Next/merge.log

   1 $ date
   2 Thu Nov  3 12:35:49 EST 2011
   3 $ git checkout master
   4 Already on 'master'
   5 $ git reset --hard stable
   6 HEAD is now at b4beb4b Merge branch 'for-linus/i2c-3.2' of git://git.fluff.org/bjdooks/linux
   7 Merging origin/master (43672a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/linux-dm)
   8 $ git merge origin/master
   9 Updating b4beb4b..43672a0
  10 Fast-forward
  11  Documentation/DMA-API.txt                          |    7 +
  12  Documentation/cgroups/memory.txt                   |    1 -
  13  Documentation/device-mapper/dm-log.txt             |    2 +-
  14  Documentation/device-mapper/persistent-data.txt    |   84 +
  15  Documentation/device-mapper/thin-provisioning.txt  |  285 ++
  16  Documentation/devicetree/bindings/arm/calxeda.txt  |    8 +
  17  Documentation/devicetree/bindings/arm/fsl.txt      |   26 +
  18  Documentation/devicetree/bindings/arm/gic.txt      |   55 +
  19  Documentation/devicetree/bindings/arm/omap/dsp.txt |   14 +
  20  Documentation/devicetree/bindings/arm/omap/iva.txt |   19 +
  21  .../devicetree/bindings/arm/omap/l3-noc.txt        |   19 +
  22  Documentation/devicetree/bindings/arm/omap/mpu.txt |   27 +
  23  .../devicetree/bindings/arm/omap/omap.txt          |   43 +
  24  .../devicetree/bindings/arm/picoxcell.txt          |   24 +
  25  .../devicetree/bindings/pinmux/pinmux_nvidia.txt   |    5 +
  26  .../devicetree/bindings/tty/serial/msm_serial.txt  |   27 +
  27  Documentation/devicetree/bindings/virtio/mmio.txt  |   17 +
  28  Documentation/feature-removal-schedule.txt         |   35 -
  29  Documentation/filesystems/Locking                  |    1 +
  30  Documentation/filesystems/ext3.txt                 |    8 -
  31  Documentation/filesystems/ext4.txt                 |   41 +-
  32  Documentation/rapidio/rapidio.txt                  |    2 +-
  33  Documentation/rapidio/tsi721.txt                   |   49 +
  34  Documentation/virtual/uml/UserModeLinux-HOWTO.txt  |  532 ++--
  35  MAINTAINERS                                        |   26 +-
  36  arch/arm/Kconfig                                   |   49 +-
  37  arch/arm/Kconfig.debug                             |  131 +-
  38  arch/arm/Makefile                                  |    9 +-
  39  arch/arm/boot/dts/at91sam9g20.dtsi                 |  119 +
  40  arch/arm/boot/dts/at91sam9g45.dtsi                 |  106 +
  41  arch/arm/boot/dts/at91sam9m10g45ek.dts             |   35 +
  42  arch/arm/boot/dts/highbank.dts                     |  198 ++
  43  arch/arm/boot/dts/imx51-babbage.dts                |  135 +
  44  arch/arm/boot/dts/imx51.dtsi                       |  246 ++
  45  arch/arm/boot/dts/imx53-ard.dts                    |  113 +
  46  arch/arm/boot/dts/imx53-evk.dts                    |  120 +
  47  arch/arm/boot/dts/imx53-qsb.dts                    |  125 +
  48  arch/arm/boot/dts/imx53-smd.dts                    |  169 +
  49  arch/arm/boot/dts/imx53.dtsi                       |  301 ++
  50  arch/arm/boot/dts/imx6q-sabreauto.dts              |   62 +
  51  arch/arm/boot/dts/imx6q.dtsi                       |  575 ++++
  52  arch/arm/boot/dts/msm8660-surf.dts                 |   24 +
  53  arch/arm/boot/dts/omap3-beagle.dts                 |   29 +
  54  arch/arm/boot/dts/omap3.dtsi                       |   63 +
  55  arch/arm/boot/dts/omap4-panda.dts                  |   29 +
  56  arch/arm/boot/dts/omap4-sdp.dts                    |   29 +
  57  arch/arm/boot/dts/omap4.dtsi                       |  103 +
  58  arch/arm/boot/dts/picoxcell-pc3x2.dtsi             |  249 ++
  59  arch/arm/boot/dts/picoxcell-pc3x3.dtsi             |  365 ++
  60  arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts       |   86 +
  61  arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts       |   92 +
  62  arch/arm/boot/dts/prima2-cb.dts                    |   14 +-
  63  arch/arm/boot/dts/tegra-harmony.dts                |    1 +
  64  arch/arm/boot/dts/tegra-seaboard.dts               |    4 +
  65  arch/arm/boot/dts/tegra-ventana.dts                |   32 +
  66  arch/arm/boot/dts/tegra20.dtsi                     |    8 +
  67  arch/arm/boot/dts/usb_a9g20.dts                    |   30 +
  68  arch/arm/common/Kconfig                            |    1 +
  69  arch/arm/common/gic.c                              |  188 +-
  70  arch/arm/configs/at91sam9g45_defconfig             |  214 ++
  71  arch/arm/configs/exynos4_defconfig                 |    1 +
  72  .../{mx27_defconfig => imx_v4_v5_defconfig}        |   68 +-
  73  arch/arm/configs/mx1_defconfig                     |   91 -
  74  arch/arm/configs/mx21_defconfig                    |   97 -
  75  arch/arm/configs/mx3_defconfig                     |   46 +-
  76  arch/arm/configs/{mx51_defconfig => mx5_defconfig} |   60 +-
  77  arch/arm/configs/mxs_defconfig                     |    1 +
  78  arch/arm/configs/tegra_defconfig                   |   39 +-
  79  arch/arm/include/asm/device.h                      |    5 +
  80  arch/arm/include/asm/hardware/cache-l2x0.h         |    9 +-
  81  arch/arm/include/asm/hardware/gic.h                |   10 +-
  82  arch/arm/include/asm/hardware/it8152.h             |    2 +-
  83  arch/arm/mach-at91/Kconfig                         |   24 +
  84  arch/arm/mach-at91/Makefile                        |    9 +-
  85  arch/arm/mach-at91/Makefile.boot                   |    2 +
  86  arch/arm/mach-at91/at91cap9.c                      |    2 +
  87  arch/arm/mach-at91/at91cap9_devices.c              |    6 +
  88  arch/arm/mach-at91/at91rm9200.c                    |    2 +
  89  arch/arm/mach-at91/at91rm9200_devices.c            |    8 +
  90  arch/arm/mach-at91/at91sam9260.c                   |   10 +
  91  arch/arm/mach-at91/at91sam9260_devices.c           |    8 +
  92  arch/arm/mach-at91/at91sam9261.c                   |   29 +-
  93  arch/arm/mach-at91/at91sam9261_devices.c           |    8 +
  94  arch/arm/mach-at91/at91sam9263.c                   |    2 +
  95  arch/arm/mach-at91/at91sam9263_devices.c           |    6 +
  96  arch/arm/mach-at91/at91sam9g45.c                   |   15 +
  97  arch/arm/mach-at91/at91sam9g45_devices.c           |   35 +
  98  arch/arm/mach-at91/board-dt.c                      |  123 +
  99  arch/arm/mach-at91/board-rsi-ews.c                 |  233 ++
 100  arch/arm/mach-at91/board-usb-a9260.c               |  230 --
 101  .../{board-usb-a9263.c => board-usb-a926x.c}       |  181 +-
 102  arch/arm/mach-at91/include/mach/board.h            |    5 +
 103  arch/arm/mach-at91/include/mach/timex.h            |    5 +
 104  arch/arm/mach-davinci/Kconfig                      |   10 +
 105  arch/arm/mach-davinci/board-da850-evm.c            |  114 +
 106  arch/arm/mach-davinci/da850.c                      |    9 +
 107  arch/arm/mach-davinci/devices-da8xx.c              |    3 +
 108  arch/arm/mach-davinci/devices-tnetv107x.c          |    1 +
 109  arch/arm/mach-davinci/dm355.c                      |    1 +
 110  arch/arm/mach-davinci/dm644x.c                     |    1 +
 111  arch/arm/mach-davinci/dm646x.c                     |    1 +
 112  arch/arm/mach-davinci/dma.c                        |    5 +-
 113  arch/arm/mach-davinci/include/mach/mmc.h           |    3 +
 114  arch/arm/mach-davinci/include/mach/mux.h           |   10 +
 115  arch/arm/mach-ep93xx/Kconfig                       |    7 +
 116  arch/arm/mach-ep93xx/Makefile                      |    1 +
 117  arch/arm/mach-ep93xx/vision_ep9307.c               |  364 ++
 118  arch/arm/mach-exynos4/Kconfig                      |   71 +-
 119  arch/arm/mach-exynos4/Makefile                     |   12 +-
 120  arch/arm/mach-exynos4/clock-exynos4210.c           |  139 +
 121  arch/arm/mach-exynos4/clock-exynos4212.c           |  118 +
 122  arch/arm/mach-exynos4/clock.c                      |  218 +-
 123  arch/arm/mach-exynos4/cpu.c                        |   57 +-
 124  arch/arm/mach-exynos4/hotplug.c                    |    2 +-
 125  arch/arm/mach-exynos4/include/mach/entry-macro.S   |   23 +-
 126  arch/arm/mach-exynos4/include/mach/exynos4-clock.h |   43 +
 127  arch/arm/mach-exynos4/include/mach/irqs.h          |    2 +
 128  arch/arm/mach-exynos4/include/mach/map.h           |    4 +-
 129  arch/arm/mach-exynos4/include/mach/regs-clock.h    |   54 +-
 130  arch/arm/mach-exynos4/include/mach/regs-mct.h      |    5 +-
 131  arch/arm/mach-exynos4/mach-origen.c                |  108 +
 132  arch/arm/mach-exynos4/mach-smdk4x12.c              |  302 ++
 133  arch/arm/mach-exynos4/mach-smdkc210.c              |  309 --
 134  arch/arm/mach-exynos4/mach-smdkv310.c              |   78 +
 135  arch/arm/mach-exynos4/mct.c                        |  165 +-
 136  arch/arm/mach-exynos4/platsmp.c                    |   15 +-
 137  arch/arm/mach-exynos4/pm.c                         |   79 +-
 138  arch/arm/mach-highbank/Makefile                    |    6 +
 139  arch/arm/mach-highbank/Makefile.boot               |    1 +
 140  arch/arm/mach-highbank/clock.c                     |   62 +
 141  arch/arm/mach-highbank/core.h                      |    9 +
 142  arch/arm/mach-highbank/highbank.c                  |  145 +
 143  arch/arm/mach-highbank/hotplug.c                   |   56 +
 144  arch/arm/mach-highbank/include/mach/debug-macro.S  |   19 +
 145  arch/arm/mach-highbank/include/mach/entry-macro.S  |    7 +
 146  .../mach-highbank/include/mach/gpio.h}             |    0
 147  arch/arm/mach-highbank/include/mach/io.h           |    7 +
 148  arch/arm/mach-highbank/include/mach/irqs.h         |    6 +
 149  arch/arm/mach-highbank/include/mach/memory.h       |    1 +
 150  arch/arm/mach-highbank/include/mach/system.h       |   26 +
 151  arch/arm/mach-highbank/include/mach/timex.h        |    6 +
 152  arch/arm/mach-highbank/include/mach/uncompress.h   |    9 +
 153  arch/arm/mach-highbank/include/mach/vmalloc.h      |    1 +
 154  arch/arm/mach-highbank/lluart.c                    |   34 +
 155  arch/arm/mach-highbank/localtimer.c                |   40 +
 156  arch/arm/mach-highbank/platsmp.c                   |   78 +
 157  arch/arm/mach-highbank/pm.c                        |   55 +
 158  arch/arm/mach-highbank/sysregs.h                   |   52 +
 159  arch/arm/mach-highbank/system.c                    |   33 +
 160  arch/arm/mach-imx/Kconfig                          |   83 +-
 161  arch/arm/mach-imx/Makefile                         |   26 +-
 162  arch/arm/mach-imx/Makefile.boot                    |    4 +
 163  arch/arm/mach-imx/cache-l2x0.c                     |   56 -
 164  arch/arm/mach-imx/clock-imx25.c                    |    6 +
 165  arch/arm/mach-imx/clock-imx27.c                    |    6 +-
 166  arch/arm/mach-imx/clock-imx31.c                    |    8 +-
 167  arch/arm/mach-imx/clock-imx35.c                    |    7 +-
 168  arch/arm/mach-imx/clock-imx6q.c                    | 2012 +++++++++++
 169  arch/arm/mach-imx/cpu-imx25.c                      |   41 +
 170  arch/arm/mach-imx/cpu-imx27.c                      |   28 +-
 171  arch/arm/mach-imx/cpu-imx31.c                      |   49 +-
 172  arch/arm/mach-imx/cpu-imx35.c                      |   30 +-
 173  arch/arm/mach-imx/devices-imx27.h                  |    4 +
 174  arch/arm/mach-imx/devices-imx31.h                  |    4 +
 175  arch/arm/mach-imx/devices-imx35.h                  |    4 +
 176  arch/arm/mach-imx/gpc.c                            |  113 +
 177  arch/arm/mach-imx/head-v7.S                        |   99 +
 178  arch/arm/mach-imx/hotplug.c                        |   44 +
 179  arch/arm/mach-imx/lluart.c                         |   32 +
 180  arch/arm/mach-imx/localtimer.c                     |   35 +
 181  arch/arm/mach-imx/mach-apf9328.c                   |    1 +
 182  arch/arm/mach-imx/mach-armadillo5x0.c              |   19 +-
 183  arch/arm/mach-imx/mach-bug.c                       |    1 +
 184  arch/arm/mach-imx/mach-cpuimx27.c                  |    1 +
 185  arch/arm/mach-imx/mach-cpuimx35.c                  |    3 +-
 186  arch/arm/mach-imx/mach-eukrea_cpuimx25.c           |    1 +
 187  arch/arm/mach-imx/mach-imx27_visstrim_m10.c        |    1 +
 188  arch/arm/mach-imx/mach-imx27ipcam.c                |    1 +
 189  arch/arm/mach-imx/mach-imx27lite.c                 |    1 +
 190  arch/arm/mach-imx/mach-imx6q.c                     |   84 +
 191  arch/arm/mach-imx/mach-kzm_arm11_01.c              |    2 +
 192  arch/arm/mach-imx/mach-mx1ads.c                    |   17 +-
 193  arch/arm/mach-imx/mach-mx21ads.c                   |    1 +
 194  arch/arm/mach-imx/mach-mx25_3ds.c                  |   11 +
 195  arch/arm/mach-imx/mach-mx27_3ds.c                  |    3 +-
 196  arch/arm/mach-imx/mach-mx27ads.c                   |    1 +
 197  arch/arm/mach-imx/mach-mx31_3ds.c                  |    3 +-
 198  arch/arm/mach-imx/mach-mx31ads.c                   |    1 +
 199  arch/arm/mach-imx/mach-mx31lilly.c                 |    1 +
 200  arch/arm/mach-imx/mach-mx31lite.c                  |    1 +
 201  arch/arm/mach-imx/mach-mx31moboard.c               |   18 +
 202  arch/arm/mach-imx/mach-mx35_3ds.c                  |    1 +
 203  arch/arm/mach-imx/mach-mxt_td60.c                  |    1 +
 204  arch/arm/mach-imx/mach-pca100.c                    |    1 +
 205  arch/arm/mach-imx/mach-pcm037.c                    |    1 +
 206  arch/arm/mach-imx/mach-pcm038.c                    |    5 +-
 207  arch/arm/mach-imx/mach-pcm043.c                    |    1 +
 208  arch/arm/mach-imx/mach-qong.c                      |    7 +-
 209  arch/arm/mach-imx/mach-scb9328.c                   |    1 +
 210  arch/arm/mach-imx/mach-vpr200.c                    |    3 +-
 211  arch/arm/mach-imx/mm-imx3.c                        |  256 ++
 212  arch/arm/mach-imx/mm-imx31.c                       |   91 -
 213  arch/arm/mach-imx/mm-imx35.c                       |  109 -
 214  arch/arm/mach-imx/mmdc.c                           |   72 +
 215  arch/arm/mach-imx/platsmp.c                        |   85 +
 216  arch/arm/mach-imx/pm-imx27.c                       |    2 +-
 217  arch/arm/mach-imx/pm-imx6q.c                       |   70 +
 218  arch/arm/mach-imx/src.c                            |   49 +
 219  arch/arm/mach-ixp4xx/Kconfig                       |   19 +
 220  arch/arm/mach-ixp4xx/Makefile                      |    4 +
 221  arch/arm/mach-ixp4xx/include/mach/uncompress.h     |    3 +-
 222  arch/arm/mach-ixp4xx/miccpt-pci.c                  |   78 +
 223  arch/arm/mach-ixp4xx/omixp-setup.c                 |  273 ++
 224  arch/arm/mach-mmp/Kconfig                          |    2 +-
 225  arch/arm/mach-mmp/Makefile                         |    2 +-
 226  arch/arm/mach-mmp/clock.h                          |    8 +-
 227  arch/arm/mach-mmp/common.c                         |    4 +-
 228  arch/arm/mach-mmp/gplugd.c                         |    2 +-
 229  arch/arm/mach-mmp/include/mach/addr-map.h          |   10 +-
 230  arch/arm/mach-mmp/include/mach/gpio-pxa.h          |    2 +-
 231  arch/arm/mach-mmp/mmp2.c                           |    3 +-
 232  arch/arm/mach-msm/board-msm8x60.c                  |   58 +-
 233  arch/arm/mach-msm/hotplug.c                        |    2 +-
 234  arch/arm/mach-msm/platsmp.c                        |    2 +-
 235  arch/arm/mach-mx5/Kconfig                          |   50 +-
 236  arch/arm/mach-mx5/Makefile                         |    6 +-
 237  arch/arm/mach-mx5/board-cpuimx51.c                 |   28 +-
 238  arch/arm/mach-mx5/board-cpuimx51sd.c               |   26 +-
 239  arch/arm/mach-mx5/board-mx50_rdp.c                 |    1 +
 240  arch/arm/mach-mx5/board-mx51_3ds.c                 |    2 +-
 241  arch/arm/mach-mx5/board-mx51_babbage.c             |   36 +-
 242  arch/arm/mach-mx5/board-mx51_efikamx.c             |   14 +-
 243  arch/arm/mach-mx5/board-mx51_efikasb.c             |   25 +-
 244  arch/arm/mach-mx5/board-mx53_ard.c                 |   18 +-
 245  arch/arm/mach-mx5/board-mx53_evk.c                 |   10 +-
 246  arch/arm/mach-mx5/board-mx53_loco.c                |   31 +-
 247  arch/arm/mach-mx5/board-mx53_smd.c                 |   26 +-
 248  arch/arm/mach-mx5/clock-mx51-mx53.c                |   72 +-
 249  arch/arm/mach-mx5/cpu.c                            |   74 +-
 250  arch/arm/mach-mx5/devices-imx51.h                  |   17 +
 251  arch/arm/mach-mx5/devices-imx53.h                  |    6 +
 252  arch/arm/mach-mx5/devices.c                        |  120 -
 253  arch/arm/mach-mx5/devices.h                        |    5 -
 254  arch/arm/mach-mx5/ehci.c                           |    2 +-
 255  arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c       |    3 +-
 256  arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c       |    6 +-
 257  arch/arm/mach-mx5/imx51-dt.c                       |  116 +
 258  arch/arm/mach-mx5/imx53-dt.c                       |  126 +
 259  arch/arm/mach-mx5/mm-mx50.c                        |   72 -
 260  arch/arm/mach-mx5/mm.c                             |   90 +-
 261  arch/arm/mach-mx5/mx51_efika.c                     |   20 +-
 262  arch/arm/mach-mx5/pm-imx5.c                        |   18 +-
 263  arch/arm/mach-mx5/system.c                         |    1 +
 264  arch/arm/mach-mxs/Kconfig                          |   23 +
 265  arch/arm/mach-mxs/Makefile                         |    7 +-
 266  arch/arm/mach-mxs/clock-mx28.c                     |   26 +-
 267  arch/arm/mach-mxs/devices-mx23.h                   |    2 +
 268  arch/arm/mach-mxs/devices-mx28.h                   |    5 +
 269  arch/arm/mach-mxs/devices/Kconfig                  |    6 +
 270  arch/arm/mach-mxs/devices/Makefile                 |    2 +
 271  arch/arm/mach-mxs/devices/platform-mxs-saif.c      |   60 +
 272  arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c  |   51 +
 273  arch/arm/mach-mxs/include/mach/debug-macro.S       |   12 +-
 274  arch/arm/mach-mxs/include/mach/devices-common.h    |   12 +
 275  arch/arm/mach-mxs/include/mach/gpio.h              |   28 +-
 276  arch/arm/mach-mxs/include/mach/mxs.h               |    3 +
 277  arch/arm/mach-mxs/include/mach/uncompress.h        |    1 +
 278  arch/arm/mach-mxs/mach-m28evk.c                    |  366 ++
 279  arch/arm/mach-mxs/mach-mx23evk.c                   |    4 +-
 280  arch/arm/mach-mxs/mach-mx28evk.c                   |  100 +-
 281  arch/arm/mach-mxs/mach-stmp378x_devb.c             |    2 +-
 282  arch/arm/mach-mxs/mach-tx28.c                      |    3 +-
 283  arch/arm/mach-mxs/mm-mx28.c                        |   44 -
 284  arch/arm/mach-mxs/{mm-mx23.c => mm.c}              |   19 +
 285  arch/arm/mach-nuc93x/Kconfig                       |   19 -
 286  arch/arm/mach-nuc93x/Makefile                      |   14 -
 287  arch/arm/mach-nuc93x/Makefile.boot                 |    3 -
 288  arch/arm/mach-nuc93x/clock.c                       |   83 -
 289  arch/arm/mach-nuc93x/clock.h                       |   36 -
 290  arch/arm/mach-nuc93x/cpu.c                         |  135 -
 291  arch/arm/mach-nuc93x/cpu.h                         |   48 -
 292  arch/arm/mach-nuc93x/dev.c                         |   42 -
 293  arch/arm/mach-nuc93x/include/mach/entry-macro.S    |   32 -
 294  arch/arm/mach-nuc93x/include/mach/hardware.h       |   22 -
 295  arch/arm/mach-nuc93x/include/mach/io.h             |   28 -
 296  arch/arm/mach-nuc93x/include/mach/irqs.h           |   59 -
 297  arch/arm/mach-nuc93x/include/mach/map.h            |  139 -
 298  arch/arm/mach-nuc93x/include/mach/regs-clock.h     |   53 -
 299  arch/arm/mach-nuc93x/include/mach/regs-ebi.h       |   33 -
 300  arch/arm/mach-nuc93x/include/mach/regs-irq.h       |   42 -
 301  arch/arm/mach-nuc93x/include/mach/regs-serial.h    |   52 -
 302  arch/arm/mach-nuc93x/include/mach/regs-timer.h     |   28 -
 303  arch/arm/mach-nuc93x/include/mach/system.h         |   28 -
 304  arch/arm/mach-nuc93x/include/mach/timex.h          |   25 -
 305  arch/arm/mach-nuc93x/include/mach/uncompress.h     |   50 -
 306  arch/arm/mach-nuc93x/include/mach/vmalloc.h        |   23 -
 307  arch/arm/mach-nuc93x/irq.c                         |   66 -
 308  arch/arm/mach-nuc93x/mach-nuc932evb.c              |   42 -
 309  arch/arm/mach-nuc93x/nuc932.c                      |   65 -
 310  arch/arm/mach-nuc93x/nuc932.h                      |   29 -
 311  arch/arm/mach-nuc93x/time.c                        |  100 -
 312  arch/arm/mach-omap1/Makefile                       |    2 +-
 313  arch/arm/mach-omap1/board-ams-delta.c              |   16 +-
 314  arch/arm/mach-omap1/board-fsample.c                |   76 +-
 315  arch/arm/mach-omap1/board-generic.c                |   16 +-
 316  arch/arm/mach-omap1/board-h2.c                     |   16 +-
 317  arch/arm/mach-omap1/board-h3.c                     |   16 +-
 318  arch/arm/mach-omap1/board-htcherald.c              |   12 +-
 319  arch/arm/mach-omap1/board-innovator.c              |   36 +-
 320  arch/arm/mach-omap1/board-nokia770.c               |   34 +-
 321  arch/arm/mach-omap1/board-osk.c                    |   16 +-
 322  arch/arm/mach-omap1/board-palmte.c                 |   16 +-
 323  arch/arm/mach-omap1/board-palmtt.c                 |   16 +-
 324  arch/arm/mach-omap1/board-palmz71.c                |   18 +-
 325  arch/arm/mach-omap1/board-perseus2.c               |   75 +-
 326  arch/arm/mach-omap1/board-sx1.c                    |   17 +-
 327  arch/arm/mach-omap1/board-voiceblue.c              |   16 +-
 328  arch/arm/mach-omap1/devices.c                      |    3 +
 329  arch/arm/mach-omap1/io.c                           |   59 +-
 330  arch/arm/mach-omap1/mcbsp.c                        |   45 +
 331  arch/arm/mach-omap1/timer.c                        |  173 +
 332  arch/arm/mach-omap2/Kconfig                        |    8 +-
 333  arch/arm/mach-omap2/Makefile                       |   89 +-
 334  arch/arm/mach-omap2/board-2430sdp.c                |   17 +-
 335  arch/arm/mach-omap2/board-3430sdp.c                |    9 +-
 336  arch/arm/mach-omap2/board-3630sdp.c                |   11 +-
 337  arch/arm/mach-omap2/board-4430sdp.c                |   19 +-
 338  arch/arm/mach-omap2/board-am3517crane.c            |    9 +-
 339  arch/arm/mach-omap2/board-am3517evm.c              |    8 +-
 340  arch/arm/mach-omap2/board-apollon.c                |   18 +-
 341  arch/arm/mach-omap2/board-cm-t35.c                 |   13 +-
 342  arch/arm/mach-omap2/board-cm-t3517.c               |    9 +-
 343  arch/arm/mach-omap2/board-devkit8000.c             |   19 +-
 344  arch/arm/mach-omap2/board-flash.c                  |    5 -
 345  arch/arm/mach-omap2/board-flash.h                  |   19 +
 346  arch/arm/mach-omap2/board-generic.c                |  160 +-
 347  arch/arm/mach-omap2/board-h4.c                     |   24 +-
 348  arch/arm/mach-omap2/board-igep0020.c               |   13 +-
 349  arch/arm/mach-omap2/board-ldp.c                    |    9 +-
 350  arch/arm/mach-omap2/board-n8x0.c                   |   25 +-
 351  arch/arm/mach-omap2/board-omap3beagle.c            |   22 +-
 352  arch/arm/mach-omap2/board-omap3evm.c               |    9 +-
 353  arch/arm/mach-omap2/board-omap3logic.c             |   11 +-
 354  arch/arm/mach-omap2/board-omap3pandora.c           |   11 +-
 355  arch/arm/mach-omap2/board-omap3stalker.c           |   16 +-
 356  arch/arm/mach-omap2/board-omap3touchbook.c         |   18 +-
 357  arch/arm/mach-omap2/board-omap4panda.c             |   17 +-
 358  arch/arm/mach-omap2/board-overo.c                  |   11 +-
 359  arch/arm/mach-omap2/board-rm680.c                  |   25 +-
 360  arch/arm/mach-omap2/board-rx51.c                   |   25 +-
 361  arch/arm/mach-omap2/board-ti8168evm.c              |   10 +-
 362  arch/arm/mach-omap2/board-zoom.c                   |   23 +-
 363  arch/arm/mach-omap2/clock2420_data.c               |   48 +
 364  arch/arm/mach-omap2/clock2430_data.c               |   48 +
 365  arch/arm/mach-omap2/clock3xxx_data.c               |   47 +-
 366  arch/arm/mach-omap2/clock44xx_data.c               |   33 +
 367  arch/arm/mach-omap2/clockdomain.c                  |  147 +-
 368  arch/arm/mach-omap2/clockdomain.h                  |   22 +-
 369  arch/arm/mach-omap2/clockdomain2xxx_3xxx.c         |    4 -
 370  arch/arm/mach-omap2/clockdomain44xx.c              |    2 -
 371  arch/arm/mach-omap2/clockdomains2420_data.c        |  154 +
 372  arch/arm/mach-omap2/clockdomains2430_data.c        |  181 +
 373  arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c   |  803 +-----
 374  arch/arm/mach-omap2/clockdomains3xxx_data.c        |  398 +++
 375  arch/arm/mach-omap2/clockdomains44xx_data.c        |  409 +--
 376  arch/arm/mach-omap2/common.c                       |   62 +-
 377  arch/arm/mach-omap2/control.c                      |   16 +-
 378  arch/arm/mach-omap2/devices.c                      |   91 +-
 379  arch/arm/mach-omap2/display.c                      |   17 +-
 380  arch/arm/mach-omap2/dma.c                          |   25 +-
 381  arch/arm/mach-omap2/gpio.c                         |   22 +-
 382  arch/arm/mach-omap2/hsmmc.c                        |   26 +-
 383  arch/arm/mach-omap2/hwspinlock.c                   |   18 +-
 384  arch/arm/mach-omap2/id.c                           |  191 +-
 385  arch/arm/mach-omap2/io.c                           |  152 +-
 386  arch/arm/mach-omap2/io.h                           |    7 -
 387  arch/arm/mach-omap2/irq.c                          |    4 +-
 388  arch/arm/mach-omap2/mcbsp.c                        |  120 +-
 389  arch/arm/mach-omap2/omap-smp.c                     |    7 +-
 390  arch/arm/mach-omap2/omap_hwmod.c                   |    3 -
 391  arch/arm/mach-omap2/omap_hwmod_2420_data.c         |   59 +-
 392  arch/arm/mach-omap2/omap_hwmod_2430_data.c         |   67 +-
 393  arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |  200 +-
 394  arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |  104 +-
 395  arch/arm/mach-omap2/omap_l3_noc.c                  |  147 +-
 396  arch/arm/mach-omap2/omap_l3_noc.h                  |  224 +-
 397  arch/arm/mach-omap2/omap_l3_smx.c                  |   91 +-
 398  arch/arm/mach-omap2/omap_l3_smx.h                  |  164 +-
 399  arch/arm/mach-omap2/omap_twl.c                     |  107 +-
 400  arch/arm/mach-omap2/opp.c                          |    2 +-
 401  arch/arm/mach-omap2/pm.c                           |  104 +-
 402  arch/arm/mach-omap2/pm24xx.c                       |   27 -
 403  arch/arm/mach-omap2/pm34xx.c                       |    2 +-
 404  arch/arm/mach-omap2/powerdomain-common.c           |    7 +-
 405  arch/arm/mach-omap2/powerdomain.c                  |  110 +-
 406  arch/arm/mach-omap2/powerdomain.h                  |   19 +-
 407  arch/arm/mach-omap2/powerdomain2xxx_3xxx.c         |    2 +-
 408  arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c   |   21 +-
 409  arch/arm/mach-omap2/powerdomains2xxx_data.c        |   48 +-
 410  arch/arm/mach-omap2/powerdomains3xxx_data.c        |   97 +-
 411  arch/arm/mach-omap2/powerdomains44xx_data.c        |   36 +-
 412  arch/arm/mach-omap2/prcm.c                         |   19 +-
 413  arch/arm/mach-omap2/prm2xxx_3xxx.c                 |   56 +
 414  arch/arm/mach-omap2/prm2xxx_3xxx.h                 |   12 +
 415  arch/arm/mach-omap2/prm44xx.c                      |   71 +
 416  arch/arm/mach-omap2/prm44xx.h                      |   12 +
 417  arch/arm/mach-omap2/sdrc.c                         |   13 +-
 418  arch/arm/mach-omap2/serial.c                       |   39 +-
 419  arch/arm/mach-omap2/smartreflex-class3.c           |    4 +-
 420  arch/arm/mach-omap2/smartreflex.c                  |   29 +-
 421  arch/arm/mach-omap2/sr_device.c                    |   19 +-
 422  arch/arm/mach-omap2/timer.c                        |  194 +-
 423  arch/arm/mach-omap2/usb-musb.c                     |   26 +-
 424  arch/arm/mach-omap2/vc.c                           |  367 ++
 425  arch/arm/mach-omap2/vc.h                           |   88 +-
 426  arch/arm/mach-omap2/vc3xxx_data.c                  |   31 +-
 427  arch/arm/mach-omap2/vc44xx_data.c                  |   44 +-
 428  arch/arm/mach-omap2/voltage.c                      | 1088 ++-----
 429  arch/arm/mach-omap2/voltage.h                      |  150 +-
 430  arch/arm/mach-omap2/voltagedomains2xxx_data.c      |   32 +
 431  arch/arm/mach-omap2/voltagedomains3xxx_data.c      |   83 +-
 432  arch/arm/mach-omap2/voltagedomains44xx_data.c      |   99 +-
 433  arch/arm/mach-omap2/vp.c                           |  278 ++
 434  arch/arm/mach-omap2/vp.h                           |  133 +-
 435  arch/arm/mach-omap2/vp3xxx_data.c                  |   35 +-
 436  arch/arm/mach-omap2/vp44xx_data.c                  |   47 +-
 437  arch/arm/mach-picoxcell/Makefile                   |    3 +
 438  arch/arm/mach-picoxcell/Makefile.boot              |    1 +
 439  arch/arm/mach-picoxcell/common.c                   |   55 +
 440  arch/arm/mach-picoxcell/common.h                   |   18 +
 441  arch/arm/mach-picoxcell/include/mach/debug-macro.S |   35 +
 442  arch/arm/mach-picoxcell/include/mach/entry-macro.S |   19 +
 443  arch/arm/mach-picoxcell/include/mach/gpio.h        |    1 +
 444  arch/arm/mach-picoxcell/include/mach/hardware.h    |   21 +
 445  arch/arm/mach-picoxcell/include/mach/io.h          |   22 +
 446  arch/arm/mach-picoxcell/include/mach/irqs.h        |   25 +
 447  arch/arm/mach-picoxcell/include/mach/map.h         |   25 +
 448  arch/arm/mach-picoxcell/include/mach/memory.h      |    1 +
 449  .../mach-picoxcell/include/mach/picoxcell_soc.h    |   25 +
 450  arch/arm/mach-picoxcell/include/mach/system.h      |   31 +
 451  arch/arm/mach-picoxcell/include/mach/timex.h       |   25 +
 452  arch/arm/mach-picoxcell/include/mach/uncompress.h  |   21 +
 453  arch/arm/mach-picoxcell/include/mach/vmalloc.h     |   14 +
 454  arch/arm/mach-picoxcell/io.c                       |   32 +
 455  arch/arm/mach-picoxcell/time.c                     |  132 +
 456  arch/arm/mach-prima2/Makefile                      |    2 +
 457  arch/arm/mach-prima2/clock.c                       |    4 +-
 458  arch/arm/mach-prima2/irq.c                         |   43 +
 459  arch/arm/mach-prima2/l2x0.c                        |   45 +-
 460  arch/arm/mach-prima2/pm.c                          |  150 +
 461  arch/arm/mach-prima2/pm.h                          |   29 +
 462  arch/arm/mach-prima2/prima2.c                      |    2 +-
 463  arch/arm/mach-prima2/rtciobrg.c                    |  139 +
 464  arch/arm/mach-prima2/sleep.S                       |   64 +
 465  arch/arm/mach-prima2/timer.c                       |   38 +-
 466  arch/arm/mach-pxa/Kconfig                          |   38 +-
 467  arch/arm/mach-pxa/Makefile                         |    2 +-
 468  arch/arm/mach-pxa/balloon3.c                       |   10 +-
 469  arch/arm/mach-pxa/cm-x2xx-pci.c                    |    2 +-
 470  arch/arm/mach-pxa/cm-x2xx.c                        |    4 +-
 471  arch/arm/mach-pxa/cm-x300.c                        |    8 +-
 472  arch/arm/mach-pxa/include/mach/addr-map.h          |    8 +-
 473  arch/arm/mach-pxa/include/mach/balloon3.h          |    2 +-
 474  arch/arm/mach-pxa/include/mach/gpio-pxa.h          |    2 +-
 475  arch/arm/mach-pxa/include/mach/hardware.h          |    9 +-
 476  arch/arm/mach-pxa/include/mach/lpd270.h            |    4 +-
 477  arch/arm/mach-pxa/include/mach/mtd-xip.h           |    1 -
 478  arch/arm/mach-pxa/include/mach/palm27x.h           |    2 +-
 479  arch/arm/mach-pxa/include/mach/palmtx.h            |    6 +-
 480  arch/arm/mach-pxa/include/mach/pxa27x.h            |    2 +
 481  arch/arm/mach-pxa/include/mach/pxa95x.h            |    7 +
 482  arch/arm/mach-pxa/include/mach/pxafb.h             |   13 +
 483  arch/arm/mach-pxa/include/mach/smemc.h             |    2 +-
 484  arch/arm/mach-pxa/include/mach/zeus.h              |    4 +-
 485  arch/arm/mach-pxa/include/mach/zylonite.h          |    4 +-
 486  arch/arm/mach-pxa/irq.c                            |    4 +-
 487  arch/arm/mach-pxa/lpd270.c                         |    2 +-
 488  arch/arm/mach-pxa/palmtreo.c                       |    8 +
 489  arch/arm/mach-pxa/palmtx.c                         |    8 +-
 490  arch/arm/mach-pxa/pxa25x.c                         |    2 +-
 491  arch/arm/mach-pxa/pxa27x.c                         |    2 +-
 492  arch/arm/mach-pxa/pxa3xx-ulpi.c                    |    2 +
 493  arch/arm/mach-pxa/pxa3xx.c                         |    2 +-
 494  arch/arm/mach-pxa/saarb.c                          |    1 +
 495  arch/arm/mach-pxa/z2.c                             |    3 +-
 496  arch/arm/mach-pxa/zeus.c                           |    8 +-
 497  arch/arm/mach-realview/hotplug.c                   |    2 +-
 498  arch/arm/mach-realview/include/mach/debug-macro.S  |   17 +-
 499  arch/arm/mach-s3c2410/Kconfig                      |    6 -
 500  arch/arm/mach-s3c2410/Makefile                     |    1 -
 501  arch/arm/mach-s3c2410/dma.c                        |   14 -
 502  arch/arm/mach-s3c2410/gpio.c                       |   72 -
 503  arch/arm/mach-s3c2410/include/mach/map.h           |   52 +-
 504  arch/arm/mach-s3c2412/Kconfig                      |    1 -
 505  arch/arm/mach-s3c2412/Makefile                     |    1 -
 506  arch/arm/mach-s3c2412/dma.c                        |   18 -
 507  arch/arm/mach-s3c2412/gpio.c                       |   62 -
 508  arch/arm/mach-s3c2440/Kconfig                      |    2 -
 509  arch/arm/mach-s3c2440/dma.c                        |   17 -
 510  arch/arm/mach-s3c2443/dma.c                        |   27 -
 511  arch/arm/mach-s3c64xx/cpu.c                        |   22 +-
 512  arch/arm/mach-s3c64xx/include/mach/map.h           |    9 +-
 513  arch/arm/mach-s3c64xx/mach-crag6410.c              |    3 -
 514  arch/arm/mach-s3c64xx/mach-mini6410.c              |    8 +-
 515  arch/arm/mach-s3c64xx/mach-real6410.c              |    8 +-
 516  arch/arm/mach-s3c64xx/mach-smdk6410.c              |    8 +-
 517  arch/arm/mach-s5p64x0/dev-spi.c                    |    8 +-
 518  arch/arm/mach-s5p64x0/dma.c                        |    7 +-
 519  arch/arm/mach-s5p64x0/gpiolib.c                    |    7 +-
 520  arch/arm/mach-s5p64x0/irq-eint.c                   |    3 +-
 521  arch/arm/mach-s5p64x0/mach-smdk6440.c              |    8 +-
 522  arch/arm/mach-s5p64x0/mach-smdk6450.c              |    8 +-
 523  arch/arm/mach-s5pc100/mach-smdkc100.c              |    8 +-
 524  arch/arm/mach-s5pv210/Kconfig                      |    6 -
 525  arch/arm/mach-s5pv210/Makefile                     |    2 +-
 526  arch/arm/mach-s5pv210/mach-smdkv210.c              |    8 +-
 527  arch/arm/mach-shmobile/smp-sh73a0.c                |    6 +-
 528  arch/arm/mach-tegra/Kconfig                        |    6 +
 529  arch/arm/mach-tegra/Makefile                       |    1 +
 530  arch/arm/mach-tegra/Makefile.boot                  |    1 +
 531  arch/arm/mach-tegra/board-dt.c                     |   26 +-
 532  arch/arm/mach-tegra/board-harmony-pinmux.c         |    8 +
 533  arch/arm/mach-tegra/board-harmony-power.c          |   13 +-
 534  arch/arm/mach-tegra/board-harmony.c                |    5 +-
 535  arch/arm/mach-tegra/board-paz00-pinmux.c           |   11 +
 536  arch/arm/mach-tegra/board-paz00.c                  |   64 +-
 537  arch/arm/mach-tegra/board-paz00.h                  |    8 +
 538  arch/arm/mach-tegra/board-seaboard-pinmux.c        |   75 +-
 539  arch/arm/mach-tegra/board-seaboard.c               |   81 +-
 540  arch/arm/mach-tegra/board-seaboard.h               |   12 +-
 541  arch/arm/mach-tegra/board-trimslice-pinmux.c       |    7 +
 542  arch/arm/mach-tegra/board-trimslice.c              |    4 +-
 543  arch/arm/mach-tegra/common.c                       |    2 +-
 544  arch/arm/mach-tegra/cpu-tegra.c                    |    6 +-
 545  arch/arm/mach-tegra/devices.c                      |   86 +
 546  arch/arm/mach-tegra/devices.h                      |    2 +
 547  arch/arm/mach-tegra/dma.c                          |   14 +-
 548  arch/arm/mach-tegra/include/mach/io.h              |   18 +-
 549  arch/arm/mach-tegra/include/mach/pinmux.h          |    4 +
 550  arch/arm/mach-tegra/include/mach/powergate.h       |    1 -
 551  arch/arm/mach-tegra/io.c                           |    8 +-
 552  arch/arm/mach-tegra/pcie.c                         |    8 +-
 553  arch/arm/mach-tegra/pinmux-t2-tables.c             |   76 +-
 554  arch/arm/mach-tegra/pinmux.c                       |  163 +-
 555  arch/arm/mach-tegra/powergate.c                    |    5 +-
 556  arch/arm/mach-tegra/tegra2_clocks.c                |   50 +-
 557  arch/arm/mach-tegra/timer.c                        |    6 +-
 558  arch/arm/mach-u300/Kconfig                         |   46 -
 559  arch/arm/mach-u300/Makefile.boot                   |   17 +-
 560  arch/arm/mach-u300/core.c                          |   81 +-
 561  arch/arm/mach-u300/include/mach/memory.h           |   22 +-
 562  arch/arm/mach-u300/u300.c                          |   16 -
 563  arch/arm/mach-ux500/Makefile                       |    3 +-
 564  arch/arm/mach-ux500/board-mop500-pins.c            |   34 +-
 565  arch/arm/mach-ux500/board-mop500-sdi.c             |   52 +-
 566  arch/arm/mach-ux500/board-mop500.c                 |   78 +-
 567  arch/arm/mach-ux500/board-mop500.h                 |    3 +
 568  arch/arm/mach-ux500/cache-l2x0.c                   |   95 +
 569  arch/arm/mach-ux500/cpu.c                          |   98 +-
 570  arch/arm/mach-ux500/hotplug.c                      |    2 +-
 571  arch/arm/mach-ux500/include/mach/db5500-regs.h     |    2 +
 572  arch/arm/mach-ux500/include/mach/db8500-regs.h     |    3 +
 573  arch/arm/mach-ux500/include/mach/uncompress.h      |   10 +-
 574  arch/arm/mach-ux500/pins-db8500.h                  |  142 +-
 575  arch/arm/mach-ux500/platsmp.c                      |    2 +-
 576  arch/arm/mach-ux500/timer.c                        |   68 +
 577  arch/arm/mach-vexpress/hotplug.c                   |    2 +-
 578  arch/arm/mm/Kconfig                                |    4 +-
 579  arch/arm/plat-mxc/Kconfig                          |   50 +-
 580  arch/arm/plat-mxc/Makefile                         |    2 +-
 581  arch/arm/plat-mxc/audmux-v2.c                      |   18 +-
 582  arch/arm/plat-mxc/avic.c                           |   91 +-
 583  arch/arm/plat-mxc/cpu.c                            |    9 +
 584  arch/arm/plat-mxc/devices.c                        |   14 -
 585  arch/arm/plat-mxc/devices/Kconfig                  |    9 +-
 586  arch/arm/plat-mxc/devices/Makefile                 |    2 +
 587  arch/arm/plat-mxc/devices/platform-ahci-imx.c      |  156 +
 588  arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c  |    5 +
 589  arch/arm/plat-mxc/devices/platform-imx-i2c.c       |    6 +
 590  arch/arm/plat-mxc/devices/platform-mxc-ehci.c      |    9 +
 591  arch/arm/plat-mxc/devices/platform-pata_imx.c      |   59 +
 592  arch/arm/plat-mxc/gic.c                            |   48 +
 593  arch/arm/plat-mxc/include/mach/common.h            |   63 +-
 594  arch/arm/plat-mxc/include/mach/debug-macro.S       |   40 +-
 595  arch/arm/plat-mxc/include/mach/devices-common.h    |   18 +
 596  arch/arm/plat-mxc/include/mach/entry-macro.S       |   64 +-
 597  arch/arm/plat-mxc/include/mach/gpio.h              |   34 +-
 598  arch/arm/plat-mxc/include/mach/hardware.h          |   19 +-
 599  arch/arm/plat-mxc/include/mach/io.h                |   22 +-
 600  arch/arm/plat-mxc/include/mach/iomux-mx3.h         |    1 +
 601  arch/arm/plat-mxc/include/mach/iomux-mx51.h        | 2270 +++++---------
 602  arch/arm/plat-mxc/include/mach/iomux-mx53.h        | 3530 +++++++-------------
 603  arch/arm/plat-mxc/include/mach/iomux-v3.h          |   11 +-
 604  arch/arm/plat-mxc/include/mach/irqs.h              |   10 +-
 605  arch/arm/plat-mxc/include/mach/mx25.h              |    5 +
 606  arch/arm/plat-mxc/include/mach/mx27.h              |   14 -
 607  arch/arm/plat-mxc/include/mach/mx31.h              |   14 -
 608  arch/arm/plat-mxc/include/mach/mx35.h              |    2 +-
 609  arch/arm/plat-mxc/include/mach/mx3x.h              |   18 +-
 610  arch/arm/plat-mxc/include/mach/mx51.h              |  183 +-
 611  arch/arm/plat-mxc/include/mach/mx53.h              |    1 +
 612  arch/arm/plat-mxc/include/mach/mx6q.h              |   33 +
 613  arch/arm/plat-mxc/include/mach/mxc.h               |    7 -
 614  arch/arm/plat-mxc/include/mach/system.h            |   35 +-
 615  arch/arm/plat-mxc/irq-common.c                     |   21 +-
 616  arch/arm/plat-mxc/irq-common.h                     |    3 +-
 617  arch/arm/plat-mxc/pwm.c                            |    2 +-
 618  arch/arm/plat-mxc/system.c                         |    3 +
 619  arch/arm/plat-mxc/tzic.c                           |   32 +-
 620  arch/arm/plat-nomadik/Kconfig                      |    8 +-
 621  arch/arm/plat-nomadik/include/plat/mtu.h           |   47 +-
 622  arch/arm/plat-nomadik/include/plat/pincfg.h        |    5 -
 623  arch/arm/plat-nomadik/timer.c                      |  138 +-
 624  arch/arm/plat-omap/devices.c                       |   46 -
 625  arch/arm/plat-omap/dmtimer.c                       |  713 +++--
 626  arch/arm/plat-omap/i2c.c                           |   18 +-
 627  arch/arm/plat-omap/include/plat/clock.h            |    2 -
 628  arch/arm/plat-omap/include/plat/common.h           |   30 +-
 629  arch/arm/plat-omap/include/plat/cpu.h              |  108 +-
 630  arch/arm/plat-omap/include/plat/dmtimer.h          |  233 +-
 631  arch/arm/plat-omap/include/plat/io.h               |   35 +-
 632  arch/arm/plat-omap/include/plat/mcbsp.h            |  208 +-
 633  arch/arm/plat-omap/include/plat/omap_device.h      |   31 +-
 634  arch/arm/plat-omap/include/plat/omap_hwmod.h       |    3 -
 635  arch/arm/plat-omap/include/plat/voltage.h          |   20 +
 636  arch/arm/plat-omap/io.c                            |   10 +
 637  arch/arm/plat-omap/mcbsp.c                         |  385 +--
 638  arch/arm/plat-omap/omap_device.c                   |  450 ++-
 639  arch/arm/plat-omap/sram.c                          |   85 +-
 640  arch/arm/plat-pxa/include/plat/mfp.h               |    2 +-
 641  arch/arm/plat-pxa/mfp.c                            |    4 +-
 642  arch/arm/plat-s3c24xx/cpu.c                        |    9 +-
 643  arch/arm/plat-s3c24xx/include/plat/map.h           |  100 -
 644  arch/arm/plat-s5p/cpu.c                            |   46 +-
 645  arch/arm/plat-s5p/include/plat/exynos4.h           |    5 +-
 646  arch/arm/plat-s5p/include/plat/pll.h               |   56 +-
 647  arch/arm/plat-samsung/Kconfig                      |    7 +
 648  arch/arm/plat-samsung/Makefile                     |    2 +-
 649  arch/arm/plat-samsung/cpu.c                        |   58 +
 650  arch/arm/plat-samsung/dev-hsmmc.c                  |   19 +-
 651  arch/arm/plat-samsung/dev-hsmmc1.c                 |   19 +-
 652  arch/arm/plat-samsung/dev-hsmmc2.c                 |   19 +-
 653  arch/arm/plat-samsung/dev-hsmmc3.c                 |   19 +-
 654  arch/arm/plat-samsung/dev-ts.c                     |    9 +
 655  arch/arm/plat-samsung/include/plat/cpu.h           |  113 +-
 656  arch/arm/plat-samsung/include/plat/dma-s3c24xx.h   |    6 -
 657  arch/arm/plat-samsung/include/plat/map-s3c.h       |   84 +
 658  .../include/plat/map-s5p.h                         |    6 +-
 659  arch/arm/plat-samsung/include/plat/sdhci.h         |    7 +
 660  arch/arm/plat-samsung/platformdata.c               |   22 +
 661  arch/arm/plat-versatile/platsmp.c                  |    2 +-
 662  arch/ia64/Kconfig                                  |    2 +-
 663  arch/ia64/configs/generic_defconfig                |    1 +
 664  arch/ia64/configs/gensparse_defconfig              |    1 +
 665  arch/ia64/configs/tiger_defconfig                  |    1 +
 666  arch/ia64/configs/xen_domu_defconfig               |    1 +
 667  arch/ia64/configs/zx1_defconfig                    |    1 +
 668  arch/ia64/sn/kernel/sn2/sn_hwperf.c                |   12 +-
 669  arch/powerpc/mm/gup.c                              |   12 -
 670  arch/powerpc/mm/hugetlbpage.c                      |   21 +-
 671  arch/powerpc/sysdev/fsl_rio.c                      |    1 +
 672  arch/s390/hypfs/inode.c                            |    6 +-
 673  arch/s390/mm/gup.c                                 |   14 +-
 674  arch/sparc/mm/gup.c                                |    2 +
 675  arch/um/Kconfig.char                               |  114 +-
 676  arch/um/Kconfig.rest                               |   23 +-
 677  arch/um/Kconfig.um                                 |    6 +
 678  arch/um/Makefile                                   |   49 +-
 679  arch/um/Makefile-x86_64                            |   26 -
 680  .../{include/shared/chan_kern.h => drivers/chan.h} |    6 +-
 681  arch/um/drivers/chan_kern.c                        |   12 +-
 682  arch/um/drivers/chan_user.c                        |    9 +-
 683  arch/um/{include/shared => drivers}/chan_user.h    |    0
 684  arch/um/drivers/cow_sys.h                          |    1 -
 685  arch/um/drivers/daemon_user.c                      |    1 -
 686  arch/um/drivers/fd.c                               |    2 -
 687  arch/um/drivers/harddog_user.c                     |    1 -
 688  arch/um/drivers/line.c                             |    2 +-
 689  arch/um/{include/shared => drivers}/line.h         |    0
 690  arch/um/{include/shared => drivers}/mconsole.h     |    0
 691  .../um/{include/shared => drivers}/mconsole_kern.h |    0
 692  arch/um/drivers/mconsole_user.c                    |    2 -
 693  arch/um/drivers/net_user.c                         |    2 -
 694  arch/um/drivers/pcap_user.c                        |    2 -
 695  arch/um/drivers/port_user.c                        |    2 -
 696  arch/um/drivers/pty.c                              |    2 -
 697  arch/um/drivers/slip_user.c                        |    2 -
 698  arch/um/drivers/slirp_user.c                       |    2 -
 699  arch/um/drivers/ssl.c                              |    4 +-
 700  arch/um/drivers/stdio_console.c                    |    3 +-
 701  arch/um/drivers/tty.c                              |    2 -
 702  arch/um/drivers/ubd_kern.c                         |   33 +-
 703  arch/um/drivers/ubd_user.c                         |    1 -
 704  arch/um/{include/shared => drivers}/ubd_user.h     |    0
 705  arch/um/drivers/umcast_user.c                      |    2 -
 706  arch/um/drivers/vde_user.c                         |    2 -
 707  arch/um/drivers/xterm.c                            |    2 -
 708  arch/um/include/asm/Kbuild                         |    3 +
 709  arch/um/include/asm/bug.h                          |    6 -
 710  arch/um/include/asm/checksum.h                     |    6 -
 711  arch/um/include/asm/cputime.h                      |    6 -
 712  arch/um/include/asm/device.h                       |    7 -
 713  arch/um/include/asm/emergency-restart.h            |    6 -
 714  arch/um/include/asm/futex.h                        |    6 -
 715  arch/um/include/asm/hardirq.h                      |    1 -
 716  arch/um/include/asm/hw_irq.h                       |    7 -
 717  arch/um/include/asm/irq_regs.h                     |    1 -
 718  arch/um/include/asm/irqflags.h                     |   38 +-
 719  arch/um/include/asm/kdebug.h                       |    1 -
 720  arch/um/include/asm/mmu.h                          |   22 +-
 721  arch/um/include/asm/mmu_context.h                  |    7 +-
 722  arch/um/include/asm/page.h                         |    2 +-
 723  arch/um/include/asm/page_offset.h                  |    1 -
 724  arch/um/include/asm/pda.h                          |   21 -
 725  arch/um/include/asm/percpu.h                       |    6 -
 726  arch/um/include/asm/ptrace-generic.h               |    7 -
 727  arch/um/include/asm/sections.h                     |    7 -
 728  arch/um/include/asm/system.h                       |   47 -
 729  arch/um/include/asm/topology.h                     |    6 -
 730  arch/um/include/asm/uaccess.h                      |   89 +-
 731  arch/um/include/asm/xor.h                          |    6 -
 732  arch/um/include/shared/as-layout.h                 |    2 +-
 733  arch/um/include/shared/common-offsets.h            |    1 -
 734  arch/um/include/shared/initrd.h                    |   12 -
 735  arch/um/include/shared/kern.h                      |   18 -
 736  arch/um/include/shared/kern_util.h                 |    1 -
 737  arch/um/include/shared/ldt.h                       |   37 -
 738  arch/um/include/shared/mem_kern.h                  |   20 -
 739  arch/um/include/shared/os.h                        |   13 +-
 740  arch/um/include/shared/process.h                   |   17 -
 741  arch/um/include/shared/ptrace_user.h               |    3 +-
 742  arch/um/include/shared/skas_ptregs.h               |    6 -
 743  arch/um/include/shared/syscall.h                   |   12 -
 744  arch/um/include/shared/task.h                      |    9 -
 745  arch/um/include/shared/tlb.h                       |   15 -
 746  arch/um/include/shared/um_malloc.h                 |    2 +-
 747  arch/um/include/shared/um_mmu.h                    |   24 -
 748  arch/um/include/shared/um_uaccess.h                |   97 -
 749  arch/um/include/shared/user.h                      |    7 +-
 750  arch/um/kernel/Makefile                            |    2 +-
 751  arch/um/kernel/exec.c                              |   18 +-
 752  arch/um/kernel/gmon_syms.c                         |   15 -
 753  arch/um/kernel/initrd.c                            |    4 +-
 754  arch/um/kernel/irq.c                               |    1 +
 755  arch/um/kernel/ksyms.c                             |   38 +-
 756  arch/um/kernel/mem.c                               |    2 +
 757  arch/um/kernel/physmem.c                           |   21 +-
 758  arch/um/kernel/process.c                           |    4 +-
 759  arch/um/kernel/signal.c                            |    1 -
 760  arch/um/kernel/skas/clone.c                        |    1 -
 761  arch/um/kernel/skas/uaccess.c                      |    6 +
 762  arch/um/kernel/tlb.c                               |    5 +-
 763  arch/um/kernel/trap.c                              |    3 +-
 764  arch/um/kernel/uaccess.c                           |   33 -
 765  arch/um/kernel/um_arch.c                           |    2 +
 766  arch/um/os-Linux/Makefile                          |    6 +-
 767  arch/um/os-Linux/aio.c                             |    2 -
 768  arch/um/os-Linux/drivers/ethertap_user.c           |    2 -
 769  arch/um/os-Linux/drivers/tuntap_user.c             |    2 -
 770  arch/um/os-Linux/elf_aux.c                         |    1 -
 771  arch/um/os-Linux/file.c                            |    2 -
 772  arch/um/os-Linux/helper.c                          |    2 -
 773  arch/um/os-Linux/internal.h                        |    1 +
 774  arch/um/os-Linux/irq.c                             |    3 -
 775  arch/um/os-Linux/main.c                            |    1 -
 776  arch/um/os-Linux/mem.c                             |    2 -
 777  arch/um/os-Linux/process.c                         |   23 +-
 778  arch/um/os-Linux/sigio.c                           |    3 -
 779  arch/um/os-Linux/signal.c                          |   72 +-
 780  arch/um/os-Linux/skas/mem.c                        |    2 -
 781  arch/um/os-Linux/skas/process.c                    |   21 +-
 782  arch/um/os-Linux/start_up.c                        |   10 +-
 783  arch/um/os-Linux/sys-i386/signal.c                 |   13 -
 784  arch/um/os-Linux/sys-x86_64/Makefile               |   10 -
 785  arch/um/os-Linux/sys-x86_64/registers.c            |   52 -
 786  arch/um/os-Linux/sys-x86_64/signal.c               |   16 -
 787  arch/um/os-Linux/sys-x86_64/task_size.c            |    5 -
 788  arch/um/os-Linux/time.c                            |    4 +-
 789  arch/um/os-Linux/tls.c                             |   35 -
 790  arch/um/os-Linux/tty.c                             |    2 -
 791  arch/um/os-Linux/uaccess.c                         |   32 -
 792  arch/um/os-Linux/umid.c                            |    2 -
 793  arch/um/os-Linux/util.c                            |    2 -
 794  arch/um/scripts/Makefile.rules                     |    7 +-
 795  arch/um/sys-i386/Makefile                          |   24 -
 796  arch/um/sys-i386/asm/elf.h                         |  125 -
 797  arch/um/sys-i386/asm/module.h                      |   13 -
 798  arch/um/sys-i386/atomic64_cx8_32.S                 |  225 --
 799  arch/um/sys-i386/bug.c                             |   21 -
 800  arch/um/sys-i386/ksyms.c                           |    5 -
 801  arch/um/sys-i386/shared/sysdep/barrier.h           |    9 -
 802  arch/um/sys-i386/shared/sysdep/host_ldt.h          |   34 -
 803  arch/um/sys-i386/shared/sysdep/ptrace_user.h       |   50 -
 804  arch/um/sys-i386/shared/sysdep/sc.h                |   44 -
 805  arch/um/sys-i386/shared/sysdep/sigcontext.h        |   26 -
 806  arch/um/sys-i386/shared/sysdep/system.h            |  132 -
 807  arch/um/sys-i386/shared/sysdep/vm-flags.h          |   14 -
 808  arch/um/sys-i386/stub_segv.c                       |   17 -
 809  arch/um/sys-i386/user-offsets.c                    |   53 -
 810  arch/um/sys-x86_64/Makefile                        |   27 -
 811  arch/um/sys-x86_64/asm/archparam.h                 |   16 -
 812  arch/um/sys-x86_64/asm/module.h                    |   20 -
 813  arch/um/sys-x86_64/delay.c                         |   60 -
 814  arch/um/sys-x86_64/fault.c                         |   28 -
 815  arch/um/sys-x86_64/ptrace_user.c                   |   22 -
 816  arch/um/sys-x86_64/shared/sysdep/barrier.h         |    7 -
 817  arch/um/sys-x86_64/shared/sysdep/host_ldt.h        |   38 -
 818  arch/um/sys-x86_64/shared/sysdep/kernel-offsets.h  |   23 -
 819  arch/um/sys-x86_64/shared/sysdep/ptrace_user.h     |   77 -
 820  arch/um/sys-x86_64/shared/sysdep/sc.h              |   45 -
 821  arch/um/sys-x86_64/shared/sysdep/sigcontext.h      |   27 -
 822  arch/um/sys-x86_64/shared/sysdep/skas_ptrace.h     |   22 -
 823  arch/um/sys-x86_64/shared/sysdep/tls.h             |   29 -
 824  arch/um/sys-x86_64/signal.c                        |  290 --
 825  arch/{um/Makefile-i386 => x86/Makefile.um}         |   37 +-
 826  arch/x86/kernel/cpu/mcheck/mce.c                   |   18 +-
 827  arch/x86/mm/gup.c                                  |   10 -
 828  arch/{um/Kconfig.x86 => x86/um/Kconfig}            |    0
 829  arch/x86/um/Makefile                               |   45 +
 830  arch/{um/include => x86/um}/asm/apic.h             |    0
 831  arch/{um/include => x86/um}/asm/arch_hweight.h     |    0
 832  arch/{um/sys-i386 => x86/um}/asm/archparam.h       |    8 +-
 833  arch/x86/um/asm/checksum.h                         |   10 +
 834  .../sysdep/checksum.h => x86/um/asm/checksum_32.h} |    2 +-
 835  .../sysdep/checksum.h => x86/um/asm/checksum_64.h} |    0
 836  arch/{um/include => x86/um}/asm/desc.h             |    0
 837  arch/{um/sys-x86_64 => x86/um}/asm/elf.h           |  145 +-
 838  arch/{um/include => x86/um}/asm/irq_vectors.h      |    0
 839  arch/x86/um/asm/mm_context.h                       |   72 +
 840  arch/x86/um/asm/module.h                           |   23 +
 841  arch/x86/um/asm/processor.h                        |   22 +
 842  .../asm/processor.h => x86/um/asm/processor_32.h}  |   18 +-
 843  .../asm/processor.h => x86/um/asm/processor_64.h}  |   11 -
 844  arch/x86/um/asm/ptrace.h                           |    5 +
 845  .../asm/ptrace.h => x86/um/asm/ptrace_32.h}        |    0
 846  .../asm/ptrace.h => x86/um/asm/ptrace_64.h}        |    2 +-
 847  .../{um/include => x86/um}/asm/required-features.h |    0
 848  arch/{um/include => x86/um}/asm/segment.h          |    0
 849  .../shared/sysdep => x86/um/asm}/system.h          |    3 +
 850  .../shared/sysdep => x86/um/asm}/vm-flags.h        |   14 +-
 851  arch/{um/sys-x86_64 => x86/um}/bug.c               |    0
 852  arch/{um/sys-i386/bugs.c => x86/um/bugs_32.c}      |    6 +-
 853  arch/{um/sys-x86_64/bugs.c => x86/um/bugs_64.c}    |    0
 854  .../sys-i386/checksum.S => x86/um/checksum_32.S}   |    0
 855  arch/{um/sys-i386 => x86/um}/delay.c               |    0
 856  arch/{um/sys-i386 => x86/um}/elfcore.c             |    0
 857  arch/{um/sys-i386 => x86/um}/fault.c               |    0
 858  arch/{um/sys-x86_64 => x86/um}/ksyms.c             |    2 +
 859  arch/{um/sys-i386 => x86/um}/ldt.c                 |   36 +-
 860  arch/{um/sys-i386/mem.c => x86/um/mem_32.c}        |    0
 861  arch/{um/sys-x86_64/mem.c => x86/um/mem_64.c}      |    0
 862  .../os-Linux/sys-i386 => x86/um/os-Linux}/Makefile |    5 +-
 863  arch/x86/um/os-Linux/mcontext.c                    |   31 +
 864  .../sys-x86_64 => x86/um/os-Linux}/prctl.c         |    0
 865  .../sys-i386 => x86/um/os-Linux}/registers.c       |   62 +-
 866  .../sys-i386 => x86/um/os-Linux}/task_size.c       |   13 +-
 867  .../os-Linux/sys-i386 => x86/um/os-Linux}/tls.c    |   35 +-
 868  arch/{um/sys-i386/ptrace.c => x86/um/ptrace_32.c}  |   69 +-
 869  .../{um/sys-x86_64/ptrace.c => x86/um/ptrace_64.c} |  103 +-
 870  arch/{um/sys-i386 => x86/um}/ptrace_user.c         |    2 +-
 871  arch/{um/sys-i386/setjmp.S => x86/um/setjmp_32.S}  |    0
 872  .../{um/sys-x86_64/setjmp.S => x86/um/setjmp_64.S} |    0
 873  arch/x86/um/shared/sysdep/archsetjmp.h             |    5 +
 874  .../um/shared/sysdep/archsetjmp_32.h}              |    0
 875  .../um/shared/sysdep/archsetjmp_64.h}              |    0
 876  arch/x86/um/shared/sysdep/faultinfo.h              |    5 +
 877  .../um/shared/sysdep/faultinfo_32.h}               |    6 +
 878  .../um/shared/sysdep/faultinfo_64.h}               |    6 +
 879  .../um}/shared/sysdep/kernel-offsets.h             |    0
 880  arch/x86/um/shared/sysdep/mcontext.h               |   31 +
 881  arch/x86/um/shared/sysdep/ptrace.h                 |    5 +
 882  .../ptrace.h => x86/um/shared/sysdep/ptrace_32.h}  |   75 +-
 883  .../ptrace.h => x86/um/shared/sysdep/ptrace_64.h}  |  103 +-
 884  arch/x86/um/shared/sysdep/ptrace_user.h            |   27 +
 885  .../um}/shared/sysdep/skas_ptrace.h                |    4 +-
 886  arch/x86/um/shared/sysdep/stub.h                   |   14 +
 887  .../stub.h => x86/um/shared/sysdep/stub_32.h}      |    8 -
 888  .../stub.h => x86/um/shared/sysdep/stub_64.h}      |    8 -
 889  arch/x86/um/shared/sysdep/syscalls.h               |    5 +
 890  .../um/shared/sysdep/syscalls_32.h}                |    0
 891  .../um/shared/sysdep/syscalls_64.h}                |    1 -
 892  arch/{um/sys-i386 => x86/um}/shared/sysdep/tls.h   |    9 +-
 893  arch/{um/sys-i386 => x86/um}/signal.c              |  304 ++-
 894  arch/{um/sys-i386/stub.S => x86/um/stub_32.S}      |    0
 895  arch/{um/sys-x86_64/stub.S => x86/um/stub_64.S}    |    0
 896  arch/{um/sys-x86_64 => x86/um}/stub_segv.c         |   11 +-
 897  .../um/sys_call_table_32.S}                        |    4 +-
 898  .../syscall_table.c => x86/um/sys_call_table_64.c} |    3 +-
 899  .../sys-i386/syscalls.c => x86/um/syscalls_32.c}   |    0
 900  .../sys-x86_64/syscalls.c => x86/um/syscalls_64.c} |    0
 901  arch/{um/sys-i386/sysrq.c => x86/um/sysrq_32.c}    |    0
 902  arch/{um/sys-x86_64/sysrq.c => x86/um/sysrq_64.c}  |    2 +-
 903  arch/{um/sys-i386/tls.c => x86/um/tls_32.c}        |    0
 904  arch/{um/sys-x86_64/tls.c => x86/um/tls_64.c}      |    0
 905  arch/{um/sys-x86_64 => x86/um}/user-offsets.c      |   51 +-
 906  arch/{um/sys-x86_64 => x86/um}/vdso/Makefile       |    4 +-
 907  arch/{um/sys-x86_64 => x86/um}/vdso/checkundef.sh  |    0
 908  arch/{um/sys-x86_64 => x86/um}/vdso/um_vdso.c      |    0
 909  .../sys-x86_64 => x86/um}/vdso/vdso-layout.lds.S   |    0
 910  arch/{um/sys-x86_64 => x86/um}/vdso/vdso-note.S    |    0
 911  arch/{um/sys-x86_64 => x86/um}/vdso/vdso.S         |    2 +-
 912  arch/{um/sys-x86_64 => x86/um}/vdso/vdso.lds.S     |    0
 913  arch/{um/sys-x86_64 => x86/um}/vdso/vma.c          |    2 +-
 914  drivers/block/virtio_blk.c                         |   30 +-
 915  drivers/char/Kconfig                               |    6 +-
 916  drivers/char/agp/hp-agp.c                          |    6 +-
 917  drivers/char/hw_random/Kconfig                     |   28 +
 918  drivers/char/hw_random/Makefile                    |    1 +
 919  drivers/char/hw_random/atmel-rng.c                 |  158 +
 920  drivers/char/ttyprintk.c                           |    2 +-
 921  drivers/char/virtio_console.c                      |  120 +-
 922  drivers/clocksource/Kconfig                        |   15 +
 923  drivers/clocksource/Makefile                       |    1 +
 924  drivers/clocksource/clksrc-dbx500-prcmu.c          |  106 +
 925  drivers/edac/Kconfig                               |   16 +-
 926  drivers/edac/Makefile                              |    2 +-
 927  drivers/edac/edac_core.h                           |  350 +--
 928  drivers/edac/edac_mce.c                            |   61 -
 929  drivers/edac/i7300_edac.c                          |   51 +-
 930  drivers/edac/i7core_edac.c                         |  415 +++-
 931  drivers/edac/sb_edac.c                             | 1893 +++++++++++
 932  drivers/gpio/gpio-mxc.c                            |   12 +
 933  drivers/gpio/gpio-mxs.c                            |    2 +
 934  drivers/gpio/gpio-pxa.c                            |    2 +-
 935  drivers/gpio/gpio-tegra.c                          |  143 +-
 936  drivers/input/Kconfig                              |    2 +-
 937  drivers/isdn/Kconfig                               |    2 +-
 938  drivers/md/Kconfig                                 |   36 +
 939  drivers/md/Makefile                                |    4 +
 940  drivers/md/dm-bufio.c                              | 1699 ++++++++++
 941  drivers/md/dm-bufio.h                              |  112 +
 942  drivers/md/dm-ioctl.c                              |   11 +
 943  drivers/md/dm-kcopyd.c                             |   31 +-
 944  drivers/md/dm-log-userspace-base.c                 |   37 +-
 945  drivers/md/dm-raid.c                               |   48 +-
 946  drivers/md/dm-table.c                              |   73 +
 947  drivers/md/dm-thin-metadata.c                      | 1391 ++++++++
 948  drivers/md/dm-thin-metadata.h                      |  156 +
 949  drivers/md/dm-thin.c                               | 2428 ++++++++++++++
 950  drivers/md/dm.c                                    |   21 +-
 951  drivers/md/dm.h                                    |    2 +
 952  drivers/md/persistent-data/Kconfig                 |    8 +
 953  drivers/md/persistent-data/Makefile                |   11 +
 954  drivers/md/persistent-data/dm-block-manager.c      |  620 ++++
 955  drivers/md/persistent-data/dm-block-manager.h      |  123 +
 956  drivers/md/persistent-data/dm-btree-internal.h     |  137 +
 957  drivers/md/persistent-data/dm-btree-remove.c       |  566 ++++
 958  drivers/md/persistent-data/dm-btree-spine.c        |  244 ++
 959  drivers/md/persistent-data/dm-btree.c              |  805 +++++
 960  drivers/md/persistent-data/dm-btree.h              |  145 +
 961  .../persistent-data/dm-persistent-data-internal.h  |   19 +
 962  drivers/md/persistent-data/dm-space-map-checker.c  |  437 +++
 963  drivers/md/persistent-data/dm-space-map-checker.h  |   26 +
 964  drivers/md/persistent-data/dm-space-map-common.c   |  705 ++++
 965  drivers/md/persistent-data/dm-space-map-common.h   |  126 +
 966  drivers/md/persistent-data/dm-space-map-disk.c     |  335 ++
 967  drivers/md/persistent-data/dm-space-map-disk.h     |   25 +
 968  drivers/md/persistent-data/dm-space-map-metadata.c |  596 ++++
 969  drivers/md/persistent-data/dm-space-map-metadata.h |   33 +
 970  drivers/md/persistent-data/dm-space-map.h          |  134 +
 971  .../md/persistent-data/dm-transaction-manager.c    |  400 +++
 972  .../md/persistent-data/dm-transaction-manager.h    |  130 +
 973  drivers/misc/Kconfig                               |    2 +-
 974  drivers/misc/vmw_balloon.c                         |    4 +-
 975  drivers/mmc/host/davinci_mmc.c                     |   13 +
 976  drivers/mmc/host/mxcmmc.c                          |    1 +
 977  drivers/mtd/mtdchar.c                              |    2 +-
 978  drivers/net/rionet.c                               |    4 +-
 979  drivers/net/virtio_net.c                           |   14 +-
 980  drivers/net/wireless/ath/Kconfig                   |    2 +-
 981  drivers/net/wireless/rtlwifi/Kconfig               |    4 +-
 982  drivers/of/base.c                                  |   84 +
 983  drivers/of/irq.c                                   |  107 +
 984  drivers/pcmcia/pxa2xx_balloon3.c                   |    2 +-
 985  drivers/power/Kconfig                              |    1 +
 986  drivers/power/ds2780_battery.c                     |   86 +-
 987  drivers/pps/clients/Kconfig                        |    9 +
 988  drivers/pps/clients/Makefile                       |    1 +
 989  drivers/pps/clients/pps-gpio.c                     |  227 ++
 990  drivers/pps/clients/pps-ktimer.c                   |   12 -
 991  drivers/pps/clients/pps_parport.c                  |    9 -
 992  drivers/pps/kapi.c                                 |   20 +-
 993  drivers/rapidio/Kconfig                            |    6 +-
 994  drivers/rapidio/Makefile                           |    1 +
 995  drivers/rapidio/devices/Kconfig                    |   10 +
 996  drivers/rapidio/devices/Makefile                   |    5 +
 997  drivers/rapidio/devices/tsi721.c                   | 2360 +++++++++++++
 998  drivers/rapidio/devices/tsi721.h                   |  766 +++++
 999  drivers/rapidio/rio-scan.c                         |    6 +-
1000  drivers/rtc/Kconfig                                |    2 +-
1001  drivers/rtc/class.c                                |   32 +-
1002  drivers/rtc/rtc-ds1307.c                           |   27 +
1003  drivers/rtc/rtc-mc13xxx.c                          |    6 +-
1004  drivers/staging/pohmelfs/inode.c                   |    2 +-
1005  drivers/tty/Kconfig                                |    2 +-
1006  drivers/tty/serial/msm_serial.c                    |   30 +-
1007  drivers/usb/host/ohci-at91.c                       |  239 ++-
1008  drivers/video/mbx/mbxfb.c                          |    6 +-
1009  drivers/video/pxafb.c                              |   10 -
1010  drivers/virtio/Kconfig                             |   11 +
1011  drivers/virtio/Makefile                            |    1 +
1012  drivers/virtio/virtio_mmio.c                       |  479 +++
1013  drivers/virtio/virtio_pci.c                        |   10 +-
1014  drivers/w1/slaves/w1_ds2760.c                      |   48 +-
1015  drivers/w1/slaves/w1_ds2780.c                      |   96 +-
1016  drivers/w1/slaves/w1_ds2780.h                      |    2 +
1017  drivers/w1/w1_int.c                                |    1 +
1018  drivers/w1/w1_io.c                                 |    5 +
1019  drivers/watchdog/Kconfig                           |    6 +-
1020  fs/9p/vfs_inode.c                                  |    4 +-
1021  fs/9p/vfs_inode_dotl.c                             |    4 +-
1022  fs/adfs/inode.c                                    |    2 +-
1023  fs/affs/amigaffs.c                                 |    4 +-
1024  fs/affs/inode.c                                    |    8 +-
1025  fs/affs/namei.c                                    |    6 +-
1026  fs/afs/fsclient.c                                  |    2 +-
1027  fs/afs/inode.c                                     |    4 +-
1028  fs/aio.c                                           |  136 +-
1029  fs/autofs4/inode.c                                 |    2 +-
1030  fs/befs/linuxvfs.c                                 |    2 +-
1031  fs/bfs/dir.c                                       |    2 +-
1032  fs/bfs/inode.c                                     |    2 +-
1033  fs/binfmt_elf.c                                    |   11 +-
1034  fs/binfmt_misc.c                                   |    2 +-
1035  fs/btrfs/delayed-inode.c                           |    2 +-
1036  fs/btrfs/disk-io.c                                 |    2 +-
1037  fs/btrfs/inode.c                                   |    4 +-
1038  fs/btrfs/tree-log.c                                |    2 +-
1039  fs/ceph/caps.c                                     |    2 +-
1040  fs/ceph/inode.c                                    |    2 +-
1041  fs/cifs/inode.c                                    |    6 +-
1042  fs/cifs/link.c                                     |    2 +-
1043  fs/coda/coda_linux.c                               |    2 +-
1044  fs/coda/dir.c                                      |    2 +-
1045  fs/dcache.c                                        |   40 +-
1046  fs/devpts/inode.c                                  |    4 +-
1047  fs/ecryptfs/inode.c                                |   12 +-
1048  fs/efs/inode.c                                     |    2 +-
1049  fs/exofs/inode.c                                   |    2 +-
1050  fs/ext2/balloc.c                                   |    2 +-
1051  fs/ext2/ialloc.c                                   |    2 +-
1052  fs/ext2/inode.c                                    |    2 +-
1053  fs/ext2/super.c                                    |    8 +-
1054  fs/ext3/balloc.c                                   |   17 +-
1055  fs/ext3/fsync.c                                    |   10 -
1056  fs/ext3/ialloc.c                                   |   47 +-
1057  fs/ext3/inode.c                                    |    2 +-
1058  fs/ext3/ioctl.c                                    |   24 -
1059  fs/ext3/namei.c                                    |    6 +-
1060  fs/ext3/super.c                                    |   12 +-
1061  fs/ext4/balloc.c                                   |  345 ++-
1062  fs/ext4/ext4.h                                     |  141 +-
1063  fs/ext4/ext4_extents.h                             |    2 +
1064  fs/ext4/ext4_jbd2.c                                |    8 +-
1065  fs/ext4/extents.c                                  | 1168 +++++--
1066  fs/ext4/file.c                                     |    4 +-
1067  fs/ext4/fsync.c                                    |   10 +-
1068  fs/ext4/ialloc.c                                   |  206 +-
1069  fs/ext4/indirect.c                                 |   20 +-
1070  fs/ext4/inode.c                                    |  514 +++-
1071  fs/ext4/ioctl.c                                    |   65 +-
1072  fs/ext4/mballoc.c                                  |  331 ++-
1073  fs/ext4/mballoc.h                                  |   11 +-
1074  fs/ext4/migrate.c                                  |  111 +-
1075  fs/ext4/mmp.c                                      |   10 +-
1076  fs/ext4/move_extent.c                              |    1 -
1077  fs/ext4/namei.c                                    |   29 +-
1078  fs/ext4/page-io.c                                  |   66 +-
1079  fs/ext4/resize.c                                   |   10 +-
1080  fs/ext4/super.c                                    |  263 +-
1081  fs/ext4/xattr.c                                    |   12 +-
1082  fs/fat/inode.c                                     |    4 +-
1083  fs/fat/namei_msdos.c                               |    2 +-
1084  fs/fat/namei_vfat.c                                |    2 +-
1085  fs/freevxfs/vxfs_inode.c                           |    2 +-
1086  fs/fuse/control.c                                  |    2 +-
1087  fs/fuse/inode.c                                    |    2 +-
1088  fs/gfs2/glops.c                                    |    2 +-
1089  fs/hfs/btree.c                                     |   20 +-
1090  fs/hfs/dir.c                                       |    4 +-
1091  fs/hfs/inode.c                                     |    4 +-
1092  fs/hfsplus/dir.c                                   |    4 +-
1093  fs/hfsplus/inode.c                                 |   10 +-
1094  fs/hostfs/hostfs_kern.c                            |    2 +-
1095  fs/hostfs/hostfs_user.c                            |    1 -
1096  fs/hpfs/dir.c                                      |    2 +-
1097  fs/hpfs/inode.c                                    |   10 +-
1098  fs/hpfs/namei.c                                    |    8 +-
1099  fs/hppfs/hppfs.c                                   |    2 +-
1100  fs/hugetlbfs/inode.c                               |    2 +-
1101  fs/inode.c                                         |    2 +-
1102  fs/isofs/inode.c                                   |   14 +-
1103  fs/isofs/rock.c                                    |    4 +-
1104  fs/jbd/journal.c                                   |    8 +
1105  fs/jbd2/commit.c                                   |   26 +-
1106  fs/jbd2/journal.c                                  |   44 +-
1107  fs/jbd2/recovery.c                                 |   28 +-
1108  fs/jbd2/transaction.c                              |   68 +-
1109  fs/jffs2/dir.c                                     |    6 +-
1110  fs/jffs2/fs.c                                      |    6 +-
1111  fs/jfs/jfs_imap.c                                  |    6 +-
1112  fs/jfs/jfs_inode.c                                 |    2 +-
1113  fs/jfs/namei.c                                     |   12 +-
1114  fs/jfs/super.c                                     |    1 -
1115  fs/libfs.c                                         |    6 +-
1116  fs/logfs/dir.c                                     |    8 +-
1117  fs/logfs/inode.c                                   |    3 +-
1118  fs/logfs/readwrite.c                               |    2 +-
1119  fs/minix/inode.c                                   |    4 +-
1120  fs/namei.c                                         |   18 +-
1121  fs/ncpfs/inode.c                                   |    2 +-
1122  fs/nfs/inode.c                                     |    6 +-
1123  fs/nfsd/nfs4xdr.c                                  |    2 +-
1124  fs/nilfs2/inode.c                                  |    4 +-
1125  fs/nilfs2/namei.c                                  |    2 +-
1126  fs/ntfs/inode.c                                    |    8 +-
1127  fs/ocfs2/dir.c                                     |    4 +-
1128  fs/ocfs2/dlmglue.c                                 |    2 +-
1129  fs/ocfs2/inode.c                                   |    4 +-
1130  fs/ocfs2/namei.c                                   |   18 +-
1131  fs/openpromfs/inode.c                              |    4 +-
1132  fs/proc/base.c                                     |  158 +-
1133  fs/proc/generic.c                                  |    2 +-
1134  fs/proc/inode.c                                    |    2 +-
1135  fs/proc/proc_sysctl.c                              |   48 +-
1136  fs/qnx4/inode.c                                    |    2 +-
1137  fs/quota/quota.c                                   |    7 +-
1138  fs/ramfs/inode.c                                   |   10 -
1139  fs/reiserfs/inode.c                                |   10 +-
1140  fs/reiserfs/namei.c                                |   16 +-
1141  fs/romfs/super.c                                   |    2 +-
1142  fs/squashfs/inode.c                                |   18 +-
1143  fs/stack.c                                         |    2 +-
1144  fs/stat.c                                          |    5 +-
1145  fs/super.c                                         |    9 +-
1146  fs/sysfs/inode.c                                   |    2 +-
1147  fs/sysv/inode.c                                    |    2 +-
1148  fs/ubifs/super.c                                   |    2 +-
1149  fs/ubifs/xattr.c                                   |    4 +-
1150  fs/udf/balloc.c                                    |   14 +-
1151  fs/udf/directory.c                                 |    8 +-
1152  fs/udf/inode.c                                     |   56 +-
1153  fs/udf/lowlevel.c                                  |    2 +-
1154  fs/udf/misc.c                                      |   19 +-
1155  fs/udf/namei.c                                     |   20 +-
1156  fs/udf/partition.c                                 |   19 +-
1157  fs/udf/super.c                                     |  280 +-
1158  fs/udf/truncate.c                                  |   22 +-
1159  fs/udf/udf_sb.h                                    |    5 +-
1160  fs/udf/udfdecl.h                                   |   35 +-
1161  fs/udf/udftime.c                                   |    3 +-
1162  fs/udf/unicode.c                                   |    6 +-
1163  fs/ufs/ialloc.c                                    |    2 +-
1164  fs/ufs/inode.c                                     |    4 +-
1165  fs/xfs/xfs_iops.c                                  |    2 +-
1166  include/linux/aio.h                                |    1 +
1167  include/linux/cgroup.h                             |    2 +-
1168  include/linux/clksrc-dbx500-prcmu.h                |   20 +
1169  include/linux/dcache.h                             |    8 +-
1170  include/linux/device-mapper.h                      |   45 +-
1171  include/linux/dm-ioctl.h                           |    4 +-
1172  include/linux/dm-kcopyd.h                          |    4 +
1173  include/linux/dm-log-userspace.h                   |   18 +-
1174  include/linux/dma-mapping.h                        |   10 +
1175  include/linux/edac.h                               |  350 ++
1176  include/linux/edac_mce.h                           |   31 -
1177  include/linux/ext2_fs.h                            |    4 +-
1178  include/linux/ext3_fs.h                            |    6 +-
1179  include/linux/ext3_fs_sb.h                         |    4 -
1180  include/linux/fs.h                                 |   41 +-
1181  include/linux/irqdomain.h                          |   16 +-
1182  include/linux/jbd.h                                |   64 +-
1183  include/linux/jbd2.h                               |   69 +-
1184  include/linux/jbd_common.h                         |   68 +
1185  include/linux/magic.h                              |   10 +-
1186  include/linux/memcontrol.h                         |   44 +-
1187  include/linux/mm.h                                 |   67 +-
1188  include/linux/mm_types.h                           |   21 +-
1189  include/linux/namei.h                              |    1 +
1190  include/linux/of.h                                 |   18 +
1191  include/linux/of_irq.h                             |    3 +
1192  include/linux/pps-gpio.h                           |   32 +
1193  include/linux/rio_ids.h                            |    1 +
1194  include/linux/rtc/sirfsoc_rtciobrg.h               |   18 +
1195  include/linux/sem.h                                |   49 +-
1196  include/linux/sysctl.h                             |   22 +
1197  include/linux/utsname.h                            |   16 +
1198  include/linux/virtio.h                             |    4 +-
1199  include/linux/virtio_config.h                      |    3 +
1200  include/linux/virtio_mmio.h                        |  111 +
1201  include/linux/virtio_ring.h                        |    6 +-
1202  include/trace/events/ext4.h                        |  480 +++-
1203  init/Kconfig                                       |    4 +-
1204  init/do_mounts.c                                   |   48 +-
1205  init/do_mounts_rd.c                                |   14 +
1206  ipc/sem.c                                          |   56 +-
1207  kernel/cgroup.c                                    |   39 +-
1208  kernel/cpuset.c                                    |    9 +-
1209  kernel/irq/irqdomain.c                             |   12 +-
1210  kernel/sys.c                                       |    2 +
1211  kernel/utsname_sysctl.c                            |   23 +
1212  lib/idr.c                                          |   11 +-
1213  mm/huge_memory.c                                   |   37 +-
1214  mm/internal.h                                      |   46 +
1215  mm/memcontrol.c                                    | 1006 +++---
1216  mm/memory.c                                        |    2 +-
1217  mm/page_cgroup.c                                   |    9 +-
1218  mm/shmem.c                                         |    2 +-
1219  mm/swap.c                                          |   83 +-
1220  mm/vmscan.c                                        |    4 +-
1221  security/integrity/ima/Kconfig                     |    2 +-
1222  security/tomoyo/common.c                           |   30 +
1223  sound/Kconfig                                      |    2 +-
1224  1213 files changed, 50156 insertions(+), 21548 deletions(-)
1225  create mode 100644 Documentation/device-mapper/persistent-data.txt
1226  create mode 100644 Documentation/device-mapper/thin-provisioning.txt
1227  create mode 100644 Documentation/devicetree/bindings/arm/calxeda.txt
1228  create mode 100644 Documentation/devicetree/bindings/arm/fsl.txt
1229  create mode 100644 Documentation/devicetree/bindings/arm/gic.txt
1230  create mode 100644 Documentation/devicetree/bindings/arm/omap/dsp.txt
1231  create mode 100644 Documentation/devicetree/bindings/arm/omap/iva.txt
1232  create mode 100644 Documentation/devicetree/bindings/arm/omap/l3-noc.txt
1233  create mode 100644 Documentation/devicetree/bindings/arm/omap/mpu.txt
1234  create mode 100644 Documentation/devicetree/bindings/arm/omap/omap.txt
1235  create mode 100644 Documentation/devicetree/bindings/arm/picoxcell.txt
1236  create mode 100644 Documentation/devicetree/bindings/pinmux/pinmux_nvidia.txt
1237  create mode 100644 Documentation/devicetree/bindings/tty/serial/msm_serial.txt
1238  create mode 100644 Documentation/devicetree/bindings/virtio/mmio.txt
1239  create mode 100644 Documentation/rapidio/tsi721.txt
1240  create mode 100644 arch/arm/boot/dts/at91sam9g20.dtsi
1241  create mode 100644 arch/arm/boot/dts/at91sam9g45.dtsi
1242  create mode 100644 arch/arm/boot/dts/at91sam9m10g45ek.dts
1243  create mode 100644 arch/arm/boot/dts/highbank.dts
1244  create mode 100644 arch/arm/boot/dts/imx51-babbage.dts
1245  create mode 100644 arch/arm/boot/dts/imx51.dtsi
1246  create mode 100644 arch/arm/boot/dts/imx53-ard.dts
1247  create mode 100644 arch/arm/boot/dts/imx53-evk.dts
1248  create mode 100644 arch/arm/boot/dts/imx53-qsb.dts
1249  create mode 100644 arch/arm/boot/dts/imx53-smd.dts
1250  create mode 100644 arch/arm/boot/dts/imx53.dtsi
1251  create mode 100644 arch/arm/boot/dts/imx6q-sabreauto.dts
1252  create mode 100644 arch/arm/boot/dts/imx6q.dtsi
1253  create mode 100644 arch/arm/boot/dts/msm8660-surf.dts
1254  create mode 100644 arch/arm/boot/dts/omap3-beagle.dts
1255  create mode 100644 arch/arm/boot/dts/omap3.dtsi
1256  create mode 100644 arch/arm/boot/dts/omap4-panda.dts
1257  create mode 100644 arch/arm/boot/dts/omap4-sdp.dts
1258  create mode 100644 arch/arm/boot/dts/omap4.dtsi
1259  create mode 100644 arch/arm/boot/dts/picoxcell-pc3x2.dtsi
1260  create mode 100644 arch/arm/boot/dts/picoxcell-pc3x3.dtsi
1261  create mode 100644 arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts
1262  create mode 100644 arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts
1263  create mode 100644 arch/arm/boot/dts/tegra-ventana.dts
1264  create mode 100644 arch/arm/boot/dts/usb_a9g20.dts
1265  create mode 100644 arch/arm/configs/at91sam9g45_defconfig
1266  rename arch/arm/configs/{mx27_defconfig => imx_v4_v5_defconfig} (69%)
1267  delete mode 100644 arch/arm/configs/mx1_defconfig
1268  delete mode 100644 arch/arm/configs/mx21_defconfig
1269  rename arch/arm/configs/{mx51_defconfig => mx5_defconfig} (82%)
1270  create mode 100644 arch/arm/mach-at91/board-dt.c
1271  create mode 100644 arch/arm/mach-at91/board-rsi-ews.c
1272  delete mode 100644 arch/arm/mach-at91/board-usb-a9260.c
1273  rename arch/arm/mach-at91/{board-usb-a9263.c => board-usb-a926x.c} (54%)
1274  create mode 100644 arch/arm/mach-ep93xx/vision_ep9307.c
1275  create mode 100644 arch/arm/mach-exynos4/clock-exynos4210.c
1276  create mode 100644 arch/arm/mach-exynos4/clock-exynos4212.c
1277  create mode 100644 arch/arm/mach-exynos4/include/mach/exynos4-clock.h
1278  create mode 100644 arch/arm/mach-exynos4/mach-origen.c
1279  create mode 100644 arch/arm/mach-exynos4/mach-smdk4x12.c
1280  delete mode 100644 arch/arm/mach-exynos4/mach-smdkc210.c
1281  create mode 100644 arch/arm/mach-highbank/Makefile
1282  create mode 100644 arch/arm/mach-highbank/Makefile.boot
1283  create mode 100644 arch/arm/mach-highbank/clock.c
1284  create mode 100644 arch/arm/mach-highbank/core.h
1285  create mode 100644 arch/arm/mach-highbank/highbank.c
1286  create mode 100644 arch/arm/mach-highbank/hotplug.c
1287  create mode 100644 arch/arm/mach-highbank/include/mach/debug-macro.S
1288  create mode 100644 arch/arm/mach-highbank/include/mach/entry-macro.S
1289  rename arch/{um/include/asm/ftrace.h => arm/mach-highbank/include/mach/gpio.h} (100%)
1290  create mode 100644 arch/arm/mach-highbank/include/mach/io.h
1291  create mode 100644 arch/arm/mach-highbank/include/mach/irqs.h
1292  create mode 100644 arch/arm/mach-highbank/include/mach/memory.h
1293  create mode 100644 arch/arm/mach-highbank/include/mach/system.h
1294  create mode 100644 arch/arm/mach-highbank/include/mach/timex.h
1295  create mode 100644 arch/arm/mach-highbank/include/mach/uncompress.h
1296  create mode 100644 arch/arm/mach-highbank/include/mach/vmalloc.h
1297  create mode 100644 arch/arm/mach-highbank/lluart.c
1298  create mode 100644 arch/arm/mach-highbank/localtimer.c
1299  create mode 100644 arch/arm/mach-highbank/platsmp.c
1300  create mode 100644 arch/arm/mach-highbank/pm.c
1301  create mode 100644 arch/arm/mach-highbank/sysregs.h
1302  create mode 100644 arch/arm/mach-highbank/system.c
1303  delete mode 100644 arch/arm/mach-imx/cache-l2x0.c
1304  create mode 100644 arch/arm/mach-imx/clock-imx6q.c
1305  create mode 100644 arch/arm/mach-imx/cpu-imx25.c
1306  create mode 100644 arch/arm/mach-imx/gpc.c
1307  create mode 100644 arch/arm/mach-imx/head-v7.S
1308  create mode 100644 arch/arm/mach-imx/hotplug.c
1309  create mode 100644 arch/arm/mach-imx/lluart.c
1310  create mode 100644 arch/arm/mach-imx/localtimer.c
1311  create mode 100644 arch/arm/mach-imx/mach-imx6q.c
1312  create mode 100644 arch/arm/mach-imx/mm-imx3.c
1313  delete mode 100644 arch/arm/mach-imx/mm-imx31.c
1314  delete mode 100644 arch/arm/mach-imx/mm-imx35.c
1315  create mode 100644 arch/arm/mach-imx/mmdc.c
1316  create mode 100644 arch/arm/mach-imx/platsmp.c
1317  create mode 100644 arch/arm/mach-imx/pm-imx6q.c
1318  create mode 100644 arch/arm/mach-imx/src.c
1319  create mode 100644 arch/arm/mach-ixp4xx/miccpt-pci.c
1320  create mode 100644 arch/arm/mach-ixp4xx/omixp-setup.c
1321  delete mode 100644 arch/arm/mach-mx5/devices.c
1322  delete mode 100644 arch/arm/mach-mx5/devices.h
1323  create mode 100644 arch/arm/mach-mx5/imx51-dt.c
1324  create mode 100644 arch/arm/mach-mx5/imx53-dt.c
1325  delete mode 100644 arch/arm/mach-mx5/mm-mx50.c
1326  create mode 100644 arch/arm/mach-mxs/devices/platform-mxs-saif.c
1327  create mode 100644 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c
1328  create mode 100644 arch/arm/mach-mxs/mach-m28evk.c
1329  delete mode 100644 arch/arm/mach-mxs/mm-mx28.c
1330  rename arch/arm/mach-mxs/{mm-mx23.c => mm.c} (75%)
1331  delete mode 100644 arch/arm/mach-nuc93x/Kconfig
1332  delete mode 100644 arch/arm/mach-nuc93x/Makefile
1333  delete mode 100644 arch/arm/mach-nuc93x/Makefile.boot
1334  delete mode 100644 arch/arm/mach-nuc93x/clock.c
1335  delete mode 100644 arch/arm/mach-nuc93x/clock.h
1336  delete mode 100644 arch/arm/mach-nuc93x/cpu.c
1337  delete mode 100644 arch/arm/mach-nuc93x/cpu.h
1338  delete mode 100644 arch/arm/mach-nuc93x/dev.c
1339  delete mode 100644 arch/arm/mach-nuc93x/include/mach/entry-macro.S
1340  delete mode 100644 arch/arm/mach-nuc93x/include/mach/hardware.h
1341  delete mode 100644 arch/arm/mach-nuc93x/include/mach/io.h
1342  delete mode 100644 arch/arm/mach-nuc93x/include/mach/irqs.h
1343  delete mode 100644 arch/arm/mach-nuc93x/include/mach/map.h
1344  delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-clock.h
1345  delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-ebi.h
1346  delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-irq.h
1347  delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-serial.h
1348  delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-timer.h
1349  delete mode 100644 arch/arm/mach-nuc93x/include/mach/system.h
1350  delete mode 100644 arch/arm/mach-nuc93x/include/mach/timex.h
1351  delete mode 100644 arch/arm/mach-nuc93x/include/mach/uncompress.h
1352  delete mode 100644 arch/arm/mach-nuc93x/include/mach/vmalloc.h
1353  delete mode 100644 arch/arm/mach-nuc93x/irq.c
1354  delete mode 100644 arch/arm/mach-nuc93x/mach-nuc932evb.c
1355  delete mode 100644 arch/arm/mach-nuc93x/nuc932.c
1356  delete mode 100644 arch/arm/mach-nuc93x/nuc932.h
1357  delete mode 100644 arch/arm/mach-nuc93x/time.c
1358  create mode 100644 arch/arm/mach-omap1/timer.c
1359  create mode 100644 arch/arm/mach-omap2/clockdomains2420_data.c
1360  create mode 100644 arch/arm/mach-omap2/clockdomains2430_data.c
1361  create mode 100644 arch/arm/mach-omap2/clockdomains3xxx_data.c
1362  create mode 100644 arch/arm/mach-omap2/vc.c
1363  create mode 100644 arch/arm/mach-omap2/voltagedomains2xxx_data.c
1364  create mode 100644 arch/arm/mach-omap2/vp.c
1365  create mode 100644 arch/arm/mach-picoxcell/Makefile
1366  create mode 100644 arch/arm/mach-picoxcell/Makefile.boot
1367  create mode 100644 arch/arm/mach-picoxcell/common.c
1368  create mode 100644 arch/arm/mach-picoxcell/common.h
1369  create mode 100644 arch/arm/mach-picoxcell/include/mach/debug-macro.S
1370  create mode 100644 arch/arm/mach-picoxcell/include/mach/entry-macro.S
1371  create mode 100644 arch/arm/mach-picoxcell/include/mach/gpio.h
1372  create mode 100644 arch/arm/mach-picoxcell/include/mach/hardware.h
1373  create mode 100644 arch/arm/mach-picoxcell/include/mach/io.h
1374  create mode 100644 arch/arm/mach-picoxcell/include/mach/irqs.h
1375  create mode 100644 arch/arm/mach-picoxcell/include/mach/map.h
1376  create mode 100644 arch/arm/mach-picoxcell/include/mach/memory.h
1377  create mode 100644 arch/arm/mach-picoxcell/include/mach/picoxcell_soc.h
1378  create mode 100644 arch/arm/mach-picoxcell/include/mach/system.h
1379  create mode 100644 arch/arm/mach-picoxcell/include/mach/timex.h
1380  create mode 100644 arch/arm/mach-picoxcell/include/mach/uncompress.h
1381  create mode 100644 arch/arm/mach-picoxcell/include/mach/vmalloc.h
1382  create mode 100644 arch/arm/mach-picoxcell/io.c
1383  create mode 100644 arch/arm/mach-picoxcell/time.c
1384  create mode 100644 arch/arm/mach-prima2/pm.c
1385  create mode 100644 arch/arm/mach-prima2/pm.h
1386  create mode 100644 arch/arm/mach-prima2/rtciobrg.c
1387  create mode 100644 arch/arm/mach-prima2/sleep.S
1388  create mode 100644 arch/arm/mach-pxa/include/mach/pxa95x.h
1389  delete mode 100644 arch/arm/mach-s3c2410/gpio.c
1390  delete mode 100644 arch/arm/mach-s3c2412/gpio.c
1391  create mode 100644 arch/arm/mach-ux500/cache-l2x0.c
1392  create mode 100644 arch/arm/mach-ux500/timer.c
1393  create mode 100644 arch/arm/plat-mxc/devices/platform-ahci-imx.c
1394  create mode 100644 arch/arm/plat-mxc/devices/platform-pata_imx.c
1395  create mode 100644 arch/arm/plat-mxc/gic.c
1396  create mode 100644 arch/arm/plat-mxc/include/mach/mx6q.h
1397  create mode 100644 arch/arm/plat-omap/include/plat/voltage.h
1398  delete mode 100644 arch/arm/plat-s3c24xx/include/plat/map.h
1399  create mode 100644 arch/arm/plat-samsung/cpu.c
1400  create mode 100644 arch/arm/plat-samsung/include/plat/map-s3c.h
1401  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/map-s5p.h (94%)
1402  delete mode 100644 arch/um/Makefile-x86_64
1403  rename arch/um/{include/shared/chan_kern.h => drivers/chan.h} (95%)
1404  rename arch/um/{include/shared => drivers}/chan_user.h (100%)
1405  rename arch/um/{include/shared => drivers}/line.h (100%)
1406  rename arch/um/{include/shared => drivers}/mconsole.h (100%)
1407  rename arch/um/{include/shared => drivers}/mconsole_kern.h (100%)
1408  rename arch/um/{include/shared => drivers}/ubd_user.h (100%)
1409  create mode 100644 arch/um/include/asm/Kbuild
1410  delete mode 100644 arch/um/include/asm/bug.h
1411  delete mode 100644 arch/um/include/asm/checksum.h
1412  delete mode 100644 arch/um/include/asm/cputime.h
1413  delete mode 100644 arch/um/include/asm/device.h
1414  delete mode 100644 arch/um/include/asm/emergency-restart.h
1415  delete mode 100644 arch/um/include/asm/futex.h
1416  delete mode 100644 arch/um/include/asm/hardirq.h
1417  delete mode 100644 arch/um/include/asm/hw_irq.h
1418  delete mode 100644 arch/um/include/asm/irq_regs.h
1419  delete mode 100644 arch/um/include/asm/kdebug.h
1420  delete mode 100644 arch/um/include/asm/page_offset.h
1421  delete mode 100644 arch/um/include/asm/pda.h
1422  delete mode 100644 arch/um/include/asm/percpu.h
1423  delete mode 100644 arch/um/include/asm/sections.h
1424  delete mode 100644 arch/um/include/asm/system.h
1425  delete mode 100644 arch/um/include/asm/topology.h
1426  delete mode 100644 arch/um/include/asm/xor.h
1427  delete mode 100644 arch/um/include/shared/initrd.h
1428  delete mode 100644 arch/um/include/shared/ldt.h
1429  delete mode 100644 arch/um/include/shared/mem_kern.h
1430  delete mode 100644 arch/um/include/shared/process.h
1431  delete mode 100644 arch/um/include/shared/skas_ptregs.h
1432  delete mode 100644 arch/um/include/shared/syscall.h
1433  delete mode 100644 arch/um/include/shared/task.h
1434  delete mode 100644 arch/um/include/shared/tlb.h
1435  delete mode 100644 arch/um/include/shared/um_mmu.h
1436  delete mode 100644 arch/um/include/shared/um_uaccess.h
1437  delete mode 100644 arch/um/kernel/uaccess.c
1438  create mode 100644 arch/um/os-Linux/internal.h
1439  delete mode 100644 arch/um/os-Linux/sys-i386/signal.c
1440  delete mode 100644 arch/um/os-Linux/sys-x86_64/Makefile
1441  delete mode 100644 arch/um/os-Linux/sys-x86_64/registers.c
1442  delete mode 100644 arch/um/os-Linux/sys-x86_64/signal.c
1443  delete mode 100644 arch/um/os-Linux/sys-x86_64/task_size.c
1444  delete mode 100644 arch/um/os-Linux/tls.c
1445  delete mode 100644 arch/um/os-Linux/uaccess.c
1446  delete mode 100644 arch/um/sys-i386/Makefile
1447  delete mode 100644 arch/um/sys-i386/asm/elf.h
1448  delete mode 100644 arch/um/sys-i386/asm/module.h
1449  delete mode 100644 arch/um/sys-i386/atomic64_cx8_32.S
1450  delete mode 100644 arch/um/sys-i386/bug.c
1451  delete mode 100644 arch/um/sys-i386/ksyms.c
1452  delete mode 100644 arch/um/sys-i386/shared/sysdep/barrier.h
1453  delete mode 100644 arch/um/sys-i386/shared/sysdep/host_ldt.h
1454  delete mode 100644 arch/um/sys-i386/shared/sysdep/ptrace_user.h
1455  delete mode 100644 arch/um/sys-i386/shared/sysdep/sc.h
1456  delete mode 100644 arch/um/sys-i386/shared/sysdep/sigcontext.h
1457  delete mode 100644 arch/um/sys-i386/shared/sysdep/system.h
1458  delete mode 100644 arch/um/sys-i386/shared/sysdep/vm-flags.h
1459  delete mode 100644 arch/um/sys-i386/stub_segv.c
1460  delete mode 100644 arch/um/sys-i386/user-offsets.c
1461  delete mode 100644 arch/um/sys-x86_64/Makefile
1462  delete mode 100644 arch/um/sys-x86_64/asm/archparam.h
1463  delete mode 100644 arch/um/sys-x86_64/asm/module.h
1464  delete mode 100644 arch/um/sys-x86_64/delay.c
1465  delete mode 100644 arch/um/sys-x86_64/fault.c
1466  delete mode 100644 arch/um/sys-x86_64/ptrace_user.c
1467  delete mode 100644 arch/um/sys-x86_64/shared/sysdep/barrier.h
1468  delete mode 100644 arch/um/sys-x86_64/shared/sysdep/host_ldt.h
1469  delete mode 100644 arch/um/sys-x86_64/shared/sysdep/kernel-offsets.h
1470  delete mode 100644 arch/um/sys-x86_64/shared/sysdep/ptrace_user.h
1471  delete mode 100644 arch/um/sys-x86_64/shared/sysdep/sc.h
1472  delete mode 100644 arch/um/sys-x86_64/shared/sysdep/sigcontext.h
1473  delete mode 100644 arch/um/sys-x86_64/shared/sysdep/skas_ptrace.h
1474  delete mode 100644 arch/um/sys-x86_64/shared/sysdep/tls.h
1475  delete mode 100644 arch/um/sys-x86_64/signal.c
1476  rename arch/{um/Makefile-i386 => x86/Makefile.um} (64%)
1477  rename arch/{um/Kconfig.x86 => x86/um/Kconfig} (100%)
1478  create mode 100644 arch/x86/um/Makefile
1479  rename arch/{um/include => x86/um}/asm/apic.h (100%)
1480  rename arch/{um/include => x86/um}/asm/arch_hweight.h (100%)
1481  rename arch/{um/sys-i386 => x86/um}/asm/archparam.h (62%)
1482  create mode 100644 arch/x86/um/asm/checksum.h
1483  rename arch/{um/sys-i386/shared/sysdep/checksum.h => x86/um/asm/checksum_32.h} (99%)
1484  rename arch/{um/sys-x86_64/shared/sysdep/checksum.h => x86/um/asm/checksum_64.h} (100%)
1485  rename arch/{um/include => x86/um}/asm/desc.h (100%)
1486  rename arch/{um/sys-x86_64 => x86/um}/asm/elf.h (59%)
1487  rename arch/{um/include => x86/um}/asm/irq_vectors.h (100%)
1488  create mode 100644 arch/x86/um/asm/mm_context.h
1489  create mode 100644 arch/x86/um/asm/module.h
1490  create mode 100644 arch/x86/um/asm/processor.h
1491  rename arch/{um/sys-i386/asm/processor.h => x86/um/asm/processor_32.h} (78%)
1492  rename arch/{um/sys-x86_64/asm/processor.h => x86/um/asm/processor_64.h} (77%)
1493  create mode 100644 arch/x86/um/asm/ptrace.h
1494  rename arch/{um/sys-i386/asm/ptrace.h => x86/um/asm/ptrace_32.h} (100%)
1495  rename arch/{um/sys-x86_64/asm/ptrace.h => x86/um/asm/ptrace_64.h} (98%)
1496  rename arch/{um/include => x86/um}/asm/required-features.h (100%)
1497  rename arch/{um/include => x86/um}/asm/segment.h (100%)
1498  rename arch/{um/sys-x86_64/shared/sysdep => x86/um/asm}/system.h (96%)
1499  rename arch/{um/sys-x86_64/shared/sysdep => x86/um/asm}/vm-flags.h (58%)
1500  rename arch/{um/sys-x86_64 => x86/um}/bug.c (100%)
1501  rename arch/{um/sys-i386/bugs.c => x86/um/bugs_32.c} (94%)
1502  rename arch/{um/sys-x86_64/bugs.c => x86/um/bugs_64.c} (100%)
1503  rename arch/{um/sys-i386/checksum.S => x86/um/checksum_32.S} (100%)
1504  rename arch/{um/sys-i386 => x86/um}/delay.c (100%)
1505  rename arch/{um/sys-i386 => x86/um}/elfcore.c (100%)
1506  rename arch/{um/sys-i386 => x86/um}/fault.c (100%)
1507  rename arch/{um/sys-x86_64 => x86/um}/ksyms.c (90%)
1508  rename arch/{um/sys-i386 => x86/um}/ldt.c (92%)
1509  rename arch/{um/sys-i386/mem.c => x86/um/mem_32.c} (100%)
1510  rename arch/{um/sys-x86_64/mem.c => x86/um/mem_64.c} (100%)
1511  rename arch/{um/os-Linux/sys-i386 => x86/um/os-Linux}/Makefile (61%)
1512  create mode 100644 arch/x86/um/os-Linux/mcontext.c
1513  rename arch/{um/os-Linux/sys-x86_64 => x86/um/os-Linux}/prctl.c (100%)
1514  rename arch/{um/os-Linux/sys-i386 => x86/um/os-Linux}/registers.c (79%)
1515  rename arch/{um/os-Linux/sys-i386 => x86/um/os-Linux}/task_size.c (95%)
1516  rename arch/{um/os-Linux/sys-i386 => x86/um/os-Linux}/tls.c (53%)
1517  rename arch/{um/sys-i386/ptrace.c => x86/um/ptrace_32.c} (83%)
1518  rename arch/{um/sys-x86_64/ptrace.c => x86/um/ptrace_64.c} (72%)
1519  rename arch/{um/sys-i386 => x86/um}/ptrace_user.c (94%)
1520  rename arch/{um/sys-i386/setjmp.S => x86/um/setjmp_32.S} (100%)
1521  rename arch/{um/sys-x86_64/setjmp.S => x86/um/setjmp_64.S} (100%)
1522  create mode 100644 arch/x86/um/shared/sysdep/archsetjmp.h
1523  rename arch/{um/sys-i386/shared/sysdep/archsetjmp.h => x86/um/shared/sysdep/archsetjmp_32.h} (100%)
1524  rename arch/{um/sys-x86_64/shared/sysdep/archsetjmp.h => x86/um/shared/sysdep/archsetjmp_64.h} (100%)
1525  create mode 100644 arch/x86/um/shared/sysdep/faultinfo.h
1526  rename arch/{um/sys-i386/shared/sysdep/faultinfo.h => x86/um/shared/sysdep/faultinfo_32.h} (80%)
1527  rename arch/{um/sys-x86_64/shared/sysdep/faultinfo.h => x86/um/shared/sysdep/faultinfo_64.h} (84%)
1528  rename arch/{um/sys-i386 => x86/um}/shared/sysdep/kernel-offsets.h (100%)
1529  create mode 100644 arch/x86/um/shared/sysdep/mcontext.h
1530  create mode 100644 arch/x86/um/shared/sysdep/ptrace.h
1531  rename arch/{um/sys-i386/shared/sysdep/ptrace.h => x86/um/shared/sysdep/ptrace_32.h} (56%)
1532  rename arch/{um/sys-x86_64/shared/sysdep/ptrace.h => x86/um/shared/sysdep/ptrace_64.h} (53%)
1533  create mode 100644 arch/x86/um/shared/sysdep/ptrace_user.h
1534  rename arch/{um/sys-i386 => x86/um}/shared/sysdep/skas_ptrace.h (80%)
1535  create mode 100644 arch/x86/um/shared/sysdep/stub.h
1536  rename arch/{um/sys-i386/shared/sysdep/stub.h => x86/um/shared/sysdep/stub_32.h} (90%)
1537  rename arch/{um/sys-x86_64/shared/sysdep/stub.h => x86/um/shared/sysdep/stub_64.h} (91%)
1538  create mode 100644 arch/x86/um/shared/sysdep/syscalls.h
1539  rename arch/{um/sys-i386/shared/sysdep/syscalls.h => x86/um/shared/sysdep/syscalls_32.h} (100%)
1540  rename arch/{um/sys-x86_64/shared/sysdep/syscalls.h => x86/um/shared/sysdep/syscalls_64.h} (96%)
1541  rename arch/{um/sys-i386 => x86/um}/shared/sysdep/tls.h (79%)
1542  rename arch/{um/sys-i386 => x86/um}/signal.c (70%)
1543  rename arch/{um/sys-i386/stub.S => x86/um/stub_32.S} (100%)
1544  rename arch/{um/sys-x86_64/stub.S => x86/um/stub_64.S} (100%)
1545  rename arch/{um/sys-x86_64 => x86/um}/stub_segv.c (53%)
1546  rename arch/{um/sys-i386/sys_call_table.S => x86/um/sys_call_table_32.S} (82%)
1547  rename arch/{um/sys-x86_64/syscall_table.c => x86/um/sys_call_table_64.c} (95%)
1548  rename arch/{um/sys-i386/syscalls.c => x86/um/syscalls_32.c} (100%)
1549  rename arch/{um/sys-x86_64/syscalls.c => x86/um/syscalls_64.c} (100%)
1550  rename arch/{um/sys-i386/sysrq.c => x86/um/sysrq_32.c} (100%)
1551  rename arch/{um/sys-x86_64/sysrq.c => x86/um/sysrq_64.c} (95%)
1552  rename arch/{um/sys-i386/tls.c => x86/um/tls_32.c} (100%)
1553  rename arch/{um/sys-x86_64/tls.c => x86/um/tls_64.c} (100%)
1554  rename arch/{um/sys-x86_64 => x86/um}/user-offsets.c (54%)
1555  rename arch/{um/sys-x86_64 => x86/um}/vdso/Makefile (94%)
1556  rename arch/{um/sys-x86_64 => x86/um}/vdso/checkundef.sh (100%)
1557  rename arch/{um/sys-x86_64 => x86/um}/vdso/um_vdso.c (100%)
1558  rename arch/{um/sys-x86_64 => x86/um}/vdso/vdso-layout.lds.S (100%)
1559  rename arch/{um/sys-x86_64 => x86/um}/vdso/vdso-note.S (100%)
1560  rename arch/{um/sys-x86_64 => x86/um}/vdso/vdso.S (69%)
1561  rename arch/{um/sys-x86_64 => x86/um}/vdso/vdso.lds.S (100%)
1562  rename arch/{um/sys-x86_64 => x86/um}/vdso/vma.c (96%)
1563  create mode 100644 drivers/char/hw_random/atmel-rng.c
1564  create mode 100644 drivers/clocksource/clksrc-dbx500-prcmu.c
1565  delete mode 100644 drivers/edac/edac_mce.c
1566  create mode 100644 drivers/edac/sb_edac.c
1567  create mode 100644 drivers/md/dm-bufio.c
1568  create mode 100644 drivers/md/dm-bufio.h
1569  create mode 100644 drivers/md/dm-thin-metadata.c
1570  create mode 100644 drivers/md/dm-thin-metadata.h
1571  create mode 100644 drivers/md/dm-thin.c
1572  create mode 100644 drivers/md/persistent-data/Kconfig
1573  create mode 100644 drivers/md/persistent-data/Makefile
1574  create mode 100644 drivers/md/persistent-data/dm-block-manager.c
1575  create mode 100644 drivers/md/persistent-data/dm-block-manager.h
1576  create mode 100644 drivers/md/persistent-data/dm-btree-internal.h
1577  create mode 100644 drivers/md/persistent-data/dm-btree-remove.c
1578  create mode 100644 drivers/md/persistent-data/dm-btree-spine.c
1579  create mode 100644 drivers/md/persistent-data/dm-btree.c
1580  create mode 100644 drivers/md/persistent-data/dm-btree.h
1581  create mode 100644 drivers/md/persistent-data/dm-persistent-data-internal.h
1582  create mode 100644 drivers/md/persistent-data/dm-space-map-checker.c
1583  create mode 100644 drivers/md/persistent-data/dm-space-map-checker.h
1584  create mode 100644 drivers/md/persistent-data/dm-space-map-common.c
1585  create mode 100644 drivers/md/persistent-data/dm-space-map-common.h
1586  create mode 100644 drivers/md/persistent-data/dm-space-map-disk.c
1587  create mode 100644 drivers/md/persistent-data/dm-space-map-disk.h
1588  create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.c
1589  create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.h
1590  create mode 100644 drivers/md/persistent-data/dm-space-map.h
1591  create mode 100644 drivers/md/persistent-data/dm-transaction-manager.c
1592  create mode 100644 drivers/md/persistent-data/dm-transaction-manager.h
1593  create mode 100644 drivers/pps/clients/pps-gpio.c
1594  create mode 100644 drivers/rapidio/devices/Kconfig
1595  create mode 100644 drivers/rapidio/devices/Makefile
1596  create mode 100644 drivers/rapidio/devices/tsi721.c
1597  create mode 100644 drivers/rapidio/devices/tsi721.h
1598  create mode 100644 drivers/virtio/virtio_mmio.c
1599  create mode 100644 include/linux/clksrc-dbx500-prcmu.h
1600  delete mode 100644 include/linux/edac_mce.h
1601  create mode 100644 include/linux/jbd_common.h
1602  create mode 100644 include/linux/pps-gpio.h
1603  create mode 100644 include/linux/rtc/sirfsoc_rtciobrg.h
1604  create mode 100644 include/linux/virtio_mmio.h
1605 Merging fixes/master (956e850 Revert "hvc_console: display printk messages on console.")
1606 $ git merge fixes/master
1607 Updating 43672a0..956e850
1608 Fast-forward
1609  drivers/tty/hvc/hvc_console.c |    7 +------
1610  1 files changed, 1 insertions(+), 6 deletions(-)
1611 Merging kbuild-current/rc-fixes (322a8b0 Linux 3.1-rc1)
1612 $ git merge kbuild-current/rc-fixes
1613 Already up-to-date.
1614 Merging arm-current/fixes (1bf1aac Merge branch 'samsung-fixes-4' of git://github.com/kgene/linux-samsung)
1615 $ git merge arm-current/fixes
1616 Already up-to-date.
1617 Merging m68k-current/for-linus (4b7cecc m68k/mac: Remove mac_irq_{en,dis}able() wrappers)
1618 $ git merge m68k-current/for-linus
1619 Merge made by the 'recursive' strategy.
1620  arch/m68k/Kconfig                 |    4 +-
1621  arch/m68k/Kconfig.bus             |    9 +
1622  arch/m68k/Kconfig.devices         |   31 ++++
1623  arch/m68k/amiga/amiints.c         |  168 ++++++++------------
1624  arch/m68k/amiga/cia.c             |   39 +++--
1625  arch/m68k/apollo/dn_ints.c        |   35 +++--
1626  arch/m68k/atari/ataints.c         |  274 +++----------------------------
1627  arch/m68k/bvme6000/config.c       |    2 +-
1628  arch/m68k/hp300/time.c            |    2 +-
1629  arch/m68k/include/asm/hardirq.h   |    5 +
1630  arch/m68k/include/asm/irq.h       |   69 ++------
1631  arch/m68k/include/asm/macintosh.h |    2 +
1632  arch/m68k/include/asm/q40ints.h   |    3 -
1633  arch/m68k/kernel/Makefile         |    9 +-
1634  arch/m68k/kernel/entry_mm.S       |    7 +-
1635  arch/m68k/kernel/ints.c           |  323 ++++---------------------------------
1636  arch/m68k/mac/baboon.c            |   21 +--
1637  arch/m68k/mac/iop.c               |   10 +-
1638  arch/m68k/mac/macints.c           |   24 ++--
1639  arch/m68k/mac/oss.c               |   54 +++----
1640  arch/m68k/mac/psc.c               |   49 +++---
1641  arch/m68k/mac/via.c               |   74 ++++-----
1642  arch/m68k/mvme147/config.c        |    5 +-
1643  arch/m68k/mvme16x/config.c        |    2 +-
1644  arch/m68k/q40/q40ints.c           |   60 ++++----
1645  arch/m68k/sun3/sun3ints.c         |   46 +++---
1646  drivers/ide/ide-cd.c              |    1 -
1647  drivers/ide/ide-floppy.c          |    1 -
1648  drivers/ide/ide-tape.c            |    1 -
1649  drivers/macintosh/via-macii.c     |    2 +-
1650  drivers/macintosh/via-maciisi.c   |    4 +-
1651  31 files changed, 393 insertions(+), 943 deletions(-)
1652 Merging powerpc-merge/merge (0c81e4b powerpc/p1023rds: Fix the error of bank-width of nor flash)
1653 $ git merge powerpc-merge/merge
1654 Already up-to-date.
1655 Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries)
1656 $ git merge 52xx-and-virtex-current/powerpc/merge
1657 Already up-to-date.
1658 Merging sparc/master (51ce185 sparc: Hook up process_vm_{readv,writev} syscalls.)
1659 $ git merge sparc/master
1660 Merge made by the 'recursive' strategy.
1661  arch/sparc/include/asm/unistd.h |    4 +++-
1662  arch/sparc/kernel/systbls_32.S  |    2 +-
1663  arch/sparc/kernel/systbls_64.S  |    4 ++--
1664  3 files changed, 6 insertions(+), 4 deletions(-)
1665 Merging scsi-rc-fixes/master (3ee72ca Merge git://github.com/davem330/net)
1666 $ git merge scsi-rc-fixes/master
1667 Already up-to-date.
1668 Merging net/master (2edcd4c net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c)
1669 $ git merge net/master
1670 Auto-merging MAINTAINERS
1671 Merge made by the 'recursive' strategy.
1672  Documentation/networking/ipvs-sysctl.txt          |   62 ++++++++++++++++++--
1673  MAINTAINERS                                       |    4 +-
1674  drivers/isdn/hisax/l3dss1.c                       |    6 +-
1675  drivers/net/bonding/bond_main.c                   |   37 ++++--------
1676  drivers/net/bonding/bond_procfs.c                 |   12 +++-
1677  drivers/net/ethernet/Kconfig                      |    1 +
1678  drivers/net/ethernet/Makefile                     |    1 +
1679  drivers/net/ethernet/apple/Kconfig                |   12 ----
1680  drivers/net/ethernet/apple/Makefile               |    1 -
1681  drivers/net/ethernet/cirrus/Kconfig               |   14 ++++-
1682  drivers/net/ethernet/cirrus/Makefile              |    1 +
1683  drivers/net/ethernet/{apple => cirrus}/mac89x0.c  |    0
1684  drivers/net/ethernet/i825xx/3c505.c               |    6 +-
1685  drivers/net/ethernet/realtek/Kconfig              |   12 ----
1686  drivers/net/ethernet/realtek/Makefile             |    1 -
1687  drivers/net/ethernet/silan/Kconfig                |   33 +++++++++++
1688  drivers/net/ethernet/silan/Makefile               |    5 ++
1689  drivers/net/ethernet/{realtek => silan}/sc92031.c |    0
1690  drivers/net/ethernet/xilinx/ll_temac_main.c       |    4 +-
1691  include/linux/netfilter_ipv4/Kbuild               |    1 +
1692  include/linux/netfilter_ipv4/nf_nat.h             |   58 +++++++++++++++++++
1693  include/linux/skbuff.h                            |    4 +-
1694  include/net/ip_vs.h                               |   11 ++--
1695  include/net/netfilter/nf_conntrack_tuple.h        |   27 +---------
1696  include/net/netfilter/nf_nat.h                    |   26 +--------
1697  include/net/tcp.h                                 |   10 ++-
1698  include/net/udp.h                                 |   12 ++--
1699  net/8021q/vlan_dev.c                              |   10 ++-
1700  net/bridge/netfilter/ebt_ulog.c                   |    7 +-
1701  net/core/neighbour.c                              |    6 +--
1702  net/ipv4/netfilter/ipt_CLUSTERIP.c                |    1 -
1703  net/ipv4/netfilter/ipt_ULOG.c                     |    4 +-
1704  net/ipv4/netfilter/nf_nat_snmp_basic.c            |   22 +-------
1705  net/ipv4/tcp_ipv4.c                               |   22 ++++---
1706  net/ipv4/udp.c                                    |   30 ++++++----
1707  net/ipv4/udplite.c                                |   13 +++-
1708  net/ipv6/netfilter.c                              |   13 +++-
1709  net/ipv6/netfilter/nf_conntrack_reasm.c           |    7 +-
1710  net/ipv6/tcp_ipv6.c                               |   12 +++-
1711  net/ipv6/udp.c                                    |   12 +++-
1712  net/ipv6/udplite.c                                |   13 +++-
1713  net/netfilter/core.c                              |   11 ++--
1714  net/netfilter/ipset/ip_set_core.c                 |    4 +-
1715  net/netfilter/ipvs/ip_vs_core.c                   |   20 +++----
1716  net/netfilter/ipvs/ip_vs_ctl.c                    |   22 ++-----
1717  net/netfilter/ipvs/ip_vs_dh.c                     |    5 +-
1718  net/netfilter/ipvs/ip_vs_ftp.c                    |    5 +-
1719  net/netfilter/ipvs/ip_vs_lblc.c                   |    9 +--
1720  net/netfilter/ipvs/ip_vs_lblcr.c                  |   13 +---
1721  net/netfilter/ipvs/ip_vs_nfct.c                   |    2 +-
1722  net/netfilter/ipvs/ip_vs_proto.c                  |    5 +-
1723  net/netfilter/ipvs/ip_vs_proto_sctp.c             |   14 +---
1724  net/netfilter/ipvs/ip_vs_proto_tcp.c              |    6 +-
1725  net/netfilter/ipvs/ip_vs_proto_udp.c              |    5 +-
1726  net/netfilter/ipvs/ip_vs_sh.c                     |    5 +-
1727  net/netfilter/ipvs/ip_vs_wrr.c                    |    5 +-
1728  net/netfilter/ipvs/ip_vs_xmit.c                   |    2 +-
1729  net/netfilter/nf_conntrack_core.c                 |    5 +-
1730  net/netfilter/nfnetlink_log.c                     |    7 +--
1731  net/netfilter/xt_IDLETIMER.c                      |    2 -
1732  net/netfilter/xt_hashlimit.c                      |    5 +-
1733  net/x25/af_x25.c                                  |   11 +++-
1734  62 files changed, 374 insertions(+), 322 deletions(-)
1735  rename drivers/net/ethernet/{apple => cirrus}/mac89x0.c (100%)
1736  create mode 100644 drivers/net/ethernet/silan/Kconfig
1737  create mode 100644 drivers/net/ethernet/silan/Makefile
1738  rename drivers/net/ethernet/{realtek => silan}/sc92031.c (100%)
1739  create mode 100644 include/linux/netfilter_ipv4/nf_nat.h
1740 Merging sound-current/for-linus (8128c9f Merge branch 'topic/hda' into for-linus)
1741 $ git merge sound-current/for-linus
1742 Already up-to-date.
1743 Merging pci-current/for-linus (571eba1 PCI: Fix compile errors with PCI_ATS and !PCI_IOV)
1744 $ git merge pci-current/for-linus
1745 Merge made by the 'recursive' strategy.
1746  drivers/pci/Kconfig                |    1 +
1747  drivers/pci/ats.c                  |    1 +
1748  drivers/pci/hotplug/acpiphp_glue.c |   29 ++++++++++++++++++++++++-----
1749  include/linux/pci-ats.h            |    6 +++---
1750  include/linux/pci.h                |    2 +-
1751  5 files changed, 30 insertions(+), 9 deletions(-)
1752 $ git reset --hard HEAD^
1753 HEAD is now at b3c4858 Merge remote-tracking branch 'net/master'
1754 Merging refs/next/20111102/pci-current
1755 $ git merge refs/next/20111102/pci-current
1756 Merge made by the 'recursive' strategy.
1757  drivers/pci/Kconfig                |    1 +
1758  drivers/pci/hotplug/acpiphp_glue.c |   29 ++++++++++++++++++++++++-----
1759  include/linux/pci-ats.h            |    6 +++---
1760  include/linux/pci.h                |    2 +-
1761  4 files changed, 29 insertions(+), 9 deletions(-)
1762 Merging wireless/master (f956c34 iwlwifi: don't perform "echo test" when cmd queue stuck)
1763 $ git merge wireless/master
1764 Merge made by the 'recursive' strategy.
1765  drivers/bluetooth/ath3k.c                        |    4 +-
1766  drivers/bluetooth/bcm203x.c                      |   12 +++++++-
1767  drivers/bluetooth/bfusb.c                        |   13 ++++----
1768  drivers/net/wireless/ath/ath9k/ar9002_calib.c    |    4 --
1769  drivers/net/wireless/ath/ath9k/ar9003_calib.c    |   11 ++++---
1770  drivers/net/wireless/ath/ath9k/ar9003_phy.h      |   34 +++++++++++-----------
1771  drivers/net/wireless/ath/ath9k/ar9485_initvals.h |   10 +++---
1772  drivers/net/wireless/ath/ath9k/hw.c              |    3 ++
1773  drivers/net/wireless/ath/carl9170/tx.c           |   11 ++++--
1774  drivers/net/wireless/b43/xmit.c                  |    1 -
1775  drivers/net/wireless/iwlwifi/iwl-core.c          |   10 ------
1776  drivers/net/wireless/iwlwifi/iwl-pci.c           |    8 ++---
1777  drivers/net/wireless/iwlwifi/iwl-trans-pcie.c    |   12 +++++--
1778  drivers/net/wireless/libertas/cfg.c              |   25 +++++++++++-----
1779  drivers/net/wireless/libertas/cfg.h              |    1 +
1780  drivers/net/wireless/libertas/main.c             |    6 +--
1781  include/net/bluetooth/rfcomm.h                   |    1 +
1782  net/bluetooth/hci_core.c                         |    2 +-
1783  net/bluetooth/mgmt.c                             |    2 -
1784  net/bluetooth/rfcomm/core.c                      |    9 ++++-
1785  net/mac80211/cfg.c                               |   12 ++++----
1786  net/mac80211/ieee80211_i.h                       |    1 +
1787  net/mac80211/mlme.c                              |   18 ++++++++++-
1788  net/mac80211/work.c                              |    7 ++--
1789  24 files changed, 124 insertions(+), 93 deletions(-)
1790 Merging driver-core.current/driver-core-linus (094803e Merge branch 'akpm' (Andrew's incoming))
1791 $ git merge driver-core.current/driver-core-linus
1792 Already up-to-date.
1793 Merging tty.current/tty-linus (094803e Merge branch 'akpm' (Andrew's incoming))
1794 $ git merge tty.current/tty-linus
1795 Already up-to-date.
1796 Merging usb.current/usb-linus (094803e Merge branch 'akpm' (Andrew's incoming))
1797 $ git merge usb.current/usb-linus
1798 Already up-to-date.
1799 Merging staging.current/staging-linus (094803e Merge branch 'akpm' (Andrew's incoming))
1800 $ git merge staging.current/staging-linus
1801 Already up-to-date.
1802 Merging cpufreq-current/fixes (2f84dd7 autofs4: fix debug printk warning uncovered by cleanup)
1803 $ git merge cpufreq-current/fixes
1804 Already up-to-date.
1805 Merging input-current/for-linus (6ad390a Merge branch 'next' into for-linus)
1806 $ git merge input-current/for-linus
1807 Already up-to-date.
1808 Merging md-current/for-linus (7fcc7c8 md/raid10:  Fix bug when activating a hot-spare.)
1809 $ git merge md-current/for-linus
1810 Already up-to-date.
1811 Merging audit-current/for-linus (def5754 Audit: remove spaces from audit_log_d_path)
1812 $ git merge audit-current/for-linus
1813 Already up-to-date.
1814 Merging crypto-current/master (fb223c3 crypto: user - Fix rwsem leak in crypto_user)
1815 $ git merge crypto-current/master
1816 Merge made by the 'recursive' strategy.
1817  crypto/crypto_user.c |    3 ---
1818  1 files changed, 0 insertions(+), 3 deletions(-)
1819 Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
1820 $ git merge ide/master
1821 Merge made by the 'recursive' strategy.
1822  drivers/ide/cy82c693.c |    6 +++---
1823  drivers/ide/icside.c   |    2 +-
1824  drivers/ide/piix.c     |   18 ++++++++++--------
1825  drivers/ide/triflex.c  |   16 +++++++++++++++-
1826  4 files changed, 29 insertions(+), 13 deletions(-)
1827 Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
1828 $ git merge dwmw2/master
1829 Already up-to-date.
1830 Merging sh-current/sh-fixes-for-linus (21d41f2 sh: fix the compile error in setup-sh7757.c)
1831 $ git merge sh-current/sh-fixes-for-linus
1832 Already up-to-date.
1833 Merging rmobile-current/rmobile-fixes-for-linus (a408bae ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support)
1834 $ git merge rmobile-current/rmobile-fixes-for-linus
1835 Already up-to-date.
1836 Merging devicetree-current/devicetree/merge (ed5f886 dt: add empty of_alias_get_id() for non-dt builds)
1837 $ git merge devicetree-current/devicetree/merge
1838 Auto-merging include/linux/of.h
1839 Merge made by the 'recursive' strategy.
1840  include/linux/of.h |    5 +++++
1841  1 files changed, 5 insertions(+), 0 deletions(-)
1842 Merging spi-current/spi/merge (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
1843 $ git merge spi-current/spi/merge
1844 Already up-to-date.
1845 Merging arm/for-next (49eaa32 Merge branch 'devel-stable' into for-linus)
1846 $ git merge arm/for-next
1847 Merge made by the 'recursive' strategy.
1848 Merging arm-lpae/for-next (3c31119 fixup! ARM: pgtable: switch to use pgtable-nopud.h)
1849 $ git merge arm-lpae/for-next
1850 Resolved 'arch/arm/include/asm/page.h' using previous resolution.
1851 Resolved 'arch/arm/include/asm/pgtable-hwdef.h' using previous resolution.
1852 Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution.
1853 Resolved 'arch/arm/kernel/head.S' using previous resolution.
1854 Resolved 'arch/arm/kernel/sleep.S' using previous resolution.
1855 Resolved 'arch/arm/mm/dma-mapping.c' using previous resolution.
1856 Resolved 'arch/arm/mm/mmu.c' using previous resolution.
1857 Auto-merging arch/arm/mm/mmu.c
1858 CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
1859 Auto-merging arch/arm/mm/ioremap.c
1860 Auto-merging arch/arm/mm/fault.c
1861 Auto-merging arch/arm/mm/dma-mapping.c
1862 CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
1863 Auto-merging arch/arm/mm/context.c
1864 Auto-merging arch/arm/mm/alignment.c
1865 Auto-merging arch/arm/mm/Kconfig
1866 Auto-merging arch/arm/kernel/sleep.S
1867 CONFLICT (content): Merge conflict in arch/arm/kernel/sleep.S
1868 Auto-merging arch/arm/kernel/setup.c
1869 Auto-merging arch/arm/kernel/hw_breakpoint.c
1870 Auto-merging arch/arm/kernel/head.S
1871 CONFLICT (content): Merge conflict in arch/arm/kernel/head.S
1872 Auto-merging arch/arm/include/asm/system.h
1873 Auto-merging arch/arm/include/asm/proc-fns.h
1874 Auto-merging arch/arm/include/asm/pgtable.h
1875 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
1876 Auto-merging arch/arm/include/asm/pgtable-hwdef.h
1877 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable-hwdef.h
1878 Auto-merging arch/arm/include/asm/pgalloc.h
1879 Auto-merging arch/arm/include/asm/page.h
1880 CONFLICT (content): Merge conflict in arch/arm/include/asm/page.h
1881 Auto-merging arch/arm/boot/compressed/head.S
1882 Auto-merging arch/arm/Kconfig
1883 Automatic merge failed; fix conflicts and then commit the result.
1884 $ git commit -v -a
1885 [master aaa206a] Merge remote-tracking branch 'arm-lpae/for-next'
1886 $ git diff -M --stat --summary HEAD^..
1887  arch/arm/Kconfig                            |    2 +-
1888  arch/arm/boot/compressed/head.S             |    1 +
1889  arch/arm/include/asm/assembler.h            |   11 +
1890  arch/arm/include/asm/page.h                 |    4 +
1891  arch/arm/include/asm/pgalloc.h              |   26 ++-
1892  arch/arm/include/asm/pgtable-3level-hwdef.h |   82 ++++++
1893  arch/arm/include/asm/pgtable-3level-types.h |   70 +++++
1894  arch/arm/include/asm/pgtable-3level.h       |  107 +++++++
1895  arch/arm/include/asm/pgtable-hwdef.h        |    4 +
1896  arch/arm/include/asm/pgtable.h              |   93 +++++-
1897  arch/arm/include/asm/proc-fns.h             |   21 ++
1898  arch/arm/include/asm/setup.h                |    8 +
1899  arch/arm/include/asm/system.h               |    8 +
1900  arch/arm/include/asm/tlb.h                  |   12 +-
1901  arch/arm/kernel/head.S                      |   45 +++-
1902  arch/arm/kernel/hw_breakpoint.c             |    8 +-
1903  arch/arm/kernel/setup.c                     |   10 +
1904  arch/arm/kernel/sleep.S                     |    2 +
1905  arch/arm/mm/Kconfig                         |   13 +
1906  arch/arm/mm/Makefile                        |    4 +
1907  arch/arm/mm/alignment.c                     |    2 +-
1908  arch/arm/mm/context.c                       |   19 +-
1909  arch/arm/mm/fault.c                         |   87 ++++++
1910  arch/arm/mm/idmap.c                         |   36 +++-
1911  arch/arm/mm/ioremap.c                       |   39 ++-
1912  arch/arm/mm/mmu.c                           |   35 ++-
1913  arch/arm/mm/pgd.c                           |   51 +++-
1914  arch/arm/mm/proc-macros.S                   |    5 +-
1915  arch/arm/mm/proc-v7lpae.S                   |  422 +++++++++++++++++++++++++++
1916  29 files changed, 1175 insertions(+), 52 deletions(-)
1917  create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h
1918  create mode 100644 arch/arm/include/asm/pgtable-3level-types.h
1919  create mode 100644 arch/arm/include/asm/pgtable-3level.h
1920  create mode 100644 arch/arm/mm/proc-v7lpae.S
1921 Merging arm-soc/for-next (a238f82 Merge branch 'next/devel2' into for-next)
1922 $ git merge arm-soc/for-next
1923 Removing drivers/gpio/gpio-s5pv210.c
1924 Removing drivers/gpio/gpio-s5pc100.c
1925 Removing drivers/gpio/gpio-plat-samsung.c
1926 Removing drivers/gpio/gpio-exynos4.c
1927 Removing arch/arm/plat-samsung/s3c-pl330.c
1928 Auto-merging arch/arm/plat-samsung/include/plat/usb-phy.h
1929 Auto-merging arch/arm/plat-samsung/include/plat/udc.h
1930 Auto-merging arch/arm/plat-samsung/include/plat/system-reset.h
1931 Auto-merging arch/arm/plat-samsung/include/plat/sysmmu.h
1932 Auto-merging arch/arm/plat-samsung/include/plat/s5pv210.h
1933 Auto-merging arch/arm/plat-samsung/include/plat/s5pc100.h
1934 Auto-merging arch/arm/plat-samsung/include/plat/s5p6450.h
1935 Auto-merging arch/arm/plat-samsung/include/plat/s5p6440.h
1936 Auto-merging arch/arm/plat-samsung/include/plat/s5p-time.h
1937 Auto-merging arch/arm/plat-samsung/include/plat/s5p-clock.h
1938 Auto-merging arch/arm/plat-samsung/include/plat/s3c6410.h
1939 Auto-merging arch/arm/plat-samsung/include/plat/s3c6400.h
1940 Auto-merging arch/arm/plat-samsung/include/plat/s3c244x.h
1941 Auto-merging arch/arm/plat-samsung/include/plat/s3c2443.h
1942 Auto-merging arch/arm/plat-samsung/include/plat/s3c2416.h
1943 Auto-merging arch/arm/plat-samsung/include/plat/s3c2412.h
1944 Auto-merging arch/arm/plat-samsung/include/plat/s3c2410.h
1945 Removing arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h
1946 Auto-merging arch/arm/plat-samsung/include/plat/reset.h
1947 Auto-merging arch/arm/plat-samsung/include/plat/regs-udc.h
1948 Auto-merging arch/arm/plat-samsung/include/plat/regs-srom.h
1949 Auto-merging arch/arm/plat-samsung/include/plat/regs-dma.h
1950 Auto-merging arch/arm/plat-samsung/include/plat/pwm-clock.h
1951 Removing arch/arm/plat-samsung/include/plat/pll6553x.h
1952 Auto-merging arch/arm/plat-samsung/include/plat/pll.h
1953 Auto-merging arch/arm/plat-samsung/include/plat/mipi_csis.h
1954 Auto-merging arch/arm/plat-samsung/include/plat/mfc.h
1955 Auto-merging arch/arm/plat-samsung/include/plat/mci.h
1956 Auto-merging arch/arm/plat-samsung/include/plat/irqs.h
1957 Auto-merging arch/arm/plat-samsung/include/plat/irq.h
1958 Auto-merging arch/arm/plat-samsung/include/plat/fiq.h
1959 Auto-merging arch/arm/plat-samsung/include/plat/exynos4.h
1960 Auto-merging arch/arm/plat-samsung/include/plat/ehci.h
1961 Auto-merging arch/arm/plat-samsung/include/plat/dma-pl330.h
1962 Auto-merging arch/arm/plat-samsung/include/plat/cpu-freq-core.h
1963 Auto-merging arch/arm/plat-samsung/include/plat/common-smdk.h
1964 Auto-merging arch/arm/plat-samsung/include/plat/camport.h
1965 Auto-merging arch/arm/plat-samsung/include/plat/audio-simtec.h
1966 Removing arch/arm/plat-samsung/gpio.c
1967 Removing arch/arm/plat-samsung/gpio-config.c
1968 Removing arch/arm/plat-samsung/dev-wdt.c
1969 Removing arch/arm/plat-samsung/dev-usb.c
1970 Removing arch/arm/plat-samsung/dev-usb-hsotg.c
1971 Removing arch/arm/plat-samsung/dev-ts.c
1972 Removing arch/arm/plat-samsung/dev-rtc.c
1973 Removing arch/arm/plat-samsung/dev-pwm.c
1974 Removing arch/arm/plat-samsung/dev-onenand.c
1975 Removing arch/arm/plat-samsung/dev-nand.c
1976 Removing arch/arm/plat-samsung/dev-keypad.c
1977 Removing arch/arm/plat-samsung/dev-ide.c
1978 Removing arch/arm/plat-samsung/dev-i2c7.c
1979 Removing arch/arm/plat-samsung/dev-i2c6.c
1980 Removing arch/arm/plat-samsung/dev-i2c5.c
1981 Removing arch/arm/plat-samsung/dev-i2c4.c
1982 Removing arch/arm/plat-samsung/dev-i2c3.c
1983 Removing arch/arm/plat-samsung/dev-i2c2.c
1984 Removing arch/arm/plat-samsung/dev-i2c1.c
1985 Removing arch/arm/plat-samsung/dev-i2c0.c
1986 Removing arch/arm/plat-samsung/dev-hwmon.c
1987 Removing arch/arm/plat-samsung/dev-hsmmc3.c
1988 Removing arch/arm/plat-samsung/dev-hsmmc2.c
1989 Removing arch/arm/plat-samsung/dev-hsmmc1.c
1990 Removing arch/arm/plat-samsung/dev-hsmmc.c
1991 Removing arch/arm/plat-samsung/dev-fb.c
1992 Removing arch/arm/plat-samsung/dev-asocdma.c
1993 Removing arch/arm/plat-samsung/dev-adc.c
1994 Auto-merging arch/arm/plat-s5p/sleep.S
1995 Removing arch/arm/plat-s5p/dev-pmu.c
1996 Removing arch/arm/plat-s5p/dev-onenand.c
1997 Removing arch/arm/plat-s5p/dev-fimd0.c
1998 Removing arch/arm/plat-s5p/dev-fimc3.c
1999 Removing arch/arm/plat-s5p/dev-fimc2.c
2000 Removing arch/arm/plat-s5p/dev-fimc1.c
2001 Removing arch/arm/plat-s5p/dev-fimc0.c
2002 Removing arch/arm/plat-s5p/dev-ehci.c
2003 Removing arch/arm/plat-s5p/dev-csis1.c
2004 Removing arch/arm/plat-s5p/dev-csis0.c
2005 Removing arch/arm/plat-s3c24xx/include/plat/regs-spi.h
2006 Removing arch/arm/plat-s3cRecorded preimage for 'arch/arm/plat-omap/devices.c'
2007 24xx/include/plat/regs-iis.h
2008 Removing arch/arm/plat-s3c24xx/include/plat/pll.h
2009 Removing arch/arm/plat-s3c24xx/include/mach/pwm-clock.h
2010 Removing arch/arm/plat-s3c24xx/include/mach/clkdev.h
2011 Removing arch/arm/plat-s3c24xx/gpiolib.c
2012 Removing arch/arm/plat-s3c24xx/gpio.c
2013 Removing arch/arm/plat-s3c24xx/devs.c
2014 Auto-merging arch/arm/plat-omap/devices.c
2015 CONFLICT (content): Merge conflict in arch/arm/plat-omap/devices.c
2016 Removing arch/arm/mach-s5pv210/sleep.S
2017 Removing arch/arm/mach-s5pv210/include/mach/pwm-clock.h
2018 Removing arch/arm/mach-s5pv210/include/mach/clkdev.h
2019 Removing arch/arm/mach-s5pc100/include/mach/pwm-clock.h
2020 Removing arch/arm/mach-s5pc100/include/mach/clkdev.h
2021 Removing arch/arm/mach-s5p64x0/include/mach/pwm-clock.h
2022 Removing arch/arm/mach-s5p64x0/include/mach/clkdev.h
2023 Removing arch/arm/mach-s3c64xx/include/mach/pwm-clock.h
2024 Removing arch/arm/mach-s3c64xx/include/mach/pll.h
2025 Removing arch/arm/mach-s3c64xx/include/mach/clkdev.h
2026 Removing arch/arm/mach-s3c64xx/gpiolib.c
2027 Removing arch/arm/mach-s3c64xx/dev-onenand1.c
2028 Auto-merging arch/arm/mach-omap2/board-generic.c
2029 Auto-merging arch/arm/mach-omap2/Makefile
2030 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Makefile
2031 Removing arch/arm/mach-exynos4/include/mach/clkdev.h
2032 Auto-merging arch/arm/Kconfig
2033 Automatic merge failed; fix conflicts and then commit the result.
2034 $ git commit -v -a
2035 Recorded resolution for 'arch/arm/mach-omap2/Makefile'.
2036 Recorded resolution for 'arch/arm/plat-omap/devices.c'.
2037 [master 74c01a9] Merge remote-tracking branch 'arm-soc/for-next'
2038 $ git diff -M --stat --summary HEAD^..
2039  arch/arm/Kconfig                                   |    7 +-
2040  arch/arm/include/asm/hardware/pl080.h              |    4 +
2041  arch/arm/mach-exynos4/Kconfig                      |   48 +
2042  arch/arm/mach-exynos4/Makefile                     |    2 +-
2043  arch/arm/mach-exynos4/clock.c                      |  220 ++-
2044  arch/arm/mach-exynos4/cpu.c                        |    2 +
2045  arch/arm/mach-exynos4/dma.c                        |  300 ++-
2046  arch/arm/mach-exynos4/include/mach/clkdev.h        |    7 -
2047  arch/arm/mach-exynos4/include/mach/dma.h           |    4 +-
2048  arch/arm/mach-exynos4/include/mach/irqs.h          |    4 +
2049  arch/arm/mach-exynos4/include/mach/map.h           |   12 +
2050  arch/arm/mach-exynos4/include/mach/pm-core.h       |    8 +-
2051  arch/arm/mach-exynos4/include/mach/pmu.h           |    7 +
2052  arch/arm/mach-exynos4/include/mach/regs-pmu.h      |   74 +-
2053  arch/arm/mach-exynos4/mach-nuri.c                  |  192 ++-
2054  arch/arm/mach-exynos4/mach-origen.c                |  598 +++++-
2055  arch/arm/mach-exynos4/mach-smdkv310.c              |   49 +
2056  arch/arm/mach-exynos4/mach-universal_c210.c        |  307 +++-
2057  arch/arm/mach-exynos4/pm.c                         |    7 +
2058  arch/arm/mach-exynos4/pmu.c                        |  353 ++--
2059  arch/arm/mach-exynos4/setup-sdhci.c                |   47 -
2060  arch/arm/mach-mmp/Makefile                         |    2 +-
2061  arch/arm/mach-mmp/brownstone.c                     |   11 +
2062  arch/arm/mach-mmp/include/mach/mmp2.h              |   13 +
2063  arch/arm/mach-mmp/include/mach/sram.h              |   35 +
2064  arch/arm/mach-mmp/mmp2.c                           |    3 +
2065  arch/arm/mach-mmp/sram.c                           |  168 ++
2066  arch/arm/mach-omap2/board-generic.c                |    4 -
2067  arch/arm/mach-s3c2410/Kconfig                      |    1 -
2068  arch/arm/mach-s3c2410/include/mach/dma.h           |   20 +-
2069  arch/arm/mach-s3c2410/include/mach/fb.h            |   75 +-
2070  arch/arm/mach-s3c2410/include/mach/gpio-fns.h      |   99 +-
2071  arch/arm/mach-s3c2410/include/mach/gpio-nrs.h      |    2 +-
2072  arch/arm/mach-s3c2410/include/mach/gpio-track.h    |    6 +-
2073  arch/arm/mach-s3c2410/include/mach/irqs.h          |    4 +-
2074  arch/arm/mach-s3c2410/include/mach/map.h           |    1 +
2075  arch/arm/mach-s3c2410/include/mach/pm-core.h       |    2 +-
2076  .../mach-s3c2410/include/mach/regs-s3c2443-clock.h |    2 +
2077  arch/arm/mach-s3c2410/mach-h1940.c                 |    6 +-
2078  arch/arm/mach-s3c2410/mach-qt2410.c                |    1 +
2079  arch/arm/mach-s3c2410/s3c2410.c                    |    4 +-
2080  arch/arm/mach-s3c2412/dma.c                        |    4 +-
2081  arch/arm/mach-s3c2412/gpio.c                       |   62 +
2082  arch/arm/mach-s3c2416/Kconfig                      |    1 -
2083  arch/arm/mach-s3c2416/clock.c                      |   50 +-
2084  arch/arm/mach-s3c2416/s3c2416.c                    |    7 +-
2085  arch/arm/mach-s3c2416/setup-sdhci.c                |   37 -
2086  arch/arm/mach-s3c2440/Kconfig                      |    2 -
2087  arch/arm/mach-s3c2440/mach-rx1950.c                |    1 +
2088  arch/arm/mach-s3c2440/s3c2440.c                    |    4 +-
2089  arch/arm/mach-s3c2440/s3c2442.c                    |    4 +-
2090  arch/arm/mach-s3c2443/Kconfig                      |    1 -
2091  arch/arm/mach-s3c2443/clock.c                      |  160 +--
2092  arch/arm/mach-s3c2443/s3c2443.c                    |    7 +-
2093  arch/arm/mach-s3c64xx/Kconfig                      |    1 +
2094  arch/arm/mach-s3c64xx/Makefile                     |    5 +-
2095  arch/arm/mach-s3c64xx/clock.c                      |   13 +-
2096  arch/arm/mach-s3c64xx/cpu.c                        |    4 +-
2097  arch/arm/mach-s3c64xx/dev-onenand1.c               |   53 -
2098  arch/arm/mach-s3c64xx/dma.c                        |   12 +-
2099  arch/arm/mach-s3c64xx/gpiolib.c                    |  290 ---
2100  arch/arm/mach-s3c64xx/include/mach/clkdev.h        |    7 -
2101  arch/arm/mach-s3c64xx/include/mach/crag6410.h      |   23 +
2102  arch/arm/mach-s3c64xx/include/mach/dma.h           |    8 +-
2103  arch/arm/mach-s3c64xx/include/mach/pll.h           |   45 -
2104  arch/arm/mach-s3c64xx/include/mach/pm-core.h       |    2 +-
2105  arch/arm/mach-s3c64xx/include/mach/pwm-clock.h     |   56 -
2106  arch/arm/mach-s3c64xx/include/mach/regs-sys.h      |    3 +
2107  arch/arm/mach-s3c64xx/mach-anw6410.c               |    2 +-
2108  arch/arm/mach-s3c64xx/mach-crag6410-module.c       |  182 ++
2109  arch/arm/mach-s3c64xx/mach-crag6410.c              |  108 +-
2110  arch/arm/mach-s3c64xx/mach-hmt.c                   |    2 +-
2111  arch/arm/mach-s3c64xx/mach-mini6410.c              |    2 +-
2112  arch/arm/mach-s3c64xx/mach-ncp.c                   |    2 +-
2113  arch/arm/mach-s3c64xx/mach-real6410.c              |    2 +-
2114  arch/arm/mach-s3c64xx/mach-smartq5.c               |    2 +-
2115  arch/arm/mach-s3c64xx/mach-smartq7.c               |    2 +-
2116  arch/arm/mach-s3c64xx/mach-smdk6400.c              |    2 +-
2117  arch/arm/mach-s3c64xx/mach-smdk6410.c              |    2 +-
2118  arch/arm/mach-s3c64xx/pm.c                         |    4 +
2119  arch/arm/mach-s3c64xx/s3c6400.c                    |    2 +-
2120  arch/arm/mach-s3c64xx/s3c6410.c                    |    4 +-
2121  arch/arm/mach-s3c64xx/setup-sdhci.c                |   48 -
2122  arch/arm/mach-s5p64x0/Kconfig                      |   18 +-
2123  arch/arm/mach-s5p64x0/Makefile                     |    4 +-
2124  arch/arm/mach-s5p64x0/clock-s5p6440.c              |   10 +-
2125  arch/arm/mach-s5p64x0/clock-s5p6450.c              |   10 +-
2126  arch/arm/mach-s5p64x0/cpu.c                        |    3 +
2127  arch/arm/mach-s5p64x0/dma.c                        |  269 ++-
2128  arch/arm/mach-s5p64x0/include/mach/clkdev.h        |    7 -
2129  arch/arm/mach-s5p64x0/include/mach/dma.h           |    4 +-
2130  arch/arm/mach-s5p64x0/include/mach/irqs.h          |    4 +
2131  arch/arm/mach-s5p64x0/include/mach/map.h           |    4 +
2132  arch/arm/mach-s5p64x0/include/mach/pm-core.h       |  117 +
2133  arch/arm/mach-s5p64x0/include/mach/pwm-clock.h     |   68 -
2134  arch/arm/mach-s5p64x0/include/mach/regs-clock.h    |   33 +
2135  arch/arm/mach-s5p64x0/include/mach/regs-gpio.h     |   21 +
2136  arch/arm/mach-s5p64x0/irq-eint.c                   |    2 +
2137  arch/arm/mach-s5p64x0/irq-pm.c                     |   92 +
2138  arch/arm/mach-s5p64x0/mach-smdk6440.c              |   74 +
2139  arch/arm/mach-s5p64x0/mach-smdk6450.c              |   75 +
2140  arch/arm/mach-s5p64x0/pm.c                         |  204 ++
2141  arch/arm/mach-s5p64x0/setup-fb-24bpp.c             |   29 +
2142  arch/arm/mach-s5pc100/Kconfig                      |    2 +-
2143  arch/arm/mach-s5pc100/clock.c                      |   15 +-
2144  arch/arm/mach-s5pc100/dma.c                        |  324 ++-
2145  arch/arm/mach-s5pc100/include/mach/clkdev.h        |    7 -
2146  arch/arm/mach-s5pc100/include/mach/dma.h           |    4 +-
2147  arch/arm/mach-s5pc100/include/mach/pwm-clock.h     |   56 -
2148  arch/arm/mach-s5pc100/setup-sdhci.c                |   42 -
2149  arch/arm/mach-s5pv210/Kconfig                      |    6 +-
2150  arch/arm/mach-s5pv210/Makefile                     |    2 +-
2151  arch/arm/mach-s5pv210/clock.c                      |  151 +-
2152  arch/arm/mach-s5pv210/cpu.c                        |    4 +
2153  arch/arm/mach-s5pv210/dma.c                        |  317 ++-
2154  arch/arm/mach-s5pv210/include/mach/clkdev.h        |    7 -
2155  arch/arm/mach-s5pv210/include/mach/dma.h           |    4 +-
2156  arch/arm/mach-s5pv210/include/mach/irqs.h          |    4 +-
2157  arch/arm/mach-s5pv210/include/mach/map.h           |   13 +
2158  arch/arm/mach-s5pv210/include/mach/pm-core.h       |    2 +-
2159  arch/arm/mach-s5pv210/include/mach/pwm-clock.h     |   70 -
2160  arch/arm/mach-s5pv210/include/mach/regs-clock.h    |    3 +-
2161  arch/arm/mach-s5pv210/mach-goni.c                  |   57 +
2162  arch/arm/mach-s5pv210/setup-sdhci.c                |   41 -
2163  arch/arm/mach-s5pv210/sleep.S                      |   52 -
2164  arch/arm/plat-s3c24xx/Kconfig                      |    1 -
2165  arch/arm/plat-s3c24xx/Makefile                     |    4 +-
2166  arch/arm/plat-s3c24xx/dev-uart.c                   |  100 +
2167  arch/arm/plat-s3c24xx/devs.c                       |  528 ----
2168  arch/arm/plat-s3c24xx/dma.c                        |   10 +-
2169  arch/arm/plat-s3c24xx/gpio.c                       |   96 -
2170  arch/arm/plat-s3c24xx/gpiolib.c                    |  229 --
2171  arch/arm/plat-s3c24xx/include/mach/clkdev.h        |    7 -
2172  arch/arm/plat-s3c24xx/include/mach/pwm-clock.h     |   55 -
2173  arch/arm/plat-s3c24xx/include/plat/pll.h           |   62 -
2174  arch/arm/plat-s3c24xx/include/plat/regs-iis.h      |   68 -
2175  arch/arm/plat-s3c24xx/include/plat/regs-spi.h      |   81 -
2176  arch/arm/plat-s3c24xx/s3c2443-clock.c              |  192 ++-
2177  arch/arm/plat-s5p/Kconfig                          |   25 +-
2178  arch/arm/plat-s5p/Makefile                         |   14 +-
2179  arch/arm/plat-s5p/dev-csis0.c                      |   34 -
2180  arch/arm/plat-s5p/dev-csis1.c                      |   34 -
2181  arch/arm/plat-s5p/dev-ehci.c                       |   57 -
2182  arch/arm/plat-s5p/dev-fimc0.c                      |   43 -
2183  arch/arm/plat-s5p/dev-fimc1.c                      |   43 -
2184  arch/arm/plat-s5p/dev-fimc2.c                      |   43 -
2185  arch/arm/plat-s5p/dev-fimc3.c                      |   43 -
2186  arch/arm/plat-s5p/dev-fimd0.c                      |   67 -
2187  arch/arm/plat-s5p/dev-mfc.c                        |   50 -
2188  arch/arm/plat-s5p/dev-onenand.c                    |   45 -
2189  arch/arm/plat-s5p/dev-pmu.c                        |   36 -
2190  arch/arm/plat-s5p/irq-gpioint.c                    |   10 +-
2191  arch/arm/{mach-exynos4 => plat-s5p}/sleep.S        |   13 +-
2192  arch/arm/plat-samsung/Kconfig                      |   36 +-
2193  arch/arm/plat-samsung/Makefile                     |   37 +-
2194  arch/arm/plat-samsung/adc.c                        |   43 +-
2195  arch/arm/plat-samsung/dev-adc.c                    |   46 -
2196  arch/arm/plat-samsung/dev-asocdma.c                |   35 -
2197  arch/arm/plat-samsung/dev-fb.c                     |   63 -
2198  arch/arm/plat-samsung/dev-hsmmc.c                  |   62 -
2199  arch/arm/plat-samsung/dev-hsmmc1.c                 |   62 -
2200  arch/arm/plat-samsung/dev-hsmmc2.c                 |   63 -
2201  arch/arm/plat-samsung/dev-hsmmc3.c                 |   66 -
2202  arch/arm/plat-samsung/dev-hwmon.c                  |   32 -
2203  arch/arm/plat-samsung/dev-i2c0.c                   |   70 -
2204  arch/arm/plat-samsung/dev-i2c1.c                   |   61 -
2205  arch/arm/plat-samsung/dev-i2c2.c                   |   62 -
2206  arch/arm/plat-samsung/dev-i2c3.c                   |   60 -
2207  arch/arm/plat-samsung/dev-i2c4.c                   |   60 -
2208  arch/arm/plat-samsung/dev-i2c5.c                   |   60 -
2209  arch/arm/plat-samsung/dev-i2c6.c                   |   60 -
2210  arch/arm/plat-samsung/dev-i2c7.c                   |   60 -
2211  arch/arm/plat-samsung/dev-ide.c                    |   44 -
2212  arch/arm/plat-samsung/dev-keypad.c                 |   50 -
2213  arch/arm/plat-samsung/dev-nand.c                   |  125 -
2214  arch/arm/plat-samsung/dev-onenand.c                |   43 -
2215  arch/arm/plat-samsung/dev-pwm.c                    |   53 -
2216  arch/arm/plat-samsung/dev-rtc.c                    |   43 -
2217  arch/arm/plat-samsung/dev-ts.c                     |   59 -
2218  arch/arm/plat-samsung/dev-usb-hsotg.c              |   48 -
2219  arch/arm/plat-samsung/dev-usb.c                    |   65 -
2220  arch/arm/plat-samsung/dev-wdt.c                    |   40 -
2221  arch/arm/plat-samsung/devs.c                       | 1463 +++++++++++
2222  arch/arm/plat-samsung/dma-ops.c                    |  131 +
2223  arch/arm/plat-samsung/gpio-config.c                |  431 ----
2224  arch/arm/plat-samsung/gpio.c                       |  167 --
2225  arch/arm/plat-samsung/include/plat/adc-core.h      |    2 +-
2226  .../include/plat/audio-simtec.h                    |    2 +-
2227  .../include/plat/camport.h                         |    6 +-
2228  .../include/plat/common-smdk.h                     |    2 +-
2229  .../include/plat/cpu-freq-core.h                   |    5 +-
2230  arch/arm/plat-samsung/include/plat/cpu.h           |    6 +-
2231  arch/arm/plat-samsung/include/plat/devs.h          |  151 +-
2232  arch/arm/plat-samsung/include/plat/dma-ops.h       |   63 +
2233  .../include/plat/{s3c-dma-pl330.h => dma-pl330.h}  |   24 +-
2234  arch/arm/plat-samsung/include/plat/dma-s3c24xx.h   |    2 +-
2235  arch/arm/plat-samsung/include/plat/dma.h           |   10 +-
2236  .../{plat-s5p => plat-samsung}/include/plat/ehci.h |    6 +-
2237  .../include/plat/exynos4.h                         |    2 +-
2238  arch/arm/plat-samsung/include/plat/fb-s3c2410.h    |   72 +
2239  arch/arm/plat-samsung/include/plat/fb.h            |    7 +
2240  .../include/plat/fiq.h                             |    2 +-
2241  .../plat-samsung/include/plat/gpio-cfg-helpers.h   |  172 +-
2242  arch/arm/plat-samsung/include/plat/gpio-cfg.h      |   34 +-
2243  arch/arm/plat-samsung/include/plat/gpio-core.h     |   97 +-
2244  arch/arm/plat-samsung/include/plat/gpio-fns.h      |   98 +
2245  arch/arm/plat-samsung/include/plat/iic.h           |    1 +
2246  .../include/plat/irq.h                             |   25 +-
2247  .../{plat-s5p => plat-samsung}/include/plat/irqs.h |    8 +-
2248  .../include/plat/mci.h                             |   10 +-
2249  .../{plat-s5p => plat-samsung}/include/plat/mfc.h  |    6 +-
2250  .../include/plat/mipi_csis.h                       |    6 +-
2251  .../{plat-s5p => plat-samsung}/include/plat/pll.h  |  134 +-
2252  arch/arm/plat-samsung/include/plat/pll6553x.h      |   51 -
2253  arch/arm/plat-samsung/include/plat/pm.h            |   10 +-
2254  .../mach => plat-samsung/include/plat}/pwm-clock.h |   39 +-
2255  arch/arm/plat-samsung/include/plat/regs-adc.h      |    3 +
2256  .../include/plat/regs-dma.h                        |  112 +-
2257  arch/arm/plat-samsung/include/plat/regs-iis.h      |   70 +
2258  arch/arm/plat-samsung/include/plat/regs-spi.h      |   48 +
2259  .../include/plat/regs-srom.h                       |    8 +-
2260  .../include/plat/regs-udc.h                        |  132 +-
2261  .../include/plat/reset.h                           |    8 +-
2262  .../plat-samsung/include/plat/s3c-pl330-pdata.h    |   32 -
2263  .../include/plat/s3c2410.h                         |    2 +-
2264  .../include/plat/s3c2412.h                         |    2 +-
2265  .../include/plat/s3c2416.h                         |    2 +-
2266  .../include/plat/s3c2443.h                         |    9 +-
2267  .../include/plat/s3c244x.h                         |    2 +-
2268  .../mach => plat-samsung/include/plat}/s3c6400.h   |    2 +-
2269  .../mach => plat-samsung/include/plat}/s3c6410.h   |    2 +-
2270  .../include/plat/s5p-clock.h                       |    2 +-
2271  .../include/plat/s5p-time.h                        |    2 +-
2272  .../include/plat/s5p6440.h                         |    2 +-
2273  .../include/plat/s5p6450.h                         |    2 +-
2274  .../include/plat/s5pc100.h                         |    2 +-
2275  .../include/plat/s5pv210.h                         |    2 +-
2276  arch/arm/plat-samsung/include/plat/sdhci.h         |   57 -
2277  .../include/plat/sysmmu.h                          |    6 +-
2278  .../include/plat/system-reset.h                    |    2 +-
2279  arch/arm/plat-samsung/include/plat/tv-core.h       |   44 +
2280  .../include/plat/udc.h                             |    4 +-
2281  .../include/plat/usb-phy.h                         |    6 +-
2282  arch/arm/plat-samsung/platformdata.c               |    2 -
2283  arch/arm/plat-samsung/pm-gpio.c                    |   72 +-
2284  arch/arm/plat-samsung/pm.c                         |    6 +-
2285  arch/arm/plat-samsung/pwm-clock.c                  |   13 +-
2286  arch/arm/plat-samsung/s3c-dma-ops.c                |  130 +
2287  arch/arm/plat-samsung/s3c-pl330.c                  | 1244 ---------
2288  drivers/dma/Kconfig                                |    3 +-
2289  drivers/dma/amba-pl08x.c                           |  455 ++--
2290  drivers/dma/at_hdmac.c                             |  159 +-
2291  drivers/dma/at_hdmac_regs.h                        |   24 +
2292  drivers/dma/dmatest.c                              |   23 +-
2293  drivers/dma/imx-sdma.c                             |   47 +-
2294  drivers/dma/mxs-dma.c                              |   45 +-
2295  drivers/dma/pl330.c                                |  229 ++-
2296  drivers/gpio/Kconfig                               |   16 -
2297  drivers/gpio/Makefile                              |    6 +-
2298  drivers/gpio/gpio-exynos4.c                        |  385 ---
2299  drivers/gpio/gpio-plat-samsung.c                   |  205 --
2300  drivers/gpio/gpio-s5pc100.c                        |  354 ---
2301  drivers/gpio/gpio-s5pv210.c                        |  287 ---
2302  drivers/gpio/gpio-samsung.c                        | 2712 ++++++++++++++++++++
2303  drivers/mmc/host/s3cmci.c                          |    6 +-
2304  drivers/spi/spi-s3c64xx.c                          |  175 +-
2305  include/linux/amba/pl08x.h                         |   14 +-
2306  include/linux/amba/pl330.h                         |    6 +-
2307  include/linux/dmaengine.h                          |   13 +-
2308  sound/soc/samsung/ac97.c                           |   10 +-
2309  sound/soc/samsung/dma.c                            |  148 +-
2310  sound/soc/samsung/dma.h                            |    4 +-
2311  272 files changed, 10721 insertions(+), 9650 deletions(-)
2312  delete mode 100644 arch/arm/mach-exynos4/include/mach/clkdev.h
2313  create mode 100644 arch/arm/mach-mmp/include/mach/sram.h
2314  create mode 100644 arch/arm/mach-mmp/sram.c
2315  create mode 100644 arch/arm/mach-s3c2412/gpio.c
2316  delete mode 100644 arch/arm/mach-s3c64xx/dev-onenand1.c
2317  delete mode 100644 arch/arm/mach-s3c64xx/gpiolib.c
2318  delete mode 100644 arch/arm/mach-s3c64xx/include/mach/clkdev.h
2319  create mode 100644 arch/arm/mach-s3c64xx/include/mach/crag6410.h
2320  delete mode 100644 arch/arm/mach-s3c64xx/include/mach/pll.h
2321  delete mode 100644 arch/arm/mach-s3c64xx/include/mach/pwm-clock.h
2322  create mode 100644 arch/arm/mach-s3c64xx/mach-crag6410-module.c
2323  delete mode 100644 arch/arm/mach-s5p64x0/include/mach/clkdev.h
2324  create mode 100644 arch/arm/mach-s5p64x0/include/mach/pm-core.h
2325  delete mode 100644 arch/arm/mach-s5p64x0/include/mach/pwm-clock.h
2326  create mode 100644 arch/arm/mach-s5p64x0/irq-pm.c
2327  create mode 100644 arch/arm/mach-s5p64x0/pm.c
2328  create mode 100644 arch/arm/mach-s5p64x0/setup-fb-24bpp.c
2329  delete mode 100644 arch/arm/mach-s5pc100/include/mach/clkdev.h
2330  delete mode 100644 arch/arm/mach-s5pc100/include/mach/pwm-clock.h
2331  delete mode 100644 arch/arm/mach-s5pv210/include/mach/clkdev.h
2332  delete mode 100644 arch/arm/mach-s5pv210/include/mach/pwm-clock.h
2333  delete mode 100644 arch/arm/mach-s5pv210/sleep.S
2334  create mode 100644 arch/arm/plat-s3c24xx/dev-uart.c
2335  delete mode 100644 arch/arm/plat-s3c24xx/devs.c
2336  delete mode 100644 arch/arm/plat-s3c24xx/gpio.c
2337  delete mode 100644 arch/arm/plat-s3c24xx/gpiolib.c
2338  delete mode 100644 arch/arm/plat-s3c24xx/include/mach/clkdev.h
2339  delete mode 100644 arch/arm/plat-s3c24xx/include/mach/pwm-clock.h
2340  delete mode 100644 arch/arm/plat-s3c24xx/include/plat/pll.h
2341  delete mode 100644 arch/arm/plat-s3c24xx/include/plat/regs-iis.h
2342  delete mode 100644 arch/arm/plat-s3c24xx/include/plat/regs-spi.h
2343  delete mode 100644 arch/arm/plat-s5p/dev-csis0.c
2344  delete mode 100644 arch/arm/plat-s5p/dev-csis1.c
2345  delete mode 100644 arch/arm/plat-s5p/dev-ehci.c
2346  delete mode 100644 arch/arm/plat-s5p/dev-fimc0.c
2347  delete mode 100644 arch/arm/plat-s5p/dev-fimc1.c
2348  delete mode 100644 arch/arm/plat-s5p/dev-fimc2.c
2349  delete mode 100644 arch/arm/plat-s5p/dev-fimc3.c
2350  delete mode 100644 arch/arm/plat-s5p/dev-fimd0.c
2351  delete mode 100644 arch/arm/plat-s5p/dev-onenand.c
2352  delete mode 100644 arch/arm/plat-s5p/dev-pmu.c
2353  rename arch/arm/{mach-exynos4 => plat-s5p}/sleep.S (81%)
2354  delete mode 100644 arch/arm/plat-samsung/dev-adc.c
2355  delete mode 100644 arch/arm/plat-samsung/dev-asocdma.c
2356  delete mode 100644 arch/arm/plat-samsung/dev-fb.c
2357  delete mode 100644 arch/arm/plat-samsung/dev-hsmmc.c
2358  delete mode 100644 arch/arm/plat-samsung/dev-hsmmc1.c
2359  delete mode 100644 arch/arm/plat-samsung/dev-hsmmc2.c
2360  delete mode 100644 arch/arm/plat-samsung/dev-hsmmc3.c
2361  delete mode 100644 arch/arm/plat-samsung/dev-hwmon.c
2362  delete mode 100644 arch/arm/plat-samsung/dev-i2c0.c
2363  delete mode 100644 arch/arm/plat-samsung/dev-i2c1.c
2364  delete mode 100644 arch/arm/plat-samsung/dev-i2c2.c
2365  delete mode 100644 arch/arm/plat-samsung/dev-i2c3.c
2366  delete mode 100644 arch/arm/plat-samsung/dev-i2c4.c
2367  delete mode 100644 arch/arm/plat-samsung/dev-i2c5.c
2368  delete mode 100644 arch/arm/plat-samsung/dev-i2c6.c
2369  delete mode 100644 arch/arm/plat-samsung/dev-i2c7.c
2370  delete mode 100644 arch/arm/plat-samsung/dev-ide.c
2371  delete mode 100644 arch/arm/plat-samsung/dev-keypad.c
2372  delete mode 100644 arch/arm/plat-samsung/dev-nand.c
2373  delete mode 100644 arch/arm/plat-samsung/dev-onenand.c
2374  delete mode 100644 arch/arm/plat-samsung/dev-pwm.c
2375  delete mode 100644 arch/arm/plat-samsung/dev-rtc.c
2376  delete mode 100644 arch/arm/plat-samsung/dev-ts.c
2377  delete mode 100644 arch/arm/plat-samsung/dev-usb-hsotg.c
2378  delete mode 100644 arch/arm/plat-samsung/dev-usb.c
2379  delete mode 100644 arch/arm/plat-samsung/dev-wdt.c
2380  create mode 100644 arch/arm/plat-samsung/devs.c
2381  create mode 100644 arch/arm/plat-samsung/dma-ops.c
2382  delete mode 100644 arch/arm/plat-samsung/gpio-config.c
2383  delete mode 100644 arch/arm/plat-samsung/gpio.c
2384  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/audio-simtec.h (95%)
2385  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/camport.h (86%)
2386  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/common-smdk.h (87%)
2387  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/cpu-freq-core.h (98%)
2388  create mode 100644 arch/arm/plat-samsung/include/plat/dma-ops.h
2389  rename arch/arm/plat-samsung/include/plat/{s3c-dma-pl330.h => dma-pl330.h} (84%)
2390  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/ehci.h (84%)
2391  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/exynos4.h (94%)
2392  create mode 100644 arch/arm/plat-samsung/include/plat/fb-s3c2410.h
2393  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/fiq.h (88%)
2394  create mode 100644 arch/arm/plat-samsung/include/plat/gpio-fns.h
2395  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/irq.h (81%)
2396  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/irqs.h (93%)
2397  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/mci.h (90%)
2398  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/mfc.h (90%)
2399  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/mipi_csis.h (90%)
2400  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/pll.h (57%)
2401  delete mode 100644 arch/arm/plat-samsung/include/plat/pll6553x.h
2402  rename arch/arm/{mach-exynos4/include/mach => plat-samsung/include/plat}/pwm-clock.h (68%)
2403  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/regs-dma.h (58%)
2404  create mode 100644 arch/arm/plat-samsung/include/plat/regs-iis.h
2405  create mode 100644 arch/arm/plat-samsung/include/plat/regs-spi.h
2406  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/regs-srom.h (89%)
2407  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/regs-udc.h (51%)
2408  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/reset.h (66%)
2409  delete mode 100644 arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h
2410  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2410.h (93%)
2411  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2412.h (92%)
2412  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2416.h (92%)
2413  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2443.h (87%)
2414  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c244x.h (94%)
2415  rename arch/arm/{mach-s3c64xx/include/mach => plat-samsung/include/plat}/s3c6400.h (94%)
2416  rename arch/arm/{mach-s3c64xx/include/mach => plat-samsung/include/plat}/s3c6410.h (93%)
2417  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p-clock.h (96%)
2418  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p-time.h (94%)
2419  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p6440.h (94%)
2420  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p6450.h (94%)
2421  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5pc100.h (94%)
2422  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5pv210.h (94%)
2423  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/sysmmu.h (96%)
2424  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/system-reset.h (92%)
2425  create mode 100644 arch/arm/plat-samsung/include/plat/tv-core.h
2426  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/udc.h (95%)
2427  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/usb-phy.h (83%)
2428  create mode 100644 arch/arm/plat-samsung/s3c-dma-ops.c
2429  delete mode 100644 arch/arm/plat-samsung/s3c-pl330.c
2430  delete mode 100644 drivers/gpio/gpio-exynos4.c
2431  delete mode 100644 drivers/gpio/gpio-plat-samsung.c
2432  delete mode 100644 drivers/gpio/gpio-s5pc100.c
2433  delete mode 100644 drivers/gpio/gpio-s5pv210.c
2434  create mode 100644 drivers/gpio/gpio-samsung.c
2435 $ git am -3 ../patches/0001-arm-soc-merge-fixup-for-fixup-reserve-being-added-to.patch
2436 Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
2437 $ git reset HEAD^
2438 Unstaged changes after reset:
2439 M       arch/arm/mach-msm/board-msm8x60.c
2440 $ git add .
2441 $ git commit -v -a --amend
2442 [master 38f4446] Merge remote-tracking branch 'arm-soc/for-next'
2443 Merging at91/at91-next (bcdbf16 hw_random: add driver for atmel true hardware random number generator)
2444 $ git merge at91/at91-next
2445 Resolved 'arch/arm/mach-at91/at91sam9260.c' using previous resolution.
2446 Resolved 'arch/arm/mach-at91/at91sam9g45.c' using previous resolution.
2447 Resolved 'drivers/ata/pata_at91.c' using previous resolution.
2448 Auto-merging drivers/usb/host/ohci-at91.c
2449 Auto-merging drivers/usb/gadget/at91_udc.c
2450 Auto-merging drivers/mmc/host/at91_mci.c
2451 Auto-merging drivers/ide/at91_ide.c
2452 Auto-merging drivers/ata/pata_at91.c
2453 CONFLICT (content): Merge conflict in drivers/ata/pata_at91.c
2454 Auto-merging arch/arm/mach-at91/include/mach/gpio.h
2455 Auto-merging arch/arm/mach-at91/include/mach/at91sam9g45.h
2456 Auto-merging arch/arm/mach-at91/gpio.c
2457 Auto-merging arch/arm/mach-at91/board-yl-9200.c
2458 Auto-merging arch/arm/mach-at91/board-usb-a926x.c
2459 Auto-merging arch/arm/mach-at91/board-sam9rlek.c
2460 Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
2461 Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
2462 Auto-merging arch/arm/mach-at91/board-sam9263ek.c
2463 Auto-merging arch/arm/mach-at91/board-sam9261ek.c
2464 Auto-merging arch/arm/mach-at91/board-sam9260ek.c
2465 Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
2466 Auto-merging arch/arm/mach-at91/board-rm9200ek.c
2467 Auto-merging arch/arm/mach-at91/board-rm9200dk.c
2468 Auto-merging arch/arm/mach-at91/board-qil-a9260.c
2469 Auto-merging arch/arm/mach-at91/board-picotux200.c
2470 Auto-merging arch/arm/mach-at91/board-neocore926.c
2471 Auto-merging arch/arm/mach-at91/board-kb9202.c
2472 Auto-merging arch/arm/mach-at91/board-kafa.c
2473 Auto-merging arch/arm/mach-at91/board-ecbat91.c
2474 Auto-merging arch/arm/mach-at91/board-eb9200.c
2475 Auto-merging arch/arm/mach-at91/board-csb637.c
2476 Auto-merging arch/arm/mach-at91/board-csb337.c
2477 Auto-merging arch/arm/mach-at91/board-cpuat91.c
2478 Auto-merging arch/arm/mach-at91/board-cpu9krea.c
2479 Auto-merging arch/arm/mach-at91/board-carmeva.c
2480 Auto-merging arch/arm/mach-at91/board-cap9adk.c
2481 Auto-merging arch/arm/mach-at91/board-cam60.c
2482 Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
2483 Auto-merging arch/arm/mach-at91/board-1arm.c
2484 Auto-merging arch/arm/mach-at91/at91sam9rl_devices.c
2485 Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
2486 Auto-merging arch/arm/mach-at91/at91sam9g45.c
2487 CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
2488 Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
2489 Auto-merging arch/arm/mach-at91/at91sam9263.c
2490 Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
2491 Auto-merging arch/arm/mach-at91/at91sam9261.c
2492 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
2493 Auto-merging arch/arm/mach-at91/at91sam9260.c
2494 CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c
2495 Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
2496 Auto-merging arch/arm/mach-at91/at91rm9200.c
2497 Auto-merging arch/arm/mach-at91/at91cap9_devices.c
2498 Auto-merging arch/arm/mach-at91/at91cap9.c
2499 Auto-merging arch/arm/configs/at91sam9rl_defconfig
2500 Auto-merging arch/arm/configs/at91sam9g20_defconfig
2501 Auto-merging arch/arm/configs/at91sam9260_defconfig
2502 Auto-merging arch/arm/configs/at91cap9_defconfig
2503 Automatic merge failed; fix conflicts and then commit the result.
2504 $ git commit -v -a
2505 [master 52aefa0] Merge remote-tracking branch 'at91/at91-next'
2506 $ git diff -M --stat --summary HEAD^..
2507  .../{at91cap9adk_defconfig => at91cap9_defconfig}  |    5 -
2508  ...91sam9260ek_defconfig => at91sam9260_defconfig} |   14 +-
2509  ...91sam9g20ek_defconfig => at91sam9g20_defconfig} |   19 +-
2510  ...at91sam9rlek_defconfig => at91sam9rl_defconfig} |    5 -
2511  arch/arm/mach-at91/at91cap9.c                      |    8 +-
2512  arch/arm/mach-at91/at91cap9_devices.c              |   20 +-
2513  arch/arm/mach-at91/at91rm9200.c                    |    8 +-
2514  arch/arm/mach-at91/at91rm9200_devices.c            |   22 +-
2515  arch/arm/mach-at91/at91sam9260.c                   |    6 +-
2516  arch/arm/mach-at91/at91sam9260_devices.c           |   26 +-
2517  arch/arm/mach-at91/at91sam9261.c                   |    6 +-
2518  arch/arm/mach-at91/at91sam9261_devices.c           |   14 +-
2519  arch/arm/mach-at91/at91sam9263.c                   |   10 +-
2520  arch/arm/mach-at91/at91sam9263_devices.c           |   26 +-
2521  arch/arm/mach-at91/at91sam9g45.c                   |   10 +-
2522  arch/arm/mach-at91/at91sam9g45_devices.c           |   20 +-
2523  arch/arm/mach-at91/at91sam9rl.c                    |    8 +-
2524  arch/arm/mach-at91/at91sam9rl_devices.c            |   16 +-
2525  arch/arm/mach-at91/board-1arm.c                    |    1 +
2526  arch/arm/mach-at91/board-afeb-9260v1.c             |    7 +-
2527  arch/arm/mach-at91/board-cam60.c                   |    3 +-
2528  arch/arm/mach-at91/board-cap9adk.c                 |   14 +-
2529  arch/arm/mach-at91/board-carmeva.c                 |    6 +-
2530  arch/arm/mach-at91/board-cpu9krea.c                |    7 +-
2531  arch/arm/mach-at91/board-cpuat91.c                 |    4 +
2532  arch/arm/mach-at91/board-csb337.c                  |    4 +-
2533  arch/arm/mach-at91/board-csb637.c                  |    1 +
2534  arch/arm/mach-at91/board-eb9200.c                  |    8 +-
2535  arch/arm/mach-at91/board-ecbat91.c                 |    4 +
2536  arch/arm/mach-at91/board-eco920.c                  |    4 +
2537  arch/arm/mach-at91/board-flexibity.c               |    4 +-
2538  arch/arm/mach-at91/board-foxg20.c                  |    6 +-
2539  arch/arm/mach-at91/board-gsia18s.c                 |    4 +-
2540  arch/arm/mach-at91/board-kafa.c                    |    1 +
2541  arch/arm/mach-at91/board-kb9202.c                  |    5 +-
2542  arch/arm/mach-at91/board-neocore926.c              |    4 +-
2543  arch/arm/mach-at91/board-pcontrol-g20.c            |    1 +
2544  arch/arm/mach-at91/board-picotux200.c              |    2 +
2545  arch/arm/mach-at91/board-qil-a9260.c               |   11 +-
2546  arch/arm/mach-at91/board-rm9200dk.c                |   10 +-
2547  arch/arm/mach-at91/board-rm9200ek.c                |    2 +
2548  arch/arm/mach-at91/board-sam9-l9260.c              |    7 +-
2549  arch/arm/mach-at91/board-sam9260ek.c               |   11 +-
2550  arch/arm/mach-at91/board-sam9261ek.c               |    8 +-
2551  arch/arm/mach-at91/board-sam9263ek.c               |    7 +-
2552  arch/arm/mach-at91/board-sam9g20ek.c               |    8 +-
2553  arch/arm/mach-at91/board-sam9m10g45ek.c            |    3 +
2554  arch/arm/mach-at91/board-sam9rlek.c                |    7 +-
2555  arch/arm/mach-at91/board-snapper9260.c             |    5 +
2556  arch/arm/mach-at91/board-stamp9g20.c               |   11 +-
2557  arch/arm/mach-at91/board-usb-a926x.c               |    5 +-
2558  arch/arm/mach-at91/board-yl-9200.c                 |    6 +-
2559  arch/arm/mach-at91/generic.h                       |    2 +-
2560  arch/arm/mach-at91/gpio.c                          |   62 ++--
2561  arch/arm/mach-at91/include/mach/at91cap9.h         |    9 +-
2562  arch/arm/mach-at91/include/mach/at91rm9200.h       |    9 +-
2563  arch/arm/mach-at91/include/mach/at91sam9260.h      |    7 +-
2564  arch/arm/mach-at91/include/mach/at91sam9261.h      |    7 +-
2565  arch/arm/mach-at91/include/mach/at91sam9263.h      |   11 +-
2566  arch/arm/mach-at91/include/mach/at91sam9g45.h      |   11 +-
2567  arch/arm/mach-at91/include/mach/at91sam9rl.h       |    9 +-
2568  arch/arm/mach-at91/include/mach/gpio.h             |  336 ++++++++++----------
2569  drivers/ata/pata_at91.c                            |    6 +-
2570  drivers/ide/at91_ide.c                             |    2 +-
2571  drivers/mmc/host/at91_mci.c                        |   30 +-
2572  drivers/mtd/nand/atmel_nand.c                      |    8 +-
2573  drivers/usb/gadget/at91_udc.c                      |   14 +-
2574  drivers/usb/host/ohci-at91.c                       |    4 +-
2575  68 files changed, 530 insertions(+), 431 deletions(-)
2576  rename arch/arm/configs/{at91cap9adk_defconfig => at91cap9_defconfig} (95%)
2577  rename arch/arm/configs/{at91sam9260ek_defconfig => at91sam9260_defconfig} (89%)
2578  rename arch/arm/configs/{at91sam9g20ek_defconfig => at91sam9g20_defconfig} (93%)
2579  rename arch/arm/configs/{at91sam9rlek_defconfig => at91sam9rl_defconfig} (94%)
2580 Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
2581 $ git merge davinci/davinci-next
2582 Already up-to-date.
2583 Merging i.MX/for-next (5788f4d Merge branches 'imx-fixes', 'imx-cleanup' and 'imx-features' into master)
2584 $ git merge i.MX/for-next
2585 Resolved 'arch/arm/mach-mx5/clock-mx51-mx53.c' using previous resolution.
2586 Resolved 'arch/arm/mach-mx5/devices-imx53.h' using previous resolution.
2587 Resolved 'arch/arm/mach-mx5/mm.c' using previous resolution.
2588 Resolved 'arch/arm/plat-mxc/include/mach/hardware.h' using previous resolution.
2589 Auto-merging arch/arm/plat-mxc/include/mach/hardware.h
2590 CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h
2591 Auto-merging arch/arm/mach-mxs/clock-mx28.c
2592 Auto-merging arch/arm/mach-mx5/mm.c
2593 CONFLICT (content): Merge conflict in arch/arm/mach-mx5/mm.c
2594 Auto-merging arch/arm/mach-mx5/devices-imx53.h
2595 CONFLICT (content): Merge conflict in arch/arm/mach-mx5/devices-imx53.h
2596 Auto-merging arch/arm/mach-mx5/clock-mx51-mx53.c
2597 CONFLICT (content): Merge conflict in arch/arm/mach-mx5/clock-mx51-mx53.c
2598 Automatic merge failed; fix conflicts and then commit the result.
2599 $ git commit -v -a
2600 [master 4f69aab] Merge remote-tracking branch 'i.MX/for-next'
2601 $ git diff -M --stat --summary HEAD^..
2602  arch/arm/mach-mxs/clock-mx28.c |    6 +++++-
2603  1 files changed, 5 insertions(+), 1 deletions(-)
2604 Merging linux-spec/for-next (5111711 Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux)
2605 $ git merge linux-spec/for-next
2606 Already up-to-date.
2607 Merging omap/for-next (322a8b0 Linux 3.1-rc1)
2608 $ git merge omap/for-next
2609 Already up-to-date.
2610 Merging pxa/for-next (19d6c13 [ARM] pxa/hx4700: actually use platform_lcd driver)
2611 $ git merge pxa/for-next
2612 Already up-to-date.
2613 Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
2614 $ git merge samsung/next-samsung
2615 Already up-to-date.
2616 Merging s5p/for-next (ad97e8e ARM: SAMSUNG: Add lookup of sdhci-s3c clocks using generic names)
2617 $ git merge s5p/for-next
2618 Recorded preimage for 'arch/arm/mach-exynos4/Kconfig'
2619 Recorded preimage for 'drivers/gpio/Makefile'
2620 Removing drivers/tty/serial/s5pv210.c
2621 Removing drivers/tty/serial/s3c6400.c
2622 Removing drivers/tty/serial/s3c2440.c
2623 Removing drivers/tty/serial/s3c2412.c
2624 Removing drivers/tty/serial/s3c2410.c
2625 Auto-merging drivers/gpio/Makefile
2626 CONFLICT (content): Merge conflict in drivers/gpio/Makefile
2627 Removing arch/arm/mach-s5pv210/setup-sdhci.c
2628 Removing arch/arm/mach-s5pc100/setup-sdhci.c
2629 Removing arch/arm/mach-s3c64xx/setup-sdhci.c
2630 Removing arch/arm/mach-s3c2416/setup-sdhci.c
2631 Removing arch/arm/mach-exynos4/setup-sdhci.c
2632 Auto-merging arch/arm/mach-exynos4/Kconfig
2633 CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/Kconfig
2634 Automatic merge failed; fix conflicts and then commit the result.
2635 $ git commit -v -a
2636 Recorded resolution for 'arch/arm/mach-exynos4/Kconfig'.
2637 Recorded resolution for 'drivers/gpio/Makefile'.
2638 [master c02ffce] Merge remote-tracking branch 's5p/for-next'
2639 $ git diff -M --stat --summary HEAD^..
2640  .../devicetree/bindings/arm/insignal-boards.txt    |    8 +
2641  .../devicetree/bindings/arm/samsung-boards.txt     |    8 +
2642  .../devicetree/bindings/dma/arm-pl330.txt          |   30 +
2643  .../devicetree/bindings/gpio/gpio-samsung.txt      |   40 ++
2644  .../devicetree/bindings/input/samsung-keypad.txt   |   88 +++
2645  Documentation/devicetree/bindings/rtc/s3c-rtc.txt  |   20 +
2646  .../devicetree/bindings/serial/samsung_uart.txt    |   14 +
2647  arch/arm/boot/dts/exynos4210-origen.dts            |  137 +++++
2648  arch/arm/boot/dts/exynos4210-smdkv310.dts          |  182 ++++++
2649  arch/arm/boot/dts/exynos4210.dtsi                  |  397 ++++++++++++
2650  arch/arm/mach-exynos4/Kconfig                      |   24 +
2651  arch/arm/mach-exynos4/Makefile                     |    6 +-
2652  arch/arm/mach-exynos4/clock.c                      |  229 +++++---
2653  arch/arm/mach-exynos4/cpu.c                        |   33 +-
2654  arch/arm/mach-exynos4/dma.c                        |  229 ++-----
2655  arch/arm/mach-exynos4/include/mach/entry-macro.S   |    1 -
2656  arch/arm/mach-exynos4/include/mach/io.h            |    5 +
2657  arch/arm/mach-exynos4/include/mach/irqs.h          |    8 +-
2658  arch/arm/mach-exynos4/init.c                       |   21 +-
2659  arch/arm/mach-exynos4/mach-exynos4-dt.c            |   85 +++
2660  arch/arm/mach-exynos4/setup-sdhci.c                |   22 -
2661  arch/arm/mach-s3c2410/mach-bast.c                  |   22 -
2662  arch/arm/mach-s3c2410/mach-vr1000.c                |   24 -
2663  arch/arm/mach-s3c2410/s3c2410.c                    |    6 +
2664  arch/arm/mach-s3c2412/clock.c                      |    7 +
2665  arch/arm/mach-s3c2416/Makefile                     |    1 -
2666  arch/arm/mach-s3c2416/clock.c                      |   68 ++-
2667  arch/arm/mach-s3c2416/setup-sdhci.c                |   24 -
2668  arch/arm/mach-s3c2440/clock.c                      |   44 ++
2669  arch/arm/mach-s3c2440/mach-anubis.c                |   22 +-
2670  arch/arm/mach-s3c2440/mach-at2440evb.c             |   22 +-
2671  arch/arm/mach-s3c2440/mach-osiris.c                |   24 +-
2672  arch/arm/mach-s3c2440/mach-rx1950.c                |   18 +-
2673  arch/arm/mach-s3c2440/mach-rx3715.c                |   19 +-
2674  arch/arm/mach-s3c64xx/Makefile                     |    1 -
2675  arch/arm/mach-s3c64xx/clock.c                      |  163 ++++--
2676  arch/arm/mach-s3c64xx/setup-sdhci.c                |   24 -
2677  arch/arm/mach-s5p64x0/clock-s5p6440.c              |   32 +-
2678  arch/arm/mach-s5p64x0/clock-s5p6450.c              |   32 +-
2679  arch/arm/mach-s5p64x0/dma.c                        |  227 ++-----
2680  arch/arm/mach-s5p64x0/include/mach/irqs.h          |    2 +
2681  arch/arm/mach-s5p64x0/init.c                       |   31 -
2682  arch/arm/mach-s5pc100/Makefile                     |    1 -
2683  arch/arm/mach-s5pc100/clock.c                      |  163 ++++--
2684  arch/arm/mach-s5pc100/dma.c                        |  247 +++------
2685  arch/arm/mach-s5pc100/include/mach/irqs.h          |    2 +
2686  arch/arm/mach-s5pc100/setup-sdhci.c                |   23 -
2687  arch/arm/mach-s5pv210/Makefile                     |    1 -
2688  arch/arm/mach-s5pv210/clock.c                      |  274 ++++++----
2689  arch/arm/mach-s5pv210/dma.c                        |  241 +++------
2690  arch/arm/mach-s5pv210/include/mach/irqs.h          |    2 +
2691  arch/arm/mach-s5pv210/init.c                       |   19 -
2692  arch/arm/mach-s5pv210/setup-sdhci.c                |   22 -
2693  arch/arm/plat-s3c24xx/s3c2443-clock.c              |   39 +-
2694  arch/arm/plat-samsung/dev-backlight.c              |    1 +
2695  arch/arm/plat-samsung/dma-ops.c                    |   15 +-
2696  arch/arm/plat-samsung/include/plat/dma-ops.h       |    1 +
2697  arch/arm/plat-samsung/include/plat/dma-pl330.h     |    3 +-
2698  arch/arm/plat-samsung/include/plat/irqs.h          |    3 +-
2699  arch/arm/plat-samsung/include/plat/regs-serial.h   |   45 +-
2700  arch/arm/plat-samsung/include/plat/sdhci.h         |   31 -
2701  drivers/dma/pl330.c                                |   99 ++--
2702  drivers/gpio/gpio-samsung.c                        |   72 +++
2703  drivers/input/keyboard/Kconfig                     |    9 +-
2704  drivers/input/keyboard/samsung-keypad.c            |  174 +++++-
2705  drivers/rtc/rtc-s3c.c                              |   21 +-
2706  drivers/tty/serial/Kconfig                         |   45 +--
2707  drivers/tty/serial/Makefile                        |    5 -
2708  drivers/tty/serial/s3c2410.c                       |  115 ----
2709  drivers/tty/serial/s3c2412.c                       |  149 -----
2710  drivers/tty/serial/s3c2440.c                       |  178 ------
2711  drivers/tty/serial/s3c6400.c                       |  149 -----
2712  drivers/tty/serial/s5pv210.c                       |  158 -----
2713  drivers/tty/serial/samsung.c                       |  639 ++++++++++++--------
2714  drivers/tty/serial/samsung.h                       |   32 +-
2715  include/linux/amba/pl330.h                         |   15 +-
2716  76 files changed, 2812 insertions(+), 2581 deletions(-)
2717  create mode 100644 Documentation/devicetree/bindings/arm/insignal-boards.txt
2718  create mode 100644 Documentation/devicetree/bindings/arm/samsung-boards.txt
2719  create mode 100644 Documentation/devicetree/bindings/dma/arm-pl330.txt
2720  create mode 100644 Documentation/devicetree/bindings/gpio/gpio-samsung.txt
2721  create mode 100644 Documentation/devicetree/bindings/input/samsung-keypad.txt
2722  create mode 100644 Documentation/devicetree/bindings/rtc/s3c-rtc.txt
2723  create mode 100644 Documentation/devicetree/bindings/serial/samsung_uart.txt
2724  create mode 100644 arch/arm/boot/dts/exynos4210-origen.dts
2725  create mode 100644 arch/arm/boot/dts/exynos4210-smdkv310.dts
2726  create mode 100644 arch/arm/boot/dts/exynos4210.dtsi
2727  create mode 100644 arch/arm/mach-exynos4/mach-exynos4-dt.c
2728  delete mode 100644 arch/arm/mach-exynos4/setup-sdhci.c
2729  delete mode 100644 arch/arm/mach-s3c2416/setup-sdhci.c
2730  delete mode 100644 arch/arm/mach-s3c64xx/setup-sdhci.c
2731  delete mode 100644 arch/arm/mach-s5pc100/setup-sdhci.c
2732  delete mode 100644 arch/arm/mach-s5pv210/setup-sdhci.c
2733  delete mode 100644 drivers/tty/serial/s3c2410.c
2734  delete mode 100644 drivers/tty/serial/s3c2412.c
2735  delete mode 100644 drivers/tty/serial/s3c2440.c
2736  delete mode 100644 drivers/tty/serial/s3c6400.c
2737  delete mode 100644 drivers/tty/serial/s5pv210.c
2738 Merging tegra/for-next (80d0a76 Merge branches 'for-3.2/cleanup' and 'for-3.2/features' into for-next)
2739 $ git merge tegra/for-next
2740 Auto-merging arch/arm/Kconfig
2741 Merge made by the 'recursive' strategy.
2742  arch/arm/Kconfig |    1 +
2743  1 files changed, 1 insertions(+), 0 deletions(-)
2744 Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
2745 $ git merge xilinx/arm-next
2746 Already up-to-date.
2747 Merging blackfin/for-linus (e114599 Blackfin: add serial TX IRQ in individual platform resource)
2748 $ git merge blackfin/for-linus
2749 Merge made by the 'recursive' strategy.
2750  arch/blackfin/include/asm/bfin_serial.h      |    2 +
2751  arch/blackfin/mach-bf518/boards/ezbrd.c      |   14 +++++++++++-
2752  arch/blackfin/mach-bf518/boards/tcm-bf518.c  |   14 +++++++++++-
2753  arch/blackfin/mach-bf527/boards/ad7160eval.c |   14 +++++++++++-
2754  arch/blackfin/mach-bf527/boards/cm_bf527.c   |   14 +++++++++++-
2755  arch/blackfin/mach-bf527/boards/ezbrd.c      |   14 +++++++++++-
2756  arch/blackfin/mach-bf527/boards/ezkit.c      |   14 +++++++++++-
2757  arch/blackfin/mach-bf527/boards/tll6527m.c   |   14 +++++++++++-
2758  arch/blackfin/mach-bf533/boards/H8606.c      |    7 +++++-
2759  arch/blackfin/mach-bf533/boards/blackstamp.c |    7 +++++-
2760  arch/blackfin/mach-bf533/boards/cm_bf533.c   |    7 +++++-
2761  arch/blackfin/mach-bf533/boards/ezkit.c      |    7 +++++-
2762  arch/blackfin/mach-bf533/boards/ip0x.c       |    7 +++++-
2763  arch/blackfin/mach-bf533/boards/stamp.c      |    7 +++++-
2764  arch/blackfin/mach-bf537/boards/cm_bf537e.c  |   14 +++++++++++-
2765  arch/blackfin/mach-bf537/boards/cm_bf537u.c  |   14 +++++++++++-
2766  arch/blackfin/mach-bf537/boards/dnp5370.c    |   14 +++++++++++-
2767  arch/blackfin/mach-bf537/boards/minotaur.c   |   14 +++++++++++-
2768  arch/blackfin/mach-bf537/boards/pnav10.c     |   14 +++++++++++-
2769  arch/blackfin/mach-bf537/boards/stamp.c      |   14 +++++++++++-
2770  arch/blackfin/mach-bf537/boards/tcm_bf537.c  |   14 +++++++++++-
2771  arch/blackfin/mach-bf538/boards/ezkit.c      |   21 ++++++++++++++++--
2772  arch/blackfin/mach-bf548/boards/cm_bf548.c   |   28 ++++++++++++++++++++++---
2773  arch/blackfin/mach-bf548/boards/ezkit.c      |   28 ++++++++++++++++++++++---
2774  arch/blackfin/mach-bf561/boards/acvilon.c    |    7 +++++-
2775  arch/blackfin/mach-bf561/boards/cm_bf561.c   |    7 +++++-
2776  arch/blackfin/mach-bf561/boards/ezkit.c      |    7 +++++-
2777  arch/blackfin/mach-bf561/boards/tepla.c      |    7 +++++-
2778  28 files changed, 296 insertions(+), 49 deletions(-)
2779 Merging c6x/for-linux-next (2141355 C6X: MAINTAINERS)
2780 $ git merge c6x/for-linux-next
2781 Auto-merging include/asm-generic/page.h
2782 Auto-merging MAINTAINERS
2783 Merge made by the 'recursive' strategy.
2784  Documentation/devicetree/bindings/c6x/clocks.txt   |   40 +
2785  Documentation/devicetree/bindings/c6x/dscr.txt     |  127 +++
2786  Documentation/devicetree/bindings/c6x/emifa.txt    |   62 ++
2787  .../devicetree/bindings/c6x/interrupt.txt          |  104 +++
2788  Documentation/devicetree/bindings/c6x/soc.txt      |   28 +
2789  Documentation/devicetree/bindings/c6x/timer64.txt  |   26 +
2790  MAINTAINERS                                        |    8 +
2791  arch/c6x/Kconfig                                   |  174 +++++
2792  arch/c6x/Makefile                                  |   60 ++
2793  arch/c6x/boot/Makefile                             |   30 +
2794  arch/c6x/boot/dts/dsk6455.dts                      |   62 ++
2795  arch/c6x/boot/dts/evmc6457.dts                     |   48 ++
2796  arch/c6x/boot/dts/evmc6472.dts                     |   73 ++
2797  arch/c6x/boot/dts/evmc6474.dts                     |   58 ++
2798  arch/c6x/boot/dts/tms320c6455.dtsi                 |   96 +++
2799  arch/c6x/boot/dts/tms320c6457.dtsi                 |   68 ++
2800  arch/c6x/boot/dts/tms320c6472.dtsi                 |  134 ++++
2801  arch/c6x/boot/dts/tms320c6474.dtsi                 |   89 +++
2802  arch/c6x/boot/linked_dtb.S                         |    2 +
2803  arch/c6x/configs/dsk6455_defconfig                 |   44 ++
2804  arch/c6x/configs/evmc6457_defconfig                |   41 +
2805  arch/c6x/configs/evmc6472_defconfig                |   42 +
2806  arch/c6x/configs/evmc6474_defconfig                |   42 +
2807  arch/c6x/include/asm/Kbuild                        |   54 ++
2808  arch/c6x/include/asm/asm-offsets.h                 |    1 +
2809  arch/c6x/include/asm/bitops.h                      |  105 +++
2810  arch/c6x/include/asm/byteorder.h                   |   12 +
2811  arch/c6x/include/asm/cache.h                       |   90 +++
2812  arch/c6x/include/asm/cacheflush.h                  |   65 ++
2813  arch/c6x/include/asm/checksum.h                    |   34 +
2814  arch/c6x/include/asm/clkdev.h                      |   22 +
2815  arch/c6x/include/asm/clock.h                       |  148 ++++
2816  arch/c6x/include/asm/delay.h                       |   67 ++
2817  arch/c6x/include/asm/dma-mapping.h                 |   91 +++
2818  arch/c6x/include/asm/dscr.h                        |   34 +
2819  arch/c6x/include/asm/elf.h                         |  113 +++
2820  arch/c6x/include/asm/ftrace.h                      |    6 +
2821  arch/c6x/include/asm/hardirq.h                     |   20 +
2822  arch/c6x/include/asm/irq.h                         |  302 ++++++++
2823  arch/c6x/include/asm/irqflags.h                    |   72 ++
2824  arch/c6x/include/asm/linkage.h                     |   30 +
2825  arch/c6x/include/asm/megamod-pic.h                 |    9 +
2826  arch/c6x/include/asm/memblock.h                    |    4 +
2827  arch/c6x/include/asm/mmu.h                         |   18 +
2828  arch/c6x/include/asm/module.h                      |   33 +
2829  arch/c6x/include/asm/mutex.h                       |    6 +
2830  arch/c6x/include/asm/page.h                        |   11 +
2831  arch/c6x/include/asm/pgtable.h                     |   81 ++
2832  arch/c6x/include/asm/processor.h                   |  132 ++++
2833  arch/c6x/include/asm/procinfo.h                    |   28 +
2834  arch/c6x/include/asm/prom.h                        |    1 +
2835  arch/c6x/include/asm/ptrace.h                      |  174 +++++
2836  arch/c6x/include/asm/sections.h                    |   12 +
2837  arch/c6x/include/asm/setup.h                       |   32 +
2838  arch/c6x/include/asm/sigcontext.h                  |   80 ++
2839  arch/c6x/include/asm/signal.h                      |   17 +
2840  arch/c6x/include/asm/soc.h                         |   35 +
2841  arch/c6x/include/asm/string.h                      |   21 +
2842  arch/c6x/include/asm/swab.h                        |   54 ++
2843  arch/c6x/include/asm/syscall.h                     |  123 +++
2844  arch/c6x/include/asm/syscalls.h                    |   55 ++
2845  arch/c6x/include/asm/system.h                      |  168 ++++
2846  arch/c6x/include/asm/thread_info.h                 |  121 +++
2847  arch/c6x/include/asm/timer64.h                     |    6 +
2848  arch/c6x/include/asm/timex.h                       |   33 +
2849  arch/c6x/include/asm/tlb.h                         |    8 +
2850  arch/c6x/include/asm/traps.h                       |   36 +
2851  arch/c6x/include/asm/uaccess.h                     |  107 +++
2852  arch/c6x/include/asm/unaligned.h                   |  170 +++++
2853  arch/c6x/include/asm/unistd.h                      |   26 +
2854  arch/c6x/kernel/Makefile                           |   12 +
2855  arch/c6x/kernel/asm-offsets.c                      |  123 +++
2856  arch/c6x/kernel/c6x_ksyms.c                        |   66 ++
2857  arch/c6x/kernel/devicetree.c                       |   53 ++
2858  arch/c6x/kernel/dma.c                              |  153 ++++
2859  arch/c6x/kernel/entry.S                            |  803 ++++++++++++++++++++
2860  arch/c6x/kernel/head.S                             |   84 ++
2861  arch/c6x/kernel/irq.c                              |  728 ++++++++++++++++++
2862  arch/c6x/kernel/module.c                           |  123 +++
2863  arch/c6x/kernel/process.c                          |  263 +++++++
2864  arch/c6x/kernel/ptrace.c                           |  187 +++++
2865  arch/c6x/kernel/setup.c                            |  498 ++++++++++++
2866  arch/c6x/kernel/signal.c                           |  377 +++++++++
2867  arch/c6x/kernel/soc.c                              |   91 +++
2868  arch/c6x/kernel/switch_to.S                        |   74 ++
2869  arch/c6x/kernel/sys_c6x.c                          |   74 ++
2870  arch/c6x/kernel/time.c                             |   65 ++
2871  arch/c6x/kernel/traps.c                            |  423 ++++++++++
2872  arch/c6x/kernel/vectors.S                          |   81 ++
2873  arch/c6x/kernel/vmlinux.lds.S                      |  162 ++++
2874  arch/c6x/lib/Makefile                              |    7 +
2875  arch/c6x/lib/checksum.c                            |   36 +
2876  arch/c6x/lib/csum_64plus.S                         |  419 ++++++++++
2877  arch/c6x/lib/divi.S                                |   53 ++
2878  arch/c6x/lib/divremi.S                             |   46 ++
2879  arch/c6x/lib/divremu.S                             |   87 +++
2880  arch/c6x/lib/divu.S                                |   98 +++
2881  arch/c6x/lib/llshl.S                               |   37 +
2882  arch/c6x/lib/llshr.S                               |   38 +
2883  arch/c6x/lib/llshru.S                              |   38 +
2884  arch/c6x/lib/memcpy_64plus.S                       |   46 ++
2885  arch/c6x/lib/mpyll.S                               |   49 ++
2886  arch/c6x/lib/negll.S                               |   31 +
2887  arch/c6x/lib/pop_rts.S                             |   32 +
2888  arch/c6x/lib/push_rts.S                            |   31 +
2889  arch/c6x/lib/remi.S                                |   64 ++
2890  arch/c6x/lib/remu.S                                |   82 ++
2891  arch/c6x/lib/strasgi.S                             |   89 +++
2892  arch/c6x/lib/strasgi_64plus.S                      |   39 +
2893  arch/c6x/mm/Makefile                               |    5 +
2894  arch/c6x/mm/dma-coherent.c                         |  143 ++++
2895  arch/c6x/mm/init.c                                 |  113 +++
2896  arch/c6x/platforms/Kconfig                         |   16 +
2897  arch/c6x/platforms/Makefile                        |   12 +
2898  arch/c6x/platforms/cache.c                         |  445 +++++++++++
2899  arch/c6x/platforms/dscr.c                          |  598 +++++++++++++++
2900  arch/c6x/platforms/emif.c                          |   88 +++
2901  arch/c6x/platforms/megamod-pic.c                   |  349 +++++++++
2902  arch/c6x/platforms/platform.c                      |   17 +
2903  arch/c6x/platforms/pll.c                           |  444 +++++++++++
2904  arch/c6x/platforms/plldata.c                       |  404 ++++++++++
2905  arch/c6x/platforms/timer64.c                       |  236 ++++++
2906  include/asm-generic/io.h                           |    2 +-
2907  include/asm-generic/page.h                         |   10 +-
2908  include/asm-generic/uaccess.h                      |    7 +-
2909  include/linux/elf-em.h                             |    1 +
2910  126 files changed, 12972 insertions(+), 5 deletions(-)
2911  create mode 100644 Documentation/devicetree/bindings/c6x/clocks.txt
2912  create mode 100644 Documentation/devicetree/bindings/c6x/dscr.txt
2913  create mode 100644 Documentation/devicetree/bindings/c6x/emifa.txt
2914  create mode 100644 Documentation/devicetree/bindings/c6x/interrupt.txt
2915  create mode 100644 Documentation/devicetree/bindings/c6x/soc.txt
2916  create mode 100644 Documentation/devicetree/bindings/c6x/timer64.txt
2917  create mode 100644 arch/c6x/Kconfig
2918  create mode 100644 arch/c6x/Makefile
2919  create mode 100644 arch/c6x/boot/Makefile
2920  create mode 100644 arch/c6x/boot/dts/dsk6455.dts
2921  create mode 100644 arch/c6x/boot/dts/evmc6457.dts
2922  create mode 100644 arch/c6x/boot/dts/evmc6472.dts
2923  create mode 100644 arch/c6x/boot/dts/evmc6474.dts
2924  create mode 100644 arch/c6x/boot/dts/tms320c6455.dtsi
2925  create mode 100644 arch/c6x/boot/dts/tms320c6457.dtsi
2926  create mode 100644 arch/c6x/boot/dts/tms320c6472.dtsi
2927  create mode 100644 arch/c6x/boot/dts/tms320c6474.dtsi
2928  create mode 100644 arch/c6x/boot/linked_dtb.S
2929  create mode 100644 arch/c6x/configs/dsk6455_defconfig
2930  create mode 100644 arch/c6x/configs/evmc6457_defconfig
2931  create mode 100644 arch/c6x/configs/evmc6472_defconfig
2932  create mode 100644 arch/c6x/configs/evmc6474_defconfig
2933  create mode 100644 arch/c6x/include/asm/Kbuild
2934  create mode 100644 arch/c6x/include/asm/asm-offsets.h
2935  create mode 100644 arch/c6x/include/asm/bitops.h
2936  create mode 100644 arch/c6x/include/asm/byteorder.h
2937  create mode 100644 arch/c6x/include/asm/cache.h
2938  create mode 100644 arch/c6x/include/asm/cacheflush.h
2939  create mode 100644 arch/c6x/include/asm/checksum.h
2940  create mode 100644 arch/c6x/include/asm/clkdev.h
2941  create mode 100644 arch/c6x/include/asm/clock.h
2942  create mode 100644 arch/c6x/include/asm/delay.h
2943  create mode 100644 arch/c6x/include/asm/dma-mapping.h
2944  create mode 100644 arch/c6x/include/asm/dscr.h
2945  create mode 100644 arch/c6x/include/asm/elf.h
2946  create mode 100644 arch/c6x/include/asm/ftrace.h
2947  create mode 100644 arch/c6x/include/asm/hardirq.h
2948  create mode 100644 arch/c6x/include/asm/irq.h
2949  create mode 100644 arch/c6x/include/asm/irqflags.h
2950  create mode 100644 arch/c6x/include/asm/linkage.h
2951  create mode 100644 arch/c6x/include/asm/megamod-pic.h
2952  create mode 100644 arch/c6x/include/asm/memblock.h
2953  create mode 100644 arch/c6x/include/asm/mmu.h
2954  create mode 100644 arch/c6x/include/asm/module.h
2955  create mode 100644 arch/c6x/include/asm/mutex.h
2956  create mode 100644 arch/c6x/include/asm/page.h
2957  create mode 100644 arch/c6x/include/asm/pgtable.h
2958  create mode 100644 arch/c6x/include/asm/processor.h
2959  create mode 100644 arch/c6x/include/asm/procinfo.h
2960  create mode 100644 arch/c6x/include/asm/prom.h
2961  create mode 100644 arch/c6x/include/asm/ptrace.h
2962  create mode 100644 arch/c6x/include/asm/sections.h
2963  create mode 100644 arch/c6x/include/asm/setup.h
2964  create mode 100644 arch/c6x/include/asm/sigcontext.h
2965  create mode 100644 arch/c6x/include/asm/signal.h
2966  create mode 100644 arch/c6x/include/asm/soc.h
2967  create mode 100644 arch/c6x/include/asm/string.h
2968  create mode 100644 arch/c6x/include/asm/swab.h
2969  create mode 100644 arch/c6x/include/asm/syscall.h
2970  create mode 100644 arch/c6x/include/asm/syscalls.h
2971  create mode 100644 arch/c6x/include/asm/system.h
2972  create mode 100644 arch/c6x/include/asm/thread_info.h
2973  create mode 100644 arch/c6x/include/asm/timer64.h
2974  create mode 100644 arch/c6x/include/asm/timex.h
2975  create mode 100644 arch/c6x/include/asm/tlb.h
2976  create mode 100644 arch/c6x/include/asm/traps.h
2977  create mode 100644 arch/c6x/include/asm/uaccess.h
2978  create mode 100644 arch/c6x/include/asm/unaligned.h
2979  create mode 100644 arch/c6x/include/asm/unistd.h
2980  create mode 100644 arch/c6x/kernel/Makefile
2981  create mode 100644 arch/c6x/kernel/asm-offsets.c
2982  create mode 100644 arch/c6x/kernel/c6x_ksyms.c
2983  create mode 100644 arch/c6x/kernel/devicetree.c
2984  create mode 100644 arch/c6x/kernel/dma.c
2985  create mode 100644 arch/c6x/kernel/entry.S
2986  create mode 100644 arch/c6x/kernel/head.S
2987  create mode 100644 arch/c6x/kernel/irq.c
2988  create mode 100644 arch/c6x/kernel/module.c
2989  create mode 100644 arch/c6x/kernel/process.c
2990  create mode 100644 arch/c6x/kernel/ptrace.c
2991  create mode 100644 arch/c6x/kernel/setup.c
2992  create mode 100644 arch/c6x/kernel/signal.c
2993  create mode 100644 arch/c6x/kernel/soc.c
2994  create mode 100644 arch/c6x/kernel/switch_to.S
2995  create mode 100644 arch/c6x/kernel/sys_c6x.c
2996  create mode 100644 arch/c6x/kernel/time.c
2997  create mode 100644 arch/c6x/kernel/traps.c
2998  create mode 100644 arch/c6x/kernel/vectors.S
2999  create mode 100644 arch/c6x/kernel/vmlinux.lds.S
3000  create mode 100644 arch/c6x/lib/Makefile
3001  create mode 100644 arch/c6x/lib/checksum.c
3002  create mode 100644 arch/c6x/lib/csum_64plus.S
3003  create mode 100644 arch/c6x/lib/divi.S
3004  create mode 100644 arch/c6x/lib/divremi.S
3005  create mode 100644 arch/c6x/lib/divremu.S
3006  create mode 100644 arch/c6x/lib/divu.S
3007  create mode 100644 arch/c6x/lib/llshl.S
3008  create mode 100644 arch/c6x/lib/llshr.S
3009  create mode 100644 arch/c6x/lib/llshru.S
3010  create mode 100644 arch/c6x/lib/memcpy_64plus.S
3011  create mode 100644 arch/c6x/lib/mpyll.S
3012  create mode 100644 arch/c6x/lib/negll.S
3013  create mode 100644 arch/c6x/lib/pop_rts.S
3014  create mode 100644 arch/c6x/lib/push_rts.S
3015  create mode 100644 arch/c6x/lib/remi.S
3016  create mode 100644 arch/c6x/lib/remu.S
3017  create mode 100644 arch/c6x/lib/strasgi.S
3018  create mode 100644 arch/c6x/lib/strasgi_64plus.S
3019  create mode 100644 arch/c6x/mm/Makefile
3020  create mode 100644 arch/c6x/mm/dma-coherent.c
3021  create mode 100644 arch/c6x/mm/init.c
3022  create mode 100644 arch/c6x/platforms/Kconfig
3023  create mode 100644 arch/c6x/platforms/Makefile
3024  create mode 100644 arch/c6x/platforms/cache.c
3025  create mode 100644 arch/c6x/platforms/dscr.c
3026  create mode 100644 arch/c6x/platforms/emif.c
3027  create mode 100644 arch/c6x/platforms/megamod-pic.c
3028  create mode 100644 arch/c6x/platforms/platform.c
3029  create mode 100644 arch/c6x/platforms/pll.c
3030  create mode 100644 arch/c6x/platforms/plldata.c
3031  create mode 100644 arch/c6x/platforms/timer64.c
3032 Merging cris/for-next (ea78f5b CRIS: Update documentation)
3033 $ git merge cris/for-next
3034 Auto-merging drivers/net/cris/eth_v10.c
3035 Auto-merging arch/cris/arch-v32/drivers/cryptocop.c
3036 Merge made by the 'recursive' strategy.
3037  Documentation/cris/README               |   62 +++++++++++++++---------------
3038  arch/cris/arch-v32/drivers/cryptocop.c  |    6 +--
3039  arch/cris/arch-v32/kernel/ptrace.c      |    2 -
3040  arch/cris/include/arch-v32/arch/cache.h |    2 +-
3041  drivers/net/cris/eth_v10.c              |    1 -
3042  5 files changed, 34 insertions(+), 39 deletions(-)
3043 Merging quilt/hexagon (8e116d1 Add extra arch overrides to asm-generic/checksum.h)
3044 $ git merge quilt/hexagon
3045 Resolved 'arch/hexagon/kernel/head.S' using previous resolution.
3046 Resolved 'arch/hexagon/kernel/vmlinux.lds.S' using previous resolution.
3047 Auto-merging arch/hexagon/mm/strnlen_user.S
3048 CONFLICT (add/add): Merge conflict in arch/hexagon/mm/strnlen_user.S
3049 Auto-merging arch/hexagon/mm/pgalloc.c
3050 CONFLICT (add/add): Merge conflict in arch/hexagon/mm/pgalloc.c
3051 Auto-merging arch/hexagon/mm/Makefile
3052 CONFLICT (add/add): Merge conflict in arch/hexagon/mm/Makefile
3053 Auto-merging arch/hexagon/lib/memset.S
3054 CONFLICT (add/add): Merge conflict in arch/hexagon/lib/memset.S
3055 Auto-merging arch/hexagon/kernel/vmlinux.lds.S
3056 CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/vmlinux.lds.S
3057 Auto-merging arch/hexagon/kernel/vm_vectors.S
3058 CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/vm_vectors.S
3059 Auto-merging arch/hexagon/kernel/vdso.c
3060 CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/vdso.c
3061 Auto-merging arch/hexagon/kernel/kgdb.c
3062 CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/kgdb.c
3063 Auto-merging arch/hexagon/kernel/hexagon_ksyms.c
3064 CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/hexagon_ksyms.c
3065 Auto-merging arch/hexagon/kernel/head.S
3066 CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/head.S
3067 Auto-merging arch/hexagon/kernel/Makefile
3068 CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/Makefile
3069 Auto-merging arch/hexagon/include/asm/vdso.h
3070 CONFLICT (add/add): Merge conflict in arch/hexagon/include/asm/vdso.h
3071 Auto-merging arch/hexagon/include/asm/timex.h
3072 CONFLICT (add/add): Merge conflict in arch/hexagon/include/asm/timex.h
3073 Auto-merging arch/hexagon/include/asm/Kbuild
3074 CONFLICT (add/add): Merge conflict in arch/hexagon/include/asm/Kbuild
3075 Auto-merging arch/hexagon/Makefile
3076 CONFLICT (add/add): Merge conflict in arch/hexagon/Makefile
3077 Automatic merge failed; fix conflicts and then commit the result.
3078 $ git commit -v -a
3079 Recorded resolution for 'arch/hexagon/Makefile'.
3080 Recorded resolution for 'arch/hexagon/include/asm/Kbuild'.
3081 Recorded resolution for 'arch/hexagon/include/asm/timex.h'.
3082 Recorded resolution for 'arch/hexagon/include/asm/vdso.h'.
3083 Recorded resolution for 'arch/hexagon/kernel/Makefile'.
3084 Recorded resolution for 'arch/hexagon/kernel/hexagon_ksyms.c'.
3085 Recorded resolution for 'arch/hexagon/kernel/kgdb.c'.
3086 Recorded resolution for 'arch/hexagon/kernel/vdso.c'.
3087 Recorded resolution for 'arch/hexagon/kernel/vm_vectors.S'.
3088 Recorded resolution for 'arch/hexagon/lib/memset.S'.
3089 Recorded resolution for 'arch/hexagon/mm/Makefile'.
3090 Recorded resolution for 'arch/hexagon/mm/pgalloc.c'.
3091 Recorded resolution for 'arch/hexagon/mm/strnlen_user.S'.
3092 [master e67624e] Merge branch 'quilt/hexagon'
3093 $ git diff -M --stat --summary HEAD^..
3094 Merging ia64/next (0f6a1c0 Pull misc-3.2 into next branch)
3095 $ git merge ia64/next
3096 Already up-to-date!
3097 Merge made by the 'recursive' strategy.
3098 Merging m68k/for-next (4b7cecc m68k/mac: Remove mac_irq_{en,dis}able() wrappers)
3099 $ git merge m68k/for-next
3100 Already up-to-date.
3101 Merging m68knommu/for-next (0ada06b m68k: drop unused Kconfig symbols)
3102 $ git merge m68knommu/for-next
3103 Resolved 'arch/m68k/Kconfig.bus' using previous resolution.
3104 Resolved 'arch/m68k/Kconfig.devices' using previous resolution.
3105 Resolved 'arch/m68k/kernel/Makefile' using previous resolution.
3106 Auto-merging arch/m68k/kernel/Makefile
3107 CONFLICT (content): Merge conflict in arch/m68k/kernel/Makefile
3108 Auto-merging arch/m68k/Kconfig.devices
3109 CONFLICT (add/add): Merge conflict in arch/m68k/Kconfig.devices
3110 Auto-merging arch/m68k/Kconfig.bus
3111 CONFLICT (add/add): Merge conflict in arch/m68k/Kconfig.bus
3112 Automatic merge failed; fix conflicts and then commit the result.
3113 $ git commit -v -a
3114 [master ce1fe23] Merge remote-tracking branch 'm68knommu/for-next'
3115 $ git diff -M --stat --summary HEAD^..
3116 Merging microblaze/next (094803e Merge branch 'akpm' (Andrew's incoming))
3117 $ git merge microblaze/next
3118 Already up-to-date.
3119 Merging mips/mips-for-linux-next (3ba1e54 MIPS: O32: Provide definition of registers ta0 .. ta3.)
3120 $ git merge mips/mips-for-linux-next
3121 Resolved 'arch/mips/alchemy/devboards/db1x00/platform.c' using previous resolution.
3122 Resolved 'drivers/ide/Kconfig' using previous resolution.
3123 Resolved 'drivers/mmc/host/au1xmmc.c' using previous resolution.
3124 Resolved 'drivers/video/Kconfig' using previous resolution.
3125 Resolved 'sound/mips/Kconfig' using previous resolution.
3126 Auto-merging sound/soc/au1x/Kconfig
3127 Auto-merging sound/mips/Kconfig
3128 CONFLICT (content): Merge conflict in sound/mips/Kconfig
3129 Auto-merging drivers/video/Kconfig
3130 CONFLICT (content): Merge conflict in drivers/video/Kconfig
3131 Auto-merging drivers/usb/host/ohci-au1xxx.c
3132 Auto-merging drivers/usb/host/ehci-hcd.c
3133 Auto-merging drivers/usb/host/ehci-au1xxx.c
3134 Auto-merging drivers/usb/host/Makefile
3135 Auto-merging drivers/usb/Kconfig
3136 Auto-merging drivers/net/irda/Kconfig
3137 Auto-merging drivers/net/ethernet/amd/au1000_eth.h
3138 Auto-merging drivers/net/ethernet/amd/au1000_eth.c
3139 Auto-merging drivers/mmc/host/au1xmmc.c
3140 CONFLICT (content): Merge conflict in drivers/mmc/host/au1xmmc.c
3141 Auto-merging drivers/mmc/host/Kconfig
3142 Auto-merging drivers/ide/Kconfig
3143 CONFLICT (content): Merge conflict in drivers/ide/Kconfig
3144 Auto-merging drivers/i2c/busses/i2c-au1550.c
3145 Auto-merging drivers/i2c/busses/Kconfig
3146 Removing arch/mips/pci/ops-au1000.c
3147 Removing arch/mips/pci/fixup-au1000.c
3148 Auto-merging arch/mips/include/asm/mach-au1x00/au1xxx_psc.h
3149 Removing arch/mips/include/asm/mach-au1x00/au1xxx.h
3150 Auto-merging arch/mips/alchemy/devboards/db1x00/platform.c
3151 CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/db1x00/platform.c
3152 Auto-merging arch/mips/alchemy/devboards/db1200/platform.c
3153 Removing arch/mips/alchemy/common/pci.c
3154 Auto-merging arch/mips/alchemy/common/gpiolib.c
3155 Auto-merging arch/mips/Kconfig
3156 Automatic merge failed; fix conflicts and then commit the result.
3157 $ git commit -v -a
3158 [master cb25fe7] Merge remote-tracking branch 'mips/mips-for-linux-next'
3159 $ git diff -M --stat --summary HEAD^..
3160  arch/mips/Kconfig                                  |    5 +-
3161  arch/mips/Makefile                                 |    4 +-
3162  arch/mips/alchemy/Kconfig                          |   50 +-
3163  arch/mips/alchemy/common/Makefile                  |    6 +-
3164  arch/mips/alchemy/common/dbdma.c                   |  203 ++--
3165  arch/mips/alchemy/common/dma.c                     |   72 +-
3166  .../alchemy/common/{gpiolib-au1000.c => gpiolib.c} |   35 +-
3167  arch/mips/alchemy/common/pci.c                     |  104 --
3168  arch/mips/alchemy/common/platform.c                |  370 ++-----
3169  arch/mips/alchemy/common/power.c                   |   46 -
3170  arch/mips/alchemy/common/setup.c                   |    6 +-
3171  arch/mips/alchemy/devboards/db1200/platform.c      |  153 ++-
3172  arch/mips/alchemy/devboards/db1x00/board_setup.c   |   28 +-
3173  arch/mips/alchemy/devboards/db1x00/platform.c      |  198 +++-
3174  arch/mips/alchemy/devboards/pb1100/platform.c      |   49 +-
3175  arch/mips/alchemy/devboards/pb1200/platform.c      |  190 +++-
3176  arch/mips/alchemy/devboards/pb1500/board_setup.c   |   33 +-
3177  arch/mips/alchemy/devboards/pb1500/platform.c      |   71 +-
3178  arch/mips/alchemy/devboards/pb1550/board_setup.c   |    6 -
3179  arch/mips/alchemy/devboards/pb1550/platform.c      |  119 ++-
3180  arch/mips/alchemy/gpr/board_setup.c                |   12 -
3181  arch/mips/alchemy/gpr/platform.c                   |   47 +
3182  arch/mips/alchemy/mtx-1/board_setup.c              |   40 -
3183  arch/mips/alchemy/mtx-1/platform.c                 |   62 +
3184  arch/mips/alchemy/xxs1500/board_setup.c            |    8 -
3185  arch/mips/alchemy/xxs1500/platform.c               |   12 +-
3186  arch/mips/include/asm/cacheflush.h                 |   24 +
3187  arch/mips/include/asm/cpu.h                        |    3 +
3188  arch/mips/include/asm/io.h                         |   12 +-
3189  arch/mips/include/asm/mach-au1x00/au1000.h         |  559 ++++------
3190  arch/mips/include/asm/mach-au1x00/au1xxx.h         |   43 -
3191  arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h   |  114 +-
3192  arch/mips/include/asm/mach-au1x00/au1xxx_ide.h     |    1 +
3193  arch/mips/include/asm/mach-au1x00/au1xxx_psc.h     |   26 -
3194  arch/mips/include/asm/mach-au1x00/gpio-au1000.h    |   31 +-
3195  arch/mips/include/asm/mach-au1x00/gpio.h           |   79 ++-
3196  arch/mips/include/asm/mach-db1x00/db1200.h         |    2 -
3197  arch/mips/include/asm/mach-db1x00/db1x00.h         |   16 +-
3198  arch/mips/include/asm/mach-pb1x00/pb1200.h         |   18 +-
3199  arch/mips/include/asm/mach-pb1x00/pb1550.h         |   16 +-
3200  arch/mips/include/asm/mipsprom.h                   |    6 +-
3201  arch/mips/include/asm/mipsregs.h                   |    8 +
3202  arch/mips/include/asm/prom.h                       |    6 +-
3203  arch/mips/include/asm/regdef.h                     |    6 +
3204  arch/mips/jz4740/gpio.c                            |  140 +--
3205  arch/mips/jz4740/irq.c                             |   92 +-
3206  arch/mips/jz4740/irq.h                             |    6 +-
3207  arch/mips/jz4740/pm.c                              |    3 -
3208  arch/mips/kernel/Makefile                          |    5 +-
3209  arch/mips/kernel/cpu-probe.c                       |    3 +
3210  arch/mips/kernel/perf_event.c                      |  519 +--------
3211  arch/mips/kernel/perf_event_mipsxx.c               | 1265 ++++++++++++++------
3212  arch/mips/kernel/scall32-o32.S                     |    2 +-
3213  arch/mips/mm/c-octeon.c                            |    6 +
3214  arch/mips/mm/c-r3k.c                               |    7 +
3215  arch/mips/mm/c-r4k.c                               |   35 +
3216  arch/mips/mm/c-tx39.c                              |    7 +
3217  arch/mips/mm/cache.c                               |    5 +
3218  arch/mips/mm/tlb-r3k.c                             |    4 +-
3219  arch/mips/mm/tlb-r4k.c                             |    4 +-
3220  arch/mips/netlogic/Platform                        |    5 +
3221  arch/mips/netlogic/xlr/setup.c                     |    4 +-
3222  arch/mips/netlogic/xlr/smp.c                       |    6 +-
3223  arch/mips/netlogic/xlr/smpboot.S                   |   16 +-
3224  arch/mips/pci/Makefile                             |    3 +-
3225  arch/mips/pci/fixup-au1000.c                       |   43 -
3226  arch/mips/pci/ops-au1000.c                         |  308 -----
3227  arch/mips/pci/pci-alchemy.c                        |  516 ++++++++
3228  arch/mips/pmc-sierra/msp71xx/msp_setup.c           |    1 +
3229  arch/mips/pmc-sierra/yosemite/py-console.c         |   12 +-
3230  arch/mips/pnx8550/common/prom.c                    |    2 +-
3231  arch/mips/sgi-ip27/ip27-irq.c                      |    4 +-
3232  drivers/i2c/busses/Kconfig                         |    2 +-
3233  drivers/i2c/busses/i2c-au1550.c                    |    2 +-
3234  drivers/ide/Kconfig                                |    6 +-
3235  drivers/ide/au1xxx-ide.c                           |   46 +-
3236  drivers/mmc/host/Kconfig                           |    2 +-
3237  drivers/mmc/host/au1xmmc.c                         |   92 +-
3238  drivers/mtd/maps/lantiq-flash.c                    |    4 +-
3239  drivers/mtd/nand/Kconfig                           |    2 +-
3240  drivers/mtd/nand/au1550nd.c                        |    6 +-
3241  drivers/net/ethernet/amd/au1000_eth.c              |   48 +-
3242  drivers/net/ethernet/amd/au1000_eth.h              |    2 +-
3243  drivers/net/irda/Kconfig                           |    2 +-
3244  drivers/spi/Kconfig                                |    2 +-
3245  drivers/usb/Kconfig                                |    1 -
3246  drivers/usb/host/Makefile                          |    1 +
3247  drivers/usb/host/alchemy-common.c                  |  337 ++++++
3248  drivers/usb/host/ehci-au1xxx.c                     |   77 +-
3249  drivers/usb/host/ehci-hcd.c                        |    2 +-
3250  drivers/usb/host/ohci-au1xxx.c                     |  110 +--
3251  drivers/video/Kconfig                              |    4 +-
3252  sound/mips/Kconfig                                 |    2 +-
3253  sound/soc/au1x/Kconfig                             |    2 +-
3254  94 files changed, 3554 insertions(+), 3120 deletions(-)
3255  rename arch/mips/alchemy/common/{gpiolib-au1000.c => gpiolib.c} (83%)
3256  delete mode 100644 arch/mips/alchemy/common/pci.c
3257  delete mode 100644 arch/mips/include/asm/mach-au1x00/au1xxx.h
3258  delete mode 100644 arch/mips/pci/fixup-au1000.c
3259  delete mode 100644 arch/mips/pci/ops-au1000.c
3260  create mode 100644 arch/mips/pci/pci-alchemy.c
3261  create mode 100644 drivers/usb/host/alchemy-common.c
3262 Merging openrisc/for-upstream (b6fd41e Linux 3.1-rc6)
3263 $ git merge openrisc/for-upstream
3264 Already up-to-date.
3265 Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls)
3266 $ git merge parisc/for-next
3267 Merge made by the 'recursive' strategy.
3268  arch/parisc/include/asm/futex.h |   31 +++++++++++++++++++++++++++----
3269  1 files changed, 27 insertions(+), 4 deletions(-)
3270 Merging powerpc/next (7680057 powerpc: Don't try OPAL takeover on old 970 blades)
3271 $ git merge powerpc/next
3272 Resolved 'arch/powerpc/include/asm/udbg.h' using previous resolution.
3273 Resolved 'arch/powerpc/kernel/udbg.c' using previous resolution.
3274 Resolved 'drivers/tty/serial/8250.c' using previous resolution.
3275 Auto-merging kernel/sched.c
3276 Auto-merging include/linux/dma-mapping.h
3277 Auto-merging drivers/tty/serial/8250.c
3278 CONFLICT (content): Merge conflict in drivers/tty/serial/8250.c
3279 Auto-merging drivers/tty/hvc/hvcs.c
3280 Auto-merging drivers/of/fdt.c
3281 Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_net.h
3282 Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_net.c
3283 Auto-merging drivers/gpio/Makefile
3284 Auto-merging drivers/gpio/Kconfig
3285 Auto-merging arch/powerpc/platforms/85xx/Kconfig
3286 Removing arch/powerpc/platforms/40x/hcu4.c
3287 Auto-merging arch/powerpc/platforms/40x/Kconfig
3288 Auto-merging arch/powerpc/mm/hugetlbpage.c
3289 Auto-merging arch/powerpc/kernel/udbg.c
3290 CONFLICT (content): Merge conflict in arch/powerpc/kernel/udbg.c
3291 Auto-merging arch/powerpc/kernel/exceptions-64s.S
3292 Auto-merging arch/powerpc/kernel/asm-offsets.c
3293 Auto-merging arch/powerpc/include/asm/udbg.h
3294 CONFLICT (content): Merge conflict in arch/powerpc/include/asm/udbg.h
3295 Auto-merging arch/powerpc/configs/ppc40x_defconfig
3296 CONFLICT (modify/delete): arch/powerpc/configs/40x/hcu4_defconfig deleted in powerpc/next and modified in HEAD. Version HEAD of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
3297 Removing arch/powerpc/boot/dts/hcu4.dts
3298 Auto-merging arch/powerpc/Kconfig
3299 Automatic merge failed; fix conflicts and then commit the result.
3300 $ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
3301 arch/powerpc/configs/40x/hcu4_defconfig: needs merge
3302 arch/powerpc/include/asm/udbg.h: needs merge
3303 arch/powerpc/kernel/udbg.c: needs merge
3304 drivers/tty/serial/8250.c: needs merge
3305 rm 'arch/powerpc/configs/40x/hcu4_defconfig'
3306 $ git commit -v -a
3307 [master a1be3f5] Merge remote-tracking branch 'powerpc/next'
3308 $ git diff -M --stat --summary HEAD^..
3309  arch/powerpc/Kconfig                               |    7 +-
3310  arch/powerpc/Kconfig.debug                         |   46 +-
3311  arch/powerpc/boot/Makefile                         |    3 +-
3312  arch/powerpc/boot/dts/digsy_mtc.dts                |   59 +-
3313  arch/powerpc/boot/dts/hcu4.dts                     |  168 ---
3314  arch/powerpc/boot/dts/mpc5200b.dtsi                |    2 +
3315  arch/powerpc/boot/dts/yosemite.dts                 |   36 +
3316  arch/powerpc/configs/40x/hcu4_defconfig            |   81 --
3317  arch/powerpc/configs/85xx/p1023rds_defconfig       |    2 +-
3318  arch/powerpc/configs/85xx/xes_mpc85xx_defconfig    |    2 +-
3319  arch/powerpc/configs/mpc512x_defconfig             |   19 +-
3320  arch/powerpc/configs/mpc5200_defconfig             |   12 +
3321  arch/powerpc/configs/mpc85xx_defconfig             |    2 +-
3322  arch/powerpc/configs/mpc85xx_smp_defconfig         |    2 +-
3323  arch/powerpc/configs/ppc40x_defconfig              |    1 -
3324  arch/powerpc/configs/ppc6xx_defconfig              |    2 +-
3325  arch/powerpc/include/asm/device.h                  |    2 +
3326  arch/powerpc/include/asm/firmware.h                |   10 +
3327  arch/powerpc/include/asm/hugetlb.h                 |   63 ++-
3328  arch/powerpc/include/asm/kexec.h                   |    2 +-
3329  arch/powerpc/include/asm/machdep.h                 |    3 +-
3330  arch/powerpc/include/asm/mmu-book3e.h              |    7 +
3331  arch/powerpc/include/asm/mmu-hash64.h              |    3 +-
3332  arch/powerpc/include/asm/mmu.h                     |   18 +-
3333  arch/powerpc/include/asm/mpic.h                    |    2 -
3334  arch/powerpc/include/asm/opal.h                    |  443 ++++++++
3335  arch/powerpc/include/asm/paca.h                    |    8 +
3336  arch/powerpc/include/asm/page.h                    |   31 +-
3337  arch/powerpc/include/asm/page_64.h                 |   11 -
3338  arch/powerpc/include/asm/pte-book3e.h              |    3 +
3339  arch/powerpc/include/asm/rtas.h                    |    6 +-
3340  arch/powerpc/include/asm/smp.h                     |    1 +
3341  arch/powerpc/include/asm/sparsemem.h               |    2 +-
3342  arch/powerpc/include/asm/topology.h                |   14 +-
3343  arch/powerpc/include/asm/udbg.h                    |    3 +
3344  arch/powerpc/include/asm/xics.h                    |   19 +
3345  arch/powerpc/kernel/asm-offsets.c                  |   10 +
3346  arch/powerpc/kernel/dma-iommu.c                    |   28 +-
3347  arch/powerpc/kernel/dma-swiotlb.c                  |   16 +
3348  arch/powerpc/kernel/dma.c                          |   44 +-
3349  arch/powerpc/kernel/exceptions-64s.S               |   27 +-
3350  arch/powerpc/kernel/head_32.S                      |    7 +-
3351  arch/powerpc/kernel/head_40x.S                     |   15 +-
3352  arch/powerpc/kernel/head_44x.S                     |   16 +-
3353  arch/powerpc/kernel/head_64.S                      |   22 +-
3354  arch/powerpc/kernel/head_8xx.S                     |   13 +-
3355  arch/powerpc/kernel/head_fsl_booke.S               |  175 +++-
3356  arch/powerpc/kernel/ibmebus.c                      |   22 +-
3357  arch/powerpc/kernel/iommu.c                        |    8 +
3358  arch/powerpc/kernel/legacy_serial.c                |   25 +
3359  arch/powerpc/kernel/machine_kexec_64.c             |    3 +-
3360  arch/powerpc/kernel/misc_32.S                      |  171 +++
3361  arch/powerpc/kernel/pci-common.c                   |   11 +
3362  arch/powerpc/kernel/power6-pmu.c                   |    4 +-
3363  arch/powerpc/kernel/power7-pmu.c                   |    2 +
3364  arch/powerpc/kernel/prom.c                         |   14 +
3365  arch/powerpc/kernel/prom_init.c                    |  383 ++++++-
3366  arch/powerpc/kernel/prom_init_check.sh             |    4 +-
3367  arch/powerpc/kernel/ptrace.c                       |   18 +-
3368  arch/powerpc/kernel/setup_32.c                     |    2 +-
3369  arch/powerpc/kernel/setup_64.c                     |   22 +-
3370  arch/powerpc/kernel/smp.c                          |   30 +-
3371  arch/powerpc/kernel/swsusp.c                       |    2 +-
3372  arch/powerpc/kernel/udbg.c                         |    6 +
3373  arch/powerpc/kernel/vio.c                          |   21 +-
3374  arch/powerpc/mm/Makefile                           |    1 +
3375  arch/powerpc/mm/hash_utils_64.c                    |    9 +-
3376  arch/powerpc/mm/hugetlbpage-book3e.c               |  121 +++
3377  arch/powerpc/mm/hugetlbpage.c                      |  379 ++++++-
3378  arch/powerpc/mm/init_32.c                          |    9 +
3379  arch/powerpc/mm/mem.c                              |    8 +-
3380  arch/powerpc/mm/mmu_context_hash64.c               |   12 +-
3381  arch/powerpc/mm/mmu_context_nohash.c               |    5 +
3382  arch/powerpc/mm/numa.c                             |   20 +-
3383  arch/powerpc/mm/pgtable.c                          |    3 +-
3384  arch/powerpc/mm/tlb_low_64e.S                      |   24 +-
3385  arch/powerpc/mm/tlb_nohash.c                       |   46 +-
3386  arch/powerpc/platforms/40x/Kconfig                 |    8 -
3387  arch/powerpc/platforms/40x/Makefile                |    1 -
3388  arch/powerpc/platforms/40x/hcu4.c                  |   61 --
3389  arch/powerpc/platforms/512x/Kconfig                |    1 +
3390  arch/powerpc/platforms/83xx/Kconfig                |    9 +-
3391  arch/powerpc/platforms/85xx/Kconfig                |   12 +-
3392  arch/powerpc/platforms/86xx/Kconfig                |    1 +
3393  arch/powerpc/platforms/Kconfig                     |   11 +-
3394  arch/powerpc/platforms/Kconfig.cputype             |    4 +-
3395  arch/powerpc/platforms/Makefile                    |    1 +
3396  arch/powerpc/platforms/cell/iommu.c                |   21 +
3397  arch/powerpc/platforms/powernv/Kconfig             |   16 +
3398  arch/powerpc/platforms/powernv/Makefile            |    5 +
3399  arch/powerpc/platforms/powernv/opal-nvram.c        |   88 ++
3400  arch/powerpc/platforms/powernv/opal-rtc.c          |   97 ++
3401  arch/powerpc/platforms/powernv/opal-takeover.S     |  140 +++
3402  arch/powerpc/platforms/powernv/opal-wrappers.S     |  101 ++
3403  arch/powerpc/platforms/powernv/opal.c              |  322 ++++++
3404  arch/powerpc/platforms/powernv/pci-p5ioc2.c        |  234 ++++
3405  arch/powerpc/platforms/powernv/pci.c               |  427 ++++++++
3406  arch/powerpc/platforms/powernv/pci.h               |   48 +
3407  arch/powerpc/platforms/powernv/powernv.h           |   16 +
3408  arch/powerpc/platforms/powernv/setup.c             |  196 ++++
3409  arch/powerpc/platforms/powernv/smp.c               |  182 ++++
3410  arch/powerpc/platforms/ps3/Kconfig                 |   12 +
3411  arch/powerpc/platforms/ps3/Makefile                |    1 +
3412  arch/powerpc/platforms/ps3/gelic_udbg.c            |  273 +++++
3413  arch/powerpc/platforms/ps3/system-bus.c            |    7 +
3414  arch/powerpc/platforms/pseries/Kconfig             |    1 +
3415  arch/powerpc/platforms/pseries/dlpar.c             |    4 +
3416  arch/powerpc/platforms/pseries/eeh.c               |    2 +-
3417  arch/powerpc/platforms/pseries/iommu.c             |   34 +-
3418  arch/powerpc/platforms/pseries/nvram.c             |  171 +++-
3419  arch/powerpc/platforms/wsp/Kconfig                 |   11 +-
3420  arch/powerpc/platforms/wsp/Makefile                |    2 +
3421  arch/powerpc/platforms/wsp/ics.c                   |   48 +
3422  arch/powerpc/platforms/wsp/ics.h                   |    5 +
3423  arch/powerpc/platforms/wsp/msi.c                   |  102 ++
3424  arch/powerpc/platforms/wsp/msi.h                   |   19 +
3425  arch/powerpc/platforms/wsp/psr2.c                  |    4 +
3426  arch/powerpc/platforms/wsp/wsp.h                   |    3 +
3427  arch/powerpc/platforms/wsp/wsp_pci.c               | 1133 ++++++++++++++++++++
3428  arch/powerpc/platforms/wsp/wsp_pci.h               |  268 +++++
3429  arch/powerpc/sysdev/Makefile                       |    1 -
3430  arch/powerpc/sysdev/mpic.c                         |   24 +-
3431  arch/powerpc/sysdev/ppc4xx_pci.c                   |  101 ++-
3432  arch/powerpc/sysdev/ppc4xx_pci.h                   |   12 +
3433  arch/powerpc/sysdev/xics/Makefile                  |    1 +
3434  arch/powerpc/sysdev/xics/icp-native.c              |    2 +-
3435  arch/powerpc/sysdev/xics/ics-opal.c                |  244 +++++
3436  arch/powerpc/sysdev/xics/xics-common.c             |    8 +-
3437  arch/powerpc/xmon/xmon.c                           |    4 +-
3438  drivers/edac/cpc925_edac.c                         |   67 ++-
3439  drivers/edac/ppc4xx_edac.c                         |    2 +-
3440  drivers/gpio/Kconfig                               |    8 +
3441  drivers/gpio/Makefile                              |    1 +
3442  .../mpc8xxx_gpio.c => drivers/gpio/gpio-mpc8xxx.c  |    0
3443  drivers/net/ethernet/toshiba/ps3_gelic_net.c       |    3 +
3444  drivers/net/ethernet/toshiba/ps3_gelic_net.h       |    6 +
3445  drivers/of/fdt.c                                   |    7 +-
3446  drivers/tty/hvc/Kconfig                            |    9 +
3447  drivers/tty/hvc/Makefile                           |    1 +
3448  drivers/tty/hvc/hvc_opal.c                         |  424 ++++++++
3449  drivers/tty/hvc/hvcs.c                             |    6 +-
3450  drivers/tty/hvc/hvsi_lib.c                         |    4 +-
3451  drivers/tty/serial/8250.c                          |   23 -
3452  include/linux/dma-mapping.h                        |    3 +
3453  include/linux/topology.h                           |    4 +
3454  kernel/sched.c                                     |    2 -
3455  146 files changed, 7176 insertions(+), 746 deletions(-)
3456  delete mode 100644 arch/powerpc/boot/dts/hcu4.dts
3457  delete mode 100644 arch/powerpc/configs/40x/hcu4_defconfig
3458  create mode 100644 arch/powerpc/include/asm/opal.h
3459  create mode 100644 arch/powerpc/mm/hugetlbpage-book3e.c
3460  delete mode 100644 arch/powerpc/platforms/40x/hcu4.c
3461  create mode 100644 arch/powerpc/platforms/powernv/Kconfig
3462  create mode 100644 arch/powerpc/platforms/powernv/Makefile
3463  create mode 100644 arch/powerpc/platforms/powernv/opal-nvram.c
3464  create mode 100644 arch/powerpc/platforms/powernv/opal-rtc.c
3465  create mode 100644 arch/powerpc/platforms/powernv/opal-takeover.S
3466  create mode 100644 arch/powerpc/platforms/powernv/opal-wrappers.S
3467  create mode 100644 arch/powerpc/platforms/powernv/opal.c
3468  create mode 100644 arch/powerpc/platforms/powernv/pci-p5ioc2.c
3469  create mode 100644 arch/powerpc/platforms/powernv/pci.c
3470  create mode 100644 arch/powerpc/platforms/powernv/pci.h
3471  create mode 100644 arch/powerpc/platforms/powernv/powernv.h
3472  create mode 100644 arch/powerpc/platforms/powernv/setup.c
3473  create mode 100644 arch/powerpc/platforms/powernv/smp.c
3474  create mode 100644 arch/powerpc/platforms/ps3/gelic_udbg.c
3475  create mode 100644 arch/powerpc/platforms/wsp/msi.c
3476  create mode 100644 arch/powerpc/platforms/wsp/msi.h
3477  create mode 100644 arch/powerpc/platforms/wsp/wsp_pci.c
3478  create mode 100644 arch/powerpc/platforms/wsp/wsp_pci.h
3479  create mode 100644 arch/powerpc/sysdev/xics/ics-opal.c
3480  rename arch/powerpc/sysdev/mpc8xxx_gpio.c => drivers/gpio/gpio-mpc8xxx.c (100%)
3481  create mode 100644 drivers/tty/hvc/hvc_opal.c
3482 Merging 4xx/next (9fcd768 powerpc/40x: Remove obsolete HCU4 board)
3483 $ git merge 4xx/next
3484 Already up-to-date.
3485 Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries)
3486 $ git merge 52xx-and-virtex/powerpc/next
3487 Merge made by the 'recursive' strategy.
3488  arch/powerpc/boot/dts/charon.dts             |  236 ++++++++++++++++++++++++++
3489  arch/powerpc/configs/52xx/tqm5200_defconfig  |   20 ++-
3490  arch/powerpc/platforms/52xx/mpc5200_simple.c |    1 +
3491  3 files changed, 249 insertions(+), 8 deletions(-)
3492  create mode 100644 arch/powerpc/boot/dts/charon.dts
3493 Merging galak/next (1661e5b powerpc/cpm: Clear muram before it is in use.)
3494 $ git merge galak/next
3495 Auto-merging arch/powerpc/platforms/85xx/p2041_rdb.c
3496 Auto-merging arch/powerpc/platforms/85xx/p1022_ds.c
3497 Auto-merging arch/powerpc/platforms/85xx/Kconfig
3498 Auto-merging arch/powerpc/boot/dts/p2041si.dtsi
3499 Auto-merging arch/powerpc/boot/dts/p2041rdb.dts
3500 Merge made by the 'recursive' strategy.
3501  .../devicetree/bindings/powerpc/fsl/board.txt      |   30 +-
3502  .../devicetree/bindings/powerpc/fsl/dcsr.txt       |  395 ++++++++++++++++++++
3503  .../devicetree/bindings/powerpc/fsl/msi-pic.txt    |   42 ++
3504  arch/powerpc/boot/dts/ksi8560.dts                  |    2 +-
3505  arch/powerpc/boot/dts/mgcoge.dts                   |    9 +
3506  arch/powerpc/boot/dts/mpc8349emitx.dts             |    3 +-
3507  arch/powerpc/boot/dts/p1022ds.dts                  |    2 +-
3508  arch/powerpc/boot/dts/p2020ds.dts                  |    5 +
3509  .../boot/dts/{p2040rdb.dts => p2041rdb.dts}        |   17 +-
3510  .../boot/dts/{p2040si.dtsi => p2041si.dtsi}        |  135 +++++--
3511  arch/powerpc/boot/dts/p3041ds.dts                  |    8 +-
3512  arch/powerpc/boot/dts/p3041si.dtsi                 |   71 ++++-
3513  arch/powerpc/boot/dts/p4080ds.dts                  |   12 +-
3514  arch/powerpc/boot/dts/p4080si.dtsi                 |  114 +++++-
3515  arch/powerpc/boot/dts/p5020ds.dts                  |    8 +-
3516  arch/powerpc/boot/dts/p5020si.dtsi                 |   68 ++++-
3517  arch/powerpc/boot/dts/sbc8560.dts                  |    2 +-
3518  arch/powerpc/configs/corenet32_smp_defconfig       |   10 +-
3519  arch/powerpc/configs/corenet64_smp_defconfig       |    5 -
3520  arch/powerpc/configs/mgcoge_defconfig              |   27 +-
3521  arch/powerpc/configs/mpc85xx_defconfig             |    5 +-
3522  arch/powerpc/configs/mpc85xx_smp_defconfig         |    6 +-
3523  arch/powerpc/include/asm/reg_booke.h               |    3 +
3524  arch/powerpc/kernel/idle_e500.S                    |    2 +-
3525  arch/powerpc/kernel/prom.c                         |    5 +-
3526  arch/powerpc/kernel/traps.c                        |    9 +-
3527  arch/powerpc/math-emu/math_efp.c                   |  100 +++---
3528  arch/powerpc/mm/fsl_booke_mmu.c                    |   43 ++-
3529  arch/powerpc/mm/mmu_decl.h                         |    2 +
3530  arch/powerpc/mm/tlb_nohash.c                       |   21 +-
3531  arch/powerpc/platforms/82xx/km82xx.c               |    4 +
3532  arch/powerpc/platforms/85xx/Kconfig                |    6 +-
3533  arch/powerpc/platforms/85xx/Makefile               |    2 +-
3534  arch/powerpc/platforms/85xx/p1022_ds.c             |   11 +-
3535  .../platforms/85xx/{p2040_rdb.c => p2041_rdb.c}    |   18 +-
3536  arch/powerpc/platforms/85xx/sbc8560.c              |    2 +-
3537  arch/powerpc/platforms/85xx/smp.c                  |   10 +-
3538  arch/powerpc/sysdev/cpm_common.c                   |    3 +-
3539  arch/powerpc/sysdev/fsl_msi.c                      |   28 +-
3540  arch/powerpc/sysdev/fsl_msi.h                      |    3 +-
3541  drivers/virt/fsl_hypervisor.c                      |    1 +
3542  41 files changed, 1029 insertions(+), 220 deletions(-)
3543  create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/dcsr.txt
3544  rename arch/powerpc/boot/dts/{p2040rdb.dts => p2041rdb.dts} (95%)
3545  rename arch/powerpc/boot/dts/{p2040si.dtsi => p2041si.dtsi} (80%)
3546  rename arch/powerpc/platforms/85xx/{p2040_rdb.c => p2041_rdb.c} (82%)
3547 Merging s390/features (0d7c7ff [S390] add support for physical memory > 4TB)
3548 $ git merge s390/features
3549 Merge made by the 'recursive' strategy.
3550  arch/s390/include/asm/pgtable.h   |   23 +------
3551  arch/s390/include/asm/sparsemem.h |    4 +-
3552  arch/s390/kernel/mem_detect.c     |  122 ++++++++++++++++++++-----------------
3553  arch/s390/kernel/setup.c          |   68 ++++++++++++++++-----
3554  arch/s390/mm/init.c               |   16 +++--
3555  arch/s390/mm/pgtable.c            |   11 ---
3556  6 files changed, 135 insertions(+), 109 deletions(-)
3557 Merging sh/sh-latest (b9a3acf Merge branch 'sh/stable-updates' into sh-latest)
3558 $ git merge sh/sh-latest
3559 Merge made by the 'recursive' strategy.
3560  arch/sh/boards/mach-ecovec24/setup.c |    4 ++++
3561  1 files changed, 4 insertions(+), 0 deletions(-)
3562 Merging rmobile/rmobile-latest (b58c580 Merge branch 'rmobile-fixes-for-linus' into rmobile-latest)
3563 $ git merge rmobile/rmobile-latest
3564 Merge made by the 'recursive' strategy.
3565  arch/arm/mach-shmobile/include/mach/sh73a0.h |   13 ++++
3566  arch/arm/mach-shmobile/pfc-sh73a0.c          |   77 +++++++++++++++++++++-----
3567  2 files changed, 75 insertions(+), 15 deletions(-)
3568 Merging sparc-next/master (3ee72ca Merge git://github.com/davem330/net)
3569 $ git merge sparc-next/master
3570 Already up-to-date.
3571 Merging tile/master (0124538 nfs: fix a couple of minor portability issues)
3572 $ git merge tile/master
3573 Resolved 'arch/tile/kernel/intvec_32.S' using previous resolution.
3574 Auto-merging fs/nfs/nfs4filelayout.c
3575 Auto-merging arch/tile/lib/atomic_asm_32.S
3576 CONFLICT (content): Merge conflict in arch/tile/lib/atomic_asm_32.S
3577 Auto-merging arch/tile/kernel/intvec_32.S
3578 CONFLICT (content): Merge conflict in arch/tile/kernel/intvec_32.S
3579 Automatic merge failed; fix conflicts and then commit the result.
3580 $ git commit -v -a
3581 Recorded resolution for 'arch/tile/lib/atomic_asm_32.S'.
3582 [master b86494f] Merge remote-tracking branch 'tile/master'
3583 $ git diff -M --stat --summary HEAD^..
3584  fs/nfs/nfs4filelayout.c |    6 +++---
3585  1 files changed, 3 insertions(+), 3 deletions(-)
3586 Merging unicore32/unicore32 (10967fd arch/unicore32: do not use EXTRA_AFLAGS or EXTRA_CFLAGS)
3587 $ git merge unicore32/unicore32
3588 Merge made by the 'recursive' strategy.
3589  arch/unicore32/boot/compressed/Makefile |    4 ++--
3590  arch/unicore32/include/asm/bitops.h     |   12 ++++++------
3591  arch/unicore32/kernel/ksyms.c           |    4 ++--
3592  arch/unicore32/lib/findbit.S            |   14 ++++++++------
3593  4 files changed, 18 insertions(+), 16 deletions(-)
3594 Merging xtensa/master (29aced6 xtensa: remove defining register numbers)
3595 $ git merge xtensa/master
3596 Merge made by the 'recursive' strategy.
3597  arch/xtensa/include/asm/irqflags.h |    1 +
3598  arch/xtensa/include/asm/regs.h     |   91 ++++++++++++++++++---------------
3599  arch/xtensa/include/asm/timex.h    |    4 +-
3600  arch/xtensa/include/asm/uaccess.h  |    2 +-
3601  arch/xtensa/kernel/align.S         |   14 +++---
3602  arch/xtensa/kernel/coprocessor.S   |   10 ++--
3603  arch/xtensa/kernel/entry.S         |   98 ++++++++++++++++++------------------
3604  arch/xtensa/kernel/head.S          |   12 ++--
3605  arch/xtensa/kernel/irq.c           |    5 ++
3606  arch/xtensa/kernel/traps.c         |    4 +-
3607  arch/xtensa/kernel/vectors.S       |   22 ++++----
3608  arch/xtensa/kernel/vmlinux.lds.S   |    1 +
3609  12 files changed, 139 insertions(+), 125 deletions(-)
3610 Merging ceph/for-next (3395734 libceph: fix double-free of page vector)
3611 $ git merge ceph/for-next
3612 Already up-to-date.
3613 Merging cifs/master (9ef5992 cifs: Assume passwords are encoded according to iocharset (try #2))
3614 $ git merge cifs/master
3615 Merge made by the 'recursive' strategy.
3616  fs/cifs/cifsencrypt.c |    8 +++---
3617  fs/cifs/cifsfs.h      |    2 +-
3618  fs/cifs/cifsproto.h   |    8 ++++--
3619  fs/cifs/connect.c     |    2 +-
3620  fs/cifs/file.c        |   11 ++++++--
3621  fs/cifs/sess.c        |    2 +-
3622  fs/cifs/smbencrypt.c  |   63 +++++++++---------------------------------------
3623  7 files changed, 32 insertions(+), 64 deletions(-)
3624 Merging configfs/linux-next (420118c configfs: Rework configfs_depend_item() locking and make lockdep happy)
3625 $ git merge configfs/linux-next
3626 Already up-to-date.
3627 Merging ecryptfs/next (985ca0e ecryptfs: Make inode bdi consistent with superblock bdi)
3628 $ git merge ecryptfs/next
3629 Already up-to-date.
3630 Merging ext3/for_next (ed47a7d udf: Cleanup metadata flags handling)
3631 $ git merge ext3/for_next
3632 Already up-to-date.
3633 Merging ext4/dev (f2a4452 jbd2: Unify log messages in jbd2 code)
3634 $ git merge ext4/dev
3635 Already up-to-date.
3636 Merging fatfs/master (710d440 fat: fat16 support maximum 4GB file/vol size as WinXP or 7.)
3637 $ git merge fatfs/master
3638 Already up-to-date.
3639 Merging fuse/for-next (c2183d1 fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message)
3640 $ git merge fuse/for-next
3641 Already up-to-date.
3642 Merging gfs2/master (809a4fa GFS2: Move readahead of metadata during deallocation into its own function)
3643 $ git merge gfs2/master
3644 Resolved 'fs/gfs2/file.c' using previous resolution.
3645 Auto-merging fs/gfs2/file.c
3646 CONFLICT (content): Merge conflict in fs/gfs2/file.c
3647 Automatic merge failed; fix conflicts and then commit the result.
3648 $ git commit -v -a
3649 [master 638ee76] Merge remote-tracking branch 'gfs2/master'
3650 $ git diff -M --stat --summary HEAD^..
3651 Merging hfsplus/for-next (6596528 hfsplus: ensure bio requests are not smaller than the hardware sectors)
3652 $ git merge hfsplus/for-next
3653 Already up-to-date.
3654 Merging jfs/next (1c8007b jfs: flush journal completely before releasing metadata inodes)
3655 $ git merge jfs/next
3656 Already up-to-date.
3657 Merging logfs/master (51b3089 Merge branch 'master' of github.com:prasad-joshi/logfs)
3658 $ git merge logfs/master
3659 Resolved 'fs/logfs/file.c' using previous resolution.
3660 Auto-merging fs/logfs/super.c
3661 Auto-merging fs/logfs/readwrite.c
3662 Auto-merging fs/logfs/logfs.h
3663 Auto-merging fs/logfs/inode.c
3664 Auto-merging fs/logfs/file.c
3665 CONFLICT (content): Merge conflict in fs/logfs/file.c
3666 Auto-merging fs/logfs/dir.c
3667 Auto-merging MAINTAINERS
3668 Automatic merge failed; fix conflicts and then commit the result.
3669 $ git commit -v -a
3670 [master 0989d78] Merge remote-tracking branch 'logfs/master'
3671 $ git diff -M --stat --summary HEAD^..
3672  MAINTAINERS          |    1 +
3673  fs/logfs/dev_mtd.c   |   26 ++++++++++++--------------
3674  fs/logfs/dir.c       |    2 +-
3675  fs/logfs/file.c      |    2 ++
3676  fs/logfs/inode.c     |    4 +++-
3677  fs/logfs/journal.c   |    1 -
3678  fs/logfs/logfs.h     |    5 ++++-
3679  fs/logfs/readwrite.c |   22 ++++++++++++----------
3680  fs/logfs/segment.c   |   14 ++++++++++----
3681  fs/logfs/super.c     |    3 ++-
3682  10 files changed, 47 insertions(+), 33 deletions(-)
3683 Merging nfs/linux-next (e414966 NFS: Remove no-op less-than-zero checks on unsigned variables.)
3684 $ git merge nfs/linux-next
3685 Auto-merging net/sunrpc/svc.c
3686 Auto-merging include/linux/sunrpc/svc.h
3687 Auto-merging include/linux/sunrpc/clnt.h
3688 Auto-merging fs/nfs/nfs4filelayout.c
3689 Merge made by the 'recursive' strategy.
3690  fs/nfs/callback_xdr.c       |   11 +++--
3691  fs/nfs/nfs4filelayout.c     |    7 +--
3692  fs/nfs/nfs4proc.c           |    6 +++
3693  fs/nfs/nfs4xdr.c            |    2 -
3694  fs/nfs/pagelist.c           |    2 +-
3695  fs/nfs/pnfs.c               |   25 +++++++++++-
3696  fs/nfsd/nfssvc.c            |    2 +
3697  include/linux/nfs_fs.h      |    1 +
3698  include/linux/sunrpc/clnt.h |    2 +
3699  include/linux/sunrpc/svc.h  |    1 +
3700  net/sunrpc/auth_unix.c      |    3 +
3701  net/sunrpc/rpcb_clnt.c      |   88 ++++++++++++++++++++++++++++---------------
3702  net/sunrpc/sunrpc_syms.c    |    3 -
3703  net/sunrpc/svc.c            |   48 ++++++++++++++++++++++-
3704  14 files changed, 150 insertions(+), 51 deletions(-)
3705 Merging nfsd/nfsd-next (fc0d14f nfsd4: typo logical vs bitwise negate in nfsd4_decode_share_access)
3706 $ git merge nfsd/nfsd-next
3707 Already up-to-date.
3708 Merging nilfs2/for-next (93ee7a9 Linux 3.1-rc2)
3709 $ git merge nilfs2/for-next
3710 Already up-to-date.
3711 Merging ocfs2/linux-next (c849cc2 ocfs2: make direntry invalid when deleting it)
3712 $ git merge ocfs2/linux-next
3713 Resolved 'fs/ocfs2/xattr.c' using previous resolution.
3714 Auto-merging fs/ocfs2/xattr.c
3715 CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
3716 Auto-merging fs/ocfs2/move_extents.c
3717 Auto-merging fs/ocfs2/file.c
3718 Auto-merging fs/ocfs2/dlmglue.c
3719 Auto-merging fs/ocfs2/dir.c
3720 Automatic merge failed; fix conflicts and then commit the result.
3721 $ git commit -v -a
3722 [master 365a5dc] Merge remote-tracking branch 'ocfs2/linux-next'
3723 $ git diff -M --stat --summary HEAD^..
3724  fs/ocfs2/aops.c              |   69 +++++++++++++--
3725  fs/ocfs2/aops.h              |   14 +++
3726  fs/ocfs2/cluster/heartbeat.c |  194 ++++++++++++++++++++++++++----------------
3727  fs/ocfs2/cluster/netdebug.c  |  102 +++++++++++++++-------
3728  fs/ocfs2/cluster/tcp.c       |  138 ++++++++++++++++--------------
3729  fs/ocfs2/cluster/tcp.h       |    2 +
3730  fs/ocfs2/dir.c               |    3 +-
3731  fs/ocfs2/dlm/dlmcommon.h     |   56 +++----------
3732  fs/ocfs2/dlm/dlmdomain.c     |   44 +++++-----
3733  fs/ocfs2/dlm/dlmlock.c       |   54 ++++++------
3734  fs/ocfs2/dlm/dlmmaster.c     |  175 +++++++++++++++++++-------------------
3735  fs/ocfs2/dlm/dlmrecovery.c   |  164 ++++++++++++++++++------------------
3736  fs/ocfs2/dlm/dlmthread.c     |   16 ++--
3737  fs/ocfs2/dlmglue.c           |   21 +++--
3738  fs/ocfs2/extent_map.c        |   96 +++++++++++++++++++++
3739  fs/ocfs2/extent_map.h        |    2 +
3740  fs/ocfs2/file.c              |   93 ++++++++++++++++++++-
3741  fs/ocfs2/inode.h             |    3 +
3742  fs/ocfs2/ioctl.c             |    8 +-
3743  fs/ocfs2/journal.c           |   23 +++++-
3744  fs/ocfs2/mmap.c              |   53 +++++------
3745  fs/ocfs2/move_extents.c      |    2 +-
3746  fs/ocfs2/ocfs2.h             |    4 +-
3747  fs/ocfs2/quota_local.c       |   13 ++-
3748  fs/ocfs2/slot_map.c          |    4 +-
3749  fs/ocfs2/stack_o2cb.c        |   71 ++++++++++++++--
3750  fs/ocfs2/super.c             |   23 +++--
3751  27 files changed, 926 insertions(+), 521 deletions(-)
3752 Merging omfs/for-next (976d167 Linux 3.1-rc9)
3753 $ git merge omfs/for-next
3754 Already up-to-date.
3755 Merging squashfs/master (7657cac Squashfs: Add an option to set dev block size to 4K)
3756 $ git merge squashfs/master
3757 Auto-merging fs/squashfs/Kconfig
3758 Merge made by the 'recursive' strategy.
3759  fs/squashfs/Kconfig       |   22 ++++++++++++++++++++++
3760  fs/squashfs/squashfs_fs.h |    7 +++++++
3761  fs/squashfs/super.c       |    2 +-
3762  3 files changed, 30 insertions(+), 1 deletions(-)
3763 Merging v9fs/for-next (14211d0 9p: fix 9p.txt to advertise msize instead of maxdata)
3764 $ git merge v9fs/for-next
3765 Already up-to-date.
3766 Merging ubifs/linux-next (a7fb948 UBI: do not link debug messages when debugging is disabled)
3767 $ git merge ubifs/linux-next
3768 Merge made by the 'recursive' strategy.
3769 Merging xfs/master (9e4c109 xfs: add AIL pushing tracepoints)
3770 $ git merge xfs/master
3771 Already up-to-date.
3772 Merging vfs/for-next (206b1d0 Fix POSIX ACL permission check)
3773 $ git merge vfs/for-next
3774 Already up-to-date.
3775 Merging vfs-scale/vfs-scale-working (32385c7 kernel: fix hlist_bl again)
3776 $ git merge vfs-scale/vfs-scale-working
3777 Already up-to-date.
3778 Merging pci/linux-next (6f3baa2 PCI: Fix PRI and PASID consistency)
3779 $ git merge pci/linux-next
3780 Merge made by the 'recursive' strategy.
3781  Documentation/ABI/testing/sysfs-bus-pci |   18 +++++
3782  drivers/pci/ats.c                       |   21 +++---
3783  drivers/pci/msi.c                       |  111 +++++++++++++++++++++++++++++++
3784  include/linux/msi.h                     |    3 +
3785  include/linux/pci.h                     |    1 +
3786  include/linux/pci_regs.h                |    4 +-
3787  6 files changed, 146 insertions(+), 12 deletions(-)
3788 $ git reset --hard HEAD^
3789 HEAD is now at 978494d Merge remote-tracking branch 'ubifs/linux-next'
3790 Merging refs/next/20111102/pci
3791 $ git merge refs/next/20111102/pci
3792 Already up-to-date.
3793 Merging hid/for-next (31dced4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
3794 $ git merge hid/for-next
3795 Already up-to-date.
3796 Merging quilt/i2c (839d881 Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging)
3797 $ git merge quilt/i2c
3798 Already up-to-date.
3799 Merging bjdooks-i2c/next-i2c (f8420b7 fixup merge)
3800 $ git merge bjdooks-i2c/next-i2c
3801 Resolved 'drivers/i2c/busses/i2c-designware-platdrv.c' using previous resolution.
3802 Auto-merging drivers/i2c/busses/i2c-designware-platdrv.c
3803 CONFLICT (add/add): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c
3804 Automatic merge failed; fix conflicts and then commit the result.
3805 $ git commit -v -a
3806 [master 112c064] Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
3807 $ git diff -M --stat --summary HEAD^..
3808  drivers/i2c/busses/i2c-designware-platdrv.c |    2 +-
3809  1 files changed, 1 insertions(+), 1 deletions(-)
3810 Merging quilt/jdelvare-hwmon (a1933c5 hwmon: Use i2c_smbus_{read,write}_word_swapped)
3811 $ git merge quilt/jdelvare-hwmon
3812 Auto-merging drivers/hwmon/ibmaem.c
3813 Merge made by the 'recursive' strategy.
3814  drivers/hwmon/Kconfig      |   15 ++++-
3815  drivers/hwmon/ad7414.c     |    7 +-
3816  drivers/hwmon/ad7418.c     |   27 +++------
3817  drivers/hwmon/ads1015.c    |   21 +-----
3818  drivers/hwmon/ads7828.c    |   12 +---
3819  drivers/hwmon/asb100.c     |   10 ++--
3820  drivers/hwmon/ds1621.c     |   24 +------
3821  drivers/hwmon/ds620.c      |   42 +++----------
3822  drivers/hwmon/gl518sm.c    |    4 +-
3823  drivers/hwmon/gl520sm.c    |    4 +-
3824  drivers/hwmon/ibmaem.c     |   60 ++++++++++--------
3825  drivers/hwmon/jc42.c       |   52 ++++++----------
3826  drivers/hwmon/lm73.c       |   30 +++++++---
3827  drivers/hwmon/lm75.c       |    9 +--
3828  drivers/hwmon/lm77.c       |    4 +-
3829  drivers/hwmon/lm90.c       |  146 +++++++++++++++++++++----------------------
3830  drivers/hwmon/lm92.c       |   26 ++++----
3831  drivers/hwmon/max16065.c   |    4 +-
3832  drivers/hwmon/sht21.c      |   26 +-------
3833  drivers/hwmon/smm665.c     |   15 +---
3834  drivers/hwmon/smsc47b397.c |   13 +++--
3835  drivers/hwmon/tmp102.c     |   44 +++++--------
3836  drivers/hwmon/w83781d.c    |   10 ++--
3837  23 files changed, 259 insertions(+), 346 deletions(-)
3838 Merging hwmon-staging/hwmon-next (c5794cf hwmon: (w83627ehf) Better fix for negative temperature values)
3839 $ git merge hwmon-staging/hwmon-next
3840 Already up-to-date.
3841 Merging quilt/kernel-doc (b814f03 Documentation/PCI/pci.txt: fix a reference doc name)
3842 $ git merge quilt/kernel-doc
3843 Resolved 'Documentation/PCI/pci.txt' using previous resolution.
3844 Auto-merging Documentation/laptops/thinkpad-acpi.txt
3845 Auto-merging Documentation/PCI/pci.txt
3846 CONFLICT (content): Merge conflict in Documentation/PCI/pci.txt
3847 Automatic merge failed; fix conflicts and then commit the result.
3848 $ git commit -v -a
3849 [master 5e6b531] Merge branch 'quilt/kernel-doc'
3850 $ git diff -M --stat --summary HEAD^..
3851  Documentation/CodingStyle               |    4 ++--
3852  Documentation/PCI/pci.txt               |    4 ++--
3853  Documentation/block/switching-sched.txt |    4 ++--
3854  Documentation/cgroups/cgroups.txt       |    4 ++--
3855  Documentation/filesystems/hfs.txt       |    9 ++++-----
3856  Documentation/filesystems/inotify.txt   |    3 ++-
3857  Documentation/laptops/thinkpad-acpi.txt |    4 ++--
3858  Documentation/leds/leds-class.txt       |    4 ++--
3859  Documentation/serial/computone.txt      |    2 --
3860  9 files changed, 18 insertions(+), 20 deletions(-)
3861 Merging docs/docs-move (c6f211c Merge ra.kernel.org:/pub/scm/linux/kernel/git/rdunlap/linux-docs into docs-move)
3862 $ git merge docs/docs-move
3863 Auto-merging drivers/gpu/drm/i915/i915_drv.c
3864 Merge made by the 'recursive' strategy.
3865  Documentation/DocBook/drm.tmpl  |  308 +++++++++++++++++++++------------------
3866  drivers/gpu/drm/i915/i915_drv.c |    4 +-
3867  2 files changed, 170 insertions(+), 142 deletions(-)
3868 Merging v4l-dvb/master (76ba028 Merge /home/v4l/v4l/patchwork)
3869 $ git merge v4l-dvb/master
3870 Recorded preimage for 'drivers/staging/Makefile'
3871 Removing drivers/staging/cx25821/README
3872 Auto-merging drivers/staging/Makefile
3873 CONFLICT (content): Merge conflict in drivers/staging/Makefile
3874 Auto-merging drivers/staging/Kconfig
3875 Auto-merging drivers/media/video/Kconfig
3876 Automatic merge failed; fix conflicts and then commit the result.
3877 $ git commit -v -a
3878 Recorded resolution for 'drivers/staging/Makefile'.
3879 [master 43180fa] Merge remote-tracking branch 'v4l-dvb/master'
3880 $ git diff -M --stat --summary HEAD^..
3881  drivers/media/dvb/ddbridge/Makefile                |    2 +-
3882  drivers/media/dvb/dvb-usb/Makefile                 |    1 +
3883  drivers/media/dvb/dvb-usb/mxl111sf-demod.c         |  614 ++++++++++++++++++++
3884  drivers/media/dvb/dvb-usb/mxl111sf-demod.h         |   55 ++
3885  drivers/media/dvb/dvb-usb/mxl111sf.c               |  228 +++++++-
3886  drivers/media/dvb/dvb-usb/mxl111sf.h               |    2 +-
3887  drivers/media/dvb/ngene/Makefile                   |    2 +-
3888  drivers/media/video/Kconfig                        |    2 +
3889  drivers/media/video/Makefile                       |    1 +
3890  drivers/media/video/cx18/cx18-driver.c             |    2 +
3891  drivers/{staging => media/video}/cx25821/Kconfig   |    0
3892  drivers/{staging => media/video}/cx25821/Makefile  |    0
3893  .../video}/cx25821/cx25821-alsa.c                  |    0
3894  .../video}/cx25821/cx25821-audio-upstream.c        |    0
3895  .../video}/cx25821/cx25821-audio-upstream.h        |    0
3896  .../video}/cx25821/cx25821-audio.h                 |    0
3897  .../video}/cx25821/cx25821-biffuncs.h              |    0
3898  .../video}/cx25821/cx25821-cards.c                 |    0
3899  .../video}/cx25821/cx25821-core.c                  |    0
3900  .../video}/cx25821/cx25821-gpio.c                  |    0
3901  .../{staging => media/video}/cx25821/cx25821-i2c.c |    0
3902  .../video}/cx25821/cx25821-medusa-defines.h        |    0
3903  .../video}/cx25821/cx25821-medusa-reg.h            |    0
3904  .../video}/cx25821/cx25821-medusa-video.c          |    0
3905  .../video}/cx25821/cx25821-medusa-video.h          |    0
3906  .../{staging => media/video}/cx25821/cx25821-reg.h |    0
3907  .../video}/cx25821/cx25821-sram.h                  |    0
3908  .../video}/cx25821/cx25821-video-upstream-ch2.c    |    0
3909  .../video}/cx25821/cx25821-video-upstream-ch2.h    |    0
3910  .../video}/cx25821/cx25821-video-upstream.c        |    0
3911  .../video}/cx25821/cx25821-video-upstream.h        |    0
3912  .../video}/cx25821/cx25821-video.c                 |    0
3913  .../video}/cx25821/cx25821-video.h                 |    0
3914  drivers/{staging => media/video}/cx25821/cx25821.h |    0
3915  drivers/media/video/ivtv/ivtv-driver.c             |    2 +
3916  drivers/staging/Kconfig                            |   16 +-
3917  drivers/staging/Makefile                           |    8 +-
3918  drivers/staging/cx25821/README                     |    6 -
3919  drivers/staging/media/Kconfig                      |   37 ++
3920  drivers/staging/media/Makefile                     |    7 +
3921  drivers/staging/media/as102/Kconfig                |    7 +
3922  drivers/staging/media/as102/Makefile               |    6 +
3923  drivers/staging/media/as102/as102_drv.c            |  351 +++++++++++
3924  drivers/staging/media/as102/as102_drv.h            |  141 +++++
3925  drivers/staging/media/as102/as102_fe.c             |  603 +++++++++++++++++++
3926  drivers/staging/media/as102/as102_fw.c             |  251 ++++++++
3927  drivers/staging/media/as102/as102_fw.h             |   42 ++
3928  drivers/staging/media/as102/as102_usb_drv.c        |  478 +++++++++++++++
3929  drivers/staging/media/as102/as102_usb_drv.h        |   59 ++
3930  drivers/staging/media/as102/as10x_cmd.c            |  452 ++++++++++++++
3931  drivers/staging/media/as102/as10x_cmd.h            |  540 +++++++++++++++++
3932  drivers/staging/media/as102/as10x_cmd_cfg.c        |  215 +++++++
3933  drivers/staging/media/as102/as10x_cmd_stream.c     |  223 +++++++
3934  drivers/staging/media/as102/as10x_handle.h         |   58 ++
3935  drivers/staging/media/as102/as10x_types.h          |  198 +++++++
3936  drivers/staging/{ => media}/cxd2099/Kconfig        |    0
3937  drivers/staging/{ => media}/cxd2099/Makefile       |    0
3938  drivers/staging/{ => media}/cxd2099/TODO           |    0
3939  drivers/staging/{ => media}/cxd2099/cxd2099.c      |    0
3940  drivers/staging/{ => media}/cxd2099/cxd2099.h      |    0
3941  drivers/staging/{ => media}/dt3155v4l/Kconfig      |    0
3942  drivers/staging/{ => media}/dt3155v4l/Makefile     |    0
3943  drivers/staging/{ => media}/dt3155v4l/dt3155v4l.c  |    0
3944  drivers/staging/{ => media}/dt3155v4l/dt3155v4l.h  |    0
3945  drivers/staging/{ => media}/easycap/Kconfig        |    0
3946  drivers/staging/{ => media}/easycap/Makefile       |    0
3947  drivers/staging/{ => media}/easycap/README         |    0
3948  drivers/staging/{ => media}/easycap/easycap.h      |    0
3949  .../staging/{ => media}/easycap/easycap_ioctl.c    |    0
3950  drivers/staging/{ => media}/easycap/easycap_low.c  |    0
3951  drivers/staging/{ => media}/easycap/easycap_main.c |    0
3952  .../staging/{ => media}/easycap/easycap_settings.c |    0
3953  .../staging/{ => media}/easycap/easycap_sound.c    |    0
3954  .../staging/{ => media}/easycap/easycap_testcard.c |    0
3955  drivers/staging/{ => media}/go7007/Kconfig         |    0
3956  drivers/staging/{ => media}/go7007/Makefile        |    0
3957  drivers/staging/{ => media}/go7007/README          |    0
3958  drivers/staging/{ => media}/go7007/go7007-driver.c |    0
3959  drivers/staging/{ => media}/go7007/go7007-fw.c     |    0
3960  drivers/staging/{ => media}/go7007/go7007-i2c.c    |    0
3961  drivers/staging/{ => media}/go7007/go7007-priv.h   |    0
3962  drivers/staging/{ => media}/go7007/go7007-usb.c    |    0
3963  drivers/staging/{ => media}/go7007/go7007-v4l2.c   |    0
3964  drivers/staging/{ => media}/go7007/go7007.h        |    0
3965  drivers/staging/{ => media}/go7007/go7007.txt      |    0
3966  drivers/staging/{ => media}/go7007/s2250-board.c   |    0
3967  drivers/staging/{ => media}/go7007/s2250-loader.c  |    0
3968  drivers/staging/{ => media}/go7007/s2250-loader.h  |    0
3969  .../staging/{ => media}/go7007/saa7134-go7007.c    |    0
3970  drivers/staging/{ => media}/go7007/snd-go7007.c    |    0
3971  drivers/staging/{ => media}/go7007/wis-i2c.h       |    0
3972  drivers/staging/{ => media}/go7007/wis-ov7640.c    |    0
3973  drivers/staging/{ => media}/go7007/wis-saa7113.c   |    0
3974  drivers/staging/{ => media}/go7007/wis-saa7115.c   |    0
3975  .../staging/{ => media}/go7007/wis-sony-tuner.c    |    0
3976  drivers/staging/{ => media}/go7007/wis-tw2804.c    |    0
3977  drivers/staging/{ => media}/go7007/wis-tw9903.c    |    0
3978  drivers/staging/{ => media}/go7007/wis-uda1342.c   |    0
3979  drivers/staging/{ => media}/lirc/Kconfig           |    0
3980  drivers/staging/{ => media}/lirc/Makefile          |    0
3981  drivers/staging/{ => media}/lirc/TODO              |    0
3982  drivers/staging/{ => media}/lirc/TODO.lirc_zilog   |    0
3983  drivers/staging/{ => media}/lirc/lirc_bt829.c      |    0
3984  drivers/staging/{ => media}/lirc/lirc_ene0100.h    |    0
3985  .../staging/{ => media}/lirc/lirc_igorplugusb.c    |    0
3986  drivers/staging/{ => media}/lirc/lirc_imon.c       |    0
3987  drivers/staging/{ => media}/lirc/lirc_parallel.c   |    0
3988  drivers/staging/{ => media}/lirc/lirc_parallel.h   |    0
3989  drivers/staging/{ => media}/lirc/lirc_sasem.c      |    0
3990  drivers/staging/{ => media}/lirc/lirc_serial.c     |    0
3991  drivers/staging/{ => media}/lirc/lirc_sir.c        |    0
3992  drivers/staging/{ => media}/lirc/lirc_ttusbir.c    |    0
3993  drivers/staging/{ => media}/lirc/lirc_zilog.c      |    0
3994  drivers/staging/{ => media}/solo6x10/Kconfig       |    0
3995  drivers/staging/{ => media}/solo6x10/Makefile      |    0
3996  drivers/staging/{ => media}/solo6x10/TODO          |    0
3997  drivers/staging/{ => media}/solo6x10/core.c        |    0
3998  drivers/staging/{ => media}/solo6x10/disp.c        |    0
3999  drivers/staging/{ => media}/solo6x10/enc.c         |    0
4000  drivers/staging/{ => media}/solo6x10/g723.c        |    0
4001  drivers/staging/{ => media}/solo6x10/gpio.c        |    0
4002  drivers/staging/{ => media}/solo6x10/i2c.c         |    0
4003  drivers/staging/{ => media}/solo6x10/jpeg.h        |    0
4004  drivers/staging/{ => media}/solo6x10/offsets.h     |    0
4005  drivers/staging/{ => media}/solo6x10/osd-font.h    |    0
4006  drivers/staging/{ => media}/solo6x10/p2m.c         |    0
4007  drivers/staging/{ => media}/solo6x10/registers.h   |    0
4008  drivers/staging/{ => media}/solo6x10/solo6x10.h    |    0
4009  drivers/staging/{ => media}/solo6x10/tw28.c        |    0
4010  drivers/staging/{ => media}/solo6x10/tw28.h        |    0
4011  drivers/staging/{ => media}/solo6x10/v4l2-enc.c    |    0
4012  drivers/staging/{ => media}/solo6x10/v4l2.c        |    0
4013  132 files changed, 4576 insertions(+), 33 deletions(-)
4014  create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-demod.c
4015  create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-demod.h
4016  rename drivers/{staging => media/video}/cx25821/Kconfig (100%)
4017  rename drivers/{staging => media/video}/cx25821/Makefile (100%)
4018  rename drivers/{staging => media/video}/cx25821/cx25821-alsa.c (100%)
4019  rename drivers/{staging => media/video}/cx25821/cx25821-audio-upstream.c (100%)
4020  rename drivers/{staging => media/video}/cx25821/cx25821-audio-upstream.h (100%)
4021  rename drivers/{staging => media/video}/cx25821/cx25821-audio.h (100%)
4022  rename drivers/{staging => media/video}/cx25821/cx25821-biffuncs.h (100%)
4023  rename drivers/{staging => media/video}/cx25821/cx25821-cards.c (100%)
4024  rename drivers/{staging => media/video}/cx25821/cx25821-core.c (100%)
4025  rename drivers/{staging => media/video}/cx25821/cx25821-gpio.c (100%)
4026  rename drivers/{staging => media/video}/cx25821/cx25821-i2c.c (100%)
4027  rename drivers/{staging => media/video}/cx25821/cx25821-medusa-defines.h (100%)
4028  rename drivers/{staging => media/video}/cx25821/cx25821-medusa-reg.h (100%)
4029  rename drivers/{staging => media/video}/cx25821/cx25821-medusa-video.c (100%)
4030  rename drivers/{staging => media/video}/cx25821/cx25821-medusa-video.h (100%)
4031  rename drivers/{staging => media/video}/cx25821/cx25821-reg.h (100%)
4032  rename drivers/{staging => media/video}/cx25821/cx25821-sram.h (100%)
4033  rename drivers/{staging => media/video}/cx25821/cx25821-video-upstream-ch2.c (100%)
4034  rename drivers/{staging => media/video}/cx25821/cx25821-video-upstream-ch2.h (100%)
4035  rename drivers/{staging => media/video}/cx25821/cx25821-video-upstream.c (100%)
4036  rename drivers/{staging => media/video}/cx25821/cx25821-video-upstream.h (100%)
4037  rename drivers/{staging => media/video}/cx25821/cx25821-video.c (100%)
4038  rename drivers/{staging => media/video}/cx25821/cx25821-video.h (100%)
4039  rename drivers/{staging => media/video}/cx25821/cx25821.h (100%)
4040  delete mode 100644 drivers/staging/cx25821/README
4041  create mode 100644 drivers/staging/media/Kconfig
4042  create mode 100644 drivers/staging/media/Makefile
4043  create mode 100644 drivers/staging/media/as102/Kconfig
4044  create mode 100644 drivers/staging/media/as102/Makefile
4045  create mode 100644 drivers/staging/media/as102/as102_drv.c
4046  create mode 100644 drivers/staging/media/as102/as102_drv.h
4047  create mode 100644 drivers/staging/media/as102/as102_fe.c
4048  create mode 100644 drivers/staging/media/as102/as102_fw.c
4049  create mode 100644 drivers/staging/media/as102/as102_fw.h
4050  create mode 100644 drivers/staging/media/as102/as102_usb_drv.c
4051  create mode 100644 drivers/staging/media/as102/as102_usb_drv.h
4052  create mode 100644 drivers/staging/media/as102/as10x_cmd.c
4053  create mode 100644 drivers/staging/media/as102/as10x_cmd.h
4054  create mode 100644 drivers/staging/media/as102/as10x_cmd_cfg.c
4055  create mode 100644 drivers/staging/media/as102/as10x_cmd_stream.c
4056  create mode 100644 drivers/staging/media/as102/as10x_handle.h
4057  create mode 100644 drivers/staging/media/as102/as10x_types.h
4058  rename drivers/staging/{ => media}/cxd2099/Kconfig (100%)
4059  rename drivers/staging/{ => media}/cxd2099/Makefile (100%)
4060  rename drivers/staging/{ => media}/cxd2099/TODO (100%)
4061  rename drivers/staging/{ => media}/cxd2099/cxd2099.c (100%)
4062  rename drivers/staging/{ => media}/cxd2099/cxd2099.h (100%)
4063  rename drivers/staging/{ => media}/dt3155v4l/Kconfig (100%)
4064  rename drivers/staging/{ => media}/dt3155v4l/Makefile (100%)
4065  rename drivers/staging/{ => media}/dt3155v4l/dt3155v4l.c (100%)
4066  rename drivers/staging/{ => media}/dt3155v4l/dt3155v4l.h (100%)
4067  rename drivers/staging/{ => media}/easycap/Kconfig (100%)
4068  rename drivers/staging/{ => media}/easycap/Makefile (100%)
4069  rename drivers/staging/{ => media}/easycap/README (100%)
4070  rename drivers/staging/{ => media}/easycap/easycap.h (100%)
4071  rename drivers/staging/{ => media}/easycap/easycap_ioctl.c (100%)
4072  rename drivers/staging/{ => media}/easycap/easycap_low.c (100%)
4073  rename drivers/staging/{ => media}/easycap/easycap_main.c (100%)
4074  rename drivers/staging/{ => media}/easycap/easycap_settings.c (100%)
4075  rename drivers/staging/{ => media}/easycap/easycap_sound.c (100%)
4076  rename drivers/staging/{ => media}/easycap/easycap_testcard.c (100%)
4077  rename drivers/staging/{ => media}/go7007/Kconfig (100%)
4078  rename drivers/staging/{ => media}/go7007/Makefile (100%)
4079  rename drivers/staging/{ => media}/go7007/README (100%)
4080  rename drivers/staging/{ => media}/go7007/go7007-driver.c (100%)
4081  rename drivers/staging/{ => media}/go7007/go7007-fw.c (100%)
4082  rename drivers/staging/{ => media}/go7007/go7007-i2c.c (100%)
4083  rename drivers/staging/{ => media}/go7007/go7007-priv.h (100%)
4084  rename drivers/staging/{ => media}/go7007/go7007-usb.c (100%)
4085  rename drivers/staging/{ => media}/go7007/go7007-v4l2.c (100%)
4086  rename drivers/staging/{ => media}/go7007/go7007.h (100%)
4087  rename drivers/staging/{ => media}/go7007/go7007.txt (100%)
4088  rename drivers/staging/{ => media}/go7007/s2250-board.c (100%)
4089  rename drivers/staging/{ => media}/go7007/s2250-loader.c (100%)
4090  rename drivers/staging/{ => media}/go7007/s2250-loader.h (100%)
4091  rename drivers/staging/{ => media}/go7007/saa7134-go7007.c (100%)
4092  rename drivers/staging/{ => media}/go7007/snd-go7007.c (100%)
4093  rename drivers/staging/{ => media}/go7007/wis-i2c.h (100%)
4094  rename drivers/staging/{ => media}/go7007/wis-ov7640.c (100%)
4095  rename drivers/staging/{ => media}/go7007/wis-saa7113.c (100%)
4096  rename drivers/staging/{ => media}/go7007/wis-saa7115.c (100%)
4097  rename drivers/staging/{ => media}/go7007/wis-sony-tuner.c (100%)
4098  rename drivers/staging/{ => media}/go7007/wis-tw2804.c (100%)
4099  rename drivers/staging/{ => media}/go7007/wis-tw9903.c (100%)
4100  rename drivers/staging/{ => media}/go7007/wis-uda1342.c (100%)
4101  rename drivers/staging/{ => media}/lirc/Kconfig (100%)
4102  rename drivers/staging/{ => media}/lirc/Makefile (100%)
4103  rename drivers/staging/{ => media}/lirc/TODO (100%)
4104  rename drivers/staging/{ => media}/lirc/TODO.lirc_zilog (100%)
4105  rename drivers/staging/{ => media}/lirc/lirc_bt829.c (100%)
4106  rename drivers/staging/{ => media}/lirc/lirc_ene0100.h (100%)
4107  rename drivers/staging/{ => media}/lirc/lirc_igorplugusb.c (100%)
4108  rename drivers/staging/{ => media}/lirc/lirc_imon.c (100%)
4109  rename drivers/staging/{ => media}/lirc/lirc_parallel.c (100%)
4110  rename drivers/staging/{ => media}/lirc/lirc_parallel.h (100%)
4111  rename drivers/staging/{ => media}/lirc/lirc_sasem.c (100%)
4112  rename drivers/staging/{ => media}/lirc/lirc_serial.c (100%)
4113  rename drivers/staging/{ => media}/lirc/lirc_sir.c (100%)
4114  rename drivers/staging/{ => media}/lirc/lirc_ttusbir.c (100%)
4115  rename drivers/staging/{ => media}/lirc/lirc_zilog.c (100%)
4116  rename drivers/staging/{ => media}/solo6x10/Kconfig (100%)
4117  rename drivers/staging/{ => media}/solo6x10/Makefile (100%)
4118  rename drivers/staging/{ => media}/solo6x10/TODO (100%)
4119  rename drivers/staging/{ => media}/solo6x10/core.c (100%)
4120  rename drivers/staging/{ => media}/solo6x10/disp.c (100%)
4121  rename drivers/staging/{ => media}/solo6x10/enc.c (100%)
4122  rename drivers/staging/{ => media}/solo6x10/g723.c (100%)
4123  rename drivers/staging/{ => media}/solo6x10/gpio.c (100%)
4124  rename drivers/staging/{ => media}/solo6x10/i2c.c (100%)
4125  rename drivers/staging/{ => media}/solo6x10/jpeg.h (100%)
4126  rename drivers/staging/{ => media}/solo6x10/offsets.h (100%)
4127  rename drivers/staging/{ => media}/solo6x10/osd-font.h (100%)
4128  rename drivers/staging/{ => media}/solo6x10/p2m.c (100%)
4129  rename drivers/staging/{ => media}/solo6x10/registers.h (100%)
4130  rename drivers/staging/{ => media}/solo6x10/solo6x10.h (100%)
4131  rename drivers/staging/{ => media}/solo6x10/tw28.c (100%)
4132  rename drivers/staging/{ => media}/solo6x10/tw28.h (100%)
4133  rename drivers/staging/{ => media}/solo6x10/v4l2-enc.c (100%)
4134  rename drivers/staging/{ => media}/solo6x10/v4l2.c (100%)
4135 Merging kbuild/for-next (57b742f Merge branch 'kbuild/kbuild' into kbuild/for-next)
4136 $ git merge kbuild/for-next
4137 Resolved 'drivers/net/ethernet/stmicro/stmmac/Kconfig' using previous resolution.
4138 Auto-merging scripts/checkpatch.pl
4139 Auto-merging drivers/scsi/Kconfig
4140 Auto-merging drivers/pci/Kconfig
4141 Auto-merging drivers/net/ethernet/stmicro/stmmac/Kconfig
4142 CONFLICT (content): Merge conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig
4143 Auto-merging arch/x86/um/Kconfig
4144 Auto-merging arch/x86/Kconfig
4145 Auto-merging arch/sparc/Kconfig
4146 Auto-merging arch/powerpc/platforms/wsp/Kconfig
4147 Auto-merging arch/powerpc/platforms/Kconfig.cputype
4148 Auto-merging arch/powerpc/platforms/40x/Kconfig
4149 Auto-merging arch/powerpc/Kconfig
4150 Auto-merging arch/openrisc/Kconfig
4151 Removing arch/mips/powertv/asic/Kconfig
4152 Auto-merging arch/mips/Kconfig
4153 Auto-merging arch/m32r/Kconfig
4154 Auto-merging arch/arm/mach-at91/Kconfig
4155 Auto-merging arch/alpha/Kconfig
4156 Auto-merging Makefile
4157 Automatic merge failed; fix conflicts and then commit the result.
4158 $ git commit -v -a
4159 [master 963a018] Merge remote-tracking branch 'kbuild/for-next'
4160 $ git diff -M --stat --summary HEAD^..
4161  Kbuild                                      |    6 +-
4162  Makefile                                    |    4 +-
4163  arch/alpha/Kconfig                          |    5 -
4164  arch/arm/mach-at91/Kconfig                  |    6 -
4165  arch/m32r/Kconfig                           |    7 -
4166  arch/mips/Kconfig                           |   14 -
4167  arch/mips/powertv/Kconfig                   |    2 -
4168  arch/mips/powertv/asic/Kconfig              |   28 --
4169  arch/openrisc/Kconfig                       |   12 -
4170  arch/powerpc/Kconfig                        |   22 -
4171  arch/powerpc/platforms/40x/Kconfig          |    5 -
4172  arch/powerpc/platforms/Kconfig.cputype      |    8 -
4173  arch/powerpc/platforms/embedded6xx/Kconfig  |    4 -
4174  arch/powerpc/platforms/prep/Kconfig         |    9 -
4175  arch/powerpc/platforms/wsp/Kconfig          |    5 -
4176  arch/score/Kconfig                          |   19 -
4177  arch/sh/Kconfig                             |    4 -
4178  arch/sparc/Kconfig                          |    7 +-
4179  arch/x86/Kconfig                            |    3 -
4180  arch/x86/um/Kconfig                         |    3 -
4181  drivers/net/ethernet/stmicro/stmmac/Kconfig |    9 -
4182  drivers/pci/Kconfig                         |   11 -
4183  drivers/scsi/Kconfig                        |   14 -
4184  samples/Kconfig                             |    6 -
4185  scripts/Makefile.build                      |    2 +-
4186  scripts/Makefile.lib                        |    4 +
4187  scripts/basic/fixdep.c                      |    1 +
4188  scripts/checkpatch.pl                       |   14 +
4189  scripts/extract-vmlinux                     |   62 +++
4190  scripts/genksyms/genksyms.c                 |    3 +-
4191  scripts/genksyms/genksyms.h                 |    4 +-
4192  scripts/genksyms/lex.l                      |    8 +
4193  scripts/genksyms/lex.lex.c_shipped          |   12 +-
4194  scripts/genksyms/parse.tab.c_shipped        |  645 ++++++++++++++-------------
4195  scripts/genksyms/parse.tab.h_shipped        |    7 +-
4196  scripts/genksyms/parse.y                    |   40 +-
4197  scripts/kconfig/Makefile                    |   28 +--
4198  scripts/kconfig/confdata.c                  |   49 ++-
4199  scripts/kconfig/lxdialog/textbox.c          |    3 +-
4200  scripts/kconfig/mconf.c                     |   86 +++--
4201  scripts/kconfig/menu.c                      |   13 +-
4202  scripts/kconfig/nconf.c                     |   23 +-
4203  scripts/kconfig/nconf.gui.c                 |   59 ++-
4204  scripts/kconfig/nconf.h                     |    2 +-
4205  scripts/kconfig/streamline_config.pl        |   22 +-
4206  scripts/tags.sh                             |    4 +-
4207  46 files changed, 656 insertions(+), 648 deletions(-)
4208  delete mode 100644 arch/mips/powertv/asic/Kconfig
4209  create mode 100755 scripts/extract-vmlinux
4210 Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
4211 $ git merge kconfig/for-next
4212 Already up-to-date!
4213 Merge made by the 'recursive' strategy.
4214 Merging libata/NEXT (a0da191 pata_efar: fix register naming used in efar_set_piomode())
4215 $ git merge libata/NEXT
4216 Already up-to-date.
4217 Merging infiniband/for-next (504255f Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'fdr', 'ipath', 'ipoib', 'misc', 'mlx4', 'misc', 'nes', 'qib' and 'xrc' into for-next)
4218 $ git merge infiniband/for-next
4219 Already up-to-date.
4220 Merging acpi/acpi (38c0a0c Merge branches 'apei', 'bz-13195' and 'doc' into acpi)
4221 $ git merge acpi/acpi
4222 Already up-to-date.
4223 Merging idle-test/idle-test (a0bfa13 cpuidle: stop depending on pm_idle)
4224 $ git merge idle-test/idle-test
4225 Already up-to-date.
4226 Merging powertools/tools-test (d30c4b7 tools/power turbostat: fit output into 80 columns on snb-ep)
4227 $ git merge powertools/tools-test
4228 Already up-to-date.
4229 Merging cpupowerutils/master (498ca79 cpupower: use man(1) when calling "cpupower help subcommand")
4230 $ git merge cpupowerutils/master
4231 Already up-to-date.
4232 Merging ieee1394/for-next (a572e68 firewire: ohci: fix isochronous DMA synchronization)
4233 $ git merge ieee1394/for-next
4234 Already up-to-date.
4235 Merging ubi/linux-next (93ee7a9 Linux 3.1-rc2)
4236 $ git merge ubi/linux-next
4237 Already up-to-date.
4238 Merging dlm/next (c3b92c8 Linux 3.1)
4239 $ git merge dlm/next
4240 Already up-to-date.
4241 Merging swiotlb/master (25b84fa swiotlb: Export io_tlb_nslabs as swiotlb_nslabs and use it.)
4242 $ git merge swiotlb/master
4243 Recorded preimage for 'drivers/xen/swiotlb-xen.c'
4244 Auto-merging drivers/xen/swiotlb-xen.c
4245 CONFLICT (content): Merge conflict in drivers/xen/swiotlb-xen.c
4246 Automatic merge failed; fix conflicts and then commit the result.
4247 $ git commit -v -a
4248 Recorded resolution for 'drivers/xen/swiotlb-xen.c'.
4249 [master fa8ca71] Merge remote-tracking branch 'swiotlb/master'
4250 $ git diff -M --stat --summary HEAD^..
4251 Merging ibft/master (f1b1e06 iscsi-ibft: Fix compile warning introduced by 'iscsi_ibft: iscsi_ibft_find unused variable i')
4252 $ git merge ibft/master
4253 Merge made by the 'recursive' strategy.
4254 Merging scsi/master (99a700b [SCSI] mv_sas: OCZ RevoDrive3 & zDrive R4 support)
4255 $ git merge scsi/master
4256 Merge made by the 'recursive' strategy.
4257  drivers/firmware/edd.c                |    6 +-
4258  drivers/scsi/bnx2fc/bnx2fc.h          |    5 +-
4259  drivers/scsi/bnx2fc/bnx2fc_els.c      |   23 +-
4260  drivers/scsi/bnx2fc/bnx2fc_fcoe.c     |    2 +-
4261  drivers/scsi/bnx2fc/bnx2fc_io.c       |   37 ++
4262  drivers/scsi/device_handler/scsi_dh.c |   10 +-
4263  drivers/scsi/fcoe/fcoe.c              |   13 +-
4264  drivers/scsi/hosts.c                  |    9 +-
4265  drivers/scsi/hpsa.c                   |  221 ++++++++++-
4266  drivers/scsi/hpsa.h                   |   10 +-
4267  drivers/scsi/hpsa_cmd.h               |    5 +-
4268  drivers/scsi/ipr.c                    |    2 +
4269  drivers/scsi/ipr.h                    |    1 +
4270  drivers/scsi/isci/host.c              |   23 +-
4271  drivers/scsi/isci/init.c              |    2 +-
4272  drivers/scsi/isci/port.c              |  146 +++----
4273  drivers/scsi/isci/port.h              |    6 +-
4274  drivers/scsi/isci/probe_roms.h        |    4 +-
4275  drivers/scsi/isci/remote_device.c     |   85 ----
4276  drivers/scsi/isci/remote_device.h     |    5 +-
4277  drivers/scsi/isci/request.c           |   52 +--
4278  drivers/scsi/isci/request.h           |    6 -
4279  drivers/scsi/isci/task.c              |  698 +++++++++++----------------------
4280  drivers/scsi/isci/task.h              |   35 +--
4281  drivers/scsi/libfc/fc_exch.c          |    7 +-
4282  drivers/scsi/libfc/fc_lport.c         |  100 +++---
4283  drivers/scsi/mpt2sas/mpi/mpi2.h       |   11 +-
4284  drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h  |  153 +++++++-
4285  drivers/scsi/mpt2sas/mpi/mpi2_ioc.h   |  113 ++++++-
4286  drivers/scsi/mpt2sas/mpt2sas_base.c   |  247 ++++++++++--
4287  drivers/scsi/mpt2sas/mpt2sas_base.h   |   32 ++-
4288  drivers/scsi/mpt2sas/mpt2sas_config.c |   67 ++--
4289  drivers/scsi/mpt2sas/mpt2sas_ctl.c    |    9 +-
4290  drivers/scsi/mpt2sas/mpt2sas_scsih.c  |  634 ++++++++++++++++++++++++------
4291  drivers/scsi/mvsas/mv_init.c          |   10 +
4292  drivers/scsi/pmcraid.c                |    2 +-
4293  drivers/scsi/qla2xxx/qla_isr.c        |    2 +-
4294  drivers/scsi/scsi_lib.c               |    9 +
4295  drivers/scsi/sd.c                     |   12 +-
4296  drivers/scsi/sd.h                     |    6 -
4297  drivers/scsi/st.c                     |    4 +-
4298  include/linux/pci_ids.h               |    2 +
4299  42 files changed, 1752 insertions(+), 1074 deletions(-)
4300 Merging target-updates/for-next (2235007 target: add back error handling in transport_complete_task)
4301 $ git merge target-updates/for-next
4302 Merge made by the 'recursive' strategy.
4303  drivers/target/iscsi/iscsi_target.c     |   11 +++---
4304  drivers/target/loopback/tcm_loop.c      |   23 ++++++++++++-
4305  drivers/target/target_core_pscsi.c      |    2 +-
4306  drivers/target/target_core_tmr.c        |   23 +++----------
4307  drivers/target/target_core_transport.c  |   54 ++++++++++++++----------------
4308  drivers/target/tcm_fc/tcm_fc.h          |    2 +-
4309  drivers/target/tcm_fc/tfc_cmd.c         |    3 +-
4310  include/target/target_core_base.h       |    1 -
4311  include/target/target_core_fabric_ops.h |    7 +++-
4312  include/target/target_core_transport.h  |    1 -
4313  10 files changed, 67 insertions(+), 60 deletions(-)
4314 Merging target-merge/for-next-merge (e0d85e5 ib_srpt: Initial SRP Target merge for v3.2-rc1)
4315 $ git merge target-merge/for-next-merge
4316 Merge made by the 'recursive' strategy.
4317  drivers/infiniband/Kconfig              |    1 +
4318  drivers/infiniband/Makefile             |    1 +
4319  drivers/infiniband/ulp/srpt/Kconfig     |   12 +
4320  drivers/infiniband/ulp/srpt/Makefile    |    2 +
4321  drivers/infiniband/ulp/srpt/ib_dm_mad.h |  139 ++
4322  drivers/infiniband/ulp/srpt/ib_srpt.c   | 4081 +++++++++++++++++++++++++++++++
4323  drivers/infiniband/ulp/srpt/ib_srpt.h   |  444 ++++
4324  7 files changed, 4680 insertions(+), 0 deletions(-)
4325  create mode 100644 drivers/infiniband/ulp/srpt/Kconfig
4326  create mode 100644 drivers/infiniband/ulp/srpt/Makefile
4327  create mode 100644 drivers/infiniband/ulp/srpt/ib_dm_mad.h
4328  create mode 100644 drivers/infiniband/ulp/srpt/ib_srpt.c
4329  create mode 100644 drivers/infiniband/ulp/srpt/ib_srpt.h
4330 Merging slave-dma/next (4598fc2 dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle)
4331 $ git merge slave-dma/next
4332 Auto-merging drivers/tty/serial/sh-sci.c
4333 Auto-merging drivers/dma/pl330.c
4334 Merge made by the 'recursive' strategy.
4335  drivers/dma/amba-pl08x.c    |  381 ++++++++++++++++++++++++-------------------
4336  drivers/dma/at_hdmac.c      |    5 +-
4337  drivers/dma/dw_dmac.c       |    5 +-
4338  drivers/dma/ep93xx_dma.c    |    1 +
4339  drivers/dma/imx-dma.c       |    1 +
4340  drivers/dma/imx-sdma.c      |    1 +
4341  drivers/dma/intel_mid_dma.c |    9 +-
4342  drivers/dma/mpc512x_dma.c   |    1 -
4343  drivers/dma/pch_dma.c       |    7 +-
4344  drivers/dma/pl330.c         |    2 -
4345  drivers/dma/shdma.c         |  129 ++++++++++-----
4346  drivers/dma/shdma.h         |    7 +
4347  drivers/dma/timb_dma.c      |    5 +-
4348  drivers/tty/serial/sh-sci.c |   25 +--
4349  include/linux/amba/pl08x.h  |   22 ++-
4350  include/linux/serial_sci.h  |    2 -
4351  16 files changed, 348 insertions(+), 255 deletions(-)
4352 Merging async_tx/next (21ef4b8 dmaengine: use DEFINE_IDR for static initialization)
4353 $ git merge async_tx/next
4354 Already up-to-date.
4355 Merging net-next/master (8b3408f dp83640: free packet queues on remove)
4356 $ git merge net-next/master
4357 Already up-to-date.
4358 Merging wireless-next/master (8b3408f dp83640: free packet queues on remove)
4359 $ git merge wireless-next/master
4360 Already up-to-date.
4361 Merging bluetooth/master (693ff2d Bluetooth: Fix hidp_get_connection())
4362 $ git merge bluetooth/master
4363 Resolved 'net/bluetooth/l2cap_sock.c' using previous resolution.
4364 Auto-merging net/bluetooth/rfcomm/sock.c
4365 Auto-merging net/bluetooth/l2cap_sock.c
4366 CONFLICT (content): Merge conflict in net/bluetooth/l2cap_sock.c
4367 Auto-merging include/net/bluetooth/bluetooth.h
4368 Auto-merging drivers/bluetooth/btusb.c
4369 Automatic merge failed; fix conflicts and then commit the result.
4370 $ git commit -v -a
4371 [master ca607ff] Merge remote-tracking branch 'bluetooth/master'
4372 $ git diff -M --stat --summary HEAD^..
4373  drivers/bluetooth/ath3k.c         |   15 +-
4374  drivers/bluetooth/bfusb.c         |    4 +-
4375  drivers/bluetooth/bluecard_cs.c   |    4 +-
4376  drivers/bluetooth/bt3c_cs.c       |    4 +-
4377  drivers/bluetooth/btuart_cs.c     |    4 +-
4378  drivers/bluetooth/btusb.c         |   13 +-
4379  drivers/bluetooth/dtl1_cs.c       |    4 +-
4380  drivers/bluetooth/hci_vhci.c      |    5 +-
4381  include/net/bluetooth/bluetooth.h |    2 +-
4382  include/net/bluetooth/hci.h       |   15 +
4383  include/net/bluetooth/hci_core.h  |   22 +-
4384  include/net/bluetooth/l2cap.h     |  355 ++++++++++++++++---
4385  include/net/bluetooth/mgmt.h      |    2 -
4386  net/bluetooth/bnep/core.c         |   13 +-
4387  net/bluetooth/cmtp/core.c         |   13 +-
4388  net/bluetooth/hci_conn.c          |   14 +-
4389  net/bluetooth/hci_core.c          |   71 ++---
4390  net/bluetooth/hci_event.c         |   32 ++-
4391  net/bluetooth/hci_sysfs.c         |   40 +--
4392  net/bluetooth/hidp/core.c         |  157 +++++----
4393  net/bluetooth/l2cap_core.c        |  687 +++++++++++++++++++++++++------------
4394  net/bluetooth/l2cap_sock.c        |   53 ++--
4395  net/bluetooth/mgmt.c              |   85 +++--
4396  net/bluetooth/rfcomm/core.c       |   65 +++--
4397  net/bluetooth/rfcomm/sock.c       |    2 +
4398  net/bluetooth/rfcomm/tty.c        |   45 ++--
4399  26 files changed, 1149 insertions(+), 577 deletions(-)
4400 Merging mtd/master (3f30310 Merge git://git.infradead.org/mtd-2.6)
4401 $ git merge mtd/master
4402 Already up-to-date.
4403 Merging l2-mtd/master (48e546b mtd: tests: annotate as DANGEROUS in Kconfig)
4404 $ git merge l2-mtd/master
4405 Resolved 'arch/arm/mach-at91/board-afeb-9260v1.c' using previous resolution.
4406 Resolved 'arch/arm/mach-at91/board-neocore926.c' using previous resolution.
4407 Resolved 'arch/arm/mach-at91/board-rm9200dk.c' using previous resolution.
4408 Resolved 'arch/arm/mach-at91/board-sam9g20ek.c' using previous resolution.
4409 Resolved 'arch/arm/mach-at91/board-sam9m10g45ek.c' using previous resolution.
4410 Resolved 'drivers/mtd/maps/lantiq-flash.c' using previous resolution.
4411 Auto-merging fs/jffs2/fs.c
4412 Auto-merging drivers/mtd/onenand/omap2.c
4413 Removing drivers/mtd/nand/edb7312.c
4414 Auto-merging drivers/mtd/nand/au1550nd.c
4415 Auto-merging drivers/mtd/nand/atmel_nand.c
4416 Auto-merging drivers/mtd/nand/Kconfig
4417 Auto-merging drivers/mtd/mtdchar.c
4418 Auto-merging drivers/mtd/maps/lantiq-flash.c
4419 CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
4420 Removing drivers/mtd/maps/edb7312.c
4421 Removing drivers/mtd/maps/ceiva.c
4422 Auto-merging drivers/mtd/Kconfig
4423 Auto-merging arch/arm/mach-pxa/zylonite.c
4424 Auto-merging arch/arm/mach-pxa/raumfeld.c
4425 Auto-merging arch/arm/mach-pxa/littleton.c
4426 Auto-merging arch/arm/mach-pxa/cm-x300.c
4427 Auto-merging arch/arm/mach-orion5x/ts78xx-setup.c
4428 Auto-merging arch/arm/mach-mmp/aspenite.c
4429 Auto-merging arch/arm/mach-ep93xx/ts72xx.c
4430 Auto-merging arch/arm/mach-davinci/board-tnetv107x-evm.c
4431 Auto-merging arch/arm/mach-davinci/board-neuros-osd2.c
4432 Auto-merging arch/arm/mach-davinci/board-mityomapl138.c
4433 Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
4434 Auto-merging arch/arm/mach-davinci/board-dm365-evm.c
4435 Auto-merging arch/arm/mach-davinci/board-dm355-leopard.c
4436 Auto-merging arch/arm/mach-davinci/board-dm355-evm.c
4437 Auto-merging arch/arm/mach-davinci/board-da850-evm.c
4438 Auto-merging arch/arm/mach-davinci/board-da830-evm.c
4439 Auto-merging arch/arm/mach-at91/include/mach/board.h
4440 Auto-merging arch/arm/mach-at91/board-yl-9200.c
4441 Auto-merging arch/arm/mach-at91/board-usb-a926x.c
4442 CONFLICT (modify/delete): arch/arm/mach-at91/board-usb-a9260.c deleted in HEAD and modified in l2-mtd/master. Version l2-mtd/master of arch/arm/mach-at91/board-usb-a9260.c left in tree.
4443 Auto-merging arch/arm/mach-at91/board-snapper9260.c
4444 Auto-merging arch/arm/mach-at91/board-sam9rlek.c
4445 Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
4446 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9m10g45ek.c
4447 Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
4448 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9g20ek.c
4449 Auto-merging arch/arm/mach-at91/board-sam9263ek.c
4450 Auto-merging arch/arm/mach-at91/board-sam9261ek.c
4451 Auto-merging arch/arm/mach-at91/board-sam9260ek.c
4452 Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
4453 Auto-merging arch/arm/mach-at91/board-rm9200dk.c
4454 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-rm9200dk.c
4455 Auto-merging arch/arm/mach-at91/board-qil-a9260.c
4456 Auto-merging arch/arm/mach-at91/board-neocore926.c
4457 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-neocore926.c
4458 Auto-merging arch/arm/mach-at91/board-kb9202.c
4459 Auto-merging arch/arm/mach-at91/board-cap9adk.c
4460 Auto-merging arch/arm/mach-at91/board-cam60.c
4461 Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
4462 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-afeb-9260v1.c
4463 Automatic merge failed; fix conflicts and then commit the result.
4464 $ git rm -f arch/arm/mach-at91/board-usb-a9260.c
4465 arch/arm/mach-at91/board-afeb-9260v1.c: needs merge
4466 arch/arm/mach-at91/board-neocore926.c: needs merge
4467 arch/arm/mach-at91/board-rm9200dk.c: needs merge
4468 arch/arm/mach-at91/board-sam9g20ek.c: needs merge
4469 arch/arm/mach-at91/board-sam9m10g45ek.c: needs merge
4470 arch/arm/mach-at91/board-usb-a9260.c: needs merge
4471 drivers/mtd/maps/lantiq-flash.c: needs merge
4472 rm 'arch/arm/mach-at91/board-usb-a9260.c'
4473 $ git commit -v -a
4474 [master 45f696f] Merge remote-tracking branch 'l2-mtd/master'
4475 $ git diff -M --stat --summary HEAD^..
4476  Documentation/DocBook/mtdnand.tmpl                 |   19 +-
4477  .../devicetree/bindings/mtd/atmel-dataflash.txt    |   14 +
4478  arch/arm/mach-at91/board-afeb-9260v1.c             |    9 +-
4479  arch/arm/mach-at91/board-cam60.c                   |    9 +-
4480  arch/arm/mach-at91/board-cap9adk.c                 |    9 +-
4481  arch/arm/mach-at91/board-kb9202.c                  |    9 +-
4482  arch/arm/mach-at91/board-neocore926.c              |    9 +-
4483  arch/arm/mach-at91/board-qil-a9260.c               |    9 +-
4484  arch/arm/mach-at91/board-rm9200dk.c                |    9 +-
4485  arch/arm/mach-at91/board-sam9-l9260.c              |    9 +-
4486  arch/arm/mach-at91/board-sam9260ek.c               |    9 +-
4487  arch/arm/mach-at91/board-sam9261ek.c               |    9 +-
4488  arch/arm/mach-at91/board-sam9263ek.c               |    9 +-
4489  arch/arm/mach-at91/board-sam9g20ek.c               |    9 +-
4490  arch/arm/mach-at91/board-sam9m10g45ek.c            |    9 +-
4491  arch/arm/mach-at91/board-sam9rlek.c                |    9 +-
4492  arch/arm/mach-at91/board-snapper9260.c             |   10 +-
4493  arch/arm/mach-at91/board-usb-a926x.c               |    9 +-
4494  arch/arm/mach-at91/board-yl-9200.c                 |    9 +-
4495  arch/arm/mach-at91/include/mach/board.h            |    3 +-
4496  arch/arm/mach-davinci/board-da830-evm.c            |    2 +-
4497  arch/arm/mach-davinci/board-da850-evm.c            |    2 +-
4498  arch/arm/mach-davinci/board-dm355-evm.c            |    2 +-
4499  arch/arm/mach-davinci/board-dm355-leopard.c        |    2 +-
4500  arch/arm/mach-davinci/board-dm365-evm.c            |    2 +-
4501  arch/arm/mach-davinci/board-dm644x-evm.c           |    2 +-
4502  arch/arm/mach-davinci/board-mityomapl138.c         |    3 +-
4503  arch/arm/mach-davinci/board-neuros-osd2.c          |    2 +-
4504  arch/arm/mach-davinci/board-tnetv107x-evm.c        |    2 +-
4505  arch/arm/mach-davinci/include/mach/nand.h          |    4 +-
4506  arch/arm/mach-ep93xx/ts72xx.c                      |   23 +-
4507  arch/arm/mach-mmp/aspenite.c                       |    5 +-
4508  arch/arm/mach-orion5x/ts78xx-setup.c               |    2 +-
4509  arch/arm/mach-pxa/cm-x300.c                        |    5 +-
4510  arch/arm/mach-pxa/colibri-pxa3xx.c                 |    5 +-
4511  arch/arm/mach-pxa/littleton.c                      |    5 +-
4512  arch/arm/mach-pxa/mxm8x10.c                        |    9 +-
4513  arch/arm/mach-pxa/raumfeld.c                       |    5 +-
4514  arch/arm/mach-pxa/zylonite.c                       |    5 +-
4515  arch/arm/plat-pxa/include/plat/pxa3xx_nand.h       |   20 +-
4516  arch/avr32/boards/atngw100/setup.c                 |    8 +-
4517  arch/avr32/boards/atstk1000/atstk1002.c            |    9 +-
4518  arch/avr32/mach-at32ap/include/mach/board.h        |    3 +-
4519  arch/cris/arch-v32/drivers/mach-a3/nandflash.c     |    2 +-
4520  arch/cris/arch-v32/drivers/mach-fs/nandflash.c     |    2 +-
4521  drivers/mtd/Kconfig                                |   21 +-
4522  drivers/mtd/Makefile                               |    2 +-
4523  drivers/mtd/afs.c                                  |    4 +-
4524  drivers/mtd/ar7part.c                              |    2 +-
4525  drivers/mtd/chips/cfi_cmdset_0002.c                |   31 +-
4526  drivers/mtd/chips/fwh_lock.h                       |    3 +-
4527  drivers/mtd/chips/jedec_probe.c                    |   34 +-
4528  drivers/mtd/cmdlinepart.c                          |    7 +-
4529  drivers/mtd/devices/Kconfig                        |   13 +-
4530  drivers/mtd/devices/Makefile                       |    3 +
4531  drivers/mtd/devices/doc2000.c                      |   17 +-
4532  drivers/mtd/devices/doc2001.c                      |   11 +-
4533  drivers/mtd/devices/doc2001plus.c                  |   11 +-
4534  drivers/mtd/devices/docecc.c                       |    2 +-
4535  drivers/mtd/devices/docg3.c                        | 1114 ++++++++++++++
4536  drivers/mtd/devices/docg3.h                        |  297 ++++
4537  drivers/mtd/devices/docprobe.c                     |    5 -
4538  drivers/mtd/devices/lart.c                         |   18 +-
4539  drivers/mtd/devices/m25p80.c                       |   92 +-
4540  drivers/mtd/devices/mtd_dataflash.c                |   91 +-
4541  drivers/mtd/devices/sst25l.c                       |   42 +-
4542  drivers/mtd/ftl.c                                  |   40 +-
4543  drivers/mtd/inftlcore.c                            |   69 +-
4544  drivers/mtd/inftlmount.c                           |  116 +-
4545  drivers/mtd/maps/Kconfig                           |   26 -
4546  drivers/mtd/maps/Makefile                          |    2 -
4547  drivers/mtd/maps/bfin-async-flash.c                |   16 +-
4548  drivers/mtd/maps/ceiva.c                           |  341 ----
4549  drivers/mtd/maps/dc21285.c                         |    9 +-
4550  drivers/mtd/maps/edb7312.c                         |  134 --
4551  drivers/mtd/maps/gpio-addr-flash.c                 |   16 +-
4552  drivers/mtd/maps/h720x-flash.c                     |   23 +-
4553  drivers/mtd/maps/impa7.c                           |   28 +-
4554  drivers/mtd/maps/intel_vr_nor.c                    |    7 +-
4555  drivers/mtd/maps/ixp2000.c                         |   11 +-
4556  drivers/mtd/maps/ixp4xx.c                          |   29 +-
4557  drivers/mtd/maps/lantiq-flash.c                    |   17 +-
4558  drivers/mtd/maps/latch-addr-flash.c                |   24 +-
4559  drivers/mtd/maps/pcmciamtd.c                       |  124 +-
4560  drivers/mtd/maps/physmap.c                         |   38 +-
4561  drivers/mtd/maps/physmap_of.c                      |   80 +-
4562  drivers/mtd/maps/plat-ram.c                        |   23 +-
4563  drivers/mtd/maps/pxa2xx-flash.c                    |   20 +-
4564  drivers/mtd/maps/rbtx4939-flash.c                  |   24 +-
4565  drivers/mtd/maps/sa1100-flash.c                    |   30 +-
4566  drivers/mtd/maps/solutionengine.c                  |   30 +-
4567  drivers/mtd/maps/wr_sbc82xx_flash.c                |   33 +-
4568  drivers/mtd/mtd_blkdevs.c                          |    2 +
4569  drivers/mtd/mtdblock.c                             |   18 +-
4570  drivers/mtd/mtdchar.c                              |  162 ++-
4571  drivers/mtd/mtdconcat.c                            |   10 +-
4572  drivers/mtd/mtdcore.c                              |   70 +-
4573  drivers/mtd/mtdcore.h                              |    3 +
4574  drivers/mtd/mtdoops.c                              |    2 +-
4575  drivers/mtd/mtdpart.c                              |   62 +-
4576  drivers/mtd/mtdsuper.c                             |   20 +-
4577  drivers/mtd/mtdswap.c                              |   31 +-
4578  drivers/mtd/nand/Kconfig                           |   29 +-
4579  drivers/mtd/nand/Makefile                          |    2 +-
4580  drivers/mtd/nand/atmel_nand.c                      |   74 +-
4581  drivers/mtd/nand/au1550nd.c                        |   29 +-
4582  drivers/mtd/nand/autcpu12.c                        |    4 +-
4583  drivers/mtd/nand/bcm_umi_nand.c                    |   57 +-
4584  drivers/mtd/nand/cafe_nand.c                       |   21 +-
4585  drivers/mtd/nand/cmx270_nand.c                     |   23 +-
4586  drivers/mtd/nand/cs553x_nand.c                     |   15 +-
4587  drivers/mtd/nand/davinci_nand.c                    |   39 +-
4588  drivers/mtd/nand/denali.c                          |    6 +-
4589  drivers/mtd/nand/diskonchip.c                      |    8 +-
4590  drivers/mtd/nand/edb7312.c                         |  203 ---
4591  drivers/mtd/nand/fsl_elbc_nand.c                   |   75 +-
4592  drivers/mtd/nand/fsl_upm.c                         |   16 +-
4593  drivers/mtd/nand/fsmc_nand.c                       |   77 +-
4594  drivers/mtd/nand/gpmi-nand/Makefile                |    3 +
4595  drivers/mtd/nand/gpmi-nand/bch-regs.h              |   84 +
4596  drivers/mtd/nand/gpmi-nand/gpmi-lib.c              | 1057 +++++++++++++
4597  drivers/mtd/nand/gpmi-nand/gpmi-nand.c             | 1619 ++++++++++++++++++++
4598  drivers/mtd/nand/gpmi-nand/gpmi-nand.h             |  273 ++++
4599  drivers/mtd/nand/gpmi-nand/gpmi-regs.h             |  172 +++
4600  drivers/mtd/nand/h1910.c                           |   19 +-
4601  drivers/mtd/nand/jz4740_nand.c                     |   18 +-
4602  drivers/mtd/nand/mpc5121_nfc.c                     |   22 +-
4603  drivers/mtd/nand/mxc_nand.c                        |   37 +-
4604  drivers/mtd/nand/nand_base.c                       | 1109 +++++++-------
4605  drivers/mtd/nand/nand_bbt.c                        |  692 ++++-----
4606  drivers/mtd/nand/nand_bch.c                        |    4 +-
4607  drivers/mtd/nand/nand_ecc.c                        |   10 +-
4608  drivers/mtd/nand/nandsim.c                         |    4 +-
4609  drivers/mtd/nand/ndfc.c                            |   22 +-
4610  drivers/mtd/nand/nomadik_nand.c                    |    1 +
4611  drivers/mtd/nand/nuc900_nand.c                     |    1 +
4612  drivers/mtd/nand/omap2.c                           |   22 +-
4613  drivers/mtd/nand/orion_nand.c                      |   16 +-
4614  drivers/mtd/nand/pasemi_nand.c                     |    3 +-
4615  drivers/mtd/nand/plat_nand.c                       |   25 +-
4616  drivers/mtd/nand/ppchameleonevb.c                  |   47 +-
4617  drivers/mtd/nand/pxa3xx_nand.c                     |  471 ++++---
4618  drivers/mtd/nand/r852.c                            |    6 +-
4619  drivers/mtd/nand/rtc_from4.c                       |    5 +-
4620  drivers/mtd/nand/s3c2410.c                         |   27 +-
4621  drivers/mtd/nand/sharpsl.c                         |   13 +-
4622  drivers/mtd/nand/sm_common.c                       |    2 +-
4623  drivers/mtd/nand/socrates_nand.c                   |   28 +-
4624  drivers/mtd/nand/tmio_nand.c                       |   17 +-
4625  drivers/mtd/nand/txx9ndfmc.c                       |    8 +-
4626  drivers/mtd/nftlcore.c                             |   37 +-
4627  drivers/mtd/nftlmount.c                            |   26 +-
4628  drivers/mtd/ofpart.c                               |  112 ++-
4629  drivers/mtd/onenand/generic.c                      |   14 +-
4630  drivers/mtd/onenand/omap2.c                        |   16 +-
4631  drivers/mtd/onenand/onenand_base.c                 |  114 +-
4632  drivers/mtd/onenand/onenand_bbt.c                  |    8 +-
4633  drivers/mtd/onenand/samsung.c                      |   13 +-
4634  drivers/mtd/redboot.c                              |   16 +-
4635  drivers/mtd/sm_ftl.c                               |   26 +-
4636  drivers/mtd/ssfdc.c                                |   46 +-
4637  drivers/mtd/tests/mtd_oobtest.c                    |   33 +-
4638  drivers/mtd/tests/mtd_pagetest.c                   |   37 +-
4639  drivers/mtd/tests/mtd_readtest.c                   |   13 +-
4640  drivers/mtd/tests/mtd_speedtest.c                  |   17 +-
4641  drivers/mtd/tests/mtd_stresstest.c                 |   11 +-
4642  drivers/mtd/tests/mtd_subpagetest.c                |   17 +-
4643  drivers/mtd/tests/mtd_torturetest.c                |   11 +-
4644  drivers/mtd/ubi/eba.c                              |    2 +-
4645  drivers/mtd/ubi/io.c                               |   24 +-
4646  drivers/mtd/ubi/kapi.c                             |    2 +-
4647  drivers/mtd/ubi/misc.c                             |    2 +-
4648  drivers/mtd/ubi/scan.c                             |    4 +-
4649  drivers/mtd/ubi/vtbl.c                             |    2 +-
4650  drivers/staging/spectra/lld_mtd.c                  |    6 +-
4651  fs/jffs2/compr.c                                   |  128 ++-
4652  fs/jffs2/compr.h                                   |    2 +
4653  fs/jffs2/fs.c                                      |    2 +-
4654  fs/jffs2/jffs2_fs_sb.h                             |    6 +
4655  fs/jffs2/os-linux.h                                |    2 +-
4656  fs/jffs2/scan.c                                    |    4 +-
4657  fs/jffs2/super.c                                   |  119 ++
4658  fs/jffs2/wbuf.c                                    |    9 +-
4659  include/linux/mtd/bbm.h                            |   39 +-
4660  include/linux/mtd/mtd.h                            |   82 +-
4661  include/linux/mtd/nand.h                           |   92 +-
4662  include/linux/mtd/onenand.h                        |    4 +
4663  include/linux/mtd/partitions.h                     |   46 +-
4664  include/linux/mtd/physmap.h                        |   17 -
4665  include/mtd/mtd-abi.h                              |  122 ++-
4666  190 files changed, 7583 insertions(+), 4046 deletions(-)
4667  create mode 100644 Documentation/devicetree/bindings/mtd/atmel-dataflash.txt
4668  create mode 100644 drivers/mtd/devices/docg3.c
4669  create mode 100644 drivers/mtd/devices/docg3.h
4670  delete mode 100644 drivers/mtd/maps/ceiva.c
4671  delete mode 100644 drivers/mtd/maps/edb7312.c
4672  delete mode 100644 drivers/mtd/nand/edb7312.c
4673  create mode 100644 drivers/mtd/nand/gpmi-nand/Makefile
4674  create mode 100644 drivers/mtd/nand/gpmi-nand/bch-regs.h
4675  create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-lib.c
4676  create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-nand.c
4677  create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-nand.h
4678  create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-regs.h
4679 Merging crypto/master (ea8bdfc crypto: user - Add dependency on NET)
4680 $ git merge crypto/master
4681 Already up-to-date.
4682 Merging sound/for-next (0a842b6 Merge branch 'fix/hda' into for-next)
4683 $ git merge sound/for-next
4684 Merge made by the 'recursive' strategy.
4685  sound/core/hwdep.c             |    9 +++++++-
4686  sound/pci/hda/hda_hwdep.c      |    2 -
4687  sound/pci/hda/hda_local.h      |    4 +++
4688  sound/pci/hda/patch_hdmi.c     |    5 +---
4689  sound/pci/hda/patch_realtek.c  |   11 +++++----
4690  sound/pci/hda/patch_sigmatel.c |   38 +++++++++++++++++-------------------
4691  sound/pci/hda/patch_via.c      |    5 ----
4692  sound/pci/intel8x0.c           |   29 +++++++++++++++++++++++++-
4693  sound/pci/rme9652/hdsp.c       |    2 +-
4694  sound/pci/rme9652/hdspm.c      |   42 +++++++++++++++++----------------------
4695  sound/soc/codecs/tlv320aic23.c |    1 +
4696  sound/soc/codecs/tlv320aic3x.c |    1 +
4697  sound/soc/codecs/wm5100.c      |   12 +++++++---
4698  sound/soc/codecs/wm8711.c      |    4 +-
4699  sound/soc/codecs/wm8904.c      |    2 +-
4700  sound/soc/codecs/wm8940.c      |    2 +-
4701  sound/soc/codecs/wm8962.c      |   30 +++++++++++++++++++---------
4702  17 files changed, 117 insertions(+), 82 deletions(-)
4703 Merging sound-asoc/for-next (86f14df ASoC: Update git repository URL)
4704 $ git merge sound-asoc/for-next
4705 Auto-merging MAINTAINERS
4706 Merge made by the 'recursive' strategy.
4707  MAINTAINERS |    2 +-
4708  1 files changed, 1 insertions(+), 1 deletions(-)
4709 Merging cpufreq/next (5aace58 [CPUFREQ] ARM Exynos4210 PM/Suspend compatibility with different bootloaders)
4710 $ git merge cpufreq/next
4711 Merge made by the 'recursive' strategy.
4712  drivers/cpufreq/db8500-cpufreq.c     |    7 +-
4713  drivers/cpufreq/e_powersaver.c       |  135 +++++++++++++++++++++++++++++++---
4714  drivers/cpufreq/exynos4210-cpufreq.c |  129 +++++++++++++++++++++++++++++++-
4715  3 files changed, 252 insertions(+), 19 deletions(-)
4716 Merging quilt/rr (dfb79dc module: Enable dynamic debugging regardless of taint)
4717 $ git merge quilt/rr
4718 Auto-merging include/linux/kernel.h
4719 Auto-merging drivers/virtio/virtio_pci.c
4720 Merge made by the 'recursive' strategy.
4721  Documentation/oops-tracing.txt |    2 ++
4722  drivers/virtio/virtio_pci.c    |   10 +++++++---
4723  include/linux/kernel.h         |    1 +
4724  kernel/module.c                |   11 +++++++----
4725  kernel/panic.c                 |    2 ++
4726  scripts/mod/modpost.c          |    7 +++++++
4727  6 files changed, 26 insertions(+), 7 deletions(-)
4728 Merging input/next (fb6c721 Input: tca8418_keypad - initial driver release)
4729 $ git merge input/next
4730 Auto-merging drivers/input/tablet/wacom_wac.c
4731 Auto-merging drivers/input/tablet/wacom_sys.c
4732 Auto-merging drivers/input/keyboard/Kconfig
4733 Merge made by the 'recursive' strategy.
4734  drivers/input/keyboard/Kconfig          |   16 ++
4735  drivers/input/keyboard/Makefile         |    1 +
4736  drivers/input/keyboard/tca8418_keypad.c |  430 +++++++++++++++++++++++++++++++
4737  drivers/input/tablet/wacom_sys.c        |   96 +++++++-
4738  drivers/input/tablet/wacom_wac.c        |  101 +++++++-
4739  drivers/input/tablet/wacom_wac.h        |    4 +-
4740  include/linux/input/tca8418_keypad.h    |   44 ++++
4741  7 files changed, 672 insertions(+), 20 deletions(-)
4742  create mode 100644 drivers/input/keyboard/tca8418_keypad.c
4743  create mode 100644 include/linux/input/tca8418_keypad.h
4744 Merging input-mt/next (02f8c6a Linux 3.0)
4745 $ git merge input-mt/next
4746 Already up-to-date.
4747 Merging lsm/for-next (ca05a99 capabilities: remain source compatible with 32-bit raw legacy capability support.)
4748 $ git merge lsm/for-next
4749 Already up-to-date.
4750 Merging block/for-next (a2da998 Merge branch 'for-3.2/core' into for-next)
4751 $ git merge block/for-next
4752 Resolved 'drivers/md/faulty.c' using previous resolution.
4753 Resolved 'drivers/md/linear.c' using previous resolution.
4754 Resolved 'drivers/md/md.c' using previous resolution.
4755 Resolved 'drivers/md/md.h' using previous resolution.
4756 Resolved 'drivers/md/multipath.c' using previous resolution.
4757 Resolved 'drivers/md/raid0.c' using previous resolution.
4758 Resolved 'drivers/md/raid1.c' using previous resolution.
4759 Resolved 'drivers/md/raid5.c' using previous resolution.
4760 Resolved 'drivers/staging/zram/zram_drv.c' using previous resolution.
4761 Auto-merging include/linux/genhd.h
4762 Auto-merging drivers/staging/zram/zram_drv.c
4763 CONFLICT (content): Merge conflict in drivers/staging/zram/zram_drv.c
4764 Auto-merging drivers/scsi/hpsa.c
4765 Auto-merging drivers/md/raid5.c
4766 CONFLICT (content): Merge conflict in drivers/md/raid5.c
4767 Auto-merging drivers/md/raid10.c
4768 CONFLICT (content): Merge conflict in drivers/md/raid10.c
4769 Auto-merging drivers/md/raid1.c
4770 CONFLICT (content): Merge conflict in drivers/md/raid1.c
4771 Auto-merging drivers/md/raid0.c
4772 CONFLICT (content): Merge conflict in drivers/md/raid0.c
4773 Auto-merging drivers/md/multipath.c
4774 CONFLICT (content): Merge conflict in drivers/md/multipath.c
4775 Auto-merging drivers/md/md.h
4776 CONFLICT (content): Merge conflict in drivers/md/md.h
4777 Auto-merging drivers/md/md.c
4778 CONFLICT (content): Merge conflict in drivers/md/md.c
4779 Auto-merging drivers/md/linear.c
4780 CONFLICT (content): Merge conflict in drivers/md/linear.c
4781 Auto-merging drivers/md/faulty.c
4782 CONFLICT (content): Merge conflict in drivers/md/faulty.c
4783 Auto-merging drivers/md/dm.c
4784 Auto-merging drivers/block/xen-blkback/common.h
4785 Auto-merging drivers/block/xen-blkback/blkback.c
4786 Auto-merging drivers/block/drbd/drbd_int.h
4787 Auto-merging block/genhd.c
4788 Automatic merge failed; fix conflicts and then commit the result.
4789 $ git commit -v -a
4790 Recorded resolution for 'drivers/md/raid10.c'.
4791 [master a46c152] Merge remote-tracking branch 'block/for-next'
4792 $ git diff -M --stat --summary HEAD^..
4793  .../ABI/testing/sysfs-bus-pci-devices-cciss        |    7 +
4794  Documentation/blockdev/cciss.txt                   |   10 +
4795  arch/m68k/emu/nfblock.c                            |    3 +-
4796  arch/powerpc/sysdev/axonram.c                      |    8 +-
4797  block/blk-cgroup.c                                 |  111 +++--
4798  block/blk-cgroup.h                                 |    2 +-
4799  block/blk-core.c                                   |  456 +++++++++++---------
4800  block/blk-flush.c                                  |    3 +-
4801  block/blk-sysfs.c                                  |    7 +-
4802  block/blk-tag.c                                    |    6 +-
4803  block/blk-throttle.c                               |  106 +++--
4804  block/blk.h                                        |   20 +-
4805  block/elevator.c                                   |   39 +--
4806  block/genhd.c                                      |   12 +-
4807  block/ioctl.c                                      |    2 +-
4808  block/scsi_ioctl.c                                 |    3 +-
4809  drivers/block/aoe/aoeblk.c                         |   14 +-
4810  drivers/block/brd.c                                |    4 +-
4811  drivers/block/cciss.c                              |   76 +++-
4812  drivers/block/cciss.h                              |    1 +
4813  drivers/block/cpqarray.c                           |    2 +-
4814  drivers/block/drbd/drbd_int.h                      |    2 +-
4815  drivers/block/drbd/drbd_req.c                      |    8 +-
4816  drivers/block/loop.c                               |  251 ++++++------
4817  drivers/block/nbd.c                                |   69 ++--
4818  drivers/block/pktcdvd.c                            |   11 +-
4819  drivers/block/ps3vram.c                            |    6 +-
4820  drivers/block/umem.c                               |    4 +-
4821  drivers/block/xen-blkback/blkback.c                |  130 +++++-
4822  drivers/block/xen-blkback/common.h                 |   98 ++++-
4823  drivers/block/xen-blkback/xenbus.c                 |   76 ++++
4824  drivers/block/xen-blkfront.c                       |  123 +++++--
4825  drivers/md/dm.c                                    |   25 +-
4826  drivers/md/faulty.c                                |   14 +-
4827  drivers/md/linear.c                                |   17 +-
4828  drivers/md/md.c                                    |   12 +-
4829  drivers/md/md.h                                    |    2 +-
4830  drivers/md/multipath.c                             |    8 +-
4831  drivers/md/raid0.c                                 |   22 +-
4832  drivers/md/raid1.c                                 |    9 +-
4833  drivers/md/raid10.c                                |   19 +-
4834  drivers/md/raid5.c                                 |    8 +-
4835  drivers/s390/block/dcssblk.c                       |    7 +-
4836  drivers/s390/block/xpram.c                         |    5 +-
4837  drivers/scsi/hpsa.c                                |    7 +
4838  drivers/staging/zram/zram_drv.c                    |    5 +-
4839  fs/bio.c                                           |    1 -
4840  fs/block_dev.c                                     |   15 +-
4841  include/linux/bio.h                                |    8 -
4842  include/linux/blk_types.h                          |   11 +-
4843  include/linux/blkdev.h                             |   40 +-
4844  include/linux/elevator.h                           |    6 +
4845  include/linux/genhd.h                              |    6 +-
4846  include/linux/loop.h                               |    2 +-
4847  include/xen/interface/io/blkif.h                   |   36 ++
4848  mm/bounce.c                                        |    9 +-
4849  56 files changed, 1220 insertions(+), 744 deletions(-)
4850 Merging quilt/device-mapper (0daefd7 When devices in a RAID array are not in-sync, they are supposed to be reported as such in the status output as an 'a' character, which means "alive, but not in-sync".  But when the entire array is rebuilt 'A' is being used, which is incorrect.  This patch corrects this to 'a'.)
4851 $ git merge quilt/device-mapper
4852 Recorded preimage for 'Documentation/device-mapper/thin-provisioning.txt'
4853 Auto-merging Documentation/device-mapper/thin-provisioning.txt
4854 CONFLICT (add/add): Merge conflict in Documentation/device-mapper/thin-provisioning.txt
4855 Automatic merge failed; fix conflicts and then commit the result.
4856 $ git commit -v -a
4857 Recorded resolution for 'Documentation/device-mapper/thin-provisioning.txt'.
4858 [master 01a00c0] Merge branch 'quilt/device-mapper'
4859 $ git diff -M --stat --summary HEAD^..
4860 Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
4861 $ git merge embedded/master
4862 Already up-to-date.
4863 Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
4864 $ git merge firmware/master
4865 Already up-to-date.
4866 Merging pcmcia/master (74411c0 smc91c92_cs.c: fix bogus compiler warning)
4867 $ git merge pcmcia/master
4868 Already up-to-date.
4869 Merging battery/master (85b5fbf power_supply: Fix sysfs format warning)
4870 $ git merge battery/master
4871 Auto-merging drivers/power/ds2780_battery.c
4872 Merge made by the 'recursive' strategy.
4873  .../bindings/power_supply/olpc_battery.txt         |    5 +
4874  drivers/power/ds2780_battery.c                     |    2 +-
4875  drivers/power/max17042_battery.c                   |   17 ++--
4876  drivers/power/max8903_charger.c                    |    2 +-
4877  drivers/power/max8997_charger.c                    |    1 +
4878  drivers/power/max8998_charger.c                    |    2 +
4879  drivers/power/olpc_battery.c                       |   79 ++++++++++++++-----
4880  drivers/power/pda_power.c                          |   74 ++++++++++++++++--
4881  drivers/power/power_supply_sysfs.c                 |    4 +-
4882  drivers/power/wm831x_power.c                       |   44 +++++++----
4883  drivers/power/z2_battery.c                         |    2 +-
4884  include/linux/pda_power.h                          |    2 +
4885  12 files changed, 175 insertions(+), 59 deletions(-)
4886  create mode 100644 Documentation/devicetree/bindings/power_supply/olpc_battery.txt
4887 Merging mmc/mmc-next (d517455 mmc: omap_hsmmc: fix missing parenthesis in pr_info)
4888 $ git merge mmc/mmc-next
4889 Merge made by the 'recursive' strategy.
4890  drivers/mmc/host/omap_hsmmc.c |    6 ++----
4891  1 files changed, 2 insertions(+), 4 deletions(-)
4892 Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack())
4893 $ git merge kgdb/kgdb-next
4894 Merge made by the 'recursive' strategy.
4895 Merging slab/for-next (e24daf8 Merge branch 'slab/next' into for-next)
4896 $ git merge slab/for-next
4897 Already up-to-date!
4898 Merge made by the 'recursive' strategy.
4899 Merging uclinux/for-next (6e86841 Linux 2.6.27-rc1)
4900 $ git merge uclinux/for-next
4901 Already up-to-date.
4902 Merging md/for-next (e0b361a Merge branch 'block-3.1' into for-next)
4903 $ git merge md/for-next
4904 Merge made by the 'recursive' strategy.
4905 Merging mfd/for-next (b958f7a mfd: Fix missing abx500 header file updates)
4906 $ git merge mfd/for-next
4907 Resolved 'arch/arm/mach-imx/mach-mx31moboard.c' using previous resolution.
4908 Resolved 'arch/arm/mach-omap2/board-omap3beagle.c' using previous resolution.
4909 Resolved 'arch/arm/mach-u300/include/mach/irqs.h' using previous resolution.
4910 Resolved 'drivers/mfd/wm831x-spi.c' using previous resolution.
4911 Auto-merging include/linux/mfd/wm8994/core.h
4912 Auto-merging include/linux/mfd/wm831x/core.h
4913 Auto-merging drivers/mfd/wm8994-core.c
4914 Auto-merging drivers/mfd/wm831x-spi.c
4915 CONFLICT (content): Merge conflict in drivers/mfd/wm831x-spi.c
4916 Auto-merging drivers/mfd/menelaus.c
4917 Auto-merging drivers/mfd/dbx500-prcmu-regs.h
4918 Removing drivers/mfd/db8500-prcmu-regs.h
4919 Removing drivers/mfd/ab3550-core.c
4920 Auto-merging drivers/mfd/Kconfig
4921 Auto-merging drivers/input/misc/Makefile
4922 Auto-merging drivers/input/misc/Kconfig
4923 Auto-merging drivers/i2c/busses/Kconfig
4924 Auto-merging drivers/gpio/Kconfig
4925 Auto-merging drivers/cpufreq/db8500-cpufreq.c
4926 Auto-merging arch/x86/platform/mrst/mrst.c
4927 Auto-merging arch/arm/mach-ux500/cpu.c
4928 Auto-merging arch/arm/mach-ux500/board-u5500.c
4929 Auto-merging arch/arm/mach-u300/include/mach/irqs.h
4930 CONFLICT (content): Merge conflict in arch/arm/mach-u300/include/mach/irqs.h
4931 Auto-merging arch/arm/mach-omap2/board-omap3beagle.c
4932 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3beagle.c
4933 Auto-merging arch/arm/mach-omap2/Kconfig
4934 Auto-merging arch/arm/mach-mx5/mx51_efika.c
4935 Auto-merging arch/arm/mach-imx/mach-pcm038.c
4936 Auto-merging arch/arm/mach-imx/mach-mx31moboard.c
4937 CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-mx31moboard.c
4938 Auto-merging arch/arm/mach-imx/mach-mx31lite.c
4939 Auto-merging arch/arm/mach-imx/mach-mx31_3ds.c
4940 Auto-merging arch/arm/mach-imx/mach-mx27_3ds.c
4941 Automatic merge failed; fix conflicts and then commit the result.
4942 $ git commit -v -a
4943 [master aaabf24] Merge remote-tracking branch 'mfd/for-next'
4944 $ git diff -M --stat --summary HEAD^..
4945  arch/arm/mach-imx/mach-mx27_3ds.c                  |    3 +-
4946  arch/arm/mach-imx/mach-mx31_3ds.c                  |    2 +-
4947  arch/arm/mach-imx/mach-mx31lite.c                  |    3 +-
4948  arch/arm/mach-imx/mach-mx31moboard.c               |   15 +-
4949  arch/arm/mach-imx/mach-pcm038.c                    |    3 +-
4950  arch/arm/mach-mx5/mx51_efika.c                     |    2 +-
4951  arch/arm/mach-omap2/Kconfig                        |    1 -
4952  arch/arm/mach-omap2/board-omap3beagle.c            |    9 +-
4953  arch/arm/mach-u300/i2c.c                           |   51 +-
4954  arch/arm/mach-u300/include/mach/irqs.h             |   10 +-
4955  arch/arm/mach-ux500/board-u5500.c                  |   29 +-
4956  arch/arm/mach-ux500/cpu.c                          |    2 +-
4957  arch/x86/include/asm/intel_scu_ipc.h               |   22 +
4958  arch/x86/platform/mrst/mrst.c                      |  176 +++-
4959  drivers/cpufreq/db8500-cpufreq.c                   |    2 +-
4960  drivers/gpio/Kconfig                               |    3 +-
4961  drivers/hwmon/mc13783-adc.c                        |   12 +-
4962  drivers/i2c/busses/Kconfig                         |    1 -
4963  drivers/input/misc/Kconfig                         |   10 +
4964  drivers/input/misc/Makefile                        |    1 +
4965  drivers/input/misc/mc13783-pwrbutton.c             |  282 ++++
4966  drivers/input/touchscreen/mc13783_ts.c             |   34 +-
4967  drivers/leds/leds-asic3.c                          |   35 +-
4968  drivers/leds/leds-mc13783.c                        |   60 +-
4969  drivers/media/radio/Kconfig                        |    1 -
4970  drivers/mfd/Kconfig                                |   64 +-
4971  drivers/mfd/Makefile                               |    4 +-
4972  drivers/mfd/aat2870-core.c                         |    2 +-
4973  drivers/mfd/ab3100-core.c                          |    2 +-
4974  drivers/mfd/ab3550-core.c                          | 1380 -------------------
4975  drivers/mfd/ab5500-core.c                          | 1439 ++++++++++++++++++++
4976  drivers/mfd/ab5500-core.h                          |   87 ++
4977  drivers/mfd/ab5500-debugfs.c                       |  806 +++++++++++
4978  drivers/mfd/ab5500-debugfs.h                       |   22 +
4979  drivers/mfd/ab8500-core.c                          |   33 +-
4980  drivers/mfd/ab8500-gpadc.c                         |   56 +-
4981  drivers/mfd/asic3.c                                |   26 +-
4982  drivers/mfd/da903x.c                               |    2 +-
4983  drivers/mfd/db5500-prcmu.c                         |   29 +-
4984  drivers/mfd/db8500-prcmu-regs.h                    |  166 ---
4985  drivers/mfd/db8500-prcmu.c                         |  629 +++++++--
4986  .../{db5500-prcmu-regs.h => dbx500-prcmu-regs.h}   |  105 ++-
4987  drivers/mfd/intel_msic.c                           |  502 +++++++
4988  drivers/mfd/jz4740-adc.c                           |    2 +-
4989  drivers/mfd/max8997.c                              |   27 +-
4990  drivers/mfd/mc13xxx-core.c                         |  116 +-
4991  drivers/mfd/menelaus.c                             |    2 +-
4992  drivers/mfd/pcf50633-core.c                        |  114 +--
4993  drivers/mfd/tc3589x.c                              |    2 +
4994  drivers/mfd/timberdale.c                           |    9 +-
4995  drivers/mfd/tps65912-core.c                        |    6 +-
4996  drivers/mfd/twl-core.c                             |    2 +-
4997  drivers/mfd/twl4030-irq.c                          |  342 ++---
4998  drivers/mfd/twl4030-madc.c                         |   22 +
4999  drivers/mfd/twl6030-irq.c                          |   75 +-
5000  drivers/mfd/wm831x-irq.c                           |   24 +-
5001  drivers/mfd/wm8994-core.c                          |   53 +
5002  drivers/regulator/db8500-prcmu.c                   |    2 +-
5003  drivers/regulator/mc13783-regulator.c              |    6 +-
5004  include/linux/i2c/twl4030-madc.h                   |    4 +
5005  include/linux/mfd/ab5500/ab5500.h                  |  140 ++
5006  include/linux/mfd/ab8500/gpadc.h                   |    5 +-
5007  include/linux/mfd/abx500.h                         |   54 +-
5008  include/linux/mfd/db5500-prcmu.h                   |  102 ++-
5009  include/linux/mfd/db8500-prcmu.h                   |  368 ++----
5010  include/linux/mfd/dbx500-prcmu.h                   |  549 ++++++++
5011  include/linux/mfd/intel_msic.h                     |  456 +++++++
5012  include/linux/mfd/max8997-private.h                |    1 -
5013  include/linux/mfd/mc13783.h                        |  111 --
5014  include/linux/mfd/mc13xxx.h                        |   38 +-
5015  include/linux/mfd/pcf50633/core.h                  |    3 +-
5016  include/linux/mfd/wm831x/core.h                    |    1 +
5017  include/linux/mfd/wm8994/core.h                    |    2 +
5018  include/linux/mfd/wm8994/pdata.h                   |    7 +
5019  74 files changed, 6038 insertions(+), 2730 deletions(-)
5020  create mode 100644 drivers/input/misc/mc13783-pwrbutton.c
5021  delete mode 100644 drivers/mfd/ab3550-core.c
5022  create mode 100644 drivers/mfd/ab5500-core.c
5023  create mode 100644 drivers/mfd/ab5500-core.h
5024  create mode 100644 drivers/mfd/ab5500-debugfs.c
5025  create mode 100644 drivers/mfd/ab5500-debugfs.h
5026  delete mode 100644 drivers/mfd/db8500-prcmu-regs.h
5027  rename drivers/mfd/{db5500-prcmu-regs.h => dbx500-prcmu-regs.h} (51%)
5028  create mode 100644 drivers/mfd/intel_msic.c
5029  create mode 100644 include/linux/mfd/ab5500/ab5500.h
5030  create mode 100644 include/linux/mfd/dbx500-prcmu.h
5031  create mode 100644 include/linux/mfd/intel_msic.h
5032 Merging hdlc/hdlc-next (4a6908a Linux 2.6.28)
5033 $ git merge hdlc/hdlc-next
5034 Already up-to-date.
5035 Merging drm/drm-next (1717c0e Revert "drm/ttm: add a way to bo_wait for either the last read or last write")
5036 $ git merge drm/drm-next
5037 Already up-to-date.
5038 Merging fbdev/fbdev-next (b57287b video: platinumfb: Add __devexit_p at necessary place)
5039 $ git merge fbdev/fbdev-next
5040 Already up-to-date.
5041 Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value)
5042 $ git merge viafb/viafb-next
5043 Already up-to-date.
5044 Merging omap_dss2/for-next (3e28189 OMAPDSS: picodlp: add missing #include <linux/module.h>)
5045 $ git merge omap_dss2/for-next
5046 Already up-to-date.
5047 Merging regulator/for-next (89efed4 regulator: max8649 Convert max8649 to use regmap api)
5048 $ git merge regulator/for-next
5049 Merge made by the 'recursive' strategy.
5050  drivers/regulator/Kconfig   |    1 +
5051  drivers/regulator/max8649.c |  155 +++++++++++++++----------------------------
5052  2 files changed, 56 insertions(+), 100 deletions(-)
5053 Merging security/next (59df316 TOMOYO: Fix interactive judgment functionality.)
5054 $ git merge security/next
5055 Already up-to-date.
5056 Merging selinux/master (ded5098 SELinux: skip file_name_trans_write() when policy downgraded.)
5057 $ git merge selinux/master
5058 Already up-to-date.
5059 Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
5060 $ git merge lblnet/master
5061 Already up-to-date.
5062 Merging watchdog/linux-next (134edca Merge branch 'fixes' into linux-next)
5063 $ git merge watchdog/linux-next
5064 Auto-merging drivers/watchdog/Kconfig
5065 Merge made by the 'recursive' strategy.
5066  .../watchdog/convert_drivers_to_kernel_api.txt     |  195 ++++++++++++
5067  drivers/watchdog/Kconfig                           |    2 +
5068  drivers/watchdog/coh901327_wdt.c                   |    2 +-
5069  drivers/watchdog/eurotechwdt.c                     |    2 +-
5070  drivers/watchdog/iTCO_wdt.c                        |   19 +-
5071  drivers/watchdog/mpcore_wdt.c                      |    3 +-
5072  drivers/watchdog/octeon-wdt-main.c                 |    2 +-
5073  drivers/watchdog/s3c2410_wdt.c                     |  176 +++---------
5074  drivers/watchdog/sb_wdog.c                         |    4 +-
5075  drivers/watchdog/sc520_wdt.c                       |    2 +-
5076  drivers/watchdog/w83627hf_wdt.c                    |   33 ++-
5077  drivers/watchdog/wdt.c                             |    2 +-
5078  drivers/watchdog/wdt_pci.c                         |    2 +-
5079  drivers/watchdog/wm831x_wdt.c                      |  318 +++++++-------------
5080  14 files changed, 388 insertions(+), 374 deletions(-)
5081  create mode 100644 Documentation/watchdog/convert_drivers_to_kernel_api.txt
5082 Merging bdev/master (feaf384 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block)
5083 $ git merge bdev/master
5084 Already up-to-date.
5085 Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
5086 $ git merge dwmw2-iommu/master
5087 Already up-to-date.
5088 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)
5089 $ git merge iommu/next
5090 Already up-to-date.
5091 Merging cputime/cputime (f611671 [S390] cputime: add sparse checking and cleanup)
5092 $ git merge cputime/cputime
5093 Resolved 'fs/proc/stat.c' using previous resolution.
5094 Resolved 'include/asm-generic/cputime.h' using previous resolution.
5095 Resolved 'kernel/sched_stats.h' using previous resolution.
5096 Auto-merging kernel/sys.c
5097 Auto-merging kernel/signal.c
5098 Auto-merging kernel/sched_stats.h
5099 CONFLICT (content): Merge conflict in kernel/sched_stats.h
5100 Auto-merging kernel/sched.c
5101 Auto-merging kernel/posix-cpu-timers.c
5102 Auto-merging kernel/fork.c
5103 Auto-merging kernel/exit.c
5104 Auto-merging include/linux/sched.h
5105 Auto-merging include/asm-generic/cputime.h
5106 CONFLICT (content): Merge conflict in include/asm-generic/cputime.h
5107 Auto-merging fs/proc/stat.c
5108 CONFLICT (content): Merge conflict in fs/proc/stat.c
5109 Auto-merging drivers/cpufreq/cpufreq_ondemand.c
5110 Auto-merging drivers/cpufreq/cpufreq_conservative.c
5111 Automatic merge failed; fix conflicts and then commit the result.
5112 $ git commit -v -a
5113 [master e7efbe96] Merge remote-tracking branch 'cputime/cputime'
5114 $ git diff -M --stat --summary HEAD^..
5115  arch/ia64/include/asm/cputime.h        |   69 +++++++---------
5116  arch/powerpc/include/asm/cputime.h     |   70 ++++++----------
5117  arch/s390/include/asm/cputime.h        |  140 ++++++++++++++-----------------
5118  drivers/cpufreq/cpufreq_conservative.c |   29 +++----
5119  drivers/cpufreq/cpufreq_ondemand.c     |   33 ++++----
5120  drivers/cpufreq/cpufreq_stats.c        |    5 +-
5121  drivers/macintosh/rack-meter.c         |   11 +--
5122  fs/proc/array.c                        |    8 +-
5123  fs/proc/stat.c                         |   28 +++----
5124  fs/proc/uptime.c                       |    4 +-
5125  include/asm-generic/cputime.h          |   62 +++++++--------
5126  include/linux/sched.h                  |    4 +-
5127  kernel/acct.c                          |    4 +-
5128  kernel/cpu.c                           |    3 +-
5129  kernel/exit.c                          |   22 ++----
5130  kernel/fork.c                          |   14 +--
5131  kernel/itimer.c                        |   15 ++--
5132  kernel/posix-cpu-timers.c              |  136 ++++++++++++-------------------
5133  kernel/sched.c                         |   80 ++++++++----------
5134  kernel/sched_stats.h                   |    6 +-
5135  kernel/signal.c                        |    6 +-
5136  kernel/sys.c                           |    6 +-
5137  kernel/tsacct.c                        |    2 +-
5138  23 files changed, 325 insertions(+), 432 deletions(-)
5139 Merging osd/linux-next (dde406e pnfs-obj: Support for RAID5 read-4-write interface.)
5140 $ git merge osd/linux-next
5141 Merge made by the 'recursive' strategy.
5142  fs/exofs/Kconfig             |    2 +-
5143  fs/nfs/objlayout/objio_osd.c |  872 ++++++++++--------------------------------
5144  fs/nfs/objlayout/objlayout.c |  209 ++++-------
5145  fs/nfs/objlayout/objlayout.h |   48 ++--
5146  4 files changed, 302 insertions(+), 829 deletions(-)
5147 Merging jc_docs/docs-next (5c050fb docs: update the development process document)
5148 $ git merge jc_docs/docs-next
5149 Already up-to-date.
5150 Merging nommu/master (0ce790e Linux 2.6.39-rc1)
5151 $ git merge nommu/master
5152 Already up-to-date.
5153 Merging trivial/for-next (59e5253 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial)
5154 $ git merge trivial/for-next
5155 Already up-to-date.
5156 Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path)
5157 $ git merge audit/for-next
5158 Already up-to-date.
5159 Merging pm/linux-next (a7521c1 PM / QoS: Remove redundant check)
5160 $ git merge pm/linux-next
5161 Auto-merging kernel/cpu.c
5162 Merge made by the 'recursive' strategy.
5163  Documentation/power/freezing-of-tasks.txt |    8 ++--
5164  drivers/acpi/sleep.c                      |    8 +++
5165  drivers/base/power/runtime.c              |    5 +--
5166  include/linux/cpu.h                       |    4 --
5167  include/linux/freezer.h                   |   27 +++++-----
5168  include/linux/opp.h                       |    4 +-
5169  kernel/cpu.c                              |   74 +++++++++++++++++++++++++++++
5170  kernel/power/qos.c                        |    3 +-
5171  8 files changed, 104 insertions(+), 29 deletions(-)
5172 Merging apm/for-next (73692d9 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
5173 $ git merge apm/for-next
5174 Already up-to-date.
5175 Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared)
5176 $ git merge fsnotify/for-next
5177 Auto-merging include/linux/fsnotify_backend.h
5178 Auto-merging fs/notify/mark.c
5179 Auto-merging fs/notify/group.c
5180 Auto-merging fs/notify/fanotify/fanotify_user.c
5181 Auto-merging fs/nfsd/vfs.c
5182 Auto-merging fs/cachefiles/namei.c
5183 Merge made by the 'recursive' strategy.
5184  fs/cachefiles/namei.c              |    1 -
5185  fs/cachefiles/xattr.c              |    1 -
5186  fs/nfsd/vfs.c                      |    3 -
5187  fs/notify/dnotify/dnotify.c        |   15 +++---
5188  fs/notify/fanotify/fanotify.c      |   24 +++++----
5189  fs/notify/fanotify/fanotify_user.c |  101 +++++++++++++++++++++++++-----------
5190  fs/notify/group.c                  |    1 +
5191  fs/notify/mark.c                   |   36 +++++--------
5192  include/linux/fanotify.h           |    5 ++-
5193  include/linux/fsnotify_backend.h   |   14 ++++-
5194  10 files changed, 121 insertions(+), 80 deletions(-)
5195 Merging irda/for-next (94d57c4 enic: Update MAINTAINERS)
5196 $ git merge irda/for-next
5197 Already up-to-date.
5198 Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver)
5199 $ git merge edac/linux_next
5200 Already up-to-date.
5201 Merging edac-amd/for-next (1f6189e amd64_edac: Cleanup return type of amd64_determine_edac_cap())
5202 $ git merge edac-amd/for-next
5203 Already up-to-date.
5204 Merging devicetree/devicetree/next (ae97159 of_mdio: Don't phy_scan_fixups() twice)
5205 $ git merge devicetree/devicetree/next
5206 Already up-to-date.
5207 Merging spi/spi/next (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
5208 $ git merge spi/spi/next
5209 Already up-to-date.
5210 Merging gpio/gpio/next (d92ef29 h8300: Move gpio.h to gpio-internal.h)
5211 $ git merge gpio/gpio/next
5212 Already up-to-date.
5213 Merging tip/auto-latest (e471db8 Merge branch 'perf/core' into auto-latest)
5214 $ git merge tip/auto-latest
5215 Resolved 'arch/x86/kernel/cpu/amd.c' using previous resolution.
5216 Resolved 'drivers/char/random.c' using previous resolution.
5217 Auto-merging drivers/char/random.c
5218 CONFLICT (content): Merge conflict in drivers/char/random.c
5219 Auto-merging arch/x86/xen/mmu.c
5220 Auto-merging arch/x86/kernel/cpu/amd.c
5221 CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/amd.c
5222 Auto-merging arch/x86/Kconfig
5223 Auto-merging MAINTAINERS
5224 Automatic merge failed; fix conflicts and then commit the result.
5225 $ git commit -v -a
5226 [master 047e8c8] Merge remote-tracking branch 'tip/auto-latest'
5227 $ git diff -M --stat --summary HEAD^..
5228  Documentation/ABI/testing/sysfs-platform-ts5500 |   46 +++
5229  MAINTAINERS                                     |    5 +
5230  arch/x86/Kconfig                                |    2 +
5231  arch/x86/include/asm/pgtable_types.h            |    1 -
5232  arch/x86/include/asm/x86_init.h                 |   12 -
5233  arch/x86/kernel/vsyscall_64.c                   |    2 +-
5234  arch/x86/kernel/x86_init.c                      |    4 -
5235  arch/x86/mm/init.c                              |  145 ++++++--
5236  arch/x86/platform/Makefile                      |    1 +
5237  arch/x86/platform/ts5500/Kconfig                |   28 ++
5238  arch/x86/platform/ts5500/Makefile               |    4 +
5239  arch/x86/platform/ts5500/ts5500.c               |  468 +++++++++++++++++++++++
5240  arch/x86/platform/ts5500/ts5500_adc.c           |  326 ++++++++++++++++
5241  arch/x86/platform/ts5500/ts5500_adc.h           |   62 +++
5242  arch/x86/platform/ts5500/ts5500_gpio.c          |  413 ++++++++++++++++++++
5243  arch/x86/platform/ts5500/ts5500_gpio.h          |   60 +++
5244  arch/x86/platform/ts5500/ts5500_led.c           |  115 ++++++
5245  arch/x86/xen/mmu.c                              |   15 -
5246  18 files changed, 1639 insertions(+), 70 deletions(-)
5247  create mode 100644 Documentation/ABI/testing/sysfs-platform-ts5500
5248  create mode 100644 arch/x86/platform/ts5500/Kconfig
5249  create mode 100644 arch/x86/platform/ts5500/Makefile
5250  create mode 100644 arch/x86/platform/ts5500/ts5500.c
5251  create mode 100644 arch/x86/platform/ts5500/ts5500_adc.c
5252  create mode 100644 arch/x86/platform/ts5500/ts5500_adc.h
5253  create mode 100644 arch/x86/platform/ts5500/ts5500_gpio.c
5254  create mode 100644 arch/x86/platform/ts5500/ts5500_gpio.h
5255  create mode 100644 arch/x86/platform/ts5500/ts5500_led.c
5256 Merging rcu/rcu/next (afe24b1 rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp())
5257 $ git merge rcu/rcu/next
5258 Already up-to-date.
5259 Merging kmemleak/kmemleak (614d29d kmemleak: Handle percpu memory allocation)
5260 $ git merge kmemleak/kmemleak
5261 Merge made by the 'recursive' strategy.
5262  Documentation/kmemleak.txt |    3 +
5263  include/linux/kmemleak.h   |    8 ++
5264  mm/kmemleak.c              |  152 +++++++++++++++++++++++++++++++++++++-------
5265  mm/percpu.c                |   12 +++-
5266  4 files changed, 150 insertions(+), 25 deletions(-)
5267 Merging kvm/kvm-updates/3.2 (a3e06bb KVM: emulate lapic tsc deadline timer for guest)
5268 $ git merge kvm/kvm-updates/3.2
5269 Already up-to-date.
5270 Merging oprofile/for-next (4167ab9 Merge branch 'core' of git://amd64.org/linux/rric into perf/core)
5271 $ git merge oprofile/for-next
5272 Already up-to-date.
5273 Merging xen/upstream/xen (ec8161f Merge branch 'upstream/microcode' into upstream/xen)
5274 $ git merge xen/upstream/xen
5275 Resolved 'arch/x86/xen/Kconfig' using previous resolution.
5276 Auto-merging arch/x86/xen/time.c
5277 Auto-merging arch/x86/xen/Kconfig
5278 CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
5279 Auto-merging arch/x86/kernel/microcode_core.c
5280 Auto-merging arch/x86/kernel/Makefile
5281 Automatic merge failed; fix conflicts and then commit the result.
5282 $ git commit -v -a
5283 [master 8050f24] Merge remote-tracking branch 'xen/upstream/xen'
5284 $ git diff -M --stat --summary HEAD^..
5285  arch/ia64/include/asm/xen/interface.h |    1 +
5286  arch/x86/include/asm/microcode.h      |    9 +
5287  arch/x86/include/asm/xen/hypercall.h  |    8 +
5288  arch/x86/include/asm/xen/interface.h  |    1 +
5289  arch/x86/kernel/Makefile              |    1 +
5290  arch/x86/kernel/microcode_core.c      |    5 +-
5291  arch/x86/kernel/microcode_xen.c       |  198 ++++++++++++++++++++
5292  arch/x86/xen/Kconfig                  |    4 +
5293  arch/x86/xen/time.c                   |   16 ++-
5294  include/xen/interface/platform.h      |  320 +++++++++++++++++++++++++++++++++
5295  include/xen/interface/xen.h           |    1 +
5296  11 files changed, 562 insertions(+), 2 deletions(-)
5297  create mode 100644 arch/x86/kernel/microcode_xen.c
5298  create mode 100644 include/xen/interface/platform.h
5299 Merging xen-two/linux-next (9d5ae84 Merge branch 'stable/vmalloc-3.2' into linux-next)
5300 $ git merge xen-two/linux-next
5301 Auto-merging drivers/net/xen-netback/netback.c
5302 Auto-merging drivers/block/xen-blkback/xenbus.c
5303 Auto-merging drivers/block/xen-blkback/common.h
5304 Removing arch/x86/include/asm/xen/grant_table.h
5305 Removing arch/ia64/include/asm/xen/grant_table.h
5306 Merge made by the 'recursive' strategy.
5307  arch/ia64/include/asm/xen/grant_table.h |   29 -----------
5308  arch/ia64/xen/grant-table.c             |   62 ------------------------
5309  arch/x86/include/asm/xen/grant_table.h  |    7 ---
5310  arch/x86/xen/grant-table.c              |    2 +-
5311  drivers/block/xen-blkback/common.h      |    5 +--
5312  drivers/block/xen-blkback/xenbus.c      |   54 +++------------------
5313  drivers/net/xen-netback/common.h        |   11 ++--
5314  drivers/net/xen-netback/netback.c       |   80 +++++++------------------------
5315  drivers/xen/xenbus/xenbus_client.c      |    6 +-
5316  include/xen/grant_table.h               |    1 -
5317  10 files changed, 34 insertions(+), 223 deletions(-)
5318  delete mode 100644 arch/ia64/include/asm/xen/grant_table.h
5319  delete mode 100644 arch/x86/include/asm/xen/grant_table.h
5320 Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
5321 $ git merge xen-pvhvm/linux-next
5322 Already up-to-date.
5323 Merging percpu/for-next (bc499f9 percpu: rename pcpu_mem_alloc to pcpu_mem_zalloc)
5324 $ git merge percpu/for-next
5325 Auto-merging mm/percpu.c
5326 Merge made by the 'recursive' strategy.
5327  mm/percpu-vm.c |    5 ++---
5328  mm/percpu.c    |   17 +++++++++--------
5329  2 files changed, 11 insertions(+), 11 deletions(-)
5330 Merging workqueues/for-next (9c5a2ba workqueue: separate out drain_workqueue() from destroy_workqueue())
5331 $ git merge workqueues/for-next
5332 Already up-to-date.
5333 Merging sfi/sfi-test (5b026c4 SFI: use ioremap_cache() instead of ioremap())
5334 $ git merge sfi/sfi-test
5335 Already up-to-date.
5336 Merging asm-generic/next (35dbc0e asm-generic/io.h: allow people to override individual funcs)
5337 $ git merge asm-generic/next
5338 Already up-to-date.
5339 Merging drivers-x86/linux-next (15b956a acer-wmi: support Lenovo ideapad S205 wifi switch)
5340 $ git merge drivers-x86/linux-next
5341 Already up-to-date.
5342 Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
5343 $ git merge hwpoison/hwpoison
5344 Already up-to-date.
5345 Merging sysctl/master (c2f5631 sysctl: remove impossible condition check)
5346 $ git merge sysctl/master
5347 Auto-merging fs/proc/proc_sysctl.c
5348 Merge made by the 'recursive' strategy.
5349  fs/proc/proc_sysctl.c |   14 ++------------
5350  1 files changed, 2 insertions(+), 12 deletions(-)
5351 Merging namespace/master (7e05c93 proc: Fix the proc access checks to namespace files.)
5352 $ git merge namespace/master
5353 Auto-merging fs/proc/inode.c
5354 Merge made by the 'recursive' strategy.
5355  fs/proc/inode.c      |    6 +-
5356  fs/proc/namespaces.c |  160 +++++++++++++++++++++++++++++++++++++++++++-------
5357  2 files changed, 142 insertions(+), 24 deletions(-)
5358 Merging regmap/for-next (a084481 regmap: Prepare LZO cache for variable block sizes)
5359 $ git merge regmap/for-next
5360 Merge made by the 'recursive' strategy.
5361  drivers/base/regmap/regcache-lzo.c |   15 +++++++++------
5362  1 files changed, 9 insertions(+), 6 deletions(-)
5363 Merging driver-core/driver-core-next (094803e Merge branch 'akpm' (Andrew's incoming))
5364 $ git merge driver-core/driver-core-next
5365 Already up-to-date.
5366 Merging tty/tty-next (094803e Merge branch 'akpm' (Andrew's incoming))
5367 $ git merge tty/tty-next
5368 Already up-to-date.
5369 Merging usb/usb-next (094803e Merge branch 'akpm' (Andrew's incoming))
5370 $ git merge usb/usb-next
5371 Already up-to-date.
5372 Merging staging/staging-next (094803e Merge branch 'akpm' (Andrew's incoming))
5373 $ git merge staging/staging-next
5374 Already up-to-date.
5375 Merging bkl-config/config (4ba8216 BKL: That's all, folks)
5376 $ git merge bkl-config/config
5377 Already up-to-date.
5378 Merging tmem/tmem (665c1e6 mm: cleancache: Use __read_mostly as appropiate.)
5379 $ git merge tmem/tmem
5380 Resolved 'mm/swapfile.c' using previous resolution.
5381 Auto-merging mm/swapfile.c
5382 CONFLICT (content): Merge conflict in mm/swapfile.c
5383 Auto-merging mm/filemap.c
5384 Auto-merging mm/Makefile
5385 Auto-merging mm/Kconfig
5386 Auto-merging include/linux/swap.h
5387 Auto-merging fs/super.c
5388 Auto-merging fs/buffer.c
5389 Auto-merging drivers/staging/zcache/zcache-main.c
5390 Removing Documentation/ABI/testing/sysfs-kernel-mm-cleancache
5391 Automatic merge failed; fix conflicts and then commit the result.
5392 $ git commit -v -a
5393 [master 9322a7a] Merge remote-tracking branch 'tmem/tmem'
5394 $ git diff -M --stat --summary HEAD^..
5395  .../ABI/testing/sysfs-kernel-mm-cleancache         |   11 -
5396  Documentation/vm/cleancache.txt                    |   41 ++--
5397  Documentation/vm/frontswap.txt                     |  210 +++++++++++++++
5398  drivers/staging/zcache/zcache-main.c               |   10 +-
5399  drivers/xen/tmem.c                                 |   10 +-
5400  fs/buffer.c                                        |    2 +-
5401  fs/super.c                                         |    2 +-
5402  include/linux/cleancache.h                         |   24 +-
5403  include/linux/frontswap.h                          |  126 +++++++++
5404  include/linux/swap.h                               |    4 +
5405  include/linux/swapfile.h                           |   13 +
5406  mm/Kconfig                                         |   17 ++
5407  mm/Makefile                                        |    1 +
5408  mm/cleancache.c                                    |   98 +++-----
5409  mm/filemap.c                                       |    2 +-
5410  mm/frontswap.c                                     |  273 ++++++++++++++++++++
5411  mm/page_io.c                                       |   12 +
5412  mm/swapfile.c                                      |   64 ++++-
5413  mm/truncate.c                                      |   10 +-
5414  19 files changed, 796 insertions(+), 134 deletions(-)
5415  delete mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache
5416  create mode 100644 Documentation/vm/frontswap.txt
5417  create mode 100644 include/linux/frontswap.h
5418  create mode 100644 include/linux/swapfile.h
5419  create mode 100644 mm/frontswap.c
5420 Merging writeback/writeback-for-next (ea7bf1d Merge branch 'requeue-io-wait' into writeback-for-next)
5421 $ git merge writeback/writeback-for-next
5422 Auto-merging mm/vmscan.c
5423 Auto-merging mm/page-writeback.c
5424 Auto-merging mm/backing-dev.c
5425 Auto-merging kernel/fork.c
5426 Auto-merging include/linux/sched.h
5427 Auto-merging fs/quota/quota.c
5428 Auto-merging fs/ext4/inode.c
5429 Auto-merging fs/buffer.c
5430 Merge made by the 'recursive' strategy.
5431  fs/btrfs/extent-tree.c           |    3 +-
5432  fs/buffer.c                      |    2 +-
5433  fs/ext4/inode.c                  |    2 +-
5434  fs/fs-writeback.c                |  146 ++++++---
5435  fs/quota/quota.c                 |    2 +-
5436  fs/sync.c                        |    4 +-
5437  fs/ubifs/budget.c                |    2 +-
5438  include/linux/backing-dev.h      |   22 +-
5439  include/linux/sched.h            |    7 +
5440  include/linux/writeback.h        |   33 ++-
5441  include/trace/events/writeback.h |   43 +--
5442  kernel/fork.c                    |    3 +
5443  mm/backing-dev.c                 |   17 +-
5444  mm/page-writeback.c              |  680 +++++++++++++++++++++++++++++---------
5445  mm/vmscan.c                      |    3 +-
5446  15 files changed, 726 insertions(+), 243 deletions(-)
5447 Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
5448 $ git merge arm-dt/devicetree/arm-next
5449 Already up-to-date.
5450 Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
5451 $ git merge hwspinlock/linux-next
5452 Resolved 'arch/arm/mach-omap2/hwspinlock.c' using previous resolution.
5453 Auto-merging arch/arm/mach-omap2/hwspinlock.c
5454 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/hwspinlock.c
5455 Auto-merging MAINTAINERS
5456 Automatic merge failed; fix conflicts and then commit the result.
5457 $ git commit -v -a
5458 [master 93fdf6a] Merge remote-tracking branch 'hwspinlock/linux-next'
5459 $ git diff -M --stat --summary HEAD^..
5460  Documentation/hwspinlock.txt             |   74 +++++++-----
5461  MAINTAINERS                              |   14 ++
5462  arch/arm/mach-omap2/hwspinlock.c         |    9 ++-
5463  drivers/hwspinlock/Kconfig               |   27 +++--
5464  drivers/hwspinlock/Makefile              |    1 +
5465  drivers/hwspinlock/hwspinlock_core.c     |  204 +++++++++++++++++++-----------
5466  drivers/hwspinlock/hwspinlock_internal.h |   40 ++++--
5467  drivers/hwspinlock/omap_hwspinlock.c     |  127 +++++++------------
5468  drivers/hwspinlock/u8500_hsem.c          |  198 +++++++++++++++++++++++++++++
5469  include/linux/hwspinlock.h               |   46 +++++--
5470  10 files changed, 515 insertions(+), 225 deletions(-)
5471  create mode 100644 drivers/hwspinlock/u8500_hsem.c
5472 Merging pinctrl/for-next (ab872c8 pinctrl/sirf: fix sirfsoc_get_group_pins prototype)
5473 $ git merge pinctrl/for-next
5474 Resolved 'arch/arm/mach-u300/Kconfig' using previous resolution.
5475 Resolved 'arch/arm/mach-u300/core.c' using previous resolution.
5476 Auto-merging arch/arm/mach-u300/core.c
5477 CONFLICT (content): Merge conflict in arch/arm/mach-u300/core.c
5478 Auto-merging arch/arm/mach-u300/Kconfig
5479 CONFLICT (content): Merge conflict in arch/arm/mach-u300/Kconfig
5480 Automatic merge failed; fix conflicts and then commit the result.
5481 $ git commit -v -a
5482 [master eefc89b] Merge remote-tracking branch 'pinctrl/for-next'
5483 $ git diff -M --stat --summary HEAD^..
5484 Merging moduleh/for-sfr (67b8499 Revert "tracing: Include module.h in define_trace.h")
5485 $ git merge moduleh/for-sfr
5486 Auto-merging sound/soc/samsung/dma.c
5487 Auto-merging sound/soc/samsung/ac97.c
5488 Auto-merging sound/pci/rme9652/hdspm.c
5489 Auto-merging sound/pci/rme9652/hdsp.c
5490 Auto-merging sound/pci/intel8x0.c
5491 Auto-merging sound/pci/hda/patch_via.c
5492 Auto-merging sound/pci/hda/patch_sigmatel.c
5493 Auto-merging sound/pci/hda/patch_realtek.c
5494 Auto-merging sound/pci/hda/patch_hdmi.c
5495 Auto-merging sound/pci/hda/hda_hwdep.c
5496 Auto-merging sound/core/hwdep.c
5497 Auto-merging net/mac80211/mlme.c
5498 Auto-merging net/ipv6/udplite.c
5499 Auto-merging net/ipv6/route.c
5500 Auto-merging net/ipv6/netfilter.c
5501 Auto-merging net/ipv6/addrconf.c
5502 Auto-merging net/ipv4/udplite.c
5503 Auto-merging net/bluetooth/mgmt.c
5504 Auto-merging net/bluetooth/l2cap_sock.c
5505 Auto-merging net/bluetooth/hci_sysfs.c
5506 Auto-merging net/8021q/vlan_core.c
5507 Auto-merging mm/truncate.c
5508 Auto-merging mm/swapfile.c
5509 Auto-merging mm/swap.c
5510 Auto-merging mm/shmem.c
5511 Auto-merging mm/rmap.c
5512 Auto-merging mm/page-writeback.c
5513 Auto-merging mm/oom_kill.c
5514 Auto-merging mm/mmap.c
5515 Auto-merging mm/mlock.c
5516 Auto-merging mm/migrate.c
5517 Auto-merging mm/mempolicy.c
5518 Auto-merging mm/memory.c
5519 Auto-merging mm/memory-failure.c
5520 Auto-merging mm/memcontrol.c
5521 Auto-merging mm/kmemleak.c
5522 Auto-merging mm/highmem.c
5523 Auto-merging mm/filemap.c
5524 Auto-merging mm/bounce.c
5525 Auto-merging kernel/utsname_sysctl.c
5526 Auto-merging kernel/sys.c
5527 Auto-merging kernel/stop_machine.c
5528 Auto-merging kernel/signal.c
5529 Auto-merging kernel/power/qos.c
5530 Auto-merging kernel/module.c
5531 Auto-merging kernel/events/core.c
5532 Auto-merging kernel/crash_dump.c
5533 Auto-merging kernel/cpuset.c
5534 Auto-merging kernel/cpu.c
5535 Auto-merging include/xen/xenbus.h
5536 Auto-merging include/sound/core.h
5537 Auto-merging include/net/sock.h
5538 Auto-merging include/net/ip_vs.h
5539 Auto-merging include/net/inet_timewait_sock.h
5540 Auto-merging include/net/bluetooth/hci_core.h
5541 Auto-merging include/media/saa7146.h
5542 Auto-merging include/linux/of.h
5543 Auto-merging include/linux/mtd/mtd.h
5544 Auto-merging include/linux/gameport.h
5545 Auto-merging include/linux/dmaengine.h
5546 CONFLICT (content): Merge conflict in include/linux/dmaengine.h
5547 Auto-merging include/linux/device.h
5548 Auto-merging include/linux/crypto.h
5549 Auto-merging include/linux/blkdev.h
5550 Auto-merging include/drm/drmP.h
5551 Auto-merging fs/ocfs2/cluster/tcp.c
5552 Auto-merging fs/nfsd/nfssvc.c
5553 Auto-merging fs/nfs/pnfs.c
5554 Auto-merging fs/nfs/pagelist.c
5555 Auto-merging fs/nfs/nfs4filelayout.c
5556 Auto-merging fs/logfs/super.c
5557 Auto-merging fs/cifs/connect.c
5558 Auto-merging drivers/xen/xenbus/xenbus_client.c
5559 Auto-merging drivers/w1/w1_int.c
5560 Auto-merging drivers/video/backlight/l4f00242t03.c
5561 Auto-merging drivers/target/target_core_transport.c
5562 Auto-merging drivers/target/target_core_tmr.c
5563 Auto-merging drivers/target/target_core_pscsi.c
5564 Auto-merging drivers/target/iscsi/iscsi_target.c
5565 Auto-merging drivers/staging/media/solo6x10/g723.c
5566 Auto-merging drivers/scsi/scsi_lib.c
5567 Auto-merging drivers/scsi/libfc/fc_lport.c
5568 Auto-merging drivers/scsi/libfc/fc_exch.c
5569 Auto-merging drivers/scsi/device_handler/scsi_dh.c
5570 Auto-merging drivers/s390/kvm/kvm_virtio.c
5571 Auto-merging drivers/s390/cio/qdio_debug.c
5572 Auto-merging drivers/s390/char/vmur.c
5573 Auto-merging drivers/regulator/tps6586x-regulator.c
5574 Auto-merging drivers/regulator/mc13783-regulator.c
5575 Auto-merging drivers/regulator/db8500-prcmu.c
5576 Auto-merging drivers/regulator/core.c
5577 Auto-merging drivers/regulator/88pm8607.c
5578 Auto-merging drivers/power/power_supply_sysfs.c
5579 Auto-merging drivers/power/max8998_charger.c
5580 Auto-merging drivers/power/max8997_charger.c
5581 Auto-merging drivers/power/max8903_charger.c
5582 Auto-merging drivers/power/max17042_battery.c
5583 Auto-merging drivers/platform/x86/wmi.c
5584 Auto-merging drivers/net/wireless/libertas/main.c
5585 Auto-merging drivers/net/wireless/iwlwifi/iwl-pci.c
5586 Auto-merging drivers/net/wireless/ath/ath9k/hw.c
5587 Auto-merging drivers/net/ethernet/mellanox/mlx4/srq.c
5588 Auto-merging drivers/net/ethernet/mellanox/mlx4/qp.c
5589 Auto-merging drivers/net/ethernet/mellanox/mlx4/port.c
5590 Auto-merging drivers/net/ethernet/mellanox/mlx4/pd.c
5591 Auto-merging drivers/net/ethernet/mellanox/mlx4/mr.c
5592 Auto-merging drivers/net/ethernet/mellanox/mlx4/fw.c
5593 Auto-merging drivers/net/ethernet/mellanox/mlx4/eq.c
5594 Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
5595 Auto-merging drivers/net/bonding/bond_procfs.c
5596 Auto-merging drivers/mtd/redboot.c
5597 Auto-merging drivers/mtd/onenand/onenand_bbt.c
5598 Auto-merging drivers/mtd/nand/sm_common.c
5599 Auto-merging drivers/mtd/nand/omap2.c
5600 Auto-merging drivers/mtd/nand/nand_bbt.c
5601 Auto-merging drivers/mtd/nand/diskonchip.c
5602 Auto-merging drivers/mtd/nand/cmx270_nand.c
5603 Auto-merging drivers/mtd/nand/cafe_nand.c
5604 Auto-merging drivers/mtd/mtdsuper.c
5605 Auto-merging drivers/mtd/cmdlinepart.c
5606 Auto-merging drivers/mtd/ar7part.c
5607 Auto-merging drivers/mfd/twl6030-irq.c
5608 Auto-merging drivers/mfd/twl-core.c
5609 Auto-merging drivers/mfd/max8997.c
5610 Auto-merging drivers/mfd/asic3.c
5611 CONFLICT (modify/delete): drivers/mfd/ab3550-core.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/mfd/ab3550-core.c left in tree.
5612 Auto-merging drivers/mfd/ab3100-core.c
5613 Auto-merging drivers/media/video/v4l2-subdev.c
5614 Auto-merging drivers/media/video/v4l2-ctrls.c
5615 Auto-merging drivers/media/video/tvp7002.c
5616 Auto-merging drivers/media/video/sr030pc30.c
5617 Auto-merging drivers/media/video/pvrusb2/pvrusb2-v4l2.c
5618 Auto-merging drivers/media/video/pvrusb2/pvrusb2-hdw.c
5619 Auto-merging drivers/media/video/noon010pc30.c
5620 Auto-merging drivers/media/video/mxb.c
5621 Auto-merging drivers/media/video/mt9m111.c
5622 Auto-merging drivers/media/video/m5mols/m5mols_core.c
5623 Auto-merging drivers/media/video/hexium_orion.c
5624 Auto-merging drivers/media/video/hexium_gemini.c
5625 Auto-merging drivers/media/video/cx25840/cx25840-ir.c
5626 Auto-merging drivers/media/video/adp1653.c
5627 Auto-merging drivers/media/rc/rc-main.c
5628 Auto-merging drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c
5629 Auto-merging drivers/media/rc/ir-lirc-codec.c
5630 Auto-merging drivers/media/radio/wl128x/fmdrv_v4l2.c
5631 Auto-merging drivers/media/radio/radio-wl1273.c
5632 Auto-merging drivers/media/dvb/frontends/dibx000_common.c
5633 CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/dibx000_common.c
5634 Auto-merging drivers/media/common/saa7146_video.c
5635 Auto-merging drivers/media/common/saa7146_hlp.c
5636 Auto-merging drivers/media/common/saa7146_fops.c
5637 Auto-merging drivers/media/common/saa7146_core.c
5638 Auto-merging drivers/md/raid5.c
5639 Auto-merging drivers/md/raid10.c
5640 Auto-merging drivers/md/raid1.c
5641 Auto-merging drivers/md/raid0.c
5642 Auto-merging drivers/md/multipath.c
5643 Auto-merging drivers/md/md.c
5644 Auto-merging drivers/md/linear.c
5645 Auto-merging drivers/md/faulty.c
5646 Auto-merging drivers/md/dm-raid.c
5647 Auto-merging drivers/md/dm-log-userspace-base.c
5648 Auto-merging drivers/leds/leds-lm3530.c
5649 Auto-merging drivers/leds/leds-gpio.c
5650 Auto-merging drivers/leds/leds-asic3.c
5651 Auto-merging drivers/infiniband/ulp/ipoib/ipoib_fs.c
5652 Auto-merging drivers/infiniband/ulp/ipoib/ipoib_cm.c
5653 Auto-merging drivers/infiniband/hw/qib/qib_verbs.c
5654 Auto-merging drivers/infiniband/hw/qib/qib_init.c
5655 Auto-merging drivers/infiniband/hw/qib/qib_iba7322.c
5656 Auto-merging drivers/infiniband/hw/qib/qib_iba7220.c
5657 Auto-merging drivers/infiniband/hw/qib/qib_file_ops.c
5658 Auto-merging drivers/infiniband/hw/qib/qib_driver.c
5659 Auto-merging drivers/infiniband/hw/mthca/mthca_provider.c
5660 Auto-merging drivers/infiniband/hw/ipath/ipath_init_chip.c
5661 Auto-merging drivers/infiniband/hw/cxgb4/qp.c
5662 Auto-merging drivers/infiniband/core/verbs.c
5663 Auto-merging drivers/infiniband/core/umem.c
5664 Auto-merging drivers/infiniband/core/ucma.c
5665 Auto-merging drivers/infiniband/core/sysfs.c
5666 Auto-merging drivers/infiniband/core/mad.c
5667 Auto-merging drivers/infiniband/core/cma.c
5668 Auto-merging drivers/infiniband/core/cm.c
5669 Auto-merging drivers/i2c/busses/i2c-tegra.c
5670 Auto-merging drivers/i2c/busses/i2c-sh7760.c
5671 Auto-merging drivers/gpu/drm/i915/i915_drv.c
5672 Auto-merging drivers/gpio/gpio-mxs.c
5673 Auto-merging drivers/gpio/gpio-mxc.c
5674 Auto-merging drivers/dma/intel_mid_dma.c
5675 Auto-merging drivers/dma/imx-sdma.c
5676 Auto-merging drivers/dma/imx-dma.c
5677 Auto-merging drivers/cpufreq/cpufreq_stats.c
5678 Auto-merging drivers/char/virtio_console.c
5679 Auto-merging drivers/char/ttyprintk.c
5680 Auto-merging drivers/block/virtio_blk.c
5681 Auto-merging drivers/block/ps3vram.c
5682 Auto-merging drivers/block/aoe/aoeblk.c
5683 Auto-merging drivers/base/power/runtime.c
5684 Auto-merResolved 'drivers/media/dvb/frontends/dibx000_common.c' using previous resolution.
5685 Resolved 'include/linux/dmaengine.h' using previous resolution.
5686 ging block/ioctl.c
5687 Auto-merging arch/x86/kernel/vsyscall_64.c
5688 Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
5689 Auto-merging arch/x86/crypto/aes_glue.c
5690 Auto-merging arch/s390/mm/init.c
5691 Auto-merging arch/powerpc/xmon/xmon.c
5692 Auto-merging arch/powerpc/sysdev/fsl_rio.c
5693 Auto-merging arch/powerpc/sysdev/cpm_common.c
5694 Auto-merging arch/powerpc/platforms/pseries/iommu.c
5695 Auto-merging arch/powerpc/platforms/pseries/eeh.c
5696 Auto-merging arch/powerpc/platforms/ps3/system-bus.c
5697 Auto-merging arch/powerpc/mm/tlb_nohash.c
5698 Auto-merging arch/powerpc/mm/numa.c
5699 Auto-merging arch/powerpc/mm/mmu_context_hash64.c
5700 Auto-merging arch/powerpc/mm/mem.c
5701 Auto-merging arch/powerpc/mm/hash_utils_64.c
5702 Auto-merging arch/powerpc/kernel/vio.c
5703 Auto-merging arch/powerpc/kernel/smp.c
5704 Auto-merging arch/powerpc/kernel/setup_64.c
5705 Auto-merging arch/powerpc/kernel/ptrace.c
5706 Auto-merging arch/powerpc/kernel/prom.c
5707 Auto-merging arch/powerpc/kernel/pci-common.c
5708 Auto-merging arch/powerpc/kernel/ibmebus.c
5709 Auto-merging arch/powerpc/kernel/dma.c
5710 Auto-merging arch/powerpc/kernel/dma-iommu.c
5711 Auto-merging arch/powerpc/include/asm/machdep.h
5712 Auto-merging arch/mips/kernel/cpu-probe.c
5713 Auto-merging arch/microblaze/kernel/dma.c
5714 Auto-merging arch/blackfin/mach-bf537/boards/tcm_bf537.c
5715 Auto-merging arch/blackfin/mach-bf537/boards/stamp.c
5716 Auto-merging arch/blackfin/mach-bf537/boards/pnav10.c
5717 Auto-merging arch/blackfin/mach-bf537/boards/dnp5370.c
5718 Auto-merging arch/blackfin/mach-bf537/boards/cm_bf537u.c
5719 Auto-merging arch/blackfin/mach-bf537/boards/cm_bf537e.c
5720 Auto-merging arch/blackfin/mach-bf527/boards/tll6527m.c
5721 Auto-merging arch/blackfin/mach-bf527/boards/ezkit.c
5722 Auto-merging arch/blackfin/mach-bf527/boards/ezbrd.c
5723 Auto-merging arch/blackfin/mach-bf527/boards/cm_bf527.c
5724 Auto-merging arch/blackfin/mach-bf527/boards/ad7160eval.c
5725 Auto-merging arch/blackfin/mach-bf518/boards/ezbrd.c
5726 Auto-merging arch/arm/plat-samsung/platformdata.c
5727 Auto-merging arch/arm/plat-samsung/dev-backlight.c
5728 Auto-merging arch/arm/mach-tegra/pcie.c
5729 Auto-merging arch/arm/mach-s3c2410/mach-h1940.c
5730 Auto-merging arch/arm/mach-omap2/voltage.c
5731 Auto-merging arch/arm/mach-omap2/prcm.c
5732 Auto-merging arch/arm/mach-omap2/pm.c
5733 Auto-merging arch/arm/mach-omap2/display.c
5734 Auto-merging arch/arm/mach-omap2/clockdomain.c
5735 Auto-merging arch/arm/mach-omap2/board-omap3evm.c
5736 Auto-merging arch/arm/mach-omap1/board-voiceblue.c
5737 Auto-merging arch/arm/mach-omap1/board-sx1.c
5738 Auto-merging arch/arm/mach-omap1/board-ams-delta.c
5739 Auto-merging arch/arm/mach-imx/mach-mx31moboard.c
5740 Auto-merging arch/arm/mach-imx/mach-mx31lite.c
5741 Auto-merging arch/arm/mach-imx/mach-mx31lilly.c
5742 Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
5743 Auto-merging arch/arm/kernel/setup.c
5744 Automatic merge failed; fix conflicts and then commit the result.
5745 $ git rm -f drivers/mfd/ab3550-core.c
5746 drivers/media/dvb/frontends/dibx000_common.c: needs merge
5747 drivers/mfd/ab3550-core.c: needs merge
5748 include/linux/dmaengine.h: needs merge
5749 rm 'drivers/mfd/ab3550-core.c'
5750 $ git commit -v -a
5751 [master f71fa9e] Merge remote-tracking branch 'moduleh/for-sfr'
5752 $ git diff -M --stat --summary HEAD^..
5753  arch/alpha/kernel/core_irongate.c                  |    1 +
5754  arch/alpha/kernel/pci-sysfs.c                      |    1 +
5755  arch/alpha/kernel/pci_iommu.c                      |    1 +
5756  arch/alpha/kernel/setup.c                          |    1 +
5757  arch/arm/common/it8152.c                           |    1 +
5758  arch/arm/common/scoop.c                            |    1 +
5759  arch/arm/kernel/armksyms.c                         |    2 +-
5760  arch/arm/kernel/bios32.c                           |    2 +-
5761  arch/arm/kernel/devtree.c                          |    2 +-
5762  arch/arm/kernel/elf.c                              |    2 +-
5763  arch/arm/kernel/etm.c                              |    1 +
5764  arch/arm/kernel/io.c                               |    2 +-
5765  arch/arm/kernel/irq.c                              |    1 -
5766  arch/arm/kernel/leds.c                             |    3 +-
5767  arch/arm/kernel/perf_event.c                       |    2 +-
5768  arch/arm/kernel/pj4-cp0.c                          |    1 -
5769  arch/arm/kernel/process.c                          |    2 +-
5770  arch/arm/kernel/ptrace.c                           |    1 +
5771  arch/arm/kernel/return_address.c                   |    2 +-
5772  arch/arm/kernel/setup.c                            |    2 +-
5773  arch/arm/kernel/stacktrace.c                       |    2 +-
5774  arch/arm/kernel/sys_arm.c                          |    2 +-
5775  arch/arm/kernel/time.c                             |    2 +-
5776  arch/arm/kernel/unwind.c                           |    2 +-
5777  arch/arm/kernel/xscale-cp0.c                       |    1 -
5778  arch/arm/mach-at91/cpuidle.c                       |    1 +
5779  arch/arm/mach-bcmring/dma.c                        |    1 +
5780  arch/arm/mach-bcmring/mm.c                         |    1 +
5781  arch/arm/mach-davinci/board-dm644x-evm.c           |    1 +
5782  arch/arm/mach-davinci/board-dm646x-evm.c           |    1 +
5783  arch/arm/mach-davinci/cdce949.c                    |    1 +
5784  arch/arm/mach-davinci/cpufreq.c                    |    1 +
5785  arch/arm/mach-davinci/cpuidle.c                    |    1 +
5786  arch/arm/mach-ep93xx/core.c                        |    1 +
5787  arch/arm/mach-exynos4/dev-sysmmu.c                 |    1 +
5788  arch/arm/mach-imx/mach-mx31lilly.c                 |    1 +
5789  arch/arm/mach-imx/mach-mx31lite.c                  |    1 +
5790  arch/arm/mach-imx/mach-mx31moboard.c               |    1 +
5791  arch/arm/mach-iop13xx/pci.c                        |    1 +
5792  arch/arm/mach-ixp2000/core.c                       |    1 +
5793  arch/arm/mach-ixp4xx/common-pci.c                  |    1 +
5794  arch/arm/mach-ixp4xx/common.c                      |    1 +
5795  arch/arm/mach-kirkwood/cpuidle.c                   |    1 +
5796  arch/arm/mach-msm/io.c                             |    1 +
5797  arch/arm/mach-netx/xc.c                            |    1 +
5798  arch/arm/mach-omap1/board-ams-delta.c              |    1 +
5799  arch/arm/mach-omap1/board-sx1.c                    |    1 +
5800  arch/arm/mach-omap1/board-voiceblue.c              |    1 +
5801  arch/arm/mach-omap1/mailbox.c                      |    1 +
5802  arch/arm/mach-omap2/board-omap3evm.c               |    1 +
5803  arch/arm/mach-omap2/clockdomain.c                  |    1 +
5804  arch/arm/mach-omap2/display.c                      |    1 +
5805  arch/arm/mach-omap2/gpmc-onenand.c                 |    1 +
5806  arch/arm/mach-omap2/pm.c                           |    1 +
5807  arch/arm/mach-omap2/prcm.c                         |    1 +
5808  arch/arm/mach-omap2/usb-tusb6010.c                 |    2 +
5809  arch/arm/mach-omap2/voltage.c                      |    1 +
5810  arch/arm/mach-pxa/colibri-pxa270.c                 |    1 +
5811  arch/arm/mach-pxa/corgi.c                          |    1 +
5812  arch/arm/mach-pxa/poodle.c                         |    1 +
5813  arch/arm/mach-pxa/spitz.c                          |    1 +
5814  arch/arm/mach-pxa/trizeps4.c                       |    1 +
5815  arch/arm/mach-s3c2410/mach-h1940.c                 |    1 +
5816  arch/arm/mach-s3c64xx/dev-audio.c                  |    1 +
5817  arch/arm/mach-sa1100/collie.c                      |    1 +
5818  arch/arm/mach-sa1100/jornada720.c                  |    1 +
5819  arch/arm/mach-shmobile/clock.c                     |    1 +
5820  arch/arm/mach-tegra/pcie.c                         |    1 +
5821  arch/arm/mm/fault-armv.c                           |    1 -
5822  arch/arm/mm/init.c                                 |    1 +
5823  arch/arm/plat-iop/gpio.c                           |    1 +
5824  arch/arm/plat-iop/time.c                           |    1 +
5825  arch/arm/plat-omap/clock.c                         |    1 +
5826  arch/arm/plat-omap/mailbox.c                       |    1 +
5827  arch/arm/plat-samsung/dev-backlight.c              |    1 +
5828  arch/arm/plat-samsung/platformdata.c               |    1 +
5829  arch/arm/vfp/vfpmodule.c                           |    1 -
5830  arch/avr32/mach-at32ap/clock.c                     |    1 +
5831  arch/avr32/mach-at32ap/cpufreq.c                   |    1 +
5832  arch/avr32/mach-at32ap/intc.c                      |    1 +
5833  arch/avr32/mach-at32ap/pio.c                       |    1 +
5834  arch/avr32/mm/dma-coherent.c                       |    1 +
5835  arch/blackfin/kernel/dma-mapping.c                 |    1 +
5836  arch/blackfin/kernel/perf_event.c                  |    1 +
5837  arch/blackfin/kernel/sys_bfin.c                    |    1 +
5838  arch/blackfin/mach-bf518/boards/ezbrd.c            |    1 +
5839  arch/blackfin/mach-bf527/boards/ad7160eval.c       |    1 +
5840  arch/blackfin/mach-bf527/boards/cm_bf527.c         |    1 +
5841  arch/blackfin/mach-bf527/boards/ezbrd.c            |    1 +
5842  arch/blackfin/mach-bf527/boards/ezkit.c            |    1 +
5843  arch/blackfin/mach-bf527/boards/tll6527m.c         |    1 +
5844  arch/blackfin/mach-bf537/boards/cm_bf537e.c        |    1 +
5845  arch/blackfin/mach-bf537/boards/cm_bf537u.c        |    1 +
5846  arch/blackfin/mach-bf537/boards/dnp5370.c          |    1 +
5847  arch/blackfin/mach-bf537/boards/pnav10.c           |    1 +
5848  arch/blackfin/mach-bf537/boards/stamp.c            |    1 +
5849  arch/blackfin/mach-bf537/boards/tcm_bf537.c        |    1 +
5850  arch/blackfin/mach-common/cpufreq.c                |    1 +
5851  arch/blackfin/mm/init.c                            |    1 +
5852  arch/ia64/hp/common/hwsw_iommu.c                   |    1 +
5853  arch/ia64/kernel/dma-mapping.c                     |    1 +
5854  arch/ia64/kernel/topology.c                        |    1 +
5855  arch/ia64/pci/pci.c                                |    1 +
5856  arch/ia64/sn/kernel/io_acpi_init.c                 |    1 +
5857  arch/ia64/sn/kernel/io_init.c                      |    1 +
5858  arch/ia64/sn/pci/pcibr/pcibr_dma.c                 |    1 +
5859  arch/ia64/sn/pci/pcibr/pcibr_provider.c            |    1 +
5860  arch/ia64/sn/pci/tioca_provider.c                  |    1 +
5861  arch/ia64/xen/hypervisor.c                         |    1 +
5862  arch/m68k/atari/time.c                             |    1 +
5863  arch/m68k/kernel/dma_mm.c                          |    1 +
5864  arch/m68k/kernel/dma_no.c                          |    1 +
5865  arch/microblaze/kernel/dma.c                       |    1 +
5866  arch/microblaze/kernel/irq.c                       |    1 +
5867  arch/microblaze/mm/init.c                          |    1 +
5868  arch/microblaze/pci/iomap.c                        |    1 +
5869  arch/microblaze/pci/pci-common.c                   |    1 +
5870  arch/mips/bcm47xx/gpio.c                           |    1 +
5871  arch/mips/bcm47xx/setup.c                          |    1 +
5872  arch/mips/cavium-octeon/csrc-octeon.c              |    1 +
5873  arch/mips/cavium-octeon/dma-octeon.c               |    1 +
5874  arch/mips/cavium-octeon/flash_setup.c              |    1 +
5875  arch/mips/kernel/8250-platform.c                   |    1 -
5876  arch/mips/kernel/cpu-probe.c                       |    3 +-
5877  arch/mips/kernel/i8253.c                           |    2 +-
5878  arch/mips/kernel/init_task.c                       |    2 +-
5879  arch/mips/kernel/irq-msc01.c                       |    1 -
5880  arch/mips/kernel/irq.c                             |    1 -
5881  arch/mips/kernel/mips-mt.c                         |    2 +-
5882  arch/mips/kernel/mips_ksyms.c                      |    2 +-
5883  arch/mips/kernel/module.c                          |    1 -
5884  arch/mips/kernel/process.c                         |    2 +-
5885  arch/mips/kernel/prom.c                            |    2 +-
5886  arch/mips/kernel/reset.c                           |    2 +-
5887  arch/mips/kernel/rtlx.c                            |    1 -
5888  arch/mips/kernel/setup.c                           |    2 +-
5889  arch/mips/kernel/spinlock_test.c                   |    2 +-
5890  arch/mips/kernel/stacktrace.c                      |    2 +-
5891  arch/mips/kernel/time.c                            |    2 +-
5892  arch/mips/kernel/traps.c                           |    1 -
5893  arch/mips/kernel/unaligned.c                       |    1 -
5894  arch/mips/kernel/vpe.c                             |    1 -
5895  arch/mips/loongson/common/platform.c               |    1 +
5896  arch/mips/pci/pci-ip27.c                           |    1 +
5897  arch/mips/pci/pci.c                                |    1 +
5898  arch/mips/powertv/pci/fixup-powertv.c              |    1 +
5899  arch/mips/powertv/powertv-usb.c                    |    1 +
5900  arch/mips/rb532/gpio.c                             |    1 +
5901  arch/mips/rb532/setup.c                            |    1 +
5902  arch/mips/txx9/generic/spi_eeprom.c                |    1 +
5903  arch/mips/txx9/rbtx4939/setup.c                    |    1 +
5904  arch/mips/vr41xx/common/giu.c                      |    1 +
5905  arch/mips/vr41xx/common/rtc.c                      |    1 +
5906  arch/parisc/kernel/drivers.c                       |    1 +
5907  arch/parisc/kernel/pci-dma.c                       |    1 +
5908  arch/parisc/kernel/setup.c                         |    1 +
5909  arch/parisc/lib/iomap.c                            |    1 +
5910  arch/powerpc/include/asm/lv1call.h                 |    1 +
5911  arch/powerpc/include/asm/machdep.h                 |    1 +
5912  arch/powerpc/include/asm/spu.h                     |    1 +
5913  arch/powerpc/kernel/btext.c                        |    2 +-
5914  arch/powerpc/kernel/clock.c                        |    2 +-
5915  arch/powerpc/kernel/cputable.c                     |    2 +-
5916  arch/powerpc/kernel/crash.c                        |    1 +
5917  arch/powerpc/kernel/dma-iommu.c                    |    1 +
5918  arch/powerpc/kernel/dma.c                          |    1 +
5919  arch/powerpc/kernel/firmware.c                     |    3 +-
5920  arch/powerpc/kernel/hw_breakpoint.c                |    1 -
5921  arch/powerpc/kernel/ibmebus.c                      |    2 +
5922  arch/powerpc/kernel/init_task.c                    |    2 +-
5923  arch/powerpc/kernel/io-workarounds.c               |    1 +
5924  arch/powerpc/kernel/io.c                           |    2 +-
5925  arch/powerpc/kernel/iomap.c                        |    1 +
5926  arch/powerpc/kernel/irq.c                          |    2 +-
5927  arch/powerpc/kernel/isa-bridge.c                   |    1 +
5928  arch/powerpc/kernel/kvm.c                          |    1 +
5929  arch/powerpc/kernel/module.c                       |    1 -
5930  arch/powerpc/kernel/of_platform.c                  |    2 +-
5931  arch/powerpc/kernel/paca.c                         |    2 +-
5932  arch/powerpc/kernel/pci-common.c                   |    1 +
5933  arch/powerpc/kernel/pci_32.c                       |    1 +
5934  arch/powerpc/kernel/pci_64.c                       |    1 +
5935  arch/powerpc/kernel/pci_dn.c                       |    1 +
5936  arch/powerpc/kernel/pci_of_scan.c                  |    1 +
5937  arch/powerpc/kernel/pmc.c                          |    2 +-
5938  arch/powerpc/kernel/ppc_ksyms.c                    |    2 +-
5939  arch/powerpc/kernel/process.c                      |    2 +-
5940  arch/powerpc/kernel/prom.c                         |    2 +-
5941  arch/powerpc/kernel/prom_parse.c                   |    1 -
5942  arch/powerpc/kernel/ptrace.c                       |    3 -
5943  arch/powerpc/kernel/rtas.c                         |    2 +-
5944  arch/powerpc/kernel/setup-common.c                 |    2 +-
5945  arch/powerpc/kernel/setup_64.c                     |    2 +-
5946  arch/powerpc/kernel/signal_64.c                    |    1 -
5947  arch/powerpc/kernel/smp.c                          |    2 +-
5948  arch/powerpc/kernel/stacktrace.c                   |    2 +-
5949  arch/powerpc/kernel/swsusp_64.c                    |    1 +
5950  arch/powerpc/kernel/sysfs.c                        |    2 +-
5951  arch/powerpc/kernel/time.c                         |    2 +-
5952  arch/powerpc/kernel/vdso.c                         |    1 -
5953  arch/powerpc/kernel/vio.c                          |    3 +-
5954  arch/powerpc/kvm/44x.c                             |    1 +
5955  arch/powerpc/kvm/book3s.c                          |    1 +
5956  arch/powerpc/kvm/book3s_exports.c                  |    2 +-
5957  arch/powerpc/kvm/book3s_hv.c                       |    1 +
5958  arch/powerpc/kvm/book3s_hv_builtin.c               |    1 +
5959  arch/powerpc/kvm/book3s_pr.c                       |    1 +
5960  arch/powerpc/kvm/powerpc.c                         |    1 -
5961  arch/powerpc/lib/checksum_wrappers_64.c            |    2 +-
5962  arch/powerpc/lib/devres.c                          |    2 +-
5963  arch/powerpc/lib/locks.c                           |    2 +-
5964  arch/powerpc/lib/rheap.c                           |    2 +-
5965  arch/powerpc/mm/dma-noncoherent.c                  |    1 +
5966  arch/powerpc/mm/hash_utils_64.c                    |    1 +
5967  arch/powerpc/mm/mem.c                              |    2 +-
5968  arch/powerpc/mm/mmu_context_hash32.c               |    1 +
5969  arch/powerpc/mm/mmu_context_hash64.c               |    2 +-
5970  arch/powerpc/mm/numa.c                             |    2 +-
5971  arch/powerpc/mm/pgtable_64.c                       |    1 +
5972  arch/powerpc/mm/slice.c                            |    2 +-
5973  arch/powerpc/mm/tlb_hash32.c                       |    1 +
5974  arch/powerpc/mm/tlb_nohash.c                       |    1 +
5975  arch/powerpc/platforms/44x/warp.c                  |    1 +
5976  arch/powerpc/platforms/512x/clock.c                |    1 +
5977  arch/powerpc/platforms/52xx/mpc52xx_common.c       |    1 +
5978  arch/powerpc/platforms/52xx/mpc52xx_gpt.c          |    1 +
5979  arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c      |    1 +
5980  arch/powerpc/platforms/83xx/suspend.c              |    1 +
5981  arch/powerpc/platforms/85xx/mpc85xx_cds.c          |    1 -
5982  arch/powerpc/platforms/85xx/mpc85xx_mds.c          |    1 -
5983  arch/powerpc/platforms/85xx/sbc8548.c              |    1 -
5984  arch/powerpc/platforms/86xx/gef_gpio.c             |    1 +
5985  arch/powerpc/platforms/8xx/tqm8xx_setup.c          |    1 -
5986  arch/powerpc/platforms/cell/axon_msi.c             |    1 +
5987  arch/powerpc/platforms/cell/beat.c                 |    2 +-
5988  arch/powerpc/platforms/cell/beat_spu_priv1.c       |    2 -
5989  arch/powerpc/platforms/cell/beat_wrapper.h         |    1 +
5990  arch/powerpc/platforms/cell/cbe_cpufreq.c          |    1 +
5991  arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c      |    1 +
5992  arch/powerpc/platforms/cell/cbe_powerbutton.c      |    1 +
5993  arch/powerpc/platforms/cell/cbe_regs.c             |    2 +-
5994  arch/powerpc/platforms/cell/celleb_setup.c         |    1 +
5995  arch/powerpc/platforms/cell/cpufreq_spudemand.c    |    1 +
5996  arch/powerpc/platforms/cell/interrupt.c            |    2 +-
5997  arch/powerpc/platforms/cell/pmu.c                  |    1 +
5998  arch/powerpc/platforms/cell/qpace_setup.c          |    1 +
5999  arch/powerpc/platforms/cell/setup.c                |    1 +
6000  arch/powerpc/platforms/cell/smp.c                  |    1 -
6001  arch/powerpc/platforms/cell/spu_callbacks.c        |    2 +-
6002  arch/powerpc/platforms/cell/spu_fault.c            |    2 +-
6003  arch/powerpc/platforms/cell/spu_manage.c           |    2 +-
6004  arch/powerpc/platforms/cell/spu_notify.c           |    3 +-
6005  arch/powerpc/platforms/cell/spu_priv1_mmio.c       |    1 -
6006  arch/powerpc/platforms/cell/spufs/backing_ops.c    |    1 -
6007  arch/powerpc/platforms/cell/spufs/context.c        |    2 +-
6008  arch/powerpc/platforms/cell/spufs/coredump.c       |    1 -
6009  arch/powerpc/platforms/cell/spufs/fault.c          |    1 -
6010  arch/powerpc/platforms/cell/spufs/file.c           |    2 +-
6011  arch/powerpc/platforms/cell/spufs/hw_ops.c         |    1 -
6012  arch/powerpc/platforms/cell/spufs/sched.c          |    1 -
6013  arch/powerpc/platforms/cell/spufs/switch.c         |    2 +-
6014  arch/powerpc/platforms/cell/spufs/syscalls.c       |    2 +-
6015  arch/powerpc/platforms/embedded6xx/holly.c         |    1 +
6016  arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c  |    1 +
6017  arch/powerpc/platforms/iseries/hvlpconfig.c        |    2 +-
6018  arch/powerpc/platforms/iseries/iommu.c             |    2 +-
6019  arch/powerpc/platforms/iseries/ksyms.c             |    2 +-
6020  arch/powerpc/platforms/iseries/lpardata.c          |    1 -
6021  arch/powerpc/platforms/iseries/lpevents.c          |    2 +-
6022  arch/powerpc/platforms/iseries/mf.c                |    1 +
6023  arch/powerpc/platforms/iseries/pci.c               |    1 -
6024  arch/powerpc/platforms/iseries/setup.c             |    1 +
6025  arch/powerpc/platforms/iseries/smp.c               |    1 -
6026  arch/powerpc/platforms/iseries/vio.c               |    2 +-
6027  arch/powerpc/platforms/iseries/viopath.c           |    2 +-
6028  arch/powerpc/platforms/maple/setup.c               |    1 +
6029  arch/powerpc/platforms/pasemi/cpufreq.c            |    1 +
6030  arch/powerpc/platforms/pasemi/dma_lib.c            |    3 +-
6031  arch/powerpc/platforms/pasemi/setup.c              |    1 +
6032  arch/powerpc/platforms/powermac/backlight.c        |    1 +
6033  arch/powerpc/platforms/powermac/feature.c          |    1 +
6034  arch/powerpc/platforms/powermac/low_i2c.c          |    2 +-
6035  arch/powerpc/platforms/powermac/nvram.c            |    2 +-
6036  arch/powerpc/platforms/powermac/pic.c              |    1 -
6037  arch/powerpc/platforms/powermac/setup.c            |    1 +
6038  arch/powerpc/platforms/ps3/exports.c               |    2 -
6039  arch/powerpc/platforms/ps3/interrupt.c             |    2 +-
6040  arch/powerpc/platforms/ps3/mm.c                    |    2 +-
6041  arch/powerpc/platforms/ps3/os-area.c               |    1 +
6042  arch/powerpc/platforms/ps3/setup.c                 |    1 +
6043  arch/powerpc/platforms/ps3/spu.c                   |    1 +
6044  arch/powerpc/platforms/ps3/system-bus.c            |    2 +-
6045  arch/powerpc/platforms/pseries/eeh.c               |    2 +
6046  arch/powerpc/platforms/pseries/eeh_event.c         |    1 +
6047  arch/powerpc/platforms/pseries/eeh_sysfs.c         |    1 +
6048  arch/powerpc/platforms/pseries/hotplug-cpu.c       |    1 +
6049  arch/powerpc/platforms/pseries/hvconsole.c         |    3 +-
6050  arch/powerpc/platforms/pseries/io_event_irq.c      |    2 +-
6051  arch/powerpc/platforms/pseries/iommu.c             |    1 +
6052  arch/powerpc/platforms/pseries/lpar.c              |    1 +
6053  arch/powerpc/platforms/pseries/mobility.c          |    1 +
6054  arch/powerpc/platforms/pseries/pci_dlpar.c         |    1 +
6055  arch/powerpc/platforms/pseries/plpar_wrappers.h    |    3 +
6056  arch/powerpc/platforms/pseries/setup.c             |    2 +-
6057  arch/powerpc/platforms/pseries/smp.c               |    1 -
6058  arch/powerpc/platforms/pseries/suspend.c           |    1 +
6059  arch/powerpc/sysdev/bestcomm/sram.c                |    2 +-
6060  arch/powerpc/sysdev/cpm_common.c                   |    1 +
6061  arch/powerpc/sysdev/dcr.c                          |    1 +
6062  arch/powerpc/sysdev/fsl_gtm.c                      |    1 +
6063  arch/powerpc/sysdev/fsl_lbc.c                      |    3 +-
6064  arch/powerpc/sysdev/fsl_pmc.c                      |    1 +
6065  arch/powerpc/sysdev/fsl_rio.c                      |    2 +-
6066  arch/powerpc/sysdev/fsl_soc.c                      |    2 +-
6067  arch/powerpc/sysdev/mpc5xxx_clocks.c               |    1 +
6068  arch/powerpc/sysdev/mpc8xx_pic.c                   |    1 -
6069  arch/powerpc/sysdev/mv64x60_pci.c                  |    1 +
6070  arch/powerpc/sysdev/pmi.c                          |    1 +
6071  arch/powerpc/sysdev/ppc4xx_msi.c                   |    1 +
6072  arch/powerpc/sysdev/qe_lib/gpio.c                  |    1 +
6073  arch/powerpc/sysdev/qe_lib/ucc.c                   |    2 +-
6074  arch/powerpc/sysdev/qe_lib/ucc_fast.c              |    2 +-
6075  arch/powerpc/sysdev/qe_lib/ucc_slow.c              |    2 +-
6076  arch/powerpc/sysdev/qe_lib/usb.c                   |    1 +
6077  arch/powerpc/sysdev/rtc_cmos_setup.c               |    1 +
6078  arch/powerpc/sysdev/scom.c                         |    1 +
6079  arch/powerpc/sysdev/simple_gpio.c                  |    1 -
6080  arch/powerpc/sysdev/tsi108_dev.c                   |    2 +-
6081  arch/powerpc/xmon/xmon.c                           |    2 +-
6082  arch/s390/crypto/sha_common.c                      |    1 +
6083  arch/s390/mm/init.c                                |    1 +
6084  arch/sh/drivers/dma/dma-sysfs.c                    |    1 +
6085  arch/sh/drivers/pci/pci.c                          |    1 +
6086  arch/sh/kernel/cpu/shmobile/cpuidle.c              |    1 +
6087  arch/sh/kernel/perf_event.c                        |    1 +
6088  arch/sh/kernel/topology.c                          |    1 +
6089  arch/sh/mm/init.c                                  |    1 +
6090  arch/sparc/include/asm/termios.h                   |    1 -
6091  arch/sparc/kernel/apc.c                            |    1 +
6092  arch/sparc/kernel/auxio_32.c                       |    1 +
6093  arch/sparc/kernel/btext.c                          |    1 -
6094  arch/sparc/kernel/central.c                        |    1 +
6095  arch/sparc/kernel/cpu.c                            |    2 +-
6096  arch/sparc/kernel/cpumap.c                         |    2 +-
6097  arch/sparc/kernel/dma.c                            |    1 -
6098  arch/sparc/kernel/ebus.c                           |    2 +-
6099  arch/sparc/kernel/hvapi.c                          |    2 +-
6100  arch/sparc/kernel/idprom.c                         |    2 +-
6101  arch/sparc/kernel/iommu.c                          |    2 +-
6102  arch/sparc/kernel/irq_32.c                         |    1 +
6103  arch/sparc/kernel/irq_64.c                         |    1 -
6104  arch/sparc/kernel/ldc.c                            |    2 +-
6105  arch/sparc/kernel/leon_kernel.c                    |    1 -
6106  arch/sparc/kernel/leon_pci.c                       |    1 +
6107  arch/sparc/kernel/leon_pci_grpci2.c                |    2 +-
6108  arch/sparc/kernel/mdesc.c                          |    2 +
6109  arch/sparc/kernel/nmi.c                            |    2 +-
6110  arch/sparc/kernel/of_device_32.c                   |    1 -
6111  arch/sparc/kernel/of_device_64.c                   |    3 +-
6112  arch/sparc/kernel/of_device_common.c               |    2 +-
6113  arch/sparc/kernel/pci.c                            |    2 +-
6114  arch/sparc/kernel/pci_fire.c                       |    1 +
6115  arch/sparc/kernel/pci_psycho.c                     |    1 +
6116  arch/sparc/kernel/pci_sabre.c                      |    1 +
6117  arch/sparc/kernel/pci_schizo.c                     |    1 +
6118  arch/sparc/kernel/pci_sun4v.c                      |    1 +
6119  arch/sparc/kernel/pcic.c                           |    1 +
6120  arch/sparc/kernel/pcr.c                            |    3 +-
6121  arch/sparc/kernel/pmc.c                            |    1 +
6122  arch/sparc/kernel/power.c                          |    2 +-
6123  arch/sparc/kernel/process_64.c                     |    2 +-
6124  arch/sparc/kernel/prom_32.c                        |    1 -
6125  arch/sparc/kernel/prom_64.c                        |    1 -
6126  arch/sparc/kernel/prom_common.c                    |    2 +-
6127  arch/sparc/kernel/reboot.c                         |    2 +-
6128  arch/sparc/kernel/sbus.c                           |    1 +
6129  arch/sparc/kernel/setup_32.c                       |    1 +
6130  arch/sparc/kernel/smp_64.c                         |    2 +-
6131  arch/sparc/kernel/sparc_ksyms_64.c                 |    2 +-
6132  arch/sparc/kernel/stacktrace.c                     |    2 +-
6133  arch/sparc/kernel/sys_sparc32.c                    |    1 -
6134  arch/sparc/kernel/sys_sparc_64.c                   |    2 +-
6135  arch/sparc/kernel/time_64.c                        |    2 +-
6136  arch/sparc/kernel/traps_32.c                       |    1 +
6137  arch/sparc/kernel/unaligned_32.c                   |    1 -
6138  arch/sparc/kernel/vio.c                            |    1 +
6139  arch/sparc/kernel/viohs.c                          |    2 +-
6140  arch/sparc/mm/fault_32.c                           |    1 -
6141  arch/sparc/mm/generic_32.c                         |    1 +
6142  arch/sparc/mm/generic_64.c                         |    1 +
6143  arch/sparc/mm/highmem.c                            |    1 +
6144  arch/sparc/mm/hugetlbpage.c                        |    1 -
6145  arch/unicore32/mm/init.c                           |    1 +
6146  arch/x86/crypto/aes_glue.c                         |    1 +
6147  arch/x86/crypto/aesni-intel_glue.c                 |    1 +
6148  arch/x86/kernel/cpu/amd.c                          |    1 +
6149  arch/x86/kernel/cpu/mcheck/mce-apei.c              |    1 +
6150  arch/x86/kernel/cpu/mcheck/mce.c                   |    1 +
6151  arch/x86/kernel/cpu/mcheck/therm_throt.c           |    1 +
6152  arch/x86/kernel/cpu/perf_event_intel.c             |    1 +
6153  arch/x86/kernel/devicetree.c                       |    1 +
6154  arch/x86/kernel/e820.c                             |    1 +
6155  arch/x86/kernel/hpet.c                             |    1 +
6156  arch/x86/kernel/irq.c                              |    1 +
6157  arch/x86/kernel/nmi.c                              |    1 +
6158  arch/x86/kernel/pci-dma.c                          |    1 +
6159  arch/x86/kernel/probe_roms.c                       |    4 +-
6160  arch/x86/kernel/rtc.c                              |    1 +
6161  arch/x86/kernel/smp.c                              |    1 +
6162  arch/x86/kernel/tboot.c                            |    1 +
6163  arch/x86/kernel/time.c                             |    1 +
6164  arch/x86/kernel/topology.c                         |    1 +
6165  arch/x86/kernel/vsyscall_64.c                      |    1 +
6166  arch/x86/lguest/boot.c                             |    1 +
6167  arch/x86/pci/i386.c                                |    1 +
6168  arch/x86/pci/legacy.c                              |    1 +
6169  arch/x86/platform/efi/efi.c                        |    1 +
6170  arch/x86/platform/efi/efi_32.c                     |    1 +
6171  arch/x86/platform/mrst/vrtc.c                      |    1 +
6172  arch/x86/platform/olpc/olpc-xo1-pm.c               |    1 +
6173  arch/x86/platform/uv/bios_uv.c                     |    1 +
6174  arch/x86/power/cpu.c                               |    1 +
6175  arch/x86/video/fbdev.c                             |    1 +
6176  block/blk-integrity.c                              |    1 +
6177  block/bsg-lib.c                                    |    2 +-
6178  block/ioctl.c                                      |    1 +
6179  crypto/async_tx/async_memcpy.c                     |    1 +
6180  crypto/async_tx/async_pq.c                         |    1 +
6181  crypto/async_tx/async_raid6_recov.c                |    1 +
6182  crypto/async_tx/async_tx.c                         |    1 +
6183  crypto/async_tx/async_xor.c                        |    1 +
6184  crypto/async_tx/raid6test.c                        |    1 +
6185  crypto/crypto_wq.c                                 |    1 +
6186  crypto/md4.c                                       |    1 +
6187  crypto/proc.c                                      |    1 +
6188  crypto/vmac.c                                      |    1 +
6189  crypto/xcbc.c                                      |    1 +
6190  drivers/acpi/acpica/evxface.c                      |    1 +
6191  drivers/acpi/acpica/evxfevnt.c                     |    1 +
6192  drivers/acpi/acpica/evxfgpe.c                      |    1 +
6193  drivers/acpi/acpica/evxfregn.c                     |    1 +
6194  drivers/acpi/acpica/hwsleep.c                      |    1 +
6195  drivers/acpi/acpica/hwtimer.c                      |    1 +
6196  drivers/acpi/acpica/hwxface.c                      |    1 +
6197  drivers/acpi/acpica/nsxfeval.c                     |    1 +
6198  drivers/acpi/acpica/nsxfname.c                     |    1 +
6199  drivers/acpi/acpica/nsxfobj.c                      |    1 +
6200  drivers/acpi/acpica/rsxface.c                      |    1 +
6201  drivers/acpi/acpica/tbxface.c                      |    1 +
6202  drivers/acpi/acpica/utdebug.c                      |    1 +
6203  drivers/acpi/acpica/utdecode.c                     |    1 +
6204  drivers/acpi/acpica/utglobal.c                     |    1 +
6205  drivers/acpi/acpica/utxface.c                      |    1 +
6206  drivers/acpi/acpica/utxferror.c                    |    1 +
6207  drivers/acpi/atomicio.c                            |    2 +-
6208  drivers/acpi/blacklist.c                           |    1 -
6209  drivers/acpi/debugfs.c                             |    1 +
6210  drivers/acpi/ec_sys.c                              |    1 +
6211  drivers/acpi/event.c                               |    1 +
6212  drivers/acpi/glue.c                                |    1 +
6213  drivers/acpi/proc.c                                |    1 +
6214  drivers/acpi/processor_core.c                      |    1 +
6215  drivers/acpi/sbshc.c                               |    1 +
6216  drivers/acpi/video_detect.c                        |    1 +
6217  drivers/ata/libata-eh.c                            |    1 +
6218  drivers/ata/libata-pmp.c                           |    1 +
6219  drivers/ata/libata-scsi.c                          |    1 +
6220  drivers/ata/libata-sff.c                           |    1 +
6221  drivers/base/base.h                                |    1 +
6222  drivers/base/dma-coherent.c                        |    1 +
6223  drivers/base/dma-mapping.c                         |    1 +
6224  drivers/base/hypervisor.c                          |    1 +
6225  drivers/base/power/common.c                        |    2 +-
6226  drivers/base/power/generic_ops.c                   |    1 +
6227  drivers/base/power/main.c                          |    1 +
6228  drivers/base/power/qos.c                           |    1 +
6229  drivers/base/power/runtime.c                       |    1 +
6230  drivers/base/power/sysfs.c                         |    1 +
6231  drivers/base/power/trace.c                         |    1 +
6232  drivers/base/power/wakeup.c                        |    1 +
6233  drivers/base/regmap/regcache.c                     |    1 +
6234  drivers/base/transport_class.c                     |    1 +
6235  drivers/bcma/core.c                                |    1 +
6236  drivers/bcma/driver_chipcommon.c                   |    1 +
6237  drivers/bcma/driver_chipcommon_pmu.c               |    1 +
6238  drivers/bcma/driver_pci.c                          |    1 +
6239  drivers/bcma/host_pci.c                            |    1 +
6240  drivers/bcma/main.c                                |    1 +
6241  drivers/block/aoe/aoeblk.c                         |    1 +
6242  drivers/block/aoe/aoechr.c                         |    1 +
6243  drivers/block/ps3disk.c                            |    1 +
6244  drivers/block/ps3vram.c                            |    1 +
6245  drivers/block/virtio_blk.c                         |    1 +
6246  drivers/bluetooth/btmrvl_main.c                    |    2 +
6247  drivers/bluetooth/btmrvl_sdio.c                    |    1 +
6248  drivers/bluetooth/btwilink.c                       |    1 +
6249  drivers/char/hw_random/virtio-rng.c                |    1 +
6250  drivers/char/mem.c                                 |    1 +
6251  drivers/char/ps3flash.c                            |    1 +
6252  drivers/char/ramoops.c                             |    1 +
6253  drivers/char/ttyprintk.c                           |    1 +
6254  drivers/char/virtio_console.c                      |    1 +
6255  drivers/clocksource/sh_cmt.c                       |    1 +
6256  drivers/clocksource/sh_mtu2.c                      |    1 +
6257  drivers/clocksource/sh_tmu.c                       |    1 +
6258  drivers/cpufreq/cpufreq_stats.c                    |    1 +
6259  drivers/cpufreq/s3c64xx-cpufreq.c                  |    1 +
6260  drivers/cpuidle/cpuidle.c                          |    1 +
6261  drivers/cpuidle/governors/ladder.c                 |    2 +-
6262  drivers/cpuidle/governors/menu.c                   |    1 +
6263  drivers/crypto/mv_cesa.c                           |    1 +
6264  drivers/dca/dca-core.c                             |    1 +
6265  drivers/dca/dca-sysfs.c                            |    1 +
6266  drivers/dma/imx-dma.c                              |    1 +
6267  drivers/dma/imx-sdma.c                             |    1 +
6268  drivers/dma/intel_mid_dma.c                        |    1 +
6269  drivers/dma/ipu/ipu_idmac.c                        |    1 +
6270  drivers/dma/ste_dma40.c                            |    1 +
6271  drivers/edac/mce_amd_inj.c                         |    1 +
6272  drivers/firewire/core-iso.c                        |    1 +
6273  drivers/firmware/google/gsmi.c                     |    1 +
6274  drivers/gpio/gpio-74x164.c                         |    1 +
6275  drivers/gpio/gpio-ep93xx.c                         |    1 +
6276  drivers/gpio/gpio-mc33880.c                        |    1 +
6277  drivers/gpio/gpio-mcp23s08.c                       |    1 +
6278  drivers/gpio/gpio-ml-ioh.c                         |    1 +
6279  drivers/gpio/gpio-mpc5200.c                        |    1 +
6280  drivers/gpio/gpio-mxc.c                            |    1 +
6281  drivers/gpio/gpio-mxs.c                            |    1 +
6282  drivers/gpio/gpio-pcf857x.c                        |    1 +
6283  drivers/gpio/gpio-pch.c                            |    1 +
6284  drivers/gpio/gpio-xilinx.c                         |    1 +
6285  drivers/gpu/drm/ati_pcigart.c                      |    1 +
6286  drivers/gpu/drm/drm_buffer.c                       |    1 +
6287  drivers/gpu/drm/drm_bufs.c                         |    1 +
6288  drivers/gpu/drm/drm_cache.c                        |    1 +
6289  drivers/gpu/drm/drm_crtc.c                         |    1 +
6290  drivers/gpu/drm/drm_crtc_helper.c                  |    3 +
6291  drivers/gpu/drm/drm_debugfs.c                      |    1 +
6292  drivers/gpu/drm/drm_dma.c                          |    1 +
6293  drivers/gpu/drm/drm_drv.c                          |    1 +
6294  drivers/gpu/drm/drm_edid.c                         |    1 +
6295  drivers/gpu/drm/drm_encoder_slave.c                |    2 +
6296  drivers/gpu/drm/drm_fb_helper.c                    |    1 +
6297  drivers/gpu/drm/drm_fops.c                         |    1 +
6298  drivers/gpu/drm/drm_hashtab.c                      |    1 +
6299  drivers/gpu/drm/drm_ioc32.c                        |    1 +
6300  drivers/gpu/drm/drm_irq.c                          |    1 +
6301  drivers/gpu/drm/drm_memory.c                       |    1 +
6302  drivers/gpu/drm/drm_mm.c                           |    1 +
6303  drivers/gpu/drm/drm_modes.c                        |    1 +
6304  drivers/gpu/drm/drm_pci.c                          |    1 +
6305  drivers/gpu/drm/drm_platform.c                     |    1 +
6306  drivers/gpu/drm/drm_proc.c                         |    1 +
6307  drivers/gpu/drm/drm_sman.c                         |    1 +
6308  drivers/gpu/drm/drm_sysfs.c                        |    1 +
6309  drivers/gpu/drm/drm_usb.c                          |    1 +
6310  drivers/gpu/drm/drm_vm.c                           |    1 +
6311  drivers/gpu/drm/i2c/ch7006_drv.c                   |    2 +
6312  drivers/gpu/drm/i2c/sil164_drv.c                   |    2 +
6313  drivers/gpu/drm/i810/i810_drv.c                    |    2 +
6314  drivers/gpu/drm/i915/i915_debugfs.c                |    1 +
6315  drivers/gpu/drm/i915/i915_dma.c                    |    1 +
6316  drivers/gpu/drm/i915/i915_drv.c                    |    1 +
6317  drivers/gpu/drm/i915/intel_dp.c                    |    1 +
6318  drivers/gpu/drm/i915/intel_i2c.c                   |    1 +
6319  drivers/gpu/drm/i915/intel_sdvo.c                  |    1 +
6320  drivers/gpu/drm/mga/mga_drv.c                      |    2 +
6321  drivers/gpu/drm/mga/mga_warp.c                     |    1 +
6322  drivers/gpu/drm/nouveau/nouveau_drv.c              |    1 +
6323  drivers/gpu/drm/nouveau/nouveau_i2c.c              |    2 +
6324  drivers/gpu/drm/nouveau/nouveau_temp.c             |    2 +
6325  drivers/gpu/drm/nouveau/nvc0_graph.c               |    1 +
6326  drivers/gpu/drm/r128/r128_cce.c                    |    1 +
6327  drivers/gpu/drm/r128/r128_drv.c                    |    2 +
6328  drivers/gpu/drm/radeon/ni.c                        |    1 +
6329  drivers/gpu/drm/radeon/r100.c                      |    1 +
6330  drivers/gpu/drm/radeon/r600.c                      |    1 +
6331  drivers/gpu/drm/radeon/r600_cp.c                   |    2 +
6332  drivers/gpu/drm/radeon/radeon_cp.c                 |    2 +
6333  drivers/gpu/drm/radeon/radeon_drv.c                |    1 +
6334  drivers/gpu/drm/radeon/radeon_i2c.c                |    2 +
6335  drivers/gpu/drm/savage/savage_drv.c                |    2 +
6336  drivers/gpu/drm/sis/sis_drv.c                      |    2 +
6337  drivers/gpu/drm/tdfx/tdfx_drv.c                    |    2 +
6338  drivers/gpu/drm/ttm/ttm_tt.c                       |    1 +
6339  drivers/gpu/drm/via/via_drv.c                      |    2 +
6340  drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |    1 +
6341  drivers/gpu/drm/vmwgfx/vmwgfx_fb.c                 |    2 +
6342  drivers/hid/hid-axff.c                             |    1 +
6343  drivers/hid/hid-debug.c                            |    1 +
6344  drivers/hid/hid-dr.c                               |    1 +
6345  drivers/hid/hid-emsff.c                            |    1 +
6346  drivers/hid/hid-gaff.c                             |    1 +
6347  drivers/hid/hid-holtekff.c                         |    1 +
6348  drivers/hid/hid-picolcd.c                          |    1 +
6349  drivers/hid/hid-pl.c                               |    1 +
6350  drivers/hid/hid-roccat-common.c                    |    1 +
6351  drivers/hid/hid-roccat.c                           |    1 +
6352  drivers/hid/hid-sjoy.c                             |    1 +
6353  drivers/hid/hid-tmff.c                             |    1 +
6354  drivers/hid/hid-zpff.c                             |    1 +
6355  drivers/hid/usbhid/hid-quirks.c                    |    1 +
6356  drivers/hwmon/ultra45_env.c                        |    1 +
6357  drivers/i2c/busses/i2c-pxa-pci.c                   |    1 +
6358  drivers/i2c/busses/i2c-sh7760.c                    |    1 +
6359  drivers/i2c/busses/i2c-tegra.c                     |    1 +
6360  drivers/i2c/i2c-boardinfo.c                        |    1 +
6361  drivers/ide/buddha.c                               |    1 +
6362  drivers/ide/cmd640.c                               |    1 +
6363  drivers/ide/ide-acpi.c                             |    1 +
6364  drivers/ide/ide-atapi.c                            |    1 +
6365  drivers/ide/ide-disk_proc.c                        |    1 +
6366  drivers/ide/ide-dma-sff.c                          |    1 +
6367  drivers/ide/ide-dma.c                              |    1 +
6368  drivers/ide/ide-eh.c                               |    1 +
6369  drivers/ide/ide-floppy_proc.c                      |    1 +
6370  drivers/ide/ide-io-std.c                           |    1 +
6371  drivers/ide/ide-ioctls.c                           |    1 +
6372  drivers/ide/ide-legacy.c                           |    1 +
6373  drivers/ide/ide-lib.c                              |    1 +
6374  drivers/ide/ide-pnp.c                              |    1 +
6375  drivers/ide/ide-taskfile.c                         |    1 +
6376  drivers/ide/ide-xfer-mode.c                        |    1 +
6377  drivers/ide/macide.c                               |    1 +
6378  drivers/ide/pmac.c                                 |    1 +
6379  drivers/ide/q40ide.c                               |    1 +
6380  drivers/ide/setup-pci.c                            |    1 +
6381  drivers/ide/tc86c001.c                             |    1 +
6382  drivers/idle/intel_idle.c                          |    1 +
6383  drivers/infiniband/core/addr.c                     |    1 +
6384  drivers/infiniband/core/cm.c                       |    1 +
6385  drivers/infiniband/core/cma.c                      |    1 +
6386  drivers/infiniband/core/fmr_pool.c                 |    1 +
6387  drivers/infiniband/core/iwcm.c                     |    1 +
6388  drivers/infiniband/core/mad.c                      |    1 +
6389  drivers/infiniband/core/multicast.c                |    1 +
6390  drivers/infiniband/core/netlink.c                  |    1 +
6391  drivers/infiniband/core/packer.c                   |    1 +
6392  drivers/infiniband/core/sysfs.c                    |    1 +
6393  drivers/infiniband/core/ucma.c                     |    1 +
6394  drivers/infiniband/core/ud_header.c                |    1 +
6395  drivers/infiniband/core/umem.c                     |    1 +
6396  drivers/infiniband/core/uverbs_marshall.c          |    1 +
6397  drivers/infiniband/core/verbs.c                    |    1 +
6398  drivers/infiniband/hw/cxgb4/qp.c                   |    3 +
6399  drivers/infiniband/hw/ipath/ipath_diag.c           |    1 +
6400  drivers/infiniband/hw/ipath/ipath_driver.c         |    1 +
6401  drivers/infiniband/hw/ipath/ipath_file_ops.c       |    1 +
6402  drivers/infiniband/hw/ipath/ipath_init_chip.c      |    1 +
6403  drivers/infiniband/hw/ipath/ipath_sysfs.c          |    1 +
6404  drivers/infiniband/hw/ipath/ipath_verbs.c          |    1 +
6405  drivers/infiniband/hw/mthca/mthca_catas.c          |    1 +
6406  drivers/infiniband/hw/mthca/mthca_cmd.c            |    1 +
6407  drivers/infiniband/hw/mthca/mthca_provider.c       |    2 +
6408  drivers/infiniband/hw/qib/qib_diag.c               |    1 +
6409  drivers/infiniband/hw/qib/qib_driver.c             |    1 +
6410  drivers/infiniband/hw/qib/qib_file_ops.c           |    1 +
6411  drivers/infiniband/hw/qib/qib_iba7220.c            |    1 +
6412  drivers/infiniband/hw/qib/qib_iba7322.c            |    1 +
6413  drivers/infiniband/hw/qib/qib_init.c               |    1 +
6414  drivers/infiniband/hw/qib/qib_pcie.c               |    1 +
6415  drivers/infiniband/hw/qib/qib_sd7220.c             |    1 +
6416  drivers/infiniband/hw/qib/qib_sdma.c               |    1 +
6417  drivers/infiniband/hw/qib/qib_tx.c                 |    1 +
6418  drivers/infiniband/hw/qib/qib_verbs.c              |    1 +
6419  drivers/infiniband/ulp/ipoib/ipoib_cm.c            |    1 +
6420  drivers/infiniband/ulp/ipoib/ipoib_fs.c            |    1 +
6421  drivers/infiniband/ulp/ipoib/ipoib_ib.c            |    1 +
6422  drivers/infiniband/ulp/ipoib/ipoib_multicast.c     |    1 +
6423  drivers/infiniband/ulp/iser/iscsi_iser.c           |    1 +
6424  drivers/input/input-compat.c                       |    1 +
6425  drivers/input/input-mt.c                           |    1 +
6426  drivers/input/input-polldev.c                      |    1 +
6427  drivers/input/joystick/as5011.c                    |    1 +
6428  drivers/input/keyboard/nomadik-ske-keypad.c        |    1 +
6429  drivers/input/keyboard/tnetv107x-keypad.c          |    1 +
6430  drivers/input/misc/ad714x.c                        |    1 +
6431  drivers/input/misc/adxl34x.c                       |    1 +
6432  drivers/input/misc/ati_remote2.c                   |    1 +
6433  drivers/input/misc/cma3000_d0x.c                   |    1 +
6434  drivers/input/misc/dm355evm_keys.c                 |    1 +
6435  drivers/input/sparse-keymap.c                      |    1 +
6436  drivers/input/touchscreen/ad7877.c                 |    1 +
6437  drivers/input/touchscreen/ad7879-spi.c             |    1 +
6438  drivers/input/touchscreen/ad7879.c                 |    1 +
6439  drivers/input/touchscreen/ads7846.c                |    1 +
6440  drivers/input/touchscreen/bu21013_ts.c             |    1 +
6441  drivers/iommu/intel-iommu.c                        |    1 +
6442  drivers/isdn/capi/kcapi_proc.c                     |    1 +
6443  drivers/isdn/gigaset/asyncdata.c                   |    1 +
6444  drivers/isdn/gigaset/capi.c                        |    1 +
6445  drivers/isdn/gigaset/dummyll.c                     |    1 +
6446  drivers/isdn/gigaset/ev-layer.c                    |    1 +
6447  drivers/isdn/gigaset/i4l.c                         |    1 +
6448  drivers/isdn/gigaset/interface.c                   |    1 +
6449  drivers/isdn/hardware/mISDN/mISDNisar.c            |    1 +
6450  drivers/isdn/i4l/isdn_tty.c                        |    1 +
6451  drivers/isdn/mISDN/clock.c                         |    1 +
6452  drivers/isdn/mISDN/dsp_audio.c                     |    1 +
6453  drivers/isdn/mISDN/dsp_pipeline.c                  |    1 +
6454  drivers/isdn/mISDN/socket.c                        |    1 +
6455  drivers/leds/dell-led.c                            |    1 +
6456  drivers/leds/leds-88pm860x.c                       |    1 +
6457  drivers/leds/leds-asic3.c                          |    1 +
6458  drivers/leds/leds-atmel-pwm.c                      |    1 +
6459  drivers/leds/leds-cobalt-raq.c                     |    1 +
6460  drivers/leds/leds-fsg.c                            |    1 +
6461  drivers/leds/leds-gpio.c                           |    1 +
6462  drivers/leds/leds-lm3530.c                         |    1 +
6463  drivers/leds/leds-locomo.c                         |    1 +
6464  drivers/leds/leds-lt3593.c                         |    1 +
6465  drivers/leds/leds-net48xx.c                        |    1 +
6466  drivers/leds/leds-net5501.c                        |    1 +
6467  drivers/leds/leds-ns2.c                            |    1 +
6468  drivers/leds/leds-s3c24xx.c                        |    1 +
6469  drivers/leds/leds-wm831x-status.c                  |    1 +
6470  drivers/leds/leds-wm8350.c                         |    1 +
6471  drivers/leds/leds-wrap.c                           |    1 +
6472  drivers/lguest/lguest_device.c                     |    1 +
6473  drivers/lguest/lguest_user.c                       |    1 +
6474  drivers/md/dm-exception-store.c                    |    1 +
6475  drivers/md/dm-log-userspace-base.c                 |    1 +
6476  drivers/md/dm-path-selector.c                      |    1 +
6477  drivers/md/dm-raid.c                               |    1 +
6478  drivers/md/dm-round-robin.c                        |    1 +
6479  drivers/md/dm-service-time.c                       |    1 +
6480  drivers/md/dm-snap-persistent.c                    |    1 +
6481  drivers/md/dm-snap-transient.c                     |    1 +
6482  drivers/md/dm-uevent.c                             |    1 +
6483  drivers/md/faulty.c                                |    1 +
6484  drivers/md/linear.c                                |    1 +
6485  drivers/md/md.c                                    |    1 +
6486  drivers/md/multipath.c                             |    1 +
6487  drivers/md/raid0.c                                 |    1 +
6488  drivers/md/raid1.c                                 |    1 +
6489  drivers/md/raid10.c                                |    1 +
6490  drivers/md/raid5.c                                 |    1 +
6491  drivers/media/common/saa7146_core.c                |    1 +
6492  drivers/media/common/saa7146_fops.c                |    1 +
6493  drivers/media/common/saa7146_hlp.c                 |    1 +
6494  drivers/media/common/saa7146_video.c               |    1 +
6495  drivers/media/common/tuners/tuner-types.c          |    1 +
6496  drivers/media/dvb/frontends/dibx000_common.c       |    1 +
6497  drivers/media/dvb/siano/sms-cards.c                |    1 +
6498  drivers/media/dvb/siano/smsendian.c                |    1 +
6499  drivers/media/dvb/siano/smssdio.c                  |    1 +
6500  drivers/media/dvb/siano/smsusb.c                   |    1 +
6501  drivers/media/media-device.c                       |    1 +
6502  drivers/media/radio/radio-timb.c                   |    1 +
6503  drivers/media/radio/radio-wl1273.c                 |    1 +
6504  drivers/media/radio/si4713-i2c.c                   |    1 +
6505  drivers/media/radio/wl128x/fmdrv_v4l2.c            |    2 +
6506  drivers/media/rc/ir-jvc-decoder.c                  |    1 +
6507  drivers/media/rc/ir-lirc-codec.c                   |    1 +
6508  drivers/media/rc/ir-nec-decoder.c                  |    1 +
6509  drivers/media/rc/ir-raw.c                          |    2 +
6510  drivers/media/rc/ir-rc5-decoder.c                  |    1 +
6511  drivers/media/rc/ir-rc5-sz-decoder.c               |    1 +
6512  drivers/media/rc/ir-rc6-decoder.c                  |    1 +
6513  drivers/media/rc/ir-sony-decoder.c                 |    1 +
6514  drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c    |    1 +
6515  drivers/media/rc/keymaps/rc-alink-dtu-m.c          |    1 +
6516  drivers/media/rc/keymaps/rc-anysee.c               |    1 +
6517  drivers/media/rc/keymaps/rc-apac-viewcomp.c        |    1 +
6518  drivers/media/rc/keymaps/rc-asus-pc39.c            |    1 +
6519  drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c |    1 +
6520  drivers/media/rc/keymaps/rc-avermedia-a16d.c       |    1 +
6521  drivers/media/rc/keymaps/rc-avermedia-cardbus.c    |    1 +
6522  drivers/media/rc/keymaps/rc-avermedia-dvbt.c       |    1 +
6523  drivers/media/rc/keymaps/rc-avermedia-m135a.c      |    1 +
6524  .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c    |    1 +
6525  drivers/media/rc/keymaps/rc-avermedia-rm-ks.c      |    1 +
6526  drivers/media/rc/keymaps/rc-avermedia.c            |    1 +
6527  drivers/media/rc/keymaps/rc-avertv-303.c           |    1 +
6528  drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c   |    1 +
6529  drivers/media/rc/keymaps/rc-behold-columbus.c      |    1 +
6530  drivers/media/rc/keymaps/rc-behold.c               |    1 +
6531  drivers/media/rc/keymaps/rc-budget-ci-old.c        |    1 +
6532  drivers/media/rc/keymaps/rc-cinergy-1400.c         |    1 +
6533  drivers/media/rc/keymaps/rc-cinergy.c              |    1 +
6534  drivers/media/rc/keymaps/rc-dib0700-nec.c          |    1 +
6535  drivers/media/rc/keymaps/rc-dib0700-rc5.c          |    1 +
6536  drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c  |    1 +
6537  drivers/media/rc/keymaps/rc-digittrade.c           |    1 +
6538  drivers/media/rc/keymaps/rc-dm1105-nec.c           |    1 +
6539  drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c      |    1 +
6540  drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c   |    1 +
6541  drivers/media/rc/keymaps/rc-em-terratec.c          |    1 +
6542  drivers/media/rc/keymaps/rc-encore-enltv-fm53.c    |    1 +
6543  drivers/media/rc/keymaps/rc-encore-enltv.c         |    1 +
6544  drivers/media/rc/keymaps/rc-encore-enltv2.c        |    1 +
6545  drivers/media/rc/keymaps/rc-evga-indtube.c         |    1 +
6546  drivers/media/rc/keymaps/rc-eztv.c                 |    1 +
6547  drivers/media/rc/keymaps/rc-flydvb.c               |    1 +
6548  drivers/media/rc/keymaps/rc-flyvideo.c             |    1 +
6549  drivers/media/rc/keymaps/rc-fusionhdtv-mce.c       |    1 +
6550  drivers/media/rc/keymaps/rc-gadmei-rm008z.c        |    1 +
6551  drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c   |    1 +
6552  drivers/media/rc/keymaps/rc-gotview7135.c          |    1 +
6553  drivers/media/rc/keymaps/rc-hauppauge.c            |    1 +
6554  drivers/media/rc/keymaps/rc-imon-mce.c             |    1 +
6555  drivers/media/rc/keymaps/rc-imon-pad.c             |    1 +
6556  drivers/media/rc/keymaps/rc-iodata-bctv7e.c        |    1 +
6557  drivers/media/rc/keymaps/rc-kaiomy.c               |    1 +
6558  drivers/media/rc/keymaps/rc-kworld-315u.c          |    1 +
6559  .../media/rc/keymaps/rc-kworld-plus-tv-analog.c    |    1 +
6560  drivers/media/rc/keymaps/rc-leadtek-y04g0051.c     |    1 +
6561  drivers/media/rc/keymaps/rc-lirc.c                 |    1 +
6562  drivers/media/rc/keymaps/rc-lme2510.c              |    1 +
6563  drivers/media/rc/keymaps/rc-manli.c                |    1 +
6564  drivers/media/rc/keymaps/rc-msi-digivox-ii.c       |    1 +
6565  drivers/media/rc/keymaps/rc-msi-digivox-iii.c      |    1 +
6566  drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c  |    1 +
6567  drivers/media/rc/keymaps/rc-msi-tvanywhere.c       |    1 +
6568  drivers/media/rc/keymaps/rc-nebula.c               |    1 +
6569  .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c  |    1 +
6570  drivers/media/rc/keymaps/rc-norwood.c              |    1 +
6571  drivers/media/rc/keymaps/rc-npgtech.c              |    1 +
6572  drivers/media/rc/keymaps/rc-pctv-sedna.c           |    1 +
6573  drivers/media/rc/keymaps/rc-pinnacle-color.c       |    1 +
6574  drivers/media/rc/keymaps/rc-pinnacle-grey.c        |    1 +
6575  drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c     |    1 +
6576  drivers/media/rc/keymaps/rc-pixelview-002t.c       |    1 +
6577  drivers/media/rc/keymaps/rc-pixelview-mk12.c       |    1 +
6578  drivers/media/rc/keymaps/rc-pixelview-new.c        |    1 +
6579  drivers/media/rc/keymaps/rc-pixelview.c            |    1 +
6580  .../media/rc/keymaps/rc-powercolor-real-angel.c    |    1 +
6581  drivers/media/rc/keymaps/rc-proteus-2309.c         |    1 +
6582  drivers/media/rc/keymaps/rc-purpletv.c             |    1 +
6583  drivers/media/rc/keymaps/rc-pv951.c                |    1 +
6584  drivers/media/rc/keymaps/rc-rc6-mce.c              |    1 +
6585  .../media/rc/keymaps/rc-real-audio-220-32-keys.c   |    1 +
6586  drivers/media/rc/keymaps/rc-streamzap.c            |    1 +
6587  drivers/media/rc/keymaps/rc-tbs-nec.c              |    1 +
6588  drivers/media/rc/keymaps/rc-technisat-usb2.c       |    1 +
6589  drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c  |    1 +
6590  drivers/media/rc/keymaps/rc-terratec-slim-2.c      |    1 +
6591  drivers/media/rc/keymaps/rc-terratec-slim.c        |    1 +
6592  drivers/media/rc/keymaps/rc-tevii-nec.c            |    1 +
6593  drivers/media/rc/keymaps/rc-tivo.c                 |    1 +
6594  drivers/media/rc/keymaps/rc-total-media-in-hand.c  |    1 +
6595  drivers/media/rc/keymaps/rc-trekstor.c             |    1 +
6596  drivers/media/rc/keymaps/rc-tt-1500.c              |    1 +
6597  drivers/media/rc/keymaps/rc-twinhan1027.c          |    1 +
6598  drivers/media/rc/keymaps/rc-videomate-m1f.c        |    1 +
6599  drivers/media/rc/keymaps/rc-videomate-s350.c       |    1 +
6600  drivers/media/rc/keymaps/rc-videomate-tv-pvr.c     |    1 +
6601  drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c |    1 +
6602  drivers/media/rc/keymaps/rc-winfast.c              |    1 +
6603  drivers/media/rc/rc-main.c                         |    1 +
6604  drivers/media/video/adp1653.c                      |    1 +
6605  drivers/media/video/ak881x.c                       |    1 +
6606  drivers/media/video/cpia2/cpia2_usb.c              |    1 +
6607  drivers/media/video/cx25840/cx25840-ir.c           |    1 +
6608  drivers/media/video/davinci/dm355_ccdc.c           |    1 +
6609  drivers/media/video/davinci/dm644x_ccdc.c          |    1 +
6610  drivers/media/video/hdpvr/hdpvr-i2c.c              |    1 +
6611  drivers/media/video/hexium_gemini.c                |    1 +
6612  drivers/media/video/hexium_orion.c                 |    1 +
6613  drivers/media/video/imx074.c                       |    1 +
6614  drivers/media/video/m5mols/m5mols_core.c           |    1 +
6615  drivers/media/video/mt9m001.c                      |    1 +
6616  drivers/media/video/mt9m111.c                      |    1 +
6617  drivers/media/video/mt9t031.c                      |    1 +
6618  drivers/media/video/mt9v011.c                      |    1 +
6619  drivers/media/video/mt9v022.c                      |    1 +
6620  drivers/media/video/mt9v032.c                      |    1 +
6621  drivers/media/video/mxb.c                          |    1 +
6622  drivers/media/video/noon010pc30.c                  |    1 +
6623  drivers/media/video/omap24xxcam.c                  |    1 +
6624  drivers/media/video/ov6650.c                       |    1 +
6625  drivers/media/video/pvrusb2/pvrusb2-devattr.c      |    1 +
6626  drivers/media/video/pvrusb2/pvrusb2-hdw.c          |    1 +
6627  drivers/media/video/pvrusb2/pvrusb2-i2c-core.c     |    1 +
6628  drivers/media/video/pvrusb2/pvrusb2-v4l2.c         |    1 +
6629  drivers/media/video/rj54n1cb0c.c                   |    1 +
6630  drivers/media/video/sh_mobile_csi2.c               |    1 +
6631  drivers/media/video/sh_vou.c                       |    1 +
6632  drivers/media/video/sr030pc30.c                    |    1 +
6633  drivers/media/video/tcm825x.c                      |    1 +
6634  drivers/media/video/timblogiw.c                    |    1 +
6635  drivers/media/video/tvp514x.c                      |    1 +
6636  drivers/media/video/tvp5150.c                      |    1 +
6637  drivers/media/video/tvp7002.c                      |    1 +
6638  drivers/media/video/usbvision/usbvision-cards.c    |    1 +
6639  drivers/media/video/v4l2-ctrls.c                   |    1 +
6640  drivers/media/video/v4l2-device.c                  |    1 +
6641  drivers/media/video/v4l2-event.c                   |    1 +
6642  drivers/media/video/v4l2-fh.c                      |    1 +
6643  drivers/media/video/v4l2-int-device.c              |    1 +
6644  drivers/media/video/v4l2-subdev.c                  |    1 +
6645  drivers/memstick/core/memstick.c                   |    1 +
6646  drivers/memstick/core/mspro_block.c                |    1 +
6647  drivers/memstick/host/jmb38x_ms.c                  |    1 +
6648  drivers/memstick/host/tifm_ms.c                    |    1 +
6649  drivers/message/i2o/pci.c                          |    1 +
6650  drivers/mfd/ab3100-core.c                          |    1 +
6651  drivers/mfd/ab8500-debugfs.c                       |    1 +
6652  drivers/mfd/ab8500-sysctrl.c                       |    1 +
6653  drivers/mfd/abx500-core.c                          |    1 +
6654  drivers/mfd/asic3.c                                |    1 +
6655  drivers/mfd/dm355evm_msp.c                         |    1 +
6656  drivers/mfd/max8997.c                              |    1 +
6657  drivers/mfd/mfd-core.c                             |    1 +
6658  drivers/mfd/pcf50633-irq.c                         |    1 +
6659  drivers/mfd/tmio_core.c                            |    1 +
6660  drivers/mfd/twl-core.c                             |    1 +
6661  drivers/mfd/twl6030-irq.c                          |    1 +
6662  drivers/mfd/wl1273-core.c                          |    1 +
6663  drivers/mfd/wm8400-core.c                          |    1 +
6664  drivers/misc/ab8500-pwm.c                          |    1 +
6665  drivers/misc/atmel-ssc.c                           |    1 +
6666  drivers/misc/atmel_tclib.c                         |    1 +
6667  drivers/misc/bh1780gli.c                           |    1 +
6668  drivers/misc/kgdbts.c                              |    1 +
6669  drivers/misc/sgi-gru/grukservices.c                |    1 +
6670  drivers/misc/ti-st/st_kim.c                        |    1 +
6671  drivers/misc/tifm_7xx1.c                           |    1 +
6672  drivers/misc/tifm_core.c                           |    1 +
6673  drivers/mmc/core/bus.c                             |    2 +
6674  drivers/mmc/core/debugfs.c                         |    1 +
6675  drivers/mmc/core/host.c                            |    1 +
6676  drivers/mmc/core/mmc.c                             |    1 +
6677  drivers/mmc/core/mmc_ops.c                         |    1 +
6678  drivers/mmc/core/quirks.c                          |    1 +
6679  drivers/mmc/core/sd.c                              |    1 +
6680  drivers/mmc/core/sd_ops.c                          |    1 +
6681  drivers/mmc/core/sdio_bus.c                        |    1 +
6682  drivers/mmc/core/sdio_io.c                         |    1 +
6683  drivers/mmc/core/sdio_irq.c                        |    1 +
6684  drivers/mmc/host/sdhci-tegra.c                     |    1 +
6685  drivers/mtd/ar7part.c                              |    1 +
6686  drivers/mtd/cmdlinepart.c                          |    1 +
6687  drivers/mtd/lpddr/lpddr_cmds.c                     |    1 +
6688  drivers/mtd/mtdblock_ro.c                          |    1 +
6689  drivers/mtd/mtdsuper.c                             |    1 +
6690  drivers/mtd/nand/cafe_nand.c                       |    1 +
6691  drivers/mtd/nand/cmx270_nand.c                     |    1 +
6692  drivers/mtd/nand/diskonchip.c                      |    1 +
6693  drivers/mtd/nand/nand_bbt.c                        |    1 +
6694  drivers/mtd/nand/omap2.c                           |    1 +
6695  drivers/mtd/nand/sm_common.c                       |    1 +
6696  drivers/mtd/onenand/onenand_bbt.c                  |    1 +
6697  drivers/mtd/redboot.c                              |    1 +
6698  drivers/mtd/rfd_ftl.c                              |    1 +
6699  drivers/mtd/ubi/vmt.c                              |    1 +
6700  drivers/net/bonding/bond_procfs.c                  |    1 +
6701  drivers/net/ethernet/brocade/bna/bnad.c            |    1 +
6702  drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c |    1 +
6703  drivers/net/ethernet/chelsio/cxgb3/l2t.c           |    1 +
6704  drivers/net/ethernet/chelsio/cxgb4/l2t.c           |    7 +-
6705  drivers/net/ethernet/chelsio/cxgb4/sge.c           |    1 +
6706  drivers/net/ethernet/emulex/benet/be_main.c        |    1 +
6707  drivers/net/ethernet/ethoc.c                       |    1 +
6708  drivers/net/ethernet/freescale/ucc_geth.c          |    1 +
6709  drivers/net/ethernet/intel/e1000e/param.c          |    1 +
6710  drivers/net/ethernet/mellanox/mlx4/alloc.c         |    1 +
6711  drivers/net/ethernet/mellanox/mlx4/catas.c         |    1 +
6712  drivers/net/ethernet/mellanox/mlx4/cmd.c           |    1 +
6713  drivers/net/ethernet/mellanox/mlx4/cq.c            |    1 +
6714  drivers/net/ethernet/mellanox/mlx4/en_tx.c         |    1 +
6715  drivers/net/ethernet/mellanox/mlx4/eq.c            |    1 +
6716  drivers/net/ethernet/mellanox/mlx4/fw.c            |    1 +
6717  drivers/net/ethernet/mellanox/mlx4/intf.c          |    1 +
6718  drivers/net/ethernet/mellanox/mlx4/mcg.c           |    1 +
6719  drivers/net/ethernet/mellanox/mlx4/mr.c            |    1 +
6720  drivers/net/ethernet/mellanox/mlx4/pd.c            |    1 +
6721  drivers/net/ethernet/mellanox/mlx4/port.c          |    1 +
6722  drivers/net/ethernet/mellanox/mlx4/qp.c            |    1 +
6723  drivers/net/ethernet/mellanox/mlx4/srq.c           |    1 +
6724  drivers/net/ethernet/neterion/vxge/vxge-main.c     |    1 +
6725  drivers/net/ethernet/octeon/octeon_mgmt.c          |    1 +
6726  .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c   |    1 +
6727  .../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c  |    1 +
6728  drivers/net/ethernet/sfc/rx.c                      |    1 +
6729  drivers/net/ethernet/smsc/smsc9420.c               |    1 +
6730  drivers/net/ethernet/xscale/ixp4xx_eth.c           |    1 +
6731  drivers/net/phy/realtek.c                          |    1 +
6732  drivers/net/usb/lg-vl600.c                         |    1 +
6733  drivers/net/veth.c                                 |    1 +
6734  drivers/net/vmxnet3/vmxnet3_drv.c                  |    1 +
6735  drivers/net/wimax/i2400m/control.c                 |    2 +
6736  drivers/net/wimax/i2400m/debugfs.c                 |    1 +
6737  drivers/net/wimax/i2400m/fw.c                      |    1 +
6738  drivers/net/wimax/i2400m/netdev.c                  |    1 +
6739  drivers/net/wimax/i2400m/rx.c                      |    2 +
6740  drivers/net/wimax/i2400m/sdio.c                    |    1 +
6741  drivers/net/wimax/i2400m/tx.c                      |    1 +
6742  drivers/net/wimax/i2400m/usb.c                     |    1 +
6743  drivers/net/wireless/adm8211.c                     |    1 +
6744  drivers/net/wireless/ath/ath5k/debug.c             |    3 +-
6745  drivers/net/wireless/ath/ath5k/pci.c               |    1 +
6746  drivers/net/wireless/ath/ath6kl/cfg80211.c         |    2 +
6747  drivers/net/wireless/ath/ath6kl/debug.c            |    1 +
6748  drivers/net/wireless/ath/ath6kl/sdio.c             |    1 +
6749  drivers/net/wireless/ath/ath9k/ahb.c               |    1 +
6750  drivers/net/wireless/ath/ath9k/ani.c               |    1 +
6751  drivers/net/wireless/ath/ath9k/ar9002_hw.c         |    1 +
6752  drivers/net/wireless/ath/ath9k/ar9002_mac.c        |    1 +
6753  drivers/net/wireless/ath/ath9k/ar9003_mac.c        |    1 +
6754  drivers/net/wireless/ath/ath9k/ar9003_paprd.c      |    1 +
6755  drivers/net/wireless/ath/ath9k/ar9003_phy.c        |    1 +
6756  drivers/net/wireless/ath/ath9k/btcoex.c            |    1 +
6757  drivers/net/wireless/ath/ath9k/calib.c             |    1 +
6758  drivers/net/wireless/ath/ath9k/debug.c             |    1 +
6759  drivers/net/wireless/ath/ath9k/hw.c                |    1 +
6760  drivers/net/wireless/ath/ath9k/init.c              |    1 +
6761  drivers/net/wireless/ath/ath9k/mac.c               |    1 +
6762  drivers/net/wireless/ath/ath9k/pci.c               |    1 +
6763  drivers/net/wireless/ath/ath9k/rc.c                |    1 +
6764  drivers/net/wireless/ath/carl9170/fw.c             |    1 +
6765  drivers/net/wireless/ath/debug.c                   |    1 +
6766  drivers/net/wireless/ath/hw.c                      |    1 +
6767  drivers/net/wireless/ath/key.c                     |    1 +
6768  drivers/net/wireless/ath/regd.c                    |    1 +
6769  drivers/net/wireless/b43/main.c                    |    2 +-
6770  drivers/net/wireless/b43/pcmcia.c                  |    1 +
6771  drivers/net/wireless/b43legacy/main.c              |    2 +-
6772  drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c   |    1 +
6773  .../net/wireless/brcm80211/brcmsmac/mac80211_if.c  |    1 +
6774  drivers/net/wireless/hostap/hostap_80211_rx.c      |    1 +
6775  drivers/net/wireless/hostap/hostap_80211_tx.c      |    1 +
6776  drivers/net/wireless/hostap/hostap_ap.c            |    2 +
6777  drivers/net/wireless/hostap/hostap_info.c          |    1 +
6778  drivers/net/wireless/hostap/hostap_ioctl.c         |    1 +
6779  drivers/net/wireless/hostap/hostap_proc.c          |    1 +
6780  drivers/net/wireless/iwlegacy/iwl-debugfs.c        |    1 +
6781  drivers/net/wireless/iwlegacy/iwl-rx.c             |    1 +
6782  drivers/net/wireless/iwlegacy/iwl-scan.c           |    1 +
6783  drivers/net/wireless/iwlegacy/iwl-sta.c            |    1 +
6784  drivers/net/wireless/iwlegacy/iwl-tx.c             |    1 +
6785  drivers/net/wireless/iwlwifi/iwl-pci.c             |    1 +
6786  drivers/net/wireless/iwmc3200wifi/commands.c       |    1 +
6787  drivers/net/wireless/iwmc3200wifi/debugfs.c        |    1 +
6788  drivers/net/wireless/iwmc3200wifi/main.c           |    1 +
6789  drivers/net/wireless/iwmc3200wifi/sdio.c           |    1 +
6790  drivers/net/wireless/libertas/cmd.c                |    1 +
6791  drivers/net/wireless/libertas/debugfs.c            |    1 +
6792  drivers/net/wireless/libertas/if_sdio.c            |    2 +-
6793  drivers/net/wireless/libertas/if_spi.c             |    2 +-
6794  drivers/net/wireless/libertas/if_usb.c             |    2 +-
6795  drivers/net/wireless/libertas/main.c               |    2 +-
6796  drivers/net/wireless/libertas/rx.c                 |    1 +
6797  drivers/net/wireless/libertas/tx.c                 |    1 +
6798  drivers/net/wireless/libertas_tf/cmd.c             |    1 +
6799  drivers/net/wireless/libertas_tf/if_usb.c          |    2 +-
6800  drivers/net/wireless/libertas_tf/main.c            |    1 +
6801  drivers/net/wireless/mac80211_hwsim.c              |    1 +
6802  drivers/net/wireless/orinoco/fw.c                  |    1 +
6803  drivers/net/wireless/p54/eeprom.c                  |    1 +
6804  drivers/net/wireless/p54/fwio.c                    |    1 +
6805  drivers/net/wireless/p54/main.c                    |    1 +
6806  drivers/net/wireless/p54/p54pci.c                  |    1 +
6807  drivers/net/wireless/p54/p54usb.c                  |    1 +
6808  drivers/net/wireless/p54/txrx.c                    |    1 +
6809  drivers/net/wireless/rtl818x/rtl8180/dev.c         |    1 +
6810  drivers/net/wireless/rtl818x/rtl8187/dev.c         |    1 +
6811  drivers/net/wireless/rtlwifi/base.c                |    1 +
6812  drivers/net/wireless/rtlwifi/cam.c                 |    1 +
6813  drivers/net/wireless/rtlwifi/efuse.c               |    1 +
6814  drivers/net/wireless/rtlwifi/pci.c                 |    1 +
6815  drivers/net/wireless/rtlwifi/ps.c                  |    1 +
6816  drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c  |    1 +
6817  drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c  |    1 +
6818  drivers/net/wireless/rtlwifi/rtl8192c/main.c       |    1 +
6819  drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c |    1 +
6820  drivers/net/wireless/rtlwifi/rtl8192ce/sw.c        |    1 +
6821  drivers/net/wireless/rtlwifi/rtl8192cu/sw.c        |    1 +
6822  drivers/net/wireless/rtlwifi/rtl8192de/sw.c        |    1 +
6823  drivers/net/wireless/rtlwifi/rtl8192se/sw.c        |    1 +
6824  drivers/net/wireless/rtlwifi/usb.c                 |    1 +
6825  drivers/net/wireless/wl12xx/boot.c                 |    1 +
6826  drivers/net/wireless/zd1211rw/zd_usb.c             |    1 +
6827  drivers/nfc/nfcwilink.c                            |    1 +
6828  drivers/of/of_net.c                                |    1 +
6829  drivers/of/of_pci.c                                |    1 +
6830  drivers/of/of_pci_irq.c                            |    1 +
6831  drivers/of/of_spi.c                                |    1 +
6832  drivers/parisc/ccio-dma.c                          |    1 +
6833  drivers/parisc/sba_iommu.c                         |    1 +
6834  drivers/pci/ats.c                                  |    1 +
6835  drivers/pci/hotplug-pci.c                          |    1 +
6836  drivers/pci/hotplug/pciehp_acpi.c                  |    1 +
6837  drivers/pci/hotplug/pcihp_slot.c                   |    1 +
6838  drivers/pci/hotplug/rpadlpar_core.c                |    1 +
6839  drivers/pci/htirq.c                                |    1 +
6840  drivers/pci/ioapic.c                               |    1 +
6841  drivers/pci/iov.c                                  |    1 +
6842  drivers/pci/irq.c                                  |    1 +
6843  drivers/pci/msi.c                                  |    1 +
6844  drivers/pci/pci-sysfs.c                            |    1 +
6845  drivers/pci/quirks.c                               |    1 +
6846  drivers/pci/rom.c                                  |    1 +
6847  drivers/pci/setup-res.c                            |    1 +
6848  drivers/pci/slot.c                                 |    1 +
6849  drivers/pci/vpd.c                                  |    1 +
6850  drivers/pcmcia/db1xxx_ss.c                         |    1 +
6851  drivers/pcmcia/pxa2xx_cm_x255.c                    |    1 +
6852  drivers/pcmcia/pxa2xx_cm_x270.c                    |    1 +
6853  drivers/pinctrl/core.c                             |    1 +
6854  drivers/platform/x86/intel_scu_ipc.c               |    1 +
6855  drivers/platform/x86/msi-wmi.c                     |    1 +
6856  drivers/platform/x86/wmi.c                         |    1 +
6857  drivers/pnp/pnpacpi/core.c                         |    1 +
6858  drivers/power/max17042_battery.c                   |    1 +
6859  drivers/power/max8903_charger.c                    |    1 +
6860  drivers/power/max8997_charger.c                    |    1 +
6861  drivers/power/max8998_charger.c                    |    1 +
6862  drivers/power/power_supply_sysfs.c                 |    1 +
6863  drivers/ps3/ps3stor_lib.c                          |    1 +
6864  drivers/ps3/sys-manager-core.c                     |    1 +
6865  drivers/rapidio/switches/idt_gen2.c                |    1 +
6866  drivers/regulator/88pm8607.c                       |    1 +
6867  drivers/regulator/ab8500.c                         |    1 +
6868  drivers/regulator/bq24022.c                        |    1 +
6869  drivers/regulator/core.c                           |    1 +
6870  drivers/regulator/da903x.c                         |    1 +
6871  drivers/regulator/db8500-prcmu.c                   |    1 +
6872  drivers/regulator/dummy.c                          |    1 +
6873  drivers/regulator/fixed.c                          |    1 +
6874  drivers/regulator/lp3971.c                         |    1 +
6875  drivers/regulator/lp3972.c                         |    1 +
6876  drivers/regulator/max8925-regulator.c              |    1 +
6877  drivers/regulator/max8997.c                        |    1 +
6878  drivers/regulator/mc13783-regulator.c              |    1 +
6879  drivers/regulator/mc13892-regulator.c              |    1 +
6880  drivers/regulator/mc13xxx-regulator-core.c         |    1 +
6881  drivers/regulator/tps6586x-regulator.c             |    1 +
6882  drivers/regulator/userspace-consumer.c             |    1 +
6883  drivers/regulator/virtual.c                        |    1 +
6884  drivers/regulator/wm8400-regulator.c               |    1 +
6885  drivers/rtc/interface.c                            |    1 +
6886  drivers/rtc/rtc-dm355evm.c                         |    1 +
6887  drivers/rtc/rtc-ds1305.c                           |    1 +
6888  drivers/rtc/rtc-ds1511.c                           |    1 +
6889  drivers/rtc/rtc-ds1553.c                           |    1 +
6890  drivers/rtc/rtc-ds1672.c                           |    1 +
6891  drivers/rtc/rtc-ds1742.c                           |    1 +
6892  drivers/rtc/rtc-em3027.c                           |    1 +
6893  drivers/rtc/rtc-isl12022.c                         |    1 +
6894  drivers/rtc/rtc-mv.c                               |    1 +
6895  drivers/rtc/rtc-pcf2123.c                          |    1 +
6896  drivers/rtc/rtc-pcf8563.c                          |    1 +
6897  drivers/rtc/rtc-rs5c348.c                          |    1 +
6898  drivers/rtc/rtc-rs5c372.c                          |    1 +
6899  drivers/rtc/rtc-stk17ta8.c                         |    1 +
6900  drivers/rtc/rtc-tx4939.c                           |    1 +
6901  drivers/rtc/rtc-x1205.c                            |    1 +
6902  drivers/s390/char/fs3270.c                         |    1 +
6903  drivers/s390/char/sclp_cpi_sys.c                   |    1 +
6904  drivers/s390/char/vmcp.c                           |    1 +
6905  drivers/s390/char/vmur.c                           |    1 +
6906  drivers/s390/cio/chp.c                             |    2 +
6907  drivers/s390/cio/qdio_debug.c                      |    2 +
6908  drivers/s390/cio/qdio_setup.c                      |    1 +
6909  drivers/s390/kvm/kvm_virtio.c                      |    1 +
6910  drivers/s390/scsi/zfcp_aux.c                       |    1 +
6911  drivers/s390/scsi/zfcp_ccw.c                       |    1 +
6912  drivers/s390/scsi/zfcp_dbf.c                       |    1 +
6913  drivers/s390/scsi/zfcp_qdio.c                      |    1 +
6914  drivers/s390/scsi/zfcp_scsi.c                      |    1 +
6915  drivers/scsi/a2091.c                               |    1 +
6916  drivers/scsi/a3000.c                               |    1 +
6917  drivers/scsi/aacraid/aachba.c                      |    1 +
6918  drivers/scsi/be2iscsi/be_main.c                    |    1 +
6919  drivers/scsi/bfa/bfad_debugfs.c                    |    1 +
6920  drivers/scsi/bfa/bfad_im.c                         |    2 +
6921  drivers/scsi/cxgbi/libcxgbi.c                      |    1 +
6922  drivers/scsi/device_handler/scsi_dh.c              |    1 +
6923  drivers/scsi/device_handler/scsi_dh_alua.c         |    1 +
6924  drivers/scsi/device_handler/scsi_dh_emc.c          |    1 +
6925  drivers/scsi/device_handler/scsi_dh_hp_sw.c        |    1 +
6926  drivers/scsi/device_handler/scsi_dh_rdac.c         |    1 +
6927  drivers/scsi/gvp11.c                               |    1 +
6928  drivers/scsi/iscsi_tcp.c                           |    1 +
6929  drivers/scsi/libfc/fc_disc.c                       |    1 +
6930  drivers/scsi/libfc/fc_elsct.c                      |    1 +
6931  drivers/scsi/libfc/fc_exch.c                       |    1 +
6932  drivers/scsi/libfc/fc_libfc.c                      |    1 +
6933  drivers/scsi/libfc/fc_lport.c                      |    1 +
6934  drivers/scsi/libfc/fc_npiv.c                       |    1 +
6935  drivers/scsi/libfc/fc_rport.c                      |    1 +
6936  drivers/scsi/libiscsi.c                            |    1 +
6937  drivers/scsi/libiscsi_tcp.c                        |    1 +
6938  drivers/scsi/libsas/sas_host_smp.c                 |    1 +
6939  drivers/scsi/libsas/sas_scsi_host.c                |    1 +
6940  drivers/scsi/libsas/sas_task.c                     |    1 +
6941  drivers/scsi/libsrp.c                              |    1 +
6942  drivers/scsi/lpfc/lpfc_attr.c                      |    1 +
6943  drivers/scsi/lpfc/lpfc_debugfs.c                   |    1 +
6944  drivers/scsi/lpfc/lpfc_init.c                      |    1 +
6945  drivers/scsi/lpfc/lpfc_scsi.c                      |    1 +
6946  drivers/scsi/mac53c94.c                            |    1 +
6947  drivers/scsi/megaraid/megaraid_mbox.c              |    1 +
6948  drivers/scsi/osd/osd_initiator.c                   |    1 +
6949  drivers/scsi/ps3rom.c                              |    1 +
6950  drivers/scsi/scsi_lib.c                            |    1 +
6951  drivers/scsi/scsi_lib_dma.c                        |    1 +
6952  drivers/scsi/scsi_netlink.c                        |    1 +
6953  drivers/scsi/scsi_pm.c                             |    1 +
6954  drivers/scsi/scsi_tgt_if.c                         |    1 +
6955  drivers/scsi/sr_ioctl.c                            |    1 +
6956  drivers/sfi/sfi_core.h                             |    3 +
6957  drivers/sh/intc/core.c                             |    2 +
6958  drivers/sh/intc/dynamic.c                          |    1 +
6959  drivers/sh/intc/virq.c                             |    1 +
6960  drivers/sh/maple/maple.c                           |    1 +
6961  drivers/spi/spi-altera.c                           |    1 +
6962  drivers/spi/spi-au1550.c                           |    1 +
6963  drivers/spi/spi-bitbang.c                          |    1 +
6964  drivers/spi/spi-butterfly.c                        |    1 +
6965  drivers/spi/spi-dw-mmio.c                          |    1 +
6966  drivers/spi/spi-dw-pci.c                           |    1 +
6967  drivers/spi/spi-dw.c                               |    1 +
6968  drivers/spi/spi-gpio.c                             |    1 +
6969  drivers/spi/spi-oc-tiny.c                          |    1 +
6970  drivers/spi/spi-omap-uwire.c                       |    1 +
6971  drivers/spi/spi-orion.c                            |    1 +
6972  drivers/spi/spi-pxa2xx-pci.c                       |    1 +
6973  drivers/spi/spi-s3c24xx.c                          |    1 +
6974  drivers/spi/spi-sh-msiof.c                         |    1 +
6975  drivers/spi/spi-sh-sci.c                           |    1 +
6976  drivers/spi/spi-ti-ssp.c                           |    1 +
6977  drivers/spi/spi-tle62x0.c                          |    1 +
6978  drivers/spi/spi-txx9.c                             |    1 +
6979  drivers/spi/spi.c                                  |    1 +
6980  drivers/ssb/b43_pci_bridge.c                       |    1 +
6981  drivers/ssb/driver_chipcommon.c                    |    1 +
6982  drivers/ssb/driver_chipcommon_pmu.c                |    1 +
6983  drivers/ssb/driver_gige.c                          |    1 +
6984  drivers/ssb/driver_pcicore.c                       |    1 +
6985  drivers/ssb/embedded.c                             |    1 +
6986  drivers/ssb/main.c                                 |    1 +
6987  drivers/ssb/pcihost_wrapper.c                      |    1 +
6988  drivers/staging/cxt1e1/linux.c                     |    1 +
6989  drivers/staging/gma500/intel_i2c.c                 |    1 +
6990  drivers/staging/gma500/mdfld_dsi_output.c          |    1 +
6991  drivers/staging/gma500/mdfld_output.c              |    3 +-
6992  drivers/staging/gma500/mid_bios.c                  |    1 +
6993  drivers/staging/gma500/mrst_hdmi_i2c.c             |    1 +
6994  drivers/staging/gma500/psb_drv.c                   |    1 +
6995  drivers/staging/iio/accel/adis16201_ring.c         |    1 +
6996  drivers/staging/iio/accel/adis16201_trigger.c      |    1 +
6997  drivers/staging/iio/accel/adis16203_ring.c         |    1 +
6998  drivers/staging/iio/accel/adis16203_trigger.c      |    1 +
6999  drivers/staging/iio/accel/adis16204_ring.c         |    1 +
7000  drivers/staging/iio/accel/adis16204_trigger.c      |    1 +
7001  drivers/staging/iio/accel/adis16209_ring.c         |    1 +
7002  drivers/staging/iio/accel/adis16209_trigger.c      |    1 +
7003  drivers/staging/iio/accel/adis16240_ring.c         |    1 +
7004  drivers/staging/iio/accel/adis16240_trigger.c      |    1 +
7005  drivers/staging/iio/accel/lis3l02dq_ring.c         |    1 +
7006  drivers/staging/iio/adc/ad7793.c                   |    1 +
7007  drivers/staging/iio/dac/ad5686.c                   |    1 +
7008  drivers/staging/iio/gyro/adis16060_core.c          |    1 +
7009  drivers/staging/iio/gyro/adis16260_ring.c          |    1 +
7010  drivers/staging/iio/gyro/adis16260_trigger.c       |    1 +
7011  drivers/staging/iio/iio_simple_dummy_buffer.c      |    1 +
7012  drivers/staging/iio/imu/adis16400_ring.c           |    1 +
7013  drivers/staging/iio/imu/adis16400_trigger.c        |    1 +
7014  drivers/staging/iio/industrialio-buffer.c          |    1 +
7015  drivers/staging/iio/meter/ade7758_ring.c           |    1 +
7016  drivers/staging/iio/meter/ade7758_trigger.c        |    1 +
7017  drivers/staging/intel_sst/intel_sst.c              |    1 +
7018  .../staging/intel_sst/intel_sst_drv_interface.c    |    1 +
7019  drivers/staging/line6/audio.c                      |    1 +
7020  drivers/staging/media/solo6x10/g723.c              |    1 +
7021  drivers/staging/rts5139/rts51x_scsi.c              |    1 +
7022  drivers/staging/usbip/usbip_common.c               |    1 +
7023  drivers/staging/usbip/usbip_event.c                |    1 +
7024  drivers/staging/winbond/wbusb.c                    |    1 +
7025  drivers/staging/wlags49_h2/wl_cs.c                 |    1 +
7026  drivers/target/iscsi/iscsi_target.c                |    1 +
7027  drivers/target/iscsi/iscsi_target_configfs.c       |    1 +
7028  drivers/target/iscsi/iscsi_target_stat.c           |    1 +
7029  drivers/target/target_core_alua.c                  |    1 +
7030  drivers/target/target_core_device.c                |    1 +
7031  drivers/target/target_core_fabric_lib.c            |    1 +
7032  drivers/target/target_core_file.c                  |    1 +
7033  drivers/target/target_core_hba.c                   |    1 +
7034  drivers/target/target_core_iblock.c                |    1 +
7035  drivers/target/target_core_pscsi.c                 |    1 +
7036  drivers/target/target_core_tmr.c                   |    1 +
7037  drivers/target/target_core_tpg.c                   |    1 +
7038  drivers/target/target_core_transport.c             |    1 +
7039  drivers/tty/hvc/hvc_iseries.c                      |    1 +
7040  drivers/tty/hvc/hvc_vio.c                          |    1 +
7041  drivers/tty/serial/jsm/jsm_driver.c                |    2 +-
7042  drivers/tty/serial/kgdboc.c                        |    1 +
7043  drivers/tty/serial/max3100.c                       |    1 +
7044  drivers/tty/serial/max3107-aava.c                  |    1 +
7045  drivers/tty/serial/max3107.c                       |    1 +
7046  drivers/tty/serial/nwpserial.c                     |    1 +
7047  drivers/tty/serial/timbuart.c                      |    1 +
7048  drivers/tty/serial/xilinx_uartps.c                 |    1 +
7049  drivers/tty/vt/vc_screen.c                         |    1 +
7050  drivers/uio/uio_pdrv.c                             |    1 +
7051  drivers/uio/uio_pdrv_genirq.c                      |    1 +
7052  drivers/usb/c67x00/c67x00-drv.c                    |    1 +
7053  drivers/usb/core/driver.c                          |    1 +
7054  drivers/usb/core/notify.c                          |    1 +
7055  drivers/usb/gadget/cdc2.c                          |    1 +
7056  drivers/usb/gadget/composite.c                     |    1 +
7057  drivers/usb/gadget/dbgp.c                          |    1 +
7058  drivers/usb/gadget/f_fs.c                          |    1 +
7059  drivers/usb/gadget/f_obex.c                        |    1 +
7060  drivers/usb/gadget/f_sourcesink.c                  |    1 +
7061  drivers/usb/gadget/file_storage.c                  |    1 +
7062  drivers/usb/gadget/fusb300_udc.c                   |    1 +
7063  drivers/usb/gadget/gmidi.c                         |    1 +
7064  drivers/usb/gadget/u_serial.c                      |    1 +
7065  drivers/usb/host/fsl-mph-dr-of.c                   |    1 +
7066  drivers/usb/host/isp1760-if.c                      |    1 +
7067  drivers/usb/host/pci-quirks.c                      |    1 +
7068  drivers/usb/host/whci/debug.c                      |    1 +
7069  drivers/usb/host/whci/hcd.c                        |    1 +
7070  drivers/usb/host/xhci-hub.c                        |    1 +
7071  drivers/usb/host/xhci-pci.c                        |    1 +
7072  drivers/usb/mon/mon_bin.c                          |    1 +
7073  drivers/usb/mon/mon_stat.c                         |    1 +
7074  drivers/usb/mon/mon_text.c                         |    1 +
7075  drivers/usb/otg/gpio_vbus.c                        |    1 +
7076  drivers/usb/otg/otg.c                              |    1 +
7077  drivers/usb/otg/ulpi.c                             |    1 +
7078  drivers/usb/serial/aircable.c                      |    1 +
7079  drivers/usb/serial/qcserial.c                      |    1 +
7080  drivers/usb/storage/option_ms.c                    |    1 +
7081  drivers/usb/storage/protocol.c                     |    1 +
7082  drivers/usb/storage/sierra_ms.c                    |    1 +
7083  drivers/usb/storage/transport.c                    |    1 +
7084  drivers/usb/storage/uas.c                          |    1 +
7085  drivers/usb/wusbcore/devconnect.c                  |    1 +
7086  drivers/usb/wusbcore/mmc.c                         |    1 +
7087  drivers/usb/wusbcore/rh.c                          |    1 +
7088  drivers/usb/wusbcore/security.c                    |    1 +
7089  drivers/usb/wusbcore/wa-hc.c                       |    1 +
7090  drivers/usb/wusbcore/wa-rpipe.c                    |    1 +
7091  drivers/usb/wusbcore/wa-xfer.c                     |    1 +
7092  drivers/uwb/est.c                                  |    1 +
7093  drivers/uwb/i1480/dfu/dfu.c                        |    1 +
7094  drivers/uwb/ie.c                                   |    1 +
7095  drivers/uwb/lc-dev.c                               |    2 +
7096  drivers/uwb/lc-rc.c                                |    1 +
7097  drivers/uwb/neh.c                                  |    1 +
7098  drivers/uwb/pal.c                                  |    1 +
7099  drivers/uwb/radio.c                                |    1 +
7100  drivers/uwb/reset.c                                |    1 +
7101  drivers/uwb/rsv.c                                  |    1 +
7102  drivers/uwb/scan.c                                 |    1 +
7103  drivers/uwb/umc-bus.c                              |    1 +
7104  drivers/uwb/umc-dev.c                              |    1 +
7105  drivers/uwb/umc-drv.c                              |    1 +
7106  drivers/uwb/whci.c                                 |    1 +
7107  drivers/video/atmel_lcdfb.c                        |    1 +
7108  drivers/video/backlight/88pm860x_bl.c              |    1 +
7109  drivers/video/backlight/adp5520_bl.c               |    1 +
7110  drivers/video/backlight/ams369fg06.c               |    1 +
7111  drivers/video/backlight/da903x_bl.c                |    1 +
7112  drivers/video/backlight/ep93xx_bl.c                |    1 +
7113  drivers/video/backlight/l4f00242t03.c              |    1 +
7114  drivers/video/backlight/ld9040.c                   |    1 +
7115  drivers/video/backlight/lms283gf05.c               |    1 +
7116  drivers/video/backlight/max8925_bl.c               |    1 +
7117  drivers/video/backlight/s6e63m0.c                  |    1 +
7118  drivers/video/backlight/wm831x_bl.c                |    1 +
7119  drivers/video/carminefb.c                          |    1 +
7120  drivers/video/cobalt_lcdfb.c                       |    1 +
7121  drivers/video/ep93xx-fb.c                          |    1 +
7122  drivers/video/fb_ddc.c                             |    3 +-
7123  drivers/video/fb_notify.c                          |    1 +
7124  drivers/video/mb862xx/mb862xx-i2c.c                |    1 +
7125  drivers/video/mb862xx/mb862xxfbdrv.c               |    1 +
7126  drivers/video/msm/mdp.c                            |    1 +
7127  drivers/video/omap/lcd_mipid.c                     |    1 +
7128  drivers/video/omap/omapfb_main.c                   |    1 +
7129  drivers/video/omap2/dss/dispc.c                    |    1 +
7130  drivers/video/omap2/dss/dpi.c                      |    1 +
7131  drivers/video/omap2/dss/dsi.c                      |    1 +
7132  drivers/video/omap2/dss/dss.c                      |    1 +
7133  drivers/video/omap2/dss/rfbi.c                     |    1 +
7134  drivers/video/omap2/dss/sdi.c                      |    1 +
7135  drivers/video/omap2/omapfb/omapfb-ioctl.c          |    1 +
7136  drivers/video/savage/savagefb_accel.c              |    1 +
7137  drivers/video/sh_mipi_dsi.c                        |    1 +
7138  drivers/video/sh_mobile_lcdcfb.c                   |    1 +
7139  drivers/video/via/via-gpio.c                       |    1 +
7140  drivers/video/w100fb.c                             |    1 +
7141  drivers/virtio/virtio.c                            |    1 +
7142  drivers/virtio/virtio_balloon.c                    |    1 +
7143  drivers/virtio/virtio_ring.c                       |    1 +
7144  drivers/w1/w1_family.c                             |    1 +
7145  drivers/w1/w1_int.c                                |    2 +
7146  drivers/watchdog/stmp3xxx_wdt.c                    |    1 +
7147  drivers/xen/balloon.c                              |    1 +
7148  drivers/xen/manage.c                               |    1 +
7149  drivers/xen/swiotlb-xen.c                          |    1 +
7150  drivers/xen/xen-pciback/conf_space.c               |    1 +
7151  drivers/xen/xenbus/xenbus_client.c                 |    1 +
7152  drivers/xen/xenbus/xenbus_probe.c                  |    1 +
7153  drivers/xen/xenbus/xenbus_probe_backend.c          |    1 +
7154  drivers/xen/xenbus/xenbus_probe_frontend.c         |    1 +
7155  drivers/zorro/proc.c                               |    1 +
7156  fs/bio-integrity.c                                 |    1 +
7157  fs/cifs/connect.c                                  |    1 +
7158  fs/exofs/ore.c                                     |    1 +
7159  fs/exofs/super.c                                   |    1 +
7160  fs/fuse/cuse.c                                     |    1 +
7161  fs/gfs2/ops_fstype.c                               |    1 +
7162  fs/ioprio.c                                        |    1 +
7163  fs/jfs/jfs_logmgr.c                                |    1 +
7164  fs/logfs/super.c                                   |    1 +
7165  fs/nfs/nfs4filelayout.c                            |    1 +
7166  fs/nfs/pagelist.c                                  |    1 +
7167  fs/nfs/pnfs.c                                      |    1 +
7168  fs/nfs/pnfs_dev.c                                  |    1 +
7169  fs/nfs/write.c                                     |    1 +
7170  fs/nfsd/nfs4acl.c                                  |    1 +
7171  fs/nfsd/nfsctl.c                                   |    1 +
7172  fs/nfsd/nfssvc.c                                   |    1 +
7173  fs/ocfs2/cluster/tcp.c                             |    1 +
7174  fs/ocfs2/dlm/dlmdebug.c                            |    1 +
7175  fs/proc/vmcore.c                                   |    1 +
7176  include/acpi/platform/aclinux.h                    |    1 -
7177  include/drm/drmP.h                                 |    3 +-
7178  include/linux/bcma/bcma.h                          |    7 +-
7179  include/linux/blkdev.h                             |    2 +-
7180  include/linux/cpuidle.h                            |    3 +-
7181  include/linux/crypto.h                             |    6 --
7182  include/linux/device.h                             |   15 ++-
7183  include/linux/device_cgroup.h                      |    1 -
7184  include/linux/dmaengine.h                          |    2 +
7185  include/linux/export.h                             |   89 ++++++++++++++++++++
7186  include/linux/firmware.h                           |    2 +-
7187  include/linux/ftrace.h                             |    2 +-
7188  include/linux/gameport.h                           |   17 ++--
7189  include/linux/hid.h                                |    9 +-
7190  include/linux/i2c.h                                |   10 +-
7191  include/linux/ipmi.h                               |    3 +-
7192  include/linux/ipmi_smi.h                           |    1 -
7193  include/linux/irq.h                                |   32 +++-----
7194  include/linux/irqdesc.h                            |    1 +
7195  include/linux/mdio-bitbang.h                       |    3 +-
7196  include/linux/miscdevice.h                         |    3 +-
7197  include/linux/module.h                             |   73 +----------------
7198  include/linux/moduleparam.h                        |    5 +
7199  include/linux/mtd/mtd.h                            |    3 +-
7200  include/linux/of.h                                 |    1 +
7201  include/linux/of_platform.h                        |    1 -
7202  include/linux/pci_hotplug.h                        |   10 +--
7203  include/linux/pm_runtime.h                         |    1 +
7204  include/linux/regmap.h                             |    2 +-
7205  include/linux/regulator/driver.h                   |    1 +
7206  include/linux/serio.h                              |   20 +++--
7207  include/linux/ssb/ssb.h                            |    7 +-
7208  include/linux/stop_machine.h                       |    1 +
7209  include/linux/sunrpc/svc_xprt.h                    |    3 +-
7210  include/linux/sysdev.h                             |    1 -
7211  include/linux/textsearch.h                         |    3 +-
7212  include/linux/uio_driver.h                         |   12 ++--
7213  include/linux/usb.h                                |    9 +-
7214  include/linux/uwb.h                                |    1 +
7215  include/linux/uwb/umc.h                            |    7 +-
7216  include/linux/vermagic.h                           |    1 -
7217  include/linux/vlynq.h                              |    3 +-
7218  include/media/saa7146.h                            |    3 +-
7219  include/media/v4l2-int-device.h                    |    3 +-
7220  include/net/bluetooth/hci_core.h                   |   24 +++---
7221  include/net/inet_timewait_sock.h                   |    1 -
7222  include/net/ip_vs.h                                |   15 ++--
7223  include/net/lib80211.h                             |    3 +-
7224  include/net/netfilter/nf_conntrack.h               |    2 +
7225  include/net/sch_generic.h                          |    1 -
7226  include/net/sock.h                                 |    2 +-
7227  include/sound/core.h                               |    2 +-
7228  include/trace/define_trace.h                       |   10 --
7229  include/trace/events/module.h                      |    2 +-
7230  include/xen/xenbus.h                               |    1 +
7231  kernel/async.c                                     |    2 +-
7232  kernel/audit.c                                     |    2 +-
7233  kernel/auditsc.c                                   |    2 +-
7234  kernel/capability.c                                |    2 +-
7235  kernel/cgroup_freezer.c                            |    2 +-
7236  kernel/compat.c                                    |    1 +
7237  kernel/cpu.c                                       |    2 +-
7238  kernel/cpuset.c                                    |    2 +-
7239  kernel/crash_dump.c                                |    2 +-
7240  kernel/cred.c                                      |    2 +-
7241  kernel/debug/kdb/kdb_debugger.c                    |    1 +
7242  kernel/dma.c                                       |    2 +-
7243  kernel/events/core.c                               |    1 +
7244  kernel/freezer.c                                   |    2 +-
7245  kernel/futex.c                                     |    2 +-
7246  kernel/groups.c                                    |    2 +-
7247  kernel/hrtimer.c                                   |    2 +-
7248  kernel/hung_task.c                                 |    2 +-
7249  kernel/irq/generic-chip.c                          |    1 +
7250  kernel/irq/irqdesc.c                               |    2 +-
7251  kernel/irq_work.c                                  |    4 +-
7252  kernel/kfifo.c                                     |    2 +-
7253  kernel/kprobes.c                                   |    2 +-
7254  kernel/ksysfs.c                                    |    3 +-
7255  kernel/kthread.c                                   |    2 +-
7256  kernel/latencytop.c                                |    2 +-
7257  kernel/lockdep_proc.c                              |    2 +-
7258  kernel/module.c                                    |    2 +-
7259  kernel/mutex-debug.c                               |    2 +-
7260  kernel/mutex.c                                     |    2 +-
7261  kernel/notifier.c                                  |    2 +-
7262  kernel/nsproxy.c                                   |    2 +-
7263  kernel/padata.c                                    |    2 +-
7264  kernel/params.c                                    |    2 +-
7265  kernel/pid.c                                       |    2 +-
7266  kernel/posix-timers.c                              |    2 +-
7267  kernel/power/hibernate.c                           |    1 +
7268  kernel/power/main.c                                |    1 +
7269  kernel/power/qos.c                                 |    1 +
7270  kernel/power/suspend.c                             |    2 +
7271  kernel/power/user.c                                |    1 +
7272  kernel/profile.c                                   |    2 +-
7273  kernel/ptrace.c                                    |    2 +-
7274  kernel/range.c                                     |    2 +-
7275  kernel/rcupdate.c                                  |    2 +-
7276  kernel/rcutiny.c                                   |    3 +-
7277  kernel/rcutiny_plugin.h                            |    1 +
7278  kernel/rcutree.c                                   |    2 +-
7279  kernel/relay.c                                     |    2 +-
7280  kernel/resource.c                                  |    2 +-
7281  kernel/rtmutex-debug.c                             |    2 +-
7282  kernel/rtmutex-tester.c                            |    2 +-
7283  kernel/rtmutex.c                                   |    2 +-
7284  kernel/rwsem.c                                     |    2 +-
7285  kernel/sched_clock.c                               |    2 +-
7286  kernel/semaphore.c                                 |    2 +-
7287  kernel/signal.c                                    |    2 +-
7288  kernel/smp.c                                       |    2 +-
7289  kernel/softirq.c                                   |    2 +-
7290  kernel/spinlock.c                                  |    2 +-
7291  kernel/srcu.c                                      |    2 +-
7292  kernel/stacktrace.c                                |    2 +-
7293  kernel/stop_machine.c                              |    2 +-
7294  kernel/sys.c                                       |    3 +-
7295  kernel/time.c                                      |    2 +-
7296  kernel/time/posix-clock.c                          |    1 +
7297  kernel/timer.c                                     |    2 +-
7298  kernel/trace/blktrace.c                            |    1 +
7299  kernel/trace/ftrace.c                              |    1 +
7300  kernel/trace/trace_syscalls.c                      |    1 +
7301  kernel/up.c                                        |    2 +-
7302  kernel/user-return-notifier.c                      |    2 +-
7303  kernel/user.c                                      |    2 +-
7304  kernel/user_namespace.c                            |    2 +-
7305  kernel/utsname.c                                   |    2 +-
7306  kernel/utsname_sysctl.c                            |    2 +-
7307  kernel/wait.c                                      |    2 +-
7308  kernel/workqueue.c                                 |    2 +-
7309  lib/dma-debug.c                                    |    1 +
7310  lib/raid6/algos.c                                  |    1 +
7311  lib/raid6/mktables.c                               |    1 +
7312  lib/raid6/recov.c                                  |    1 +
7313  mm/bootmem.c                                       |    2 +-
7314  mm/bounce.c                                        |    2 +-
7315  mm/dmapool.c                                       |    3 +-
7316  mm/filemap.c                                       |    2 +-
7317  mm/filemap_xip.c                                   |    2 +-
7318  mm/fremap.c                                        |    1 -
7319  mm/highmem.c                                       |    2 +-
7320  mm/kmemleak.c                                      |    2 +-
7321  mm/maccess.c                                       |    2 +-
7322  mm/memcontrol.c                                    |    1 +
7323  mm/memory-failure.c                                |    1 +
7324  mm/memory.c                                        |    2 +-
7325  mm/memory_hotplug.c                                |    2 +-
7326  mm/mempolicy.c                                     |    2 +-
7327  mm/mempool.c                                       |    2 +-
7328  mm/migrate.c                                       |    2 +-
7329  mm/mlock.c                                         |    2 +-
7330  mm/mm_init.c                                       |    2 +-
7331  mm/mmap.c                                          |    2 +-
7332  mm/mmu_context.c                                   |    2 +-
7333  mm/mmu_notifier.c                                  |    2 +-
7334  mm/mmzone.c                                        |    1 -
7335  mm/nobootmem.c                                     |    2 +-
7336  mm/nommu.c                                         |    2 +-
7337  mm/oom_kill.c                                      |    2 +-
7338  mm/page-writeback.c                                |    2 +-
7339  mm/quicklist.c                                     |    1 -
7340  mm/readahead.c                                     |    2 +-
7341  mm/rmap.c                                          |    2 +-
7342  mm/shmem.c                                         |    2 +-
7343  mm/slob.c                                          |    2 +-
7344  mm/sparse-vmemmap.c                                |    1 -
7345  mm/sparse.c                                        |    2 +-
7346  mm/swap.c                                          |    2 +-
7347  mm/swap_state.c                                    |    1 -
7348  mm/swapfile.c                                      |    1 -
7349  mm/truncate.c                                      |    2 +-
7350  mm/util.c                                          |    2 +-
7351  net/802/fc.c                                       |    1 +
7352  net/802/garp.c                                     |    1 +
7353  net/802/stp.c                                      |    1 +
7354  net/8021q/vlan_core.c                              |    1 +
7355  net/8021q/vlan_netlink.c                           |    1 +
7356  net/appletalk/aarp.c                               |    1 +
7357  net/appletalk/atalk_proc.c                         |    1 +
7358  net/atm/pvc.c                                      |    1 +
7359  net/atm/svc.c                                      |    1 +
7360  net/ax25/ax25_route.c                              |    1 +
7361  net/ax25/ax25_uid.c                                |    1 +
7362  net/bluetooth/hci_sysfs.c                          |    1 +
7363  net/bluetooth/l2cap_sock.c                         |    1 +
7364  net/bluetooth/mgmt.c                               |    1 +
7365  net/bridge/br_input.c                              |    1 +
7366  net/bridge/br_stp_if.c                             |    1 +
7367  net/caif/caif_dev.c                                |    1 +
7368  net/caif/cfpkt_skbuff.c                            |    1 +
7369  net/ceph/messenger.c                               |    1 +
7370  net/compat.c                                       |    1 +
7371  net/core/dev_addr_lists.c                          |    1 +
7372  net/core/fib_rules.c                               |    1 +
7373  net/core/net-sysfs.c                               |    1 +
7374  net/core/net-traces.c                              |    1 +
7375  net/core/net_namespace.c                           |    1 +
7376  net/core/netevent.c                                |    1 +
7377  net/core/netpoll.c                                 |    1 +
7378  net/core/timestamping.c                            |    1 +
7379  net/core/user_dma.c                                |    1 +
7380  net/dcb/dcbevent.c                                 |    1 +
7381  net/dcb/dcbnl.c                                    |    1 +
7382  net/dccp/ackvec.c                                  |    1 +
7383  net/dccp/ccids/lib/tfrc.c                          |    1 +
7384  net/dccp/timer.c                                   |    1 +
7385  net/decnet/dn_route.c                              |    1 +
7386  net/decnet/dn_rules.c                              |    1 +
7387  net/dsa/dsa.c                                      |    1 +
7388  net/ieee802154/nl-mac.c                            |    1 +
7389  net/ipv4/fib_rules.c                               |    1 +
7390  net/ipv4/fib_trie.c                                |    1 +
7391  net/ipv4/inet_timewait_sock.c                      |    1 +
7392  net/ipv4/ipconfig.c                                |    1 +
7393  net/ipv4/ipmr.c                                    |    1 +
7394  net/ipv4/netfilter.c                               |    1 +
7395  .../netfilter/nf_conntrack_l3proto_ipv4_compat.c   |    1 +
7396  net/ipv4/netfilter/nf_nat_proto_common.c           |    1 +
7397  net/ipv4/netfilter/nf_nat_proto_icmp.c             |    1 +
7398  net/ipv4/netfilter/nf_nat_proto_sctp.c             |    1 +
7399  net/ipv4/netfilter/nf_nat_proto_tcp.c              |    1 +
7400  net/ipv4/netfilter/nf_nat_proto_udp.c              |    1 +
7401  net/ipv4/netfilter/nf_nat_proto_udplite.c          |    1 +
7402  net/ipv4/ping.c                                    |    1 +
7403  net/ipv4/proc.c                                    |    1 +
7404  net/ipv4/raw.c                                     |    1 +
7405  net/ipv4/syncookies.c                              |    1 +
7406  net/ipv4/udplite.c                                 |    1 +
7407  net/ipv4/xfrm4_state.c                             |    1 +
7408  net/ipv6/addrconf.c                                |    1 +
7409  net/ipv6/addrconf_core.c                           |    1 +
7410  net/ipv6/exthdrs.c                                 |    1 +
7411  net/ipv6/exthdrs_core.c                            |    1 +
7412  net/ipv6/fib6_rules.c                              |    1 +
7413  net/ipv6/ip6_flowlabel.c                           |    1 +
7414  net/ipv6/ip6mr.c                                   |    1 +
7415  net/ipv6/netfilter.c                               |    1 +
7416  net/ipv6/proc.c                                    |    1 +
7417  net/ipv6/raw.c                                     |    1 +
7418  net/ipv6/reassembly.c                              |    1 +
7419  net/ipv6/route.c                                   |    1 +
7420  net/ipv6/sysctl_net_ipv6.c                         |    1 +
7421  net/ipv6/udplite.c                                 |    1 +
7422  net/ipv6/xfrm6_state.c                             |    1 +
7423  net/ipx/ipx_proc.c                                 |    1 +
7424  net/irda/discovery.c                               |    1 +
7425  net/irda/irda_device.c                             |    1 +
7426  net/irda/irttp.c                                   |    1 +
7427  net/irda/qos.c                                     |    2 +
7428  net/llc/llc_input.c                                |    1 +
7429  net/llc/llc_output.c                               |    1 +
7430  net/llc/llc_proc.c                                 |    1 +
7431  net/mac80211/agg-rx.c                              |    1 +
7432  net/mac80211/agg-tx.c                              |    1 +
7433  net/mac80211/ht.c                                  |    1 +
7434  net/mac80211/key.c                                 |    1 +
7435  net/mac80211/led.c                                 |    1 +
7436  net/mac80211/mlme.c                                |    2 +
7437  net/mac80211/offchannel.c                          |    1 +
7438  net/mac80211/rate.c                                |    1 +
7439  net/mac80211/rc80211_minstrel_debugfs.c            |    1 +
7440  net/mac80211/rc80211_minstrel_ht_debugfs.c         |    1 +
7441  net/mac80211/rc80211_pid_debugfs.c                 |    1 +
7442  net/mac80211/rx.c                                  |    1 +
7443  net/mac80211/scan.c                                |    1 +
7444  net/mac80211/status.c                              |    1 +
7445  net/mac80211/tkip.c                                |    1 +
7446  net/mac80211/tx.c                                  |    1 +
7447  net/mac80211/util.c                                |    1 +
7448  net/netfilter/ipset/ip_set_getport.c               |    1 +
7449  net/netfilter/ipset/pfxlen.c                       |    1 +
7450  net/netfilter/nf_conntrack_acct.c                  |    1 +
7451  net/netfilter/nf_conntrack_ecache.c                |    1 +
7452  net/netfilter/nf_conntrack_expect.c                |    2 +
7453  net/netfilter/x_tables.c                           |    1 +
7454  net/netfilter/xt_quota.c                           |    1 +
7455  net/netfilter/xt_statistic.c                       |    1 +
7456  net/netrom/nr_route.c                              |    1 +
7457  net/nfc/af_nfc.c                                   |    1 +
7458  net/nfc/nci/core.c                                 |    1 +
7459  net/nfc/rawsock.c                                  |    1 +
7460  net/phonet/datagram.c                              |    1 +
7461  net/phonet/pep.c                                   |    1 +
7462  net/phonet/socket.c                                |    1 +
7463  net/rds/cong.c                                     |    1 +
7464  net/rds/connection.c                               |    1 +
7465  net/rds/ib.c                                       |    1 +
7466  net/rds/info.c                                     |    1 +
7467  net/rds/iw.c                                       |    1 +
7468  net/rds/message.c                                  |    1 +
7469  net/rds/page.c                                     |    1 +
7470  net/rds/rdma_transport.c                           |    1 +
7471  net/rds/recv.c                                     |    1 +
7472  net/rds/send.c                                     |    2 +
7473  net/rds/stats.c                                    |    1 +
7474  net/rds/tcp.c                                      |    1 +
7475  net/rds/threads.c                                  |    1 +
7476  net/rfkill/input.c                                 |    1 +
7477  net/rose/rose_route.c                              |    1 +
7478  net/rxrpc/ar-output.c                              |    1 +
7479  net/rxrpc/ar-recvmsg.c                             |    1 +
7480  net/sched/act_api.c                                |    1 +
7481  net/sched/cls_flow.c                               |    1 +
7482  net/sched/sch_mq.c                                 |    1 +
7483  net/sched/sch_mqprio.c                             |    1 +
7484  net/sctp/proc.c                                    |    1 +
7485  net/sctp/socket.c                                  |    1 +
7486  net/sunrpc/addr.c                                  |    1 +
7487  net/sunrpc/backchannel_rqst.c                      |    1 +
7488  net/sunrpc/socklib.c                               |    1 +
7489  net/sunrpc/svc_xprt.c                              |    1 +
7490  net/sunrpc/svcsock.c                               |    1 +
7491  net/sunrpc/xprtrdma/svc_rdma_transport.c           |    1 +
7492  net/sysctl_net.c                                   |    1 +
7493  net/tipc/core.c                                    |    2 +
7494  net/tipc/socket.c                                  |    1 +
7495  net/wimax/op-msg.c                                 |    1 +
7496  net/wimax/op-reset.c                               |    1 +
7497  net/wimax/op-rfkill.c                              |    1 +
7498  net/wimax/stack.c                                  |    1 +
7499  net/wireless/ibss.c                                |    1 +
7500  net/wireless/mesh.c                                |    1 +
7501  net/wireless/radiotap.c                            |    1 +
7502  net/wireless/reg.c                                 |    2 +
7503  net/wireless/sme.c                                 |    1 +
7504  net/wireless/util.c                                |    1 +
7505  net/wireless/wext-compat.c                         |    1 +
7506  net/wireless/wext-core.c                           |    1 +
7507  net/wireless/wext-sme.c                            |    1 +
7508  net/wireless/wext-spy.c                            |    1 +
7509  net/x25/x25_proc.c                                 |    1 +
7510  net/xfrm/xfrm_proc.c                               |    1 +
7511  net/xfrm/xfrm_replay.c                             |    1 +
7512  security/selinux/hooks.c                           |    1 +
7513  security/selinux/netlink.c                         |    1 +
7514  sound/aoa/soundbus/i2sbus/pcm.c                    |    1 +
7515  sound/arm/pxa2xx-ac97-lib.c                        |    1 +
7516  sound/arm/pxa2xx-pcm.c                             |    1 +
7517  sound/core/control.c                               |    1 +
7518  sound/core/device.c                                |    1 +
7519  sound/core/hwdep.c                                 |    1 +
7520  sound/core/info.c                                  |    1 +
7521  sound/core/info_oss.c                              |    1 +
7522  sound/core/init.c                                  |    1 +
7523  sound/core/isadma.c                                |    1 +
7524  sound/core/jack.c                                  |    1 +
7525  sound/core/memory.c                                |    1 +
7526  sound/core/misc.c                                  |    2 +
7527  sound/core/oss/mixer_oss.c                         |    1 +
7528  sound/core/oss/pcm_oss.c                           |    2 +-
7529  sound/core/pcm.c                                   |    1 +
7530  sound/core/pcm_lib.c                               |    1 +
7531  sound/core/pcm_memory.c                            |    1 +
7532  sound/core/pcm_misc.c                              |    1 +
7533  sound/core/pcm_native.c                            |    1 +
7534  sound/core/rawmidi.c                               |    2 +-
7535  sound/core/seq/oss/seq_oss.c                       |    2 +-
7536  sound/core/seq/oss/seq_oss_init.c                  |    1 +
7537  sound/core/seq/oss/seq_oss_synth.c                 |    1 +
7538  sound/core/seq/seq.c                               |    2 +-
7539  sound/core/seq/seq_clientmgr.c                     |    1 +
7540  sound/core/seq/seq_device.c                        |    1 +
7541  sound/core/seq/seq_dummy.c                         |    2 +-
7542  sound/core/seq/seq_info.c                          |    1 +
7543  sound/core/seq/seq_lock.c                          |    1 +
7544  sound/core/seq/seq_memory.c                        |    1 +
7545  sound/core/seq/seq_midi.c                          |    2 +-
7546  sound/core/seq/seq_midi_emul.c                     |    1 +
7547  sound/core/seq/seq_midi_event.c                    |    1 +
7548  sound/core/seq/seq_ports.c                         |    1 +
7549  sound/core/seq/seq_system.c                        |    1 +
7550  sound/core/seq/seq_virmidi.c                       |    1 +
7551  sound/core/sound.c                                 |    2 +-
7552  sound/core/sound_oss.c                             |    1 +
7553  sound/core/timer.c                                 |    2 +-
7554  sound/core/vmaster.c                               |    1 +
7555  sound/drivers/aloop.c                              |    2 +-
7556  sound/drivers/dummy.c                              |    2 +-
7557  sound/drivers/ml403-ac97cr.c                       |    2 +-
7558  sound/drivers/mpu401/mpu401.c                      |    2 +-
7559  sound/drivers/mpu401/mpu401_uart.c                 |    1 +
7560  sound/drivers/mtpav.c                              |    1 +
7561  sound/drivers/mts64.c                              |    1 +
7562  sound/drivers/opl3/opl3_lib.c                      |    1 +
7563  sound/drivers/opl3/opl3_oss.c                      |    1 +
7564  sound/drivers/opl3/opl3_seq.c                      |    1 +
7565  sound/drivers/opl3/opl3_synth.c                    |    1 +
7566  sound/drivers/opl4/opl4_lib.c                      |    1 +
7567  sound/drivers/opl4/opl4_proc.c                     |    1 +
7568  sound/drivers/opl4/opl4_seq.c                      |    1 +
7569  sound/drivers/pcsp/pcsp.c                          |    2 +-
7570  sound/drivers/portman2x4.c                         |    1 +
7571  sound/drivers/serial-u16550.c                      |    2 +-
7572  sound/drivers/virmidi.c                            |    2 +-
7573  sound/drivers/vx/vx_core.c                         |    1 +
7574  sound/drivers/vx/vx_hwdep.c                        |    1 +
7575  sound/firewire/iso-resources.c                     |    1 +
7576  sound/firewire/packets-buffer.c                    |    1 +
7577  sound/i2c/cs8427.c                                 |    1 +
7578  sound/i2c/i2c.c                                    |    1 +
7579  sound/i2c/other/ak4113.c                           |    1 +
7580  sound/i2c/other/ak4114.c                           |    1 +
7581  sound/i2c/other/ak4117.c                           |    1 +
7582  sound/i2c/other/ak4xxx-adda.c                      |    1 +
7583  sound/i2c/other/pt2258.c                           |    1 +
7584  sound/i2c/other/tea575x-tuner.c                    |    1 +
7585  sound/i2c/tea6330t.c                               |    1 +
7586  sound/isa/ad1816a/ad1816a.c                        |    2 +-
7587  sound/isa/ad1848/ad1848.c                          |    2 +-
7588  sound/isa/als100.c                                 |    2 +-
7589  sound/isa/azt2320.c                                |    2 +-
7590  sound/isa/cmi8330.c                                |    2 +-
7591  sound/isa/cs423x/cs4231.c                          |    2 +-
7592  sound/isa/cs423x/cs4236.c                          |    2 +-
7593  sound/isa/es1688/es1688.c                          |    2 +-
7594  sound/isa/es1688/es1688_lib.c                      |    1 +
7595  sound/isa/es18xx.c                                 |    2 +-
7596  sound/isa/gus/gus_main.c                           |    1 +
7597  sound/isa/gus/gus_volume.c                         |    1 +
7598  sound/isa/gus/gusclassic.c                         |    2 +-
7599  sound/isa/gus/gusextreme.c                         |    2 +-
7600  sound/isa/gus/gusmax.c                             |    2 +-
7601  sound/isa/gus/interwave.c                          |    2 +-
7602  sound/isa/msnd/msnd.c                              |    1 +
7603  sound/isa/msnd/msnd_midi.c                         |    1 +
7604  sound/isa/msnd/msnd_pinnacle_mixer.c               |    1 +
7605  sound/isa/opl3sa2.c                                |    2 +-
7606  sound/isa/opti9xx/miro.c                           |    2 +-
7607  sound/isa/opti9xx/opti92x-ad1848.c                 |    2 +-
7608  sound/isa/sb/emu8000.c                             |    1 +
7609  sound/isa/sb/emu8000_callback.c                    |    1 +
7610  sound/isa/sb/emu8000_patch.c                       |    1 +
7611  sound/isa/sb/emu8000_synth.c                       |    1 +
7612  sound/isa/sb/sb16.c                                |    2 +-
7613  sound/isa/sb/sb16_csp.c                            |    1 +
7614  sound/isa/sb/sb16_main.c                           |    1 +
7615  sound/isa/sb/sb8.c                                 |    2 +-
7616  sound/isa/sb/sb8_main.c                            |    1 +
7617  sound/isa/sb/sb_common.c                           |    1 +
7618  sound/isa/sscape.c                                 |    2 +-
7619  sound/isa/wavefront/wavefront.c                    |    2 +-
7620  sound/isa/wavefront/wavefront_fx.c                 |    1 +
7621  sound/isa/wavefront/wavefront_synth.c              |    1 +
7622  sound/isa/wss/wss_lib.c                            |    1 +
7623  sound/mips/au1x00.c                                |    1 +
7624  sound/mips/hal2.c                                  |    1 +
7625  sound/mips/sgio2audio.c                            |    1 +
7626  sound/pci/ac97/ac97_codec.c                        |    2 +-
7627  sound/pci/ac97/ac97_pcm.c                          |    1 +
7628  sound/pci/ad1889.c                                 |    1 +
7629  sound/pci/ak4531_codec.c                           |    1 +
7630  sound/pci/ali5451/ali5451.c                        |    2 +-
7631  sound/pci/als300.c                                 |    2 +-
7632  sound/pci/als4000.c                                |    2 +-
7633  sound/pci/asihpi/asihpi.c                          |    1 +
7634  sound/pci/asihpi/hpioctl.c                         |    1 +
7635  sound/pci/atiixp.c                                 |    2 +-
7636  sound/pci/atiixp_modem.c                           |    2 +-
7637  sound/pci/au88x0/au88x0.c                          |    2 +-
7638  sound/pci/au88x0/au88x0_game.c                     |    1 +
7639  sound/pci/aw2/aw2-alsa.c                           |    1 +
7640  sound/pci/azt3328.c                                |    2 +-
7641  sound/pci/bt87x.c                                  |    2 +-
7642  sound/pci/ca0106/ca0106_main.c                     |    2 +-
7643  sound/pci/cmipci.c                                 |    2 +-
7644  sound/pci/cs4281.c                                 |    2 +-
7645  sound/pci/cs46xx/cs46xx.c                          |    2 +-
7646  sound/pci/cs46xx/cs46xx_lib.c                      |    1 +
7647  sound/pci/cs5530.c                                 |    2 +-
7648  sound/pci/cs5535audio/cs5535audio.c                |    2 +-
7649  sound/pci/ctxfi/xfi.c                              |    1 +
7650  sound/pci/echoaudio/darla20.c                      |    2 +-
7651  sound/pci/echoaudio/darla24.c                      |    2 +-
7652  sound/pci/echoaudio/echo3g.c                       |    2 +-
7653  sound/pci/echoaudio/echoaudio.c                    |    2 +
7654  sound/pci/echoaudio/gina20.c                       |    2 +-
7655  sound/pci/echoaudio/gina24.c                       |    2 +-
7656  sound/pci/echoaudio/indigo.c                       |    2 +-
7657  sound/pci/echoaudio/indigodj.c                     |    2 +-
7658  sound/pci/echoaudio/indigodjx.c                    |    2 +-
7659  sound/pci/echoaudio/indigoio.c                     |    2 +-
7660  sound/pci/echoaudio/indigoiox.c                    |    2 +-
7661  sound/pci/echoaudio/layla20.c                      |    2 +-
7662  sound/pci/echoaudio/layla24.c                      |    2 +-
7663  sound/pci/echoaudio/mia.c                          |    2 +-
7664  sound/pci/echoaudio/mona.c                         |    2 +-
7665  sound/pci/emu10k1/emu10k1.c                        |    2 +-
7666  sound/pci/emu10k1/emu10k1_callback.c               |    1 +
7667  sound/pci/emu10k1/emu10k1_main.c                   |    1 +
7668  sound/pci/emu10k1/emu10k1_synth.c                  |    1 +
7669  sound/pci/emu10k1/emu10k1x.c                       |    2 +-
7670  sound/pci/emu10k1/io.c                             |    1 +
7671  sound/pci/emu10k1/memory.c                         |    1 +
7672  sound/pci/emu10k1/voice.c                          |    1 +
7673  sound/pci/ens1370.c                                |    2 +-
7674  sound/pci/es1938.c                                 |    2 +-
7675  sound/pci/es1968.c                                 |    2 +-
7676  sound/pci/fm801.c                                  |    2 +-
7677  sound/pci/hda/hda_beep.c                           |    1 +
7678  sound/pci/hda/hda_codec.c                          |    1 +
7679  sound/pci/hda/hda_generic.c                        |    1 +
7680  sound/pci/hda/hda_hwdep.c                          |    1 +
7681  sound/pci/hda/patch_analog.c                       |    1 +
7682  sound/pci/hda/patch_ca0110.c                       |    1 +
7683  sound/pci/hda/patch_ca0132.c                       |    1 +
7684  sound/pci/hda/patch_cirrus.c                       |    1 +
7685  sound/pci/hda/patch_cmedia.c                       |    1 +
7686  sound/pci/hda/patch_conexant.c                     |    1 +
7687  sound/pci/hda/patch_hdmi.c                         |    2 +-
7688  sound/pci/hda/patch_realtek.c                      |    1 +
7689  sound/pci/hda/patch_si3054.c                       |    1 +
7690  sound/pci/hda/patch_sigmatel.c                     |    1 +
7691  sound/pci/hda/patch_via.c                          |    1 +
7692  sound/pci/ice1712/ak4xxx.c                         |    1 +
7693  sound/pci/ice1712/ice1712.c                        |    2 +-
7694  sound/pci/ice1712/ice1724.c                        |    2 +-
7695  sound/pci/intel8x0.c                               |    2 +-
7696  sound/pci/intel8x0m.c                              |    2 +-
7697  sound/pci/korg1212/korg1212.c                      |    2 +-
7698  sound/pci/lola/lola.c                              |    2 +-
7699  sound/pci/maestro3.c                               |    2 +-
7700  sound/pci/mixart/mixart.c                          |    2 +-
7701  sound/pci/mixart/mixart_hwdep.c                    |    1 +
7702  sound/pci/nm256/nm256.c                            |    2 +-
7703  sound/pci/oxygen/oxygen.c                          |    1 +
7704  sound/pci/oxygen/oxygen_io.c                       |    1 +
7705  sound/pci/oxygen/oxygen_lib.c                      |    1 +
7706  sound/pci/oxygen/virtuoso.c                        |    1 +
7707  sound/pci/pcxhr/pcxhr.c                            |    2 +-
7708  sound/pci/pcxhr/pcxhr_hwdep.c                      |    1 +
7709  sound/pci/riptide/riptide.c                        |    1 +
7710  sound/pci/rme32.c                                  |    2 +-
7711  sound/pci/rme96.c                                  |    2 +-
7712  sound/pci/rme9652/hdsp.c                           |    2 +-
7713  sound/pci/rme9652/hdspm.c                          |    2 +-
7714  sound/pci/rme9652/rme9652.c                        |    2 +-
7715  sound/pci/sis7019.c                                |    2 +-
7716  sound/pci/sonicvibes.c                             |    2 +-
7717  sound/pci/trident/trident.c                        |    2 +-
7718  sound/pci/trident/trident_main.c                   |    1 +
7719  sound/pci/via82xx.c                                |    2 +-
7720  sound/pci/via82xx_modem.c                          |    2 +-
7721  sound/pci/vx222/vx222.c                            |    2 +-
7722  sound/pci/ymfpci/ymfpci.c                          |    2 +-
7723  sound/pci/ymfpci/ymfpci_main.c                     |    1 +
7724  sound/pcmcia/pdaudiocf/pdaudiocf.c                 |    2 +-
7725  sound/pcmcia/vx/vxpocket.c                         |    2 +-
7726  sound/ppc/powermac.c                               |    2 +-
7727  sound/ppc/snd_ps3.c                                |    1 +
7728  sound/sh/aica.c                                    |    2 +-
7729  sound/sh/sh_dac_audio.c                            |    1 +
7730  sound/soc/blackfin/bf5xx-sport.c                   |    1 +
7731  sound/soc/blackfin/bfin-eval-adav80x.c             |    1 +
7732  sound/soc/codecs/ac97.c                            |    1 +
7733  sound/soc/codecs/ads117x.c                         |    1 +
7734  sound/soc/codecs/ak4642.c                          |    1 +
7735  sound/soc/codecs/cx20442.c                         |    1 +
7736  sound/soc/codecs/da7210.c                          |    1 +
7737  sound/soc/codecs/dmic.c                            |    1 +
7738  sound/soc/codecs/pcm3008.c                         |    1 +
7739  sound/soc/codecs/sn95031.c                         |    1 +
7740  sound/soc/codecs/wl1273.c                          |    1 +
7741  sound/soc/ep93xx/edb93xx.c                         |    1 +
7742  sound/soc/ep93xx/snappercl15.c                     |    1 +
7743  sound/soc/imx/wm1133-ev1.c                         |    1 +
7744  sound/soc/mid-x86/mfld_machine.c                   |    1 +
7745  sound/soc/mid-x86/sst_platform.c                   |    1 +
7746  sound/soc/omap/am3517evm.c                         |    1 +
7747  sound/soc/omap/ams-delta.c                         |    1 +
7748  sound/soc/omap/igep0020.c                          |    1 +
7749  sound/soc/omap/n810.c                              |    1 +
7750  sound/soc/omap/omap-pcm.c                          |    1 +
7751  sound/soc/omap/omap3beagle.c                       |    1 +
7752  sound/soc/omap/omap3evm.c                          |    1 +
7753  sound/soc/omap/omap3pandora.c                      |    1 +
7754  sound/soc/omap/omap4-hdmi-card.c                   |    1 +
7755  sound/soc/omap/osk5912.c                           |    1 +
7756  sound/soc/omap/overo.c                             |    1 +
7757  sound/soc/omap/rx51.c                              |    1 +
7758  sound/soc/omap/sdp3430.c                           |    1 +
7759  sound/soc/omap/sdp4430.c                           |    1 +
7760  sound/soc/omap/zoom2.c                             |    1 +
7761  sound/soc/pxa/pxa2xx-pcm.c                         |    1 +
7762  sound/soc/samsung/ac97.c                           |    1 +
7763  sound/soc/samsung/dma.c                            |    1 +
7764  sound/soc/samsung/goni_wm8994.c                    |    1 +
7765  sound/soc/samsung/h1940_uda1380.c                  |    1 +
7766  sound/soc/samsung/i2s.c                            |    1 +
7767  sound/soc/samsung/idma.c                           |    1 +
7768  sound/soc/samsung/jive_wm8750.c                    |    1 +
7769  sound/soc/samsung/ln2440sbc_alc650.c               |    1 +
7770  sound/soc/samsung/pcm.c                            |    1 +
7771  sound/soc/samsung/rx1950_uda1380.c                 |    1 +
7772  sound/soc/samsung/s3c2412-i2s.c                    |    1 +
7773  sound/soc/samsung/s3c24xx-i2s.c                    |    1 +
7774  sound/soc/samsung/s3c24xx_simtec.c                 |    1 +
7775  sound/soc/samsung/s3c24xx_simtec_hermes.c          |    1 +
7776  sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c     |    1 +
7777  sound/soc/samsung/s3c24xx_uda134x.c                |    1 +
7778  sound/soc/samsung/smartq_wm8987.c                  |    1 +
7779  sound/soc/samsung/smdk_spdif.c                     |    1 +
7780  sound/soc/samsung/smdk_wm8580.c                    |    1 +
7781  sound/soc/samsung/smdk_wm8580pcm.c                 |    1 +
7782  sound/soc/samsung/smdk_wm8994pcm.c                 |    1 +
7783  sound/soc/samsung/smdk_wm9713.c                    |    1 +
7784  sound/soc/samsung/spdif.c                          |    1 +
7785  sound/soc/samsung/speyside.c                       |    1 +
7786  sound/soc/samsung/speyside_wm8962.c                |    1 +
7787  sound/soc/sh/fsi-ak4642.c                          |    1 +
7788  sound/soc/sh/fsi-da7210.c                          |    1 +
7789  sound/soc/sh/fsi-hdmi.c                            |    1 +
7790  sound/soc/sh/fsi.c                                 |    1 +
7791  sound/soc/sh/siu_dai.c                             |    1 +
7792  sound/soc/soc-cache.c                              |    1 +
7793  sound/soc/soc-io.c                                 |    1 +
7794  sound/soc/soc-jack.c                               |    1 +
7795  sound/soc/soc-utils.c                              |    1 +
7796  sound/soc/tegra/tegra_asoc_utils.c                 |    1 +
7797  sound/sparc/dbri.c                                 |    1 +
7798  sound/synth/emux/emux.c                            |    1 +
7799  sound/synth/emux/emux_oss.c                        |    1 +
7800  sound/synth/emux/emux_seq.c                        |    2 +-
7801  sound/synth/emux/emux_synth.c                      |    1 +
7802  sound/synth/emux/soundfont.c                       |    1 +
7803  sound/synth/util_mem.c                             |    1 +
7804  sound/usb/6fire/firmware.c                         |    1 +
7805  sound/usb/card.c                                   |    1 +
7806  sound/usb/midi.c                                   |    1 +
7807  sound/usb/usx2y/us122l.c                           |    1 +
7808  sound/usb/usx2y/usbusx2yaudio.c                    |    1 +
7809  virt/kvm/iommu.c                                   |    2 +
7810  2057 files changed, 2248 insertions(+), 606 deletions(-)
7811  create mode 100644 include/linux/export.h
7812 $ git am -3 ../modsplit/arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch
7813 Applying: arm: Add export.h to recently added files for EXPORT_SYMBOL
7814 $ git reset HEAD^
7815 Unstaged changes after reset:
7816 M       arch/arm/plat-samsung/dma-ops.c
7817 M       arch/arm/plat-samsung/s3c-dma-ops.c
7818 $ git add .
7819 $ git commit -v -a --amend
7820 [master cd50e26] Merge remote-tracking branch 'moduleh/for-sfr'
7821 $ git am -3 ../modsplit/powerpc-powernv-include-export.h-in-hvc_opal.h-for-T.patch
7822 Applying: powerpc/powernv: include export.h in hvc_opal.h for THIS_MODULE
7823 $ git reset HEAD^
7824 Unstaged changes after reset:
7825 M       drivers/tty/hvc/hvc_opal.c
7826 $ git add .
7827 $ git commit -v -a --amend
7828 [master 265dfb4] Merge remote-tracking branch 'moduleh/for-sfr'
7829 $ git am -3 ../modsplit/drivers-md-change-module.h-export.h-in-persistent-da.patch
7830 Applying: drivers/md: change module.h -> export.h in persistent-data/dm-*
7831 $ git reset HEAD^
7832 Unstaged changes after reset:
7833 M       drivers/md/persistent-data/dm-btree-remove.c
7834 M       drivers/md/persistent-data/dm-btree.c
7835 M       drivers/md/persistent-data/dm-space-map-disk.c
7836 M       drivers/md/persistent-data/dm-transaction-manager.c
7837 $ git add .
7838 $ git commit -v -a --amend
7839 [master e755cea] Merge remote-tracking branch 'moduleh/for-sfr'
7840 $ git am -3 ../modsplit/device-mapper-dm-bufio.c-needs-to-include-module.h.patch
7841 Applying: device-mapper: dm-bufio.c needs to include module.h
7842 $ git reset HEAD^
7843 Unstaged changes after reset:
7844 M       drivers/md/dm-bufio.c
7845 $ git add .
7846 $ git commit -v -a --amend
7847 [master a38c31c] Merge remote-tracking branch 'moduleh/for-sfr'
7848 $ git am -3 ../modsplit/device-mapper-using-EXPORT_SYBOL-in-dm-space-map-che.patch
7849 Applying: device-mapper: using EXPORT_SYBOL in dm-space-map-checker.c needs export.h
7850 $ git reset HEAD^
7851 Unstaged changes after reset:
7852 M       drivers/md/persistent-data/dm-space-map-checker.c
7853 $ git add .
7854 $ git commit -v -a --amend
7855 [master 5050784] Merge remote-tracking branch 'moduleh/for-sfr'
7856 Merging kvmtool/master (3b08ed0 config: Add 'make kvmconfig')
7857 $ git merge kvmtool/master
7858 Recorded preimage for 'scripts/kconfig/Makefile'
7859 Resolved 'include/net/9p/9p.h' using previous resolution.
7860 Auto-merging scripts/kconfig/Makefile
7861 CONFLICT (content): Merge conflict in scripts/kconfig/Makefile
7862 Auto-merging include/net/9p/9p.h
7863 CONFLICT (content): Merge conflict in include/net/9p/9p.h
7864 Auto-merging arch/x86/Kconfig
7865 Auto-merging MAINTAINERS
7866 Automatic merge failed; fix conflicts and then commit the result.
7867 $ git commit -v -a
7868 Recorded resolution for 'scripts/kconfig/Makefile'.
7869 [master 2a93f6f] Merge remote-tracking branch 'kvmtool/master'
7870 $ git diff -M --stat --summary HEAD^..
7871  MAINTAINERS                                  |    8 +
7872  arch/x86/Kconfig                             |   27 +
7873  scripts/kconfig/Makefile                     |    6 +-
7874  tools/kvm/.gitignore                         |   10 +
7875  tools/kvm/CREDITS-Git                        |   30 +
7876  tools/kvm/Documentation/kernel-debugging.txt |   15 +
7877  tools/kvm/Documentation/kvm-balloon.txt      |   24 +
7878  tools/kvm/Documentation/kvm-debug.txt        |   16 +
7879  tools/kvm/Documentation/kvm-list.txt         |   16 +
7880  tools/kvm/Documentation/kvm-pause.txt        |   16 +
7881  tools/kvm/Documentation/kvm-resume.txt       |   16 +
7882  tools/kvm/Documentation/kvm-run.txt          |   62 ++
7883  tools/kvm/Documentation/kvm-setup.txt        |   15 +
7884  tools/kvm/Documentation/kvm-stat.txt         |   19 +
7885  tools/kvm/Documentation/kvm-stop.txt         |   16 +
7886  tools/kvm/Documentation/kvm-version.txt      |   21 +
7887  tools/kvm/Makefile                           |  305 ++++++
7888  tools/kvm/README                             |  109 +++
7889  tools/kvm/bios.c                             |  157 +++
7890  tools/kvm/bios/.gitignore                    |    3 +
7891  tools/kvm/bios/bios-rom.S                    |   12 +
7892  tools/kvm/bios/e820.c                        |   72 ++
7893  tools/kvm/bios/entry.S                       |   92 ++
7894  tools/kvm/bios/gen-offsets.sh                |   14 +
7895  tools/kvm/bios/int10.c                       |  154 +++
7896  tools/kvm/bios/int15.c                       |   18 +
7897  tools/kvm/bios/local.S                       |    7 +
7898  tools/kvm/bios/macro.S                       |   25 +
7899  tools/kvm/bios/memcpy.c                      |   23 +
7900  tools/kvm/bios/rom.ld.S                      |   17 +
7901  tools/kvm/builtin-balloon.c                  |   90 ++
7902  tools/kvm/builtin-debug.c                    |   89 ++
7903  tools/kvm/builtin-help.c                     |   62 ++
7904  tools/kvm/builtin-list.c                     |  156 +++
7905  tools/kvm/builtin-pause.c                    |   78 ++
7906  tools/kvm/builtin-resume.c                   |   78 ++
7907  tools/kvm/builtin-run.c                      |  995 +++++++++++++++++++
7908  tools/kvm/builtin-setup.c                    |  228 +++++
7909  tools/kvm/builtin-stat.c                     |  131 +++
7910  tools/kvm/builtin-stop.c                     |   78 ++
7911  tools/kvm/builtin-version.c                  |   15 +
7912  tools/kvm/code16gcc.h                        |   15 +
7913  tools/kvm/command-list.txt                   |   14 +
7914  tools/kvm/config/feature-tests.mak           |  168 ++++
7915  tools/kvm/config/utilities.mak               |  188 ++++
7916  tools/kvm/cpuid.c                            |   55 ++
7917  tools/kvm/disk/blk.c                         |   39 +
7918  tools/kvm/disk/core.c                        |  241 +++++
7919  tools/kvm/disk/qcow.c                        | 1334 ++++++++++++++++++++++++++
7920  tools/kvm/disk/raw.c                         |  142 +++
7921  tools/kvm/framebuffer.c                      |   68 ++
7922  tools/kvm/guest/init.c                       |   46 +
7923  tools/kvm/guest_compat.c                     |  104 ++
7924  tools/kvm/hw/i8042.c                         |  348 +++++++
7925  tools/kvm/hw/pci-shmem.c                     |  261 +++++
7926  tools/kvm/hw/rtc.c                           |   87 ++
7927  tools/kvm/hw/serial.c                        |  364 +++++++
7928  tools/kvm/hw/vesa.c                          |   77 ++
7929  tools/kvm/include/asm/hweight.h              |    8 +
7930  tools/kvm/include/bios/memcpy.h              |    9 +
7931  tools/kvm/include/kvm/8250-serial.h          |   10 +
7932  tools/kvm/include/kvm/apic.h                 |   17 +
7933  tools/kvm/include/kvm/assembly.h             |   24 +
7934  tools/kvm/include/kvm/barrier.h              |   15 +
7935  tools/kvm/include/kvm/bios-export.h          |   13 +
7936  tools/kvm/include/kvm/bios.h                 |   84 ++
7937  tools/kvm/include/kvm/boot-protocol.h        |   16 +
7938  tools/kvm/include/kvm/brlock.h               |   41 +
7939  tools/kvm/include/kvm/builtin-balloon.h      |    7 +
7940  tools/kvm/include/kvm/builtin-debug.h        |    7 +
7941  tools/kvm/include/kvm/builtin-help.h         |    6 +
7942  tools/kvm/include/kvm/builtin-list.h         |    7 +
7943  tools/kvm/include/kvm/builtin-pause.h        |    7 +
7944  tools/kvm/include/kvm/builtin-resume.h       |    7 +
7945  tools/kvm/include/kvm/builtin-run.h          |    7 +
7946  tools/kvm/include/kvm/builtin-setup.h        |    9 +
7947  tools/kvm/include/kvm/builtin-stat.h         |    7 +
7948  tools/kvm/include/kvm/builtin-stop.h         |    7 +
7949  tools/kvm/include/kvm/builtin-version.h      |    6 +
7950  tools/kvm/include/kvm/compiler.h             |    6 +
7951  tools/kvm/include/kvm/cpufeature.h           |   41 +
7952  tools/kvm/include/kvm/disk-image.h           |   81 ++
7953  tools/kvm/include/kvm/e820.h                 |   12 +
7954  tools/kvm/include/kvm/framebuffer.h          |   34 +
7955  tools/kvm/include/kvm/guest_compat.h         |    9 +
7956  tools/kvm/include/kvm/i8042.h                |   12 +
7957  tools/kvm/include/kvm/interrupt.h            |   26 +
7958  tools/kvm/include/kvm/ioeventfd.h            |   27 +
7959  tools/kvm/include/kvm/ioport.h               |   65 ++
7960  tools/kvm/include/kvm/irq.h                  |   31 +
7961  tools/kvm/include/kvm/kvm-cmd.h              |   17 +
7962  tools/kvm/include/kvm/kvm-cpu.h              |   46 +
7963  tools/kvm/include/kvm/kvm-ipc.h              |   27 +
7964  tools/kvm/include/kvm/kvm.h                  |  108 +++
7965  tools/kvm/include/kvm/mptable.h              |    8 +
7966  tools/kvm/include/kvm/mutex.h                |   33 +
7967  tools/kvm/include/kvm/parse-options.h        |  213 ++++
7968  tools/kvm/include/kvm/pci-shmem.h            |   28 +
7969  tools/kvm/include/kvm/pci.h                  |   74 ++
7970  tools/kvm/include/kvm/qcow.h                 |  131 +++
7971  tools/kvm/include/kvm/rbtree-interval.h      |   27 +
7972  tools/kvm/include/kvm/read-write.h           |   43 +
7973  tools/kvm/include/kvm/rtc.h                  |    6 +
7974  tools/kvm/include/kvm/rwsem.h                |   39 +
7975  tools/kvm/include/kvm/sdl.h                  |   17 +
7976  tools/kvm/include/kvm/segment.h              |   21 +
7977  tools/kvm/include/kvm/strbuf.h               |    6 +
7978  tools/kvm/include/kvm/symbol.h               |   22 +
7979  tools/kvm/include/kvm/term.h                 |   18 +
7980  tools/kvm/include/kvm/threadpool.h           |   37 +
7981  tools/kvm/include/kvm/types.h                |    7 +
7982  tools/kvm/include/kvm/uip.h                  |  358 +++++++
7983  tools/kvm/include/kvm/util.h                 |   78 ++
7984  tools/kvm/include/kvm/vesa.h                 |   18 +
7985  tools/kvm/include/kvm/virtio-9p.h            |   74 ++
7986  tools/kvm/include/kvm/virtio-balloon.h       |    8 +
7987  tools/kvm/include/kvm/virtio-blk.h           |   13 +
7988  tools/kvm/include/kvm/virtio-console.h       |    9 +
7989  tools/kvm/include/kvm/virtio-net.h           |   21 +
7990  tools/kvm/include/kvm/virtio-pci-dev.h       |   37 +
7991  tools/kvm/include/kvm/virtio-pci.h           |   60 ++
7992  tools/kvm/include/kvm/virtio-rng.h           |    9 +
7993  tools/kvm/include/kvm/virtio.h               |   62 ++
7994  tools/kvm/include/kvm/vnc.h                  |   14 +
7995  tools/kvm/include/linux/bitops.h             |   33 +
7996  tools/kvm/include/linux/byteorder.h          |    7 +
7997  tools/kvm/include/linux/kernel.h             |   39 +
7998  tools/kvm/include/linux/module.h             |    6 +
7999  tools/kvm/include/linux/prefetch.h           |    6 +
8000  tools/kvm/include/linux/types.h              |   50 +
8001  tools/kvm/interrupt.c                        |   27 +
8002  tools/kvm/ioeventfd.c                        |  128 +++
8003  tools/kvm/ioport.c                           |  192 ++++
8004  tools/kvm/irq.c                              |  193 ++++
8005  tools/kvm/kvm-cmd.c                          |   91 ++
8006  tools/kvm/kvm-cpu.c                          |  523 ++++++++++
8007  tools/kvm/kvm-ipc.c                          |  171 ++++
8008  tools/kvm/kvm.c                              |  821 ++++++++++++++++
8009  tools/kvm/main.c                             |   19 +
8010  tools/kvm/mmio.c                             |  132 +++
8011  tools/kvm/mptable.c                          |  284 ++++++
8012  tools/kvm/net/uip/arp.c                      |   30 +
8013  tools/kvm/net/uip/buf.c                      |  114 +++
8014  tools/kvm/net/uip/core.c                     |  190 ++++
8015  tools/kvm/net/uip/csum.c                     |   92 ++
8016  tools/kvm/net/uip/dhcp.c                     |  203 ++++
8017  tools/kvm/net/uip/icmp.c                     |   29 +
8018  tools/kvm/net/uip/ipv4.c                     |   29 +
8019  tools/kvm/net/uip/tcp.c                      |  317 ++++++
8020  tools/kvm/net/uip/udp.c                      |  236 +++++
8021  tools/kvm/pci.c                              |  169 ++++
8022  tools/kvm/read-write.c                       |  344 +++++++
8023  tools/kvm/symbol.c                           |   98 ++
8024  tools/kvm/term.c                             |  170 ++++
8025  tools/kvm/tests/Makefile                     |   19 +
8026  tools/kvm/tests/boot/Makefile                |   13 +
8027  tools/kvm/tests/boot/init.c                  |   11 +
8028  tools/kvm/tests/kernel/.gitignore            |    2 +
8029  tools/kvm/tests/kernel/Makefile              |   20 +
8030  tools/kvm/tests/kernel/README                |   16 +
8031  tools/kvm/tests/kernel/kernel.S              |    8 +
8032  tools/kvm/tests/pit/.gitignore               |    2 +
8033  tools/kvm/tests/pit/Makefile                 |   20 +
8034  tools/kvm/tests/pit/README                   |   16 +
8035  tools/kvm/tests/pit/tick.S                   |  109 +++
8036  tools/kvm/threadpool.c                       |  146 +++
8037  tools/kvm/ui/sdl.c                           |  280 ++++++
8038  tools/kvm/ui/vnc.c                           |  218 +++++
8039  tools/kvm/util.c                             |  101 ++
8040  tools/kvm/util/KVMTOOLS-VERSION-GEN          |   40 +
8041  tools/kvm/util/generate-cmdlist.sh           |   23 +
8042  tools/kvm/util/kvm-ifup-vbr0                 |    6 +
8043  tools/kvm/util/parse-options.c               |  577 +++++++++++
8044  tools/kvm/util/rbtree-interval.c             |   90 ++
8045  tools/kvm/util/set_private_br.sh             |   51 +
8046  tools/kvm/util/strbuf.c                      |   13 +
8047  tools/kvm/virtio/9p-pdu.c                    |  287 ++++++
8048  tools/kvm/virtio/9p.c                        | 1266 ++++++++++++++++++++++++
8049  tools/kvm/virtio/balloon.c                   |  264 +++++
8050  tools/kvm/virtio/blk.c                       |  288 ++++++
8051  tools/kvm/virtio/console.c                   |  199 ++++
8052  tools/kvm/virtio/core.c                      |  111 +++
8053  tools/kvm/virtio/net.c                       |  423 ++++++++
8054  tools/kvm/virtio/pci.c                       |  319 ++++++
8055  tools/kvm/virtio/rng.c                       |  185 ++++
8056  185 files changed, 19088 insertions(+), 1 deletions(-)
8057  create mode 100644 tools/kvm/.gitignore
8058  create mode 100644 tools/kvm/CREDITS-Git
8059  create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
8060  create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
8061  create mode 100644 tools/kvm/Documentation/kvm-debug.txt
8062  create mode 100644 tools/kvm/Documentation/kvm-list.txt
8063  create mode 100644 tools/kvm/Documentation/kvm-pause.txt
8064  create mode 100644 tools/kvm/Documentation/kvm-resume.txt
8065  create mode 100644 tools/kvm/Documentation/kvm-run.txt
8066  create mode 100644 tools/kvm/Documentation/kvm-setup.txt
8067  create mode 100644 tools/kvm/Documentation/kvm-stat.txt
8068  create mode 100644 tools/kvm/Documentation/kvm-stop.txt
8069  create mode 100644 tools/kvm/Documentation/kvm-version.txt
8070  create mode 100644 tools/kvm/Makefile
8071  create mode 100644 tools/kvm/README
8072  create mode 100644 tools/kvm/bios.c
8073  create mode 100644 tools/kvm/bios/.gitignore
8074  create mode 100644 tools/kvm/bios/bios-rom.S
8075  create mode 100644 tools/kvm/bios/e820.c
8076  create mode 100644 tools/kvm/bios/entry.S
8077  create mode 100644 tools/kvm/bios/gen-offsets.sh
8078  create mode 100644 tools/kvm/bios/int10.c
8079  create mode 100644 tools/kvm/bios/int15.c
8080  create mode 100644 tools/kvm/bios/local.S
8081  create mode 100644 tools/kvm/bios/macro.S
8082  create mode 100644 tools/kvm/bios/memcpy.c
8083  create mode 100644 tools/kvm/bios/rom.ld.S
8084  create mode 100644 tools/kvm/builtin-balloon.c
8085  create mode 100644 tools/kvm/builtin-debug.c
8086  create mode 100644 tools/kvm/builtin-help.c
8087  create mode 100644 tools/kvm/builtin-list.c
8088  create mode 100644 tools/kvm/builtin-pause.c
8089  create mode 100644 tools/kvm/builtin-resume.c
8090  create mode 100644 tools/kvm/builtin-run.c
8091  create mode 100644 tools/kvm/builtin-setup.c
8092  create mode 100644 tools/kvm/builtin-stat.c
8093  create mode 100644 tools/kvm/builtin-stop.c
8094  create mode 100644 tools/kvm/builtin-version.c
8095  create mode 100644 tools/kvm/code16gcc.h
8096  create mode 100644 tools/kvm/command-list.txt
8097  create mode 100644 tools/kvm/config/feature-tests.mak
8098  create mode 100644 tools/kvm/config/utilities.mak
8099  create mode 100644 tools/kvm/cpuid.c
8100  create mode 100644 tools/kvm/disk/blk.c
8101  create mode 100644 tools/kvm/disk/core.c
8102  create mode 100644 tools/kvm/disk/qcow.c
8103  create mode 100644 tools/kvm/disk/raw.c
8104  create mode 100644 tools/kvm/framebuffer.c
8105  create mode 100644 tools/kvm/guest/init.c
8106  create mode 100644 tools/kvm/guest_compat.c
8107  create mode 100644 tools/kvm/hw/i8042.c
8108  create mode 100644 tools/kvm/hw/pci-shmem.c
8109  create mode 100644 tools/kvm/hw/rtc.c
8110  create mode 100644 tools/kvm/hw/serial.c
8111  create mode 100644 tools/kvm/hw/vesa.c
8112  create mode 100644 tools/kvm/include/asm/hweight.h
8113  create mode 100644 tools/kvm/include/bios/memcpy.h
8114  create mode 100644 tools/kvm/include/kvm/8250-serial.h
8115  create mode 100644 tools/kvm/include/kvm/apic.h
8116  create mode 100644 tools/kvm/include/kvm/assembly.h
8117  create mode 100644 tools/kvm/include/kvm/barrier.h
8118  create mode 100644 tools/kvm/include/kvm/bios-export.h
8119  create mode 100644 tools/kvm/include/kvm/bios.h
8120  create mode 100644 tools/kvm/include/kvm/boot-protocol.h
8121  create mode 100644 tools/kvm/include/kvm/brlock.h
8122  create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
8123  create mode 100644 tools/kvm/include/kvm/builtin-debug.h
8124  create mode 100644 tools/kvm/include/kvm/builtin-help.h
8125  create mode 100644 tools/kvm/include/kvm/builtin-list.h
8126  create mode 100644 tools/kvm/include/kvm/builtin-pause.h
8127  create mode 100644 tools/kvm/include/kvm/builtin-resume.h
8128  create mode 100644 tools/kvm/include/kvm/builtin-run.h
8129  create mode 100644 tools/kvm/include/kvm/builtin-setup.h
8130  create mode 100644 tools/kvm/include/kvm/builtin-stat.h
8131  create mode 100644 tools/kvm/include/kvm/builtin-stop.h
8132  create mode 100644 tools/kvm/include/kvm/builtin-version.h
8133  create mode 100644 tools/kvm/include/kvm/compiler.h
8134  create mode 100644 tools/kvm/include/kvm/cpufeature.h
8135  create mode 100644 tools/kvm/include/kvm/disk-image.h
8136  create mode 100644 tools/kvm/include/kvm/e820.h
8137  create mode 100644 tools/kvm/include/kvm/framebuffer.h
8138  create mode 100644 tools/kvm/include/kvm/guest_compat.h
8139  create mode 100644 tools/kvm/include/kvm/i8042.h
8140  create mode 100644 tools/kvm/include/kvm/interrupt.h
8141  create mode 100644 tools/kvm/include/kvm/ioeventfd.h
8142  create mode 100644 tools/kvm/include/kvm/ioport.h
8143  create mode 100644 tools/kvm/include/kvm/irq.h
8144  create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
8145  create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
8146  create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
8147  create mode 100644 tools/kvm/include/kvm/kvm.h
8148  create mode 100644 tools/kvm/include/kvm/mptable.h
8149  create mode 100644 tools/kvm/include/kvm/mutex.h
8150  create mode 100644 tools/kvm/include/kvm/parse-options.h
8151  create mode 100644 tools/kvm/include/kvm/pci-shmem.h
8152  create mode 100644 tools/kvm/include/kvm/pci.h
8153  create mode 100644 tools/kvm/include/kvm/qcow.h
8154  create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
8155  create mode 100644 tools/kvm/include/kvm/read-write.h
8156  create mode 100644 tools/kvm/include/kvm/rtc.h
8157  create mode 100644 tools/kvm/include/kvm/rwsem.h
8158  create mode 100644 tools/kvm/include/kvm/sdl.h
8159  create mode 100644 tools/kvm/include/kvm/segment.h
8160  create mode 100644 tools/kvm/include/kvm/strbuf.h
8161  create mode 100644 tools/kvm/include/kvm/symbol.h
8162  create mode 100644 tools/kvm/include/kvm/term.h
8163  create mode 100644 tools/kvm/include/kvm/threadpool.h
8164  create mode 100644 tools/kvm/include/kvm/types.h
8165  create mode 100644 tools/kvm/include/kvm/uip.h
8166  create mode 100644 tools/kvm/include/kvm/util.h
8167  create mode 100644 tools/kvm/include/kvm/vesa.h
8168  create mode 100644 tools/kvm/include/kvm/virtio-9p.h
8169  create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
8170  create mode 100644 tools/kvm/include/kvm/virtio-blk.h
8171  create mode 100644 tools/kvm/include/kvm/virtio-console.h
8172  create mode 100644 tools/kvm/include/kvm/virtio-net.h
8173  create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
8174  create mode 100644 tools/kvm/include/kvm/virtio-pci.h
8175  create mode 100644 tools/kvm/include/kvm/virtio-rng.h
8176  create mode 100644 tools/kvm/include/kvm/virtio.h
8177  create mode 100644 tools/kvm/include/kvm/vnc.h
8178  create mode 100644 tools/kvm/include/linux/bitops.h
8179  create mode 100644 tools/kvm/include/linux/byteorder.h
8180  create mode 100644 tools/kvm/include/linux/kernel.h
8181  create mode 100644 tools/kvm/include/linux/module.h
8182  create mode 100644 tools/kvm/include/linux/prefetch.h
8183  create mode 100644 tools/kvm/include/linux/types.h
8184  create mode 100644 tools/kvm/interrupt.c
8185  create mode 100644 tools/kvm/ioeventfd.c
8186  create mode 100644 tools/kvm/ioport.c
8187  create mode 100644 tools/kvm/irq.c
8188  create mode 100644 tools/kvm/kvm-cmd.c
8189  create mode 100644 tools/kvm/kvm-cpu.c
8190  create mode 100644 tools/kvm/kvm-ipc.c
8191  create mode 100644 tools/kvm/kvm.c
8192  create mode 100644 tools/kvm/main.c
8193  create mode 100644 tools/kvm/mmio.c
8194  create mode 100644 tools/kvm/mptable.c
8195  create mode 100644 tools/kvm/net/uip/arp.c
8196  create mode 100644 tools/kvm/net/uip/buf.c
8197  create mode 100644 tools/kvm/net/uip/core.c
8198  create mode 100644 tools/kvm/net/uip/csum.c
8199  create mode 100644 tools/kvm/net/uip/dhcp.c
8200  create mode 100644 tools/kvm/net/uip/icmp.c
8201  create mode 100644 tools/kvm/net/uip/ipv4.c
8202  create mode 100644 tools/kvm/net/uip/tcp.c
8203  create mode 100644 tools/kvm/net/uip/udp.c
8204  create mode 100644 tools/kvm/pci.c
8205  create mode 100644 tools/kvm/read-write.c
8206  create mode 100644 tools/kvm/symbol.c
8207  create mode 100644 tools/kvm/term.c
8208  create mode 100644 tools/kvm/tests/Makefile
8209  create mode 100644 tools/kvm/tests/boot/Makefile
8210  create mode 100644 tools/kvm/tests/boot/init.c
8211  create mode 100644 tools/kvm/tests/kernel/.gitignore
8212  create mode 100644 tools/kvm/tests/kernel/Makefile
8213  create mode 100644 tools/kvm/tests/kernel/README
8214  create mode 100644 tools/kvm/tests/kernel/kernel.S
8215  create mode 100644 tools/kvm/tests/pit/.gitignore
8216  create mode 100644 tools/kvm/tests/pit/Makefile
8217  create mode 100644 tools/kvm/tests/pit/README
8218  create mode 100644 tools/kvm/tests/pit/tick.S
8219  create mode 100644 tools/kvm/threadpool.c
8220  create mode 100644 tools/kvm/ui/sdl.c
8221  create mode 100644 tools/kvm/ui/vnc.c
8222  create mode 100644 tools/kvm/util.c
8223  create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
8224  create mode 100755 tools/kvm/util/generate-cmdlist.sh
8225  create mode 100755 tools/kvm/util/kvm-ifup-vbr0
8226  create mode 100644 tools/kvm/util/parse-options.c
8227  create mode 100644 tools/kvm/util/rbtree-interval.c
8228  create mode 100755 tools/kvm/util/set_private_br.sh
8229  create mode 100644 tools/kvm/util/strbuf.c
8230  create mode 100644 tools/kvm/virtio/9p-pdu.c
8231  create mode 100644 tools/kvm/virtio/9p.c
8232  create mode 100644 tools/kvm/virtio/balloon.c
8233  create mode 100644 tools/kvm/virtio/blk.c
8234  create mode 100644 tools/kvm/virtio/console.c
8235  create mode 100644 tools/kvm/virtio/core.c
8236  create mode 100644 tools/kvm/virtio/net.c
8237  create mode 100644 tools/kvm/virtio/pci.c
8238  create mode 100644 tools/kvm/virtio/rng.c
8239 Merging scsi-post-merge/merge-base:master ()
8240 $ git clone -s -l -n -q . ../rebase-tmp
8241 $ cd ../rebase-tmp
8242 $ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm
8243 From ../next
8244  * [new branch]      quilt/akpm -> akpm
8245 $ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base
8246 From ../next
8247  * [new branch]      quilt/akpm-base -> akpm-base
8248 $ git checkout akpm
8249 Switched to branch 'akpm'
8250 $ git rebase --onto master akpm-base
8251 First, rewinding head to replay your work on top of it...
8252 Applying: drm: fix kconfig unmet dependency warning
8253 Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
8254 Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
8255 Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
8256 Applying: x86: fix mmap random address range
8257 Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map
8258 Applying: vrtc: change its year offset from 1960 to 1972
8259 Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms
8260 Applying: mrst: battery fixes
8261 Applying: drivers/power/intel_mid_battery.c: fix build
8262 Applying: x86,mrst: add mapping for bma023
8263 Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
8264 Applying: arch/x86/kernel/ptrace.c: quiet sparse noise
8265 Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static
8266 Applying: x86: tlb flush avoid superflous leave_mm()
8267 Applying: x86: reduce clock calibration time during slave cpu startup
8268 Applying: x86-reduce-clock-calibration-time-during-slave-cpu-startup-fix
8269 Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
8270 Applying: arm, exec: remove redundant set_fs(USER_DS)
8271 Applying: audit: always follow va_copy() with va_end()
8272 Applying: btrfs: don't dereference extent_mapping if NULL
8273 Applying: ceph/mds_client.c: quiet sparse noise
8274 Applying: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
8275 Applying: devtmpfsd: fix task state handling
8276 Applying: drivers/gpu/vga/vgaarb.c: add missing kfree
8277 Applying: drm: avoid switching to text console if there is no panic timeout
8278 Applying: hrtimers: Special-case zero length sleeps
8279 Applying: ia64, exec: remove redundant set_fs(USER_DS)
8280 Applying: brlocks/lglocks: clean up code
8281 Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes
8282 Applying: ipc/mqueue: cleanup definition names and locations
8283 Applying: ipc/mqueue: switch back to using non-max values on create
8284 Applying: ipc/mqueue: enforce hard limits
8285 Applying: ipc/mqueue: update maximums for the mqueue subsystem
8286 Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-fix
8287 Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes
8288 Applying: unicore32, exec: remove redundant set_fs(USER_DS)
8289 Applying: drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
8290 Applying: debugobjects: extend debugobjects to assert that an object is initialized
8291 Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers
8292 Applying: ext4: use proper little-endian bitops
8293 Applying: ocfs2: avoid unaligned access to dqc_bitmap
8294 Applying: parisc, exec: remove redundant set_fs(USER_DS)
8295 Applying: drivers/firmware/dmi_scan.c: make dmi_name_in_vendors more focused
8296 Applying: scsi: fix a header to include linux/types.h
8297 Applying: drivers/scsi/megaraid.c: fix sparse warnings
8298 Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()
8299 Applying: drivers/scsi/osd/osd_uld.c: use ida_simple_get() to handle id
8300 Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user()
8301 Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
8302 Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements
8303 Applying: loop: prevent information leak after failed read
8304 Applying: loop: cleanup set_status interface
8305 Applying: loop-cleanup-set_status-interface-checkpatch-fixes
8306 Applying: cciss: auto engage SCSI mid layer at driver load time
8307 Applying: block: avoid unnecessary plug list flush
8308 Applying: block: add missed trace_block_plug
8309 Applying: include/linux/bio.h: use a static inline function for bio_integrity_clone()
8310 Applying: bio: change some signed vars to unsigned
8311 Applying: paride: fix potential information leak in pg_read()
8312 Applying: slab: add taint flag outputting to debug paths.
8313 Applying: slub: add taint flag outputting to debug paths
8314 Applying: drivers/tty/serial/pch_uart.c: add console support
8315 Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
8316 Applying: vmscan: fix initial shrinker size handling
8317 Applying: vmscan: use atomic-long for shrinker batching
8318 Applying: vmscan-use-atomic-long-for-shrinker-batching-fix
8319 Applying: vmscan: promote shared file mapped pages
8320 Applying: vmscan: activate executable pages after first usage
8321 Applying: mm: add free_hot_cold_page_list() helper
8322 Applying: mm: fix page-faults detection in swap-token logic
8323 Applying: mm: add extra free kbytes tunable
8324 Applying: mm-add-extra-free-kbytes-tunable-update
8325 Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
8326 Applying: mm: add vm_area_add_early()
8327 Applying: selinuxfs: remove custom hex_to_bin()
8328 Applying: include/linux/security.h: fix security_inode_init_security() arg
8329 Applying: hpet: factor timer allocate from open
8330 Applying: intel_idle: fix API misuse
8331 Applying: intel_idle: disable auto_demotion for hotplugged CPUs
8332 Applying: poll: add poll_requested_events() function
8333 Applying: lib/crc: add slice by 8 algorithm to crc32.c
8334 Applying: lib-crc-add-slice-by-8-algorithm-to-crc32c-fix
8335 Applying: epoll: limit paths
8336 Applying: init/do_mounts_rd.c: fix ramdisk identification for padded cramfs
8337 Applying: oprofilefs: handle zero-length writes
8338 Applying: cgroups: add res_counter_write_u64() API
8339 Applying: cgroups: new resource counter inheritance API
8340 Applying: cgroups: add previous cgroup in can_attach_task/attach_task callbacks
8341 Applying: cgroups: new cancel_attach_task() subsystem callback
8342 Applying: cgroups: ability to stop res charge propagation on bounded ancestor
8343 Applying: cgroups: add res counter common ancestor searching
8344 Applying: res_counter: allow charge failure pointer to be null
8345 Applying: cgroups: pull up res counter charge failure interpretation to caller
8346 Applying: cgroups: allow subsystems to cancel a fork
8347 Applying: cgroups: add a task counter subsystem
8348 Applying: cgroups: ERR_PTR needs err.h
8349 Applying: proc: force dcache drop on unauthorized access
8350 Applying: ipc/sem.c: alternatives to preempt_disable()
8351 Applying: fs/direct-io.c: salcuate fs_count correctly in get_more_blocks()
8352 Applying: vfs: cache request_queue in struct block_device
8353 Applying: dio: optimize cache misses in the submission path
8354 Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes
8355 Applying: dio: using prefetch requires including prefetch.h
8356 Applying: ramoops: update parameters only after successful init
8357 $ cd ../next
8358 $ git fetch -f ../rebase-tmp akpm:akpm
8359 From ../rebase-tmp
8360  + 43a4cab...11a2f1f akpm       -> akpm  (forced update)
8361 $ rm -rf ../rebase-tmp
8362 Merging akpm (11a2f1f ramoops: update parameters only after successful init)
8363 $ git merge --no-ff akpm
8364 Merge made by the 'recursive' strategy.
8365  Documentation/DocBook/debugobjects.tmpl         |   50 +++
8366  Documentation/blockdev/cciss.txt                |   14 +-
8367  Documentation/cgroups/cgroups.txt               |   13 +-
8368  Documentation/cgroups/resource_counter.txt      |   20 ++-
8369  Documentation/cgroups/task_counter.txt          |  153 ++++++++++
8370  Documentation/sysctl/vm.txt                     |   16 +
8371  arch/arm/include/asm/processor.h                |    1 -
8372  arch/arm/mach-ux500/mbox-db5500.c               |    2 +-
8373  arch/ia64/include/asm/processor.h               |    1 -
8374  arch/parisc/include/asm/processor.h             |    2 -
8375  arch/parisc/kernel/process.c                    |    1 -
8376  arch/unicore32/include/asm/processor.h          |    1 -
8377  arch/x86/include/asm/mrst.h                     |    9 +
8378  arch/x86/kernel/e820.c                          |   59 ++---
8379  arch/x86/kernel/ptrace.c                        |    3 +-
8380  arch/x86/kernel/rtc.c                           |    5 +
8381  arch/x86/kernel/smpboot.c                       |   16 +-
8382  arch/x86/kernel/tsc.c                           |   20 ++
8383  arch/x86/mm/mmap.c                              |    4 +-
8384  arch/x86/mm/pageattr.c                          |    2 +-
8385  arch/x86/mm/tlb.c                               |   16 +-
8386  arch/x86/platform/iris/iris.c                   |   67 ++++-
8387  arch/x86/platform/mrst/mrst.c                   |    1 +
8388  arch/x86/platform/mrst/vrtc.c                   |    4 +-
8389  block/blk-cgroup.c                              |   12 +-
8390  block/blk-core.c                                |   18 +-
8391  drivers/base/devtmpfs.c                         |    3 +-
8392  drivers/block/cciss.c                           |    1 +
8393  drivers/block/cciss_scsi.c                      |    1 +
8394  drivers/block/loop.c                            |   47 ++-
8395  drivers/block/paride/pg.c                       |    1 +
8396  drivers/char/hpet.c                             |   56 +++-
8397  drivers/char/ramoops.c                          |   17 +-
8398  drivers/edac/mpc85xx_edac.c                     |    2 +-
8399  drivers/firmware/dmi_scan.c                     |    6 +-
8400  drivers/gpu/drm/Kconfig                         |    1 +
8401  drivers/gpu/drm/drm_fb_helper.c                 |    7 +
8402  drivers/gpu/vga/vgaarb.c                        |   18 +-
8403  drivers/idle/intel_idle.c                       |   59 +++--
8404  drivers/message/fusion/mptbase.c                |    7 +-
8405  drivers/message/fusion/mptbase.h                |    1 +
8406  drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h |    2 -
8407  drivers/oprofile/oprofilefs.c                   |    5 +-
8408  drivers/platform/x86/acerhdf.c                  |    1 +
8409  drivers/power/intel_mid_battery.c               |   12 +-
8410  drivers/rtc/rtc-mrst.c                          |   19 +-
8411  drivers/scsi/aacraid/commctrl.c                 |    1 +
8412  drivers/scsi/megaraid.c                         |    8 +-
8413  drivers/scsi/mpt2sas/mpt2sas_base.c             |    3 +-
8414  drivers/scsi/osd/osd_uld.c                      |   22 +-
8415  drivers/scsi/sg.c                               |   25 +-
8416  drivers/tty/serial/Kconfig                      |    9 +
8417  drivers/tty/serial/pch_uart.c                   |  160 ++++++++++-
8418  fs/bio.c                                        |    7 +-
8419  fs/block_dev.c                                  |    3 +
8420  fs/btrfs/inode.c                                |    3 +-
8421  fs/ceph/mds_client.c                            |    4 +-
8422  fs/dcache.c                                     |   10 +-
8423  fs/direct-io.c                                  |   56 +++-
8424  fs/eventpoll.c                                  |  245 +++++++++++++--
8425  fs/ext4/ext4.h                                  |    7 +-
8426  fs/ext4/ialloc.c                                |    4 +-
8427  fs/file_table.c                                 |   23 +-
8428  fs/internal.h                                   |    3 +-
8429  fs/namei.c                                      |   26 +-
8430  fs/namespace.c                                  |  124 ++++----
8431  fs/ocfs2/ocfs2.h                                |   47 +++
8432  fs/ocfs2/quota_local.c                          |   10 +-
8433  fs/pnode.c                                      |    4 +-
8434  fs/proc/base.c                                  |   42 +---
8435  fs/select.c                                     |   38 +--
8436  include/linux/bio.h                             |   10 +-
8437  include/linux/cgroup.h                          |   28 ++-
8438  include/linux/cgroup_subsys.h                   |    8 +
8439  include/linux/debugobjects.h                    |    6 +
8440  include/linux/eventpoll.h                       |    1 +
8441  include/linux/fs.h                              |    5 +-
8442  include/linux/gfp.h                             |    1 +
8443  include/linux/hpet.h                            |    1 +
8444  include/linux/ipc_namespace.h                   |   40 +++-
8445  include/linux/lglock.h                          |  152 ++--------
8446  include/linux/mm.h                              |    1 +
8447  include/linux/mm_types.h                        |    1 +
8448  include/linux/mmzone.h                          |    2 +-
8449  include/linux/poll.h                            |    7 +-
8450  include/linux/res_counter.h                     |   27 ++-
8451  include/linux/security.h                        |    2 +-
8452  include/linux/shrinker.h                        |    2 +-
8453  include/linux/swap.h                            |   36 +++
8454  include/linux/vmalloc.h                         |    1 +
8455  include/linux/writeback.h                       |    2 -
8456  include/scsi/scsi_netlink.h                     |    2 +-
8457  init/Kconfig                                    |    9 +
8458  init/calibrate.c                                |   15 +
8459  init/do_mounts_rd.c                             |   14 +
8460  ipc/mq_sysctl.c                                 |   31 +--
8461  ipc/mqueue.c                                    |   24 +-
8462  ipc/sem.c                                       |  250 +++++++++++-----
8463  kernel/Makefile                                 |    3 +-
8464  kernel/audit.c                                  |    5 +-
8465  kernel/cgroup.c                                 |   58 +++-
8466  kernel/cgroup_freezer.c                         |    9 +-
8467  kernel/cgroup_task_counter.c                    |  239 +++++++++++++++
8468  kernel/cpuset.c                                 |    6 +-
8469  kernel/events/core.c                            |    5 +-
8470  kernel/exit.c                                   |    2 +-
8471  kernel/fork.c                                   |    8 +-
8472  kernel/hrtimer.c                                |    8 +
8473  kernel/lglock.c                                 |  101 ++++++
8474  kernel/res_counter.c                            |   97 +++++-
8475  kernel/sched.c                                  |    6 +-
8476  kernel/sysctl.c                                 |   11 +-
8477  kernel/timer.c                                  |   54 +++-
8478  lib/crc32.c                                     |  370 ++++++++++++++++-------
8479  lib/crc32defs.h                                 |   16 +-
8480  lib/debugobjects.c                              |   33 ++
8481  lib/gen_crc32table.c                            |   59 +++--
8482  mm/memory.c                                     |   13 +
8483  mm/page-writeback.c                             |  122 ++++----
8484  mm/page_alloc.c                                 |   49 +++-
8485  mm/rmap.c                                       |    3 +-
8486  mm/slab.c                                       |    9 +-
8487  mm/slub.c                                       |    2 +-
8488  mm/swap.c                                       |   14 +-
8489  mm/vmalloc.c                                    |   28 ++-
8490  mm/vmscan.c                                     |   54 ++--
8491  net/netfilter/nf_conntrack_netlink.c            |    5 +
8492  security/selinux/selinuxfs.c                    |   14 +-
8493  128 files changed, 2729 insertions(+), 1012 deletions(-)
8494  create mode 100644 Documentation/cgroups/task_counter.txt
8495  create mode 100644 kernel/cgroup_task_counter.c
8496  create mode 100644 kernel/lglock.c