Next/merge.log

   1 $ date
   2 Tue Nov  8 11:40:49 EST 2011
   3 $ git checkout master
   4 Already on 'master'
   5 $ git reset --hard stable
   6 HEAD is now at 534baf5 Merge branch 'next/move' of git://git.linaro.org/people/arnd/arm-soc
   7 Merging origin/master (1ea6b8f Linux 3.2-rc1)
   8 $ git merge origin/master
   9 Updating 534baf5..1ea6b8f
  10 Fast-forward
  11  Documentation/ABI/stable/sysfs-acpi-pmprofile      |   22 +
  12  Documentation/DocBook/mtdnand.tmpl                 |   19 +-
  13  .../devicetree/bindings/mtd/atmel-dataflash.txt    |   14 +
  14  .../devicetree/bindings/powerpc/fsl/board.txt      |   30 +-
  15  .../devicetree/bindings/powerpc/fsl/dcsr.txt       |  395 ++++
  16  .../devicetree/bindings/powerpc/fsl/msi-pic.txt    |   42 +
  17  Documentation/oops-tracing.txt                     |    2 +
  18  Kbuild                                             |    6 +-
  19  MAINTAINERS                                        |    5 +-
  20  Makefile                                           |   10 +-
  21  arch/alpha/Kconfig                                 |    5 -
  22  arch/alpha/kernel/core_irongate.c                  |    1 +
  23  arch/alpha/kernel/pci-sysfs.c                      |    1 +
  24  arch/alpha/kernel/pci_iommu.c                      |    1 +
  25  arch/alpha/kernel/setup.c                          |    1 +
  26  arch/arm/common/it8152.c                           |    1 +
  27  arch/arm/common/scoop.c                            |    1 +
  28  arch/arm/kernel/armksyms.c                         |    2 +-
  29  arch/arm/kernel/bios32.c                           |    2 +-
  30  arch/arm/kernel/devtree.c                          |    2 +-
  31  arch/arm/kernel/elf.c                              |    2 +-
  32  arch/arm/kernel/etm.c                              |    1 +
  33  arch/arm/kernel/io.c                               |    2 +-
  34  arch/arm/kernel/irq.c                              |    1 -
  35  arch/arm/kernel/leds.c                             |    3 +-
  36  arch/arm/kernel/perf_event.c                       |    2 +-
  37  arch/arm/kernel/pj4-cp0.c                          |    1 -
  38  arch/arm/kernel/process.c                          |    2 +-
  39  arch/arm/kernel/ptrace.c                           |    1 +
  40  arch/arm/kernel/return_address.c                   |    2 +-
  41  arch/arm/kernel/setup.c                            |    2 +-
  42  arch/arm/kernel/stacktrace.c                       |    2 +-
  43  arch/arm/kernel/sys_arm.c                          |    2 +-
  44  arch/arm/kernel/time.c                             |    2 +-
  45  arch/arm/kernel/unwind.c                           |    2 +-
  46  arch/arm/kernel/xscale-cp0.c                       |    1 -
  47  arch/arm/mach-at91/Kconfig                         |    6 -
  48  arch/arm/mach-at91/board-afeb-9260v1.c             |    9 +-
  49  arch/arm/mach-at91/board-cam60.c                   |    9 +-
  50  arch/arm/mach-at91/board-cap9adk.c                 |    9 +-
  51  arch/arm/mach-at91/board-kb9202.c                  |    9 +-
  52  arch/arm/mach-at91/board-neocore926.c              |    9 +-
  53  arch/arm/mach-at91/board-qil-a9260.c               |    9 +-
  54  arch/arm/mach-at91/board-rm9200dk.c                |    9 +-
  55  arch/arm/mach-at91/board-sam9-l9260.c              |    9 +-
  56  arch/arm/mach-at91/board-sam9260ek.c               |    9 +-
  57  arch/arm/mach-at91/board-sam9261ek.c               |    9 +-
  58  arch/arm/mach-at91/board-sam9263ek.c               |    9 +-
  59  arch/arm/mach-at91/board-sam9g20ek.c               |    9 +-
  60  arch/arm/mach-at91/board-sam9m10g45ek.c            |    9 +-
  61  arch/arm/mach-at91/board-sam9rlek.c                |    9 +-
  62  arch/arm/mach-at91/board-snapper9260.c             |   10 +-
  63  arch/arm/mach-at91/board-usb-a926x.c               |    9 +-
  64  arch/arm/mach-at91/board-yl-9200.c                 |    9 +-
  65  arch/arm/mach-at91/cpuidle.c                       |   42 +-
  66  arch/arm/mach-at91/include/mach/board.h            |    3 +-
  67  arch/arm/mach-bcmring/dma.c                        |    1 +
  68  arch/arm/mach-bcmring/mm.c                         |    1 +
  69  arch/arm/mach-davinci/board-da830-evm.c            |    2 +-
  70  arch/arm/mach-davinci/board-da850-evm.c            |    2 +-
  71  arch/arm/mach-davinci/board-dm355-evm.c            |    2 +-
  72  arch/arm/mach-davinci/board-dm355-leopard.c        |    2 +-
  73  arch/arm/mach-davinci/board-dm365-evm.c            |    2 +-
  74  arch/arm/mach-davinci/board-dm644x-evm.c           |    3 +-
  75  arch/arm/mach-davinci/board-dm646x-evm.c           |    1 +
  76  arch/arm/mach-davinci/board-mityomapl138.c         |    3 +-
  77  arch/arm/mach-davinci/board-neuros-osd2.c          |    2 +-
  78  arch/arm/mach-davinci/board-tnetv107x-evm.c        |    2 +-
  79  arch/arm/mach-davinci/cdce949.c                    |    1 +
  80  arch/arm/mach-davinci/cpufreq.c                    |    1 +
  81  arch/arm/mach-davinci/cpuidle.c                    |   52 +-
  82  arch/arm/mach-davinci/include/mach/gpio.h          |    2 +
  83  arch/arm/mach-davinci/include/mach/nand.h          |    4 +-
  84  arch/arm/mach-ep93xx/core.c                        |    1 +
  85  arch/arm/mach-ep93xx/ts72xx.c                      |   23 +-
  86  arch/arm/mach-exynos/cpuidle.c                     |   30 +-
  87  arch/arm/mach-exynos/dev-sysmmu.c                  |    1 +
  88  arch/arm/mach-exynos/platsmp.c                     |    2 -
  89  arch/arm/mach-imx/mach-mx31lilly.c                 |    1 +
  90  arch/arm/mach-imx/mach-mx31lite.c                  |    1 +
  91  arch/arm/mach-imx/mach-mx31moboard.c               |    1 +
  92  arch/arm/mach-iop13xx/pci.c                        |    1 +
  93  arch/arm/mach-ixp2000/core.c                       |    1 +
  94  arch/arm/mach-ixp4xx/common-pci.c                  |    1 +
  95  arch/arm/mach-ixp4xx/common.c                      |    1 +
  96  arch/arm/mach-kirkwood/cpuidle.c                   |   43 +-
  97  arch/arm/mach-mmp/aspenite.c                       |    5 +-
  98  arch/arm/mach-msm/io.c                             |    1 +
  99  arch/arm/mach-netx/xc.c                            |    1 +
 100  arch/arm/mach-omap1/board-ams-delta.c              |    1 +
 101  arch/arm/mach-omap1/board-palmz71.c                |    1 -
 102  arch/arm/mach-omap1/board-sx1.c                    |    1 +
 103  arch/arm/mach-omap1/board-voiceblue.c              |    1 +
 104  arch/arm/mach-omap1/mailbox.c                      |    1 +
 105  arch/arm/mach-omap1/pm.c                           |    2 +-
 106  arch/arm/mach-omap2/board-devkit8000.c             |    1 -
 107  arch/arm/mach-omap2/board-generic.c                |    8 +
 108  arch/arm/mach-omap2/board-h4.c                     |  122 +-
 109  arch/arm/mach-omap2/board-omap3evm.c               |    1 +
 110  arch/arm/mach-omap2/clkt_dpll.c                    |   51 +-
 111  arch/arm/mach-omap2/clock.h                        |    2 +
 112  arch/arm/mach-omap2/clock2420_data.c               |   12 -
 113  arch/arm/mach-omap2/clock2430_data.c               |   12 -
 114  arch/arm/mach-omap2/clock3xxx_data.c               |   12 -
 115  arch/arm/mach-omap2/clock44xx.h                    |    7 +
 116  arch/arm/mach-omap2/clock44xx_data.c               |   43 +-
 117  arch/arm/mach-omap2/clockdomain.c                  |    1 +
 118  arch/arm/mach-omap2/cpuidle34xx.c                  |  133 +-
 119  arch/arm/mach-omap2/devices.c                      |   17 +-
 120  arch/arm/mach-omap2/display.c                      |    1 +
 121  arch/arm/mach-omap2/dpll3xxx.c                     |    9 +-
 122  arch/arm/mach-omap2/dpll44xx.c                     |   69 +
 123  arch/arm/mach-omap2/dsp.c                          |    1 +
 124  arch/arm/mach-omap2/gpmc-onenand.c                 |    1 +
 125  arch/arm/mach-omap2/hsmmc.c                        |   16 +-
 126  arch/arm/mach-omap2/id.c                           |    5 +-
 127  .../include/mach/ctrl_module_pad_core_44xx.h       |    8 +-
 128  arch/arm/mach-omap2/io.c                           |    6 +
 129  arch/arm/mach-omap2/mailbox.c                      |    1 +
 130  arch/arm/mach-omap2/omap-iommu.c                   |    1 +
 131  arch/arm/mach-omap2/omap_hwmod.c                   |    2 +-
 132  arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |   17 +-
 133  arch/arm/mach-omap2/omap_l3_noc.c                  |    1 +
 134  arch/arm/mach-omap2/pm.c                           |    1 +
 135  arch/arm/mach-omap2/pm34xx.c                       |   70 +-
 136  arch/arm/mach-omap2/powerdomain.c                  |   14 +-
 137  arch/arm/mach-omap2/powerdomain.h                  |    2 +-
 138  arch/arm/mach-omap2/prcm.c                         |    1 +
 139  arch/arm/mach-omap2/smartreflex.c                  |    1 +
 140  arch/arm/mach-omap2/timer.c                        |   12 +-
 141  arch/arm/mach-omap2/usb-musb.c                     |   38 -
 142  arch/arm/mach-omap2/usb-tusb6010.c                 |    2 +
 143  arch/arm/mach-omap2/voltage.c                      |    1 +
 144  arch/arm/mach-orion5x/ts78xx-setup.c               |    2 +-
 145  arch/arm/mach-pxa/cm-x300.c                        |    5 +-
 146  arch/arm/mach-pxa/colibri-pxa270.c                 |    1 +
 147  arch/arm/mach-pxa/colibri-pxa3xx.c                 |    5 +-
 148  arch/arm/mach-pxa/corgi.c                          |    1 +
 149  arch/arm/mach-pxa/eseries.c                        |    2 +-
 150  arch/arm/mach-pxa/eseries.h                        |    1 -
 151  arch/arm/mach-pxa/include/mach/gpio-pxa.h          |    2 +-
 152  arch/arm/mach-pxa/littleton.c                      |    5 +-
 153  arch/arm/mach-pxa/mxm8x10.c                        |    9 +-
 154  arch/arm/mach-pxa/poodle.c                         |    1 +
 155  arch/arm/mach-pxa/raumfeld.c                       |    5 +-
 156  arch/arm/mach-pxa/spitz.c                          |    1 +
 157  arch/arm/mach-pxa/trizeps4.c                       |    1 +
 158  arch/arm/mach-pxa/zylonite.c                       |    5 +-
 159  arch/arm/mach-s3c2410/mach-h1940.c                 |    1 +
 160  arch/arm/mach-s3c64xx/dev-audio.c                  |    1 +
 161  arch/arm/mach-sa1100/collie.c                      |    1 +
 162  arch/arm/mach-sa1100/jornada720.c                  |    1 +
 163  arch/arm/mach-shmobile/Kconfig                     |    8 +
 164  arch/arm/mach-shmobile/Makefile                    |    1 +
 165  arch/arm/mach-shmobile/board-ag5evm.c              |   36 +-
 166  arch/arm/mach-shmobile/board-ap4evb.c              |    4 +-
 167  arch/arm/mach-shmobile/board-kota2.c               |  447 ++++
 168  arch/arm/mach-shmobile/board-mackerel.c            |    4 +-
 169  arch/arm/mach-shmobile/clock.c                     |    1 +
 170  arch/arm/mach-shmobile/include/mach/intc.h         |  246 ++
 171  arch/arm/mach-shmobile/include/mach/sh73a0.h       |   17 +
 172  arch/arm/mach-shmobile/intc-sh7367.c               |   40 +-
 173  arch/arm/mach-shmobile/intc-sh7372.c               |   72 +-
 174  arch/arm/mach-shmobile/intc-sh7377.c               |   67 +-
 175  arch/arm/mach-shmobile/intc-sh73a0.c               |  187 ++
 176  arch/arm/mach-shmobile/pfc-sh73a0.c                |  120 +-
 177  arch/arm/mach-shmobile/platsmp.c                   |   10 +-
 178  arch/arm/mach-tegra/pcie.c                         |    1 +
 179  arch/arm/mm/fault-armv.c                           |    1 -
 180  arch/arm/mm/init.c                                 |    1 +
 181  arch/arm/plat-iop/gpio.c                           |    1 +
 182  arch/arm/plat-iop/time.c                           |    1 +
 183  arch/arm/plat-omap/clock.c                         |    1 +
 184  arch/arm/plat-omap/dmtimer.c                       |    1 +
 185  arch/arm/plat-omap/i2c.c                           |    2 +-
 186  arch/arm/plat-omap/include/plat/cpu.h              |   17 +-
 187  arch/arm/plat-omap/include/plat/dmtimer.h          |    4 +-
 188  arch/arm/plat-omap/include/plat/omap-alsa.h        |  123 -
 189  arch/arm/plat-omap/include/plat/omap-pm.h          |    4 +-
 190  arch/arm/plat-omap/include/plat/omap_device.h      |    2 +-
 191  arch/arm/plat-omap/include/plat/omap_hwmod.h       |    2 +-
 192  arch/arm/plat-omap/mailbox.c                       |    1 +
 193  arch/arm/plat-omap/omap-pm-noop.c                  |   24 +-
 194  arch/arm/plat-omap/omap_device.c                   |    3 +-
 195  arch/arm/plat-pxa/include/plat/pxa3xx_nand.h       |   20 +-
 196  arch/arm/plat-samsung/dev-backlight.c              |    1 +
 197  arch/arm/plat-samsung/dma-ops.c                    |    1 +
 198  arch/arm/plat-samsung/platformdata.c               |    1 +
 199  arch/arm/plat-samsung/s3c-dma-ops.c                |    1 +
 200  arch/arm/vfp/vfpmodule.c                           |    1 -
 201  arch/avr32/boards/atngw100/setup.c                 |    8 +-
 202  arch/avr32/boards/atstk1000/atstk1002.c            |    9 +-
 203  arch/avr32/mach-at32ap/clock.c                     |    1 +
 204  arch/avr32/mach-at32ap/cpufreq.c                   |    1 +
 205  arch/avr32/mach-at32ap/include/mach/board.h        |    3 +-
 206  arch/avr32/mach-at32ap/intc.c                      |    1 +
 207  arch/avr32/mach-at32ap/pio.c                       |    1 +
 208  arch/avr32/mm/dma-coherent.c                       |    1 +
 209  arch/blackfin/kernel/dma-mapping.c                 |    1 +
 210  arch/blackfin/kernel/perf_event.c                  |    1 +
 211  arch/blackfin/kernel/sys_bfin.c                    |    1 +
 212  arch/blackfin/mach-bf518/boards/ezbrd.c            |    1 +
 213  arch/blackfin/mach-bf527/boards/ad7160eval.c       |    1 +
 214  arch/blackfin/mach-bf527/boards/cm_bf527.c         |    1 +
 215  arch/blackfin/mach-bf527/boards/ezbrd.c            |    1 +
 216  arch/blackfin/mach-bf527/boards/ezkit.c            |    1 +
 217  arch/blackfin/mach-bf527/boards/tll6527m.c         |    1 +
 218  arch/blackfin/mach-bf537/boards/cm_bf537e.c        |    1 +
 219  arch/blackfin/mach-bf537/boards/cm_bf537u.c        |    1 +
 220  arch/blackfin/mach-bf537/boards/dnp5370.c          |    1 +
 221  arch/blackfin/mach-bf537/boards/pnav10.c           |    1 +
 222  arch/blackfin/mach-bf537/boards/stamp.c            |    1 +
 223  arch/blackfin/mach-bf537/boards/tcm_bf537.c        |    1 +
 224  arch/blackfin/mach-common/cpufreq.c                |    1 +
 225  arch/blackfin/mm/init.c                            |    1 +
 226  arch/cris/arch-v32/drivers/mach-a3/nandflash.c     |    2 +-
 227  arch/cris/arch-v32/drivers/mach-fs/nandflash.c     |    2 +-
 228  arch/ia64/hp/common/hwsw_iommu.c                   |    1 +
 229  arch/ia64/include/asm/xen/grant_table.h            |   29 -
 230  arch/ia64/include/asm/xen/interface.h              |    1 +
 231  arch/ia64/kernel/dma-mapping.c                     |    1 +
 232  arch/ia64/kernel/topology.c                        |    1 +
 233  arch/ia64/pci/pci.c                                |    1 +
 234  arch/ia64/sn/kernel/io_acpi_init.c                 |    1 +
 235  arch/ia64/sn/kernel/io_init.c                      |    1 +
 236  arch/ia64/sn/pci/pcibr/pcibr_dma.c                 |    1 +
 237  arch/ia64/sn/pci/pcibr/pcibr_provider.c            |    1 +
 238  arch/ia64/sn/pci/tioca_provider.c                  |    1 +
 239  arch/ia64/xen/grant-table.c                        |   62 -
 240  arch/ia64/xen/hypervisor.c                         |    1 +
 241  arch/m32r/Kconfig                                  |    7 -
 242  arch/m68k/atari/time.c                             |    1 +
 243  arch/m68k/kernel/dma_mm.c                          |    1 +
 244  arch/m68k/kernel/dma_no.c                          |    1 +
 245  arch/microblaze/kernel/dma.c                       |    1 +
 246  arch/microblaze/kernel/irq.c                       |    1 +
 247  arch/microblaze/mm/init.c                          |    1 +
 248  arch/microblaze/pci/iomap.c                        |    1 +
 249  arch/microblaze/pci/pci-common.c                   |    1 +
 250  arch/mips/Kconfig                                  |   14 -
 251  arch/mips/bcm47xx/gpio.c                           |    1 +
 252  arch/mips/bcm47xx/setup.c                          |    1 +
 253  arch/mips/cavium-octeon/csrc-octeon.c              |    1 +
 254  arch/mips/cavium-octeon/dma-octeon.c               |    1 +
 255  arch/mips/cavium-octeon/flash_setup.c              |    1 +
 256  arch/mips/kernel/8250-platform.c                   |    1 -
 257  arch/mips/kernel/cpu-probe.c                       |    3 +-
 258  arch/mips/kernel/i8253.c                           |    2 +-
 259  arch/mips/kernel/init_task.c                       |    2 +-
 260  arch/mips/kernel/irq-msc01.c                       |    1 -
 261  arch/mips/kernel/irq.c                             |    1 -
 262  arch/mips/kernel/mips-mt.c                         |    2 +-
 263  arch/mips/kernel/mips_ksyms.c                      |    2 +-
 264  arch/mips/kernel/module.c                          |    1 -
 265  arch/mips/kernel/process.c                         |    2 +-
 266  arch/mips/kernel/prom.c                            |    2 +-
 267  arch/mips/kernel/reset.c                           |    2 +-
 268  arch/mips/kernel/rtlx.c                            |    1 -
 269  arch/mips/kernel/setup.c                           |    2 +-
 270  arch/mips/kernel/spinlock_test.c                   |    2 +-
 271  arch/mips/kernel/stacktrace.c                      |    2 +-
 272  arch/mips/kernel/time.c                            |    2 +-
 273  arch/mips/kernel/traps.c                           |    1 -
 274  arch/mips/kernel/unaligned.c                       |    1 -
 275  arch/mips/kernel/vpe.c                             |    1 -
 276  arch/mips/loongson/common/platform.c               |    1 +
 277  arch/mips/pci/pci-ip27.c                           |    1 +
 278  arch/mips/pci/pci.c                                |    1 +
 279  arch/mips/powertv/Kconfig                          |    2 -
 280  arch/mips/powertv/asic/Kconfig                     |   28 -
 281  arch/mips/powertv/pci/fixup-powertv.c              |    1 +
 282  arch/mips/powertv/powertv-usb.c                    |    1 +
 283  arch/mips/rb532/gpio.c                             |    1 +
 284  arch/mips/rb532/setup.c                            |    1 +
 285  arch/mips/txx9/generic/spi_eeprom.c                |    1 +
 286  arch/mips/txx9/rbtx4939/setup.c                    |    1 +
 287  arch/mips/vr41xx/common/giu.c                      |    1 +
 288  arch/mips/vr41xx/common/rtc.c                      |    1 +
 289  arch/openrisc/Kconfig                              |   12 -
 290  arch/parisc/kernel/drivers.c                       |    1 +
 291  arch/parisc/kernel/pci-dma.c                       |    1 +
 292  arch/parisc/kernel/setup.c                         |    1 +
 293  arch/parisc/lib/iomap.c                            |    1 +
 294  arch/powerpc/Kconfig                               |   29 +-
 295  arch/powerpc/Kconfig.debug                         |   46 +-
 296  arch/powerpc/boot/Makefile                         |    3 +-
 297  arch/powerpc/boot/dts/digsy_mtc.dts                |   59 +-
 298  arch/powerpc/boot/dts/gef_ppc9a.dts                |   33 +-
 299  arch/powerpc/boot/dts/gef_sbc310.dts               |   33 +-
 300  arch/powerpc/boot/dts/gef_sbc610.dts               |   33 +-
 301  arch/powerpc/boot/dts/hcu4.dts                     |  168 --
 302  arch/powerpc/boot/dts/ksi8560.dts                  |    2 +-
 303  arch/powerpc/boot/dts/mgcoge.dts                   |    9 +
 304  arch/powerpc/boot/dts/mpc5200b.dtsi                |    2 +
 305  arch/powerpc/boot/dts/mpc8349emitx.dts             |    3 +-
 306  arch/powerpc/boot/dts/p1022ds.dts                  |    2 +-
 307  arch/powerpc/boot/dts/p2020ds.dts                  |    5 +
 308  .../boot/dts/{p2040rdb.dts => p2041rdb.dts}        |   17 +-
 309  .../boot/dts/{p2040si.dtsi => p2041si.dtsi}        |  135 +-
 310  arch/powerpc/boot/dts/p3041ds.dts                  |    8 +-
 311  arch/powerpc/boot/dts/p3041si.dtsi                 |   71 +-
 312  arch/powerpc/boot/dts/p3060qds.dts                 |  238 ++
 313  arch/powerpc/boot/dts/p3060si.dtsi                 |  719 ++++++
 314  arch/powerpc/boot/dts/p4080ds.dts                  |   12 +-
 315  arch/powerpc/boot/dts/p4080si.dtsi                 |  114 +-
 316  arch/powerpc/boot/dts/p5020ds.dts                  |    8 +-
 317  arch/powerpc/boot/dts/p5020si.dtsi                 |   68 +-
 318  arch/powerpc/boot/dts/sbc8560.dts                  |    2 +-
 319  arch/powerpc/boot/dts/yosemite.dts                 |   36 +
 320  arch/powerpc/configs/40x/hcu4_defconfig            |   81 -
 321  arch/powerpc/configs/85xx/p1023rds_defconfig       |    2 +-
 322  arch/powerpc/configs/85xx/xes_mpc85xx_defconfig    |    2 +-
 323  arch/powerpc/configs/corenet32_smp_defconfig       |   11 +-
 324  arch/powerpc/configs/corenet64_smp_defconfig       |    5 -
 325  arch/powerpc/configs/mgcoge_defconfig              |   27 +-
 326  arch/powerpc/configs/mpc512x_defconfig             |   19 +-
 327  arch/powerpc/configs/mpc5200_defconfig             |   12 +
 328  arch/powerpc/configs/mpc85xx_defconfig             |    5 +-
 329  arch/powerpc/configs/mpc85xx_smp_defconfig         |    6 +-
 330  arch/powerpc/configs/ppc40x_defconfig              |    1 -
 331  arch/powerpc/configs/ppc6xx_defconfig              |    2 +-
 332  arch/powerpc/include/asm/device.h                  |    2 +
 333  arch/powerpc/include/asm/firmware.h                |   10 +
 334  arch/powerpc/include/asm/hugetlb.h                 |   63 +-
 335  arch/powerpc/include/asm/kexec.h                   |    2 +-
 336  arch/powerpc/include/asm/lv1call.h                 |    1 +
 337  arch/powerpc/include/asm/machdep.h                 |    4 +-
 338  arch/powerpc/include/asm/mmu-book3e.h              |    7 +
 339  arch/powerpc/include/asm/mmu-hash64.h              |    3 +-
 340  arch/powerpc/include/asm/mmu.h                     |   18 +-
 341  arch/powerpc/include/asm/mpic.h                    |    2 -
 342  arch/powerpc/include/asm/opal.h                    |  443 ++++
 343  arch/powerpc/include/asm/paca.h                    |    8 +
 344  arch/powerpc/include/asm/page.h                    |   31 +-
 345  arch/powerpc/include/asm/page_64.h                 |   11 -
 346  arch/powerpc/include/asm/pte-book3e.h              |    3 +
 347  arch/powerpc/include/asm/reg_booke.h               |    3 +
 348  arch/powerpc/include/asm/rtas.h                    |    6 +-
 349  arch/powerpc/include/asm/smp.h                     |    1 +
 350  arch/powerpc/include/asm/sparsemem.h               |    2 +-
 351  arch/powerpc/include/asm/spu.h                     |    1 +
 352  arch/powerpc/include/asm/topology.h                |   14 +-
 353  arch/powerpc/include/asm/udbg.h                    |    3 +
 354  arch/powerpc/include/asm/xics.h                    |   19 +
 355  arch/powerpc/kernel/asm-offsets.c                  |   10 +
 356  arch/powerpc/kernel/btext.c                        |    2 +-
 357  arch/powerpc/kernel/clock.c                        |    2 +-
 358  arch/powerpc/kernel/cputable.c                     |    2 +-
 359  arch/powerpc/kernel/crash.c                        |    1 +
 360  arch/powerpc/kernel/dma-iommu.c                    |   29 +-
 361  arch/powerpc/kernel/dma-swiotlb.c                  |   16 +
 362  arch/powerpc/kernel/dma.c                          |   45 +-
 363  arch/powerpc/kernel/exceptions-64s.S               |   27 +-
 364  arch/powerpc/kernel/firmware.c                     |    3 +-
 365  arch/powerpc/kernel/head_32.S                      |    7 +-
 366  arch/powerpc/kernel/head_40x.S                     |   15 +-
 367  arch/powerpc/kernel/head_44x.S                     |   16 +-
 368  arch/powerpc/kernel/head_64.S                      |   22 +-
 369  arch/powerpc/kernel/head_8xx.S                     |   13 +-
 370  arch/powerpc/kernel/head_fsl_booke.S               |  175 ++-
 371  arch/powerpc/kernel/hw_breakpoint.c                |    1 -
 372  arch/powerpc/kernel/ibmebus.c                      |   24 +-
 373  arch/powerpc/kernel/idle_e500.S                    |    2 +-
 374  arch/powerpc/kernel/init_task.c                    |    2 +-
 375  arch/powerpc/kernel/io-workarounds.c               |    1 +
 376  arch/powerpc/kernel/io.c                           |    2 +-
 377  arch/powerpc/kernel/iomap.c                        |    1 +
 378  arch/powerpc/kernel/iommu.c                        |    8 +
 379  arch/powerpc/kernel/irq.c                          |    2 +-
 380  arch/powerpc/kernel/isa-bridge.c                   |    1 +
 381  arch/powerpc/kernel/kvm.c                          |    1 +
 382  arch/powerpc/kernel/legacy_serial.c                |   25 +
 383  arch/powerpc/kernel/machine_kexec_64.c             |    3 +-
 384  arch/powerpc/kernel/misc_32.S                      |  171 ++
 385  arch/powerpc/kernel/module.c                       |    1 -
 386  arch/powerpc/kernel/of_platform.c                  |    2 +-
 387  arch/powerpc/kernel/paca.c                         |    2 +-
 388  arch/powerpc/kernel/pci-common.c                   |   12 +
 389  arch/powerpc/kernel/pci_32.c                       |    1 +
 390  arch/powerpc/kernel/pci_64.c                       |    1 +
 391  arch/powerpc/kernel/pci_dn.c                       |    1 +
 392  arch/powerpc/kernel/pci_of_scan.c                  |    1 +
 393  arch/powerpc/kernel/pmc.c                          |    2 +-
 394  arch/powerpc/kernel/power6-pmu.c                   |    4 +-
 395  arch/powerpc/kernel/power7-pmu.c                   |    2 +
 396  arch/powerpc/kernel/ppc_ksyms.c                    |    2 +-
 397  arch/powerpc/kernel/process.c                      |    2 +-
 398  arch/powerpc/kernel/prom.c                         |   21 +-
 399  arch/powerpc/kernel/prom_init.c                    |  383 +++-
 400  arch/powerpc/kernel/prom_init_check.sh             |    4 +-
 401  arch/powerpc/kernel/prom_parse.c                   |    1 -
 402  arch/powerpc/kernel/ptrace.c                       |   21 +-
 403  arch/powerpc/kernel/rtas.c                         |    2 +-
 404  arch/powerpc/kernel/setup-common.c                 |    2 +-
 405  arch/powerpc/kernel/setup_32.c                     |    2 +-
 406  arch/powerpc/kernel/setup_64.c                     |   24 +-
 407  arch/powerpc/kernel/signal_64.c                    |    1 -
 408  arch/powerpc/kernel/smp.c                          |   32 +-
 409  arch/powerpc/kernel/stacktrace.c                   |    2 +-
 410  arch/powerpc/kernel/swsusp.c                       |    2 +-
 411  arch/powerpc/kernel/swsusp_64.c                    |    1 +
 412  arch/powerpc/kernel/sysfs.c                        |    2 +-
 413  arch/powerpc/kernel/time.c                         |    2 +-
 414  arch/powerpc/kernel/traps.c                        |    9 +-
 415  arch/powerpc/kernel/udbg.c                         |    6 +
 416  arch/powerpc/kernel/vdso.c                         |    1 -
 417  arch/powerpc/kernel/vio.c                          |   24 +-
 418  arch/powerpc/kvm/44x.c                             |    1 +
 419  arch/powerpc/kvm/book3s.c                          |    1 +
 420  arch/powerpc/kvm/book3s_exports.c                  |    2 +-
 421  arch/powerpc/kvm/book3s_hv.c                       |    1 +
 422  arch/powerpc/kvm/book3s_hv_builtin.c               |    1 +
 423  arch/powerpc/kvm/book3s_pr.c                       |    1 +
 424  arch/powerpc/kvm/powerpc.c                         |    1 -
 425  arch/powerpc/lib/checksum_wrappers_64.c            |    2 +-
 426  arch/powerpc/lib/devres.c                          |    2 +-
 427  arch/powerpc/lib/locks.c                           |    2 +-
 428  arch/powerpc/lib/rheap.c                           |    2 +-
 429  arch/powerpc/math-emu/math_efp.c                   |  100 +-
 430  arch/powerpc/mm/Makefile                           |    1 +
 431  arch/powerpc/mm/dma-noncoherent.c                  |    1 +
 432  arch/powerpc/mm/fsl_booke_mmu.c                    |   43 +-
 433  arch/powerpc/mm/hash_utils_64.c                    |   10 +-
 434  arch/powerpc/mm/hugetlbpage-book3e.c               |  121 +
 435  arch/powerpc/mm/hugetlbpage.c                      |  379 +++-
 436  arch/powerpc/mm/init_32.c                          |    9 +
 437  arch/powerpc/mm/mem.c                              |   10 +-
 438  arch/powerpc/mm/mmu_context_hash32.c               |    1 +
 439  arch/powerpc/mm/mmu_context_hash64.c               |   14 +-
 440  arch/powerpc/mm/mmu_context_nohash.c               |    5 +
 441  arch/powerpc/mm/mmu_decl.h                         |    2 +
 442  arch/powerpc/mm/numa.c                             |   22 +-
 443  arch/powerpc/mm/pgtable.c                          |    3 +-
 444  arch/powerpc/mm/pgtable_64.c                       |    1 +
 445  arch/powerpc/mm/slice.c                            |    2 +-
 446  arch/powerpc/mm/tlb_hash32.c                       |    1 +
 447  arch/powerpc/mm/tlb_low_64e.S                      |   24 +-
 448  arch/powerpc/mm/tlb_nohash.c                       |   68 +-
 449  arch/powerpc/platforms/40x/Kconfig                 |   13 -
 450  arch/powerpc/platforms/40x/Makefile                |    1 -
 451  arch/powerpc/platforms/40x/hcu4.c                  |   61 -
 452  arch/powerpc/platforms/44x/warp.c                  |    1 +
 453  arch/powerpc/platforms/512x/Kconfig                |    1 +
 454  arch/powerpc/platforms/512x/clock.c                |    1 +
 455  arch/powerpc/platforms/52xx/mpc52xx_common.c       |    1 +
 456  arch/powerpc/platforms/52xx/mpc52xx_gpt.c          |    1 +
 457  arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c      |    1 +
 458  arch/powerpc/platforms/82xx/km82xx.c               |    4 +
 459  arch/powerpc/platforms/83xx/Kconfig                |    9 +-
 460  arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c     |   58 +-
 461  arch/powerpc/platforms/83xx/suspend.c              |    1 +
 462  arch/powerpc/platforms/85xx/Kconfig                |   30 +-
 463  arch/powerpc/platforms/85xx/Makefile               |    3 +-
 464  arch/powerpc/platforms/85xx/mpc85xx_cds.c          |    1 -
 465  arch/powerpc/platforms/85xx/mpc85xx_mds.c          |    1 -
 466  arch/powerpc/platforms/85xx/p1022_ds.c             |   11 +-
 467  .../platforms/85xx/{p2040_rdb.c => p2041_rdb.c}    |   18 +-
 468  arch/powerpc/platforms/85xx/p3060_qds.c            |   77 +
 469  arch/powerpc/platforms/85xx/sbc8548.c              |    1 -
 470  arch/powerpc/platforms/85xx/sbc8560.c              |    2 +-
 471  arch/powerpc/platforms/85xx/smp.c                  |   12 +-
 472  arch/powerpc/platforms/86xx/Kconfig                |    1 +
 473  arch/powerpc/platforms/86xx/gef_gpio.c             |    1 +
 474  arch/powerpc/platforms/8xx/tqm8xx_setup.c          |    1 -
 475  arch/powerpc/platforms/Kconfig                     |   13 +-
 476  arch/powerpc/platforms/Kconfig.cputype             |   12 +-
 477  arch/powerpc/platforms/Makefile                    |    1 +
 478  arch/powerpc/platforms/cell/axon_msi.c             |    1 +
 479  arch/powerpc/platforms/cell/beat.c                 |    2 +-
 480  arch/powerpc/platforms/cell/beat_spu_priv1.c       |    2 -
 481  arch/powerpc/platforms/cell/beat_wrapper.h         |    1 +
 482  arch/powerpc/platforms/cell/cbe_cpufreq.c          |    1 +
 483  arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c      |    1 +
 484  arch/powerpc/platforms/cell/cbe_powerbutton.c      |    1 +
 485  arch/powerpc/platforms/cell/cbe_regs.c             |    2 +-
 486  arch/powerpc/platforms/cell/celleb_setup.c         |    1 +
 487  arch/powerpc/platforms/cell/cpufreq_spudemand.c    |    1 +
 488  arch/powerpc/platforms/cell/interrupt.c            |    2 +-
 489  arch/powerpc/platforms/cell/iommu.c                |   21 +
 490  arch/powerpc/platforms/cell/pmu.c                  |    1 +
 491  arch/powerpc/platforms/cell/qpace_setup.c          |    1 +
 492  arch/powerpc/platforms/cell/setup.c                |    1 +
 493  arch/powerpc/platforms/cell/smp.c                  |    1 -
 494  arch/powerpc/platforms/cell/spu_callbacks.c        |    2 +-
 495  arch/powerpc/platforms/cell/spu_fault.c            |    2 +-
 496  arch/powerpc/platforms/cell/spu_manage.c           |    2 +-
 497  arch/powerpc/platforms/cell/spu_notify.c           |    3 +-
 498  arch/powerpc/platforms/cell/spu_priv1_mmio.c       |    1 -
 499  arch/powerpc/platforms/cell/spufs/backing_ops.c    |    1 -
 500  arch/powerpc/platforms/cell/spufs/context.c        |    2 +-
 501  arch/powerpc/platforms/cell/spufs/coredump.c       |    1 -
 502  arch/powerpc/platforms/cell/spufs/fault.c          |    1 -
 503  arch/powerpc/platforms/cell/spufs/file.c           |    2 +-
 504  arch/powerpc/platforms/cell/spufs/hw_ops.c         |    1 -
 505  arch/powerpc/platforms/cell/spufs/sched.c          |    1 -
 506  arch/powerpc/platforms/cell/spufs/switch.c         |    2 +-
 507  arch/powerpc/platforms/cell/spufs/syscalls.c       |    2 +-
 508  arch/powerpc/platforms/embedded6xx/Kconfig         |    4 -
 509  arch/powerpc/platforms/embedded6xx/holly.c         |    1 +
 510  arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c  |    1 +
 511  arch/powerpc/platforms/iseries/hvlpconfig.c        |    2 +-
 512  arch/powerpc/platforms/iseries/iommu.c             |    2 +-
 513  arch/powerpc/platforms/iseries/ksyms.c             |    2 +-
 514  arch/powerpc/platforms/iseries/lpardata.c          |    1 -
 515  arch/powerpc/platforms/iseries/lpevents.c          |    2 +-
 516  arch/powerpc/platforms/iseries/mf.c                |    1 +
 517  arch/powerpc/platforms/iseries/pci.c               |    1 -
 518  arch/powerpc/platforms/iseries/setup.c             |    1 +
 519  arch/powerpc/platforms/iseries/smp.c               |    1 -
 520  arch/powerpc/platforms/iseries/vio.c               |    2 +-
 521  arch/powerpc/platforms/iseries/viopath.c           |    2 +-
 522  arch/powerpc/platforms/maple/setup.c               |    1 +
 523  arch/powerpc/platforms/pasemi/cpufreq.c            |    1 +
 524  arch/powerpc/platforms/pasemi/dma_lib.c            |    3 +-
 525  arch/powerpc/platforms/pasemi/setup.c              |    1 +
 526  arch/powerpc/platforms/powermac/backlight.c        |    1 +
 527  arch/powerpc/platforms/powermac/feature.c          |    1 +
 528  arch/powerpc/platforms/powermac/low_i2c.c          |    2 +-
 529  arch/powerpc/platforms/powermac/nvram.c            |    2 +-
 530  arch/powerpc/platforms/powermac/pic.c              |    1 -
 531  arch/powerpc/platforms/powermac/setup.c            |    1 +
 532  arch/powerpc/platforms/powernv/Kconfig             |   16 +
 533  arch/powerpc/platforms/powernv/Makefile            |    5 +
 534  arch/powerpc/platforms/powernv/opal-nvram.c        |   88 +
 535  arch/powerpc/platforms/powernv/opal-rtc.c          |   97 +
 536  arch/powerpc/platforms/powernv/opal-takeover.S     |  140 ++
 537  arch/powerpc/platforms/powernv/opal-wrappers.S     |  101 +
 538  arch/powerpc/platforms/powernv/opal.c              |  322 +++
 539  arch/powerpc/platforms/powernv/pci-p5ioc2.c        |  234 ++
 540  arch/powerpc/platforms/powernv/pci.c               |  427 ++++
 541  arch/powerpc/platforms/powernv/pci.h               |   48 +
 542  arch/powerpc/platforms/powernv/powernv.h           |   16 +
 543  arch/powerpc/platforms/powernv/setup.c             |  196 ++
 544  arch/powerpc/platforms/powernv/smp.c               |  182 ++
 545  arch/powerpc/platforms/prep/Kconfig                |    9 -
 546  arch/powerpc/platforms/ps3/Kconfig                 |   12 +
 547  arch/powerpc/platforms/ps3/Makefile                |    1 +
 548  arch/powerpc/platforms/ps3/exports.c               |    2 -
 549  arch/powerpc/platforms/ps3/gelic_udbg.c            |  273 +++
 550  arch/powerpc/platforms/ps3/interrupt.c             |    2 +-
 551  arch/powerpc/platforms/ps3/mm.c                    |    2 +-
 552  arch/powerpc/platforms/ps3/os-area.c               |    1 +
 553  arch/powerpc/platforms/ps3/setup.c                 |    1 +
 554  arch/powerpc/platforms/ps3/spu.c                   |    1 +
 555  arch/powerpc/platforms/ps3/system-bus.c            |    9 +-
 556  arch/powerpc/platforms/pseries/Kconfig             |    1 +
 557  arch/powerpc/platforms/pseries/dlpar.c             |    4 +
 558  arch/powerpc/platforms/pseries/eeh.c               |    4 +-
 559  arch/powerpc/platforms/pseries/eeh_event.c         |    1 +
 560  arch/powerpc/platforms/pseries/eeh_sysfs.c         |    1 +
 561  arch/powerpc/platforms/pseries/hotplug-cpu.c       |    1 +
 562  arch/powerpc/platforms/pseries/hvconsole.c         |    3 +-
 563  arch/powerpc/platforms/pseries/io_event_irq.c      |    2 +-
 564  arch/powerpc/platforms/pseries/iommu.c             |   35 +-
 565  arch/powerpc/platforms/pseries/lpar.c              |    1 +
 566  arch/powerpc/platforms/pseries/mobility.c          |    1 +
 567  arch/powerpc/platforms/pseries/nvram.c             |  171 ++-
 568  arch/powerpc/platforms/pseries/pci_dlpar.c         |    1 +
 569  arch/powerpc/platforms/pseries/plpar_wrappers.h    |    3 +
 570  arch/powerpc/platforms/pseries/setup.c             |    2 +-
 571  arch/powerpc/platforms/pseries/smp.c               |    1 -
 572  arch/powerpc/platforms/pseries/suspend.c           |    1 +
 573  arch/powerpc/platforms/wsp/Kconfig                 |   16 +-
 574  arch/powerpc/platforms/wsp/Makefile                |    2 +
 575  arch/powerpc/platforms/wsp/ics.c                   |   48 +
 576  arch/powerpc/platforms/wsp/ics.h                   |    5 +
 577  arch/powerpc/platforms/wsp/msi.c                   |  102 +
 578  arch/powerpc/platforms/wsp/msi.h                   |   19 +
 579  arch/powerpc/platforms/wsp/psr2.c                  |    4 +
 580  arch/powerpc/platforms/wsp/wsp.h                   |    3 +
 581  arch/powerpc/platforms/wsp/wsp_pci.c               | 1133 ++++++++++
 582  arch/powerpc/platforms/wsp/wsp_pci.h               |  268 +++
 583  arch/powerpc/sysdev/Makefile                       |    1 -
 584  arch/powerpc/sysdev/bestcomm/sram.c                |    2 +-
 585  arch/powerpc/sysdev/cpm_common.c                   |    4 +-
 586  arch/powerpc/sysdev/dcr.c                          |    1 +
 587  arch/powerpc/sysdev/fsl_gtm.c                      |    1 +
 588  arch/powerpc/sysdev/fsl_lbc.c                      |    3 +-
 589  arch/powerpc/sysdev/fsl_msi.c                      |   28 +-
 590  arch/powerpc/sysdev/fsl_msi.h                      |    3 +-
 591  arch/powerpc/sysdev/fsl_pmc.c                      |    1 +
 592  arch/powerpc/sysdev/fsl_rio.c                      |    2 +-
 593  arch/powerpc/sysdev/fsl_soc.c                      |    2 +-
 594  arch/powerpc/sysdev/mpc5xxx_clocks.c               |    1 +
 595  arch/powerpc/sysdev/mpc8xx_pic.c                   |    1 -
 596  arch/powerpc/sysdev/mpic.c                         |   34 +-
 597  arch/powerpc/sysdev/mv64x60_pci.c                  |    1 +
 598  arch/powerpc/sysdev/pmi.c                          |    1 +
 599  arch/powerpc/sysdev/ppc4xx_msi.c                   |    1 +
 600  arch/powerpc/sysdev/ppc4xx_pci.c                   |  101 +-
 601  arch/powerpc/sysdev/ppc4xx_pci.h                   |   12 +
 602  arch/powerpc/sysdev/qe_lib/gpio.c                  |    1 +
 603  arch/powerpc/sysdev/qe_lib/ucc.c                   |    2 +-
 604  arch/powerpc/sysdev/qe_lib/ucc_fast.c              |    2 +-
 605  arch/powerpc/sysdev/qe_lib/ucc_slow.c              |    2 +-
 606  arch/powerpc/sysdev/qe_lib/usb.c                   |    1 +
 607  arch/powerpc/sysdev/rtc_cmos_setup.c               |    1 +
 608  arch/powerpc/sysdev/scom.c                         |    1 +
 609  arch/powerpc/sysdev/simple_gpio.c                  |    1 -
 610  arch/powerpc/sysdev/tsi108_dev.c                   |    2 +-
 611  arch/powerpc/sysdev/xics/Makefile                  |    1 +
 612  arch/powerpc/sysdev/xics/icp-native.c              |    2 +-
 613  arch/powerpc/sysdev/xics/ics-opal.c                |  244 ++
 614  arch/powerpc/sysdev/xics/xics-common.c             |    8 +-
 615  arch/powerpc/xmon/xmon.c                           |    6 +-
 616  arch/s390/crypto/sha_common.c                      |    1 +
 617  arch/s390/kernel/jump_label.c                      |   51 +-
 618  arch/s390/mm/init.c                                |    1 +
 619  arch/score/Kconfig                                 |   19 -
 620  arch/sh/drivers/dma/dma-sysfs.c                    |    1 +
 621  arch/sh/drivers/pci/pci.c                          |    1 +
 622  arch/sh/kernel/cpu/shmobile/cpuidle.c              |   29 +-
 623  arch/sh/kernel/perf_event.c                        |    1 +
 624  arch/sh/kernel/topology.c                          |    1 +
 625  arch/sh/mm/init.c                                  |    1 +
 626  arch/sparc/Kconfig                                 |    7 +-
 627  arch/sparc/include/asm/termios.h                   |    1 -
 628  arch/sparc/kernel/apc.c                            |    1 +
 629  arch/sparc/kernel/auxio_32.c                       |    1 +
 630  arch/sparc/kernel/btext.c                          |    1 -
 631  arch/sparc/kernel/central.c                        |    1 +
 632  arch/sparc/kernel/cpu.c                            |    2 +-
 633  arch/sparc/kernel/cpumap.c                         |    2 +-
 634  arch/sparc/kernel/dma.c                            |    1 -
 635  arch/sparc/kernel/ebus.c                           |    2 +-
 636  arch/sparc/kernel/hvapi.c                          |    2 +-
 637  arch/sparc/kernel/idprom.c                         |    2 +-
 638  arch/sparc/kernel/iommu.c                          |    2 +-
 639  arch/sparc/kernel/irq_32.c                         |    1 +
 640  arch/sparc/kernel/irq_64.c                         |    1 -
 641  arch/sparc/kernel/jump_label.c                     |    8 -
 642  arch/sparc/kernel/ldc.c                            |    2 +-
 643  arch/sparc/kernel/leon_kernel.c                    |    1 -
 644  arch/sparc/kernel/leon_pci.c                       |    1 +
 645  arch/sparc/kernel/leon_pci_grpci2.c                |    2 +-
 646  arch/sparc/kernel/mdesc.c                          |    2 +
 647  arch/sparc/kernel/nmi.c                            |    2 +-
 648  arch/sparc/kernel/of_device_32.c                   |    1 -
 649  arch/sparc/kernel/of_device_64.c                   |    3 +-
 650  arch/sparc/kernel/of_device_common.c               |    2 +-
 651  arch/sparc/kernel/pci.c                            |    2 +-
 652  arch/sparc/kernel/pci_fire.c                       |    1 +
 653  arch/sparc/kernel/pci_psycho.c                     |    1 +
 654  arch/sparc/kernel/pci_sabre.c                      |    1 +
 655  arch/sparc/kernel/pci_schizo.c                     |    1 +
 656  arch/sparc/kernel/pci_sun4v.c                      |    1 +
 657  arch/sparc/kernel/pcic.c                           |    1 +
 658  arch/sparc/kernel/pcr.c                            |    3 +-
 659  arch/sparc/kernel/pmc.c                            |    1 +
 660  arch/sparc/kernel/power.c                          |    2 +-
 661  arch/sparc/kernel/process_64.c                     |    2 +-
 662  arch/sparc/kernel/prom_32.c                        |    1 -
 663  arch/sparc/kernel/prom_64.c                        |    1 -
 664  arch/sparc/kernel/prom_common.c                    |    2 +-
 665  arch/sparc/kernel/reboot.c                         |    2 +-
 666  arch/sparc/kernel/sbus.c                           |    1 +
 667  arch/sparc/kernel/setup_32.c                       |    1 +
 668  arch/sparc/kernel/smp_64.c                         |    2 +-
 669  arch/sparc/kernel/sparc_ksyms_64.c                 |    2 +-
 670  arch/sparc/kernel/stacktrace.c                     |    2 +-
 671  arch/sparc/kernel/sys_sparc32.c                    |    1 -
 672  arch/sparc/kernel/sys_sparc_64.c                   |    2 +-
 673  arch/sparc/kernel/time_64.c                        |    2 +-
 674  arch/sparc/kernel/traps_32.c                       |    1 +
 675  arch/sparc/kernel/unaligned_32.c                   |    1 -
 676  arch/sparc/kernel/vio.c                            |    1 +
 677  arch/sparc/kernel/viohs.c                          |    2 +-
 678  arch/sparc/mm/fault_32.c                           |    1 -
 679  arch/sparc/mm/generic_32.c                         |    1 +
 680  arch/sparc/mm/generic_64.c                         |    1 +
 681  arch/sparc/mm/highmem.c                            |    1 +
 682  arch/sparc/mm/hugetlbpage.c                        |    1 -
 683  arch/unicore32/mm/init.c                           |    1 +
 684  arch/x86/Kconfig                                   |    3 -
 685  arch/x86/crypto/aes_glue.c                         |    1 +
 686  arch/x86/crypto/aesni-intel_glue.c                 |    1 +
 687  arch/x86/include/asm/xen/grant_table.h             |    7 -
 688  arch/x86/include/asm/xen/hypercall.h               |    8 +
 689  arch/x86/include/asm/xen/interface.h               |    1 +
 690  arch/x86/kernel/cpu/amd.c                          |    1 +
 691  arch/x86/kernel/cpu/mcheck/mce-apei.c              |    1 +
 692  arch/x86/kernel/cpu/mcheck/mce.c                   |    1 +
 693  arch/x86/kernel/cpu/mcheck/therm_throt.c           |    1 +
 694  arch/x86/kernel/cpu/perf_event_intel.c             |    1 +
 695  arch/x86/kernel/devicetree.c                       |    1 +
 696  arch/x86/kernel/e820.c                             |    1 +
 697  arch/x86/kernel/hpet.c                             |    1 +
 698  arch/x86/kernel/irq.c                              |    1 +
 699  arch/x86/kernel/jump_label.c                       |   20 +-
 700  arch/x86/kernel/nmi.c                              |    1 +
 701  arch/x86/kernel/pci-dma.c                          |    1 +
 702  arch/x86/kernel/probe_roms.c                       |    4 +-
 703  arch/x86/kernel/rtc.c                              |    1 +
 704  arch/x86/kernel/smp.c                              |    1 +
 705  arch/x86/kernel/tboot.c                            |    1 +
 706  arch/x86/kernel/time.c                             |    1 +
 707  arch/x86/kernel/topology.c                         |    1 +
 708  arch/x86/kernel/vsyscall_64.c                      |    1 +
 709  arch/x86/lguest/boot.c                             |    1 +
 710  arch/x86/pci/i386.c                                |    1 +
 711  arch/x86/pci/legacy.c                              |    1 +
 712  arch/x86/platform/efi/efi.c                        |    1 +
 713  arch/x86/platform/efi/efi_32.c                     |    1 +
 714  arch/x86/platform/mrst/pmu.c                       |    2 +-
 715  arch/x86/platform/mrst/vrtc.c                      |    1 +
 716  arch/x86/platform/olpc/olpc-xo1-pm.c               |    1 +
 717  arch/x86/platform/uv/bios_uv.c                     |    1 +
 718  arch/x86/power/cpu.c                               |    1 +
 719  arch/x86/um/Kconfig                                |    3 -
 720  arch/x86/video/fbdev.c                             |    1 +
 721  arch/x86/xen/grant-table.c                         |    2 +-
 722  arch/x86/xen/time.c                                |   16 +-
 723  block/blk-integrity.c                              |    1 +
 724  block/bsg-lib.c                                    |    2 +-
 725  block/ioctl.c                                      |    1 +
 726  crypto/async_tx/async_memcpy.c                     |    1 +
 727  crypto/async_tx/async_pq.c                         |    1 +
 728  crypto/async_tx/async_raid6_recov.c                |    1 +
 729  crypto/async_tx/async_tx.c                         |    1 +
 730  crypto/async_tx/async_xor.c                        |    1 +
 731  crypto/async_tx/raid6test.c                        |    1 +
 732  crypto/crypto_wq.c                                 |    1 +
 733  crypto/md4.c                                       |    1 +
 734  crypto/proc.c                                      |    1 +
 735  crypto/vmac.c                                      |    1 +
 736  crypto/xcbc.c                                      |    1 +
 737  drivers/acpi/acpica/evxface.c                      |    1 +
 738  drivers/acpi/acpica/evxfevnt.c                     |    1 +
 739  drivers/acpi/acpica/evxfgpe.c                      |    1 +
 740  drivers/acpi/acpica/evxfregn.c                     |    1 +
 741  drivers/acpi/acpica/hwregs.c                       |   11 +-
 742  drivers/acpi/acpica/hwsleep.c                      |    1 +
 743  drivers/acpi/acpica/hwtimer.c                      |    1 +
 744  drivers/acpi/acpica/hwxface.c                      |    1 +
 745  drivers/acpi/acpica/nsxfeval.c                     |    1 +
 746  drivers/acpi/acpica/nsxfname.c                     |    1 +
 747  drivers/acpi/acpica/nsxfobj.c                      |    1 +
 748  drivers/acpi/acpica/rsxface.c                      |    1 +
 749  drivers/acpi/acpica/tbxface.c                      |    1 +
 750  drivers/acpi/acpica/utdebug.c                      |    1 +
 751  drivers/acpi/acpica/utdecode.c                     |    1 +
 752  drivers/acpi/acpica/utglobal.c                     |    1 +
 753  drivers/acpi/acpica/utxface.c                      |    1 +
 754  drivers/acpi/acpica/utxferror.c                    |    1 +
 755  drivers/acpi/atomicio.c                            |    4 +-
 756  drivers/acpi/blacklist.c                           |    1 -
 757  drivers/acpi/bus.c                                 |    8 +-
 758  drivers/acpi/debugfs.c                             |    1 +
 759  drivers/acpi/ec_sys.c                              |    1 +
 760  drivers/acpi/event.c                               |    1 +
 761  drivers/acpi/glue.c                                |    1 +
 762  drivers/acpi/proc.c                                |    1 +
 763  drivers/acpi/processor_core.c                      |    1 +
 764  drivers/acpi/processor_driver.c                    |   20 +-
 765  drivers/acpi/processor_idle.c                      |  251 ++-
 766  drivers/acpi/sbshc.c                               |    1 +
 767  drivers/acpi/scan.c                                |    3 +-
 768  drivers/acpi/sysfs.c                               |   14 +-
 769  drivers/acpi/video_detect.c                        |    1 +
 770  drivers/ata/libata-eh.c                            |    1 +
 771  drivers/ata/libata-pmp.c                           |    1 +
 772  drivers/ata/libata-scsi.c                          |    1 +
 773  drivers/ata/libata-sff.c                           |    1 +
 774  drivers/base/base.h                                |    1 +
 775  drivers/base/dma-coherent.c                        |    1 +
 776  drivers/base/dma-mapping.c                         |    1 +
 777  drivers/base/hypervisor.c                          |    1 +
 778  drivers/base/power/common.c                        |    2 +-
 779  drivers/base/power/generic_ops.c                   |    1 +
 780  drivers/base/power/main.c                          |    1 +
 781  drivers/base/power/qos.c                           |    1 +
 782  drivers/base/power/runtime.c                       |    1 +
 783  drivers/base/power/sysfs.c                         |    1 +
 784  drivers/base/power/trace.c                         |    1 +
 785  drivers/base/power/wakeup.c                        |    1 +
 786  drivers/base/regmap/regcache.c                     |    1 +
 787  drivers/base/transport_class.c                     |    1 +
 788  drivers/bcma/core.c                                |    1 +
 789  drivers/bcma/driver_chipcommon.c                   |    1 +
 790  drivers/bcma/driver_chipcommon_pmu.c               |    1 +
 791  drivers/bcma/driver_pci.c                          |    1 +
 792  drivers/bcma/host_pci.c                            |    1 +
 793  drivers/bcma/main.c                                |    1 +
 794  drivers/block/aoe/aoeblk.c                         |    1 +
 795  drivers/block/aoe/aoechr.c                         |    1 +
 796  drivers/block/ps3disk.c                            |    1 +
 797  drivers/block/ps3vram.c                            |    1 +
 798  drivers/block/virtio_blk.c                         |    1 +
 799  drivers/block/xen-blkback/common.h                 |    5 +-
 800  drivers/block/xen-blkback/xenbus.c                 |   54 +-
 801  drivers/bluetooth/ath3k.c                          |    4 +-
 802  drivers/bluetooth/bcm203x.c                        |   12 +-
 803  drivers/bluetooth/bfusb.c                          |   13 +-
 804  drivers/bluetooth/btmrvl_main.c                    |    2 +
 805  drivers/bluetooth/btmrvl_sdio.c                    |    1 +
 806  drivers/bluetooth/btwilink.c                       |    1 +
 807  drivers/char/hw_random/virtio-rng.c                |    1 +
 808  drivers/char/mem.c                                 |    1 +
 809  drivers/char/ps3flash.c                            |    1 +
 810  drivers/char/ramoops.c                             |    1 +
 811  drivers/char/ttyprintk.c                           |    1 +
 812  drivers/char/virtio_console.c                      |    1 +
 813  drivers/clocksource/sh_cmt.c                       |    1 +
 814  drivers/clocksource/sh_mtu2.c                      |    1 +
 815  drivers/clocksource/sh_tmu.c                       |    1 +
 816  drivers/cpufreq/cpufreq_stats.c                    |    1 +
 817  drivers/cpufreq/s3c64xx-cpufreq.c                  |    1 +
 818  drivers/cpuidle/cpuidle.c                          |   87 +-
 819  drivers/cpuidle/driver.c                           |   25 +
 820  drivers/cpuidle/governors/ladder.c                 |   43 +-
 821  drivers/cpuidle/governors/menu.c                   |   30 +-
 822  drivers/cpuidle/sysfs.c                            |   22 +-
 823  drivers/crypto/mv_cesa.c                           |    1 +
 824  drivers/dca/dca-core.c                             |    1 +
 825  drivers/dca/dca-sysfs.c                            |    1 +
 826  drivers/dma/imx-dma.c                              |    1 +
 827  drivers/dma/imx-sdma.c                             |    1 +
 828  drivers/dma/intel_mid_dma.c                        |    1 +
 829  drivers/dma/ipu/ipu_idmac.c                        |    1 +
 830  drivers/dma/ste_dma40.c                            |    1 +
 831  drivers/edac/cpc925_edac.c                         |   67 +-
 832  drivers/edac/mce_amd_inj.c                         |    1 +
 833  drivers/edac/ppc4xx_edac.c                         |    2 +-
 834  drivers/firewire/core-iso.c                        |    1 +
 835  drivers/firmware/google/gsmi.c                     |    1 +
 836  drivers/gpio/Kconfig                               |    8 +
 837  drivers/gpio/Makefile                              |    1 +
 838  drivers/gpio/gpio-74x164.c                         |    1 +
 839  drivers/gpio/gpio-ep93xx.c                         |    1 +
 840  drivers/gpio/gpio-mc33880.c                        |    1 +
 841  drivers/gpio/gpio-mcp23s08.c                       |    1 +
 842  drivers/gpio/gpio-ml-ioh.c                         |    1 +
 843  drivers/gpio/gpio-mpc5200.c                        |    1 +
 844  .../mpc8xxx_gpio.c => drivers/gpio/gpio-mpc8xxx.c  |    3 +
 845  drivers/gpio/gpio-mxc.c                            |    1 +
 846  drivers/gpio/gpio-mxs.c                            |    1 +
 847  drivers/gpio/gpio-pcf857x.c                        |    1 +
 848  drivers/gpio/gpio-pch.c                            |    1 +
 849  drivers/gpio/gpio-xilinx.c                         |    1 +
 850  drivers/gpu/drm/ati_pcigart.c                      |    1 +
 851  drivers/gpu/drm/drm_buffer.c                       |    1 +
 852  drivers/gpu/drm/drm_bufs.c                         |    1 +
 853  drivers/gpu/drm/drm_cache.c                        |    1 +
 854  drivers/gpu/drm/drm_crtc.c                         |    9 +-
 855  drivers/gpu/drm/drm_crtc_helper.c                  |    3 +
 856  drivers/gpu/drm/drm_debugfs.c                      |    1 +
 857  drivers/gpu/drm/drm_dma.c                          |    1 +
 858  drivers/gpu/drm/drm_drv.c                          |    1 +
 859  drivers/gpu/drm/drm_edid.c                         |    1 +
 860  drivers/gpu/drm/drm_encoder_slave.c                |    2 +
 861  drivers/gpu/drm/drm_fb_helper.c                    |    1 +
 862  drivers/gpu/drm/drm_fops.c                         |    1 +
 863  drivers/gpu/drm/drm_hashtab.c                      |    1 +
 864  drivers/gpu/drm/drm_ioc32.c                        |    1 +
 865  drivers/gpu/drm/drm_irq.c                          |    1 +
 866  drivers/gpu/drm/drm_memory.c                       |    1 +
 867  drivers/gpu/drm/drm_mm.c                           |    1 +
 868  drivers/gpu/drm/drm_modes.c                        |    1 +
 869  drivers/gpu/drm/drm_pci.c                          |    1 +
 870  drivers/gpu/drm/drm_platform.c                     |    1 +
 871  drivers/gpu/drm/drm_proc.c                         |    1 +
 872  drivers/gpu/drm/drm_sman.c                         |    1 +
 873  drivers/gpu/drm/drm_sysfs.c                        |    1 +
 874  drivers/gpu/drm/drm_usb.c                          |    1 +
 875  drivers/gpu/drm/drm_vm.c                           |    1 +
 876  drivers/gpu/drm/i2c/ch7006_drv.c                   |    2 +
 877  drivers/gpu/drm/i2c/sil164_drv.c                   |    2 +
 878  drivers/gpu/drm/i810/i810_drv.c                    |    2 +
 879  drivers/gpu/drm/i915/i915_debugfs.c                |    1 +
 880  drivers/gpu/drm/i915/i915_dma.c                    |    1 +
 881  drivers/gpu/drm/i915/i915_drv.c                    |    1 +
 882  drivers/gpu/drm/i915/intel_dp.c                    |    1 +
 883  drivers/gpu/drm/i915/intel_i2c.c                   |    1 +
 884  drivers/gpu/drm/i915/intel_sdvo.c                  |    1 +
 885  drivers/gpu/drm/mga/mga_drv.c                      |    2 +
 886  drivers/gpu/drm/mga/mga_warp.c                     |    1 +
 887  drivers/gpu/drm/nouveau/nouveau_drv.c              |    1 +
 888  drivers/gpu/drm/nouveau/nouveau_i2c.c              |    2 +
 889  drivers/gpu/drm/nouveau/nouveau_temp.c             |    2 +
 890  drivers/gpu/drm/nouveau/nvc0_graph.c               |    1 +
 891  drivers/gpu/drm/r128/r128_cce.c                    |    1 +
 892  drivers/gpu/drm/r128/r128_drv.c                    |    2 +
 893  drivers/gpu/drm/radeon/Makefile                    |    2 +-
 894  drivers/gpu/drm/radeon/atombios_crtc.c             |   56 +-
 895  drivers/gpu/drm/radeon/atombios_dp.c               |   20 +-
 896  drivers/gpu/drm/radeon/atombios_encoders.c         | 2369 ++++++++++++++++++++
 897  drivers/gpu/drm/radeon/evergreen.c                 |   18 +-
 898  drivers/gpu/drm/radeon/evergreen_blit_kms.c        |   20 +-
 899  drivers/gpu/drm/radeon/ni.c                        |   26 +-
 900  drivers/gpu/drm/radeon/r100.c                      |    8 +-
 901  drivers/gpu/drm/radeon/r300.c                      |   16 +-
 902  drivers/gpu/drm/radeon/r600.c                      |  107 +-
 903  drivers/gpu/drm/radeon/r600_blit_kms.c             |   14 +-
 904  drivers/gpu/drm/radeon/r600_cp.c                   |    2 +
 905  drivers/gpu/drm/radeon/radeon.h                    |   57 +-
 906  drivers/gpu/drm/radeon/radeon_connectors.c         |   90 +-
 907  drivers/gpu/drm/radeon/radeon_cp.c                 |    2 +
 908  drivers/gpu/drm/radeon/radeon_display.c            |   36 +-
 909  drivers/gpu/drm/radeon/radeon_drv.c                |    5 +
 910  drivers/gpu/drm/radeon/radeon_encoders.c           | 2151 +------------------
 911  drivers/gpu/drm/radeon/radeon_gart.c               |   71 +-
 912  drivers/gpu/drm/radeon/radeon_i2c.c                |   30 +-
 913  drivers/gpu/drm/radeon/radeon_irq_kms.c            |   60 +-
 914  drivers/gpu/drm/radeon/radeon_mode.h               |   14 +-
 915  drivers/gpu/drm/radeon/rs400.c                     |    5 +-
 916  drivers/gpu/drm/radeon/rs600.c                     |   17 +-
 917  drivers/gpu/drm/radeon/rv770.c                     |   73 +-
 918  drivers/gpu/drm/savage/savage_drv.c                |    2 +
 919  drivers/gpu/drm/sis/sis_drv.c                      |    2 +
 920  drivers/gpu/drm/tdfx/tdfx_drv.c                    |    2 +
 921  drivers/gpu/drm/ttm/ttm_tt.c                       |    1 +
 922  drivers/gpu/drm/via/via_drv.c                      |    2 +
 923  drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |    7 +
 924  drivers/gpu/drm/vmwgfx/vmwgfx_drv.h                |    6 +-
 925  drivers/gpu/drm/vmwgfx/vmwgfx_fb.c                 |    2 +
 926  drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |  151 ++-
 927  drivers/gpu/drm/vmwgfx/vmwgfx_kms.h                |   10 +-
 928  drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c                |    5 +-
 929  drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c               |   94 +-
 930  drivers/hid/hid-apple.c                            |    3 -
 931  drivers/hid/hid-axff.c                             |    1 +
 932  drivers/hid/hid-debug.c                            |    1 +
 933  drivers/hid/hid-dr.c                               |    1 +
 934  drivers/hid/hid-emsff.c                            |    1 +
 935  drivers/hid/hid-gaff.c                             |    1 +
 936  drivers/hid/hid-holtekff.c                         |    1 +
 937  drivers/hid/hid-picolcd.c                          |    1 +
 938  drivers/hid/hid-pl.c                               |    1 +
 939  drivers/hid/hid-roccat-common.c                    |    1 +
 940  drivers/hid/hid-roccat.c                           |    1 +
 941  drivers/hid/hid-sjoy.c                             |    1 +
 942  drivers/hid/hid-tmff.c                             |    1 +
 943  drivers/hid/hid-zpff.c                             |    1 +
 944  drivers/hid/usbhid/hid-quirks.c                    |    1 +
 945  drivers/hwmon/ultra45_env.c                        |    1 +
 946  drivers/i2c/busses/i2c-pxa-pci.c                   |    1 +
 947  drivers/i2c/busses/i2c-sh7760.c                    |    1 +
 948  drivers/i2c/busses/i2c-tegra.c                     |    1 +
 949  drivers/i2c/i2c-boardinfo.c                        |    1 +
 950  drivers/ide/buddha.c                               |    1 +
 951  drivers/ide/cmd640.c                               |    1 +
 952  drivers/ide/ide-acpi.c                             |    1 +
 953  drivers/ide/ide-atapi.c                            |    1 +
 954  drivers/ide/ide-disk_proc.c                        |    1 +
 955  drivers/ide/ide-dma-sff.c                          |    1 +
 956  drivers/ide/ide-dma.c                              |    1 +
 957  drivers/ide/ide-eh.c                               |    1 +
 958  drivers/ide/ide-floppy_proc.c                      |    1 +
 959  drivers/ide/ide-io-std.c                           |    1 +
 960  drivers/ide/ide-ioctls.c                           |    1 +
 961  drivers/ide/ide-legacy.c                           |    1 +
 962  drivers/ide/ide-lib.c                              |    1 +
 963  drivers/ide/ide-pnp.c                              |    1 +
 964  drivers/ide/ide-taskfile.c                         |    1 +
 965  drivers/ide/ide-xfer-mode.c                        |    1 +
 966  drivers/ide/macide.c                               |    1 +
 967  drivers/ide/pmac.c                                 |    1 +
 968  drivers/ide/q40ide.c                               |    1 +
 969  drivers/ide/setup-pci.c                            |    1 +
 970  drivers/ide/tc86c001.c                             |    1 +
 971  drivers/idle/intel_idle.c                          |  131 +-
 972  drivers/infiniband/core/addr.c                     |    1 +
 973  drivers/infiniband/core/cm.c                       |    1 +
 974  drivers/infiniband/core/cma.c                      |    1 +
 975  drivers/infiniband/core/fmr_pool.c                 |    1 +
 976  drivers/infiniband/core/iwcm.c                     |    1 +
 977  drivers/infiniband/core/mad.c                      |    1 +
 978  drivers/infiniband/core/multicast.c                |    1 +
 979  drivers/infiniband/core/netlink.c                  |    1 +
 980  drivers/infiniband/core/packer.c                   |    1 +
 981  drivers/infiniband/core/sysfs.c                    |    1 +
 982  drivers/infiniband/core/ucma.c                     |    1 +
 983  drivers/infiniband/core/ud_header.c                |    1 +
 984  drivers/infiniband/core/umem.c                     |    1 +
 985  drivers/infiniband/core/uverbs_marshall.c          |    1 +
 986  drivers/infiniband/core/verbs.c                    |    1 +
 987  drivers/infiniband/hw/cxgb4/qp.c                   |    3 +
 988  drivers/infiniband/hw/ipath/ipath_diag.c           |    1 +
 989  drivers/infiniband/hw/ipath/ipath_driver.c         |    1 +
 990  drivers/infiniband/hw/ipath/ipath_file_ops.c       |    1 +
 991  drivers/infiniband/hw/ipath/ipath_init_chip.c      |    1 +
 992  drivers/infiniband/hw/ipath/ipath_sysfs.c          |    1 +
 993  drivers/infiniband/hw/ipath/ipath_verbs.c          |    1 +
 994  drivers/infiniband/hw/mthca/mthca_catas.c          |    1 +
 995  drivers/infiniband/hw/mthca/mthca_cmd.c            |    1 +
 996  drivers/infiniband/hw/mthca/mthca_provider.c       |    2 +
 997  drivers/infiniband/hw/qib/qib_diag.c               |    1 +
 998  drivers/infiniband/hw/qib/qib_driver.c             |    1 +
 999  drivers/infiniband/hw/qib/qib_file_ops.c           |    1 +
1000  drivers/infiniband/hw/qib/qib_iba7220.c            |    1 +
1001  drivers/infiniband/hw/qib/qib_iba7322.c            |    1 +
1002  drivers/infiniband/hw/qib/qib_init.c               |    1 +
1003  drivers/infiniband/hw/qib/qib_pcie.c               |    1 +
1004  drivers/infiniband/hw/qib/qib_sd7220.c             |    1 +
1005  drivers/infiniband/hw/qib/qib_sdma.c               |    1 +
1006  drivers/infiniband/hw/qib/qib_tx.c                 |    1 +
1007  drivers/infiniband/hw/qib/qib_verbs.c              |    1 +
1008  drivers/infiniband/ulp/ipoib/ipoib_cm.c            |    1 +
1009  drivers/infiniband/ulp/ipoib/ipoib_fs.c            |    1 +
1010  drivers/infiniband/ulp/ipoib/ipoib_ib.c            |    1 +
1011  drivers/infiniband/ulp/ipoib/ipoib_multicast.c     |    1 +
1012  drivers/infiniband/ulp/iser/iscsi_iser.c           |    1 +
1013  drivers/input/input-compat.c                       |    1 +
1014  drivers/input/input-mt.c                           |    1 +
1015  drivers/input/input-polldev.c                      |    1 +
1016  drivers/input/joystick/as5011.c                    |    1 +
1017  drivers/input/keyboard/nomadik-ske-keypad.c        |    1 +
1018  drivers/input/keyboard/tnetv107x-keypad.c          |    1 +
1019  drivers/input/misc/ad714x.c                        |    1 +
1020  drivers/input/misc/adxl34x.c                       |    1 +
1021  drivers/input/misc/ati_remote2.c                   |    1 +
1022  drivers/input/misc/cma3000_d0x.c                   |    1 +
1023  drivers/input/misc/dm355evm_keys.c                 |    1 +
1024  drivers/input/sparse-keymap.c                      |    1 +
1025  drivers/input/touchscreen/ad7877.c                 |    1 +
1026  drivers/input/touchscreen/ad7879-spi.c             |    1 +
1027  drivers/input/touchscreen/ad7879.c                 |    1 +
1028  drivers/input/touchscreen/ads7846.c                |    1 +
1029  drivers/input/touchscreen/bu21013_ts.c             |    1 +
1030  drivers/iommu/intel-iommu.c                        |    1 +
1031  drivers/isdn/capi/kcapi_proc.c                     |    1 +
1032  drivers/isdn/gigaset/asyncdata.c                   |    1 +
1033  drivers/isdn/gigaset/capi.c                        |    1 +
1034  drivers/isdn/gigaset/dummyll.c                     |    1 +
1035  drivers/isdn/gigaset/ev-layer.c                    |    1 +
1036  drivers/isdn/gigaset/i4l.c                         |    1 +
1037  drivers/isdn/gigaset/interface.c                   |    1 +
1038  drivers/isdn/hardware/mISDN/mISDNisar.c            |    1 +
1039  drivers/isdn/i4l/isdn_tty.c                        |    1 +
1040  drivers/isdn/mISDN/clock.c                         |    1 +
1041  drivers/isdn/mISDN/dsp_audio.c                     |    1 +
1042  drivers/isdn/mISDN/dsp_pipeline.c                  |    1 +
1043  drivers/isdn/mISDN/socket.c                        |    1 +
1044  drivers/leds/dell-led.c                            |    1 +
1045  drivers/leds/leds-88pm860x.c                       |    1 +
1046  drivers/leds/leds-asic3.c                          |    1 +
1047  drivers/leds/leds-atmel-pwm.c                      |    1 +
1048  drivers/leds/leds-cobalt-raq.c                     |    1 +
1049  drivers/leds/leds-fsg.c                            |    1 +
1050  drivers/leds/leds-gpio.c                           |    1 +
1051  drivers/leds/leds-lm3530.c                         |    1 +
1052  drivers/leds/leds-locomo.c                         |    1 +
1053  drivers/leds/leds-lt3593.c                         |    1 +
1054  drivers/leds/leds-net48xx.c                        |    1 +
1055  drivers/leds/leds-net5501.c                        |    1 +
1056  drivers/leds/leds-ns2.c                            |    1 +
1057  drivers/leds/leds-s3c24xx.c                        |    1 +
1058  drivers/leds/leds-wm831x-status.c                  |    1 +
1059  drivers/leds/leds-wm8350.c                         |    1 +
1060  drivers/leds/leds-wrap.c                           |    1 +
1061  drivers/lguest/lguest_device.c                     |    1 +
1062  drivers/lguest/lguest_user.c                       |    1 +
1063  drivers/md/dm-bufio.c                              |    1 +
1064  drivers/md/dm-exception-store.c                    |    1 +
1065  drivers/md/dm-log-userspace-base.c                 |    1 +
1066  drivers/md/dm-path-selector.c                      |    1 +
1067  drivers/md/dm-raid.c                               |    1 +
1068  drivers/md/dm-round-robin.c                        |    1 +
1069  drivers/md/dm-service-time.c                       |    1 +
1070  drivers/md/dm-snap-persistent.c                    |    1 +
1071  drivers/md/dm-snap-transient.c                     |    1 +
1072  drivers/md/dm-uevent.c                             |    1 +
1073  drivers/md/faulty.c                                |    1 +
1074  drivers/md/linear.c                                |    1 +
1075  drivers/md/md.c                                    |    1 +
1076  drivers/md/multipath.c                             |    1 +
1077  drivers/md/persistent-data/dm-btree-remove.c       |    2 +-
1078  drivers/md/persistent-data/dm-btree.c              |    2 +-
1079  drivers/md/persistent-data/dm-space-map-checker.c  |    1 +
1080  drivers/md/persistent-data/dm-space-map-disk.c     |    2 +-
1081  .../md/persistent-data/dm-transaction-manager.c    |    2 +-
1082  drivers/md/raid0.c                                 |    1 +
1083  drivers/md/raid1.c                                 |    1 +
1084  drivers/md/raid10.c                                |    1 +
1085  drivers/md/raid5.c                                 |    1 +
1086  drivers/media/common/saa7146_core.c                |    1 +
1087  drivers/media/common/saa7146_fops.c                |    1 +
1088  drivers/media/common/saa7146_hlp.c                 |    1 +
1089  drivers/media/common/saa7146_video.c               |    1 +
1090  drivers/media/common/tuners/tuner-types.c          |    1 +
1091  drivers/media/dvb/frontends/dibx000_common.c       |    1 +
1092  drivers/media/dvb/siano/sms-cards.c                |    1 +
1093  drivers/media/dvb/siano/smsendian.c                |    1 +
1094  drivers/media/dvb/siano/smssdio.c                  |    1 +
1095  drivers/media/dvb/siano/smsusb.c                   |    1 +
1096  drivers/media/media-device.c                       |    1 +
1097  drivers/media/radio/radio-timb.c                   |    1 +
1098  drivers/media/radio/radio-wl1273.c                 |    1 +
1099  drivers/media/radio/si4713-i2c.c                   |    1 +
1100  drivers/media/radio/wl128x/fmdrv_v4l2.c            |    2 +
1101  drivers/media/rc/ir-jvc-decoder.c                  |    1 +
1102  drivers/media/rc/ir-lirc-codec.c                   |    1 +
1103  drivers/media/rc/ir-nec-decoder.c                  |    1 +
1104  drivers/media/rc/ir-raw.c                          |    2 +
1105  drivers/media/rc/ir-rc5-decoder.c                  |    1 +
1106  drivers/media/rc/ir-rc5-sz-decoder.c               |    1 +
1107  drivers/media/rc/ir-rc6-decoder.c                  |    1 +
1108  drivers/media/rc/ir-sony-decoder.c                 |    1 +
1109  drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c    |    1 +
1110  drivers/media/rc/keymaps/rc-alink-dtu-m.c          |    1 +
1111  drivers/media/rc/keymaps/rc-anysee.c               |    1 +
1112  drivers/media/rc/keymaps/rc-apac-viewcomp.c        |    1 +
1113  drivers/media/rc/keymaps/rc-asus-pc39.c            |    1 +
1114  drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c |    1 +
1115  drivers/media/rc/keymaps/rc-avermedia-a16d.c       |    1 +
1116  drivers/media/rc/keymaps/rc-avermedia-cardbus.c    |    1 +
1117  drivers/media/rc/keymaps/rc-avermedia-dvbt.c       |    1 +
1118  drivers/media/rc/keymaps/rc-avermedia-m135a.c      |    1 +
1119  .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c    |    1 +
1120  drivers/media/rc/keymaps/rc-avermedia-rm-ks.c      |    1 +
1121  drivers/media/rc/keymaps/rc-avermedia.c            |    1 +
1122  drivers/media/rc/keymaps/rc-avertv-303.c           |    1 +
1123  drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c   |    1 +
1124  drivers/media/rc/keymaps/rc-behold-columbus.c      |    1 +
1125  drivers/media/rc/keymaps/rc-behold.c               |    1 +
1126  drivers/media/rc/keymaps/rc-budget-ci-old.c        |    1 +
1127  drivers/media/rc/keymaps/rc-cinergy-1400.c         |    1 +
1128  drivers/media/rc/keymaps/rc-cinergy.c              |    1 +
1129  drivers/media/rc/keymaps/rc-dib0700-nec.c          |    1 +
1130  drivers/media/rc/keymaps/rc-dib0700-rc5.c          |    1 +
1131  drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c  |    1 +
1132  drivers/media/rc/keymaps/rc-digittrade.c           |    1 +
1133  drivers/media/rc/keymaps/rc-dm1105-nec.c           |    1 +
1134  drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c      |    1 +
1135  drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c   |    1 +
1136  drivers/media/rc/keymaps/rc-em-terratec.c          |    1 +
1137  drivers/media/rc/keymaps/rc-encore-enltv-fm53.c    |    1 +
1138  drivers/media/rc/keymaps/rc-encore-enltv.c         |    1 +
1139  drivers/media/rc/keymaps/rc-encore-enltv2.c        |    1 +
1140  drivers/media/rc/keymaps/rc-evga-indtube.c         |    1 +
1141  drivers/media/rc/keymaps/rc-eztv.c                 |    1 +
1142  drivers/media/rc/keymaps/rc-flydvb.c               |    1 +
1143  drivers/media/rc/keymaps/rc-flyvideo.c             |    1 +
1144  drivers/media/rc/keymaps/rc-fusionhdtv-mce.c       |    1 +
1145  drivers/media/rc/keymaps/rc-gadmei-rm008z.c        |    1 +
1146  drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c   |    1 +
1147  drivers/media/rc/keymaps/rc-gotview7135.c          |    1 +
1148  drivers/media/rc/keymaps/rc-hauppauge.c            |    1 +
1149  drivers/media/rc/keymaps/rc-imon-mce.c             |    1 +
1150  drivers/media/rc/keymaps/rc-imon-pad.c             |    1 +
1151  drivers/media/rc/keymaps/rc-iodata-bctv7e.c        |    1 +
1152  drivers/media/rc/keymaps/rc-kaiomy.c               |    1 +
1153  drivers/media/rc/keymaps/rc-kworld-315u.c          |    1 +
1154  .../media/rc/keymaps/rc-kworld-plus-tv-analog.c    |    1 +
1155  drivers/media/rc/keymaps/rc-leadtek-y04g0051.c     |    1 +
1156  drivers/media/rc/keymaps/rc-lirc.c                 |    1 +
1157  drivers/media/rc/keymaps/rc-lme2510.c              |    1 +
1158  drivers/media/rc/keymaps/rc-manli.c                |    1 +
1159  drivers/media/rc/keymaps/rc-msi-digivox-ii.c       |    1 +
1160  drivers/media/rc/keymaps/rc-msi-digivox-iii.c      |    1 +
1161  drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c  |    1 +
1162  drivers/media/rc/keymaps/rc-msi-tvanywhere.c       |    1 +
1163  drivers/media/rc/keymaps/rc-nebula.c               |    1 +
1164  .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c  |    1 +
1165  drivers/media/rc/keymaps/rc-norwood.c              |    1 +
1166  drivers/media/rc/keymaps/rc-npgtech.c              |    1 +
1167  drivers/media/rc/keymaps/rc-pctv-sedna.c           |    1 +
1168  drivers/media/rc/keymaps/rc-pinnacle-color.c       |    1 +
1169  drivers/media/rc/keymaps/rc-pinnacle-grey.c        |    1 +
1170  drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c     |    1 +
1171  drivers/media/rc/keymaps/rc-pixelview-002t.c       |    1 +
1172  drivers/media/rc/keymaps/rc-pixelview-mk12.c       |    1 +
1173  drivers/media/rc/keymaps/rc-pixelview-new.c        |    1 +
1174  drivers/media/rc/keymaps/rc-pixelview.c            |    1 +
1175  .../media/rc/keymaps/rc-powercolor-real-angel.c    |    1 +
1176  drivers/media/rc/keymaps/rc-proteus-2309.c         |    1 +
1177  drivers/media/rc/keymaps/rc-purpletv.c             |    1 +
1178  drivers/media/rc/keymaps/rc-pv951.c                |    1 +
1179  drivers/media/rc/keymaps/rc-rc6-mce.c              |    1 +
1180  .../media/rc/keymaps/rc-real-audio-220-32-keys.c   |    1 +
1181  drivers/media/rc/keymaps/rc-streamzap.c            |    1 +
1182  drivers/media/rc/keymaps/rc-tbs-nec.c              |    1 +
1183  drivers/media/rc/keymaps/rc-technisat-usb2.c       |    1 +
1184  drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c  |    1 +
1185  drivers/media/rc/keymaps/rc-terratec-slim-2.c      |    1 +
1186  drivers/media/rc/keymaps/rc-terratec-slim.c        |    1 +
1187  drivers/media/rc/keymaps/rc-tevii-nec.c            |    1 +
1188  drivers/media/rc/keymaps/rc-tivo.c                 |    1 +
1189  drivers/media/rc/keymaps/rc-total-media-in-hand.c  |    1 +
1190  drivers/media/rc/keymaps/rc-trekstor.c             |    1 +
1191  drivers/media/rc/keymaps/rc-tt-1500.c              |    1 +
1192  drivers/media/rc/keymaps/rc-twinhan1027.c          |    1 +
1193  drivers/media/rc/keymaps/rc-videomate-m1f.c        |    1 +
1194  drivers/media/rc/keymaps/rc-videomate-s350.c       |    1 +
1195  drivers/media/rc/keymaps/rc-videomate-tv-pvr.c     |    1 +
1196  drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c |    1 +
1197  drivers/media/rc/keymaps/rc-winfast.c              |    1 +
1198  drivers/media/rc/rc-main.c                         |    1 +
1199  drivers/media/video/adp1653.c                      |    1 +
1200  drivers/media/video/ak881x.c                       |    1 +
1201  drivers/media/video/cpia2/cpia2_usb.c              |    1 +
1202  drivers/media/video/cx25840/cx25840-ir.c           |    1 +
1203  drivers/media/video/davinci/dm355_ccdc.c           |    1 +
1204  drivers/media/video/davinci/dm644x_ccdc.c          |    1 +
1205  drivers/media/video/hdpvr/hdpvr-i2c.c              |    1 +
1206  drivers/media/video/hexium_gemini.c                |    1 +
1207  drivers/media/video/hexium_orion.c                 |    1 +
1208  drivers/media/video/imx074.c                       |    1 +
1209  drivers/media/video/m5mols/m5mols_core.c           |    1 +
1210  drivers/media/video/mt9m001.c                      |    1 +
1211  drivers/media/video/mt9m111.c                      |    1 +
1212  drivers/media/video/mt9t031.c                      |    1 +
1213  drivers/media/video/mt9v011.c                      |    1 +
1214  drivers/media/video/mt9v022.c                      |    1 +
1215  drivers/media/video/mt9v032.c                      |    1 +
1216  drivers/media/video/mxb.c                          |    1 +
1217  drivers/media/video/noon010pc30.c                  |    1 +
1218  drivers/media/video/omap24xxcam.c                  |    1 +
1219  drivers/media/video/ov6650.c                       |    1 +
1220  drivers/media/video/pvrusb2/pvrusb2-devattr.c      |    1 +
1221  drivers/media/video/pvrusb2/pvrusb2-hdw.c          |    1 +
1222  drivers/media/video/pvrusb2/pvrusb2-i2c-core.c     |    1 +
1223  drivers/media/video/pvrusb2/pvrusb2-v4l2.c         |    1 +
1224  drivers/media/video/rj54n1cb0c.c                   |    1 +
1225  drivers/media/video/sh_mobile_csi2.c               |    1 +
1226  drivers/media/video/sh_vou.c                       |    1 +
1227  drivers/media/video/sr030pc30.c                    |    1 +
1228  drivers/media/video/tcm825x.c                      |    1 +
1229  drivers/media/video/timblogiw.c                    |    1 +
1230  drivers/media/video/tvp514x.c                      |    1 +
1231  drivers/media/video/tvp5150.c                      |    1 +
1232  drivers/media/video/tvp7002.c                      |    1 +
1233  drivers/media/video/usbvision/usbvision-cards.c    |    1 +
1234  drivers/media/video/v4l2-ctrls.c                   |    1 +
1235  drivers/media/video/v4l2-device.c                  |    1 +
1236  drivers/media/video/v4l2-event.c                   |    1 +
1237  drivers/media/video/v4l2-fh.c                      |    1 +
1238  drivers/media/video/v4l2-int-device.c              |    1 +
1239  drivers/media/video/v4l2-subdev.c                  |    1 +
1240  drivers/memstick/core/memstick.c                   |    1 +
1241  drivers/memstick/core/mspro_block.c                |    1 +
1242  drivers/memstick/host/jmb38x_ms.c                  |    1 +
1243  drivers/memstick/host/tifm_ms.c                    |    1 +
1244  drivers/message/i2o/pci.c                          |    1 +
1245  drivers/mfd/ab3100-core.c                          |    1 +
1246  drivers/mfd/ab8500-debugfs.c                       |    1 +
1247  drivers/mfd/ab8500-sysctrl.c                       |    1 +
1248  drivers/mfd/abx500-core.c                          |    1 +
1249  drivers/mfd/asic3.c                                |    1 +
1250  drivers/mfd/dm355evm_msp.c                         |    1 +
1251  drivers/mfd/max8997.c                              |    1 +
1252  drivers/mfd/mfd-core.c                             |    1 +
1253  drivers/mfd/pcf50633-irq.c                         |    1 +
1254  drivers/mfd/tmio_core.c                            |    1 +
1255  drivers/mfd/twl-core.c                             |    1 +
1256  drivers/mfd/twl6030-irq.c                          |    1 +
1257  drivers/mfd/wl1273-core.c                          |    1 +
1258  drivers/mfd/wm8400-core.c                          |    1 +
1259  drivers/misc/ab8500-pwm.c                          |    1 +
1260  drivers/misc/atmel-ssc.c                           |    1 +
1261  drivers/misc/atmel_tclib.c                         |    1 +
1262  drivers/misc/bh1780gli.c                           |    1 +
1263  drivers/misc/kgdbts.c                              |    1 +
1264  drivers/misc/sgi-gru/grukservices.c                |    1 +
1265  drivers/misc/ti-st/st_kim.c                        |    1 +
1266  drivers/misc/tifm_7xx1.c                           |    1 +
1267  drivers/misc/tifm_core.c                           |    1 +
1268  drivers/mmc/core/bus.c                             |    2 +
1269  drivers/mmc/core/debugfs.c                         |    1 +
1270  drivers/mmc/core/host.c                            |    1 +
1271  drivers/mmc/core/mmc.c                             |    1 +
1272  drivers/mmc/core/mmc_ops.c                         |    1 +
1273  drivers/mmc/core/quirks.c                          |    1 +
1274  drivers/mmc/core/sd.c                              |    1 +
1275  drivers/mmc/core/sd_ops.c                          |    1 +
1276  drivers/mmc/core/sdio_bus.c                        |    1 +
1277  drivers/mmc/core/sdio_io.c                         |    1 +
1278  drivers/mmc/core/sdio_irq.c                        |    1 +
1279  drivers/mmc/host/sdhci-tegra.c                     |    1 +
1280  drivers/mtd/Kconfig                                |   21 +-
1281  drivers/mtd/Makefile                               |    2 +-
1282  drivers/mtd/afs.c                                  |    4 +-
1283  drivers/mtd/ar7part.c                              |    3 +-
1284  drivers/mtd/chips/cfi_cmdset_0002.c                |   31 +-
1285  drivers/mtd/chips/fwh_lock.h                       |    3 +-
1286  drivers/mtd/chips/jedec_probe.c                    |   34 +-
1287  drivers/mtd/cmdlinepart.c                          |    8 +-
1288  drivers/mtd/devices/Kconfig                        |   13 +-
1289  drivers/mtd/devices/Makefile                       |    3 +
1290  drivers/mtd/devices/doc2000.c                      |   17 +-
1291  drivers/mtd/devices/doc2001.c                      |   11 +-
1292  drivers/mtd/devices/doc2001plus.c                  |   11 +-
1293  drivers/mtd/devices/docecc.c                       |    2 +-
1294  drivers/mtd/devices/docg3.c                        | 1114 +++++++++
1295  drivers/mtd/devices/docg3.h                        |  297 +++
1296  drivers/mtd/devices/docprobe.c                     |    5 -
1297  drivers/mtd/devices/lart.c                         |   18 +-
1298  drivers/mtd/devices/m25p80.c                       |   92 +-
1299  drivers/mtd/devices/mtd_dataflash.c                |   91 +-
1300  drivers/mtd/devices/sst25l.c                       |   42 +-
1301  drivers/mtd/ftl.c                                  |   40 +-
1302  drivers/mtd/inftlcore.c                            |   69 +-
1303  drivers/mtd/inftlmount.c                           |  116 +-
1304  drivers/mtd/lpddr/lpddr_cmds.c                     |    1 +
1305  drivers/mtd/maps/Kconfig                           |   26 -
1306  drivers/mtd/maps/Makefile                          |    2 -
1307  drivers/mtd/maps/bfin-async-flash.c                |   16 +-
1308  drivers/mtd/maps/ceiva.c                           |  341 ---
1309  drivers/mtd/maps/dc21285.c                         |    9 +-
1310  drivers/mtd/maps/edb7312.c                         |  134 --
1311  drivers/mtd/maps/gpio-addr-flash.c                 |   16 +-
1312  drivers/mtd/maps/h720x-flash.c                     |   23 +-
1313  drivers/mtd/maps/impa7.c                           |   28 +-
1314  drivers/mtd/maps/intel_vr_nor.c                    |    7 +-
1315  drivers/mtd/maps/ixp2000.c                         |   11 +-
1316  drivers/mtd/maps/ixp4xx.c                          |   29 +-
1317  drivers/mtd/maps/lantiq-flash.c                    |   17 +-
1318  drivers/mtd/maps/latch-addr-flash.c                |   24 +-
1319  drivers/mtd/maps/pcmciamtd.c                       |  124 +-
1320  drivers/mtd/maps/physmap.c                         |   38 +-
1321  drivers/mtd/maps/physmap_of.c                      |   80 +-
1322  drivers/mtd/maps/plat-ram.c                        |   23 +-
1323  drivers/mtd/maps/pxa2xx-flash.c                    |   20 +-
1324  drivers/mtd/maps/rbtx4939-flash.c                  |   24 +-
1325  drivers/mtd/maps/sa1100-flash.c                    |   30 +-
1326  drivers/mtd/maps/solutionengine.c                  |   30 +-
1327  drivers/mtd/maps/wr_sbc82xx_flash.c                |   33 +-
1328  drivers/mtd/mtd_blkdevs.c                          |    2 +
1329  drivers/mtd/mtdblock.c                             |   18 +-
1330  drivers/mtd/mtdblock_ro.c                          |    1 +
1331  drivers/mtd/mtdchar.c                              |  162 +-
1332  drivers/mtd/mtdconcat.c                            |   10 +-
1333  drivers/mtd/mtdcore.c                              |   70 +-
1334  drivers/mtd/mtdcore.h                              |    3 +
1335  drivers/mtd/mtdoops.c                              |    2 +-
1336  drivers/mtd/mtdpart.c                              |   62 +-
1337  drivers/mtd/mtdsuper.c                             |   21 +-
1338  drivers/mtd/mtdswap.c                              |   31 +-
1339  drivers/mtd/nand/Kconfig                           |   29 +-
1340  drivers/mtd/nand/Makefile                          |    2 +-
1341  drivers/mtd/nand/atmel_nand.c                      |   74 +-
1342  drivers/mtd/nand/au1550nd.c                        |   29 +-
1343  drivers/mtd/nand/autcpu12.c                        |    4 +-
1344  drivers/mtd/nand/bcm_umi_nand.c                    |   57 +-
1345  drivers/mtd/nand/cafe_nand.c                       |   22 +-
1346  drivers/mtd/nand/cmx270_nand.c                     |   24 +-
1347  drivers/mtd/nand/cs553x_nand.c                     |   15 +-
1348  drivers/mtd/nand/davinci_nand.c                    |   39 +-
1349  drivers/mtd/nand/denali.c                          |    6 +-
1350  drivers/mtd/nand/diskonchip.c                      |    9 +-
1351  drivers/mtd/nand/edb7312.c                         |  203 --
1352  drivers/mtd/nand/fsl_elbc_nand.c                   |   75 +-
1353  drivers/mtd/nand/fsl_upm.c                         |   16 +-
1354  drivers/mtd/nand/fsmc_nand.c                       |   77 +-
1355  drivers/mtd/nand/gpmi-nand/Makefile                |    3 +
1356  drivers/mtd/nand/gpmi-nand/bch-regs.h              |   84 +
1357  drivers/mtd/nand/gpmi-nand/gpmi-lib.c              | 1057 +++++++++
1358  drivers/mtd/nand/gpmi-nand/gpmi-nand.c             | 1619 +++++++++++++
1359  drivers/mtd/nand/gpmi-nand/gpmi-nand.h             |  273 +++
1360  drivers/mtd/nand/gpmi-nand/gpmi-regs.h             |  172 ++
1361  drivers/mtd/nand/h1910.c                           |   19 +-
1362  drivers/mtd/nand/jz4740_nand.c                     |   18 +-
1363  drivers/mtd/nand/mpc5121_nfc.c                     |   22 +-
1364  drivers/mtd/nand/mxc_nand.c                        |   37 +-
1365  drivers/mtd/nand/nand_base.c                       | 1109 +++++-----
1366  drivers/mtd/nand/nand_bbt.c                        |  693 +++---
1367  drivers/mtd/nand/nand_bch.c                        |    4 +-
1368  drivers/mtd/nand/nand_ecc.c                        |   10 +-
1369  drivers/mtd/nand/nandsim.c                         |    4 +-
1370  drivers/mtd/nand/ndfc.c                            |   22 +-
1371  drivers/mtd/nand/nomadik_nand.c                    |    1 +
1372  drivers/mtd/nand/nuc900_nand.c                     |    1 +
1373  drivers/mtd/nand/omap2.c                           |   23 +-
1374  drivers/mtd/nand/orion_nand.c                      |   16 +-
1375  drivers/mtd/nand/pasemi_nand.c                     |    3 +-
1376  drivers/mtd/nand/plat_nand.c                       |   25 +-
1377  drivers/mtd/nand/ppchameleonevb.c                  |   47 +-
1378  drivers/mtd/nand/pxa3xx_nand.c                     |  471 +++--
1379  drivers/mtd/nand/r852.c                            |    6 +-
1380  drivers/mtd/nand/rtc_from4.c                       |    5 +-
1381  drivers/mtd/nand/s3c2410.c                         |   27 +-
1382  drivers/mtd/nand/sharpsl.c                         |   13 +-
1383  drivers/mtd/nand/sm_common.c                       |    3 +-
1384  drivers/mtd/nand/socrates_nand.c                   |   28 +-
1385  drivers/mtd/nand/tmio_nand.c                       |   17 +-
1386  drivers/mtd/nand/txx9ndfmc.c                       |    8 +-
1387  drivers/mtd/nftlcore.c                             |   37 +-
1388  drivers/mtd/nftlmount.c                            |   26 +-
1389  drivers/mtd/ofpart.c                               |  112 +-
1390  drivers/mtd/onenand/generic.c                      |   14 +-
1391  drivers/mtd/onenand/omap2.c                        |   16 +-
1392  drivers/mtd/onenand/onenand_base.c                 |  114 +-
1393  drivers/mtd/onenand/onenand_bbt.c                  |    9 +-
1394  drivers/mtd/onenand/samsung.c                      |   13 +-
1395  drivers/mtd/redboot.c                              |   17 +-
1396  drivers/mtd/rfd_ftl.c                              |    1 +
1397  drivers/mtd/sm_ftl.c                               |   26 +-
1398  drivers/mtd/ssfdc.c                                |   46 +-
1399  drivers/mtd/tests/mtd_oobtest.c                    |   33 +-
1400  drivers/mtd/tests/mtd_pagetest.c                   |   37 +-
1401  drivers/mtd/tests/mtd_readtest.c                   |   13 +-
1402  drivers/mtd/tests/mtd_speedtest.c                  |   17 +-
1403  drivers/mtd/tests/mtd_stresstest.c                 |   11 +-
1404  drivers/mtd/tests/mtd_subpagetest.c                |   17 +-
1405  drivers/mtd/tests/mtd_torturetest.c                |   11 +-
1406  drivers/mtd/ubi/eba.c                              |    2 +-
1407  drivers/mtd/ubi/io.c                               |   24 +-
1408  drivers/mtd/ubi/kapi.c                             |    2 +-
1409  drivers/mtd/ubi/misc.c                             |    2 +-
1410  drivers/mtd/ubi/scan.c                             |    4 +-
1411  drivers/mtd/ubi/vmt.c                              |    1 +
1412  drivers/mtd/ubi/vtbl.c                             |    2 +-
1413  drivers/net/bonding/bond_main.c                    |    4 +-
1414  drivers/net/bonding/bond_procfs.c                  |    5 +-
1415  drivers/net/ethernet/broadcom/tg3.c                |  195 +-
1416  drivers/net/ethernet/broadcom/tg3.h                |   21 +-
1417  drivers/net/ethernet/brocade/bna/bnad.c            |    1 +
1418  drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c |    1 +
1419  drivers/net/ethernet/chelsio/cxgb3/l2t.c           |    1 +
1420  drivers/net/ethernet/chelsio/cxgb4/l2t.c           |    7 +-
1421  drivers/net/ethernet/chelsio/cxgb4/sge.c           |    1 +
1422  drivers/net/ethernet/emulex/benet/be_main.c        |    1 +
1423  drivers/net/ethernet/ethoc.c                       |    1 +
1424  drivers/net/ethernet/freescale/Kconfig             |    3 +-
1425  drivers/net/ethernet/freescale/ucc_geth.c          |    1 +
1426  drivers/net/ethernet/intel/Kconfig                 |    6 +-
1427  drivers/net/ethernet/intel/e1000e/param.c          |    1 +
1428  drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c     |    2 +
1429  drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h     |    4 +-
1430  drivers/net/ethernet/marvell/sky2.c                |   11 -
1431  drivers/net/ethernet/mellanox/mlx4/alloc.c         |    1 +
1432  drivers/net/ethernet/mellanox/mlx4/catas.c         |    1 +
1433  drivers/net/ethernet/mellanox/mlx4/cmd.c           |    1 +
1434  drivers/net/ethernet/mellanox/mlx4/cq.c            |    1 +
1435  drivers/net/ethernet/mellanox/mlx4/en_tx.c         |    1 +
1436  drivers/net/ethernet/mellanox/mlx4/eq.c            |    1 +
1437  drivers/net/ethernet/mellanox/mlx4/fw.c            |    1 +
1438  drivers/net/ethernet/mellanox/mlx4/intf.c          |    1 +
1439  drivers/net/ethernet/mellanox/mlx4/mcg.c           |    1 +
1440  drivers/net/ethernet/mellanox/mlx4/mr.c            |    1 +
1441  drivers/net/ethernet/mellanox/mlx4/pd.c            |    1 +
1442  drivers/net/ethernet/mellanox/mlx4/port.c          |    1 +
1443  drivers/net/ethernet/mellanox/mlx4/qp.c            |    1 +
1444  drivers/net/ethernet/mellanox/mlx4/srq.c           |    1 +
1445  drivers/net/ethernet/natsemi/Kconfig               |    5 +-
1446  drivers/net/ethernet/neterion/vxge/vxge-main.c     |    1 +
1447  drivers/net/ethernet/nvidia/forcedeth.c            |   88 +-
1448  drivers/net/ethernet/octeon/octeon_mgmt.c          |    1 +
1449  .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c   |    1 +
1450  .../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c  |    1 +
1451  drivers/net/ethernet/sfc/rx.c                      |    1 +
1452  drivers/net/ethernet/smsc/smsc9420.c               |    1 +
1453  drivers/net/ethernet/stmicro/stmmac/Kconfig        |    9 -
1454  drivers/net/ethernet/toshiba/ps3_gelic_net.c       |    3 +
1455  drivers/net/ethernet/toshiba/ps3_gelic_net.h       |    6 +
1456  drivers/net/ethernet/xscale/ixp4xx_eth.c           |    1 +
1457  drivers/net/macvlan.c                              |    7 +
1458  drivers/net/phy/realtek.c                          |    1 +
1459  drivers/net/usb/lg-vl600.c                         |    1 +
1460  drivers/net/usb/usbnet.c                           |    3 +-
1461  drivers/net/veth.c                                 |    1 +
1462  drivers/net/vmxnet3/vmxnet3_drv.c                  |    1 +
1463  drivers/net/wimax/i2400m/control.c                 |    2 +
1464  drivers/net/wimax/i2400m/debugfs.c                 |    1 +
1465  drivers/net/wimax/i2400m/fw.c                      |    1 +
1466  drivers/net/wimax/i2400m/netdev.c                  |    1 +
1467  drivers/net/wimax/i2400m/rx.c                      |    2 +
1468  drivers/net/wimax/i2400m/sdio.c                    |    1 +
1469  drivers/net/wimax/i2400m/tx.c                      |    1 +
1470  drivers/net/wimax/i2400m/usb.c                     |    1 +
1471  drivers/net/wireless/adm8211.c                     |    1 +
1472  drivers/net/wireless/ath/ath5k/debug.c             |    3 +-
1473  drivers/net/wireless/ath/ath5k/pci.c               |    1 +
1474  drivers/net/wireless/ath/ath6kl/cfg80211.c         |    2 +
1475  drivers/net/wireless/ath/ath6kl/debug.c            |    1 +
1476  drivers/net/wireless/ath/ath6kl/sdio.c             |    1 +
1477  drivers/net/wireless/ath/ath9k/ahb.c               |    1 +
1478  drivers/net/wireless/ath/ath9k/ani.c               |    1 +
1479  drivers/net/wireless/ath/ath9k/ar9002_calib.c      |    4 -
1480  drivers/net/wireless/ath/ath9k/ar9002_hw.c         |    1 +
1481  drivers/net/wireless/ath/ath9k/ar9002_mac.c        |    1 +
1482  drivers/net/wireless/ath/ath9k/ar9003_calib.c      |   11 +-
1483  drivers/net/wireless/ath/ath9k/ar9003_mac.c        |    1 +
1484  drivers/net/wireless/ath/ath9k/ar9003_paprd.c      |    1 +
1485  drivers/net/wireless/ath/ath9k/ar9003_phy.c        |    1 +
1486  drivers/net/wireless/ath/ath9k/ar9003_phy.h        |   34 +-
1487  drivers/net/wireless/ath/ath9k/ar9485_initvals.h   |   10 +-
1488  drivers/net/wireless/ath/ath9k/btcoex.c            |    1 +
1489  drivers/net/wireless/ath/ath9k/calib.c             |    1 +
1490  drivers/net/wireless/ath/ath9k/debug.c             |    1 +
1491  drivers/net/wireless/ath/ath9k/hw.c                |    4 +
1492  drivers/net/wireless/ath/ath9k/init.c              |    1 +
1493  drivers/net/wireless/ath/ath9k/mac.c               |    1 +
1494  drivers/net/wireless/ath/ath9k/pci.c               |    1 +
1495  drivers/net/wireless/ath/ath9k/rc.c                |    1 +
1496  drivers/net/wireless/ath/carl9170/fw.c             |    1 +
1497  drivers/net/wireless/ath/carl9170/tx.c             |   11 +-
1498  drivers/net/wireless/ath/debug.c                   |    1 +
1499  drivers/net/wireless/ath/hw.c                      |    1 +
1500  drivers/net/wireless/ath/key.c                     |    1 +
1501  drivers/net/wireless/ath/regd.c                    |    1 +
1502  drivers/net/wireless/b43/main.c                    |    2 +-
1503  drivers/net/wireless/b43/pcmcia.c                  |    1 +
1504  drivers/net/wireless/b43/xmit.c                    |    1 -
1505  drivers/net/wireless/b43legacy/main.c              |    2 +-
1506  drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c   |    1 +
1507  .../net/wireless/brcm80211/brcmsmac/mac80211_if.c  |    1 +
1508  drivers/net/wireless/hostap/hostap_80211_rx.c      |    1 +
1509  drivers/net/wireless/hostap/hostap_80211_tx.c      |    1 +
1510  drivers/net/wireless/hostap/hostap_ap.c            |    2 +
1511  drivers/net/wireless/hostap/hostap_info.c          |    1 +
1512  drivers/net/wireless/hostap/hostap_ioctl.c         |    1 +
1513  drivers/net/wireless/hostap/hostap_proc.c          |    1 +
1514  drivers/net/wireless/iwlegacy/iwl-debugfs.c        |    1 +
1515  drivers/net/wireless/iwlegacy/iwl-rx.c             |    1 +
1516  drivers/net/wireless/iwlegacy/iwl-scan.c           |    1 +
1517  drivers/net/wireless/iwlegacy/iwl-sta.c            |    1 +
1518  drivers/net/wireless/iwlegacy/iwl-tx.c             |    1 +
1519  drivers/net/wireless/iwlwifi/iwl-core.c            |   10 -
1520  drivers/net/wireless/iwlwifi/iwl-pci.c             |    9 +-
1521  drivers/net/wireless/iwlwifi/iwl-trans-pcie.c      |   12 +-
1522  drivers/net/wireless/iwmc3200wifi/commands.c       |    1 +
1523  drivers/net/wireless/iwmc3200wifi/debugfs.c        |    1 +
1524  drivers/net/wireless/iwmc3200wifi/main.c           |    1 +
1525  drivers/net/wireless/iwmc3200wifi/sdio.c           |    1 +
1526  drivers/net/wireless/libertas/cfg.c                |   25 +-
1527  drivers/net/wireless/libertas/cfg.h                |    1 +
1528  drivers/net/wireless/libertas/cmd.c                |    1 +
1529  drivers/net/wireless/libertas/debugfs.c            |    1 +
1530  drivers/net/wireless/libertas/if_sdio.c            |    2 +-
1531  drivers/net/wireless/libertas/if_spi.c             |    2 +-
1532  drivers/net/wireless/libertas/if_usb.c             |    2 +-
1533  drivers/net/wireless/libertas/main.c               |    8 +-
1534  drivers/net/wireless/libertas/rx.c                 |    1 +
1535  drivers/net/wireless/libertas/tx.c                 |    1 +
1536  drivers/net/wireless/libertas_tf/cmd.c             |    1 +
1537  drivers/net/wireless/libertas_tf/if_usb.c          |    2 +-
1538  drivers/net/wireless/libertas_tf/main.c            |    1 +
1539  drivers/net/wireless/mac80211_hwsim.c              |    1 +
1540  drivers/net/wireless/orinoco/fw.c                  |    1 +
1541  drivers/net/wireless/p54/eeprom.c                  |    1 +
1542  drivers/net/wireless/p54/fwio.c                    |    1 +
1543  drivers/net/wireless/p54/main.c                    |    1 +
1544  drivers/net/wireless/p54/p54pci.c                  |    1 +
1545  drivers/net/wireless/p54/p54usb.c                  |    1 +
1546  drivers/net/wireless/p54/txrx.c                    |    1 +
1547  drivers/net/wireless/rtl818x/rtl8180/dev.c         |    1 +
1548  drivers/net/wireless/rtl818x/rtl8187/dev.c         |    1 +
1549  drivers/net/wireless/rtlwifi/base.c                |    1 +
1550  drivers/net/wireless/rtlwifi/cam.c                 |    1 +
1551  drivers/net/wireless/rtlwifi/efuse.c               |    1 +
1552  drivers/net/wireless/rtlwifi/pci.c                 |    1 +
1553  drivers/net/wireless/rtlwifi/ps.c                  |    1 +
1554  drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c  |    1 +
1555  drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c  |    1 +
1556  drivers/net/wireless/rtlwifi/rtl8192c/main.c       |    1 +
1557  drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c |    1 +
1558  drivers/net/wireless/rtlwifi/rtl8192ce/sw.c        |    1 +
1559  drivers/net/wireless/rtlwifi/rtl8192cu/sw.c        |    1 +
1560  drivers/net/wireless/rtlwifi/rtl8192de/sw.c        |    1 +
1561  drivers/net/wireless/rtlwifi/rtl8192se/sw.c        |    1 +
1562  drivers/net/wireless/rtlwifi/usb.c                 |    1 +
1563  drivers/net/wireless/wl12xx/boot.c                 |    1 +
1564  drivers/net/wireless/zd1211rw/zd_usb.c             |    1 +
1565  drivers/net/xen-netback/common.h                   |   11 +-
1566  drivers/net/xen-netback/netback.c                  |   80 +-
1567  drivers/nfc/nfcwilink.c                            |    1 +
1568  drivers/of/fdt.c                                   |    7 +-
1569  drivers/of/of_net.c                                |    1 +
1570  drivers/of/of_pci.c                                |    1 +
1571  drivers/of/of_pci_irq.c                            |    1 +
1572  drivers/of/of_spi.c                                |    1 +
1573  drivers/parisc/ccio-dma.c                          |    1 +
1574  drivers/parisc/sba_iommu.c                         |    1 +
1575  drivers/pci/Kconfig                                |   11 -
1576  drivers/pci/ats.c                                  |    1 +
1577  drivers/pci/hotplug-pci.c                          |    1 +
1578  drivers/pci/hotplug/pciehp_acpi.c                  |    1 +
1579  drivers/pci/hotplug/pcihp_slot.c                   |    1 +
1580  drivers/pci/hotplug/rpadlpar_core.c                |    1 +
1581  drivers/pci/htirq.c                                |    1 +
1582  drivers/pci/ioapic.c                               |    1 +
1583  drivers/pci/iov.c                                  |    1 +
1584  drivers/pci/irq.c                                  |    1 +
1585  drivers/pci/msi.c                                  |    1 +
1586  drivers/pci/pci-sysfs.c                            |    1 +
1587  drivers/pci/quirks.c                               |    1 +
1588  drivers/pci/rom.c                                  |    1 +
1589  drivers/pci/setup-res.c                            |    1 +
1590  drivers/pci/slot.c                                 |    1 +
1591  drivers/pci/vpd.c                                  |    1 +
1592  drivers/pcmcia/db1xxx_ss.c                         |    1 +
1593  drivers/pcmcia/pxa2xx_base.c                       |    1 +
1594  drivers/pcmcia/pxa2xx_cm_x255.c                    |    1 +
1595  drivers/pcmcia/pxa2xx_cm_x270.c                    |    1 +
1596  drivers/pcmcia/pxa2xx_cm_x2xx.c                    |    3 +-
1597  drivers/pinctrl/core.c                             |    1 +
1598  drivers/platform/x86/intel_scu_ipc.c               |    1 +
1599  drivers/platform/x86/msi-wmi.c                     |    1 +
1600  drivers/platform/x86/wmi.c                         |    1 +
1601  drivers/pnp/pnpacpi/core.c                         |    1 +
1602  drivers/pnp/pnpacpi/rsparser.c                     |   62 +-
1603  drivers/power/max17042_battery.c                   |    1 +
1604  drivers/power/max8903_charger.c                    |    1 +
1605  drivers/power/max8997_charger.c                    |    1 +
1606  drivers/power/max8998_charger.c                    |    1 +
1607  drivers/power/power_supply_sysfs.c                 |    1 +
1608  drivers/ps3/ps3stor_lib.c                          |    1 +
1609  drivers/ps3/sys-manager-core.c                     |    1 +
1610  drivers/rapidio/switches/idt_gen2.c                |    1 +
1611  drivers/regulator/88pm8607.c                       |    1 +
1612  drivers/regulator/ab8500.c                         |    1 +
1613  drivers/regulator/bq24022.c                        |    1 +
1614  drivers/regulator/core.c                           |    1 +
1615  drivers/regulator/da903x.c                         |    1 +
1616  drivers/regulator/db8500-prcmu.c                   |    1 +
1617  drivers/regulator/dummy.c                          |    1 +
1618  drivers/regulator/fixed.c                          |    1 +
1619  drivers/regulator/lp3971.c                         |    1 +
1620  drivers/regulator/lp3972.c                         |    1 +
1621  drivers/regulator/max8925-regulator.c              |    1 +
1622  drivers/regulator/max8997.c                        |    1 +
1623  drivers/regulator/mc13783-regulator.c              |    1 +
1624  drivers/regulator/mc13892-regulator.c              |    1 +
1625  drivers/regulator/mc13xxx-regulator-core.c         |    1 +
1626  drivers/regulator/tps6586x-regulator.c             |    1 +
1627  drivers/regulator/userspace-consumer.c             |    1 +
1628  drivers/regulator/virtual.c                        |    1 +
1629  drivers/regulator/wm8400-regulator.c               |    1 +
1630  drivers/rtc/interface.c                            |    1 +
1631  drivers/rtc/rtc-dm355evm.c                         |    1 +
1632  drivers/rtc/rtc-ds1305.c                           |    1 +
1633  drivers/rtc/rtc-ds1511.c                           |    1 +
1634  drivers/rtc/rtc-ds1553.c                           |    1 +
1635  drivers/rtc/rtc-ds1672.c                           |    1 +
1636  drivers/rtc/rtc-ds1742.c                           |    1 +
1637  drivers/rtc/rtc-em3027.c                           |    1 +
1638  drivers/rtc/rtc-isl12022.c                         |    1 +
1639  drivers/rtc/rtc-mv.c                               |    1 +
1640  drivers/rtc/rtc-pcf2123.c                          |    1 +
1641  drivers/rtc/rtc-pcf8563.c                          |    1 +
1642  drivers/rtc/rtc-rs5c348.c                          |    1 +
1643  drivers/rtc/rtc-rs5c372.c                          |    1 +
1644  drivers/rtc/rtc-stk17ta8.c                         |    1 +
1645  drivers/rtc/rtc-tx4939.c                           |    1 +
1646  drivers/rtc/rtc-x1205.c                            |    1 +
1647  drivers/s390/char/fs3270.c                         |    1 +
1648  drivers/s390/char/sclp_cpi_sys.c                   |    1 +
1649  drivers/s390/char/vmcp.c                           |    1 +
1650  drivers/s390/char/vmur.c                           |    1 +
1651  drivers/s390/cio/chp.c                             |    2 +
1652  drivers/s390/cio/qdio_debug.c                      |    2 +
1653  drivers/s390/cio/qdio_setup.c                      |    1 +
1654  drivers/s390/kvm/kvm_virtio.c                      |    1 +
1655  drivers/s390/scsi/zfcp_aux.c                       |    1 +
1656  drivers/s390/scsi/zfcp_ccw.c                       |    1 +
1657  drivers/s390/scsi/zfcp_dbf.c                       |    1 +
1658  drivers/s390/scsi/zfcp_qdio.c                      |    1 +
1659  drivers/s390/scsi/zfcp_scsi.c                      |    1 +
1660  drivers/scsi/Kconfig                               |   14 -
1661  drivers/scsi/a2091.c                               |    1 +
1662  drivers/scsi/a3000.c                               |    1 +
1663  drivers/scsi/aacraid/aachba.c                      |    1 +
1664  drivers/scsi/be2iscsi/be_main.c                    |    1 +
1665  drivers/scsi/bfa/bfad_debugfs.c                    |    1 +
1666  drivers/scsi/bfa/bfad_im.c                         |    2 +
1667  drivers/scsi/cxgbi/libcxgbi.c                      |    1 +
1668  drivers/scsi/device_handler/scsi_dh.c              |    1 +
1669  drivers/scsi/device_handler/scsi_dh_alua.c         |    1 +
1670  drivers/scsi/device_handler/scsi_dh_emc.c          |    1 +
1671  drivers/scsi/device_handler/scsi_dh_hp_sw.c        |    1 +
1672  drivers/scsi/device_handler/scsi_dh_rdac.c         |    1 +
1673  drivers/scsi/gvp11.c                               |    1 +
1674  drivers/scsi/iscsi_tcp.c                           |    1 +
1675  drivers/scsi/libfc/fc_disc.c                       |    1 +
1676  drivers/scsi/libfc/fc_elsct.c                      |    1 +
1677  drivers/scsi/libfc/fc_exch.c                       |    1 +
1678  drivers/scsi/libfc/fc_libfc.c                      |    1 +
1679  drivers/scsi/libfc/fc_lport.c                      |    1 +
1680  drivers/scsi/libfc/fc_npiv.c                       |    1 +
1681  drivers/scsi/libfc/fc_rport.c                      |    1 +
1682  drivers/scsi/libiscsi.c                            |    1 +
1683  drivers/scsi/libiscsi_tcp.c                        |    1 +
1684  drivers/scsi/libsas/sas_host_smp.c                 |    1 +
1685  drivers/scsi/libsas/sas_scsi_host.c                |    1 +
1686  drivers/scsi/libsas/sas_task.c                     |    1 +
1687  drivers/scsi/libsrp.c                              |    1 +
1688  drivers/scsi/lpfc/lpfc_attr.c                      |    1 +
1689  drivers/scsi/lpfc/lpfc_debugfs.c                   |    1 +
1690  drivers/scsi/lpfc/lpfc_init.c                      |    1 +
1691  drivers/scsi/lpfc/lpfc_scsi.c                      |    1 +
1692  drivers/scsi/mac53c94.c                            |    1 +
1693  drivers/scsi/megaraid/megaraid_mbox.c              |    1 +
1694  drivers/scsi/osd/osd_initiator.c                   |    1 +
1695  drivers/scsi/ps3rom.c                              |    1 +
1696  drivers/scsi/scsi_lib.c                            |    1 +
1697  drivers/scsi/scsi_lib_dma.c                        |    1 +
1698  drivers/scsi/scsi_netlink.c                        |    1 +
1699  drivers/scsi/scsi_pm.c                             |    1 +
1700  drivers/scsi/scsi_tgt_if.c                         |    1 +
1701  drivers/scsi/sr_ioctl.c                            |    1 +
1702  drivers/sfi/sfi_core.h                             |    3 +
1703  drivers/sh/intc/chip.c                             |    2 +-
1704  drivers/sh/intc/core.c                             |    2 +
1705  drivers/sh/intc/dynamic.c                          |    1 +
1706  drivers/sh/intc/virq.c                             |    1 +
1707  drivers/sh/maple/maple.c                           |    1 +
1708  drivers/spi/spi-altera.c                           |    1 +
1709  drivers/spi/spi-au1550.c                           |    1 +
1710  drivers/spi/spi-bitbang.c                          |    1 +
1711  drivers/spi/spi-butterfly.c                        |    1 +
1712  drivers/spi/spi-dw-mmio.c                          |    1 +
1713  drivers/spi/spi-dw-pci.c                           |    1 +
1714  drivers/spi/spi-dw.c                               |    1 +
1715  drivers/spi/spi-gpio.c                             |    1 +
1716  drivers/spi/spi-oc-tiny.c                          |    1 +
1717  drivers/spi/spi-omap-uwire.c                       |    1 +
1718  drivers/spi/spi-orion.c                            |    1 +
1719  drivers/spi/spi-pxa2xx-pci.c                       |    1 +
1720  drivers/spi/spi-s3c24xx.c                          |    1 +
1721  drivers/spi/spi-sh-msiof.c                         |    1 +
1722  drivers/spi/spi-sh-sci.c                           |    1 +
1723  drivers/spi/spi-ti-ssp.c                           |    1 +
1724  drivers/spi/spi-tle62x0.c                          |    1 +
1725  drivers/spi/spi-txx9.c                             |    1 +
1726  drivers/spi/spi.c                                  |    1 +
1727  drivers/ssb/b43_pci_bridge.c                       |    1 +
1728  drivers/ssb/driver_chipcommon.c                    |    1 +
1729  drivers/ssb/driver_chipcommon_pmu.c                |    1 +
1730  drivers/ssb/driver_gige.c                          |    1 +
1731  drivers/ssb/driver_pcicore.c                       |    1 +
1732  drivers/ssb/embedded.c                             |    1 +
1733  drivers/ssb/main.c                                 |    1 +
1734  drivers/ssb/pcihost_wrapper.c                      |    1 +
1735  drivers/staging/cxt1e1/linux.c                     |    1 +
1736  drivers/staging/gma500/intel_i2c.c                 |    1 +
1737  drivers/staging/gma500/mdfld_dsi_output.c          |    1 +
1738  drivers/staging/gma500/mdfld_output.c              |    3 +-
1739  drivers/staging/gma500/mid_bios.c                  |    1 +
1740  drivers/staging/gma500/mrst_hdmi_i2c.c             |    1 +
1741  drivers/staging/gma500/psb_drv.c                   |    1 +
1742  drivers/staging/iio/accel/adis16201_ring.c         |    1 +
1743  drivers/staging/iio/accel/adis16201_trigger.c      |    1 +
1744  drivers/staging/iio/accel/adis16203_ring.c         |    1 +
1745  drivers/staging/iio/accel/adis16203_trigger.c      |    1 +
1746  drivers/staging/iio/accel/adis16204_ring.c         |    1 +
1747  drivers/staging/iio/accel/adis16204_trigger.c      |    1 +
1748  drivers/staging/iio/accel/adis16209_ring.c         |    1 +
1749  drivers/staging/iio/accel/adis16209_trigger.c      |    1 +
1750  drivers/staging/iio/accel/adis16240_ring.c         |    1 +
1751  drivers/staging/iio/accel/adis16240_trigger.c      |    1 +
1752  drivers/staging/iio/accel/lis3l02dq_ring.c         |    1 +
1753  drivers/staging/iio/adc/ad7793.c                   |    1 +
1754  drivers/staging/iio/dac/ad5686.c                   |    1 +
1755  drivers/staging/iio/gyro/adis16060_core.c          |    1 +
1756  drivers/staging/iio/gyro/adis16260_ring.c          |    1 +
1757  drivers/staging/iio/gyro/adis16260_trigger.c       |    1 +
1758  drivers/staging/iio/iio_simple_dummy_buffer.c      |    1 +
1759  drivers/staging/iio/imu/adis16400_ring.c           |    1 +
1760  drivers/staging/iio/imu/adis16400_trigger.c        |    1 +
1761  drivers/staging/iio/industrialio-buffer.c          |    1 +
1762  drivers/staging/iio/meter/ade7758_ring.c           |    1 +
1763  drivers/staging/iio/meter/ade7758_trigger.c        |    1 +
1764  drivers/staging/intel_sst/intel_sst.c              |    1 +
1765  .../staging/intel_sst/intel_sst_drv_interface.c    |    1 +
1766  drivers/staging/line6/audio.c                      |    1 +
1767  drivers/staging/media/solo6x10/g723.c              |    1 +
1768  drivers/staging/rts5139/rts51x_scsi.c              |    1 +
1769  drivers/staging/spectra/lld_mtd.c                  |    6 +-
1770  drivers/staging/usbip/usbip_common.c               |    1 +
1771  drivers/staging/usbip/usbip_event.c                |    1 +
1772  drivers/staging/winbond/wbusb.c                    |    1 +
1773  drivers/staging/wlags49_h2/wl_cs.c                 |    1 +
1774  drivers/target/iscsi/iscsi_target.c                |   12 +-
1775  drivers/target/iscsi/iscsi_target_configfs.c       |    1 +
1776  drivers/target/iscsi/iscsi_target_stat.c           |    1 +
1777  drivers/target/loopback/tcm_loop.c                 |   23 +-
1778  drivers/target/target_core_alua.c                  |   12 +-
1779  drivers/target/target_core_alua.h                  |    4 +-
1780  drivers/target/target_core_cdb.c                   |  216 +--
1781  drivers/target/target_core_cdb.h                   |   14 +
1782  drivers/target/target_core_device.c                |   15 +-
1783  drivers/target/target_core_fabric_lib.c            |    1 +
1784  drivers/target/target_core_file.c                  |    1 +
1785  drivers/target/target_core_hba.c                   |    1 +
1786  drivers/target/target_core_iblock.c                |    1 +
1787  drivers/target/target_core_pr.c                    |  349 ++--
1788  drivers/target/target_core_pr.h                    |    7 +-
1789  drivers/target/target_core_pscsi.c                 |    3 +-
1790  drivers/target/target_core_tmr.c                   |   24 +-
1791  drivers/target/target_core_tpg.c                   |    1 +
1792  drivers/target/target_core_transport.c             |  393 +++--
1793  drivers/target/tcm_fc/tcm_fc.h                     |    2 +-
1794  drivers/target/tcm_fc/tfc_cmd.c                    |    3 +-
1795  drivers/thermal/thermal_sys.c                      |    4 +-
1796  drivers/tty/hvc/Kconfig                            |    9 +
1797  drivers/tty/hvc/Makefile                           |    1 +
1798  drivers/tty/hvc/hvc_console.c                      |    7 +-
1799  drivers/tty/hvc/hvc_iseries.c                      |    1 +
1800  drivers/tty/hvc/hvc_opal.c                         |  425 ++++
1801  drivers/tty/hvc/hvc_vio.c                          |    1 +
1802  drivers/tty/hvc/hvcs.c                             |    6 +-
1803  drivers/tty/hvc/hvsi_lib.c                         |    4 +-
1804  drivers/tty/serial/8250.c                          |   23 -
1805  drivers/tty/serial/jsm/jsm_driver.c                |    2 +-
1806  drivers/tty/serial/kgdboc.c                        |    1 +
1807  drivers/tty/serial/max3100.c                       |    1 +
1808  drivers/tty/serial/max3107-aava.c                  |    1 +
1809  drivers/tty/serial/max3107.c                       |    1 +
1810  drivers/tty/serial/nwpserial.c                     |    1 +
1811  drivers/tty/serial/timbuart.c                      |    1 +
1812  drivers/tty/serial/xilinx_uartps.c                 |    1 +
1813  drivers/tty/vt/vc_screen.c                         |    1 +
1814  drivers/uio/uio_pdrv.c                             |    1 +
1815  drivers/uio/uio_pdrv_genirq.c                      |    1 +
1816  drivers/usb/c67x00/c67x00-drv.c                    |    1 +
1817  drivers/usb/core/driver.c                          |    1 +
1818  drivers/usb/core/notify.c                          |    1 +
1819  drivers/usb/gadget/cdc2.c                          |    1 +
1820  drivers/usb/gadget/composite.c                     |    1 +
1821  drivers/usb/gadget/dbgp.c                          |    1 +
1822  drivers/usb/gadget/f_fs.c                          |    1 +
1823  drivers/usb/gadget/f_obex.c                        |    1 +
1824  drivers/usb/gadget/f_sourcesink.c                  |    1 +
1825  drivers/usb/gadget/file_storage.c                  |    1 +
1826  drivers/usb/gadget/fusb300_udc.c                   |    1 +
1827  drivers/usb/gadget/gmidi.c                         |    1 +
1828  drivers/usb/gadget/u_serial.c                      |    1 +
1829  drivers/usb/host/fsl-mph-dr-of.c                   |    1 +
1830  drivers/usb/host/isp1760-if.c                      |    1 +
1831  drivers/usb/host/pci-quirks.c                      |    1 +
1832  drivers/usb/host/whci/debug.c                      |    1 +
1833  drivers/usb/host/whci/hcd.c                        |    1 +
1834  drivers/usb/host/xhci-hub.c                        |    1 +
1835  drivers/usb/host/xhci-pci.c                        |    1 +
1836  drivers/usb/mon/mon_bin.c                          |    1 +
1837  drivers/usb/mon/mon_stat.c                         |    1 +
1838  drivers/usb/mon/mon_text.c                         |    1 +
1839  drivers/usb/otg/gpio_vbus.c                        |    1 +
1840  drivers/usb/otg/otg.c                              |    1 +
1841  drivers/usb/otg/ulpi.c                             |    1 +
1842  drivers/usb/serial/aircable.c                      |    1 +
1843  drivers/usb/serial/qcserial.c                      |    1 +
1844  drivers/usb/storage/option_ms.c                    |    1 +
1845  drivers/usb/storage/protocol.c                     |    1 +
1846  drivers/usb/storage/sierra_ms.c                    |    1 +
1847  drivers/usb/storage/transport.c                    |    1 +
1848  drivers/usb/storage/uas.c                          |    1 +
1849  drivers/usb/wusbcore/devconnect.c                  |    1 +
1850  drivers/usb/wusbcore/mmc.c                         |    1 +
1851  drivers/usb/wusbcore/rh.c                          |    1 +
1852  drivers/usb/wusbcore/security.c                    |    1 +
1853  drivers/usb/wusbcore/wa-hc.c                       |    1 +
1854  drivers/usb/wusbcore/wa-rpipe.c                    |    1 +
1855  drivers/usb/wusbcore/wa-xfer.c                     |    1 +
1856  drivers/uwb/est.c                                  |    1 +
1857  drivers/uwb/i1480/dfu/dfu.c                        |    1 +
1858  drivers/uwb/ie.c                                   |    1 +
1859  drivers/uwb/lc-dev.c                               |    2 +
1860  drivers/uwb/lc-rc.c                                |    1 +
1861  drivers/uwb/neh.c                                  |    1 +
1862  drivers/uwb/pal.c                                  |    1 +
1863  drivers/uwb/radio.c                                |    1 +
1864  drivers/uwb/reset.c                                |    1 +
1865  drivers/uwb/rsv.c                                  |    1 +
1866  drivers/uwb/scan.c                                 |    1 +
1867  drivers/uwb/umc-bus.c                              |    1 +
1868  drivers/uwb/umc-dev.c                              |    1 +
1869  drivers/uwb/umc-drv.c                              |    1 +
1870  drivers/uwb/whci.c                                 |    1 +
1871  drivers/video/atmel_lcdfb.c                        |    1 +
1872  drivers/video/backlight/88pm860x_bl.c              |    1 +
1873  drivers/video/backlight/adp5520_bl.c               |    1 +
1874  drivers/video/backlight/ams369fg06.c               |    1 +
1875  drivers/video/backlight/da903x_bl.c                |    1 +
1876  drivers/video/backlight/ep93xx_bl.c                |    1 +
1877  drivers/video/backlight/l4f00242t03.c              |    1 +
1878  drivers/video/backlight/ld9040.c                   |    1 +
1879  drivers/video/backlight/lms283gf05.c               |    1 +
1880  drivers/video/backlight/max8925_bl.c               |    1 +
1881  drivers/video/backlight/s6e63m0.c                  |    1 +
1882  drivers/video/backlight/wm831x_bl.c                |    1 +
1883  drivers/video/carminefb.c                          |    1 +
1884  drivers/video/cobalt_lcdfb.c                       |    1 +
1885  drivers/video/ep93xx-fb.c                          |    1 +
1886  drivers/video/fb_ddc.c                             |    3 +-
1887  drivers/video/fb_notify.c                          |    1 +
1888  drivers/video/mb862xx/mb862xx-i2c.c                |    1 +
1889  drivers/video/mb862xx/mb862xxfbdrv.c               |    1 +
1890  drivers/video/msm/mdp.c                            |    1 +
1891  drivers/video/omap/lcd_mipid.c                     |    1 +
1892  drivers/video/omap/omapfb_main.c                   |    1 +
1893  drivers/video/omap2/dss/dispc.c                    |    1 +
1894  drivers/video/omap2/dss/dpi.c                      |    1 +
1895  drivers/video/omap2/dss/dsi.c                      |    1 +
1896  drivers/video/omap2/dss/dss.c                      |    1 +
1897  drivers/video/omap2/dss/rfbi.c                     |    1 +
1898  drivers/video/omap2/dss/sdi.c                      |    1 +
1899  drivers/video/omap2/omapfb/omapfb-ioctl.c          |    1 +
1900  drivers/video/savage/savagefb_accel.c              |    1 +
1901  drivers/video/sh_mipi_dsi.c                        |    1 +
1902  drivers/video/sh_mobile_lcdcfb.c                   |    1 +
1903  drivers/video/via/via-gpio.c                       |    1 +
1904  drivers/video/w100fb.c                             |    1 +
1905  drivers/virt/fsl_hypervisor.c                      |    1 +
1906  drivers/virtio/virtio.c                            |    1 +
1907  drivers/virtio/virtio_balloon.c                    |    1 +
1908  drivers/virtio/virtio_ring.c                       |    1 +
1909  drivers/w1/w1_family.c                             |    1 +
1910  drivers/w1/w1_int.c                                |    2 +
1911  drivers/watchdog/stmp3xxx_wdt.c                    |    1 +
1912  drivers/xen/balloon.c                              |   14 +-
1913  drivers/xen/events.c                               |    9 +-
1914  drivers/xen/gntdev.c                               |    3 +-
1915  drivers/xen/grant-table.c                          |    2 +-
1916  drivers/xen/manage.c                               |    1 +
1917  drivers/xen/pci.c                                  |    2 +-
1918  drivers/xen/swiotlb-xen.c                          |    1 +
1919  drivers/xen/xen-balloon.c                          |   17 +-
1920  drivers/xen/xen-pciback/conf_space.c               |    1 +
1921  drivers/xen/xenbus/xenbus_client.c                 |    7 +-
1922  drivers/xen/xenbus/xenbus_probe.c                  |    8 +-
1923  drivers/xen/xenbus/xenbus_probe.h                  |    3 +-
1924  drivers/xen/xenbus/xenbus_probe_backend.c          |    1 +
1925  drivers/xen/xenbus/xenbus_probe_frontend.c         |    1 +
1926  drivers/zorro/proc.c                               |    1 +
1927  fs/bio-integrity.c                                 |    1 +
1928  fs/btrfs/Makefile                                  |    3 +-
1929  fs/btrfs/acl.c                                     |   17 +-
1930  fs/btrfs/backref.c                                 |  776 +++++++
1931  fs/btrfs/backref.h                                 |   62 +
1932  fs/btrfs/btrfs_inode.h                             |   17 +-
1933  fs/btrfs/compression.c                             |    3 +-
1934  fs/btrfs/ctree.c                                   |   10 +-
1935  fs/btrfs/ctree.h                                   |  198 ++-
1936  fs/btrfs/delayed-inode.c                           |   50 +-
1937  fs/btrfs/disk-io.c                                 |  441 ++++-
1938  fs/btrfs/disk-io.h                                 |    4 +-
1939  fs/btrfs/extent-tree.c                             |  851 +++++---
1940  fs/btrfs/extent_io.c                               |  614 +++++-
1941  fs/btrfs/extent_io.h                               |   23 +-
1942  fs/btrfs/file-item.c                               |   17 +-
1943  fs/btrfs/file.c                                    |   25 +-
1944  fs/btrfs/free-space-cache.c                        |  926 +++++---
1945  fs/btrfs/inode-map.c                               |    6 +-
1946  fs/btrfs/inode.c                                   |  457 ++---
1947  fs/btrfs/ioctl.c                                   |  227 ++-
1948  fs/btrfs/ioctl.h                                   |   29 +
1949  fs/btrfs/print-tree.c                              |    8 +-
1950  fs/btrfs/reada.c                                   |  951 ++++++++
1951  fs/btrfs/relocation.c                              |   24 +-
1952  fs/btrfs/scrub.c                                   |  591 ++++-
1953  fs/btrfs/super.c                                   |  298 ++-
1954  fs/btrfs/transaction.c                             |  146 +-
1955  fs/btrfs/tree-log.c                                |   19 +-
1956  fs/btrfs/volumes.c                                 |  207 ++-
1957  fs/btrfs/volumes.h                                 |   18 +-
1958  fs/btrfs/xattr.c                                   |   11 +
1959  fs/buffer.c                                        |    2 +-
1960  fs/ceph/caps.c                                     |    8 +-
1961  fs/ceph/dir.c                                      |   87 +-
1962  fs/ceph/inode.c                                    |    8 +-
1963  fs/ceph/mds_client.c                               |   10 +-
1964  fs/ceph/super.c                                    |    4 +-
1965  fs/ceph/super.h                                    |   23 +-
1966  fs/cifs/connect.c                                  |    1 +
1967  fs/cifs/file.c                                     |  105 +-
1968  fs/dcache.c                                        |    6 +-
1969  fs/exofs/ore.c                                     |    1 +
1970  fs/exofs/super.c                                   |    1 +
1971  fs/ext4/inode.c                                    |    2 +-
1972  fs/fs-writeback.c                                  |   84 +-
1973  fs/fuse/cuse.c                                     |    1 +
1974  fs/gfs2/ops_fstype.c                               |    1 +
1975  fs/ioprio.c                                        |    1 +
1976  fs/jffs2/compr.c                                   |  128 +-
1977  fs/jffs2/compr.h                                   |    2 +
1978  fs/jffs2/fs.c                                      |    2 +-
1979  fs/jffs2/jffs2_fs_sb.h                             |    6 +
1980  fs/jffs2/os-linux.h                                |    2 +-
1981  fs/jffs2/scan.c                                    |    4 +-
1982  fs/jffs2/super.c                                   |  119 +
1983  fs/jffs2/wbuf.c                                    |    9 +-
1984  fs/jfs/jfs_logmgr.c                                |    1 +
1985  fs/logfs/super.c                                   |    1 +
1986  fs/namei.c                                         |   16 +-
1987  fs/nfs/nfs4filelayout.c                            |    1 +
1988  fs/nfs/pagelist.c                                  |    1 +
1989  fs/nfs/pnfs.c                                      |    1 +
1990  fs/nfs/pnfs_dev.c                                  |    1 +
1991  fs/nfs/write.c                                     |    1 +
1992  fs/nfsd/nfs4acl.c                                  |    1 +
1993  fs/nfsd/nfsctl.c                                   |    1 +
1994  fs/nfsd/nfssvc.c                                   |    1 +
1995  fs/ocfs2/cluster/tcp.c                             |    1 +
1996  fs/ocfs2/dlm/dlmdebug.c                            |    1 +
1997  fs/proc/vmcore.c                                   |    1 +
1998  fs/quota/quota.c                                   |    2 +-
1999  fs/sync.c                                          |    4 +-
2000  fs/ubifs/budget.c                                  |    2 +-
2001  fs/ubifs/debug.c                                   |   16 +
2002  fs/ubifs/debug.h                                   |    5 +
2003  fs/ubifs/recovery.c                                |    2 +-
2004  fs/ubifs/sb.c                                      |    2 +-
2005  include/acpi/acpi_drivers.h                        |    2 +-
2006  include/acpi/actypes.h                             |    1 -
2007  include/acpi/platform/aclinux.h                    |    1 -
2008  include/acpi/processor.h                           |    1 +
2009  include/drm/drmP.h                                 |    3 +-
2010  include/drm/drm_dp_helper.h                        |    3 +
2011  include/drm/drm_mode.h                             |   12 +-
2012  include/drm/vmwgfx_drm.h                           |   51 +-
2013  include/linux/backing-dev.h                        |   14 +-
2014  include/linux/bcma/bcma.h                          |    7 +-
2015  include/linux/blkdev.h                             |    2 +-
2016  include/linux/cpuidle.h                            |   55 +-
2017  include/linux/crypto.h                             |    6 -
2018  include/linux/device.h                             |   15 +-
2019  include/linux/device_cgroup.h                      |    1 -
2020  include/linux/dma-mapping.h                        |    3 +
2021  include/linux/dmaengine.h                          |    2 +
2022  include/linux/ethtool.h                            |    2 +
2023  include/linux/export.h                             |   89 +
2024  include/linux/firmware.h                           |    2 +-
2025  include/linux/ftrace.h                             |    2 +-
2026  include/linux/gameport.h                           |   17 +-
2027  include/linux/hid.h                                |    9 +-
2028  include/linux/i2c.h                                |   10 +-
2029  include/linux/ipmi.h                               |    3 +-
2030  include/linux/ipmi_smi.h                           |    1 -
2031  include/linux/irq.h                                |   32 +-
2032  include/linux/irqdesc.h                            |    1 +
2033  include/linux/jump_label.h                         |   23 +-
2034  include/linux/kernel.h                             |    1 +
2035  include/linux/mdio-bitbang.h                       |    3 +-
2036  include/linux/miscdevice.h                         |    3 +-
2037  include/linux/module.h                             |   73 +-
2038  include/linux/moduleparam.h                        |    5 +
2039  include/linux/mtd/bbm.h                            |   39 +-
2040  include/linux/mtd/mtd.h                            |   85 +-
2041  include/linux/mtd/nand.h                           |   92 +-
2042  include/linux/mtd/onenand.h                        |    4 +
2043  include/linux/mtd/partitions.h                     |   46 +-
2044  include/linux/mtd/physmap.h                        |   17 -
2045  include/linux/of.h                                 |    1 +
2046  include/linux/of_platform.h                        |    1 -
2047  include/linux/pci_hotplug.h                        |   10 +-
2048  include/linux/pm_runtime.h                         |    1 +
2049  include/linux/regmap.h                             |    2 +-
2050  include/linux/regulator/driver.h                   |    1 +
2051  include/linux/sched.h                              |    7 +
2052  include/linux/serio.h                              |   20 +-
2053  include/linux/ssb/ssb.h                            |    7 +-
2054  include/linux/stop_machine.h                       |    1 +
2055  include/linux/sunrpc/svc_xprt.h                    |    3 +-
2056  include/linux/sysdev.h                             |    1 -
2057  include/linux/textsearch.h                         |    3 +-
2058  include/linux/topology.h                           |    4 +
2059  include/linux/uio_driver.h                         |   12 +-
2060  include/linux/usb.h                                |    9 +-
2061  include/linux/uwb.h                                |    1 +
2062  include/linux/uwb/umc.h                            |    7 +-
2063  include/linux/vermagic.h                           |    1 -
2064  include/linux/vlynq.h                              |    3 +-
2065  include/linux/writeback.h                          |   33 +-
2066  include/media/saa7146.h                            |    3 +-
2067  include/media/v4l2-int-device.h                    |    3 +-
2068  include/mtd/mtd-abi.h                              |  122 +-
2069  include/net/bluetooth/hci_core.h                   |   24 +-
2070  include/net/bluetooth/rfcomm.h                     |    1 +
2071  include/net/inet_timewait_sock.h                   |    1 -
2072  include/net/ip_vs.h                                |   15 +-
2073  include/net/lib80211.h                             |    3 +-
2074  include/net/mac80211.h                             |    3 +-
2075  include/net/netfilter/nf_conntrack.h               |    2 +
2076  include/net/netlink.h                              |   11 +-
2077  include/net/sch_generic.h                          |    1 -
2078  include/net/sock.h                                 |    2 +-
2079  include/sound/core.h                               |    2 +-
2080  include/target/target_core_base.h                  |   13 +-
2081  include/target/target_core_device.h                |    2 +-
2082  include/target/target_core_fabric_ops.h            |   11 +-
2083  include/target/target_core_transport.h             |    7 +-
2084  include/trace/define_trace.h                       |   10 -
2085  include/trace/events/module.h                      |    2 +-
2086  include/trace/events/writeback.h                   |  161 ++-
2087  include/xen/grant_table.h                          |    1 -
2088  include/xen/interface/platform.h                   |  320 +++
2089  include/xen/interface/xen.h                        |    1 +
2090  include/xen/xenbus.h                               |    1 +
2091  init/main.c                                        |    3 +
2092  kernel/async.c                                     |    2 +-
2093  kernel/audit.c                                     |    2 +-
2094  kernel/auditsc.c                                   |    2 +-
2095  kernel/capability.c                                |    2 +-
2096  kernel/cgroup_freezer.c                            |    2 +-
2097  kernel/compat.c                                    |    1 +
2098  kernel/cpu.c                                       |    2 +-
2099  kernel/cpuset.c                                    |    2 +-
2100  kernel/crash_dump.c                                |    2 +-
2101  kernel/cred.c                                      |    2 +-
2102  kernel/debug/kdb/kdb_debugger.c                    |    1 +
2103  kernel/dma.c                                       |    2 +-
2104  kernel/events/core.c                               |    1 +
2105  kernel/fork.c                                      |    3 +
2106  kernel/freezer.c                                   |    2 +-
2107  kernel/futex.c                                     |    2 +-
2108  kernel/groups.c                                    |    2 +-
2109  kernel/hrtimer.c                                   |    2 +-
2110  kernel/hung_task.c                                 |    2 +-
2111  kernel/irq/generic-chip.c                          |    1 +
2112  kernel/irq/irqdesc.c                               |    2 +-
2113  kernel/irq_work.c                                  |    4 +-
2114  kernel/jump_label.c                                |   37 +-
2115  kernel/kfifo.c                                     |    2 +-
2116  kernel/kprobes.c                                   |    2 +-
2117  kernel/ksysfs.c                                    |    3 +-
2118  kernel/kthread.c                                   |    2 +-
2119  kernel/latencytop.c                                |    2 +-
2120  kernel/lockdep_proc.c                              |    2 +-
2121  kernel/module.c                                    |   13 +-
2122  kernel/mutex-debug.c                               |    2 +-
2123  kernel/mutex.c                                     |    2 +-
2124  kernel/notifier.c                                  |    2 +-
2125  kernel/nsproxy.c                                   |    2 +-
2126  kernel/padata.c                                    |    2 +-
2127  kernel/panic.c                                     |    2 +
2128  kernel/params.c                                    |    2 +-
2129  kernel/pid.c                                       |    2 +-
2130  kernel/posix-timers.c                              |    2 +-
2131  kernel/power/hibernate.c                           |    1 +
2132  kernel/power/main.c                                |    1 +
2133  kernel/power/qos.c                                 |    1 +
2134  kernel/power/suspend.c                             |    2 +
2135  kernel/power/user.c                                |    1 +
2136  kernel/profile.c                                   |    2 +-
2137  kernel/ptrace.c                                    |    2 +-
2138  kernel/range.c                                     |    2 +-
2139  kernel/rcupdate.c                                  |    2 +-
2140  kernel/rcutiny.c                                   |    3 +-
2141  kernel/rcutiny_plugin.h                            |    1 +
2142  kernel/rcutree.c                                   |    2 +-
2143  kernel/relay.c                                     |    2 +-
2144  kernel/resource.c                                  |    2 +-
2145  kernel/rtmutex-debug.c                             |    2 +-
2146  kernel/rtmutex-tester.c                            |    2 +-
2147  kernel/rtmutex.c                                   |    2 +-
2148  kernel/rwsem.c                                     |    2 +-
2149  kernel/sched.c                                     |    2 -
2150  kernel/sched_clock.c                               |    2 +-
2151  kernel/semaphore.c                                 |    2 +-
2152  kernel/signal.c                                    |    2 +-
2153  kernel/smp.c                                       |    2 +-
2154  kernel/softirq.c                                   |    2 +-
2155  kernel/spinlock.c                                  |    2 +-
2156  kernel/srcu.c                                      |    2 +-
2157  kernel/stacktrace.c                                |    2 +-
2158  kernel/stop_machine.c                              |    2 +-
2159  kernel/sys.c                                       |    3 +-
2160  kernel/time.c                                      |    2 +-
2161  kernel/time/posix-clock.c                          |    1 +
2162  kernel/timer.c                                     |    2 +-
2163  kernel/trace/blktrace.c                            |    1 +
2164  kernel/trace/ftrace.c                              |    1 +
2165  kernel/trace/trace_syscalls.c                      |    1 +
2166  kernel/up.c                                        |    2 +-
2167  kernel/user-return-notifier.c                      |    2 +-
2168  kernel/user.c                                      |    2 +-
2169  kernel/user_namespace.c                            |    2 +-
2170  kernel/utsname.c                                   |    2 +-
2171  kernel/utsname_sysctl.c                            |    2 +-
2172  kernel/wait.c                                      |    2 +-
2173  kernel/workqueue.c                                 |    2 +-
2174  lib/dma-debug.c                                    |    1 +
2175  lib/nlattr.c                                       |    1 +
2176  lib/raid6/algos.c                                  |    1 +
2177  lib/raid6/mktables.c                               |    1 +
2178  lib/raid6/recov.c                                  |    1 +
2179  mm/backing-dev.c                                   |    7 +-
2180  mm/bootmem.c                                       |    2 +-
2181  mm/bounce.c                                        |    2 +-
2182  mm/dmapool.c                                       |    3 +-
2183  mm/filemap.c                                       |    2 +-
2184  mm/filemap_xip.c                                   |    2 +-
2185  mm/fremap.c                                        |    1 -
2186  mm/highmem.c                                       |    2 +-
2187  mm/kmemleak.c                                      |    2 +-
2188  mm/maccess.c                                       |    2 +-
2189  mm/memcontrol.c                                    |    1 +
2190  mm/memory-failure.c                                |    1 +
2191  mm/memory.c                                        |    2 +-
2192  mm/memory_hotplug.c                                |    2 +-
2193  mm/mempolicy.c                                     |    2 +-
2194  mm/mempool.c                                       |    2 +-
2195  mm/migrate.c                                       |    2 +-
2196  mm/mlock.c                                         |    2 +-
2197  mm/mm_init.c                                       |    2 +-
2198  mm/mmap.c                                          |    2 +-
2199  mm/mmu_context.c                                   |    2 +-
2200  mm/mmu_notifier.c                                  |    2 +-
2201  mm/mmzone.c                                        |    1 -
2202  mm/nobootmem.c                                     |    2 +-
2203  mm/nommu.c                                         |    2 +-
2204  mm/oom_kill.c                                      |    2 +-
2205  mm/page-writeback.c                                |  708 +++++--
2206  mm/quicklist.c                                     |    1 -
2207  mm/readahead.c                                     |    2 +-
2208  mm/rmap.c                                          |    2 +-
2209  mm/shmem.c                                         |    2 +-
2210  mm/slob.c                                          |    2 +-
2211  mm/sparse-vmemmap.c                                |    1 -
2212  mm/sparse.c                                        |    2 +-
2213  mm/swap.c                                          |    2 +-
2214  mm/swap_state.c                                    |    1 -
2215  mm/swapfile.c                                      |    1 -
2216  mm/truncate.c                                      |    2 +-
2217  mm/util.c                                          |    2 +-
2218  mm/vmscan.c                                        |    3 +-
2219  net/802/fc.c                                       |    1 +
2220  net/802/garp.c                                     |    1 +
2221  net/802/stp.c                                      |    1 +
2222  net/8021q/vlan_core.c                              |    1 +
2223  net/8021q/vlan_netlink.c                           |    1 +
2224  net/appletalk/aarp.c                               |    1 +
2225  net/appletalk/atalk_proc.c                         |    1 +
2226  net/atm/pvc.c                                      |    1 +
2227  net/atm/svc.c                                      |    1 +
2228  net/ax25/ax25_route.c                              |    1 +
2229  net/ax25/ax25_uid.c                                |    1 +
2230  net/bluetooth/hci_core.c                           |    2 +-
2231  net/bluetooth/hci_sysfs.c                          |    1 +
2232  net/bluetooth/l2cap_sock.c                         |    1 +
2233  net/bluetooth/mgmt.c                               |    3 +-
2234  net/bluetooth/rfcomm/core.c                        |    9 +-
2235  net/bridge/br_input.c                              |    1 +
2236  net/bridge/br_stp_if.c                             |    1 +
2237  net/caif/caif_dev.c                                |    1 +
2238  net/caif/cfpkt_skbuff.c                            |    1 +
2239  net/ceph/messenger.c                               |    1 +
2240  net/compat.c                                       |    1 +
2241  net/core/dev_addr_lists.c                          |    1 +
2242  net/core/fib_rules.c                               |    1 +
2243  net/core/net-sysfs.c                               |    1 +
2244  net/core/net-traces.c                              |    1 +
2245  net/core/net_namespace.c                           |    1 +
2246  net/core/netevent.c                                |    1 +
2247  net/core/netpoll.c                                 |    1 +
2248  net/core/timestamping.c                            |    1 +
2249  net/core/user_dma.c                                |    1 +
2250  net/dcb/dcbevent.c                                 |    1 +
2251  net/dcb/dcbnl.c                                    |    1 +
2252  net/dccp/ackvec.c                                  |    1 +
2253  net/dccp/ccids/lib/tfrc.c                          |    1 +
2254  net/dccp/timer.c                                   |    1 +
2255  net/decnet/dn_route.c                              |    1 +
2256  net/decnet/dn_rules.c                              |    1 +
2257  net/dsa/dsa.c                                      |    1 +
2258  net/ieee802154/nl-mac.c                            |    1 +
2259  net/ipv4/fib_rules.c                               |    1 +
2260  net/ipv4/fib_trie.c                                |    1 +
2261  net/ipv4/inet_timewait_sock.c                      |    1 +
2262  net/ipv4/ipconfig.c                                |    1 +
2263  net/ipv4/ipmr.c                                    |    1 +
2264  net/ipv4/netfilter.c                               |    1 +
2265  .../netfilter/nf_conntrack_l3proto_ipv4_compat.c   |    1 +
2266  net/ipv4/netfilter/nf_nat_proto_common.c           |    1 +
2267  net/ipv4/netfilter/nf_nat_proto_icmp.c             |    1 +
2268  net/ipv4/netfilter/nf_nat_proto_sctp.c             |    1 +
2269  net/ipv4/netfilter/nf_nat_proto_tcp.c              |    1 +
2270  net/ipv4/netfilter/nf_nat_proto_udp.c              |    1 +
2271  net/ipv4/netfilter/nf_nat_proto_udplite.c          |    1 +
2272  net/ipv4/ping.c                                    |    1 +
2273  net/ipv4/proc.c                                    |    1 +
2274  net/ipv4/raw.c                                     |    1 +
2275  net/ipv4/syncookies.c                              |    1 +
2276  net/ipv4/udplite.c                                 |    1 +
2277  net/ipv4/xfrm4_state.c                             |    1 +
2278  net/ipv6/addrconf.c                                |    1 +
2279  net/ipv6/addrconf_core.c                           |    1 +
2280  net/ipv6/exthdrs.c                                 |    1 +
2281  net/ipv6/exthdrs_core.c                            |    1 +
2282  net/ipv6/fib6_rules.c                              |    1 +
2283  net/ipv6/ip6_flowlabel.c                           |    1 +
2284  net/ipv6/ip6mr.c                                   |    1 +
2285  net/ipv6/netfilter.c                               |    1 +
2286  net/ipv6/proc.c                                    |    1 +
2287  net/ipv6/raw.c                                     |    1 +
2288  net/ipv6/reassembly.c                              |    1 +
2289  net/ipv6/route.c                                   |    1 +
2290  net/ipv6/sysctl_net_ipv6.c                         |    1 +
2291  net/ipv6/udplite.c                                 |    1 +
2292  net/ipv6/xfrm6_state.c                             |    1 +
2293  net/ipx/ipx_proc.c                                 |    1 +
2294  net/irda/discovery.c                               |    1 +
2295  net/irda/irda_device.c                             |    1 +
2296  net/irda/irttp.c                                   |    1 +
2297  net/irda/qos.c                                     |    2 +
2298  net/llc/llc_input.c                                |    1 +
2299  net/llc/llc_output.c                               |    1 +
2300  net/llc/llc_proc.c                                 |    1 +
2301  net/mac80211/agg-rx.c                              |    1 +
2302  net/mac80211/agg-tx.c                              |    1 +
2303  net/mac80211/cfg.c                                 |   12 +-
2304  net/mac80211/ht.c                                  |    1 +
2305  net/mac80211/ieee80211_i.h                         |    1 +
2306  net/mac80211/key.c                                 |    1 +
2307  net/mac80211/led.c                                 |    1 +
2308  net/mac80211/mlme.c                                |   20 +-
2309  net/mac80211/offchannel.c                          |    1 +
2310  net/mac80211/rate.c                                |    1 +
2311  net/mac80211/rc80211_minstrel_debugfs.c            |    1 +
2312  net/mac80211/rc80211_minstrel_ht_debugfs.c         |    1 +
2313  net/mac80211/rc80211_pid_debugfs.c                 |    1 +
2314  net/mac80211/rx.c                                  |    1 +
2315  net/mac80211/scan.c                                |    1 +
2316  net/mac80211/status.c                              |    1 +
2317  net/mac80211/tkip.c                                |    1 +
2318  net/mac80211/tx.c                                  |    1 +
2319  net/mac80211/util.c                                |    1 +
2320  net/mac80211/work.c                                |    7 +-
2321  net/netfilter/ipset/ip_set_getport.c               |    1 +
2322  net/netfilter/ipset/pfxlen.c                       |    1 +
2323  net/netfilter/nf_conntrack_acct.c                  |    1 +
2324  net/netfilter/nf_conntrack_ecache.c                |    1 +
2325  net/netfilter/nf_conntrack_expect.c                |    2 +
2326  net/netfilter/x_tables.c                           |    1 +
2327  net/netfilter/xt_quota.c                           |    1 +
2328  net/netfilter/xt_statistic.c                       |    1 +
2329  net/netrom/nr_route.c                              |    1 +
2330  net/nfc/af_nfc.c                                   |    1 +
2331  net/nfc/nci/core.c                                 |    1 +
2332  net/nfc/rawsock.c                                  |    1 +
2333  net/phonet/datagram.c                              |    1 +
2334  net/phonet/pep.c                                   |    1 +
2335  net/phonet/socket.c                                |    1 +
2336  net/rds/cong.c                                     |    1 +
2337  net/rds/connection.c                               |    1 +
2338  net/rds/ib.c                                       |    1 +
2339  net/rds/info.c                                     |    1 +
2340  net/rds/iw.c                                       |    1 +
2341  net/rds/message.c                                  |    1 +
2342  net/rds/page.c                                     |    1 +
2343  net/rds/rdma_transport.c                           |    1 +
2344  net/rds/recv.c                                     |    1 +
2345  net/rds/send.c                                     |    2 +
2346  net/rds/stats.c                                    |    1 +
2347  net/rds/tcp.c                                      |    1 +
2348  net/rds/threads.c                                  |    1 +
2349  net/rfkill/input.c                                 |    1 +
2350  net/rose/rose_route.c                              |    1 +
2351  net/rxrpc/ar-output.c                              |    1 +
2352  net/rxrpc/ar-recvmsg.c                             |    1 +
2353  net/sched/act_api.c                                |    1 +
2354  net/sched/cls_flow.c                               |    1 +
2355  net/sched/sch_mq.c                                 |    1 +
2356  net/sched/sch_mqprio.c                             |    1 +
2357  net/sctp/proc.c                                    |    1 +
2358  net/sctp/socket.c                                  |    1 +
2359  net/sunrpc/addr.c                                  |    1 +
2360  net/sunrpc/backchannel_rqst.c                      |    1 +
2361  net/sunrpc/socklib.c                               |    1 +
2362  net/sunrpc/svc_xprt.c                              |    1 +
2363  net/sunrpc/svcsock.c                               |    1 +
2364  net/sunrpc/xprtrdma/svc_rdma_transport.c           |    1 +
2365  net/sysctl_net.c                                   |    1 +
2366  net/tipc/core.c                                    |    2 +
2367  net/tipc/socket.c                                  |    1 +
2368  net/wanrouter/wanproc.c                            |    2 -
2369  net/wimax/op-msg.c                                 |    1 +
2370  net/wimax/op-reset.c                               |    1 +
2371  net/wimax/op-rfkill.c                              |    1 +
2372  net/wimax/stack.c                                  |    1 +
2373  net/wireless/ibss.c                                |    1 +
2374  net/wireless/mesh.c                                |    1 +
2375  net/wireless/radiotap.c                            |    1 +
2376  net/wireless/reg.c                                 |    2 +
2377  net/wireless/sme.c                                 |    1 +
2378  net/wireless/util.c                                |    1 +
2379  net/wireless/wext-compat.c                         |    1 +
2380  net/wireless/wext-core.c                           |    1 +
2381  net/wireless/wext-sme.c                            |    1 +
2382  net/wireless/wext-spy.c                            |    1 +
2383  net/x25/x25_proc.c                                 |    1 +
2384  net/xfrm/xfrm_proc.c                               |    1 +
2385  net/xfrm/xfrm_replay.c                             |    1 +
2386  samples/Kconfig                                    |    6 -
2387  scripts/Makefile.build                             |    2 +-
2388  scripts/Makefile.lib                               |    4 +
2389  scripts/basic/fixdep.c                             |    1 +
2390  scripts/checkpatch.pl                              |   14 +
2391  scripts/extract-vmlinux                            |   62 +
2392  scripts/genksyms/genksyms.c                        |    3 +-
2393  scripts/genksyms/genksyms.h                        |    4 +-
2394  scripts/genksyms/lex.l                             |    8 +
2395  scripts/genksyms/lex.lex.c_shipped                 |   12 +-
2396  scripts/genksyms/parse.tab.c_shipped               |  645 +++---
2397  scripts/genksyms/parse.tab.h_shipped               |    7 +-
2398  scripts/genksyms/parse.y                           |   40 +-
2399  scripts/kconfig/Makefile                           |   28 +-
2400  scripts/kconfig/confdata.c                         |   49 +-
2401  scripts/kconfig/lxdialog/textbox.c                 |    3 +-
2402  scripts/kconfig/mconf.c                            |   86 +-
2403  scripts/kconfig/menu.c                             |   13 +-
2404  scripts/kconfig/nconf.c                            |   23 +-
2405  scripts/kconfig/nconf.gui.c                        |   59 +-
2406  scripts/kconfig/nconf.h                            |    2 +-
2407  scripts/kconfig/streamline_config.pl               |   22 +-
2408  scripts/mod/modpost.c                              |    7 +
2409  scripts/tags.sh                                    |    4 +-
2410  security/selinux/hooks.c                           |    1 +
2411  security/selinux/netlink.c                         |    1 +
2412  sound/aoa/soundbus/i2sbus/pcm.c                    |    1 +
2413  sound/arm/pxa2xx-ac97-lib.c                        |    1 +
2414  sound/arm/pxa2xx-pcm.c                             |    1 +
2415  sound/core/control.c                               |    1 +
2416  sound/core/device.c                                |    1 +
2417  sound/core/hwdep.c                                 |    1 +
2418  sound/core/info.c                                  |    1 +
2419  sound/core/info_oss.c                              |    1 +
2420  sound/core/init.c                                  |    1 +
2421  sound/core/isadma.c                                |    1 +
2422  sound/core/jack.c                                  |    1 +
2423  sound/core/memory.c                                |    1 +
2424  sound/core/misc.c                                  |    2 +
2425  sound/core/oss/mixer_oss.c                         |    1 +
2426  sound/core/oss/pcm_oss.c                           |    2 +-
2427  sound/core/pcm.c                                   |    1 +
2428  sound/core/pcm_lib.c                               |    1 +
2429  sound/core/pcm_memory.c                            |    1 +
2430  sound/core/pcm_misc.c                              |    1 +
2431  sound/core/pcm_native.c                            |    1 +
2432  sound/core/rawmidi.c                               |    2 +-
2433  sound/core/seq/oss/seq_oss.c                       |    2 +-
2434  sound/core/seq/oss/seq_oss_init.c                  |    1 +
2435  sound/core/seq/oss/seq_oss_synth.c                 |    1 +
2436  sound/core/seq/seq.c                               |    2 +-
2437  sound/core/seq/seq_clientmgr.c                     |    1 +
2438  sound/core/seq/seq_device.c                        |    1 +
2439  sound/core/seq/seq_dummy.c                         |    2 +-
2440  sound/core/seq/seq_info.c                          |    1 +
2441  sound/core/seq/seq_lock.c                          |    1 +
2442  sound/core/seq/seq_memory.c                        |    1 +
2443  sound/core/seq/seq_midi.c                          |    2 +-
2444  sound/core/seq/seq_midi_emul.c                     |    1 +
2445  sound/core/seq/seq_midi_event.c                    |    1 +
2446  sound/core/seq/seq_ports.c                         |    1 +
2447  sound/core/seq/seq_system.c                        |    1 +
2448  sound/core/seq/seq_virmidi.c                       |    1 +
2449  sound/core/sound.c                                 |    2 +-
2450  sound/core/sound_oss.c                             |    1 +
2451  sound/core/timer.c                                 |    2 +-
2452  sound/core/vmaster.c                               |    1 +
2453  sound/drivers/aloop.c                              |    2 +-
2454  sound/drivers/dummy.c                              |    2 +-
2455  sound/drivers/ml403-ac97cr.c                       |    2 +-
2456  sound/drivers/mpu401/mpu401.c                      |    2 +-
2457  sound/drivers/mpu401/mpu401_uart.c                 |    1 +
2458  sound/drivers/mtpav.c                              |    1 +
2459  sound/drivers/mts64.c                              |    1 +
2460  sound/drivers/opl3/opl3_lib.c                      |    1 +
2461  sound/drivers/opl3/opl3_oss.c                      |    1 +
2462  sound/drivers/opl3/opl3_seq.c                      |    1 +
2463  sound/drivers/opl3/opl3_synth.c                    |    1 +
2464  sound/drivers/opl4/opl4_lib.c                      |    1 +
2465  sound/drivers/opl4/opl4_proc.c                     |    1 +
2466  sound/drivers/opl4/opl4_seq.c                      |    1 +
2467  sound/drivers/pcsp/pcsp.c                          |    2 +-
2468  sound/drivers/portman2x4.c                         |    1 +
2469  sound/drivers/serial-u16550.c                      |    2 +-
2470  sound/drivers/virmidi.c                            |    2 +-
2471  sound/drivers/vx/vx_core.c                         |    1 +
2472  sound/drivers/vx/vx_hwdep.c                        |    1 +
2473  sound/firewire/iso-resources.c                     |    1 +
2474  sound/firewire/packets-buffer.c                    |    1 +
2475  sound/i2c/cs8427.c                                 |    1 +
2476  sound/i2c/i2c.c                                    |    1 +
2477  sound/i2c/other/ak4113.c                           |    1 +
2478  sound/i2c/other/ak4114.c                           |    1 +
2479  sound/i2c/other/ak4117.c                           |    1 +
2480  sound/i2c/other/ak4xxx-adda.c                      |    1 +
2481  sound/i2c/other/pt2258.c                           |    1 +
2482  sound/i2c/other/tea575x-tuner.c                    |    1 +
2483  sound/i2c/tea6330t.c                               |    1 +
2484  sound/isa/ad1816a/ad1816a.c                        |    2 +-
2485  sound/isa/ad1848/ad1848.c                          |    2 +-
2486  sound/isa/als100.c                                 |    2 +-
2487  sound/isa/azt2320.c                                |    2 +-
2488  sound/isa/cmi8330.c                                |    2 +-
2489  sound/isa/cs423x/cs4231.c                          |    2 +-
2490  sound/isa/cs423x/cs4236.c                          |    2 +-
2491  sound/isa/es1688/es1688.c                          |    2 +-
2492  sound/isa/es1688/es1688_lib.c                      |    1 +
2493  sound/isa/es18xx.c                                 |    2 +-
2494  sound/isa/gus/gus_main.c                           |    1 +
2495  sound/isa/gus/gus_volume.c                         |    1 +
2496  sound/isa/gus/gusclassic.c                         |    2 +-
2497  sound/isa/gus/gusextreme.c                         |    2 +-
2498  sound/isa/gus/gusmax.c                             |    2 +-
2499  sound/isa/gus/interwave.c                          |    2 +-
2500  sound/isa/msnd/msnd.c                              |    1 +
2501  sound/isa/msnd/msnd_midi.c                         |    1 +
2502  sound/isa/msnd/msnd_pinnacle_mixer.c               |    1 +
2503  sound/isa/opl3sa2.c                                |    2 +-
2504  sound/isa/opti9xx/miro.c                           |    2 +-
2505  sound/isa/opti9xx/opti92x-ad1848.c                 |    2 +-
2506  sound/isa/sb/emu8000.c                             |    1 +
2507  sound/isa/sb/emu8000_callback.c                    |    1 +
2508  sound/isa/sb/emu8000_patch.c                       |    1 +
2509  sound/isa/sb/emu8000_synth.c                       |    1 +
2510  sound/isa/sb/sb16.c                                |    2 +-
2511  sound/isa/sb/sb16_csp.c                            |    1 +
2512  sound/isa/sb/sb16_main.c                           |    1 +
2513  sound/isa/sb/sb8.c                                 |    2 +-
2514  sound/isa/sb/sb8_main.c                            |    1 +
2515  sound/isa/sb/sb_common.c                           |    1 +
2516  sound/isa/sscape.c                                 |    2 +-
2517  sound/isa/wavefront/wavefront.c                    |    2 +-
2518  sound/isa/wavefront/wavefront_fx.c                 |    1 +
2519  sound/isa/wavefront/wavefront_synth.c              |    1 +
2520  sound/isa/wss/wss_lib.c                            |    1 +
2521  sound/mips/au1x00.c                                |    1 +
2522  sound/mips/hal2.c                                  |    1 +
2523  sound/mips/sgio2audio.c                            |    1 +
2524  sound/pci/ac97/ac97_codec.c                        |    2 +-
2525  sound/pci/ac97/ac97_pcm.c                          |    1 +
2526  sound/pci/ad1889.c                                 |    1 +
2527  sound/pci/ak4531_codec.c                           |    1 +
2528  sound/pci/ali5451/ali5451.c                        |    2 +-
2529  sound/pci/als300.c                                 |    2 +-
2530  sound/pci/als4000.c                                |    2 +-
2531  sound/pci/asihpi/asihpi.c                          |    1 +
2532  sound/pci/asihpi/hpioctl.c                         |    1 +
2533  sound/pci/atiixp.c                                 |    2 +-
2534  sound/pci/atiixp_modem.c                           |    2 +-
2535  sound/pci/au88x0/au88x0.c                          |    2 +-
2536  sound/pci/au88x0/au88x0_game.c                     |    1 +
2537  sound/pci/aw2/aw2-alsa.c                           |    1 +
2538  sound/pci/azt3328.c                                |    2 +-
2539  sound/pci/bt87x.c                                  |    2 +-
2540  sound/pci/ca0106/ca0106_main.c                     |    2 +-
2541  sound/pci/cmipci.c                                 |    2 +-
2542  sound/pci/cs4281.c                                 |    2 +-
2543  sound/pci/cs46xx/cs46xx.c                          |    2 +-
2544  sound/pci/cs46xx/cs46xx_lib.c                      |    1 +
2545  sound/pci/cs5530.c                                 |    2 +-
2546  sound/pci/cs5535audio/cs5535audio.c                |    2 +-
2547  sound/pci/ctxfi/xfi.c                              |    1 +
2548  sound/pci/echoaudio/darla20.c                      |    2 +-
2549  sound/pci/echoaudio/darla24.c                      |    2 +-
2550  sound/pci/echoaudio/echo3g.c                       |    2 +-
2551  sound/pci/echoaudio/echoaudio.c                    |    2 +
2552  sound/pci/echoaudio/gina20.c                       |    2 +-
2553  sound/pci/echoaudio/gina24.c                       |    2 +-
2554  sound/pci/echoaudio/indigo.c                       |    2 +-
2555  sound/pci/echoaudio/indigodj.c                     |    2 +-
2556  sound/pci/echoaudio/indigodjx.c                    |    2 +-
2557  sound/pci/echoaudio/indigoio.c                     |    2 +-
2558  sound/pci/echoaudio/indigoiox.c                    |    2 +-
2559  sound/pci/echoaudio/layla20.c                      |    2 +-
2560  sound/pci/echoaudio/layla24.c                      |    2 +-
2561  sound/pci/echoaudio/mia.c                          |    2 +-
2562  sound/pci/echoaudio/mona.c                         |    2 +-
2563  sound/pci/emu10k1/emu10k1.c                        |    2 +-
2564  sound/pci/emu10k1/emu10k1_callback.c               |    1 +
2565  sound/pci/emu10k1/emu10k1_main.c                   |    1 +
2566  sound/pci/emu10k1/emu10k1_synth.c                  |    1 +
2567  sound/pci/emu10k1/emu10k1x.c                       |    2 +-
2568  sound/pci/emu10k1/io.c                             |    1 +
2569  sound/pci/emu10k1/memory.c                         |    1 +
2570  sound/pci/emu10k1/voice.c                          |    1 +
2571  sound/pci/ens1370.c                                |    2 +-
2572  sound/pci/es1938.c                                 |    2 +-
2573  sound/pci/es1968.c                                 |    2 +-
2574  sound/pci/fm801.c                                  |    2 +-
2575  sound/pci/hda/hda_beep.c                           |    1 +
2576  sound/pci/hda/hda_codec.c                          |    1 +
2577  sound/pci/hda/hda_generic.c                        |    1 +
2578  sound/pci/hda/hda_hwdep.c                          |    1 +
2579  sound/pci/hda/patch_analog.c                       |    1 +
2580  sound/pci/hda/patch_ca0110.c                       |    1 +
2581  sound/pci/hda/patch_ca0132.c                       |    1 +
2582  sound/pci/hda/patch_cirrus.c                       |    1 +
2583  sound/pci/hda/patch_cmedia.c                       |    1 +
2584  sound/pci/hda/patch_conexant.c                     |    1 +
2585  sound/pci/hda/patch_hdmi.c                         |    2 +-
2586  sound/pci/hda/patch_realtek.c                      |    1 +
2587  sound/pci/hda/patch_si3054.c                       |    1 +
2588  sound/pci/hda/patch_sigmatel.c                     |    1 +
2589  sound/pci/hda/patch_via.c                          |    1 +
2590  sound/pci/ice1712/ak4xxx.c                         |    1 +
2591  sound/pci/ice1712/ice1712.c                        |    2 +-
2592  sound/pci/ice1712/ice1724.c                        |    2 +-
2593  sound/pci/intel8x0.c                               |    2 +-
2594  sound/pci/intel8x0m.c                              |    2 +-
2595  sound/pci/korg1212/korg1212.c                      |    2 +-
2596  sound/pci/lola/lola.c                              |    2 +-
2597  sound/pci/maestro3.c                               |    2 +-
2598  sound/pci/mixart/mixart.c                          |    2 +-
2599  sound/pci/mixart/mixart_hwdep.c                    |    1 +
2600  sound/pci/nm256/nm256.c                            |    2 +-
2601  sound/pci/oxygen/oxygen.c                          |    1 +
2602  sound/pci/oxygen/oxygen_io.c                       |    1 +
2603  sound/pci/oxygen/oxygen_lib.c                      |    1 +
2604  sound/pci/oxygen/virtuoso.c                        |    1 +
2605  sound/pci/pcxhr/pcxhr.c                            |    2 +-
2606  sound/pci/pcxhr/pcxhr_hwdep.c                      |    1 +
2607  sound/pci/riptide/riptide.c                        |    1 +
2608  sound/pci/rme32.c                                  |    2 +-
2609  sound/pci/rme96.c                                  |    2 +-
2610  sound/pci/rme9652/hdsp.c                           |    2 +-
2611  sound/pci/rme9652/hdspm.c                          |    2 +-
2612  sound/pci/rme9652/rme9652.c                        |    2 +-
2613  sound/pci/sis7019.c                                |    2 +-
2614  sound/pci/sonicvibes.c                             |    2 +-
2615  sound/pci/trident/trident.c                        |    2 +-
2616  sound/pci/trident/trident_main.c                   |    1 +
2617  sound/pci/via82xx.c                                |    2 +-
2618  sound/pci/via82xx_modem.c                          |    2 +-
2619  sound/pci/vx222/vx222.c                            |    2 +-
2620  sound/pci/ymfpci/ymfpci.c                          |    2 +-
2621  sound/pci/ymfpci/ymfpci_main.c                     |    1 +
2622  sound/pcmcia/pdaudiocf/pdaudiocf.c                 |    2 +-
2623  sound/pcmcia/vx/vxpocket.c                         |    2 +-
2624  sound/ppc/powermac.c                               |    2 +-
2625  sound/ppc/snd_ps3.c                                |    1 +
2626  sound/sh/aica.c                                    |    2 +-
2627  sound/sh/sh_dac_audio.c                            |    1 +
2628  sound/soc/blackfin/bf5xx-sport.c                   |    1 +
2629  sound/soc/blackfin/bfin-eval-adav80x.c             |    1 +
2630  sound/soc/codecs/ac97.c                            |    1 +
2631  sound/soc/codecs/ads117x.c                         |    1 +
2632  sound/soc/codecs/ak4642.c                          |    1 +
2633  sound/soc/codecs/cx20442.c                         |    1 +
2634  sound/soc/codecs/da7210.c                          |    1 +
2635  sound/soc/codecs/dmic.c                            |    1 +
2636  sound/soc/codecs/pcm3008.c                         |    1 +
2637  sound/soc/codecs/sn95031.c                         |    1 +
2638  sound/soc/codecs/wl1273.c                          |    1 +
2639  sound/soc/ep93xx/edb93xx.c                         |    1 +
2640  sound/soc/ep93xx/snappercl15.c                     |    1 +
2641  sound/soc/imx/wm1133-ev1.c                         |    1 +
2642  sound/soc/mid-x86/mfld_machine.c                   |    1 +
2643  sound/soc/mid-x86/sst_platform.c                   |    1 +
2644  sound/soc/omap/am3517evm.c                         |    1 +
2645  sound/soc/omap/ams-delta.c                         |    1 +
2646  sound/soc/omap/igep0020.c                          |    1 +
2647  sound/soc/omap/n810.c                              |    1 +
2648  sound/soc/omap/omap-pcm.c                          |    1 +
2649  sound/soc/omap/omap3beagle.c                       |    1 +
2650  sound/soc/omap/omap3evm.c                          |    1 +
2651  sound/soc/omap/omap3pandora.c                      |    1 +
2652  sound/soc/omap/omap4-hdmi-card.c                   |    1 +
2653  sound/soc/omap/osk5912.c                           |    1 +
2654  sound/soc/omap/overo.c                             |    1 +
2655  sound/soc/omap/rx51.c                              |    1 +
2656  sound/soc/omap/sdp3430.c                           |    1 +
2657  sound/soc/omap/sdp4430.c                           |    1 +
2658  sound/soc/omap/zoom2.c                             |    1 +
2659  sound/soc/pxa/pxa2xx-pcm.c                         |    1 +
2660  sound/soc/samsung/ac97.c                           |    1 +
2661  sound/soc/samsung/dma.c                            |    1 +
2662  sound/soc/samsung/goni_wm8994.c                    |    1 +
2663  sound/soc/samsung/h1940_uda1380.c                  |    1 +
2664  sound/soc/samsung/i2s.c                            |    1 +
2665  sound/soc/samsung/idma.c                           |    1 +
2666  sound/soc/samsung/jive_wm8750.c                    |    1 +
2667  sound/soc/samsung/ln2440sbc_alc650.c               |    1 +
2668  sound/soc/samsung/pcm.c                            |    1 +
2669  sound/soc/samsung/rx1950_uda1380.c                 |    1 +
2670  sound/soc/samsung/s3c2412-i2s.c                    |    1 +
2671  sound/soc/samsung/s3c24xx-i2s.c                    |    1 +
2672  sound/soc/samsung/s3c24xx_simtec.c                 |    1 +
2673  sound/soc/samsung/s3c24xx_simtec_hermes.c          |    1 +
2674  sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c     |    1 +
2675  sound/soc/samsung/s3c24xx_uda134x.c                |    1 +
2676  sound/soc/samsung/smartq_wm8987.c                  |    1 +
2677  sound/soc/samsung/smdk_spdif.c                     |    1 +
2678  sound/soc/samsung/smdk_wm8580.c                    |    1 +
2679  sound/soc/samsung/smdk_wm8580pcm.c                 |    1 +
2680  sound/soc/samsung/smdk_wm8994pcm.c                 |    1 +
2681  sound/soc/samsung/smdk_wm9713.c                    |    1 +
2682  sound/soc/samsung/spdif.c                          |    1 +
2683  sound/soc/samsung/speyside.c                       |    1 +
2684  sound/soc/samsung/speyside_wm8962.c                |    1 +
2685  sound/soc/sh/fsi-ak4642.c                          |    1 +
2686  sound/soc/sh/fsi-da7210.c                          |    1 +
2687  sound/soc/sh/fsi-hdmi.c                            |    1 +
2688  sound/soc/sh/fsi.c                                 |    1 +
2689  sound/soc/sh/siu_dai.c                             |    1 +
2690  sound/soc/soc-cache.c                              |    1 +
2691  sound/soc/soc-io.c                                 |    1 +
2692  sound/soc/soc-jack.c                               |    1 +
2693  sound/soc/soc-utils.c                              |    1 +
2694  sound/soc/tegra/tegra_asoc_utils.c                 |    1 +
2695  sound/sparc/dbri.c                                 |    1 +
2696  sound/synth/emux/emux.c                            |    1 +
2697  sound/synth/emux/emux_oss.c                        |    1 +
2698  sound/synth/emux/emux_seq.c                        |    2 +-
2699  sound/synth/emux/emux_synth.c                      |    1 +
2700  sound/synth/emux/soundfont.c                       |    1 +
2701  sound/synth/util_mem.c                             |    1 +
2702  sound/usb/6fire/firmware.c                         |    1 +
2703  sound/usb/card.c                                   |    1 +
2704  sound/usb/midi.c                                   |    1 +
2705  sound/usb/usx2y/us122l.c                           |    1 +
2706  sound/usb/usx2y/usbusx2yaudio.c                    |    1 +
2707  tools/perf/builtin-record.c                        |   13 +-
2708  tools/perf/builtin-stat.c                          |   20 +-
2709  tools/perf/builtin-test.c                          |    6 +-
2710  tools/perf/builtin-top.c                           |   54 +-
2711  tools/perf/util/annotate.c                         |    9 +-
2712  tools/perf/util/debug.c                            |    7 +-
2713  tools/perf/util/debug.h                            |   17 +-
2714  tools/perf/util/evlist.c                           |   30 +
2715  tools/perf/util/evlist.h                           |    2 +
2716  tools/perf/util/evsel.c                            |   43 +-
2717  tools/perf/util/evsel.h                            |   10 +-
2718  tools/perf/util/header.c                           |    2 +-
2719  tools/perf/util/hist.c                             |    3 +-
2720  tools/perf/util/hist.h                             |    1 +
2721  tools/perf/util/python.c                           |   31 +-
2722  tools/perf/util/session.c                          |   46 +-
2723  tools/perf/util/session.h                          |    1 +
2724  tools/perf/util/top.h                              |    1 -
2725  tools/perf/util/trace-event-info.c                 |    2 +-
2726  tools/perf/util/ui/browser.c                       |  151 +-
2727  tools/perf/util/ui/browser.h                       |    9 +
2728  tools/perf/util/ui/browsers/annotate.c             |   14 +-
2729  tools/perf/util/ui/browsers/hists.c                |   74 +-
2730  tools/perf/util/ui/helpline.c                      |   16 +-
2731  tools/perf/util/ui/helpline.h                      |    2 +
2732  tools/perf/util/ui/progress.c                      |   65 +-
2733  tools/perf/util/ui/progress.h                      |    7 +-
2734  tools/perf/util/ui/setup.c                         |   83 +-
2735  tools/perf/util/ui/ui.h                            |    3 +
2736  tools/perf/util/ui/util.c                          |  182 +-
2737  tools/perf/util/ui/util.h                          |    8 +-
2738  tools/power/x86/turbostat/turbostat.c              |   28 +-
2739  virt/kvm/iommu.c                                   |    2 +
2740  2729 files changed, 33521 insertions(+), 13231 deletions(-)
2741  create mode 100644 Documentation/ABI/stable/sysfs-acpi-pmprofile
2742  create mode 100644 Documentation/devicetree/bindings/mtd/atmel-dataflash.txt
2743  create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/dcsr.txt
2744  create mode 100644 arch/arm/mach-shmobile/board-kota2.c
2745  create mode 100644 arch/arm/mach-shmobile/include/mach/intc.h
2746  delete mode 100644 arch/arm/plat-omap/include/plat/omap-alsa.h
2747  delete mode 100644 arch/ia64/include/asm/xen/grant_table.h
2748  delete mode 100644 arch/mips/powertv/asic/Kconfig
2749  delete mode 100644 arch/powerpc/boot/dts/hcu4.dts
2750  rename arch/powerpc/boot/dts/{p2040rdb.dts => p2041rdb.dts} (95%)
2751  rename arch/powerpc/boot/dts/{p2040si.dtsi => p2041si.dtsi} (80%)
2752  create mode 100644 arch/powerpc/boot/dts/p3060qds.dts
2753  create mode 100644 arch/powerpc/boot/dts/p3060si.dtsi
2754  delete mode 100644 arch/powerpc/configs/40x/hcu4_defconfig
2755  create mode 100644 arch/powerpc/include/asm/opal.h
2756  create mode 100644 arch/powerpc/mm/hugetlbpage-book3e.c
2757  delete mode 100644 arch/powerpc/platforms/40x/hcu4.c
2758  rename arch/powerpc/platforms/85xx/{p2040_rdb.c => p2041_rdb.c} (82%)
2759  create mode 100644 arch/powerpc/platforms/85xx/p3060_qds.c
2760  create mode 100644 arch/powerpc/platforms/powernv/Kconfig
2761  create mode 100644 arch/powerpc/platforms/powernv/Makefile
2762  create mode 100644 arch/powerpc/platforms/powernv/opal-nvram.c
2763  create mode 100644 arch/powerpc/platforms/powernv/opal-rtc.c
2764  create mode 100644 arch/powerpc/platforms/powernv/opal-takeover.S
2765  create mode 100644 arch/powerpc/platforms/powernv/opal-wrappers.S
2766  create mode 100644 arch/powerpc/platforms/powernv/opal.c
2767  create mode 100644 arch/powerpc/platforms/powernv/pci-p5ioc2.c
2768  create mode 100644 arch/powerpc/platforms/powernv/pci.c
2769  create mode 100644 arch/powerpc/platforms/powernv/pci.h
2770  create mode 100644 arch/powerpc/platforms/powernv/powernv.h
2771  create mode 100644 arch/powerpc/platforms/powernv/setup.c
2772  create mode 100644 arch/powerpc/platforms/powernv/smp.c
2773  create mode 100644 arch/powerpc/platforms/ps3/gelic_udbg.c
2774  create mode 100644 arch/powerpc/platforms/wsp/msi.c
2775  create mode 100644 arch/powerpc/platforms/wsp/msi.h
2776  create mode 100644 arch/powerpc/platforms/wsp/wsp_pci.c
2777  create mode 100644 arch/powerpc/platforms/wsp/wsp_pci.h
2778  create mode 100644 arch/powerpc/sysdev/xics/ics-opal.c
2779  delete mode 100644 arch/x86/include/asm/xen/grant_table.h
2780  rename arch/powerpc/sysdev/mpc8xxx_gpio.c => drivers/gpio/gpio-mpc8xxx.c (98%)
2781  create mode 100644 drivers/gpu/drm/radeon/atombios_encoders.c
2782  create mode 100644 drivers/mtd/devices/docg3.c
2783  create mode 100644 drivers/mtd/devices/docg3.h
2784  delete mode 100644 drivers/mtd/maps/ceiva.c
2785  delete mode 100644 drivers/mtd/maps/edb7312.c
2786  delete mode 100644 drivers/mtd/nand/edb7312.c
2787  create mode 100644 drivers/mtd/nand/gpmi-nand/Makefile
2788  create mode 100644 drivers/mtd/nand/gpmi-nand/bch-regs.h
2789  create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-lib.c
2790  create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-nand.c
2791  create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-nand.h
2792  create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-regs.h
2793  create mode 100644 drivers/target/target_core_cdb.h
2794  create mode 100644 drivers/tty/hvc/hvc_opal.c
2795  create mode 100644 fs/btrfs/backref.c
2796  create mode 100644 fs/btrfs/backref.h
2797  create mode 100644 fs/btrfs/reada.c
2798  create mode 100644 include/linux/export.h
2799  create mode 100644 include/xen/interface/platform.h
2800  create mode 100755 scripts/extract-vmlinux
2801 Merging fixes/master (3155521 Revert "hvc_console: display printk messages on console.")
2802 $ git merge fixes/master
2803 Already up-to-date.
2804 Merging kbuild-current/rc-fixes (322a8b0 Linux 3.1-rc1)
2805 $ git merge kbuild-current/rc-fixes
2806 Already up-to-date.
2807 Merging arm-current/fixes (abf015f Revert "ARM: 7098/1: kdump: copy kernel relocation code at the kexec prepare stage")
2808 $ git merge arm-current/fixes
2809 Merge made by the 'recursive' strategy.
2810  arch/arm/kernel/machine_kexec.c |   35 +++++++++++++++++------------------
2811  1 files changed, 17 insertions(+), 18 deletions(-)
2812 Merging m68k-current/for-linus (4b7cecc m68k/mac: Remove mac_irq_{en,dis}able() wrappers)
2813 $ git merge m68k-current/for-linus
2814 Merge made by the 'recursive' strategy.
2815  arch/m68k/Kconfig                 |    4 +-
2816  arch/m68k/Kconfig.bus             |    9 +
2817  arch/m68k/Kconfig.devices         |   31 ++++
2818  arch/m68k/amiga/amiints.c         |  168 ++++++++------------
2819  arch/m68k/amiga/cia.c             |   39 +++--
2820  arch/m68k/apollo/dn_ints.c        |   35 +++--
2821  arch/m68k/atari/ataints.c         |  274 +++----------------------------
2822  arch/m68k/bvme6000/config.c       |    2 +-
2823  arch/m68k/hp300/time.c            |    2 +-
2824  arch/m68k/include/asm/hardirq.h   |    5 +
2825  arch/m68k/include/asm/irq.h       |   69 ++------
2826  arch/m68k/include/asm/macintosh.h |    2 +
2827  arch/m68k/include/asm/q40ints.h   |    3 -
2828  arch/m68k/kernel/Makefile         |    9 +-
2829  arch/m68k/kernel/entry_mm.S       |    7 +-
2830  arch/m68k/kernel/ints.c           |  323 ++++---------------------------------
2831  arch/m68k/mac/baboon.c            |   21 +--
2832  arch/m68k/mac/iop.c               |   10 +-
2833  arch/m68k/mac/macints.c           |   24 ++--
2834  arch/m68k/mac/oss.c               |   54 +++----
2835  arch/m68k/mac/psc.c               |   49 +++---
2836  arch/m68k/mac/via.c               |   74 ++++-----
2837  arch/m68k/mvme147/config.c        |    5 +-
2838  arch/m68k/mvme16x/config.c        |    2 +-
2839  arch/m68k/q40/q40ints.c           |   60 ++++----
2840  arch/m68k/sun3/sun3ints.c         |   46 +++---
2841  drivers/ide/ide-cd.c              |    1 -
2842  drivers/ide/ide-floppy.c          |    1 -
2843  drivers/ide/ide-tape.c            |    1 -
2844  drivers/macintosh/via-macii.c     |    2 +-
2845  drivers/macintosh/via-maciisi.c   |    4 +-
2846  31 files changed, 393 insertions(+), 943 deletions(-)
2847 Merging powerpc-merge/merge (0c81e4b powerpc/p1023rds: Fix the error of bank-width of nor flash)
2848 $ git merge powerpc-merge/merge
2849 Already up-to-date.
2850 Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries)
2851 $ git merge 52xx-and-virtex-current/powerpc/merge
2852 Already up-to-date.
2853 Merging sparc/master (51ce185 sparc: Hook up process_vm_{readv,writev} syscalls.)
2854 $ git merge sparc/master
2855 Merge made by the 'recursive' strategy.
2856  arch/sparc/include/asm/unistd.h |    4 +++-
2857  arch/sparc/kernel/systbls_32.S  |    2 +-
2858  arch/sparc/kernel/systbls_64.S  |    4 ++--
2859  3 files changed, 6 insertions(+), 4 deletions(-)
2860 Merging scsi-rc-fixes/master (3ee72ca Merge git://github.com/davem330/net)
2861 $ git merge scsi-rc-fixes/master
2862 Already up-to-date.
2863 Merging net/master (94956ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
2864 $ git merge net/master
2865 Already up-to-date.
2866 Merging sound-current/for-linus (f441917 ALSA: hda - Revert the check of NO_PRESENCE pincfg default bit)
2867 $ git merge sound-current/for-linus
2868 Already up-to-date.
2869 Merging pci-current/for-linus (fdbd3ce PCI: pciehp: Retrieve link speed after link is trained)
2870 $ git merge pci-current/for-linus
2871 Auto-merging drivers/pci/Kconfig
2872 Merge made by the 'recursive' strategy.
2873  drivers/pci/Kconfig                |    1 +
2874  drivers/pci/hotplug/acpiphp_glue.c |   29 ++++++++++++++++++++++++-----
2875  drivers/pci/hotplug/pciehp_hpc.c   |   11 ++---------
2876  include/linux/pci-ats.h            |    6 +++---
2877  include/linux/pci.h                |    2 +-
2878  5 files changed, 31 insertions(+), 18 deletions(-)
2879 Merging wireless/master (24b9c37 mac80211: uAPSD - fix IEEE80211_FCTL_MOREDATA bit setting)
2880 $ git merge wireless/master
2881 Auto-merging net/mac80211/mlme.c
2882 Merge made by the 'recursive' strategy.
2883  drivers/net/wireless/b43/xmit.c               |   15 +++++++++++++--
2884  drivers/net/wireless/b43/xmit.h               |   16 +++++++++++++++-
2885  drivers/net/wireless/brcm80211/brcmsmac/dma.c |    5 +++--
2886  drivers/net/wireless/mwifiex/scan.c           |    3 ++-
2887  net/mac80211/mlme.c                           |   19 +++++++++++++++++++
2888  net/mac80211/sta_info.c                       |    8 ++++----
2889  net/wireless/nl80211.c                        |    9 +++++++--
2890  net/wireless/scan.c                           |   13 ++++++++-----
2891  8 files changed, 71 insertions(+), 17 deletions(-)
2892 Merging driver-core.current/driver-core-linus (094803e Merge branch 'akpm' (Andrew's incoming))
2893 $ git merge driver-core.current/driver-core-linus
2894 Already up-to-date.
2895 Merging tty.current/tty-linus (094803e Merge branch 'akpm' (Andrew's incoming))
2896 $ git merge tty.current/tty-linus
2897 Already up-to-date.
2898 Merging usb.current/usb-linus (094803e Merge branch 'akpm' (Andrew's incoming))
2899 $ git merge usb.current/usb-linus
2900 Already up-to-date.
2901 Merging staging.current/staging-linus (094803e Merge branch 'akpm' (Andrew's incoming))
2902 $ git merge staging.current/staging-linus
2903 Already up-to-date.
2904 Merging cpufreq-current/fixes (2f84dd7 autofs4: fix debug printk warning uncovered by cleanup)
2905 $ git merge cpufreq-current/fixes
2906 Already up-to-date.
2907 Merging input-current/for-linus (b42c9097 Input: i8042 - add HP Pavilion dv4s to 'notimeout' and 'nomux' blacklists)
2908 $ git merge input-current/for-linus
2909 Merge made by the 'recursive' strategy.
2910  drivers/input/serio/i8042-x86ia64io.h |   14 ++++++++++++++
2911  1 files changed, 14 insertions(+), 0 deletions(-)
2912 Merging md-current/for-linus (399b35f md/raid5: abort an pending parity operations when array fails.)
2913 $ git merge md-current/for-linus
2914 Auto-merging drivers/md/raid5.c
2915 Merge made by the 'recursive' strategy.
2916  drivers/md/raid5.c |   12 ++++++++----
2917  1 files changed, 8 insertions(+), 4 deletions(-)
2918 Merging audit-current/for-linus (def5754 Audit: remove spaces from audit_log_d_path)
2919 $ git merge audit-current/for-linus
2920 Already up-to-date.
2921 Merging crypto-current/master (0559dcf crypto: algapi - Fix build problem with NET disabled)
2922 $ git merge crypto-current/master
2923 Merge made by the 'recursive' strategy.
2924  crypto/ablkcipher.c  |   14 ++++++++++++++
2925  crypto/aead.c        |   14 ++++++++++++++
2926  crypto/ahash.c       |    7 +++++++
2927  crypto/blkcipher.c   |    7 +++++++
2928  crypto/crypto_user.c |    3 ---
2929  crypto/pcompress.c   |    7 +++++++
2930  crypto/rng.c         |    7 +++++++
2931  crypto/shash.c       |    7 +++++++
2932  8 files changed, 63 insertions(+), 3 deletions(-)
2933 Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
2934 $ git merge ide/master
2935 Merge made by the 'recursive' strategy.
2936  drivers/ide/cy82c693.c |    6 +++---
2937  drivers/ide/icside.c   |    2 +-
2938  drivers/ide/piix.c     |   18 ++++++++++--------
2939  drivers/ide/triflex.c  |   16 +++++++++++++++-
2940  4 files changed, 29 insertions(+), 13 deletions(-)
2941 Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
2942 $ git merge dwmw2/master
2943 Already up-to-date.
2944 Merging sh-current/sh-fixes-for-linus (21d41f2 sh: fix the compile error in setup-sh7757.c)
2945 $ git merge sh-current/sh-fixes-for-linus
2946 Already up-to-date.
2947 Merging rmobile-current/rmobile-fixes-for-linus (a408bae ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support)
2948 $ git merge rmobile-current/rmobile-fixes-for-linus
2949 Already up-to-date.
2950 Merging devicetree-current/devicetree/merge (50e07f8 dt: add empty of_machine_is_compatible)
2951 $ git merge devicetree-current/devicetree/merge
2952 Already up-to-date.
2953 Merging spi-current/spi/merge (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
2954 $ git merge spi-current/spi/merge
2955 Already up-to-date.
2956 Merging arm/for-next (abf015f Revert "ARM: 7098/1: kdump: copy kernel relocation code at the kexec prepare stage")
2957 $ git merge arm/for-next
2958 Already up-to-date.
2959 Merging arm-lpae/for-next (689eac8 ARM: LPAE: Add the Kconfig entries)
2960 $ git merge arm-lpae/for-next
2961 Merge made by the 'recursive' strategy.
2962  arch/arm/Kconfig                            |    2 +-
2963  arch/arm/boot/compressed/head.S             |    1 +
2964  arch/arm/include/asm/assembler.h            |   11 ++
2965  arch/arm/include/asm/page.h                 |    4 +
2966  arch/arm/include/asm/pgalloc.h              |   26 ++++-
2967  arch/arm/include/asm/pgtable-2level.h       |   41 ++++++
2968  arch/arm/include/asm/pgtable-3level-hwdef.h |   82 +++++++++++++
2969  arch/arm/include/asm/pgtable-3level-types.h |   70 +++++++++++
2970  arch/arm/include/asm/pgtable-3level.h       |  155 ++++++++++++++++++++++++
2971  arch/arm/include/asm/pgtable-hwdef.h        |    4 +
2972  arch/arm/include/asm/pgtable.h              |   43 +------
2973  arch/arm/include/asm/proc-fns.h             |   21 +++
2974  arch/arm/include/asm/setup.h                |    8 ++
2975  arch/arm/include/asm/system.h               |    8 ++
2976  arch/arm/include/asm/tlb.h                  |   12 ++-
2977  arch/arm/kernel/head.S                      |   45 +++++++-
2978  arch/arm/kernel/hw_breakpoint.c             |    8 +-
2979  arch/arm/kernel/setup.c                     |   23 ++++
2980  arch/arm/kernel/sleep.S                     |    2 +
2981  arch/arm/mm/Kconfig                         |   17 +++
2982  arch/arm/mm/alignment.c                     |    2 +-
2983  arch/arm/mm/context.c                       |   19 +++-
2984  arch/arm/mm/fault.c                         |  111 +++--------------
2985  arch/arm/mm/fault.h                         |   27 ++++-
2986  arch/arm/mm/fsr-2level.c                    |   78 ++++++++++++
2987  arch/arm/mm/fsr-3level.c                    |   68 +++++++++++
2988  arch/arm/mm/idmap.c                         |   36 +++++-
2989  arch/arm/mm/ioremap.c                       |   39 ++++---
2990  arch/arm/mm/mmu.c                           |   46 +++++++-
2991  arch/arm/mm/pgd.c                           |   51 +++++++-
2992  arch/arm/mm/proc-macros.S                   |    5 +-
2993  arch/arm/mm/proc-v7-2level.S                |  171 ++++++++++++++++++++++++++
2994  arch/arm/mm/proc-v7-3level.S                |  149 +++++++++++++++++++++++
2995  arch/arm/mm/proc-v7.S                       |  175 +++------------------------
2996  34 files changed, 1238 insertions(+), 322 deletions(-)
2997  create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h
2998  create mode 100644 arch/arm/include/asm/pgtable-3level-types.h
2999  create mode 100644 arch/arm/include/asm/pgtable-3level.h
3000  create mode 100644 arch/arm/mm/fsr-2level.c
3001  create mode 100644 arch/arm/mm/fsr-3level.c
3002  create mode 100644 arch/arm/mm/proc-v7-2level.S
3003  create mode 100644 arch/arm/mm/proc-v7-3level.S
3004 Merging arm-soc/for-next (3155521 Revert "hvc_console: display printk messages on console.")
3005 $ git merge arm-soc/for-next
3006 Already up-to-date.
3007 $ git am -3 ../patches/0001-arm-soc-merge-fixup-for-fixup-reserve-being-added-to.patch
3008 Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
3009 $ git reset HEAD^
3010 Unstaged changes after reset:
3011 M       arch/arm/mach-msm/board-msm8x60.c
3012 $ git add .
3013 $ git commit -v -a --amend
3014 [master a7ae71b] Merge remote-tracking branch 'arm-lpae/for-next'
3015 Merging at91/at91-next (bcdbf16 hw_random: add driver for atmel true hardware random number generator)
3016 $ git merge at91/at91-next
3017 Resolved 'arch/arm/mach-at91/at91sam9260.c' using previous resolution.
3018 Resolved 'arch/arm/mach-at91/at91sam9g45.c' using previous resolution.
3019 Resolved 'arch/arm/mach-at91/board-afeb-9260v1.c' using previous resolution.
3020 Resolved 'arch/arm/mach-at91/board-neocore926.c' using previous resolution.
3021 Resolved 'arch/arm/mach-at91/board-rm9200dk.c' using previous resolution.
3022 Resolved 'arch/arm/mach-at91/board-sam9g20ek.c' using previous resolution.
3023 Resolved 'arch/arm/mach-at91/board-sam9m10g45ek.c' using previous resolution.
3024 Resolved 'drivers/ata/pata_at91.c' using previous resolution.
3025 Auto-merging drivers/usb/host/ohci-at91.c
3026 Auto-merging drivers/usb/gadget/at91_udc.c
3027 Auto-merging drivers/mtd/nand/atmel_nand.c
3028 Auto-merging drivers/mmc/host/at91_mci.c
3029 Auto-merging drivers/ide/at91_ide.c
3030 Auto-merging drivers/ata/pata_at91.c
3031 CONFLICT (content): Merge conflict in drivers/ata/pata_at91.c
3032 Auto-merging arch/arm/mach-at91/include/mach/gpio.h
3033 Auto-merging arch/arm/mach-at91/include/mach/at91sam9g45.h
3034 Auto-merging arch/arm/mach-at91/gpio.c
3035 Auto-merging arch/arm/mach-at91/board-yl-9200.c
3036 Auto-merging arch/arm/mach-at91/board-usb-a926x.c
3037 Auto-merging arch/arm/mach-at91/board-snapper9260.c
3038 Auto-merging arch/arm/mach-at91/board-sam9rlek.c
3039 Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
3040 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9m10g45ek.c
3041 Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
3042 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9g20ek.c
3043 Auto-merging arch/arm/mach-at91/board-sam9263ek.c
3044 Auto-merging arch/arm/mach-at91/board-sam9261ek.c
3045 Auto-merging arch/arm/mach-at91/board-sam9260ek.c
3046 Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
3047 Auto-merging arch/arm/mach-at91/board-rm9200ek.c
3048 Auto-merging arch/arm/mach-at91/board-rm9200dk.c
3049 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-rm9200dk.c
3050 Auto-merging arch/arm/mach-at91/board-qil-a9260.c
3051 Auto-merging arch/arm/mach-at91/board-picotux200.c
3052 Auto-merging arch/arm/mach-at91/board-neocore926.c
3053 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-neocore926.c
3054 Auto-merging arch/arm/mach-at91/board-kb9202.c
3055 Auto-merging arch/arm/mach-at91/board-kafa.c
3056 Auto-merging arch/arm/mach-at91/board-ecbat91.c
3057 Auto-merging arch/arm/mach-at91/board-eb9200.c
3058 Auto-merging arch/arm/mach-at91/board-csb637.c
3059 Auto-merging arch/arm/mach-at91/board-csb337.c
3060 Auto-merging arch/arm/mach-at91/board-cpuat91.c
3061 Auto-merging arch/arm/mach-at91/board-cpu9krea.c
3062 Auto-merging arch/arm/mach-at91/board-carmeva.c
3063 Auto-merging arch/arm/mach-at91/board-cap9adk.c
3064 Auto-merging arch/arm/mach-at91/board-cam60.c
3065 Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
3066 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-afeb-9260v1.c
3067 Auto-merging arch/arm/mach-at91/board-1arm.c
3068 Auto-merging arch/arm/mach-at91/at91sam9rl_devices.c
3069 Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
3070 Auto-merging arch/arm/mach-at91/at91sam9g45.c
3071 CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
3072 Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
3073 Auto-merging arch/arm/mach-at91/at91sam9263.c
3074 Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
3075 Auto-merging arch/arm/mach-at91/at91sam9261.c
3076 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
3077 Auto-merging arch/arm/mach-at91/at91sam9260.c
3078 CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c
3079 Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
3080 Auto-merging arch/arm/mach-at91/at91rm9200.c
3081 Auto-merging arch/arm/mach-at91/at91cap9_devices.c
3082 Auto-merging arch/arm/mach-at91/at91cap9.c
3083 Auto-merging arch/arm/configs/at91sam9rl_defconfig
3084 Auto-merging arch/arm/configs/at91sam9g20_defconfig
3085 Auto-merging arch/arm/configs/at91sam9260_defconfig
3086 Auto-merging arch/arm/configs/at91cap9_defconfig
3087 Automatic merge failed; fix conflicts and then commit the result.
3088 $ git commit -v -a
3089 [master b74062b] Merge remote-tracking branch 'at91/at91-next'
3090 $ git diff -M --stat --summary HEAD^..
3091  .../{at91cap9adk_defconfig => at91cap9_defconfig}  |    5 -
3092  ...91sam9260ek_defconfig => at91sam9260_defconfig} |   14 +-
3093  ...91sam9g20ek_defconfig => at91sam9g20_defconfig} |   19 +-
3094  ...at91sam9rlek_defconfig => at91sam9rl_defconfig} |    5 -
3095  arch/arm/mach-at91/at91cap9.c                      |    8 +-
3096  arch/arm/mach-at91/at91cap9_devices.c              |   20 +-
3097  arch/arm/mach-at91/at91rm9200.c                    |    8 +-
3098  arch/arm/mach-at91/at91rm9200_devices.c            |   22 +-
3099  arch/arm/mach-at91/at91sam9260.c                   |    6 +-
3100  arch/arm/mach-at91/at91sam9260_devices.c           |   26 +-
3101  arch/arm/mach-at91/at91sam9261.c                   |    6 +-
3102  arch/arm/mach-at91/at91sam9261_devices.c           |   14 +-
3103  arch/arm/mach-at91/at91sam9263.c                   |   10 +-
3104  arch/arm/mach-at91/at91sam9263_devices.c           |   26 +-
3105  arch/arm/mach-at91/at91sam9g45.c                   |   10 +-
3106  arch/arm/mach-at91/at91sam9g45_devices.c           |   20 +-
3107  arch/arm/mach-at91/at91sam9rl.c                    |    8 +-
3108  arch/arm/mach-at91/at91sam9rl_devices.c            |   16 +-
3109  arch/arm/mach-at91/board-1arm.c                    |    1 +
3110  arch/arm/mach-at91/board-afeb-9260v1.c             |    7 +-
3111  arch/arm/mach-at91/board-cam60.c                   |    3 +-
3112  arch/arm/mach-at91/board-cap9adk.c                 |   14 +-
3113  arch/arm/mach-at91/board-carmeva.c                 |    6 +-
3114  arch/arm/mach-at91/board-cpu9krea.c                |    7 +-
3115  arch/arm/mach-at91/board-cpuat91.c                 |    4 +
3116  arch/arm/mach-at91/board-csb337.c                  |    4 +-
3117  arch/arm/mach-at91/board-csb637.c                  |    1 +
3118  arch/arm/mach-at91/board-eb9200.c                  |    8 +-
3119  arch/arm/mach-at91/board-ecbat91.c                 |    4 +
3120  arch/arm/mach-at91/board-eco920.c                  |    4 +
3121  arch/arm/mach-at91/board-flexibity.c               |    4 +-
3122  arch/arm/mach-at91/board-foxg20.c                  |    6 +-
3123  arch/arm/mach-at91/board-gsia18s.c                 |    4 +-
3124  arch/arm/mach-at91/board-kafa.c                    |    1 +
3125  arch/arm/mach-at91/board-kb9202.c                  |    5 +-
3126  arch/arm/mach-at91/board-neocore926.c              |    4 +-
3127  arch/arm/mach-at91/board-pcontrol-g20.c            |    1 +
3128  arch/arm/mach-at91/board-picotux200.c              |    2 +
3129  arch/arm/mach-at91/board-qil-a9260.c               |   11 +-
3130  arch/arm/mach-at91/board-rm9200dk.c                |   10 +-
3131  arch/arm/mach-at91/board-rm9200ek.c                |    2 +
3132  arch/arm/mach-at91/board-sam9-l9260.c              |    7 +-
3133  arch/arm/mach-at91/board-sam9260ek.c               |   11 +-
3134  arch/arm/mach-at91/board-sam9261ek.c               |    8 +-
3135  arch/arm/mach-at91/board-sam9263ek.c               |    7 +-
3136  arch/arm/mach-at91/board-sam9g20ek.c               |    8 +-
3137  arch/arm/mach-at91/board-sam9m10g45ek.c            |    3 +
3138  arch/arm/mach-at91/board-sam9rlek.c                |    7 +-
3139  arch/arm/mach-at91/board-snapper9260.c             |    5 +
3140  arch/arm/mach-at91/board-stamp9g20.c               |   11 +-
3141  arch/arm/mach-at91/board-usb-a926x.c               |    5 +-
3142  arch/arm/mach-at91/board-yl-9200.c                 |    6 +-
3143  arch/arm/mach-at91/generic.h                       |    2 +-
3144  arch/arm/mach-at91/gpio.c                          |   62 ++--
3145  arch/arm/mach-at91/include/mach/at91cap9.h         |    9 +-
3146  arch/arm/mach-at91/include/mach/at91rm9200.h       |    9 +-
3147  arch/arm/mach-at91/include/mach/at91sam9260.h      |    7 +-
3148  arch/arm/mach-at91/include/mach/at91sam9261.h      |    7 +-
3149  arch/arm/mach-at91/include/mach/at91sam9263.h      |   11 +-
3150  arch/arm/mach-at91/include/mach/at91sam9g45.h      |   11 +-
3151  arch/arm/mach-at91/include/mach/at91sam9rl.h       |    9 +-
3152  arch/arm/mach-at91/include/mach/gpio.h             |  336 ++++++++++----------
3153  drivers/ata/pata_at91.c                            |    6 +-
3154  drivers/ide/at91_ide.c                             |    2 +-
3155  drivers/mmc/host/at91_mci.c                        |   30 +-
3156  drivers/mtd/nand/atmel_nand.c                      |    8 +-
3157  drivers/usb/gadget/at91_udc.c                      |   14 +-
3158  drivers/usb/host/ohci-at91.c                       |    4 +-
3159  68 files changed, 530 insertions(+), 431 deletions(-)
3160  rename arch/arm/configs/{at91cap9adk_defconfig => at91cap9_defconfig} (95%)
3161  rename arch/arm/configs/{at91sam9260ek_defconfig => at91sam9260_defconfig} (89%)
3162  rename arch/arm/configs/{at91sam9g20ek_defconfig => at91sam9g20_defconfig} (93%)
3163  rename arch/arm/configs/{at91sam9rlek_defconfig => at91sam9rl_defconfig} (94%)
3164 Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
3165 $ git merge davinci/davinci-next
3166 Already up-to-date.
3167 Merging i.MX/for-next (5788f4d Merge branches 'imx-fixes', 'imx-cleanup' and 'imx-features' into master)
3168 $ git merge i.MX/for-next
3169 Resolved 'arch/arm/mach-mx5/clock-mx51-mx53.c' using previous resolution.
3170 Resolved 'arch/arm/mach-mx5/devices-imx53.h' using previous resolution.
3171 Resolved 'arch/arm/mach-mx5/mm.c' using previous resolution.
3172 Resolved 'arch/arm/plat-mxc/include/mach/hardware.h' using previous resolution.
3173 Auto-merging arch/arm/plat-mxc/include/mach/hardware.h
3174 CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h
3175 Auto-merging arch/arm/mach-mxs/clock-mx28.c
3176 Auto-merging arch/arm/mach-mx5/mm.c
3177 CONFLICT (content): Merge conflict in arch/arm/mach-mx5/mm.c
3178 Auto-merging arch/arm/mach-mx5/devices-imx53.h
3179 CONFLICT (content): Merge conflict in arch/arm/mach-mx5/devices-imx53.h
3180 Auto-merging arch/arm/mach-mx5/clock-mx51-mx53.c
3181 CONFLICT (content): Merge conflict in arch/arm/mach-mx5/clock-mx51-mx53.c
3182 Automatic merge failed; fix conflicts and then commit the result.
3183 $ git commit -v -a
3184 [master d1329d7] Merge remote-tracking branch 'i.MX/for-next'
3185 $ git diff -M --stat --summary HEAD^..
3186  arch/arm/mach-mxs/clock-mx28.c |    6 +++++-
3187  1 files changed, 5 insertions(+), 1 deletions(-)
3188 Merging linux-spec/for-next (5111711 Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux)
3189 $ git merge linux-spec/for-next
3190 Already up-to-date.
3191 Merging omap/for-next (322a8b0 Linux 3.1-rc1)
3192 $ git merge omap/for-next
3193 Already up-to-date.
3194 Merging pxa/for-next (19d6c13 [ARM] pxa/hx4700: actually use platform_lcd driver)
3195 $ git merge pxa/for-next
3196 Already up-to-date.
3197 Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
3198 $ git merge samsung/next-samsung
3199 Already up-to-date.
3200 Merging s5p/for-next (8301457 ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos)
3201 $ git merge s5p/for-next
3202 Already up-to-date.
3203 Merging tegra/for-next (80d0a76 Merge branches 'for-3.2/cleanup' and 'for-3.2/features' into for-next)
3204 $ git merge tegra/for-next
3205 Auto-merging arch/arm/Kconfig
3206 Merge made by the 'recursive' strategy.
3207  arch/arm/Kconfig |    1 +
3208  1 files changed, 1 insertions(+), 0 deletions(-)
3209 Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
3210 $ git merge xilinx/arm-next
3211 Already up-to-date.
3212 Merging blackfin/for-linus (e114599 Blackfin: add serial TX IRQ in individual platform resource)
3213 $ git merge blackfin/for-linus
3214 Auto-merging arch/blackfin/mach-bf537/boards/tcm_bf537.c
3215 Auto-merging arch/blackfin/mach-bf537/boards/stamp.c
3216 Auto-merging arch/blackfin/mach-bf537/boards/pnav10.c
3217 Auto-merging arch/blackfin/mach-bf537/boards/dnp5370.c
3218 Auto-merging arch/blackfin/mach-bf537/boards/cm_bf537u.c
3219 Auto-merging arch/blackfin/mach-bf537/boards/cm_bf537e.c
3220 Auto-merging arch/blackfin/mach-bf527/boards/tll6527m.c
3221 Auto-merging arch/blackfin/mach-bf527/boards/ezkit.c
3222 Auto-merging arch/blackfin/mach-bf527/boards/ezbrd.c
3223 Auto-merging arch/blackfin/mach-bf527/boards/cm_bf527.c
3224 Auto-merging arch/blackfin/mach-bf527/boards/ad7160eval.c
3225 Auto-merging arch/blackfin/mach-bf518/boards/ezbrd.c
3226 Merge made by the 'recursive' strategy.
3227  arch/blackfin/include/asm/bfin_serial.h      |    2 +
3228  arch/blackfin/mach-bf518/boards/ezbrd.c      |   14 +++++++++++-
3229  arch/blackfin/mach-bf518/boards/tcm-bf518.c  |   14 +++++++++++-
3230  arch/blackfin/mach-bf527/boards/ad7160eval.c |   14 +++++++++++-
3231  arch/blackfin/mach-bf527/boards/cm_bf527.c   |   14 +++++++++++-
3232  arch/blackfin/mach-bf527/boards/ezbrd.c      |   14 +++++++++++-
3233  arch/blackfin/mach-bf527/boards/ezkit.c      |   14 +++++++++++-
3234  arch/blackfin/mach-bf527/boards/tll6527m.c   |   14 +++++++++++-
3235  arch/blackfin/mach-bf533/boards/H8606.c      |    7 +++++-
3236  arch/blackfin/mach-bf533/boards/blackstamp.c |    7 +++++-
3237  arch/blackfin/mach-bf533/boards/cm_bf533.c   |    7 +++++-
3238  arch/blackfin/mach-bf533/boards/ezkit.c      |    7 +++++-
3239  arch/blackfin/mach-bf533/boards/ip0x.c       |    7 +++++-
3240  arch/blackfin/mach-bf533/boards/stamp.c      |    7 +++++-
3241  arch/blackfin/mach-bf537/boards/cm_bf537e.c  |   14 +++++++++++-
3242  arch/blackfin/mach-bf537/boards/cm_bf537u.c  |   14 +++++++++++-
3243  arch/blackfin/mach-bf537/boards/dnp5370.c    |   14 +++++++++++-
3244  arch/blackfin/mach-bf537/boards/minotaur.c   |   14 +++++++++++-
3245  arch/blackfin/mach-bf537/boards/pnav10.c     |   14 +++++++++++-
3246  arch/blackfin/mach-bf537/boards/stamp.c      |   14 +++++++++++-
3247  arch/blackfin/mach-bf537/boards/tcm_bf537.c  |   14 +++++++++++-
3248  arch/blackfin/mach-bf538/boards/ezkit.c      |   21 ++++++++++++++++--
3249  arch/blackfin/mach-bf548/boards/cm_bf548.c   |   28 ++++++++++++++++++++++---
3250  arch/blackfin/mach-bf548/boards/ezkit.c      |   28 ++++++++++++++++++++++---
3251  arch/blackfin/mach-bf561/boards/acvilon.c    |    7 +++++-
3252  arch/blackfin/mach-bf561/boards/cm_bf561.c   |    7 +++++-
3253  arch/blackfin/mach-bf561/boards/ezkit.c      |    7 +++++-
3254  arch/blackfin/mach-bf561/boards/tepla.c      |    7 +++++-
3255  28 files changed, 296 insertions(+), 49 deletions(-)
3256 Merging c6x/for-linux-next (2141355 C6X: MAINTAINERS)
3257 $ git merge c6x/for-linux-next
3258 Auto-merging include/asm-generic/page.h
3259 Auto-merging MAINTAINERS
3260 Merge made by the 'recursive' strategy.
3261  Documentation/devicetree/bindings/c6x/clocks.txt   |   40 +
3262  Documentation/devicetree/bindings/c6x/dscr.txt     |  127 +++
3263  Documentation/devicetree/bindings/c6x/emifa.txt    |   62 ++
3264  .../devicetree/bindings/c6x/interrupt.txt          |  104 +++
3265  Documentation/devicetree/bindings/c6x/soc.txt      |   28 +
3266  Documentation/devicetree/bindings/c6x/timer64.txt  |   26 +
3267  MAINTAINERS                                        |    8 +
3268  arch/c6x/Kconfig                                   |  174 +++++
3269  arch/c6x/Makefile                                  |   60 ++
3270  arch/c6x/boot/Makefile                             |   30 +
3271  arch/c6x/boot/dts/dsk6455.dts                      |   62 ++
3272  arch/c6x/boot/dts/evmc6457.dts                     |   48 ++
3273  arch/c6x/boot/dts/evmc6472.dts                     |   73 ++
3274  arch/c6x/boot/dts/evmc6474.dts                     |   58 ++
3275  arch/c6x/boot/dts/tms320c6455.dtsi                 |   96 +++
3276  arch/c6x/boot/dts/tms320c6457.dtsi                 |   68 ++
3277  arch/c6x/boot/dts/tms320c6472.dtsi                 |  134 ++++
3278  arch/c6x/boot/dts/tms320c6474.dtsi                 |   89 +++
3279  arch/c6x/boot/linked_dtb.S                         |    2 +
3280  arch/c6x/configs/dsk6455_defconfig                 |   44 ++
3281  arch/c6x/configs/evmc6457_defconfig                |   41 +
3282  arch/c6x/configs/evmc6472_defconfig                |   42 +
3283  arch/c6x/configs/evmc6474_defconfig                |   42 +
3284  arch/c6x/include/asm/Kbuild                        |   54 ++
3285  arch/c6x/include/asm/asm-offsets.h                 |    1 +
3286  arch/c6x/include/asm/bitops.h                      |  105 +++
3287  arch/c6x/include/asm/byteorder.h                   |   12 +
3288  arch/c6x/include/asm/cache.h                       |   90 +++
3289  arch/c6x/include/asm/cacheflush.h                  |   65 ++
3290  arch/c6x/include/asm/checksum.h                    |   34 +
3291  arch/c6x/include/asm/clkdev.h                      |   22 +
3292  arch/c6x/include/asm/clock.h                       |  148 ++++
3293  arch/c6x/include/asm/delay.h                       |   67 ++
3294  arch/c6x/include/asm/dma-mapping.h                 |   91 +++
3295  arch/c6x/include/asm/dscr.h                        |   34 +
3296  arch/c6x/include/asm/elf.h                         |  113 +++
3297  arch/c6x/include/asm/ftrace.h                      |    6 +
3298  arch/c6x/include/asm/hardirq.h                     |   20 +
3299  arch/c6x/include/asm/irq.h                         |  302 ++++++++
3300  arch/c6x/include/asm/irqflags.h                    |   72 ++
3301  arch/c6x/include/asm/linkage.h                     |   30 +
3302  arch/c6x/include/asm/megamod-pic.h                 |    9 +
3303  arch/c6x/include/asm/memblock.h                    |    4 +
3304  arch/c6x/include/asm/mmu.h                         |   18 +
3305  arch/c6x/include/asm/module.h                      |   33 +
3306  arch/c6x/include/asm/mutex.h                       |    6 +
3307  arch/c6x/include/asm/page.h                        |   11 +
3308  arch/c6x/include/asm/pgtable.h                     |   81 ++
3309  arch/c6x/include/asm/processor.h                   |  132 ++++
3310  arch/c6x/include/asm/procinfo.h                    |   28 +
3311  arch/c6x/include/asm/prom.h                        |    1 +
3312  arch/c6x/include/asm/ptrace.h                      |  174 +++++
3313  arch/c6x/include/asm/sections.h                    |   12 +
3314  arch/c6x/include/asm/setup.h                       |   32 +
3315  arch/c6x/include/asm/sigcontext.h                  |   80 ++
3316  arch/c6x/include/asm/signal.h                      |   17 +
3317  arch/c6x/include/asm/soc.h                         |   35 +
3318  arch/c6x/include/asm/string.h                      |   21 +
3319  arch/c6x/include/asm/swab.h                        |   54 ++
3320  arch/c6x/include/asm/syscall.h                     |  123 +++
3321  arch/c6x/include/asm/syscalls.h                    |   55 ++
3322  arch/c6x/include/asm/system.h                      |  168 ++++
3323  arch/c6x/include/asm/thread_info.h                 |  121 +++
3324  arch/c6x/include/asm/timer64.h                     |    6 +
3325  arch/c6x/include/asm/timex.h                       |   33 +
3326  arch/c6x/include/asm/tlb.h                         |    8 +
3327  arch/c6x/include/asm/traps.h                       |   36 +
3328  arch/c6x/include/asm/uaccess.h                     |  107 +++
3329  arch/c6x/include/asm/unaligned.h                   |  170 +++++
3330  arch/c6x/include/asm/unistd.h                      |   26 +
3331  arch/c6x/kernel/Makefile                           |   12 +
3332  arch/c6x/kernel/asm-offsets.c                      |  123 +++
3333  arch/c6x/kernel/c6x_ksyms.c                        |   66 ++
3334  arch/c6x/kernel/devicetree.c                       |   53 ++
3335  arch/c6x/kernel/dma.c                              |  153 ++++
3336  arch/c6x/kernel/entry.S                            |  803 ++++++++++++++++++++
3337  arch/c6x/kernel/head.S                             |   84 ++
3338  arch/c6x/kernel/irq.c                              |  728 ++++++++++++++++++
3339  arch/c6x/kernel/module.c                           |  123 +++
3340  arch/c6x/kernel/process.c                          |  263 +++++++
3341  arch/c6x/kernel/ptrace.c                           |  187 +++++
3342  arch/c6x/kernel/setup.c                            |  498 ++++++++++++
3343  arch/c6x/kernel/signal.c                           |  377 +++++++++
3344  arch/c6x/kernel/soc.c                              |   91 +++
3345  arch/c6x/kernel/switch_to.S                        |   74 ++
3346  arch/c6x/kernel/sys_c6x.c                          |   74 ++
3347  arch/c6x/kernel/time.c                             |   65 ++
3348  arch/c6x/kernel/traps.c                            |  423 ++++++++++
3349  arch/c6x/kernel/vectors.S                          |   81 ++
3350  arch/c6x/kernel/vmlinux.lds.S                      |  162 ++++
3351  arch/c6x/lib/Makefile                              |    7 +
3352  arch/c6x/lib/checksum.c                            |   36 +
3353  arch/c6x/lib/csum_64plus.S                         |  419 ++++++++++
3354  arch/c6x/lib/divi.S                                |   53 ++
3355  arch/c6x/lib/divremi.S                             |   46 ++
3356  arch/c6x/lib/divremu.S                             |   87 +++
3357  arch/c6x/lib/divu.S                                |   98 +++
3358  arch/c6x/lib/llshl.S                               |   37 +
3359  arch/c6x/lib/llshr.S                               |   38 +
3360  arch/c6x/lib/llshru.S                              |   38 +
3361  arch/c6x/lib/memcpy_64plus.S                       |   46 ++
3362  arch/c6x/lib/mpyll.S                               |   49 ++
3363  arch/c6x/lib/negll.S                               |   31 +
3364  arch/c6x/lib/pop_rts.S                             |   32 +
3365  arch/c6x/lib/push_rts.S                            |   31 +
3366  arch/c6x/lib/remi.S                                |   64 ++
3367  arch/c6x/lib/remu.S                                |   82 ++
3368  arch/c6x/lib/strasgi.S                             |   89 +++
3369  arch/c6x/lib/strasgi_64plus.S                      |   39 +
3370  arch/c6x/mm/Makefile                               |    5 +
3371  arch/c6x/mm/dma-coherent.c                         |  143 ++++
3372  arch/c6x/mm/init.c                                 |  113 +++
3373  arch/c6x/platforms/Kconfig                         |   16 +
3374  arch/c6x/platforms/Makefile                        |   12 +
3375  arch/c6x/platforms/cache.c                         |  445 +++++++++++
3376  arch/c6x/platforms/dscr.c                          |  598 +++++++++++++++
3377  arch/c6x/platforms/emif.c                          |   88 +++
3378  arch/c6x/platforms/megamod-pic.c                   |  349 +++++++++
3379  arch/c6x/platforms/platform.c                      |   17 +
3380  arch/c6x/platforms/pll.c                           |  444 +++++++++++
3381  arch/c6x/platforms/plldata.c                       |  404 ++++++++++
3382  arch/c6x/platforms/timer64.c                       |  236 ++++++
3383  include/asm-generic/io.h                           |    2 +-
3384  include/asm-generic/page.h                         |   10 +-
3385  include/asm-generic/uaccess.h                      |    7 +-
3386  include/linux/elf-em.h                             |    1 +
3387  126 files changed, 12972 insertions(+), 5 deletions(-)
3388  create mode 100644 Documentation/devicetree/bindings/c6x/clocks.txt
3389  create mode 100644 Documentation/devicetree/bindings/c6x/dscr.txt
3390  create mode 100644 Documentation/devicetree/bindings/c6x/emifa.txt
3391  create mode 100644 Documentation/devicetree/bindings/c6x/interrupt.txt
3392  create mode 100644 Documentation/devicetree/bindings/c6x/soc.txt
3393  create mode 100644 Documentation/devicetree/bindings/c6x/timer64.txt
3394  create mode 100644 arch/c6x/Kconfig
3395  create mode 100644 arch/c6x/Makefile
3396  create mode 100644 arch/c6x/boot/Makefile
3397  create mode 100644 arch/c6x/boot/dts/dsk6455.dts
3398  create mode 100644 arch/c6x/boot/dts/evmc6457.dts
3399  create mode 100644 arch/c6x/boot/dts/evmc6472.dts
3400  create mode 100644 arch/c6x/boot/dts/evmc6474.dts
3401  create mode 100644 arch/c6x/boot/dts/tms320c6455.dtsi
3402  create mode 100644 arch/c6x/boot/dts/tms320c6457.dtsi
3403  create mode 100644 arch/c6x/boot/dts/tms320c6472.dtsi
3404  create mode 100644 arch/c6x/boot/dts/tms320c6474.dtsi
3405  create mode 100644 arch/c6x/boot/linked_dtb.S
3406  create mode 100644 arch/c6x/configs/dsk6455_defconfig
3407  create mode 100644 arch/c6x/configs/evmc6457_defconfig
3408  create mode 100644 arch/c6x/configs/evmc6472_defconfig
3409  create mode 100644 arch/c6x/configs/evmc6474_defconfig
3410  create mode 100644 arch/c6x/include/asm/Kbuild
3411  create mode 100644 arch/c6x/include/asm/asm-offsets.h
3412  create mode 100644 arch/c6x/include/asm/bitops.h
3413  create mode 100644 arch/c6x/include/asm/byteorder.h
3414  create mode 100644 arch/c6x/include/asm/cache.h
3415  create mode 100644 arch/c6x/include/asm/cacheflush.h
3416  create mode 100644 arch/c6x/include/asm/checksum.h
3417  create mode 100644 arch/c6x/include/asm/clkdev.h
3418  create mode 100644 arch/c6x/include/asm/clock.h
3419  create mode 100644 arch/c6x/include/asm/delay.h
3420  create mode 100644 arch/c6x/include/asm/dma-mapping.h
3421  create mode 100644 arch/c6x/include/asm/dscr.h
3422  create mode 100644 arch/c6x/include/asm/elf.h
3423  create mode 100644 arch/c6x/include/asm/ftrace.h
3424  create mode 100644 arch/c6x/include/asm/hardirq.h
3425  create mode 100644 arch/c6x/include/asm/irq.h
3426  create mode 100644 arch/c6x/include/asm/irqflags.h
3427  create mode 100644 arch/c6x/include/asm/linkage.h
3428  create mode 100644 arch/c6x/include/asm/megamod-pic.h
3429  create mode 100644 arch/c6x/include/asm/memblock.h
3430  create mode 100644 arch/c6x/include/asm/mmu.h
3431  create mode 100644 arch/c6x/include/asm/module.h
3432  create mode 100644 arch/c6x/include/asm/mutex.h
3433  create mode 100644 arch/c6x/include/asm/page.h
3434  create mode 100644 arch/c6x/include/asm/pgtable.h
3435  create mode 100644 arch/c6x/include/asm/processor.h
3436  create mode 100644 arch/c6x/include/asm/procinfo.h
3437  create mode 100644 arch/c6x/include/asm/prom.h
3438  create mode 100644 arch/c6x/include/asm/ptrace.h
3439  create mode 100644 arch/c6x/include/asm/sections.h
3440  create mode 100644 arch/c6x/include/asm/setup.h
3441  create mode 100644 arch/c6x/include/asm/sigcontext.h
3442  create mode 100644 arch/c6x/include/asm/signal.h
3443  create mode 100644 arch/c6x/include/asm/soc.h
3444  create mode 100644 arch/c6x/include/asm/string.h
3445  create mode 100644 arch/c6x/include/asm/swab.h
3446  create mode 100644 arch/c6x/include/asm/syscall.h
3447  create mode 100644 arch/c6x/include/asm/syscalls.h
3448  create mode 100644 arch/c6x/include/asm/system.h
3449  create mode 100644 arch/c6x/include/asm/thread_info.h
3450  create mode 100644 arch/c6x/include/asm/timer64.h
3451  create mode 100644 arch/c6x/include/asm/timex.h
3452  create mode 100644 arch/c6x/include/asm/tlb.h
3453  create mode 100644 arch/c6x/include/asm/traps.h
3454  create mode 100644 arch/c6x/include/asm/uaccess.h
3455  create mode 100644 arch/c6x/include/asm/unaligned.h
3456  create mode 100644 arch/c6x/include/asm/unistd.h
3457  create mode 100644 arch/c6x/kernel/Makefile
3458  create mode 100644 arch/c6x/kernel/asm-offsets.c
3459  create mode 100644 arch/c6x/kernel/c6x_ksyms.c
3460  create mode 100644 arch/c6x/kernel/devicetree.c
3461  create mode 100644 arch/c6x/kernel/dma.c
3462  create mode 100644 arch/c6x/kernel/entry.S
3463  create mode 100644 arch/c6x/kernel/head.S
3464  create mode 100644 arch/c6x/kernel/irq.c
3465  create mode 100644 arch/c6x/kernel/module.c
3466  create mode 100644 arch/c6x/kernel/process.c
3467  create mode 100644 arch/c6x/kernel/ptrace.c
3468  create mode 100644 arch/c6x/kernel/setup.c
3469  create mode 100644 arch/c6x/kernel/signal.c
3470  create mode 100644 arch/c6x/kernel/soc.c
3471  create mode 100644 arch/c6x/kernel/switch_to.S
3472  create mode 100644 arch/c6x/kernel/sys_c6x.c
3473  create mode 100644 arch/c6x/kernel/time.c
3474  create mode 100644 arch/c6x/kernel/traps.c
3475  create mode 100644 arch/c6x/kernel/vectors.S
3476  create mode 100644 arch/c6x/kernel/vmlinux.lds.S
3477  create mode 100644 arch/c6x/lib/Makefile
3478  create mode 100644 arch/c6x/lib/checksum.c
3479  create mode 100644 arch/c6x/lib/csum_64plus.S
3480  create mode 100644 arch/c6x/lib/divi.S
3481  create mode 100644 arch/c6x/lib/divremi.S
3482  create mode 100644 arch/c6x/lib/divremu.S
3483  create mode 100644 arch/c6x/lib/divu.S
3484  create mode 100644 arch/c6x/lib/llshl.S
3485  create mode 100644 arch/c6x/lib/llshr.S
3486  create mode 100644 arch/c6x/lib/llshru.S
3487  create mode 100644 arch/c6x/lib/memcpy_64plus.S
3488  create mode 100644 arch/c6x/lib/mpyll.S
3489  create mode 100644 arch/c6x/lib/negll.S
3490  create mode 100644 arch/c6x/lib/pop_rts.S
3491  create mode 100644 arch/c6x/lib/push_rts.S
3492  create mode 100644 arch/c6x/lib/remi.S
3493  create mode 100644 arch/c6x/lib/remu.S
3494  create mode 100644 arch/c6x/lib/strasgi.S
3495  create mode 100644 arch/c6x/lib/strasgi_64plus.S
3496  create mode 100644 arch/c6x/mm/Makefile
3497  create mode 100644 arch/c6x/mm/dma-coherent.c
3498  create mode 100644 arch/c6x/mm/init.c
3499  create mode 100644 arch/c6x/platforms/Kconfig
3500  create mode 100644 arch/c6x/platforms/Makefile
3501  create mode 100644 arch/c6x/platforms/cache.c
3502  create mode 100644 arch/c6x/platforms/dscr.c
3503  create mode 100644 arch/c6x/platforms/emif.c
3504  create mode 100644 arch/c6x/platforms/megamod-pic.c
3505  create mode 100644 arch/c6x/platforms/platform.c
3506  create mode 100644 arch/c6x/platforms/pll.c
3507  create mode 100644 arch/c6x/platforms/plldata.c
3508  create mode 100644 arch/c6x/platforms/timer64.c
3509 Merging cris/for-next (ea78f5b CRIS: Update documentation)
3510 $ git merge cris/for-next
3511 Auto-merging drivers/net/cris/eth_v10.c
3512 Auto-merging arch/cris/arch-v32/drivers/cryptocop.c
3513 Merge made by the 'recursive' strategy.
3514  Documentation/cris/README               |   62 +++++++++++++++---------------
3515  arch/cris/arch-v32/drivers/cryptocop.c  |    6 +--
3516  arch/cris/arch-v32/kernel/ptrace.c      |    2 -
3517  arch/cris/include/arch-v32/arch/cache.h |    2 +-
3518  drivers/net/cris/eth_v10.c              |    1 -
3519  5 files changed, 34 insertions(+), 39 deletions(-)
3520 Merging quilt/hexagon (8e116d1 Add extra arch overrides to asm-generic/checksum.h)
3521 $ git merge quilt/hexagon
3522 Resolved 'arch/hexagon/kernel/head.S' using previous resolution.
3523 Resolved 'arch/hexagon/kernel/vmlinux.lds.S' using previous resolution.
3524 Auto-merging arch/hexagon/mm/strnlen_user.S
3525 CONFLICT (add/add): Merge conflict in arch/hexagon/mm/strnlen_user.S
3526 Auto-merging arch/hexagon/mm/pgalloc.c
3527 CONFLICT (add/add): Merge conflict in arch/hexagon/mm/pgalloc.c
3528 Auto-merging arch/hexagon/mm/Makefile
3529 CONFLICT (add/add): Merge conflict in arch/hexagon/mm/Makefile
3530 Auto-merging arch/hexagon/lib/memset.S
3531 CONFLICT (add/add): Merge conflict in arch/hexagon/lib/memset.S
3532 Auto-merging arch/hexagon/kernel/vmlinux.lds.S
3533 CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/vmlinux.lds.S
3534 Auto-merging arch/hexagon/kernel/vm_vectors.S
3535 CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/vm_vectors.S
3536 Auto-merging arch/hexagon/kernel/vdso.c
3537 CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/vdso.c
3538 Auto-merging arch/hexagon/kernel/kgdb.c
3539 CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/kgdb.c
3540 Auto-merging arch/hexagon/kernel/hexagon_ksyms.c
3541 CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/hexagon_ksyms.c
3542 Auto-merging arch/hexagon/kernel/head.S
3543 CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/head.S
3544 Auto-merging arch/hexagon/kernel/Makefile
3545 CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/Makefile
3546 Auto-merging arch/hexagon/include/asm/vdso.h
3547 CONFLICT (add/add): Merge conflict in arch/hexagon/include/asm/vdso.h
3548 Auto-merging arch/hexagon/include/asm/timex.h
3549 CONFLICT (add/add): Merge conflict in arch/hexagon/include/asm/timex.h
3550 Auto-merging arch/hexagon/include/asm/Kbuild
3551 CONFLICT (add/add): Merge conflict in arch/hexagon/include/asm/Kbuild
3552 Auto-merging arch/hexagon/Makefile
3553 CONFLICT (add/add): Merge conflict in arch/hexagon/Makefile
3554 Automatic merge failed; fix conflicts and then commit the result.
3555 $ git commit -v -a
3556 Recorded resolution for 'arch/hexagon/Makefile'.
3557 Recorded resolution for 'arch/hexagon/include/asm/Kbuild'.
3558 Recorded resolution for 'arch/hexagon/include/asm/timex.h'.
3559 Recorded resolution for 'arch/hexagon/include/asm/vdso.h'.
3560 Recorded resolution for 'arch/hexagon/kernel/Makefile'.
3561 Recorded resolution for 'arch/hexagon/kernel/hexagon_ksyms.c'.
3562 Recorded resolution for 'arch/hexagon/kernel/kgdb.c'.
3563 Recorded resolution for 'arch/hexagon/kernel/vdso.c'.
3564 Recorded resolution for 'arch/hexagon/kernel/vm_vectors.S'.
3565 Recorded resolution for 'arch/hexagon/lib/memset.S'.
3566 Recorded resolution for 'arch/hexagon/mm/Makefile'.
3567 Recorded resolution for 'arch/hexagon/mm/pgalloc.c'.
3568 Recorded resolution for 'arch/hexagon/mm/strnlen_user.S'.
3569 [master 8d5e462] Merge branch 'quilt/hexagon'
3570 $ git diff -M --stat --summary HEAD^..
3571 Merging ia64/next (0f6a1c0 Pull misc-3.2 into next branch)
3572 $ git merge ia64/next
3573 Already up-to-date!
3574 Merge made by the 'recursive' strategy.
3575 Merging m68k/for-next (4b7cecc m68k/mac: Remove mac_irq_{en,dis}able() wrappers)
3576 $ git merge m68k/for-next
3577 Already up-to-date.
3578 Merging m68knommu/for-next (0ada06b m68k: drop unused Kconfig symbols)
3579 $ git merge m68knommu/for-next
3580 Resolved 'arch/m68k/Kconfig.bus' using previous resolution.
3581 Resolved 'arch/m68k/Kconfig.devices' using previous resolution.
3582 Resolved 'arch/m68k/kernel/Makefile' using previous resolution.
3583 Auto-merging arch/m68k/kernel/Makefile
3584 CONFLICT (content): Merge conflict in arch/m68k/kernel/Makefile
3585 Auto-merging arch/m68k/Kconfig.devices
3586 CONFLICT (add/add): Merge conflict in arch/m68k/Kconfig.devices
3587 Auto-merging arch/m68k/Kconfig.bus
3588 CONFLICT (add/add): Merge conflict in arch/m68k/Kconfig.bus
3589 Automatic merge failed; fix conflicts and then commit the result.
3590 $ git commit -v -a
3591 [master 3d74475] Merge remote-tracking branch 'm68knommu/for-next'
3592 $ git diff -M --stat --summary HEAD^..
3593 Merging microblaze/next (3155521 Revert "hvc_console: display printk messages on console.")
3594 $ git merge microblaze/next
3595 Already up-to-date.
3596 Merging mips/mips-for-linux-next (e4b3376 MIPS: irq: Remove IRQF_DISABLED)
3597 $ git merge mips/mips-for-linux-next
3598 Removing arch/mips/nxp/pnx8550/common/setup.c
3599 Removing arch/mips/nxp/pnx8550/common/pci.c
3600 Merge made by the 'recursive' strategy.
3601  arch/mips/Kconfig                                  |    1 +
3602  arch/mips/alchemy/common/dbdma.c                   |    3 +-
3603  arch/mips/alchemy/common/time.c                    |    2 +-
3604  arch/mips/alchemy/devboards/db1200/platform.c      |    4 +-
3605  arch/mips/cavium-octeon/setup.c                    |    8 -
3606  arch/mips/cavium-octeon/smp.c                      |    5 +-
3607  arch/mips/dec/setup.c                              |    1 -
3608  arch/mips/emma/common/prom.c                       |    2 +-
3609  arch/mips/include/asm/bootinfo.h                   |    1 +
3610  arch/mips/include/asm/gio_device.h                 |   56 +++
3611  arch/mips/include/asm/hugetlb.h                    |    2 +-
3612  arch/mips/include/asm/mach-bcm47xx/gpio.h          |   18 +-
3613  arch/mips/include/asm/mach-generic/floppy.h        |    2 +-
3614  arch/mips/include/asm/mach-jazz/floppy.h           |    2 +-
3615  .../asm/mach-netlogic/cpu-feature-overrides.h      |    5 +-
3616  arch/mips/include/asm/netlogic/xlr/msidef.h        |   84 ++++
3617  arch/mips/jazz/irq.c                               |    2 +-
3618  arch/mips/kernel/cevt-bcm1480.c                    |    2 +-
3619  arch/mips/kernel/cevt-ds1287.c                     |    2 +-
3620  arch/mips/kernel/cevt-gt641xx.c                    |    2 +-
3621  arch/mips/kernel/cevt-r4k.c                        |    2 +-
3622  arch/mips/kernel/cevt-sb1250.c                     |    2 +-
3623  arch/mips/kernel/cevt-txx9.c                       |    2 +-
3624  arch/mips/kernel/cpu-probe.c                       |    1 +
3625  arch/mips/kernel/i8253.c                           |    2 +-
3626  arch/mips/kernel/rtlx.c                            |    1 -
3627  arch/mips/kernel/setup.c                           |   43 ++-
3628  arch/mips/kernel/smtc.c                            |    2 +-
3629  arch/mips/lantiq/irq.c                             |    1 -
3630  arch/mips/loongson/common/cs5536/cs5536_mfgpt.c    |    2 +-
3631  arch/mips/mm/Makefile                              |    4 +-
3632  arch/mips/mm/gup.c                                 |  315 +++++++++++++++
3633  arch/mips/mm/init.c                                |    9 +-
3634  arch/mips/mti-malta/malta-int.c                    |    4 +-
3635  arch/mips/netlogic/Platform                        |    2 +-
3636  arch/mips/netlogic/xlr/irq.c                       |    5 +
3637  arch/mips/nxp/pnx8550/common/pci.c                 |  134 ------
3638  arch/mips/nxp/pnx8550/common/setup.c               |  143 -------
3639  arch/mips/pci/ops-pmcmsp.c                         |    2 +-
3640  arch/mips/pci/ops-tx3927.c                         |    2 +-
3641  arch/mips/pci/pci-tx4927.c                         |    2 +-
3642  arch/mips/pci/pci-tx4938.c                         |    2 +-
3643  arch/mips/pci/pci-tx4939.c                         |    2 +-
3644  arch/mips/pci/pci-xlr.c                            |   51 +++-
3645  arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c        |    2 +-
3646  arch/mips/pmc-sierra/msp71xx/msp_smp.c             |    4 +-
3647  arch/mips/pmc-sierra/yosemite/prom.c               |    2 +-
3648  arch/mips/pnx8550/common/int.c                     |    4 +-
3649  arch/mips/pnx8550/common/time.c                    |    4 +-
3650  arch/mips/sgi-ip22/Makefile                        |    2 +-
3651  arch/mips/sgi-ip22/ip22-gio.c                      |  427 ++++++++++++++++++++
3652  arch/mips/sgi-ip22/ip22-int.c                      |   10 +-
3653  arch/mips/sgi-ip22/ip22-mc.c                       |   10 +-
3654  arch/mips/sgi-ip22/ip22-setup.c                    |   21 -
3655  arch/mips/sgi-ip27/ip27-irq.c                      |    2 +-
3656  arch/mips/sgi-ip27/ip27-timer.c                    |    2 +-
3657  arch/mips/sgi-ip32/ip32-irq.c                      |    2 -
3658  arch/mips/sni/irq.c                                |    2 +-
3659  arch/mips/sni/time.c                               |    2 +-
3660  arch/mips/txx9/generic/pci.c                       |    2 +-
3661  drivers/video/console/newport_con.c                |   63 ++-
3662  61 files changed, 1102 insertions(+), 398 deletions(-)
3663  create mode 100644 arch/mips/include/asm/gio_device.h
3664  create mode 100644 arch/mips/include/asm/netlogic/xlr/msidef.h
3665  create mode 100644 arch/mips/mm/gup.c
3666  delete mode 100644 arch/mips/nxp/pnx8550/common/pci.c
3667  delete mode 100644 arch/mips/nxp/pnx8550/common/setup.c
3668  create mode 100644 arch/mips/sgi-ip22/ip22-gio.c
3669 Merging openrisc/for-upstream (b6fd41e Linux 3.1-rc6)
3670 $ git merge openrisc/for-upstream
3671 Already up-to-date.
3672 Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls)
3673 $ git merge parisc/for-next
3674 Merge made by the 'recursive' strategy.
3675  arch/parisc/include/asm/futex.h |   31 +++++++++++++++++++++++++++----
3676  1 files changed, 27 insertions(+), 4 deletions(-)
3677 Merging powerpc/next (96cc017 powerpc/p3060qds: Add support for P3060QDS board)
3678 $ git merge powerpc/next
3679 Already up-to-date.
3680 Merging 4xx/next (9fcd768 powerpc/40x: Remove obsolete HCU4 board)
3681 $ git merge 4xx/next
3682 Already up-to-date.
3683 Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries)
3684 $ git merge 52xx-and-virtex/powerpc/next
3685 Merge made by the 'recursive' strategy.
3686  arch/powerpc/boot/dts/charon.dts             |  236 ++++++++++++++++++++++++++
3687  arch/powerpc/configs/52xx/tqm5200_defconfig  |   20 ++-
3688  arch/powerpc/platforms/52xx/mpc5200_simple.c |    1 +
3689  3 files changed, 249 insertions(+), 8 deletions(-)
3690  create mode 100644 arch/powerpc/boot/dts/charon.dts
3691 Merging galak/next (96cc017 powerpc/p3060qds: Add support for P3060QDS board)
3692 $ git merge galak/next
3693 Already up-to-date.
3694 Merging s390/features (74ea17f [S390] add support for physical memory > 4TB)
3695 $ git merge s390/features
3696 Auto-merging arch/s390/mm/init.c
3697 Merge made by the 'recursive' strategy.
3698  arch/s390/include/asm/pgtable.h   |   23 +------
3699  arch/s390/include/asm/sparsemem.h |    4 +-
3700  arch/s390/include/asm/unistd.h    |    4 +-
3701  arch/s390/kernel/compat_wrapper.S |   20 ++++++
3702  arch/s390/kernel/mem_detect.c     |  122 ++++++++++++++++++++-----------------
3703  arch/s390/kernel/setup.c          |   68 ++++++++++++++++-----
3704  arch/s390/kernel/syscalls.S       |    2 +
3705  arch/s390/mm/init.c               |   16 +++--
3706  arch/s390/mm/pgtable.c            |   11 ---
3707  9 files changed, 160 insertions(+), 110 deletions(-)
3708 Merging sh/sh-latest (b9a3acf Merge branch 'sh/stable-updates' into sh-latest)
3709 $ git merge sh/sh-latest
3710 Already up-to-date.
3711 Merging rmobile/rmobile-latest (b58c580 Merge branch 'rmobile-fixes-for-linus' into rmobile-latest)
3712 $ git merge rmobile/rmobile-latest
3713 Already up-to-date.
3714 Merging sparc-next/master (3ee72ca Merge git://github.com/davem330/net)
3715 $ git merge sparc-next/master
3716 Already up-to-date.
3717 Merging tile/master (1583171 Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile)
3718 $ git merge tile/master
3719 Already up-to-date.
3720 Merging unicore32/unicore32 (10967fd arch/unicore32: do not use EXTRA_AFLAGS or EXTRA_CFLAGS)
3721 $ git merge unicore32/unicore32
3722 Merge made by the 'recursive' strategy.
3723  arch/unicore32/boot/compressed/Makefile |    4 ++--
3724  arch/unicore32/include/asm/bitops.h     |   12 ++++++------
3725  arch/unicore32/kernel/ksyms.c           |    4 ++--
3726  arch/unicore32/lib/findbit.S            |   14 ++++++++------
3727  4 files changed, 18 insertions(+), 16 deletions(-)
3728 Merging xtensa/master (29aced6 xtensa: remove defining register numbers)
3729 $ git merge xtensa/master
3730 Merge made by the 'recursive' strategy.
3731  arch/xtensa/include/asm/irqflags.h |    1 +
3732  arch/xtensa/include/asm/regs.h     |   91 ++++++++++++++++++---------------
3733  arch/xtensa/include/asm/timex.h    |    4 +-
3734  arch/xtensa/include/asm/uaccess.h  |    2 +-
3735  arch/xtensa/kernel/align.S         |   14 +++---
3736  arch/xtensa/kernel/coprocessor.S   |   10 ++--
3737  arch/xtensa/kernel/entry.S         |   98 ++++++++++++++++++------------------
3738  arch/xtensa/kernel/head.S          |   12 ++--
3739  arch/xtensa/kernel/irq.c           |    5 ++
3740  arch/xtensa/kernel/traps.c         |    4 +-
3741  arch/xtensa/kernel/vectors.S       |   22 ++++----
3742  arch/xtensa/kernel/vmlinux.lds.S   |    1 +
3743  12 files changed, 139 insertions(+), 125 deletions(-)
3744 Merging ceph/for-next (3395734 libceph: fix double-free of page vector)
3745 $ git merge ceph/for-next
3746 Already up-to-date.
3747 Merging cifs/master (a88b470 CIFS: Cleanup byte-range locking code style)
3748 $ git merge cifs/master
3749 Already up-to-date.
3750 Merging configfs/linux-next (420118c configfs: Rework configfs_depend_item() locking and make lockdep happy)
3751 $ git merge configfs/linux-next
3752 Already up-to-date.
3753 Merging ecryptfs/next (985ca0e ecryptfs: Make inode bdi consistent with superblock bdi)
3754 $ git merge ecryptfs/next
3755 Already up-to-date.
3756 Merging ext3/for_next (ed47a7d udf: Cleanup metadata flags handling)
3757 $ git merge ext3/for_next
3758 Already up-to-date.
3759 Merging ext4/dev (5c8a0fb VFS: fix statfs() automounter semantics regression)
3760 $ git merge ext4/dev
3761 Already up-to-date.
3762 Merging fatfs/master (710d440 fat: fat16 support maximum 4GB file/vol size as WinXP or 7.)
3763 $ git merge fatfs/master
3764 Already up-to-date.
3765 Merging fuse/for-next (c2183d1 fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message)
3766 $ git merge fuse/for-next
3767 Already up-to-date.
3768 Merging gfs2/master (809a4fa GFS2: Move readahead of metadata during deallocation into its own function)
3769 $ git merge gfs2/master
3770 Resolved 'fs/gfs2/file.c' using previous resolution.
3771 Auto-merging fs/gfs2/file.c
3772 CONFLICT (content): Merge conflict in fs/gfs2/file.c
3773 Automatic merge failed; fix conflicts and then commit the result.
3774 $ git commit -v -a
3775 [master 98f4835] Merge remote-tracking branch 'gfs2/master'
3776 $ git diff -M --stat --summary HEAD^..
3777 Merging hfsplus/for-next (6596528 hfsplus: ensure bio requests are not smaller than the hardware sectors)
3778 $ git merge hfsplus/for-next
3779 Already up-to-date.
3780 Merging jfs/next (1c8007b jfs: flush journal completely before releasing metadata inodes)
3781 $ git merge jfs/next
3782 Already up-to-date.
3783 Merging logfs/master (51b3089 Merge branch 'master' of github.com:prasad-joshi/logfs)
3784 $ git merge logfs/master
3785 Resolved 'fs/logfs/file.c' using previous resolution.
3786 Auto-merging fs/logfs/super.c
3787 Auto-merging fs/logfs/readwrite.c
3788 Auto-merging fs/logfs/logfs.h
3789 Auto-merging fs/logfs/inode.c
3790 Auto-merging fs/logfs/file.c
3791 CONFLICT (content): Merge conflict in fs/logfs/file.c
3792 Auto-merging fs/logfs/dir.c
3793 Auto-merging MAINTAINERS
3794 Automatic merge failed; fix conflicts and then commit the result.
3795 $ git commit -v -a
3796 [master c73aaff] Merge remote-tracking branch 'logfs/master'
3797 $ git diff -M --stat --summary HEAD^..
3798  MAINTAINERS          |    1 +
3799  fs/logfs/dev_mtd.c   |   26 ++++++++++++--------------
3800  fs/logfs/dir.c       |    2 +-
3801  fs/logfs/file.c      |    2 ++
3802  fs/logfs/inode.c     |    4 +++-
3803  fs/logfs/journal.c   |    1 -
3804  fs/logfs/logfs.h     |    5 ++++-
3805  fs/logfs/readwrite.c |   22 ++++++++++++----------
3806  fs/logfs/segment.c   |   14 ++++++++++----
3807  fs/logfs/super.c     |    3 ++-
3808  10 files changed, 47 insertions(+), 33 deletions(-)
3809 Merging nfs/linux-next (a6f498a NFS: Fix a regression in the referral code)
3810 $ git merge nfs/linux-next
3811 Merge made by the 'recursive' strategy.
3812  fs/nfs/dir.c            |    2 +-
3813  fs/nfs/file.c           |   91 ++++++++++++++++++++++++++--------------------
3814  fs/nfs/inode.c          |    2 +-
3815  fs/nfs/nfs3proc.c       |    1 +
3816  fs/nfs/nfs4proc.c       |    4 +-
3817  fs/nfs/proc.c           |    1 +
3818  include/linux/nfs_fs.h  |    3 ++
3819  include/linux/nfs_xdr.h |    1 +
3820  8 files changed, 61 insertions(+), 44 deletions(-)
3821 Merging nfsd/nfsd-next (fc0d14f nfsd4: typo logical vs bitwise negate in nfsd4_decode_share_access)
3822 $ git merge nfsd/nfsd-next
3823 Already up-to-date.
3824 Merging nilfs2/for-next (93ee7a9 Linux 3.1-rc2)
3825 $ git merge nilfs2/for-next
3826 Already up-to-date.
3827 Merging ocfs2/linux-next (c849cc2 ocfs2: make direntry invalid when deleting it)
3828 $ git merge ocfs2/linux-next
3829 Resolved 'fs/ocfs2/xattr.c' using previous resolution.
3830 Auto-merging fs/ocfs2/xattr.c
3831 CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
3832 Auto-merging fs/ocfs2/move_extents.c
3833 Auto-merging fs/ocfs2/file.c
3834 Auto-merging fs/ocfs2/dlmglue.c
3835 Auto-merging fs/ocfs2/dir.c
3836 Auto-merging fs/ocfs2/cluster/tcp.c
3837 Automatic merge failed; fix conflicts and then commit the result.
3838 $ git commit -v -a
3839 [master a459495] Merge remote-tracking branch 'ocfs2/linux-next'
3840 $ git diff -M --stat --summary HEAD^..
3841  fs/ocfs2/aops.c              |   69 +++++++++++++--
3842  fs/ocfs2/aops.h              |   14 +++
3843  fs/ocfs2/cluster/heartbeat.c |  194 ++++++++++++++++++++++++++----------------
3844  fs/ocfs2/cluster/netdebug.c  |  102 +++++++++++++++-------
3845  fs/ocfs2/cluster/tcp.c       |  138 ++++++++++++++++--------------
3846  fs/ocfs2/cluster/tcp.h       |    2 +
3847  fs/ocfs2/dir.c               |    3 +-
3848  fs/ocfs2/dlm/dlmcommon.h     |   56 +++----------
3849  fs/ocfs2/dlm/dlmdomain.c     |   44 +++++-----
3850  fs/ocfs2/dlm/dlmlock.c       |   54 ++++++------
3851  fs/ocfs2/dlm/dlmmaster.c     |  175 +++++++++++++++++++-------------------
3852  fs/ocfs2/dlm/dlmrecovery.c   |  164 ++++++++++++++++++------------------
3853  fs/ocfs2/dlm/dlmthread.c     |   16 ++--
3854  fs/ocfs2/dlmglue.c           |   21 +++--
3855  fs/ocfs2/extent_map.c        |   96 +++++++++++++++++++++
3856  fs/ocfs2/extent_map.h        |    2 +
3857  fs/ocfs2/file.c              |   93 ++++++++++++++++++++-
3858  fs/ocfs2/inode.h             |    3 +
3859  fs/ocfs2/ioctl.c             |    8 +-
3860  fs/ocfs2/journal.c           |   23 +++++-
3861  fs/ocfs2/mmap.c              |   53 +++++------
3862  fs/ocfs2/move_extents.c      |    2 +-
3863  fs/ocfs2/ocfs2.h             |    4 +-
3864  fs/ocfs2/quota_local.c       |   13 ++-
3865  fs/ocfs2/slot_map.c          |    4 +-
3866  fs/ocfs2/stack_o2cb.c        |   71 ++++++++++++++--
3867  fs/ocfs2/super.c             |   23 +++--
3868  27 files changed, 926 insertions(+), 521 deletions(-)
3869 Merging omfs/for-next (976d167 Linux 3.1-rc9)
3870 $ git merge omfs/for-next
3871 Already up-to-date.
3872 Merging squashfs/master (7657cac Squashfs: Add an option to set dev block size to 4K)
3873 $ git merge squashfs/master
3874 Already up-to-date.
3875 Merging v9fs/for-next (14211d0 9p: fix 9p.txt to advertise msize instead of maxdata)
3876 $ git merge v9fs/for-next
3877 Already up-to-date.
3878 Merging ubifs/linux-next (7606f85 UBIFS: fix the dark space calculation)
3879 $ git merge ubifs/linux-next
3880 Already up-to-date.
3881 Merging xfs/master (9e4c109 xfs: add AIL pushing tracepoints)
3882 $ git merge xfs/master
3883 Already up-to-date.
3884 Merging vfs/for-next (206b1d0 Fix POSIX ACL permission check)
3885 $ git merge vfs/for-next
3886 Already up-to-date.
3887 Merging vfs-scale/vfs-scale-working (32385c7 kernel: fix hlist_bl again)
3888 $ git merge vfs-scale/vfs-scale-working
3889 Already up-to-date.
3890 Merging pci/linux-next (44258a5 PCI: Fix PRI and PASID consistency)
3891 $ git merge pci/linux-next
3892 Auto-merging drivers/pci/msi.c
3893 Auto-merging drivers/pci/ats.c
3894 Merge made by the 'recursive' strategy.
3895  Documentation/ABI/testing/sysfs-bus-pci |   18 +++++
3896  drivers/pci/ats.c                       |   20 +++---
3897  drivers/pci/msi.c                       |  111 +++++++++++++++++++++++++++++++
3898  include/linux/msi.h                     |    3 +
3899  include/linux/pci.h                     |    1 +
3900  include/linux/pci_regs.h                |    4 +-
3901  6 files changed, 145 insertions(+), 12 deletions(-)
3902 Merging hid/for-next (30307c6 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
3903 $ git merge hid/for-next
3904 Already up-to-date.
3905 Merging quilt/i2c (e415e35 i2c-algo-bit: Generate correct i2c address sequence for 10-bit target)
3906 $ git merge quilt/i2c
3907 Merge made by the 'recursive' strategy.
3908  drivers/i2c/algos/i2c-algo-bit.c |    4 ++--
3909  1 files changed, 2 insertions(+), 2 deletions(-)
3910 Merging bjdooks-i2c/next-i2c (f8420b7 fixup merge)
3911 $ git merge bjdooks-i2c/next-i2c
3912 Resolved 'drivers/i2c/busses/i2c-designware-platdrv.c' using previous resolution.
3913 Auto-merging drivers/i2c/busses/i2c-designware-platdrv.c
3914 CONFLICT (add/add): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c
3915 Automatic merge failed; fix conflicts and then commit the result.
3916 $ git commit -v -a
3917 [master 4e7da0c] Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
3918 $ git diff -M --stat --summary HEAD^..
3919  drivers/i2c/busses/i2c-designware-platdrv.c |    2 +-
3920  1 files changed, 1 insertions(+), 1 deletions(-)
3921 Merging quilt/jdelvare-hwmon (c861cd3 Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc)
3922 $ git merge quilt/jdelvare-hwmon
3923 Already up-to-date.
3924 Merging hwmon-staging/hwmon-next (c5794cf hwmon: (w83627ehf) Better fix for negative temperature values)
3925 $ git merge hwmon-staging/hwmon-next
3926 Already up-to-date.
3927 Merging quilt/kernel-doc (c3b92c8 Linux 3.1)
3928 $ git merge quilt/kernel-doc
3929 Already up-to-date.
3930 Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move)
3931 $ git merge docs/docs-move
3932 Merge made by the 'recursive' strategy.
3933  Documentation/DocBook/drm.tmpl  |  308 +++++++++++++++++++++------------------
3934  drivers/gpu/drm/i915/i915_drv.c |    4 +-
3935  2 files changed, 170 insertions(+), 142 deletions(-)
3936 Merging v4l-dvb/master (b3f4e1e [media] saa7134.h: Suppress compiler warnings when CONFIG_VIDEO_SAA7134_RC is not set)
3937 $ git merge v4l-dvb/master
3938 Already up-to-date.
3939 Merging kbuild/for-next (57b742f Merge branch 'kbuild/kbuild' into kbuild/for-next)
3940 $ git merge kbuild/for-next
3941 Already up-to-date!
3942 Merge made by the 'recursive' strategy.
3943 Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
3944 $ git merge kconfig/for-next
3945 Already up-to-date!
3946 Merge made by the 'recursive' strategy.
3947 Merging libata/NEXT (a0da191 pata_efar: fix register naming used in efar_set_piomode())
3948 $ git merge libata/NEXT
3949 Already up-to-date.
3950 Merging infiniband/for-next (b8108d6 Merge branches 'iser', 'mthca' and 'qib' into for-next)
3951 $ git merge infiniband/for-next
3952 Already up-to-date.
3953 Merging acpi/next (efb9058 Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next)
3954 $ git merge acpi/next
3955 Already up-to-date.
3956 Merging cpupowerutils/master (498ca79 cpupower: use man(1) when calling "cpupower help subcommand")
3957 $ git merge cpupowerutils/master
3958 Already up-to-date.
3959 Merging ieee1394/for-next (a572e68 firewire: ohci: fix isochronous DMA synchronization)
3960 $ git merge ieee1394/for-next
3961 Already up-to-date.
3962 Merging ubi/linux-next (93ee7a9 Linux 3.1-rc2)
3963 $ git merge ubi/linux-next
3964 Already up-to-date.
3965 Merging dlm/next (c3b92c8 Linux 3.1)
3966 $ git merge dlm/next
3967 Already up-to-date.
3968 Merging swiotlb/master (25b84fa swiotlb: Export io_tlb_nslabs as swiotlb_nslabs and use it.)
3969 $ git merge swiotlb/master
3970 Resolved 'drivers/xen/swiotlb-xen.c' using previous resolution.
3971 Auto-merging drivers/xen/swiotlb-xen.c
3972 CONFLICT (content): Merge conflict in drivers/xen/swiotlb-xen.c
3973 Automatic merge failed; fix conflicts and then commit the result.
3974 $ git commit -v -a
3975 [master 67721fb] Merge remote-tracking branch 'swiotlb/master'
3976 $ git diff -M --stat --summary HEAD^..
3977 Merging ibft/master (f1b1e06 iscsi-ibft: Fix compile warning introduced by 'iscsi_ibft: iscsi_ibft_find unused variable i')
3978 $ git merge ibft/master
3979 Merge made by the 'recursive' strategy.
3980 Merging scsi/master (f7c9c6b [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev)
3981 $ git merge scsi/master
3982 Already up-to-date.
3983 Merging target-updates/for-next (5bda90c target: use ->exectute_task for all CDB emulation)
3984 $ git merge target-updates/for-next
3985 Already up-to-date.
3986 Merging target-merge/for-next-merge (e0d85e5 ib_srpt: Initial SRP Target merge for v3.2-rc1)
3987 $ git merge target-merge/for-next-merge
3988 Merge made by the 'recursive' strategy.
3989  drivers/infiniband/Kconfig              |    1 +
3990  drivers/infiniband/Makefile             |    1 +
3991  drivers/infiniband/ulp/srpt/Kconfig     |   12 +
3992  drivers/infiniband/ulp/srpt/Makefile    |    2 +
3993  drivers/infiniband/ulp/srpt/ib_dm_mad.h |  139 ++
3994  drivers/infiniband/ulp/srpt/ib_srpt.c   | 4081 +++++++++++++++++++++++++++++++
3995  drivers/infiniband/ulp/srpt/ib_srpt.h   |  444 ++++
3996  7 files changed, 4680 insertions(+), 0 deletions(-)
3997  create mode 100644 drivers/infiniband/ulp/srpt/Kconfig
3998  create mode 100644 drivers/infiniband/ulp/srpt/Makefile
3999  create mode 100644 drivers/infiniband/ulp/srpt/ib_dm_mad.h
4000  create mode 100644 drivers/infiniband/ulp/srpt/ib_srpt.c
4001  create mode 100644 drivers/infiniband/ulp/srpt/ib_srpt.h
4002 Merging slave-dma/next (4598fc2 dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle)
4003 $ git merge slave-dma/next
4004 Already up-to-date.
4005 Merging async_tx/next (21ef4b8 dmaengine: use DEFINE_IDR for static initialization)
4006 $ git merge async_tx/next
4007 Already up-to-date.
4008 Merging net-next/master (8b3408f dp83640: free packet queues on remove)
4009 $ git merge net-next/master
4010 Already up-to-date.
4011 Merging wireless-next/master (8b3408f dp83640: free packet queues on remove)
4012 $ git merge wireless-next/master
4013 Already up-to-date.
4014 Merging bluetooth/master (e395042 Bluetooth: Convert power off mechanism to use delayed_work)
4015 $ git merge bluetooth/master
4016 Recorded preimage for 'net/bluetooth/mgmt.c'
4017 Resolved 'include/net/bluetooth/bluetooth.h' using previous resolution.
4018 Resolved 'net/bluetooth/l2cap_sock.c' using previous resolution.
4019 Auto-merging net/bluetooth/rfcomm/sock.c
4020 Auto-merging net/bluetooth/rfcomm/core.c
4021 Auto-merging net/bluetooth/mgmt.c
4022 CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c
4023 Auto-merging net/bluetooth/l2cap_sock.c
4024 CONFLICT (content): Merge conflict in net/bluetooth/l2cap_sock.c
4025 Auto-merging net/bluetooth/hci_sysfs.c
4026 Auto-merging net/bluetooth/hci_core.c
4027 Auto-merging include/net/bluetooth/hci_core.h
4028 Auto-merging include/net/bluetooth/bluetooth.h
4029 CONFLICT (content): Merge conflict in include/net/bluetooth/bluetooth.h
4030 Auto-merging drivers/bluetooth/btusb.c
4031 Auto-merging drivers/bluetooth/bfusb.c
4032 Auto-merging drivers/bluetooth/ath3k.c
4033 Automatic merge failed; fix conflicts and then commit the result.
4034 $ git commit -v -a
4035 Recorded resolution for 'net/bluetooth/mgmt.c'.
4036 [master 0b9cef0] Merge remote-tracking branch 'bluetooth/master'
4037 $ git diff -M --stat --summary HEAD^..
4038  drivers/bluetooth/ath3k.c         |   15 +-
4039  drivers/bluetooth/bfusb.c         |    4 +-
4040  drivers/bluetooth/bluecard_cs.c   |    4 +-
4041  drivers/bluetooth/bt3c_cs.c       |    4 +-
4042  drivers/bluetooth/btuart_cs.c     |    4 +-
4043  drivers/bluetooth/btusb.c         |   16 +-
4044  drivers/bluetooth/dtl1_cs.c       |    4 +-
4045  drivers/bluetooth/hci_vhci.c      |    5 +-
4046  include/net/bluetooth/bluetooth.h |   29 ++-
4047  include/net/bluetooth/hci.h       |   22 +
4048  include/net/bluetooth/hci_core.h  |   77 +++-
4049  include/net/bluetooth/l2cap.h     |  409 ++++++++++++++---
4050  include/net/bluetooth/mgmt.h      |    6 +-
4051  net/bluetooth/bnep/core.c         |   13 +-
4052  net/bluetooth/cmtp/core.c         |   13 +-
4053  net/bluetooth/hci_conn.c          |   69 +++-
4054  net/bluetooth/hci_core.c          |  365 +++++++++++----
4055  net/bluetooth/hci_event.c         |  127 +++---
4056  net/bluetooth/hci_sysfs.c         |   40 +-
4057  net/bluetooth/hidp/core.c         |  157 ++++---
4058  net/bluetooth/l2cap_core.c        |  947 +++++++++++++++++++++++++++----------
4059  net/bluetooth/l2cap_sock.c        |   90 +++-
4060  net/bluetooth/mgmt.c              |  145 ++++--
4061  net/bluetooth/rfcomm/core.c       |   65 ++-
4062  net/bluetooth/rfcomm/sock.c       |    2 +
4063  net/bluetooth/rfcomm/tty.c        |   45 +-
4064  net/bluetooth/smp.c               |    3 +-
4065  27 files changed, 1967 insertions(+), 713 deletions(-)
4066 Merging mtd/master (e0d6511 Merge git://git.infradead.org/mtd-2.6)
4067 $ git merge mtd/master
4068 Already up-to-date.
4069 Merging l2-mtd/master (48e546b mtd: tests: annotate as DANGEROUS in Kconfig)
4070 $ git merge l2-mtd/master
4071 Already up-to-date.
4072 Merging crypto/master (ea8bdfc crypto: user - Add dependency on NET)
4073 $ git merge crypto/master
4074 Already up-to-date.
4075 Merging sound/for-next (2afec54 Merge branch 'fix/hda' into for-next)
4076 $ git merge sound/for-next
4077 Already up-to-date!
4078 Merge made by the 'recursive' strategy.
4079 Merging sound-asoc/for-next (19940b3 ASoC: Ensure we get an impedence reported for WM8958 jack detect)
4080 $ git merge sound-asoc/for-next
4081 Auto-merging MAINTAINERS
4082 Merge made by the 'recursive' strategy.
4083  MAINTAINERS                          |    2 +-
4084  include/linux/mfd/wm8994/registers.h |   15 ++++++++++++
4085  sound/soc/codecs/wm8994.c            |   43 +++++++++++++++++++++++-----------
4086  3 files changed, 45 insertions(+), 15 deletions(-)
4087 Merging cpufreq/next (5aace58 [CPUFREQ] ARM Exynos4210 PM/Suspend compatibility with different bootloaders)
4088 $ git merge cpufreq/next
4089 Merge made by the 'recursive' strategy.
4090 Merging quilt/rr (05478c6 module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree)
4091 $ git merge quilt/rr
4092 Merge made by the 'recursive' strategy.
4093 Merging input/next (d2cc817 Input: usbtouchscreen - add ELO IntelliTouch 2700 support)
4094 $ git merge input/next
4095 Auto-merging drivers/input/tablet/wacom_wac.c
4096 Auto-merging drivers/input/tablet/wacom_sys.c
4097 Merge made by the 'recursive' strategy.
4098  drivers/input/keyboard/Kconfig             |   16 +
4099  drivers/input/keyboard/Makefile            |    1 +
4100  drivers/input/keyboard/tca8418_keypad.c    |  430 ++++++++++++++++++++++++++++
4101  drivers/input/serio/i8042.c                |   23 +-
4102  drivers/input/tablet/wacom_sys.c           |   96 ++++++-
4103  drivers/input/tablet/wacom_wac.c           |  101 ++++++-
4104  drivers/input/tablet/wacom_wac.h           |    4 +-
4105  drivers/input/touchscreen/Kconfig          |    6 +
4106  drivers/input/touchscreen/usbtouchscreen.c |   36 +++
4107  include/linux/input/tca8418_keypad.h       |   44 +++
4108  10 files changed, 729 insertions(+), 28 deletions(-)
4109  create mode 100644 drivers/input/keyboard/tca8418_keypad.c
4110  create mode 100644 include/linux/input/tca8418_keypad.h
4111 Merging input-mt/next (02f8c6a Linux 3.0)
4112 $ git merge input-mt/next
4113 Already up-to-date.
4114 Merging lsm/for-next (ca05a99 capabilities: remain source compatible with 32-bit raw legacy capability support.)
4115 $ git merge lsm/for-next
4116 Already up-to-date.
4117 Merging block/for-next (30a4b71 Merge branch 'for-3.2/core' into for-next)
4118 $ git merge block/for-next
4119 Merge made by the 'recursive' strategy.
4120 Merging quilt/device-mapper (94956ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
4121 $ git merge quilt/device-mapper
4122 Already up-to-date.
4123 Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
4124 $ git merge embedded/master
4125 Already up-to-date.
4126 Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
4127 $ git merge firmware/master
4128 Already up-to-date.
4129 Merging pcmcia/master (74411c0 smc91c92_cs.c: fix bogus compiler warning)
4130 $ git merge pcmcia/master
4131 Already up-to-date.
4132 Merging battery/master (85b5fbf power_supply: Fix sysfs format warning)
4133 $ git merge battery/master
4134 Auto-merging drivers/power/power_supply_sysfs.c
4135 Auto-merging drivers/power/max8998_charger.c
4136 Auto-merging drivers/power/max8997_charger.c
4137 Auto-merging drivers/power/max8903_charger.c
4138 Auto-merging drivers/power/max17042_battery.c
4139 Auto-merging drivers/power/ds2780_battery.c
4140 Merge made by the 'recursive' strategy.
4141  .../bindings/power_supply/olpc_battery.txt         |    5 +
4142  drivers/power/ds2780_battery.c                     |    2 +-
4143  drivers/power/max17042_battery.c                   |   17 ++--
4144  drivers/power/max8903_charger.c                    |    2 +-
4145  drivers/power/max8997_charger.c                    |    1 +
4146  drivers/power/max8998_charger.c                    |    2 +
4147  drivers/power/olpc_battery.c                       |   79 ++++++++++++++-----
4148  drivers/power/pda_power.c                          |   74 ++++++++++++++++--
4149  drivers/power/power_supply_sysfs.c                 |    4 +-
4150  drivers/power/wm831x_power.c                       |   44 +++++++----
4151  drivers/power/z2_battery.c                         |    2 +-
4152  include/linux/pda_power.h                          |    2 +
4153  12 files changed, 175 insertions(+), 59 deletions(-)
4154  create mode 100644 Documentation/devicetree/bindings/power_supply/olpc_battery.txt
4155 Merging mmc/mmc-next (ad8ce79 mmc: omap_hsmmc: DMA unmap only once in case of MMC error)
4156 $ git merge mmc/mmc-next
4157 Auto-merging drivers/mmc/host/omap_hsmmc.c
4158 Merge made by the 'recursive' strategy.
4159  drivers/mmc/host/omap_hsmmc.c |    7 +++++--
4160  1 files changed, 5 insertions(+), 2 deletions(-)
4161 Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack())
4162 $ git merge kgdb/kgdb-next
4163 Merge made by the 'recursive' strategy.
4164 Merging slab/for-next (e24daf8 Merge branch 'slab/next' into for-next)
4165 $ git merge slab/for-next
4166 Already up-to-date!
4167 Merge made by the 'recursive' strategy.
4168 Merging uclinux/for-next (6e86841 Linux 2.6.27-rc1)
4169 $ git merge uclinux/for-next
4170 Already up-to-date.
4171 Merging md/for-next (e0b361a Merge branch 'block-3.1' into for-next)
4172 $ git merge md/for-next
4173 Resolved 'drivers/md/linear.c' using previous resolution.
4174 Auto-merging drivers/md/linear.c
4175 CONFLICT (content): Merge conflict in drivers/md/linear.c
4176 Automatic merge failed; fix conflicts and then commit the result.
4177 $ git commit -v -a
4178 [master 3ae1527] Merge remote-tracking branch 'md/for-next'
4179 $ git diff -M --stat --summary HEAD^..
4180 Merging mfd/for-next (b958f7a mfd: Fix missing abx500 header file updates)
4181 $ git merge mfd/for-next
4182 Already up-to-date.
4183 Merging hdlc/hdlc-next (4a6908a Linux 2.6.28)
4184 $ git merge hdlc/hdlc-next
4185 Already up-to-date.
4186 Merging drm/drm-next (1717c0e Revert "drm/ttm: add a way to bo_wait for either the last read or last write")
4187 $ git merge drm/drm-next
4188 Already up-to-date.
4189 Merging fbdev/fbdev-next (b57287b video: platinumfb: Add __devexit_p at necessary place)
4190 $ git merge fbdev/fbdev-next
4191 Already up-to-date.
4192 Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value)
4193 $ git merge viafb/viafb-next
4194 Already up-to-date.
4195 Merging omap_dss2/for-next (3e28189 OMAPDSS: picodlp: add missing #include <linux/module.h>)
4196 $ git merge omap_dss2/for-next
4197 Already up-to-date.
4198 Merging regulator/for-next (89efed4 regulator: max8649 Convert max8649 to use regmap api)
4199 $ git merge regulator/for-next
4200 Merge made by the 'recursive' strategy.
4201  drivers/regulator/Kconfig   |    1 +
4202  drivers/regulator/max8649.c |  155 +++++++++++++++----------------------------
4203  2 files changed, 56 insertions(+), 100 deletions(-)
4204 Merging security/next (59df316 TOMOYO: Fix interactive judgment functionality.)
4205 $ git merge security/next
4206 Already up-to-date.
4207 Merging selinux/master (ded5098 SELinux: skip file_name_trans_write() when policy downgraded.)
4208 $ git merge selinux/master
4209 Already up-to-date.
4210 Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
4211 $ git merge lblnet/master
4212 Already up-to-date.
4213 Merging watchdog/linux-next (3155521 Revert "hvc_console: display printk messages on console.")
4214 $ git merge watchdog/linux-next
4215 Already up-to-date.
4216 Merging bdev/master (feaf384 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block)
4217 $ git merge bdev/master
4218 Already up-to-date.
4219 Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
4220 $ git merge dwmw2-iommu/master
4221 Already up-to-date.
4222 Merging iommu/next (1abb4ba Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next)
4223 $ git merge iommu/next
4224 Already up-to-date.
4225 Merging cputime/cputime (f611671 [S390] cputime: add sparse checking and cleanup)
4226 $ git merge cputime/cputime
4227 Resolved 'fs/proc/stat.c' using previous resolution.
4228 Resolved 'include/asm-generic/cputime.h' using previous resolution.
4229 Resolved 'kernel/sched_stats.h' using previous resolution.
4230 Auto-merging kernel/sys.c
4231 Auto-merging kernel/signal.c
4232 Auto-merging kernel/sched_stats.h
4233 CONFLICT (content): Merge conflict in kernel/sched_stats.h
4234 Auto-merging kernel/sched.c
4235 Auto-merging kernel/posix-cpu-timers.c
4236 Auto-merging kernel/fork.c
4237 Auto-merging kernel/exit.c
4238 Auto-merging kernel/cpu.c
4239 Auto-merging include/linux/sched.h
4240 Auto-merging include/asm-generic/cputime.h
4241 CONFLICT (content): Merge conflict in include/asm-generic/cputime.h
4242 Auto-merging fs/proc/stat.c
4243 CONFLICT (content): Merge conflict in fs/proc/stat.c
4244 Auto-merging drivers/cpufreq/cpufreq_stats.c
4245 Auto-merging drivers/cpufreq/cpufreq_ondemand.c
4246 Auto-merging drivers/cpufreq/cpufreq_conservative.c
4247 Automatic merge failed; fix conflicts and then commit the result.
4248 $ git commit -v -a
4249 [master 9add834] Merge remote-tracking branch 'cputime/cputime'
4250 $ git diff -M --stat --summary HEAD^..
4251  arch/ia64/include/asm/cputime.h        |   69 +++++++---------
4252  arch/powerpc/include/asm/cputime.h     |   70 ++++++----------
4253  arch/s390/include/asm/cputime.h        |  140 ++++++++++++++-----------------
4254  drivers/cpufreq/cpufreq_conservative.c |   29 +++----
4255  drivers/cpufreq/cpufreq_ondemand.c     |   33 ++++----
4256  drivers/cpufreq/cpufreq_stats.c        |    5 +-
4257  drivers/macintosh/rack-meter.c         |   11 +--
4258  fs/proc/array.c                        |    8 +-
4259  fs/proc/stat.c                         |   28 +++----
4260  fs/proc/uptime.c                       |    4 +-
4261  include/asm-generic/cputime.h          |   62 +++++++--------
4262  include/linux/sched.h                  |    4 +-
4263  kernel/acct.c                          |    4 +-
4264  kernel/cpu.c                           |    3 +-
4265  kernel/exit.c                          |   22 ++----
4266  kernel/fork.c                          |   14 +--
4267  kernel/itimer.c                        |   15 ++--
4268  kernel/posix-cpu-timers.c              |  136 ++++++++++++-------------------
4269  kernel/sched.c                         |   80 ++++++++----------
4270  kernel/sched_stats.h                   |    6 +-
4271  kernel/signal.c                        |    6 +-
4272  kernel/sys.c                           |    6 +-
4273  kernel/tsacct.c                        |    2 +-
4274  23 files changed, 325 insertions(+), 432 deletions(-)
4275 Merging osd/linux-next (dde406e pnfs-obj: Support for RAID5 read-4-write interface.)
4276 $ git merge osd/linux-next
4277 Merge made by the 'recursive' strategy.
4278 Merging jc_docs/docs-next (5c050fb docs: update the development process document)
4279 $ git merge jc_docs/docs-next
4280 Already up-to-date.
4281 Merging nommu/master (0ce790e Linux 2.6.39-rc1)
4282 $ git merge nommu/master
4283 Already up-to-date.
4284 Merging trivial/for-next (59e5253 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial)
4285 $ git merge trivial/for-next
4286 Already up-to-date.
4287 Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path)
4288 $ git merge audit/for-next
4289 Already up-to-date.
4290 Merging pm/linux-next (1a51cfd PM / devfreq: fix private_data)
4291 $ git merge pm/linux-next
4292 Merge made by the 'recursive' strategy.
4293  Documentation/cgroups/freezer-subsystem.txt |    4 ++--
4294  include/linux/devfreq.h                     |    2 +-
4295  kernel/power/qos.c                          |    1 +
4296  3 files changed, 4 insertions(+), 3 deletions(-)
4297 Merging apm/for-next (73692d9 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
4298 $ git merge apm/for-next
4299 Already up-to-date.
4300 Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared)
4301 $ git merge fsnotify/for-next
4302 Auto-merging include/linux/fsnotify_backend.h
4303 Auto-merging fs/notify/mark.c
4304 Auto-merging fs/notify/group.c
4305 Auto-merging fs/notify/fanotify/fanotify_user.c
4306 Auto-merging fs/nfsd/vfs.c
4307 Auto-merging fs/cachefiles/namei.c
4308 Merge made by the 'recursive' strategy.
4309  fs/cachefiles/namei.c              |    1 -
4310  fs/cachefiles/xattr.c              |    1 -
4311  fs/nfsd/vfs.c                      |    3 -
4312  fs/notify/dnotify/dnotify.c        |   15 +++---
4313  fs/notify/fanotify/fanotify.c      |   24 +++++----
4314  fs/notify/fanotify/fanotify_user.c |  101 +++++++++++++++++++++++++-----------
4315  fs/notify/group.c                  |    1 +
4316  fs/notify/mark.c                   |   36 +++++--------
4317  include/linux/fanotify.h           |    5 ++-
4318  include/linux/fsnotify_backend.h   |   14 ++++-
4319  10 files changed, 121 insertions(+), 80 deletions(-)
4320 Merging irda/for-next (94d57c4 enic: Update MAINTAINERS)
4321 $ git merge irda/for-next
4322 Already up-to-date.
4323 Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver)
4324 $ git merge edac/linux_next
4325 Already up-to-date.
4326 Merging edac-amd/for-next (1f6189e amd64_edac: Cleanup return type of amd64_determine_edac_cap())
4327 $ git merge edac-amd/for-next
4328 Already up-to-date.
4329 Merging devicetree/devicetree/next (ae97159 of_mdio: Don't phy_scan_fixups() twice)
4330 $ git merge devicetree/devicetree/next
4331 Already up-to-date.
4332 Merging spi/spi/next (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
4333 $ git merge spi/spi/next
4334 Already up-to-date.
4335 Merging gpio/gpio/next (d92ef29 h8300: Move gpio.h to gpio-internal.h)
4336 $ git merge gpio/gpio/next
4337 Already up-to-date.
4338 Merging tip/auto-latest (e471db8 Merge branch 'perf/core' into auto-latest)
4339 $ git merge tip/auto-latest
4340 Resolved 'arch/x86/kernel/cpu/amd.c' using previous resolution.
4341 Resolved 'drivers/char/random.c' using previous resolution.
4342 Auto-merging drivers/char/random.c
4343 CONFLICT (content): Merge conflict in drivers/char/random.c
4344 Auto-merging arch/x86/xen/mmu.c
4345 Auto-merging arch/x86/kernel/vsyscall_64.c
4346 Auto-merging arch/x86/kernel/cpu/amd.c
4347 CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/amd.c
4348 Auto-merging arch/x86/Kconfig
4349 Auto-merging MAINTAINERS
4350 Automatic merge failed; fix conflicts and then commit the result.
4351 $ git commit -v -a
4352 [master f992a68] Merge remote-tracking branch 'tip/auto-latest'
4353 $ git diff -M --stat --summary HEAD^..
4354  Documentation/ABI/testing/sysfs-platform-ts5500 |   46 +++
4355  MAINTAINERS                                     |    5 +
4356  arch/x86/Kconfig                                |    2 +
4357  arch/x86/include/asm/pgtable_types.h            |    1 -
4358  arch/x86/include/asm/x86_init.h                 |   12 -
4359  arch/x86/kernel/vsyscall_64.c                   |    2 +-
4360  arch/x86/kernel/x86_init.c                      |    4 -
4361  arch/x86/mm/init.c                              |  145 ++++++--
4362  arch/x86/platform/Makefile                      |    1 +
4363  arch/x86/platform/ts5500/Kconfig                |   28 ++
4364  arch/x86/platform/ts5500/Makefile               |    4 +
4365  arch/x86/platform/ts5500/ts5500.c               |  468 +++++++++++++++++++++++
4366  arch/x86/platform/ts5500/ts5500_adc.c           |  326 ++++++++++++++++
4367  arch/x86/platform/ts5500/ts5500_adc.h           |   62 +++
4368  arch/x86/platform/ts5500/ts5500_gpio.c          |  413 ++++++++++++++++++++
4369  arch/x86/platform/ts5500/ts5500_gpio.h          |   60 +++
4370  arch/x86/platform/ts5500/ts5500_led.c           |  115 ++++++
4371  arch/x86/xen/mmu.c                              |   15 -
4372  18 files changed, 1639 insertions(+), 70 deletions(-)
4373  create mode 100644 Documentation/ABI/testing/sysfs-platform-ts5500
4374  create mode 100644 arch/x86/platform/ts5500/Kconfig
4375  create mode 100644 arch/x86/platform/ts5500/Makefile
4376  create mode 100644 arch/x86/platform/ts5500/ts5500.c
4377  create mode 100644 arch/x86/platform/ts5500/ts5500_adc.c
4378  create mode 100644 arch/x86/platform/ts5500/ts5500_adc.h
4379  create mode 100644 arch/x86/platform/ts5500/ts5500_gpio.c
4380  create mode 100644 arch/x86/platform/ts5500/ts5500_gpio.h
4381  create mode 100644 arch/x86/platform/ts5500/ts5500_led.c
4382 Merging rcu/rcu/next (afe24b1 rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp())
4383 $ git merge rcu/rcu/next
4384 Already up-to-date.
4385 Merging kmemleak/kmemleak (614d29d kmemleak: Handle percpu memory allocation)
4386 $ git merge kmemleak/kmemleak
4387 Auto-merging mm/kmemleak.c
4388 Merge made by the 'recursive' strategy.
4389  Documentation/kmemleak.txt |    3 +
4390  include/linux/kmemleak.h   |    8 ++
4391  mm/kmemleak.c              |  152 +++++++++++++++++++++++++++++++++++++-------
4392  mm/percpu.c                |   12 +++-
4393  4 files changed, 150 insertions(+), 25 deletions(-)
4394 Merging kvm/kvm-updates/3.2 (a3e06bb KVM: emulate lapic tsc deadline timer for guest)
4395 $ git merge kvm/kvm-updates/3.2
4396 Already up-to-date.
4397 Merging oprofile/for-next (4167ab9 Merge branch 'core' of git://amd64.org/linux/rric into perf/core)
4398 $ git merge oprofile/for-next
4399 Already up-to-date.
4400 Merging xen/upstream/xen (ec8161f Merge branch 'upstream/microcode' into upstream/xen)
4401 $ git merge xen/upstream/xen
4402 Resolved 'arch/x86/xen/Kconfig' using previous resolution.
4403 Auto-merging arch/x86/xen/Kconfig
4404 CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
4405 Auto-merging arch/x86/kernel/microcode_core.c
4406 Auto-merging arch/x86/kernel/Makefile
4407 Automatic merge failed; fix conflicts and then commit the result.
4408 $ git commit -v -a
4409 [master be19bc4] Merge remote-tracking branch 'xen/upstream/xen'
4410 $ git diff -M --stat --summary HEAD^..
4411  arch/x86/include/asm/microcode.h |    9 ++
4412  arch/x86/kernel/Makefile         |    1 +
4413  arch/x86/kernel/microcode_core.c |    5 +-
4414  arch/x86/kernel/microcode_xen.c  |  198 ++++++++++++++++++++++++++++++++++++++
4415  arch/x86/xen/Kconfig             |    4 +
4416  5 files changed, 216 insertions(+), 1 deletions(-)
4417  create mode 100644 arch/x86/kernel/microcode_xen.c
4418 Merging xen-two/linux-next (3155521 Revert "hvc_console: display printk messages on console.")
4419 $ git merge xen-two/linux-next
4420 Already up-to-date.
4421 Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
4422 $ git merge xen-pvhvm/linux-next
4423 Already up-to-date.
4424 Merging percpu/for-next (bc499f9 percpu: rename pcpu_mem_alloc to pcpu_mem_zalloc)
4425 $ git merge percpu/for-next
4426 Auto-merging mm/percpu.c
4427 Merge made by the 'recursive' strategy.
4428  mm/percpu-vm.c |    5 ++---
4429  mm/percpu.c    |   17 +++++++++--------
4430  2 files changed, 11 insertions(+), 11 deletions(-)
4431 Merging workqueues/for-next (9c5a2ba workqueue: separate out drain_workqueue() from destroy_workqueue())
4432 $ git merge workqueues/for-next
4433 Already up-to-date.
4434 Merging sfi/sfi-test (5b026c4 SFI: use ioremap_cache() instead of ioremap())
4435 $ git merge sfi/sfi-test
4436 Already up-to-date.
4437 Merging asm-generic/next (35dbc0e asm-generic/io.h: allow people to override individual funcs)
4438 $ git merge asm-generic/next
4439 Already up-to-date.
4440 Merging drivers-x86/linux-next (15b956a acer-wmi: support Lenovo ideapad S205 wifi switch)
4441 $ git merge drivers-x86/linux-next
4442 Already up-to-date.
4443 Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
4444 $ git merge hwpoison/hwpoison
4445 Already up-to-date.
4446 Merging sysctl/master (c2f5631 sysctl: remove impossible condition check)
4447 $ git merge sysctl/master
4448 Auto-merging fs/proc/proc_sysctl.c
4449 Merge made by the 'recursive' strategy.
4450  fs/proc/proc_sysctl.c |   14 ++------------
4451  1 files changed, 2 insertions(+), 12 deletions(-)
4452 Merging namespace/master (7e05c93 proc: Fix the proc access checks to namespace files.)
4453 $ git merge namespace/master
4454 Auto-merging fs/proc/inode.c
4455 Merge made by the 'recursive' strategy.
4456  fs/proc/inode.c      |    6 +-
4457  fs/proc/namespaces.c |  160 +++++++++++++++++++++++++++++++++++++++++++-------
4458  2 files changed, 142 insertions(+), 24 deletions(-)
4459 Merging regmap/for-next (a084481 regmap: Prepare LZO cache for variable block sizes)
4460 $ git merge regmap/for-next
4461 Merge made by the 'recursive' strategy.
4462  drivers/base/regmap/regcache-lzo.c |   15 +++++++++------
4463  1 files changed, 9 insertions(+), 6 deletions(-)
4464 Merging driver-core/driver-core-next (094803e Merge branch 'akpm' (Andrew's incoming))
4465 $ git merge driver-core/driver-core-next
4466 Already up-to-date.
4467 Merging tty/tty-next (094803e Merge branch 'akpm' (Andrew's incoming))
4468 $ git merge tty/tty-next
4469 Already up-to-date.
4470 Merging usb/usb-next (094803e Merge branch 'akpm' (Andrew's incoming))
4471 $ git merge usb/usb-next
4472 Already up-to-date.
4473 Merging staging/staging-next (094803e Merge branch 'akpm' (Andrew's incoming))
4474 $ git merge staging/staging-next
4475 Already up-to-date.
4476 Merging bkl-config/config (4ba8216 BKL: That's all, folks)
4477 $ git merge bkl-config/config
4478 Already up-to-date.
4479 Merging tmem/tmem (665c1e6 mm: cleancache: Use __read_mostly as appropiate.)
4480 $ git merge tmem/tmem
4481 Resolved 'mm/swapfile.c' using previous resolution.
4482 Auto-merging mm/truncate.c
4483 Auto-merging mm/swapfile.c
4484 CONFLICT (content): Merge conflict in mm/swapfile.c
4485 Auto-merging mm/filemap.c
4486 Auto-merging mm/Makefile
4487 Auto-merging mm/Kconfig
4488 Auto-merging include/linux/swap.h
4489 Auto-merging fs/super.c
4490 Auto-merging fs/buffer.c
4491 Auto-merging drivers/staging/zcache/zcache-main.c
4492 Removing Documentation/ABI/testing/sysfs-kernel-mm-cleancache
4493 Automatic merge failed; fix conflicts and then commit the result.
4494 $ git commit -v -a
4495 [master cc4e060] Merge remote-tracking branch 'tmem/tmem'
4496 $ git diff -M --stat --summary HEAD^..
4497  .../ABI/testing/sysfs-kernel-mm-cleancache         |   11 -
4498  Documentation/vm/cleancache.txt                    |   41 ++--
4499  Documentation/vm/frontswap.txt                     |  210 +++++++++++++++
4500  drivers/staging/zcache/zcache-main.c               |   10 +-
4501  drivers/xen/tmem.c                                 |   10 +-
4502  fs/buffer.c                                        |    2 +-
4503  fs/super.c                                         |    2 +-
4504  include/linux/cleancache.h                         |   24 +-
4505  include/linux/frontswap.h                          |  126 +++++++++
4506  include/linux/swap.h                               |    4 +
4507  include/linux/swapfile.h                           |   13 +
4508  mm/Kconfig                                         |   17 ++
4509  mm/Makefile                                        |    1 +
4510  mm/cleancache.c                                    |   98 +++-----
4511  mm/filemap.c                                       |    2 +-
4512  mm/frontswap.c                                     |  273 ++++++++++++++++++++
4513  mm/page_io.c                                       |   12 +
4514  mm/swapfile.c                                      |   64 ++++-
4515  mm/truncate.c                                      |   10 +-
4516  19 files changed, 796 insertions(+), 134 deletions(-)
4517  delete mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache
4518  create mode 100644 Documentation/vm/frontswap.txt
4519  create mode 100644 include/linux/frontswap.h
4520  create mode 100644 include/linux/swapfile.h
4521  create mode 100644 mm/frontswap.c
4522 Merging writeback/writeback-for-next (ea7bf1d Merge branch 'requeue-io-wait' into writeback-for-next)
4523 $ git merge writeback/writeback-for-next
4524 Recorded preimage for 'fs/fs-writeback.c'
4525 Auto-merging mm/backing-dev.c
4526 Auto-merging include/linux/backing-dev.h
4527 Auto-merging fs/fs-writeback.c
4528 CONFLICT (content): Merge conflict in fs/fs-writeback.c
4529 Automatic merge failed; fix conflicts and then commit the result.
4530 $ git commit -v -a
4531 Recorded resolution for 'fs/fs-writeback.c'.
4532 [master bbc3bf3] Merge remote-tracking branch 'writeback/writeback-for-next'
4533 $ git diff -M --stat --summary HEAD^..
4534  fs/fs-writeback.c           |   62 ++++++++++++++++++++++++++++++++++---------
4535  include/linux/backing-dev.h |    8 +++--
4536  mm/backing-dev.c            |   10 +++++-
4537  3 files changed, 62 insertions(+), 18 deletions(-)
4538 Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
4539 $ git merge arm-dt/devicetree/arm-next
4540 Already up-to-date.
4541 Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
4542 $ git merge hwspinlock/linux-next
4543 Already up-to-date.
4544 Merging pinctrl/for-next (ab872c8 pinctrl/sirf: fix sirfsoc_get_group_pins prototype)
4545 $ git merge pinctrl/for-next
4546 Resolved 'arch/arm/mach-u300/Kconfig' using previous resolution.
4547 Resolved 'arch/arm/mach-u300/core.c' using previous resolution.
4548 Auto-merging drivers/pinctrl/core.c
4549 CONFLICT (add/add): Merge conflict in drivers/pinctrl/core.c
4550 Auto-merging arch/arm/mach-u300/core.c
4551 CONFLICT (content): Merge conflict in arch/arm/mach-u300/core.c
4552 Auto-merging arch/arm/mach-u300/Kconfig
4553 CONFLICT (content): Merge conflict in arch/arm/mach-u300/Kconfig
4554 Automatic merge failed; fix conflicts and then commit the result.
4555 $ git commit -v -a
4556 Recorded resolution for 'drivers/pinctrl/core.c'.
4557 [master d888a2c] Merge remote-tracking branch 'pinctrl/for-next'
4558 $ git diff -M --stat --summary HEAD^..
4559 Merging moduleh/for-sfr (67b8499 Revert "tracing: Include module.h in define_trace.h")
4560 $ git merge moduleh/for-sfr
4561 Already up-to-date.
4562 Merging kvmtool/master (dd551ea kvm tools: Add missing 9p rename handler)
4563 $ git merge kvmtool/master
4564 Resolved 'include/net/9p/9p.h' using previous resolution.
4565 Resolved 'scripts/kconfig/Makefile' using previous resolution.
4566 Auto-merging scripts/kconfig/Makefile
4567 CONFLICT (content): Merge conflict in scripts/kconfig/Makefile
4568 Auto-merging include/net/9p/9p.h
4569 CONFLICT (content): Merge conflict in include/net/9p/9p.h
4570 Auto-merging arch/x86/Kconfig
4571 Auto-merging MAINTAINERS
4572 Automatic merge failed; fix conflicts and then commit the result.
4573 $ git commit -v -a
4574 [master 033ff8c] Merge remote-tracking branch 'kvmtool/master'
4575 $ git diff -M --stat --summary HEAD^..
4576  MAINTAINERS                                  |    8 +
4577  arch/x86/Kconfig                             |   30 +
4578  scripts/kconfig/Makefile                     |    6 +-
4579  tools/kvm/.gitignore                         |   10 +
4580  tools/kvm/CREDITS-Git                        |   30 +
4581  tools/kvm/Documentation/kernel-debugging.txt |   15 +
4582  tools/kvm/Documentation/kvm-balloon.txt      |   24 +
4583  tools/kvm/Documentation/kvm-debug.txt        |   16 +
4584  tools/kvm/Documentation/kvm-list.txt         |   16 +
4585  tools/kvm/Documentation/kvm-pause.txt        |   16 +
4586  tools/kvm/Documentation/kvm-resume.txt       |   16 +
4587  tools/kvm/Documentation/kvm-run.txt          |   62 ++
4588  tools/kvm/Documentation/kvm-setup.txt        |   15 +
4589  tools/kvm/Documentation/kvm-stat.txt         |   19 +
4590  tools/kvm/Documentation/kvm-stop.txt         |   16 +
4591  tools/kvm/Documentation/kvm-version.txt      |   21 +
4592  tools/kvm/Makefile                           |  306 ++++++
4593  tools/kvm/README                             |  109 +++
4594  tools/kvm/bios.c                             |  174 ++++
4595  tools/kvm/bios/.gitignore                    |    3 +
4596  tools/kvm/bios/bios-rom.S                    |   12 +
4597  tools/kvm/bios/e820.c                        |   72 ++
4598  tools/kvm/bios/entry.S                       |   92 ++
4599  tools/kvm/bios/gen-offsets.sh                |   14 +
4600  tools/kvm/bios/int10.c                       |  110 +++
4601  tools/kvm/bios/int15.c                       |   18 +
4602  tools/kvm/bios/local.S                       |    7 +
4603  tools/kvm/bios/macro.S                       |   25 +
4604  tools/kvm/bios/memcpy.c                      |   23 +
4605  tools/kvm/bios/rom.ld.S                      |   17 +
4606  tools/kvm/builtin-balloon.c                  |   90 ++
4607  tools/kvm/builtin-debug.c                    |   89 ++
4608  tools/kvm/builtin-help.c                     |   62 ++
4609  tools/kvm/builtin-list.c                     |  156 +++
4610  tools/kvm/builtin-pause.c                    |   78 ++
4611  tools/kvm/builtin-resume.c                   |   78 ++
4612  tools/kvm/builtin-run.c                      |  995 +++++++++++++++++++
4613  tools/kvm/builtin-setup.c                    |  228 +++++
4614  tools/kvm/builtin-stat.c                     |  131 +++
4615  tools/kvm/builtin-stop.c                     |   78 ++
4616  tools/kvm/builtin-version.c                  |   15 +
4617  tools/kvm/code16gcc.h                        |   15 +
4618  tools/kvm/command-list.txt                   |   14 +
4619  tools/kvm/config/feature-tests.mak           |  168 ++++
4620  tools/kvm/config/utilities.mak               |  188 ++++
4621  tools/kvm/cpuid.c                            |   55 ++
4622  tools/kvm/disk/blk.c                         |   39 +
4623  tools/kvm/disk/core.c                        |  241 +++++
4624  tools/kvm/disk/qcow.c                        | 1334 ++++++++++++++++++++++++++
4625  tools/kvm/disk/raw.c                         |  142 +++
4626  tools/kvm/framebuffer.c                      |   68 ++
4627  tools/kvm/guest/init.c                       |   46 +
4628  tools/kvm/guest_compat.c                     |  104 ++
4629  tools/kvm/hw/i8042.c                         |  348 +++++++
4630  tools/kvm/hw/pci-shmem.c                     |  261 +++++
4631  tools/kvm/hw/rtc.c                           |   87 ++
4632  tools/kvm/hw/serial.c                        |  364 +++++++
4633  tools/kvm/hw/vesa.c                          |   77 ++
4634  tools/kvm/include/asm/hweight.h              |    8 +
4635  tools/kvm/include/bios/memcpy.h              |    9 +
4636  tools/kvm/include/kvm/8250-serial.h          |   10 +
4637  tools/kvm/include/kvm/apic.h                 |   17 +
4638  tools/kvm/include/kvm/assembly.h             |   24 +
4639  tools/kvm/include/kvm/barrier.h              |   15 +
4640  tools/kvm/include/kvm/bios-export.h          |   13 +
4641  tools/kvm/include/kvm/bios.h                 |   88 ++
4642  tools/kvm/include/kvm/boot-protocol.h        |   16 +
4643  tools/kvm/include/kvm/brlock.h               |   41 +
4644  tools/kvm/include/kvm/builtin-balloon.h      |    7 +
4645  tools/kvm/include/kvm/builtin-debug.h        |    7 +
4646  tools/kvm/include/kvm/builtin-help.h         |    6 +
4647  tools/kvm/include/kvm/builtin-list.h         |    7 +
4648  tools/kvm/include/kvm/builtin-pause.h        |    7 +
4649  tools/kvm/include/kvm/builtin-resume.h       |    7 +
4650  tools/kvm/include/kvm/builtin-run.h          |    7 +
4651  tools/kvm/include/kvm/builtin-setup.h        |    9 +
4652  tools/kvm/include/kvm/builtin-stat.h         |    7 +
4653  tools/kvm/include/kvm/builtin-stop.h         |    7 +
4654  tools/kvm/include/kvm/builtin-version.h      |    6 +
4655  tools/kvm/include/kvm/compiler.h             |    6 +
4656  tools/kvm/include/kvm/cpufeature.h           |   41 +
4657  tools/kvm/include/kvm/disk-image.h           |   81 ++
4658  tools/kvm/include/kvm/e820.h                 |   12 +
4659  tools/kvm/include/kvm/framebuffer.h          |   34 +
4660  tools/kvm/include/kvm/guest_compat.h         |    9 +
4661  tools/kvm/include/kvm/i8042.h                |   12 +
4662  tools/kvm/include/kvm/interrupt.h            |   26 +
4663  tools/kvm/include/kvm/ioeventfd.h            |   27 +
4664  tools/kvm/include/kvm/ioport.h               |   65 ++
4665  tools/kvm/include/kvm/irq.h                  |   31 +
4666  tools/kvm/include/kvm/kvm-cmd.h              |   17 +
4667  tools/kvm/include/kvm/kvm-cpu.h              |   46 +
4668  tools/kvm/include/kvm/kvm-ipc.h              |   27 +
4669  tools/kvm/include/kvm/kvm.h                  |  108 +++
4670  tools/kvm/include/kvm/mptable.h              |    8 +
4671  tools/kvm/include/kvm/mutex.h                |   33 +
4672  tools/kvm/include/kvm/parse-options.h        |  213 ++++
4673  tools/kvm/include/kvm/pci-shmem.h            |   28 +
4674  tools/kvm/include/kvm/pci.h                  |   74 ++
4675  tools/kvm/include/kvm/qcow.h                 |  131 +++
4676  tools/kvm/include/kvm/rbtree-interval.h      |   27 +
4677  tools/kvm/include/kvm/read-write.h           |   43 +
4678  tools/kvm/include/kvm/rtc.h                  |    6 +
4679  tools/kvm/include/kvm/rwsem.h                |   39 +
4680  tools/kvm/include/kvm/sdl.h                  |   17 +
4681  tools/kvm/include/kvm/segment.h              |   21 +
4682  tools/kvm/include/kvm/strbuf.h               |    6 +
4683  tools/kvm/include/kvm/symbol.h               |   22 +
4684  tools/kvm/include/kvm/term.h                 |   18 +
4685  tools/kvm/include/kvm/threadpool.h           |   37 +
4686  tools/kvm/include/kvm/types.h                |    7 +
4687  tools/kvm/include/kvm/uip.h                  |  358 +++++++
4688  tools/kvm/include/kvm/util.h                 |   78 ++
4689  tools/kvm/include/kvm/vesa.h                 |   18 +
4690  tools/kvm/include/kvm/virtio-9p.h            |   74 ++
4691  tools/kvm/include/kvm/virtio-balloon.h       |    8 +
4692  tools/kvm/include/kvm/virtio-blk.h           |   13 +
4693  tools/kvm/include/kvm/virtio-console.h       |    9 +
4694  tools/kvm/include/kvm/virtio-net.h           |   21 +
4695  tools/kvm/include/kvm/virtio-pci-dev.h       |   37 +
4696  tools/kvm/include/kvm/virtio-pci.h           |   60 ++
4697  tools/kvm/include/kvm/virtio-rng.h           |    9 +
4698  tools/kvm/include/kvm/virtio.h               |   62 ++
4699  tools/kvm/include/kvm/vnc.h                  |   14 +
4700  tools/kvm/include/linux/bitops.h             |   33 +
4701  tools/kvm/include/linux/byteorder.h          |    7 +
4702  tools/kvm/include/linux/kernel.h             |   39 +
4703  tools/kvm/include/linux/module.h             |    6 +
4704  tools/kvm/include/linux/prefetch.h           |    6 +
4705  tools/kvm/include/linux/types.h              |   50 +
4706  tools/kvm/interrupt.c                        |   27 +
4707  tools/kvm/ioeventfd.c                        |  128 +++
4708  tools/kvm/ioport.c                           |  192 ++++
4709  tools/kvm/irq.c                              |  193 ++++
4710  tools/kvm/kvm-cmd.c                          |   91 ++
4711  tools/kvm/kvm-cpu.c                          |  523 ++++++++++
4712  tools/kvm/kvm-ipc.c                          |  171 ++++
4713  tools/kvm/kvm.c                              |  821 ++++++++++++++++
4714  tools/kvm/main.c                             |   19 +
4715  tools/kvm/mmio.c                             |  132 +++
4716  tools/kvm/mptable.c                          |  284 ++++++
4717  tools/kvm/net/uip/arp.c                      |   30 +
4718  tools/kvm/net/uip/buf.c                      |  114 +++
4719  tools/kvm/net/uip/core.c                     |  190 ++++
4720  tools/kvm/net/uip/csum.c                     |   92 ++
4721  tools/kvm/net/uip/dhcp.c                     |  203 ++++
4722  tools/kvm/net/uip/icmp.c                     |   29 +
4723  tools/kvm/net/uip/ipv4.c                     |   29 +
4724  tools/kvm/net/uip/tcp.c                      |  317 ++++++
4725  tools/kvm/net/uip/udp.c                      |  236 +++++
4726  tools/kvm/pci.c                              |  169 ++++
4727  tools/kvm/read-write.c                       |  344 +++++++
4728  tools/kvm/symbol.c                           |   98 ++
4729  tools/kvm/term.c                             |  170 ++++
4730  tools/kvm/tests/Makefile                     |   19 +
4731  tools/kvm/tests/boot/Makefile                |   13 +
4732  tools/kvm/tests/boot/init.c                  |   11 +
4733  tools/kvm/tests/kernel/.gitignore            |    2 +
4734  tools/kvm/tests/kernel/Makefile              |   20 +
4735  tools/kvm/tests/kernel/README                |   16 +
4736  tools/kvm/tests/kernel/kernel.S              |    8 +
4737  tools/kvm/tests/pit/.gitignore               |    2 +
4738  tools/kvm/tests/pit/Makefile                 |   20 +
4739  tools/kvm/tests/pit/README                   |   16 +
4740  tools/kvm/tests/pit/tick.S                   |  109 +++
4741  tools/kvm/threadpool.c                       |  146 +++
4742  tools/kvm/ui/sdl.c                           |  280 ++++++
4743  tools/kvm/ui/vnc.c                           |  218 +++++
4744  tools/kvm/util.c                             |  101 ++
4745  tools/kvm/util/KVMTOOLS-VERSION-GEN          |   40 +
4746  tools/kvm/util/generate-cmdlist.sh           |   23 +
4747  tools/kvm/util/kvm-ifup-vbr0                 |    6 +
4748  tools/kvm/util/parse-options.c               |  577 +++++++++++
4749  tools/kvm/util/rbtree-interval.c             |   90 ++
4750  tools/kvm/util/set_private_br.sh             |   51 +
4751  tools/kvm/util/strbuf.c                      |   13 +
4752  tools/kvm/virtio/9p-pdu.c                    |  287 ++++++
4753  tools/kvm/virtio/9p.c                        | 1318 +++++++++++++++++++++++++
4754  tools/kvm/virtio/balloon.c                   |  264 +++++
4755  tools/kvm/virtio/blk.c                       |  288 ++++++
4756  tools/kvm/virtio/console.c                   |  199 ++++
4757  tools/kvm/virtio/core.c                      |  111 +++
4758  tools/kvm/virtio/net.c                       |  423 ++++++++
4759  tools/kvm/virtio/pci.c                       |  319 ++++++
4760  tools/kvm/virtio/rng.c                       |  185 ++++
4761  185 files changed, 19121 insertions(+), 1 deletions(-)
4762  create mode 100644 tools/kvm/.gitignore
4763  create mode 100644 tools/kvm/CREDITS-Git
4764  create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
4765  create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
4766  create mode 100644 tools/kvm/Documentation/kvm-debug.txt
4767  create mode 100644 tools/kvm/Documentation/kvm-list.txt
4768  create mode 100644 tools/kvm/Documentation/kvm-pause.txt
4769  create mode 100644 tools/kvm/Documentation/kvm-resume.txt
4770  create mode 100644 tools/kvm/Documentation/kvm-run.txt
4771  create mode 100644 tools/kvm/Documentation/kvm-setup.txt
4772  create mode 100644 tools/kvm/Documentation/kvm-stat.txt
4773  create mode 100644 tools/kvm/Documentation/kvm-stop.txt
4774  create mode 100644 tools/kvm/Documentation/kvm-version.txt
4775  create mode 100644 tools/kvm/Makefile
4776  create mode 100644 tools/kvm/README
4777  create mode 100644 tools/kvm/bios.c
4778  create mode 100644 tools/kvm/bios/.gitignore
4779  create mode 100644 tools/kvm/bios/bios-rom.S
4780  create mode 100644 tools/kvm/bios/e820.c
4781  create mode 100644 tools/kvm/bios/entry.S
4782  create mode 100644 tools/kvm/bios/gen-offsets.sh
4783  create mode 100644 tools/kvm/bios/int10.c
4784  create mode 100644 tools/kvm/bios/int15.c
4785  create mode 100644 tools/kvm/bios/local.S
4786  create mode 100644 tools/kvm/bios/macro.S
4787  create mode 100644 tools/kvm/bios/memcpy.c
4788  create mode 100644 tools/kvm/bios/rom.ld.S
4789  create mode 100644 tools/kvm/builtin-balloon.c
4790  create mode 100644 tools/kvm/builtin-debug.c
4791  create mode 100644 tools/kvm/builtin-help.c
4792  create mode 100644 tools/kvm/builtin-list.c
4793  create mode 100644 tools/kvm/builtin-pause.c
4794  create mode 100644 tools/kvm/builtin-resume.c
4795  create mode 100644 tools/kvm/builtin-run.c
4796  create mode 100644 tools/kvm/builtin-setup.c
4797  create mode 100644 tools/kvm/builtin-stat.c
4798  create mode 100644 tools/kvm/builtin-stop.c
4799  create mode 100644 tools/kvm/builtin-version.c
4800  create mode 100644 tools/kvm/code16gcc.h
4801  create mode 100644 tools/kvm/command-list.txt
4802  create mode 100644 tools/kvm/config/feature-tests.mak
4803  create mode 100644 tools/kvm/config/utilities.mak
4804  create mode 100644 tools/kvm/cpuid.c
4805  create mode 100644 tools/kvm/disk/blk.c
4806  create mode 100644 tools/kvm/disk/core.c
4807  create mode 100644 tools/kvm/disk/qcow.c
4808  create mode 100644 tools/kvm/disk/raw.c
4809  create mode 100644 tools/kvm/framebuffer.c
4810  create mode 100644 tools/kvm/guest/init.c
4811  create mode 100644 tools/kvm/guest_compat.c
4812  create mode 100644 tools/kvm/hw/i8042.c
4813  create mode 100644 tools/kvm/hw/pci-shmem.c
4814  create mode 100644 tools/kvm/hw/rtc.c
4815  create mode 100644 tools/kvm/hw/serial.c
4816  create mode 100644 tools/kvm/hw/vesa.c
4817  create mode 100644 tools/kvm/include/asm/hweight.h
4818  create mode 100644 tools/kvm/include/bios/memcpy.h
4819  create mode 100644 tools/kvm/include/kvm/8250-serial.h
4820  create mode 100644 tools/kvm/include/kvm/apic.h
4821  create mode 100644 tools/kvm/include/kvm/assembly.h
4822  create mode 100644 tools/kvm/include/kvm/barrier.h
4823  create mode 100644 tools/kvm/include/kvm/bios-export.h
4824  create mode 100644 tools/kvm/include/kvm/bios.h
4825  create mode 100644 tools/kvm/include/kvm/boot-protocol.h
4826  create mode 100644 tools/kvm/include/kvm/brlock.h
4827  create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
4828  create mode 100644 tools/kvm/include/kvm/builtin-debug.h
4829  create mode 100644 tools/kvm/include/kvm/builtin-help.h
4830  create mode 100644 tools/kvm/include/kvm/builtin-list.h
4831  create mode 100644 tools/kvm/include/kvm/builtin-pause.h
4832  create mode 100644 tools/kvm/include/kvm/builtin-resume.h
4833  create mode 100644 tools/kvm/include/kvm/builtin-run.h
4834  create mode 100644 tools/kvm/include/kvm/builtin-setup.h
4835  create mode 100644 tools/kvm/include/kvm/builtin-stat.h
4836  create mode 100644 tools/kvm/include/kvm/builtin-stop.h
4837  create mode 100644 tools/kvm/include/kvm/builtin-version.h
4838  create mode 100644 tools/kvm/include/kvm/compiler.h
4839  create mode 100644 tools/kvm/include/kvm/cpufeature.h
4840  create mode 100644 tools/kvm/include/kvm/disk-image.h
4841  create mode 100644 tools/kvm/include/kvm/e820.h
4842  create mode 100644 tools/kvm/include/kvm/framebuffer.h
4843  create mode 100644 tools/kvm/include/kvm/guest_compat.h
4844  create mode 100644 tools/kvm/include/kvm/i8042.h
4845  create mode 100644 tools/kvm/include/kvm/interrupt.h
4846  create mode 100644 tools/kvm/include/kvm/ioeventfd.h
4847  create mode 100644 tools/kvm/include/kvm/ioport.h
4848  create mode 100644 tools/kvm/include/kvm/irq.h
4849  create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
4850  create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
4851  create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
4852  create mode 100644 tools/kvm/include/kvm/kvm.h
4853  create mode 100644 tools/kvm/include/kvm/mptable.h
4854  create mode 100644 tools/kvm/include/kvm/mutex.h
4855  create mode 100644 tools/kvm/include/kvm/parse-options.h
4856  create mode 100644 tools/kvm/include/kvm/pci-shmem.h
4857  create mode 100644 tools/kvm/include/kvm/pci.h
4858  create mode 100644 tools/kvm/include/kvm/qcow.h
4859  create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
4860  create mode 100644 tools/kvm/include/kvm/read-write.h
4861  create mode 100644 tools/kvm/include/kvm/rtc.h
4862  create mode 100644 tools/kvm/include/kvm/rwsem.h
4863  create mode 100644 tools/kvm/include/kvm/sdl.h
4864  create mode 100644 tools/kvm/include/kvm/segment.h
4865  create mode 100644 tools/kvm/include/kvm/strbuf.h
4866  create mode 100644 tools/kvm/include/kvm/symbol.h
4867  create mode 100644 tools/kvm/include/kvm/term.h
4868  create mode 100644 tools/kvm/include/kvm/threadpool.h
4869  create mode 100644 tools/kvm/include/kvm/types.h
4870  create mode 100644 tools/kvm/include/kvm/uip.h
4871  create mode 100644 tools/kvm/include/kvm/util.h
4872  create mode 100644 tools/kvm/include/kvm/vesa.h
4873  create mode 100644 tools/kvm/include/kvm/virtio-9p.h
4874  create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
4875  create mode 100644 tools/kvm/include/kvm/virtio-blk.h
4876  create mode 100644 tools/kvm/include/kvm/virtio-console.h
4877  create mode 100644 tools/kvm/include/kvm/virtio-net.h
4878  create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
4879  create mode 100644 tools/kvm/include/kvm/virtio-pci.h
4880  create mode 100644 tools/kvm/include/kvm/virtio-rng.h
4881  create mode 100644 tools/kvm/include/kvm/virtio.h
4882  create mode 100644 tools/kvm/include/kvm/vnc.h
4883  create mode 100644 tools/kvm/include/linux/bitops.h
4884  create mode 100644 tools/kvm/include/linux/byteorder.h
4885  create mode 100644 tools/kvm/include/linux/kernel.h
4886  create mode 100644 tools/kvm/include/linux/module.h
4887  create mode 100644 tools/kvm/include/linux/prefetch.h
4888  create mode 100644 tools/kvm/include/linux/types.h
4889  create mode 100644 tools/kvm/interrupt.c
4890  create mode 100644 tools/kvm/ioeventfd.c
4891  create mode 100644 tools/kvm/ioport.c
4892  create mode 100644 tools/kvm/irq.c
4893  create mode 100644 tools/kvm/kvm-cmd.c
4894  create mode 100644 tools/kvm/kvm-cpu.c
4895  create mode 100644 tools/kvm/kvm-ipc.c
4896  create mode 100644 tools/kvm/kvm.c
4897  create mode 100644 tools/kvm/main.c
4898  create mode 100644 tools/kvm/mmio.c
4899  create mode 100644 tools/kvm/mptable.c
4900  create mode 100644 tools/kvm/net/uip/arp.c
4901  create mode 100644 tools/kvm/net/uip/buf.c
4902  create mode 100644 tools/kvm/net/uip/core.c
4903  create mode 100644 tools/kvm/net/uip/csum.c
4904  create mode 100644 tools/kvm/net/uip/dhcp.c
4905  create mode 100644 tools/kvm/net/uip/icmp.c
4906  create mode 100644 tools/kvm/net/uip/ipv4.c
4907  create mode 100644 tools/kvm/net/uip/tcp.c
4908  create mode 100644 tools/kvm/net/uip/udp.c
4909  create mode 100644 tools/kvm/pci.c
4910  create mode 100644 tools/kvm/read-write.c
4911  create mode 100644 tools/kvm/symbol.c
4912  create mode 100644 tools/kvm/term.c
4913  create mode 100644 tools/kvm/tests/Makefile
4914  create mode 100644 tools/kvm/tests/boot/Makefile
4915  create mode 100644 tools/kvm/tests/boot/init.c
4916  create mode 100644 tools/kvm/tests/kernel/.gitignore
4917  create mode 100644 tools/kvm/tests/kernel/Makefile
4918  create mode 100644 tools/kvm/tests/kernel/README
4919  create mode 100644 tools/kvm/tests/kernel/kernel.S
4920  create mode 100644 tools/kvm/tests/pit/.gitignore
4921  create mode 100644 tools/kvm/tests/pit/Makefile
4922  create mode 100644 tools/kvm/tests/pit/README
4923  create mode 100644 tools/kvm/tests/pit/tick.S
4924  create mode 100644 tools/kvm/threadpool.c
4925  create mode 100644 tools/kvm/ui/sdl.c
4926  create mode 100644 tools/kvm/ui/vnc.c
4927  create mode 100644 tools/kvm/util.c
4928  create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
4929  create mode 100755 tools/kvm/util/generate-cmdlist.sh
4930  create mode 100755 tools/kvm/util/kvm-ifup-vbr0
4931  create mode 100644 tools/kvm/util/parse-options.c
4932  create mode 100644 tools/kvm/util/rbtree-interval.c
4933  create mode 100755 tools/kvm/util/set_private_br.sh
4934  create mode 100644 tools/kvm/util/strbuf.c
4935  create mode 100644 tools/kvm/virtio/9p-pdu.c
4936  create mode 100644 tools/kvm/virtio/9p.c
4937  create mode 100644 tools/kvm/virtio/balloon.c
4938  create mode 100644 tools/kvm/virtio/blk.c
4939  create mode 100644 tools/kvm/virtio/console.c
4940  create mode 100644 tools/kvm/virtio/core.c
4941  create mode 100644 tools/kvm/virtio/net.c
4942  create mode 100644 tools/kvm/virtio/pci.c
4943  create mode 100644 tools/kvm/virtio/rng.c
4944 Merging scsi-post-merge/merge-base:master ()
4945 $ git clone -s -l -n -q . ../rebase-tmp
4946 $ cd ../rebase-tmp
4947 $ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm
4948 From ../next
4949  * [new branch]      quilt/akpm -> akpm
4950 $ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base
4951 From ../next
4952  * [new branch]      quilt/akpm-base -> akpm-base
4953 $ git checkout akpm
4954 Switched to branch 'akpm'
4955 $ git rebase --onto master akpm-base
4956 First, rewinding head to replay your work on top of it...
4957 Applying: drm: fix kconfig unmet dependency warning
4958 Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
4959 Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
4960 Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
4961 Applying: x86: fix mmap random address range
4962 Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map
4963 Applying: vrtc: change its year offset from 1960 to 1972
4964 Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms
4965 Applying: mrst: battery fixes
4966 Applying: drivers/power/intel_mid_battery.c: fix build
4967 Applying: x86,mrst: add mapping for bma023
4968 Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
4969 Applying: arch/x86/kernel/ptrace.c: quiet sparse noise
4970 Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static
4971 Applying: x86: tlb flush avoid superflous leave_mm()
4972 Applying: x86: reduce clock calibration time during slave cpu startup
4973 Applying: x86-reduce-clock-calibration-time-during-slave-cpu-startup-fix
4974 Applying: x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode
4975 Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
4976 Applying: arm, exec: remove redundant set_fs(USER_DS)
4977 Applying: audit: always follow va_copy() with va_end()
4978 Applying: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
4979 Applying: devtmpfsd: fix task state handling
4980 Applying: drivers/gpu/vga/vgaarb.c: add missing kfree
4981 Applying: drm: avoid switching to text console if there is no panic timeout
4982 Applying: hrtimers: Special-case zero length sleeps
4983 Applying: ia64, exec: remove redundant set_fs(USER_DS)
4984 Applying: brlocks/lglocks: clean up code
4985 Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes
4986 Applying: ipc/mqueue: cleanup definition names and locations
4987 Applying: ipc/mqueue: switch back to using non-max values on create
4988 Applying: ipc/mqueue: enforce hard limits
4989 Applying: ipc/mqueue: update maximums for the mqueue subsystem
4990 Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-fix
4991 Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes
4992 Applying: unicore32, exec: remove redundant set_fs(USER_DS)
4993 Applying: drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
4994 Applying: debugobjects: extend debugobjects to assert that an object is initialized
4995 Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers
4996 Applying: ext4: use proper little-endian bitops
4997 Applying: ocfs2: avoid unaligned access to dqc_bitmap
4998 Applying: parisc, exec: remove redundant set_fs(USER_DS)
4999 Applying: drivers/firmware/dmi_scan.c: make dmi_name_in_vendors more focused
5000 Applying: scsi: fix a header to include linux/types.h
5001 Applying: drivers/scsi/megaraid.c: fix sparse warnings
5002 Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()
5003 Applying: drivers/scsi/osd/osd_uld.c: use ida_simple_get() to handle id
5004 Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user()
5005 Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
5006 Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements
5007 Applying: loop: prevent information leak after failed read
5008 Applying: loop: cleanup set_status interface
5009 Applying: loop-cleanup-set_status-interface-checkpatch-fixes
5010 Applying: cciss: auto engage SCSI mid layer at driver load time
5011 Applying: block: avoid unnecessary plug list flush
5012 Applying: block: add missed trace_block_plug
5013 Applying: include/linux/bio.h: use a static inline function for bio_integrity_clone()
5014 Applying: bio: change some signed vars to unsigned
5015 Applying: paride: fix potential information leak in pg_read()
5016 Applying: slab: add taint flag outputting to debug paths.
5017 Applying: slub: add taint flag outputting to debug paths
5018 Applying: drivers/tty/serial/pch_uart.c: add console support
5019 Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
5020 Applying: vmscan: fix initial shrinker size handling
5021 Applying: vmscan: use atomic-long for shrinker batching
5022 Applying: vmscan-use-atomic-long-for-shrinker-batching-fix
5023 Applying: vmscan: promote shared file mapped pages
5024 Applying: vmscan: activate executable pages after first usage
5025 Applying: mm: add free_hot_cold_page_list() helper
5026 Applying: mm: fix page-faults detection in swap-token logic
5027 Applying: mm: add extra free kbytes tunable
5028 Applying: mm-add-extra-free-kbytes-tunable-update
5029 Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
5030 Applying: mm: add vm_area_add_early()
5031 Applying: selinuxfs: remove custom hex_to_bin()
5032 Applying: include/linux/security.h: fix security_inode_init_security() arg
5033 Applying: hpet: factor timer allocate from open
5034 Applying: intel_idle: fix API misuse
5035 Using index info to reconstruct a base tree...
5036 Falling back to patching base and 3-way merge...
5037 Auto-merging drivers/idle/intel_idle.c
5038 CONFLICT (content): Merge conflict in drivers/idle/intel_idle.c
5039 Failed to merge in the changes.
5040 Patch failed at 0078 intel_idle: fix API misuse
5041
5042 When you have resolved this problem run "git rebase --continue".
5043 If you would prefer to skip this patch, instead run "git rebase --skip".
5044 To check out the original branch and stop rebasing run "git rebase --abort".
5045
5046 $ git rebase --continue
5047 Applying: intel_idle: disable auto_demotion for hotplugged CPUs
5048 Applying: poll: add poll_requested_events() function
5049 Applying: lib/crc: add slice by 8 algorithm to crc32.c
5050 Applying: lib-crc-add-slice-by-8-algorithm-to-crc32c-fix
5051 Applying: epoll: limit paths
5052 Applying: oprofilefs: handle zero-length writes
5053 Applying: cgroups: add res_counter_write_u64() API
5054 Applying: cgroups: new resource counter inheritance API
5055 Applying: cgroups: add previous cgroup in can_attach_task/attach_task callbacks
5056 Applying: cgroups: new cancel_attach_task() subsystem callback
5057 Applying: cgroups: ability to stop res charge propagation on bounded ancestor
5058 Applying: cgroups: add res counter common ancestor searching
5059 Applying: res_counter: allow charge failure pointer to be null
5060 Applying: cgroups: pull up res counter charge failure interpretation to caller
5061 Applying: cgroups: allow subsystems to cancel a fork
5062 Applying: cgroups: add a task counter subsystem
5063 Applying: cgroups: ERR_PTR needs err.h
5064 Applying: proc: force dcache drop on unauthorized access
5065 Applying: kdump: fix crash_kexec()/smp_send_stop() race in panic
5066 Applying: kdump: Add udev events for memory online/offline
5067 Applying: ipc/sem.c: alternatives to preempt_disable()
5068 Applying: fs/direct-io.c: calculate fs_count correctly in get_more_blocks()
5069 Applying: vfs: cache request_queue in struct block_device
5070 Applying: dio: optimize cache misses in the submission path
5071 Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes
5072 Applying: dio: using prefetch requires including prefetch.h
5073 Applying: ramoops: update parameters only after successful init
5074 $ cd ../next
5075 $ git fetch -f ../rebase-tmp akpm:akpm
5076 From ../rebase-tmp
5077  + ebb59ed...aab015b akpm       -> akpm  (forced update)
5078 $ rm -rf ../rebase-tmp
5079 Merging akpm (aab015b ramoops: update parameters only after successful init)
5080 $ git merge --no-ff akpm
5081 Merge made by the 'recursive' strategy.
5082  Documentation/DocBook/debugobjects.tmpl         |   50 +++
5083  Documentation/blockdev/cciss.txt                |   14 +-
5084  Documentation/cgroups/cgroups.txt               |   13 +-
5085  Documentation/cgroups/resource_counter.txt      |   20 ++-
5086  Documentation/cgroups/task_counter.txt          |  153 ++++++++++
5087  Documentation/sysctl/vm.txt                     |   16 +
5088  arch/arm/include/asm/processor.h                |    1 -
5089  arch/arm/mach-ux500/mbox-db5500.c               |    2 +-
5090  arch/ia64/include/asm/processor.h               |    1 -
5091  arch/parisc/include/asm/processor.h             |    2 -
5092  arch/parisc/kernel/process.c                    |    1 -
5093  arch/unicore32/include/asm/processor.h          |    1 -
5094  arch/x86/include/asm/mrst.h                     |    9 +
5095  arch/x86/kernel/e820.c                          |   59 ++---
5096  arch/x86/kernel/ptrace.c                        |    3 +-
5097  arch/x86/kernel/rtc.c                           |    5 +
5098  arch/x86/kernel/smpboot.c                       |   16 +-
5099  arch/x86/kernel/tsc.c                           |   20 ++
5100  arch/x86/mm/highmem_32.c                        |    2 +
5101  arch/x86/mm/mmap.c                              |    4 +-
5102  arch/x86/mm/pageattr.c                          |    2 +-
5103  arch/x86/mm/tlb.c                               |   16 +-
5104  arch/x86/platform/iris/iris.c                   |   67 ++++-
5105  arch/x86/platform/mrst/mrst.c                   |    1 +
5106  arch/x86/platform/mrst/vrtc.c                   |    4 +-
5107  block/blk-cgroup.c                              |   12 +-
5108  block/blk-core.c                                |   18 +-
5109  drivers/base/devtmpfs.c                         |    3 +-
5110  drivers/base/memory.c                           |   10 +-
5111  drivers/block/cciss.c                           |    1 +
5112  drivers/block/cciss_scsi.c                      |    1 +
5113  drivers/block/loop.c                            |   47 ++-
5114  drivers/block/paride/pg.c                       |    1 +
5115  drivers/char/hpet.c                             |   56 +++-
5116  drivers/char/ramoops.c                          |   17 +-
5117  drivers/edac/mpc85xx_edac.c                     |    2 +-
5118  drivers/firmware/dmi_scan.c                     |    6 +-
5119  drivers/gpu/drm/Kconfig                         |    1 +
5120  drivers/gpu/drm/drm_fb_helper.c                 |    7 +
5121  drivers/gpu/vga/vgaarb.c                        |   18 +-
5122  drivers/idle/intel_idle.c                       |   59 +++--
5123  drivers/message/fusion/mptbase.c                |    7 +-
5124  drivers/message/fusion/mptbase.h                |    1 +
5125  drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h |    2 -
5126  drivers/oprofile/oprofilefs.c                   |    5 +-
5127  drivers/platform/x86/acerhdf.c                  |    1 +
5128  drivers/power/intel_mid_battery.c               |   12 +-
5129  drivers/rtc/rtc-mrst.c                          |   19 +-
5130  drivers/scsi/aacraid/commctrl.c                 |    1 +
5131  drivers/scsi/megaraid.c                         |    8 +-
5132  drivers/scsi/mpt2sas/mpt2sas_base.c             |    3 +-
5133  drivers/scsi/osd/osd_uld.c                      |   22 +-
5134  drivers/scsi/sg.c                               |   25 +-
5135  drivers/tty/serial/Kconfig                      |    9 +
5136  drivers/tty/serial/pch_uart.c                   |  160 ++++++++++-
5137  fs/bio.c                                        |    7 +-
5138  fs/block_dev.c                                  |    3 +
5139  fs/dcache.c                                     |   10 +-
5140  fs/direct-io.c                                  |   57 +++-
5141  fs/eventpoll.c                                  |  245 +++++++++++++--
5142  fs/ext4/ext4.h                                  |    7 +-
5143  fs/ext4/ialloc.c                                |    4 +-
5144  fs/file_table.c                                 |   23 +-
5145  fs/internal.h                                   |    3 +-
5146  fs/namei.c                                      |   26 +-
5147  fs/namespace.c                                  |  124 ++++----
5148  fs/ocfs2/ocfs2.h                                |   47 +++
5149  fs/ocfs2/quota_local.c                          |   10 +-
5150  fs/pnode.c                                      |    4 +-
5151  fs/proc/base.c                                  |   42 +---
5152  fs/select.c                                     |   38 +--
5153  include/linux/bio.h                             |   10 +-
5154  include/linux/cgroup.h                          |   28 ++-
5155  include/linux/cgroup_subsys.h                   |    8 +
5156  include/linux/debugobjects.h                    |    6 +
5157  include/linux/eventpoll.h                       |    1 +
5158  include/linux/fs.h                              |    5 +-
5159  include/linux/gfp.h                             |    1 +
5160  include/linux/hpet.h                            |    1 +
5161  include/linux/ipc_namespace.h                   |   40 +++-
5162  include/linux/lglock.h                          |  152 ++--------
5163  include/linux/mm.h                              |    1 +
5164  include/linux/mm_types.h                        |    1 +
5165  include/linux/mmzone.h                          |    2 +-
5166  include/linux/poll.h                            |    7 +-
5167  include/linux/res_counter.h                     |   27 ++-
5168  include/linux/security.h                        |    2 +-
5169  include/linux/shrinker.h                        |    2 +-
5170  include/linux/swap.h                            |   36 +++
5171  include/linux/vmalloc.h                         |    1 +
5172  include/linux/writeback.h                       |    2 -
5173  include/scsi/scsi_netlink.h                     |    2 +-
5174  init/Kconfig                                    |    9 +
5175  init/calibrate.c                                |   15 +
5176  ipc/mq_sysctl.c                                 |   31 +--
5177  ipc/mqueue.c                                    |   24 +-
5178  ipc/sem.c                                       |  250 +++++++++++-----
5179  kernel/Makefile                                 |    3 +-
5180  kernel/audit.c                                  |    5 +-
5181  kernel/cgroup.c                                 |   58 +++-
5182  kernel/cgroup_freezer.c                         |    9 +-
5183  kernel/cgroup_task_counter.c                    |  239 +++++++++++++++
5184  kernel/cpuset.c                                 |    6 +-
5185  kernel/events/core.c                            |    5 +-
5186  kernel/exit.c                                   |    2 +-
5187  kernel/fork.c                                   |    8 +-
5188  kernel/hrtimer.c                                |    8 +
5189  kernel/lglock.c                                 |  101 ++++++
5190  kernel/panic.c                                  |    8 +
5191  kernel/res_counter.c                            |   97 +++++-
5192  kernel/sched.c                                  |    6 +-
5193  kernel/sysctl.c                                 |   11 +-
5194  kernel/timer.c                                  |   54 +++-
5195  lib/crc32.c                                     |  370 ++++++++++++++++-------
5196  lib/crc32defs.h                                 |   16 +-
5197  lib/debugobjects.c                              |   33 ++
5198  lib/gen_crc32table.c                            |   59 +++--
5199  mm/memory.c                                     |   13 +
5200  mm/page-writeback.c                             |  122 ++++----
5201  mm/page_alloc.c                                 |   49 +++-
5202  mm/rmap.c                                       |    3 +-
5203  mm/slab.c                                       |    9 +-
5204  mm/slub.c                                       |    2 +-
5205  mm/swap.c                                       |   14 +-
5206  mm/vmalloc.c                                    |   28 ++-
5207  mm/vmscan.c                                     |   54 ++--
5208  net/netfilter/nf_conntrack_netlink.c            |    5 +
5209  security/selinux/selinuxfs.c                    |   14 +-
5210  128 files changed, 2729 insertions(+), 1012 deletions(-)
5211  create mode 100644 Documentation/cgroups/task_counter.txt
5212  create mode 100644 kernel/cgroup_task_counter.c
5213  create mode 100644 kernel/lglock.c