Next/merge.log

   1 $ date
   2 Wed Oct  5 12:01:54 EST 2011
   3 $ git checkout master
   4 Already on 'master'
   5 $ git reset --hard stable
   6 HEAD is now at 0f86267 Merge branch 'hwmon-for-linus' of git://github.com/groeck/linux
   7 Merging origin/master
   8 $ git merge origin/master
   9 Updating 0f86267..a8062e4
  10 Fast-forward
  11  drivers/gpu/drm/radeon/atombios_dp.c       |   16 +++--
  12  drivers/gpu/drm/radeon/evergreen.c         |   44 -------------
  13  drivers/gpu/drm/radeon/ni.c                |   32 ----------
  14  drivers/gpu/drm/radeon/radeon_connectors.c |    8 +-
  15  drivers/gpu/drm/radeon/radeon_cursor.c     |   40 ++++++------
  16  drivers/gpu/drm/radeon/rv770.c             |   51 ---------------
  17  drivers/misc/lis3lv02d/lis3lv02d.c         |   14 +++--
  18  drivers/pci/pci.c                          |    6 ++-
  19  drivers/pci/probe.c                        |   14 ++++-
  20  drivers/spi/spi-topcliff-pch.c             |   93 ++++++++++++++++++++--------
  21  include/linux/pci.h                        |    3 +-
  22  sound/soc/codecs/wm8753.c                  |    4 +-
  23  sound/soc/omap/mcpdm.c                     |    2 +-
  24  sound/soc/omap/mcpdm.h                     |    2 +-
  25  sound/soc/pxa/zylonite.c                   |    8 +-
  26  15 files changed, 135 insertions(+), 202 deletions(-)
  27 Merging fixes/fixes
  28 $ git merge fixes/fixes
  29 Already up-to-date.
  30 Merging kbuild-current/rc-fixes
  31 $ git merge kbuild-current/rc-fixes
  32 Already up-to-date.
  33 Merging arm-current/fixes
  34 $ git merge arm-current/fixes
  35 Merge made by recursive.
  36  arch/arm/configs/integrator_defconfig |   19 +++++++++++++++----
  37  arch/arm/mm/init.c                    |    7 +++++++
  38  2 files changed, 22 insertions(+), 4 deletions(-)
  39 Merging m68k-current/for-linus
  40 $ git merge m68k-current/for-linus
  41 Already up-to-date.
  42 Merging powerpc-merge/merge
  43 $ git merge powerpc-merge/merge
  44 Already up-to-date.
  45 Merging 52xx-and-virtex-current/powerpc/merge
  46 $ git merge 52xx-and-virtex-current/powerpc/merge
  47 Already up-to-date.
  48 Merging sparc-current/master
  49 $ git merge sparc-current/master
  50 Already up-to-date.
  51 Merging scsi-rc-fixes/master
  52 $ git merge scsi-rc-fixes/master
  53 Merge made by recursive.
  54  drivers/scsi/libsas/sas_expander.c |   10 ++++++----
  55  drivers/scsi/qla2xxx/qla_os.c      |    9 +++++----
  56  2 files changed, 11 insertions(+), 8 deletions(-)
  57 Merging net-current/master
  58 $ git merge net-current/master
  59 Merge made by recursive.
  60  Documentation/networking/ip-sysctl.txt |    4 +-
  61  MAINTAINERS                            |    1 -
  62  drivers/net/bonding/bond_3ad.c         |    3 +-
  63  drivers/net/bonding/bond_alb.c         |    3 +-
  64  drivers/net/bonding/bond_main.c        |   13 ++++---
  65  drivers/net/cxgb4/cxgb4_main.c         |    3 ++
  66  drivers/net/ibmveth.c                  |    4 +-
  67  drivers/net/pch_gbe/pch_gbe_main.c     |   56 +++++++++++++++----------------
  68  drivers/net/phy/dp83640.c              |    4 +-
  69  drivers/net/xen-netback/interface.c    |    4 +-
  70  include/linux/ptp_classify.h           |   13 ++++++--
  71  net/can/bcm.c                          |   53 +++++++++++++----------------
  72  net/ipv6/tcp_ipv6.c                    |    3 ++
  73  net/packet/af_packet.c                 |    5 ++-
  74  net/rds/iw_rdma.c                      |   13 +++++--
  75  15 files changed, 100 insertions(+), 82 deletions(-)
  76 Merging sound-current/for-linus
  77 $ git merge sound-current/for-linus
  78 Already up-to-date.
  79 Merging pci-current/for-linus
  80 $ git merge pci-current/for-linus
  81 Merge made by recursive.
  82  drivers/pci/hotplug/shpchp_core.c |    4 ++--
  83  drivers/pci/hotplug/shpchp_hpc.c  |    4 ++--
  84  2 files changed, 4 insertions(+), 4 deletions(-)
  85 Merging wireless-current/master
  86 $ git merge wireless-current/master
  87 Already up-to-date.
  88 Merging driver-core.current/driver-core-linus
  89 $ git merge driver-core.current/driver-core-linus
  90 Already up-to-date.
  91 Merging tty.current/tty-linus
  92 $ git merge tty.current/tty-linus
  93 Already up-to-date.
  94 Merging usb.current/usb-linus
  95 $ git merge usb.current/usb-linus
  96 Already up-to-date.
  97 Merging staging.current/staging-linus
  98 $ git merge staging.current/staging-linus
  99 Already up-to-date.
 100 Merging cpufreq-current/fixes
 101 $ git merge cpufreq-current/fixes
 102 Already up-to-date.
 103 Merging input-current/for-linus
 104 $ git merge input-current/for-linus
 105 Already up-to-date.
 106 Merging md-current/for-linus
 107 $ git merge md-current/for-linus
 108 Already up-to-date.
 109 Merging audit-current/for-linus
 110 $ git merge audit-current/for-linus
 111 Already up-to-date.
 112 Merging crypto-current/master
 113 $ git merge crypto-current/master
 114 Already up-to-date.
 115 Merging ide-curent/master
 116 $ git merge ide-curent/master
 117 Already up-to-date.
 118 Merging dwmw2/master
 119 $ git merge dwmw2/master
 120 Already up-to-date.
 121 Merging sh-current/sh-fixes-for-linus
 122 $ git merge sh-current/sh-fixes-for-linus
 123 Already up-to-date.
 124 Merging rmobile-current/rmobile-fixes-for-linus
 125 $ git merge rmobile-current/rmobile-fixes-for-linus
 126 Already up-to-date.
 127 Merging devicetree-current/devicetree/merge
 128 $ git merge devicetree-current/devicetree/merge
 129 Already up-to-date.
 130 Merging spi-current/spi/merge
 131 $ git merge spi-current/spi/merge
 132 Already up-to-date.
 133 Merging arm/for-next
 134 $ git merge arm/for-next
 135 Removing arch/arm/include/asm/auxvec.h
 136 Removing arch/arm/include/asm/bitsperlong.h
 137 Removing arch/arm/include/asm/cputime.h
 138 Removing arch/arm/include/asm/emergency-restart.h
 139 Removing arch/arm/include/asm/errno.h
 140 Removing arch/arm/include/asm/ioctl.h
 141 Removing arch/arm/include/asm/irq_regs.h
 142 Removing arch/arm/include/asm/kdebug.h
 143 Removing arch/arm/include/asm/local.h
 144 Removing arch/arm/include/asm/local64.h
 145 Removing arch/arm/include/asm/percpu.h
 146 Removing arch/arm/include/asm/poll.h
 147 Removing arch/arm/include/asm/resource.h
 148 Removing arch/arm/include/asm/sections.h
 149 Removing arch/arm/include/asm/siginfo.h
 150 Removing arch/arm/include/asm/sizes.h
 151 Auto-merging arch/arm/mach-ixp2000/include/mach/gpio-ixp2000.h
 152 Auto-merging arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h
 153 Removing arch/arm/mach-sa1100/leds-simpad.c
 154 Auto-merging arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
 155 Auto-merging drivers/gpio/gpio-davinci.c
 156 Auto-merging drivers/gpio/gpio-ks8695.c
 157 Auto-merging drivers/gpio/gpio-lpc32xx.c
 158 Auto-merging drivers/gpio/gpio-sa1100.c
 159 Merge made by recursive.
 160  Documentation/devicetree/bindings/arm/l2cc.txt     |   44 +
 161  arch/arm/Kconfig                                   |   79 +-
 162  arch/arm/Kconfig.debug                             |   87 +-
 163  arch/arm/Makefile                                  |    3 +
 164  arch/arm/boot/Makefile                             |    9 +
 165  arch/arm/boot/compressed/.gitignore                |    9 +
 166  arch/arm/boot/compressed/Makefile                  |   40 +-
 167  arch/arm/boot/compressed/atags_to_fdt.c            |   97 ++
 168  arch/arm/boot/compressed/head.S                    |  121 ++-
 169  arch/arm/boot/compressed/libfdt_env.h              |   15 +
 170  arch/arm/boot/compressed/misc.c                    |   42 +-
 171  arch/arm/boot/compressed/string.c                  |  127 ++
 172  arch/arm/boot/compressed/vmlinux.lds.in            |    4 +
 173  arch/arm/common/gic.c                              |  205 +++-
 174  arch/arm/common/sa1111.c                           |    9 +-
 175  arch/arm/common/scoop.c                            |    2 +-
 176  arch/arm/common/timer-sp.c                         |    9 +
 177  arch/arm/include/asm/Kbuild                        |   17 +
 178  arch/arm/include/asm/auxvec.h                      |    4 -
 179  arch/arm/include/asm/bitsperlong.h                 |    1 -
 180  arch/arm/include/asm/bug.h                         |   55 +-
 181  arch/arm/include/asm/cachetype.h                   |    5 +-
 182  arch/arm/include/asm/cputime.h                     |    6 -
 183  arch/arm/include/asm/cputype.h                     |    6 +
 184  arch/arm/include/asm/dma-mapping.h                 |    9 +-
 185  arch/arm/include/asm/ecard.h                       |    1 -
 186  arch/arm/include/asm/emergency-restart.h           |    6 -
 187  arch/arm/include/asm/errno.h                       |    6 -
 188  arch/arm/include/asm/gpio.h                        |   19 +
 189  arch/arm/include/asm/hardware/cache-l2x0.h         |   17 +
 190  arch/arm/include/asm/hardware/gic.h                |    8 +
 191  arch/arm/include/asm/hardware/iop3xx-gpio.h        |    2 +
 192  arch/arm/include/asm/hw_breakpoint.h               |    2 +
 193  arch/arm/include/asm/io.h                          |   21 +
 194  arch/arm/include/asm/ioctl.h                       |    1 -
 195  arch/arm/include/asm/irq_regs.h                    |    1 -
 196  arch/arm/include/asm/kdebug.h                      |    1 -
 197  arch/arm/include/asm/local.h                       |    1 -
 198  arch/arm/include/asm/local64.h                     |    1 -
 199  arch/arm/include/asm/mach/arch.h                   |    5 +-
 200  arch/arm/include/asm/mach/map.h                    |    1 +
 201  arch/arm/include/asm/memory.h                      |   16 -
 202  arch/arm/include/asm/module.h                      |    4 -
 203  arch/arm/include/asm/page.h                        |   42 +-
 204  arch/arm/include/asm/percpu.h                      |    6 -
 205  arch/arm/include/asm/pgalloc.h                     |    6 +-
 206  arch/arm/include/asm/pgtable-2level-hwdef.h        |   93 ++
 207  arch/arm/include/asm/pgtable-2level-types.h        |   67 +
 208  arch/arm/include/asm/pgtable-2level.h              |  143 ++
 209  arch/arm/include/asm/pgtable-hwdef.h               |   77 +-
 210  arch/arm/include/asm/pgtable.h                     |  167 +--
 211  arch/arm/include/asm/pmu.h                         |   93 +-
 212  arch/arm/include/asm/poll.h                        |    1 -
 213  arch/arm/include/asm/proc-fns.h                    |    8 +
 214  arch/arm/include/asm/resource.h                    |    6 -
 215  arch/arm/include/asm/sections.h                    |    1 -
 216  arch/arm/include/asm/siginfo.h                     |    6 -
 217  arch/arm/include/asm/sizes.h                       |   21 -
 218  arch/arm/include/asm/smp.h                         |    6 +
 219  arch/arm/include/asm/suspend.h                     |   17 +-
 220  arch/arm/include/asm/system.h                      |    4 +-
 221  arch/arm/include/asm/tlb.h                         |    1 +
 222  arch/arm/include/asm/tlbflush.h                    |    4 +-
 223  arch/arm/include/asm/topology.h                    |   33 +
 224  arch/arm/kernel/Makefile                           |   10 +-
 225  arch/arm/kernel/armksyms.c                         |    3 -
 226  arch/arm/kernel/ecard.c                            |   36 +-
 227  arch/arm/kernel/entry-armv.S                       |   44 +-
 228  arch/arm/kernel/head.S                             |  135 +-
 229  arch/arm/kernel/hw_breakpoint.c                    |  270 ++--
 230  arch/arm/kernel/kprobes-arm.c                      |    4 +
 231  arch/arm/kernel/kprobes-test-arm.c                 | 1323 +++++++++++++++
 232  arch/arm/kernel/kprobes-test-thumb.c               | 1187 +++++++++++++
 233  arch/arm/kernel/kprobes-test.c                     | 1748 ++++++++++++++++++++
 234  arch/arm/kernel/kprobes-test.h                     |  392 +++++
 235  arch/arm/kernel/kprobes-thumb.c                    |    7 +
 236  arch/arm/kernel/kprobes.h                          |    8 +
 237  arch/arm/kernel/machine_kexec.c                    |   35 +-
 238  arch/arm/kernel/module.c                           |    2 +-
 239  arch/arm/kernel/perf_event.c                       |  475 +++---
 240  arch/arm/kernel/perf_event_v6.c                    |   87 +-
 241  arch/arm/kernel/perf_event_v7.c                    |  395 +++---
 242  arch/arm/kernel/perf_event_xscale.c                |   90 +-
 243  arch/arm/kernel/pmu.c                              |  182 +--
 244  arch/arm/kernel/process.c                          |    2 +-
 245  arch/arm/kernel/setup.c                            |   58 +-
 246  arch/arm/kernel/sleep.S                            |   85 +-
 247  arch/arm/kernel/smp.c                              |   20 +
 248  arch/arm/kernel/smp_scu.c                          |    2 +-
 249  arch/arm/kernel/suspend.c                          |   72 +
 250  arch/arm/kernel/topology.c                         |  148 ++
 251  arch/arm/kernel/traps.c                            |   31 +-
 252  arch/arm/kernel/vmlinux.lds.S                      |    3 +-
 253  arch/arm/lib/backtrace.S                           |    6 -
 254  arch/arm/mach-at91/Makefile.boot                   |    6 +-
 255  arch/arm/mach-at91/at91cap9_devices.c              |    2 +-
 256  arch/arm/mach-at91/at91rm9200_devices.c            |    2 +-
 257  arch/arm/mach-at91/at91sam9260_devices.c           |    2 +-
 258  arch/arm/mach-at91/at91sam9261_devices.c           |    2 +-
 259  arch/arm/mach-at91/at91sam9263_devices.c           |    2 +-
 260  arch/arm/mach-at91/at91sam9g45.c                   |    2 +
 261  arch/arm/mach-at91/at91sam9g45_devices.c           |    2 +-
 262  arch/arm/mach-at91/at91sam9rl_devices.c            |    2 +-
 263  arch/arm/mach-at91/board-1arm.c                    |    2 +-
 264  arch/arm/mach-at91/board-afeb-9260v1.c             |    2 +-
 265  arch/arm/mach-at91/board-cam60.c                   |    2 +-
 266  arch/arm/mach-at91/board-cap9adk.c                 |    2 +-
 267  arch/arm/mach-at91/board-carmeva.c                 |    2 +-
 268  arch/arm/mach-at91/board-cpu9krea.c                |    2 +-
 269  arch/arm/mach-at91/board-cpuat91.c                 |    2 +-
 270  arch/arm/mach-at91/board-csb337.c                  |    2 +-
 271  arch/arm/mach-at91/board-csb637.c                  |    2 +-
 272  arch/arm/mach-at91/board-eb9200.c                  |    2 +-
 273  arch/arm/mach-at91/board-ecbat91.c                 |    2 +-
 274  arch/arm/mach-at91/board-kafa.c                    |    2 +-
 275  arch/arm/mach-at91/board-kb9202.c                  |    2 +-
 276  arch/arm/mach-at91/board-neocore926.c              |    2 +-
 277  arch/arm/mach-at91/board-picotux200.c              |    2 +-
 278  arch/arm/mach-at91/board-qil-a9260.c               |    2 +-
 279  arch/arm/mach-at91/board-rm9200dk.c                |    2 +-
 280  arch/arm/mach-at91/board-rm9200ek.c                |    2 +-
 281  arch/arm/mach-at91/board-sam9-l9260.c              |    2 +-
 282  arch/arm/mach-at91/board-sam9260ek.c               |    2 +-
 283  arch/arm/mach-at91/board-sam9261ek.c               |    2 +-
 284  arch/arm/mach-at91/board-sam9263ek.c               |    2 +-
 285  arch/arm/mach-at91/board-sam9g20ek.c               |    2 +-
 286  arch/arm/mach-at91/board-sam9m10g45ek.c            |    2 +-
 287  arch/arm/mach-at91/board-sam9rlek.c                |    2 +-
 288  arch/arm/mach-at91/board-usb-a9260.c               |    2 +-
 289  arch/arm/mach-at91/board-usb-a9263.c               |    2 +-
 290  arch/arm/mach-at91/board-yl-9200.c                 |    2 +-
 291  arch/arm/mach-at91/gpio.c                          |    4 +-
 292  arch/arm/mach-at91/include/mach/at91sam9g45.h      |    2 -
 293  arch/arm/mach-at91/include/mach/gpio.h             |    5 -
 294  arch/arm/mach-at91/leds.c                          |    2 +-
 295  arch/arm/mach-at91/pm.c                            |    2 +-
 296  arch/arm/mach-bcmring/Makefile.boot                |    2 +-
 297  arch/arm/mach-bcmring/arch.c                       |    4 +-
 298  arch/arm/mach-bcmring/include/mach/memory.h        |    5 -
 299  arch/arm/mach-bcmring/mm.c                         |    3 +
 300  arch/arm/mach-clps711x/Makefile.boot               |    2 +-
 301  arch/arm/mach-clps711x/autcpu12.c                  |    2 +-
 302  arch/arm/mach-clps711x/cdb89712.c                  |    2 +-
 303  arch/arm/mach-clps711x/ceiva.c                     |    2 +-
 304  arch/arm/mach-clps711x/clep7312.c                  |    5 +-
 305  arch/arm/mach-clps711x/edb7211-arch.c              |    5 +-
 306  arch/arm/mach-clps711x/fortunet.c                  |    4 +-
 307  arch/arm/mach-clps711x/p720t.c                     |    5 +-
 308  arch/arm/mach-cns3xxx/Makefile.boot                |    2 +-
 309  arch/arm/mach-cns3xxx/cns3420vb.c                  |    2 +-
 310  arch/arm/mach-davinci/Makefile                     |    3 +-
 311  arch/arm/mach-davinci/Makefile.boot                |    4 +-
 312  arch/arm/mach-davinci/board-da830-evm.c            |    2 +-
 313  arch/arm/mach-davinci/board-da850-evm.c            |    2 +-
 314  arch/arm/mach-davinci/board-dm355-evm.c            |    2 +-
 315  arch/arm/mach-davinci/board-dm355-leopard.c        |    2 +-
 316  arch/arm/mach-davinci/board-dm365-evm.c            |    2 +-
 317  arch/arm/mach-davinci/board-dm644x-evm.c           |    2 +-
 318  arch/arm/mach-davinci/board-dm646x-evm.c           |    4 +-
 319  arch/arm/mach-davinci/board-mityomapl138.c         |    2 +-
 320  arch/arm/mach-davinci/board-neuros-osd2.c          |    2 +-
 321  arch/arm/mach-davinci/board-omapl138-hawk.c        |    2 +-
 322  arch/arm/mach-davinci/board-sffsdr.c               |    2 +-
 323  arch/arm/mach-davinci/board-tnetv107x-evm.c        |    2 +-
 324  arch/arm/mach-davinci/common.c                     |    3 +
 325  arch/arm/mach-davinci/da830.c                      |    3 +-
 326  arch/arm/mach-davinci/da850.c                      |    3 +-
 327  arch/arm/mach-davinci/dm355.c                      |    2 +-
 328  arch/arm/mach-davinci/dm365.c                      |    3 +-
 329  arch/arm/mach-davinci/dm644x.c                     |    2 +-
 330  arch/arm/mach-davinci/dm646x.c                     |    2 +-
 331  arch/arm/mach-davinci/include/mach/gpio-davinci.h  |   91 +
 332  arch/arm/mach-davinci/include/mach/gpio.h          |   79 +-
 333  arch/arm/mach-davinci/include/mach/memory.h        |    5 -
 334  arch/arm/mach-davinci/tnetv107x.c                  |    3 +-
 335  arch/arm/mach-dove/Makefile.boot                   |    2 +-
 336  arch/arm/mach-dove/cm-a510.c                       |    2 +-
 337  arch/arm/mach-dove/dove-db-setup.c                 |    2 +-
 338  arch/arm/mach-ebsa110/Makefile.boot                |    2 +-
 339  arch/arm/mach-ebsa110/core.c                       |    2 +-
 340  arch/arm/mach-ebsa110/include/mach/io.h            |    2 -
 341  arch/arm/mach-ep93xx/Makefile.boot                 |   10 +-
 342  arch/arm/mach-ep93xx/adssphere.c                   |    2 +-
 343  arch/arm/mach-ep93xx/edb93xx.c                     |   16 +-
 344  arch/arm/mach-ep93xx/gesbc9312.c                   |    2 +-
 345  arch/arm/mach-ep93xx/include/mach/gpio.h           |   17 +-
 346  arch/arm/mach-ep93xx/micro9.c                      |    8 +-
 347  arch/arm/mach-ep93xx/simone.c                      |    4 +-
 348  arch/arm/mach-ep93xx/snappercl15.c                 |    2 +-
 349  arch/arm/mach-ep93xx/ts72xx.c                      |    2 +-
 350  arch/arm/mach-exynos4/Makefile.boot                |    2 +-
 351  arch/arm/mach-exynos4/include/mach/gpio.h          |    7 -
 352  arch/arm/mach-exynos4/mach-armlex4210.c            |    2 +-
 353  arch/arm/mach-exynos4/mach-nuri.c                  |    2 +-
 354  arch/arm/mach-exynos4/mach-smdkc210.c              |    2 +-
 355  arch/arm/mach-exynos4/mach-smdkv310.c              |    2 +-
 356  arch/arm/mach-exynos4/mach-universal_c210.c        |    2 +-
 357  arch/arm/mach-footbridge/Kconfig                   |    4 +-
 358  arch/arm/mach-footbridge/Makefile.boot             |    2 +-
 359  arch/arm/mach-footbridge/cats-hw.c                 |    5 +-
 360  arch/arm/mach-footbridge/ebsa285.c                 |    2 +-
 361  arch/arm/mach-footbridge/include/mach/io.h         |    2 -
 362  arch/arm/mach-footbridge/netwinder-hw.c            |    5 +-
 363  arch/arm/mach-footbridge/personal.c                |    2 +-
 364  arch/arm/mach-gemini/Makefile.boot                 |    4 +-
 365  arch/arm/mach-gemini/board-nas4220b.c              |    2 +-
 366  arch/arm/mach-gemini/board-rut1xx.c                |    2 +-
 367  arch/arm/mach-gemini/board-wbd111.c                |    2 +-
 368  arch/arm/mach-gemini/board-wbd222.c                |    2 +-
 369  arch/arm/mach-gemini/include/mach/gpio.h           |    5 -
 370  arch/arm/mach-h720x/Makefile.boot                  |    2 +-
 371  arch/arm/mach-h720x/h7201-eval.c                   |    2 +-
 372  arch/arm/mach-h720x/h7202-eval.c                   |    2 +-
 373  arch/arm/mach-imx/Makefile.boot                    |   10 +-
 374  arch/arm/mach-imx/iomux-imx31.c                    |    3 +-
 375  arch/arm/mach-imx/mach-armadillo5x0.c              |    2 +-
 376  arch/arm/mach-imx/mach-cpuimx27.c                  |    2 +-
 377  arch/arm/mach-imx/mach-cpuimx35.c                  |    2 +-
 378  arch/arm/mach-imx/mach-eukrea_cpuimx25.c           |    2 +-
 379  arch/arm/mach-imx/mach-imx27_visstrim_m10.c        |    2 +-
 380  arch/arm/mach-imx/mach-imx27ipcam.c                |    2 +-
 381  arch/arm/mach-imx/mach-imx27lite.c                 |    2 +-
 382  arch/arm/mach-imx/mach-kzm_arm11_01.c              |    2 +-
 383  arch/arm/mach-imx/mach-mx1ads.c                    |    4 +-
 384  arch/arm/mach-imx/mach-mx21ads.c                   |    2 +-
 385  arch/arm/mach-imx/mach-mx25_3ds.c                  |    2 +-
 386  arch/arm/mach-imx/mach-mx27_3ds.c                  |    2 +-
 387  arch/arm/mach-imx/mach-mx27ads.c                   |    5 +-
 388  arch/arm/mach-imx/mach-mx31_3ds.c                  |    2 +-
 389  arch/arm/mach-imx/mach-mx31ads.c                   |    2 +-
 390  arch/arm/mach-imx/mach-mx31lilly.c                 |    2 +-
 391  arch/arm/mach-imx/mach-mx31lite.c                  |    2 +-
 392  arch/arm/mach-imx/mach-mx31moboard.c               |    2 +-
 393  arch/arm/mach-imx/mach-mx35_3ds.c                  |    2 +-
 394  arch/arm/mach-imx/mach-mxt_td60.c                  |    2 +-
 395  arch/arm/mach-imx/mach-pca100.c                    |    2 +-
 396  arch/arm/mach-imx/mach-pcm037.c                    |    2 +-
 397  arch/arm/mach-imx/mach-pcm038.c                    |    2 +-
 398  arch/arm/mach-imx/mach-pcm043.c                    |    2 +-
 399  arch/arm/mach-imx/mach-qong.c                      |    2 +-
 400  arch/arm/mach-imx/mach-scb9328.c                   |    2 +-
 401  arch/arm/mach-integrator/Makefile.boot             |    2 +-
 402  arch/arm/mach-integrator/core.c                    |    4 +
 403  arch/arm/mach-integrator/include/mach/io.h         |    2 -
 404  arch/arm/mach-integrator/include/mach/platform.h   |   12 -
 405  arch/arm/mach-integrator/integrator_ap.c           |   88 +-
 406  arch/arm/mach-integrator/integrator_cp.c           |    2 +-
 407  arch/arm/mach-iop13xx/Makefile.boot                |    2 +-
 408  arch/arm/mach-iop13xx/iq81340mc.c                  |    2 +-
 409  arch/arm/mach-iop13xx/iq81340sc.c                  |    2 +-
 410  arch/arm/mach-iop32x/Makefile.boot                 |    2 +-
 411  arch/arm/mach-iop32x/em7210.c                      |    2 +-
 412  arch/arm/mach-iop32x/glantank.c                    |    2 +-
 413  arch/arm/mach-iop32x/iq31244.c                     |    4 +-
 414  arch/arm/mach-iop32x/iq80321.c                     |    2 +-
 415  arch/arm/mach-iop32x/n2100.c                       |    2 +-
 416  arch/arm/mach-iop33x/Makefile.boot                 |    2 +-
 417  arch/arm/mach-iop33x/iq80331.c                     |    2 +-
 418  arch/arm/mach-iop33x/iq80332.c                     |    2 +-
 419  arch/arm/mach-ixp2000/Makefile.boot                |    2 +-
 420  arch/arm/mach-ixp2000/core.c                       |    4 +-
 421  arch/arm/mach-ixp2000/enp2611.c                    |    2 +-
 422  .../include/mach/{gpio.h => gpio-ixp2000.h}        |    4 +-
 423  arch/arm/mach-ixp2000/ixdp2400.c                   |    2 +-
 424  arch/arm/mach-ixp2000/ixdp2800.c                   |    2 +-
 425  arch/arm/mach-ixp2000/ixdp2x00.c                   |    4 +-
 426  arch/arm/mach-ixp2000/ixdp2x01.c                   |    6 +-
 427  arch/arm/mach-ixp23xx/Makefile.boot                |    2 +-
 428  arch/arm/mach-ixp23xx/espresso.c                   |    2 +-
 429  arch/arm/mach-ixp23xx/ixdp2351.c                   |    2 +-
 430  arch/arm/mach-ixp23xx/roadrunner.c                 |    2 +-
 431  arch/arm/mach-ixp4xx/Makefile.boot                 |    2 +-
 432  arch/arm/mach-ixp4xx/avila-setup.c                 |    4 +-
 433  arch/arm/mach-ixp4xx/common-pci.c                  |    3 +-
 434  arch/arm/mach-ixp4xx/coyote-setup.c                |    4 +-
 435  arch/arm/mach-ixp4xx/dsmg600-setup.c               |    5 +-
 436  arch/arm/mach-ixp4xx/fsg-setup.c                   |    5 +-
 437  arch/arm/mach-ixp4xx/gateway7001-setup.c           |    2 +-
 438  arch/arm/mach-ixp4xx/goramo_mlr.c                  |    2 +-
 439  arch/arm/mach-ixp4xx/gtwx5715-setup.c              |    2 +-
 440  arch/arm/mach-ixp4xx/include/mach/gpio.h           |    3 +
 441  arch/arm/mach-ixp4xx/include/mach/io.h             |    2 -
 442  arch/arm/mach-ixp4xx/ixdp425-setup.c               |    8 +-
 443  arch/arm/mach-ixp4xx/nas100d-setup.c               |    5 +-
 444  arch/arm/mach-ixp4xx/nslu2-setup.c                 |    5 +-
 445  arch/arm/mach-ixp4xx/vulcan-setup.c                |    2 +-
 446  arch/arm/mach-ixp4xx/wg302v2-setup.c               |    2 +-
 447  arch/arm/mach-kirkwood/Makefile.boot               |    2 +-
 448  arch/arm/mach-kirkwood/d2net_v2-setup.c            |    2 +-
 449  arch/arm/mach-kirkwood/db88f6281-bp-setup.c        |    2 +-
 450  arch/arm/mach-kirkwood/dockstar-setup.c            |    2 +-
 451  arch/arm/mach-kirkwood/guruplug-setup.c            |    2 +-
 452  arch/arm/mach-kirkwood/irq.c                       |    3 +-
 453  arch/arm/mach-kirkwood/mpp.c                       |    3 +-
 454  arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c     |    2 +-
 455  arch/arm/mach-kirkwood/netspace_v2-setup.c         |    6 +-
 456  arch/arm/mach-kirkwood/netxbig_v2-setup.c          |    4 +-
 457  arch/arm/mach-kirkwood/openrd-setup.c              |    6 +-
 458  arch/arm/mach-kirkwood/rd88f6192-nas-setup.c       |    2 +-
 459  arch/arm/mach-kirkwood/rd88f6281-setup.c           |    2 +-
 460  arch/arm/mach-kirkwood/sheevaplug-setup.c          |    4 +-
 461  arch/arm/mach-kirkwood/t5325-setup.c               |    2 +-
 462  arch/arm/mach-kirkwood/ts219-setup.c               |    2 +-
 463  arch/arm/mach-kirkwood/ts41x-setup.c               |    2 +-
 464  arch/arm/mach-ks8695/Makefile                      |    2 +-
 465  arch/arm/mach-ks8695/Makefile.boot                 |    2 +-
 466  arch/arm/mach-ks8695/board-acs5k.c                 |    6 +-
 467  arch/arm/mach-ks8695/board-dsm320.c                |    6 +-
 468  arch/arm/mach-ks8695/board-micrel.c                |    6 +-
 469  arch/arm/mach-ks8695/devices.c                     |    1 +
 470  arch/arm/mach-ks8695/include/mach/gpio-ks8695.h    |   39 +
 471  arch/arm/mach-ks8695/include/mach/gpio.h           |   38 -
 472  arch/arm/mach-ks8695/leds.c                        |    4 +-
 473  arch/arm/mach-lpc32xx/Makefile                     |    2 +-
 474  arch/arm/mach-lpc32xx/Makefile.boot                |    2 +-
 475  arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h  |   50 +
 476  arch/arm/mach-lpc32xx/include/mach/gpio.h          |   74 -
 477  arch/arm/mach-lpc32xx/phy3250.c                    |    3 +-
 478  arch/arm/mach-mmp/Makefile.boot                    |    2 +-
 479  arch/arm/mach-mmp/aspenite.c                       |    5 +-
 480  arch/arm/mach-mmp/mmp2.c                           |    3 +-
 481  arch/arm/mach-mmp/pxa168.c                         |    3 +-
 482  arch/arm/mach-mmp/pxa910.c                         |    3 +-
 483  arch/arm/mach-mmp/tavorevb.c                       |    3 +-
 484  arch/arm/mach-mmp/ttc_dkb.c                        |    2 +-
 485  arch/arm/mach-msm/Makefile.boot                    |    2 +-
 486  arch/arm/mach-msm/board-halibut.c                  |    6 +-
 487  arch/arm/mach-msm/board-mahimahi.c                 |    6 +-
 488  arch/arm/mach-msm/board-msm7x27.c                  |   11 +-
 489  arch/arm/mach-msm/board-msm7x30.c                  |   31 +-
 490  arch/arm/mach-msm/board-msm8960.c                  |   22 +
 491  arch/arm/mach-msm/board-msm8x60.c                  |   25 +
 492  arch/arm/mach-msm/board-qsd8x50.c                  |    7 +-
 493  arch/arm/mach-msm/board-sapphire.c                 |    9 +-
 494  arch/arm/mach-msm/board-trout-mmc.c                |    3 +-
 495  arch/arm/mach-msm/board-trout-panel.c              |    3 +-
 496  arch/arm/mach-msm/board-trout.c                    |    6 +-
 497  arch/arm/mach-msm/include/mach/gpio.h              |   27 +-
 498  arch/arm/mach-msm/include/mach/memory.h            |    6 +-
 499  arch/arm/mach-mv78xx0/Makefile.boot                |    2 +-
 500  arch/arm/mach-mv78xx0/buffalo-wxl-setup.c          |    2 +-
 501  arch/arm/mach-mv78xx0/db78x00-bp-setup.c           |    2 +-
 502  arch/arm/mach-mv78xx0/irq.c                        |    3 +-
 503  arch/arm/mach-mv78xx0/mpp.c                        |    3 +-
 504  arch/arm/mach-mv78xx0/rd78x00-masa-setup.c         |    2 +-
 505  arch/arm/mach-mx5/Makefile.boot                    |    6 +-
 506  arch/arm/mach-mx5/board-cpuimx51.c                 |    2 +-
 507  arch/arm/mach-mx5/board-cpuimx51sd.c               |    2 +-
 508  arch/arm/mach-mx5/board-mx51_3ds.c                 |    2 +-
 509  arch/arm/mach-mx5/board-mx51_babbage.c             |    2 +-
 510  arch/arm/mach-mx5/board-mx51_efikamx.c             |    2 +-
 511  arch/arm/mach-mx5/board-mx51_efikasb.c             |    2 +-
 512  arch/arm/mach-mxs/Makefile.boot                    |    2 +-
 513  arch/arm/mach-mxs/include/mach/gpio.h              |    8 -
 514  arch/arm/mach-netx/Makefile.boot                   |    2 +-
 515  arch/arm/mach-netx/nxdb500.c                       |    2 +-
 516  arch/arm/mach-netx/nxdkn.c                         |    2 +-
 517  arch/arm/mach-netx/nxeb500hmi.c                    |    2 +-
 518  arch/arm/mach-nomadik/Makefile.boot                |    2 +-
 519  arch/arm/mach-nomadik/board-nhk8815.c              |    3 +-
 520  arch/arm/mach-nomadik/cpu-8815.c                   |    2 +-
 521  arch/arm/mach-nomadik/i2c-8815nhk.c                |    2 +-
 522  arch/arm/mach-nomadik/include/mach/gpio.h          |    2 -
 523  arch/arm/mach-nuc93x/Makefile.boot                 |    2 +-
 524  arch/arm/mach-nuc93x/mach-nuc932evb.c              |    1 -
 525  arch/arm/mach-omap1/Makefile.boot                  |    2 +-
 526  arch/arm/mach-omap1/board-ams-delta.c              |    5 +-
 527  arch/arm/mach-omap1/board-fsample.c                |    5 +-
 528  arch/arm/mach-omap1/board-generic.c                |    5 +-
 529  arch/arm/mach-omap1/board-h2-mmc.c                 |    3 +-
 530  arch/arm/mach-omap1/board-h2.c                     |    5 +-
 531  arch/arm/mach-omap1/board-h3-mmc.c                 |    3 +-
 532  arch/arm/mach-omap1/board-h3.c                     |    5 +-
 533  arch/arm/mach-omap1/board-htcherald.c              |    3 +-
 534  arch/arm/mach-omap1/board-innovator.c              |    5 +-
 535  arch/arm/mach-omap1/board-nokia770.c               |    5 +-
 536  arch/arm/mach-omap1/board-osk.c                    |    5 +-
 537  arch/arm/mach-omap1/board-palmte.c                 |    5 +-
 538  arch/arm/mach-omap1/board-palmtt.c                 |    4 +-
 539  arch/arm/mach-omap1/board-palmz71.c                |    4 +-
 540  arch/arm/mach-omap1/board-perseus2.c               |    5 +-
 541  arch/arm/mach-omap1/board-sx1-mmc.c                |    2 +-
 542  arch/arm/mach-omap1/board-sx1.c                    |    5 +-
 543  arch/arm/mach-omap1/board-voiceblue.c              |    4 +-
 544  arch/arm/mach-omap1/devices.c                      |    2 +-
 545  arch/arm/mach-omap1/fpga.c                         |    2 +-
 546  arch/arm/mach-omap1/io.c                           |    1 +
 547  arch/arm/mach-omap1/irq.c                          |    3 +-
 548  arch/arm/mach-omap1/leds-h2p2-debug.c              |    2 +-
 549  arch/arm/mach-omap1/leds-osk.c                     |    3 +-
 550  arch/arm/mach-omap1/leds.c                         |    2 +-
 551  arch/arm/mach-omap1/serial.c                       |    3 +-
 552  arch/arm/mach-omap2/Makefile.boot                  |    2 +-
 553  arch/arm/mach-omap2/board-2430sdp.c                |    2 +-
 554  arch/arm/mach-omap2/board-3430sdp.c                |    2 +-
 555  arch/arm/mach-omap2/board-3630sdp.c                |    2 +-
 556  arch/arm/mach-omap2/board-4430sdp.c                |    2 +-
 557  arch/arm/mach-omap2/board-am3517crane.c            |    2 +-
 558  arch/arm/mach-omap2/board-am3517evm.c              |    2 +-
 559  arch/arm/mach-omap2/board-apollon.c                |    2 +-
 560  arch/arm/mach-omap2/board-cm-t35.c                 |    4 +-
 561  arch/arm/mach-omap2/board-cm-t3517.c               |    2 +-
 562  arch/arm/mach-omap2/board-devkit8000.c             |    2 +-
 563  arch/arm/mach-omap2/board-generic.c                |    5 +-
 564  arch/arm/mach-omap2/board-h4.c                     |    5 +-
 565  arch/arm/mach-omap2/board-igep0020.c               |    4 +-
 566  arch/arm/mach-omap2/board-ldp.c                    |    5 +-
 567  arch/arm/mach-omap2/board-n8x0.c                   |    6 +-
 568  arch/arm/mach-omap2/board-omap3beagle.c            |    2 +-
 569  arch/arm/mach-omap2/board-omap3evm.c               |    2 +-
 570  arch/arm/mach-omap2/board-omap3logic.c             |    4 +-
 571  arch/arm/mach-omap2/board-omap3pandora.c           |    2 +-
 572  arch/arm/mach-omap2/board-omap3stalker.c           |    2 +-
 573  arch/arm/mach-omap2/board-omap3touchbook.c         |    2 +-
 574  arch/arm/mach-omap2/board-omap4panda.c             |    2 +-
 575  arch/arm/mach-omap2/board-overo.c                  |    2 +-
 576  arch/arm/mach-omap2/board-rm680.c                  |    2 +-
 577  arch/arm/mach-omap2/board-rx51.c                   |    2 +-
 578  arch/arm/mach-omap2/board-ti8168evm.c              |    2 +-
 579  arch/arm/mach-omap2/board-zoom.c                   |    4 +-
 580  arch/arm/mach-omap2/devices.c                      |    3 +-
 581  arch/arm/mach-omap2/io.c                           |    2 +-
 582  arch/arm/mach-orion5x/Makefile.boot                |    2 +-
 583  arch/arm/mach-orion5x/common.c                     |    4 +-
 584  arch/arm/mach-orion5x/common.h                     |    4 +-
 585  arch/arm/mach-orion5x/d2net-setup.c                |    4 +-
 586  arch/arm/mach-orion5x/db88f5281-setup.c            |    5 +-
 587  arch/arm/mach-orion5x/dns323-setup.c               |    5 +-
 588  arch/arm/mach-orion5x/edmini_v2-setup.c            |    2 +-
 589  arch/arm/mach-orion5x/irq.c                        |    3 +-
 590  arch/arm/mach-orion5x/kurobox_pro-setup.c          |    7 +-
 591  arch/arm/mach-orion5x/ls-chl-setup.c               |    2 +-
 592  arch/arm/mach-orion5x/ls_hgl-setup.c               |    2 +-
 593  arch/arm/mach-orion5x/lsmini-setup.c               |    2 +-
 594  arch/arm/mach-orion5x/mss2-setup.c                 |    2 +-
 595  arch/arm/mach-orion5x/mv2120-setup.c               |    5 +-
 596  arch/arm/mach-orion5x/net2big-setup.c              |    2 +-
 597  arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c       |    5 +-
 598  arch/arm/mach-orion5x/rd88f5181l-ge-setup.c        |    5 +-
 599  arch/arm/mach-orion5x/rd88f5182-setup.c            |    5 +-
 600  arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c       |    5 +-
 601  arch/arm/mach-orion5x/terastation_pro2-setup.c     |    5 +-
 602  arch/arm/mach-orion5x/ts209-setup.c                |    5 +-
 603  arch/arm/mach-orion5x/ts409-setup.c                |    5 +-
 604  arch/arm/mach-orion5x/ts78xx-setup.c               |    2 +-
 605  arch/arm/mach-orion5x/wnr854t-setup.c              |    5 +-
 606  arch/arm/mach-orion5x/wrt350n-v2-setup.c           |    5 +-
 607  arch/arm/mach-pnx4008/Makefile.boot                |    2 +-
 608  arch/arm/mach-pnx4008/core.c                       |    2 +-
 609  arch/arm/mach-pnx4008/gpio.c                       |    3 +-
 610  .../include/mach/{gpio.h => gpio-pnx4008.h}        |    2 +-
 611  arch/arm/mach-pnx4008/serial.c                     |    3 +-
 612  arch/arm/mach-prima2/Makefile.boot                 |    2 +-
 613  arch/arm/mach-prima2/prima2.c                      |    2 +-
 614  arch/arm/mach-pxa/Makefile.boot                    |    2 +-
 615  arch/arm/mach-pxa/balloon3.c                       |    2 +-
 616  arch/arm/mach-pxa/capc7117.c                       |    2 +-
 617  arch/arm/mach-pxa/cm-x2xx.c                        |    2 +-
 618  arch/arm/mach-pxa/cm-x300.c                        |    6 +-
 619  arch/arm/mach-pxa/colibri-pxa270.c                 |    4 +-
 620  arch/arm/mach-pxa/colibri-pxa300.c                 |    2 +-
 621  arch/arm/mach-pxa/colibri-pxa320.c                 |    2 +-
 622  arch/arm/mach-pxa/corgi.c                          |    4 +-
 623  arch/arm/mach-pxa/csb726.c                         |    2 +-
 624  arch/arm/mach-pxa/em-x270.c                        |    4 +-
 625  arch/arm/mach-pxa/eseries.c                        |   15 +-
 626  arch/arm/mach-pxa/eseries.h                        |    3 +-
 627  arch/arm/mach-pxa/ezx.c                            |   12 +-
 628  arch/arm/mach-pxa/generic.c                        |    2 +-
 629  arch/arm/mach-pxa/gumstix.c                        |    2 +-
 630  arch/arm/mach-pxa/h5000.c                          |    2 +-
 631  arch/arm/mach-pxa/himalaya.c                       |    2 +-
 632  arch/arm/mach-pxa/hx4700.c                         |    2 +-
 633  arch/arm/mach-pxa/icontrol.c                       |    2 +-
 634  arch/arm/mach-pxa/include/mach/littleton.h         |    2 +-
 635  arch/arm/mach-pxa/irq.c                            |    3 +-
 636  arch/arm/mach-pxa/littleton.c                      |    2 +-
 637  arch/arm/mach-pxa/lpd270.c                         |    5 +-
 638  arch/arm/mach-pxa/lubbock.c                        |    2 +-
 639  arch/arm/mach-pxa/magician.c                       |    2 +-
 640  arch/arm/mach-pxa/mainstone.c                      |    5 +-
 641  arch/arm/mach-pxa/mfp-pxa2xx.c                     |    3 +-
 642  arch/arm/mach-pxa/mioa701.c                        |    2 +-
 643  arch/arm/mach-pxa/mp900.c                          |    2 +-
 644  arch/arm/mach-pxa/palmld.c                         |    2 +-
 645  arch/arm/mach-pxa/palmt5.c                         |    2 +-
 646  arch/arm/mach-pxa/palmtc.c                         |    2 +-
 647  arch/arm/mach-pxa/palmte2.c                        |    2 +-
 648  arch/arm/mach-pxa/palmtreo.c                       |    4 +-
 649  arch/arm/mach-pxa/palmtx.c                         |    2 +-
 650  arch/arm/mach-pxa/palmz72.c                        |    2 +-
 651  arch/arm/mach-pxa/pcm027.c                         |    2 +-
 652  arch/arm/mach-pxa/pcm990-baseboard.c               |    3 +-
 653  arch/arm/mach-pxa/poodle.c                         |    4 +-
 654  arch/arm/mach-pxa/pxa25x.c                         |    2 +-
 655  arch/arm/mach-pxa/pxa27x.c                         |    2 +-
 656  arch/arm/mach-pxa/pxa3xx.c                         |    3 +-
 657  arch/arm/mach-pxa/pxa95x.c                         |    3 +-
 658  arch/arm/mach-pxa/raumfeld.c                       |    6 +-
 659  arch/arm/mach-pxa/saar.c                           |    4 +-
 660  arch/arm/mach-pxa/saarb.c                          |    5 +-
 661  arch/arm/mach-pxa/spitz.c                          |    4 +-
 662  arch/arm/mach-pxa/stargate2.c                      |    4 +-
 663  arch/arm/mach-pxa/tavorevb.c                       |    2 +-
 664  arch/arm/mach-pxa/tavorevb3.c                      |    2 +-
 665  arch/arm/mach-pxa/tosa.c                           |    4 +-
 666  arch/arm/mach-pxa/trizeps4.c                       |    4 +-
 667  arch/arm/mach-pxa/viper.c                          |    2 +-
 668  arch/arm/mach-pxa/vpac270.c                        |    2 +-
 669  arch/arm/mach-pxa/xcep.c                           |    2 +-
 670  arch/arm/mach-pxa/z2.c                             |    2 +-
 671  arch/arm/mach-pxa/zeus.c                           |    2 +-
 672  arch/arm/mach-pxa/zylonite.c                       |    2 +-
 673  arch/arm/mach-realview/Makefile.boot               |    4 +-
 674  arch/arm/mach-realview/core.c                      |    3 +-
 675  arch/arm/mach-realview/core.h                      |    4 +-
 676  arch/arm/mach-realview/include/mach/gpio.h         |    7 +-
 677  arch/arm/mach-realview/realview_eb.c               |    2 +-
 678  arch/arm/mach-realview/realview_pb1176.c           |    5 +-
 679  arch/arm/mach-realview/realview_pb11mp.c           |    2 +-
 680  arch/arm/mach-realview/realview_pba8.c             |    2 +-
 681  arch/arm/mach-realview/realview_pbx.c              |    8 +-
 682  arch/arm/mach-rpc/Makefile.boot                    |    2 +-
 683  arch/arm/mach-rpc/include/mach/hardware.h          |   25 +-
 684  arch/arm/mach-rpc/include/mach/io.h                |  193 +---
 685  arch/arm/mach-rpc/riscpc.c                         |    4 +-
 686  arch/arm/mach-s3c2410/Makefile.boot                |    4 +-
 687  arch/arm/mach-s3c2410/include/mach/gpio.h          |    6 -
 688  arch/arm/mach-s3c2410/include/mach/h1940-latch.h   |    2 +-
 689  arch/arm/mach-s3c2410/include/mach/io.h            |    2 -
 690  arch/arm/mach-s3c2410/mach-amlm5900.c              |    2 +-
 691  arch/arm/mach-s3c2410/mach-bast.c                  |    2 +-
 692  arch/arm/mach-s3c2410/mach-h1940.c                 |    2 +-
 693  arch/arm/mach-s3c2410/mach-n30.c                   |    4 +-
 694  arch/arm/mach-s3c2410/mach-otom.c                  |    2 +-
 695  arch/arm/mach-s3c2410/mach-qt2410.c                |    2 +-
 696  arch/arm/mach-s3c2410/mach-smdk2410.c              |    2 +-
 697  arch/arm/mach-s3c2410/mach-tct_hammer.c            |    2 +-
 698  arch/arm/mach-s3c2410/mach-vr1000.c                |    2 +-
 699  arch/arm/mach-s3c2412/mach-jive.c                  |    2 +-
 700  arch/arm/mach-s3c2412/mach-smdk2413.c              |    9 +-
 701  arch/arm/mach-s3c2412/mach-vstms.c                 |    7 +-
 702  arch/arm/mach-s3c2416/mach-smdk2416.c              |    2 +-
 703  arch/arm/mach-s3c2440/mach-anubis.c                |    2 +-
 704  arch/arm/mach-s3c2440/mach-at2440evb.c             |    2 +-
 705  arch/arm/mach-s3c2440/mach-gta02.c                 |    2 +-
 706  arch/arm/mach-s3c2440/mach-mini2440.c              |    2 +-
 707  arch/arm/mach-s3c2440/mach-nexcoder.c              |    2 +-
 708  arch/arm/mach-s3c2440/mach-osiris.c                |    2 +-
 709  arch/arm/mach-s3c2440/mach-rx1950.c                |    2 +-
 710  arch/arm/mach-s3c2440/mach-rx3715.c                |    2 +-
 711  arch/arm/mach-s3c2440/mach-smdk2440.c              |    2 +-
 712  arch/arm/mach-s3c2443/mach-smdk2443.c              |    2 +-
 713  arch/arm/mach-s3c64xx/Makefile.boot                |    2 +-
 714  arch/arm/mach-s3c64xx/cpu.c                        |    2 +
 715  arch/arm/mach-s3c64xx/include/mach/gpio.h          |    7 -
 716  arch/arm/mach-s3c64xx/include/mach/memory.h        |    2 -
 717  arch/arm/mach-s3c64xx/mach-anw6410.c               |    2 +-
 718  arch/arm/mach-s3c64xx/mach-crag6410.c              |    2 +-
 719  arch/arm/mach-s3c64xx/mach-hmt.c                   |    2 +-
 720  arch/arm/mach-s3c64xx/mach-mini6410.c              |    2 +-
 721  arch/arm/mach-s3c64xx/mach-ncp.c                   |    2 +-
 722  arch/arm/mach-s3c64xx/mach-real6410.c              |    2 +-
 723  arch/arm/mach-s3c64xx/mach-smartq5.c               |    2 +-
 724  arch/arm/mach-s3c64xx/mach-smartq7.c               |    2 +-
 725  arch/arm/mach-s3c64xx/mach-smdk6400.c              |    2 +-
 726  arch/arm/mach-s3c64xx/mach-smdk6410.c              |    2 +-
 727  arch/arm/mach-s5p64x0/Makefile.boot                |    2 +-
 728  arch/arm/mach-s5p64x0/cpu.c                        |    3 +
 729  arch/arm/mach-s5p64x0/include/mach/gpio.h          |    7 -
 730  arch/arm/mach-s5p64x0/include/mach/memory.h        |    1 -
 731  arch/arm/mach-s5p64x0/mach-smdk6440.c              |    2 +-
 732  arch/arm/mach-s5p64x0/mach-smdk6450.c              |    2 +-
 733  arch/arm/mach-s5pc100/Makefile.boot                |    2 +-
 734  arch/arm/mach-s5pc100/include/mach/gpio.h          |    7 -
 735  arch/arm/mach-s5pc100/mach-smdkc100.c              |    2 +-
 736  arch/arm/mach-s5pv210/Makefile.boot                |    2 +-
 737  arch/arm/mach-s5pv210/cpu.c                        |    2 +
 738  arch/arm/mach-s5pv210/include/mach/gpio.h          |    7 -
 739  arch/arm/mach-s5pv210/include/mach/memory.h        |    1 -
 740  arch/arm/mach-s5pv210/mach-aquila.c                |    2 +-
 741  arch/arm/mach-s5pv210/mach-goni.c                  |    2 +-
 742  arch/arm/mach-s5pv210/mach-smdkc110.c              |    2 +-
 743  arch/arm/mach-s5pv210/mach-smdkv210.c              |    2 +-
 744  arch/arm/mach-s5pv210/mach-torbreck.c              |    2 +-
 745  arch/arm/mach-sa1100/Makefile                      |    3 +-
 746  arch/arm/mach-sa1100/Makefile.boot                 |    5 +-
 747  arch/arm/mach-sa1100/assabet.c                     |    5 +-
 748  arch/arm/mach-sa1100/badge4.c                      |    2 +-
 749  arch/arm/mach-sa1100/generic.c                     |    2 +-
 750  arch/arm/mach-sa1100/h3100.c                       |    2 +-
 751  arch/arm/mach-sa1100/h3600.c                       |    2 +-
 752  arch/arm/mach-sa1100/hackkit.c                     |    2 +-
 753  arch/arm/mach-sa1100/include/mach/gpio.h           |    4 +-
 754  arch/arm/mach-sa1100/include/mach/io.h             |    6 +-
 755  arch/arm/mach-sa1100/include/mach/simpad.h         |   94 +-
 756  arch/arm/mach-sa1100/jornada720.c                  |    2 +-
 757  arch/arm/mach-sa1100/lart.c                        |    2 +-
 758  arch/arm/mach-sa1100/leds-simpad.c                 |  100 --
 759  arch/arm/mach-sa1100/leds.c                        |    2 -
 760  arch/arm/mach-sa1100/leds.h                        |    1 -
 761  arch/arm/mach-sa1100/nanoengine.c                  |    2 +-
 762  arch/arm/mach-sa1100/shannon.c                     |    2 +-
 763  arch/arm/mach-sa1100/simpad.c                      |  215 +++-
 764  arch/arm/mach-shark/Makefile.boot                  |    2 +-
 765  arch/arm/mach-shark/core.c                         |    2 +-
 766  arch/arm/mach-shmobile/Makefile.boot               |    2 +-
 767  arch/arm/mach-shmobile/board-ag5evm.c              |    3 +
 768  arch/arm/mach-shmobile/board-ap4evb.c              |    3 +
 769  arch/arm/mach-shmobile/board-g3evm.c               |    3 +
 770  arch/arm/mach-shmobile/board-g4evm.c               |    3 +
 771  arch/arm/mach-shmobile/board-mackerel.c            |    3 +
 772  arch/arm/mach-shmobile/include/mach/gpio.h         |   24 +-
 773  arch/arm/mach-shmobile/include/mach/memory.h       |    3 -
 774  arch/arm/mach-spear3xx/Makefile.boot               |    2 +-
 775  arch/arm/mach-spear3xx/spear300_evb.c              |    2 +-
 776  arch/arm/mach-spear3xx/spear310_evb.c              |    2 +-
 777  arch/arm/mach-spear3xx/spear320_evb.c              |    2 +-
 778  arch/arm/mach-spear6xx/Makefile.boot               |    2 +-
 779  arch/arm/mach-spear6xx/spear600_evb.c              |    2 +-
 780  arch/arm/mach-tcc8k/Makefile.boot                  |    2 +-
 781  arch/arm/mach-tcc8k/board-tcc8000-sdk.c            |    2 +-
 782  arch/arm/mach-tegra/Makefile.boot                  |    2 +-
 783  arch/arm/mach-tegra/board-harmony-pcie.c           |   10 +-
 784  arch/arm/mach-tegra/board-harmony.c                |    6 +-
 785  arch/arm/mach-tegra/board-harmony.h                |    3 +
 786  arch/arm/mach-tegra/board-paz00.c                  |    6 +-
 787  arch/arm/mach-tegra/board-paz00.h                  |    2 +
 788  arch/arm/mach-tegra/board-seaboard.c               |    6 +-
 789  arch/arm/mach-tegra/board-seaboard.h               |    2 +
 790  arch/arm/mach-tegra/board-trimslice-pinmux.c       |    3 +-
 791  arch/arm/mach-tegra/board-trimslice.c              |    6 +-
 792  arch/arm/mach-tegra/board-trimslice.h              |    2 +
 793  arch/arm/mach-tegra/include/mach/gpio-tegra.h      |   39 +
 794  arch/arm/mach-tegra/include/mach/gpio.h            |   60 -
 795  arch/arm/mach-tegra/usb_phy.c                      |    1 +
 796  arch/arm/mach-u300/Kconfig                         |    1 +
 797  arch/arm/mach-u300/Makefile.boot                   |    4 +-
 798  arch/arm/mach-u300/core.c                          |   34 +-
 799  arch/arm/mach-u300/include/mach/gpio-u300.h        |  150 ++
 800  arch/arm/mach-u300/include/mach/gpio.h             |  294 ----
 801  arch/arm/mach-u300/include/mach/irqs.h             |   25 +-
 802  arch/arm/mach-u300/include/mach/memory.h           |   13 +-
 803  arch/arm/mach-u300/mmc.c                           |    2 +-
 804  arch/arm/mach-u300/u300.c                          |    2 +-
 805  arch/arm/mach-ux500/Makefile.boot                  |    2 +-
 806  arch/arm/mach-ux500/board-mop500-pins.c            |    2 +-
 807  arch/arm/mach-ux500/board-mop500-u8500uib.c        |    3 +-
 808  arch/arm/mach-ux500/board-mop500.c                 |    7 +-
 809  arch/arm/mach-ux500/board-u5500-sdi.c              |    2 +-
 810  arch/arm/mach-ux500/board-u5500.c                  |    4 +-
 811  arch/arm/mach-ux500/cpu-db5500.c                   |    2 +-
 812  arch/arm/mach-ux500/cpu-db8500.c                   |    2 +-
 813  arch/arm/mach-ux500/devices-common.c               |    2 +-
 814  arch/arm/mach-ux500/include/mach/gpio.h            |    2 -
 815  arch/arm/mach-versatile/Makefile.boot              |    2 +-
 816  arch/arm/mach-versatile/include/mach/gpio.h        |    7 +-
 817  arch/arm/mach-versatile/versatile_ab.c             |    2 +-
 818  arch/arm/mach-versatile/versatile_pb.c             |    2 +-
 819  arch/arm/mach-vexpress/Makefile.boot               |    2 +-
 820  arch/arm/mach-vexpress/hotplug.c                   |    9 +-
 821  arch/arm/mach-vexpress/include/mach/io.h           |    2 -
 822  arch/arm/mach-vexpress/v2m.c                       |    2 +-
 823  arch/arm/mach-vt8500/Makefile.boot                 |    2 +-
 824  arch/arm/mach-vt8500/bv07.c                        |    2 +-
 825  arch/arm/mach-vt8500/include/mach/gpio.h           |    7 +-
 826  arch/arm/mach-vt8500/include/mach/io.h             |    2 -
 827  arch/arm/mach-vt8500/wm8505_7in.c                  |    2 +-
 828  arch/arm/mach-w90x900/Makefile.boot                |    2 +-
 829  arch/arm/mach-w90x900/include/mach/gpio.h          |    6 +-
 830  arch/arm/mach-w90x900/mach-nuc910evb.c             |    1 -
 831  arch/arm/mach-w90x900/mach-nuc950evb.c             |    1 -
 832  arch/arm/mach-w90x900/mach-nuc960evb.c             |    1 -
 833  arch/arm/mach-zynq/Makefile.boot                   |    2 +-
 834  arch/arm/mm/cache-l2x0.c                           |  105 ++-
 835  arch/arm/mm/dma-mapping.c                          |   46 +-
 836  arch/arm/mm/init.c                                 |    9 -
 837  arch/arm/mm/mm.h                                   |    4 +-
 838  arch/arm/mm/mmu.c                                  |   26 +-
 839  arch/arm/mm/proc-arm920.S                          |   21 +-
 840  arch/arm/mm/proc-arm926.S                          |   21 +-
 841  arch/arm/mm/proc-sa1100.S                          |   25 +-
 842  arch/arm/mm/proc-v6.S                              |   44 +-
 843  arch/arm/mm/proc-v7.S                              |   50 +-
 844  arch/arm/mm/proc-xsc3.S                            |   28 +-
 845  arch/arm/mm/proc-xscale.S                          |   25 +-
 846  arch/arm/plat-mxc/include/mach/gpio.h              |    6 -
 847  arch/arm/plat-mxc/include/mach/memory.h            |   15 -
 848  .../include/plat/{gpio.h => gpio-nomadik.h}        |   17 +-
 849  arch/arm/plat-omap/debug-devices.c                 |    3 +-
 850  arch/arm/plat-omap/debug-leds.c                    |    3 +-
 851  arch/arm/plat-omap/devices.c                       |    3 +-
 852  arch/arm/plat-omap/include/plat/gpio.h             |   20 -
 853  arch/arm/plat-omap/include/plat/io.h               |    2 +
 854  arch/arm/plat-omap/include/plat/memory.h           |   13 -
 855  arch/arm/plat-omap/io.c                            |    8 +
 856  arch/arm/plat-orion/include/plat/gpio.h            |   10 +-
 857  arch/arm/plat-pxa/gpio.c                           |    4 +-
 858  arch/arm/plat-pxa/include/plat/gpio.h              |    2 +
 859  arch/arm/plat-spear/include/plat/gpio.h            |   25 +-
 860  arch/arm/vfp/vfpmodule.c                           |   31 +-
 861  drivers/amba/bus.c                                 |   68 +-
 862  drivers/ata/pata_at91.c                            |    2 +-
 863  drivers/gpio/Kconfig                               |    9 +
 864  drivers/gpio/Makefile                              |    6 +-
 865  .../gpio.c => drivers/gpio/gpio-davinci.c          |    7 +-
 866  drivers/gpio/gpio-ep93xx.c                         |   19 +-
 867  .../gpio.c => drivers/gpio/gpio-ks8695.c           |    4 +-
 868  .../gpiolib.c => drivers/gpio/gpio-lpc32xx.c       |    2 +-
 869  drivers/gpio/gpio-nomadik.c                        |    3 +-
 870  drivers/gpio/gpio-omap.c                           |    2 +-
 871  .../gpio.c => drivers/gpio/gpio-sa1100.c           |    4 +-
 872  drivers/gpio/gpio-tegra.c                          |   23 +-
 873  .../mach-davinci => drivers/gpio}/gpio-tnetv107x.c |    0
 874  drivers/gpio/gpio-u300.c                           | 1190 ++++++++------
 875  drivers/i2c/busses/i2c-ixp2000.c                   |    2 +-
 876  drivers/ide/at91_ide.c                             |    2 +-
 877  drivers/input/keyboard/omap-keypad.c               |    2 +-
 878  drivers/mfd/menelaus.c                             |    2 +-
 879  drivers/mmc/host/mmci.c                            |   21 +-
 880  drivers/mmc/host/omap.c                            |    2 +-
 881  drivers/mmc/host/sdhci-tegra.c                     |    4 +-
 882  drivers/mtd/nand/ams-delta.c                       |    2 +-
 883  drivers/mtd/onenand/omap2.c                        |    2 +-
 884  drivers/net/arm/at91_ether.c                       |    2 +-
 885  drivers/pcmcia/pxa2xx_vpac270.c                    |    2 +-
 886  drivers/pcmcia/sa1100_simpad.c                     |   35 +-
 887  drivers/spi/spi-atmel.c                            |    2 +-
 888  drivers/spi/spi-pl022.c                            |   92 +-
 889  drivers/tty/serial/amba-pl010.c                    |   14 +-
 890  drivers/tty/serial/amba-pl011.c                    |   14 +-
 891  drivers/tty/serial/atmel_serial.c                  |    2 +-
 892  drivers/usb/host/ohci-pnx4008.c                    |    2 +-
 893  drivers/usb/musb/davinci.c                         |    2 +-
 894  drivers/video/amba-clcd.c                          |    9 +-
 895  drivers/video/atmel_lcdfb.c                        |    2 +-
 896  drivers/video/omap/lcd_apollon.c                   |    2 +-
 897  drivers/video/omap/lcd_h3.c                        |    2 +-
 898  drivers/video/omap/lcd_inn1610.c                   |    2 +-
 899  drivers/video/omap/lcd_ldp.c                       |    2 +-
 900  drivers/video/omap/lcd_osk.c                       |    2 +-
 901  drivers/video/omap/lcd_overo.c                     |    2 +-
 902  drivers/video/omap/lcd_palmtt.c                    |    2 +-
 903  drivers/video/pnx4008/sdum.c                       |    2 +-
 904  include/linux/clk.h                                |   43 +
 905  include/linux/cpu_pm.h                             |  109 ++
 906  kernel/Makefile                                    |    1 +
 907  kernel/cpu_pm.c                                    |  233 +++
 908  kernel/events/core.c                               |    4 +-
 909  kernel/power/Kconfig                               |    4 +
 910  750 files changed, 10503 insertions(+), 4313 deletions(-)
 911  create mode 100644 Documentation/devicetree/bindings/arm/l2cc.txt
 912  create mode 100644 arch/arm/boot/compressed/atags_to_fdt.c
 913  create mode 100644 arch/arm/boot/compressed/libfdt_env.h
 914  create mode 100644 arch/arm/boot/compressed/string.c
 915  delete mode 100644 arch/arm/include/asm/auxvec.h
 916  delete mode 100644 arch/arm/include/asm/bitsperlong.h
 917  delete mode 100644 arch/arm/include/asm/cputime.h
 918  delete mode 100644 arch/arm/include/asm/emergency-restart.h
 919  delete mode 100644 arch/arm/include/asm/errno.h
 920  delete mode 100644 arch/arm/include/asm/ioctl.h
 921  delete mode 100644 arch/arm/include/asm/irq_regs.h
 922  delete mode 100644 arch/arm/include/asm/kdebug.h
 923  delete mode 100644 arch/arm/include/asm/local.h
 924  delete mode 100644 arch/arm/include/asm/local64.h
 925  delete mode 100644 arch/arm/include/asm/percpu.h
 926  create mode 100644 arch/arm/include/asm/pgtable-2level-hwdef.h
 927  create mode 100644 arch/arm/include/asm/pgtable-2level-types.h
 928  create mode 100644 arch/arm/include/asm/pgtable-2level.h
 929  delete mode 100644 arch/arm/include/asm/poll.h
 930  delete mode 100644 arch/arm/include/asm/resource.h
 931  delete mode 100644 arch/arm/include/asm/sections.h
 932  delete mode 100644 arch/arm/include/asm/siginfo.h
 933  delete mode 100644 arch/arm/include/asm/sizes.h
 934  create mode 100644 arch/arm/kernel/kprobes-test-arm.c
 935  create mode 100644 arch/arm/kernel/kprobes-test-thumb.c
 936  create mode 100644 arch/arm/kernel/kprobes-test.c
 937  create mode 100644 arch/arm/kernel/kprobes-test.h
 938  create mode 100644 arch/arm/kernel/suspend.c
 939  create mode 100644 arch/arm/kernel/topology.c
 940  create mode 100644 arch/arm/mach-davinci/include/mach/gpio-davinci.h
 941  rename arch/arm/mach-ixp2000/include/mach/{gpio.h => gpio-ixp2000.h} (95%)
 942  create mode 100644 arch/arm/mach-ks8695/include/mach/gpio-ks8695.h
 943  create mode 100644 arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h
 944  rename arch/arm/mach-pnx4008/include/mach/{gpio.h => gpio-pnx4008.h} (99%)
 945  delete mode 100644 arch/arm/mach-sa1100/leds-simpad.c
 946  create mode 100644 arch/arm/mach-tegra/include/mach/gpio-tegra.h
 947  create mode 100644 arch/arm/mach-u300/include/mach/gpio-u300.h
 948  rename arch/arm/plat-nomadik/include/plat/{gpio.h => gpio-nomadik.h} (82%)
 949  rename arch/arm/mach-davinci/gpio.c => drivers/gpio/gpio-davinci.c (98%)
 950  rename arch/arm/mach-ks8695/gpio.c => drivers/gpio/gpio-ks8695.c (99%)
 951  rename arch/arm/mach-lpc32xx/gpiolib.c => drivers/gpio/gpio-lpc32xx.c (99%)
 952  rename arch/arm/mach-sa1100/gpio.c => drivers/gpio/gpio-sa1100.c (96%)
 953  rename {arch/arm/mach-davinci => drivers/gpio}/gpio-tnetv107x.c (100%)
 954  create mode 100644 include/linux/cpu_pm.h
 955  create mode 100644 kernel/cpu_pm.c
 956 Merging arm-lpae/for-next
 957 $ git merge arm-lpae/for-next
 958 Resolved 'arch/arm/include/asm/page.h' using previous resolution.
 959 Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution.
 960 Resolved 'arch/arm/include/asm/pgtable-hwdef.h' using previous resolution.
 961 Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution.
 962 Resolved 'arch/arm/include/asm/tlb.h' using previous resolution.
 963 Resolved 'arch/arm/kernel/head.S' using previous resolution.
 964 Resolved 'arch/arm/kernel/sleep.S' using previous resolution.
 965 Resolved 'arch/arm/mm/dma-mapping.c' using previous resolution.
 966 Resolved 'arch/arm/mm/mmu.c' using previous resolution.
 967 Auto-merging arch/arm/Kconfig
 968 Auto-merging arch/arm/boot/compressed/head.S
 969 Auto-merging arch/arm/include/asm/page.h
 970 CONFLICT (content): Merge conflict in arch/arm/include/asm/page.h
 971 Auto-merging arch/arm/include/asm/pgalloc.h
 972 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
 973 Auto-merging arch/arm/include/asm/pgtable-hwdef.h
 974 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable-hwdef.h
 975 Auto-merging arch/arm/include/asm/pgtable.h
 976 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
 977 Auto-merging arch/arm/include/asm/proc-fns.h
 978 Auto-merging arch/arm/include/asm/system.h
 979 Auto-merging arch/arm/include/asm/tlb.h
 980 CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
 981 Auto-merging arch/arm/kernel/head.S
 982 CONFLICT (content): Merge conflict in arch/arm/kernel/head.S
 983 Auto-merging arch/arm/kernel/hw_breakpoint.c
 984 Auto-merging arch/arm/kernel/setup.c
 985 Auto-merging arch/arm/kernel/sleep.S
 986 CONFLICT (content): Merge conflict in arch/arm/kernel/sleep.S
 987 Auto-merging arch/arm/mm/dma-mapping.c
 988 CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
 989 Auto-merging arch/arm/mm/mmu.c
 990 CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
 991 Automatic merge failed; fix conflicts and then commit the result.
 992 $ git commit -v -a
 993 [master f331c45] Merge remote-tracking branch 'arm-lpae/for-next'
 994 $ git diff -M --stat --summary HEAD^..
 995  arch/arm/Kconfig                            |    2 +-
 996  arch/arm/boot/compressed/head.S             |    1 +
 997  arch/arm/include/asm/assembler.h            |   11 +
 998  arch/arm/include/asm/page.h                 |    4 +
 999  arch/arm/include/asm/pgalloc.h              |   24 ++
1000  arch/arm/include/asm/pgtable-3level-hwdef.h |   82 ++++++
1001  arch/arm/include/asm/pgtable-3level-types.h |   70 +++++
1002  arch/arm/include/asm/pgtable-3level.h       |  107 +++++++
1003  arch/arm/include/asm/pgtable-hwdef.h        |    4 +
1004  arch/arm/include/asm/pgtable.h              |   70 ++++-
1005  arch/arm/include/asm/proc-fns.h             |   21 ++
1006  arch/arm/include/asm/setup.h                |    8 +
1007  arch/arm/include/asm/system.h               |    8 +
1008  arch/arm/include/asm/tlb.h                  |   11 +-
1009  arch/arm/kernel/head.S                      |   45 +++-
1010  arch/arm/kernel/hw_breakpoint.c             |    8 +-
1011  arch/arm/kernel/setup.c                     |   10 +
1012  arch/arm/kernel/sleep.S                     |    2 +
1013  arch/arm/mm/Kconfig                         |   13 +
1014  arch/arm/mm/Makefile                        |    4 +
1015  arch/arm/mm/alignment.c                     |    2 +-
1016  arch/arm/mm/context.c                       |   19 +-
1017  arch/arm/mm/fault.c                         |   87 ++++++
1018  arch/arm/mm/idmap.c                         |   36 +++-
1019  arch/arm/mm/ioremap.c                       |   39 ++-
1020  arch/arm/mm/mmu.c                           |   35 ++-
1021  arch/arm/mm/pgd.c                           |   51 +++-
1022  arch/arm/mm/proc-macros.S                   |    5 +-
1023  arch/arm/mm/proc-v7lpae.S                   |  422 +++++++++++++++++++++++++++
1024  29 files changed, 1160 insertions(+), 41 deletions(-)
1025  create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h
1026  create mode 100644 arch/arm/include/asm/pgtable-3level-types.h
1027  create mode 100644 arch/arm/include/asm/pgtable-3level.h
1028  create mode 100644 arch/arm/mm/proc-v7lpae.S
1029 Merging arm-soc/for-next
1030 $ git merge arm-soc/for-next
1031 error: refusing to lose untracked file at 'arch/arm/mach-picoxcell/include/mach/uncompress.h'
1032 CONFLICT (rename/delete): Rename arch/arm/include/asm/sizes.h->arch/arm/mach-picoxcell/include/mach/uncompress.h in arm-soc/for-next and deleted in HEAD
1033 Auto-merging Documentation/devicetree/bindings/arm/l2cc.txt
1034 CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/arm/l2cc.txt
1035 Auto-merging arch/arm/Kconfig
1036 Auto-merging arch/arm/Makefile
1037 Auto-merging arch/arm/configs/imx_v4_v5_defconfig
1038 Removing arch/arm/configs/mx1_defconfig
1039 Removing arch/arm/configs/mx21_defconfig
1040 Auto-merging arch/arm/configs/mx5_defconfig
1041 Auto-merging arch/arm/mach-at91/at91cap9_devices.c
1042 Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
1043 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
1044 Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
1045 Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
1046 Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
1047 CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-at91/board-usb-a9260.c left in tree.
1048 Auto-merging arch/arm/mach-at91/board-usb-a926x.c
1049 Auto-merging arch/arm/mach-davinci/da850.c
1050 Auto-merging arch/arm/mach-davinci/dm355.c
1051 Auto-merging arch/arm/mach-davinci/dm644x.c
1052 Auto-merging arch/arm/mach-davinci/dm646x.c
1053 Removing arch/arm/mach-exynos4/mach-smdkc210.c
1054 Auto-merging arch/arm/mach-msm/board-msm8x60.c
1055 CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm8x60.c
1056 Removing arch/arm/mach-mx5/devices.c
1057 Removing arch/arm/mach-mx5/devices.h
1058 Auto-merging arch/arm/mach-mxs/include/mach/gpio.h
1059 CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/gpio.h
1060 Removing arch/arm/mach-nuc93x/Kconfig
1061 Removing arch/arm/mach-nuc93x/Makefile
1062 CONFLICT (delete/modify): arch/arm/mach-nuc93x/Makefile.boot deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-nuc93x/Makefile.boot left in tree.
1063 Removing arch/arm/mach-nuc93x/clock.c
1064 Removing arch/arm/mach-nuc93x/clock.h
1065 Removing arch/arm/mach-nuc93x/cpu.c
1066 Removing arch/arm/mach-nuc93x/cpu.h
1067 Removing arch/arm/mach-nuc93x/dev.c
1068 Removing arch/arm/mach-nuc93x/include/mach/entry-macro.S
1069 Removing arch/arm/mach-nuc93x/include/mach/hardware.h
1070 Removing arch/arm/mach-nuc93x/include/mach/io.h
1071 Removing arch/arm/mach-nuc93x/include/mach/irqs.h
1072 Removing arch/arm/mach-nuc93x/include/mach/map.h
1073 Removing arch/arm/mach-nuc93x/include/mach/memory.h
1074 Removing arch/arm/mach-nuc93x/include/mach/regs-clock.h
1075 Removing arch/arm/mach-nuc93x/include/mach/regs-ebi.h
1076 Removing arch/arm/mach-nuc93x/include/mach/regs-irq.h
1077 Removing arch/arm/mach-nuc93x/include/mach/regs-serial.h
1078 Removing arch/arm/mach-nuc93x/include/mach/regs-timer.h
1079 Removing arch/arm/mach-nuc93x/include/mach/system.h
1080 Removing arch/arm/mach-nuc93x/include/mach/timex.h
1081 Removing arch/arm/mach-nuc93x/include/mach/uncompress.h
1082 Removing arch/arm/mach-nuc93x/include/mach/vmalloc.h
1083 Removing arch/arm/mach-nuc93x/irq.c
1084 Removing arch/arm/mach-nuc93x/mach-nuc932evb.c
1085 Removing arch/arm/mach-nuc93x/nuc932.c
1086 Removing arch/arm/mach-nuc93x/nuc932.h
1087 Removing arch/arm/mach-nuc93x/time.c
1088 Auto-merging arch/arm/mach-omap2/board-generic.c
1089 Auto-merging arch/arm/mach-omap2/board-h4.c
1090 Auto-merging arch/arm/mach-omap2/board-ldp.c
1091 Auto-merging arch/arm/mach-omap2/devices.c
1092 Removing arch/arm/mach-s3c2410/gpio.c
1093 Removing arch/arm/mach-s3c2412/gpio.c
1094 Auto-merging arch/arm/mach-tegra/board-harmony.c
1095 Auto-merging arch/arm/mach-tegra/board-paz00.c
1096 Auto-merging arch/arm/mach-tegra/board-paz00.h
1097 CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-paz00.h
1098 Auto-merging arch/arm/mach-tegra/board-seaboard.h
1099 CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-seaboard.h
1100 Auto-merging arch/arm/mach-tegra/board-trimslice.c
1101 Auto-merging arch/arm/mach-u300/Kconfig
1102 Auto-merging arch/arm/mach-u300/Makefile.boot
1103 CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
1104 Auto-merging arch/arm/mach-u300/core.c
1105 Auto-merging arch/arm/mach-ux500/board-mop500-pins.c
1106 Auto-merging arch/arm/mach-ux500/board-mop500.c
1107 Auto-merging arch/arm/mach-vexpress/hotplug.c
1108 Auto-merging arch/arm/mm/cache-l2x0.c
1109 CONFLICTResolved 'Documentation/devicetree/bindings/arm/l2cc.txt' using previous resolution.
1110 Resolved 'arch/arm/mach-msm/board-msm8x60.c' using previous resolution.
1111 Resolved 'arch/arm/mach-mxs/include/mach/gpio.h' using previous resolution.
1112 Resolved 'arch/arm/mach-tegra/board-paz00.h' using previous resolution.
1113 Resolved 'arch/arm/mach-tegra/board-seaboard.h' using previous resolution.
1114 Resolved 'arch/arm/mach-u300/Makefile.boot' using previous resolution.
1115 Resolved 'arch/arm/mm/cache-l2x0.c' using previous resolution.
1116 Resolved 'arch/arm/plat-mxc/include/mach/gpio.h' using previous resolution.
1117  (content): Merge conflict in arch/arm/mm/cache-l2x0.c
1118 Auto-merging arch/arm/plat-mxc/include/mach/gpio.h
1119 CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/gpio.h
1120 Auto-merging arch/arm/plat-omap/devices.c
1121 Removing arch/arm/plat-s3c24xx/include/plat/map.h
1122 Auto-merging arch/arm/plat-samsung/include/plat/map-s5p.h
1123 Automatic merge failed; fix conflicts and then commit the result.
1124 $ git rm -f arch/arm/mach-at91/board-usb-a9260.c arch/arm/mach-nuc93x/Makefile.boot
1125 Documentation/devicetree/bindings/arm/l2cc.txt: needs merge
1126 arch/arm/mach-at91/board-usb-a9260.c: needs merge
1127 arch/arm/mach-msm/board-msm8x60.c: needs merge
1128 arch/arm/mach-mxs/include/mach/gpio.h: needs merge
1129 arch/arm/mach-nuc93x/Makefile.boot: needs merge
1130 arch/arm/mach-tegra/board-paz00.h: needs merge
1131 arch/arm/mach-tegra/board-seaboard.h: needs merge
1132 arch/arm/mach-u300/Makefile.boot: needs merge
1133 arch/arm/mm/cache-l2x0.c: needs merge
1134 arch/arm/plat-mxc/include/mach/gpio.h: needs merge
1135 rm 'arch/arm/mach-at91/board-usb-a9260.c'
1136 rm 'arch/arm/mach-nuc93x/Makefile.boot'
1137 $ git commit -v -a
1138 [master 3f2b12b] Merge remote-tracking branch 'arm-soc/for-next'
1139 $ git diff -M --stat --summary HEAD^..
1140  .../devicetree/bindings/arm/picoxcell.txt          |   24 +
1141  .../devicetree/bindings/tty/serial/msm_serial.txt  |   27 +
1142  arch/arm/Kconfig                                   |   29 +-
1143  arch/arm/Makefile                                  |    6 +-
1144  arch/arm/boot/dts/msm8660-surf.dts                 |   24 +
1145  arch/arm/boot/dts/picoxcell-pc3x2.dtsi             |  249 ++
1146  arch/arm/boot/dts/picoxcell-pc3x3.dtsi             |  365 ++
1147  arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts       |   86 +
1148  arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts       |   92 +
1149  arch/arm/boot/dts/prima2-cb.dts                    |    9 +-
1150  arch/arm/boot/dts/tegra-harmony.dts                |    1 +
1151  arch/arm/boot/dts/tegra-seaboard.dts               |    4 +
1152  arch/arm/configs/at91sam9g45_defconfig             |  214 ++
1153  arch/arm/configs/exynos4_defconfig                 |    1 +
1154  .../{mx27_defconfig => imx_v4_v5_defconfig}        |   68 +-
1155  arch/arm/configs/mx1_defconfig                     |   91 -
1156  arch/arm/configs/mx21_defconfig                    |   97 -
1157  arch/arm/configs/{mx51_defconfig => mx5_defconfig} |   60 +-
1158  arch/arm/include/asm/device.h                      |    5 +
1159  arch/arm/mach-at91/Kconfig                         |   13 +
1160  arch/arm/mach-at91/Makefile                        |    6 +-
1161  arch/arm/mach-at91/at91cap9.c                      |    2 +
1162  arch/arm/mach-at91/at91cap9_devices.c              |    6 +
1163  arch/arm/mach-at91/at91rm9200.c                    |    2 +
1164  arch/arm/mach-at91/at91rm9200_devices.c            |    8 +
1165  arch/arm/mach-at91/at91sam9260.c                   |    2 +
1166  arch/arm/mach-at91/at91sam9260_devices.c           |    8 +
1167  arch/arm/mach-at91/at91sam9261.c                   |   29 +-
1168  arch/arm/mach-at91/at91sam9261_devices.c           |    8 +
1169  arch/arm/mach-at91/at91sam9263.c                   |    2 +
1170  arch/arm/mach-at91/at91sam9263_devices.c           |    6 +
1171  arch/arm/mach-at91/at91sam9g45.c                   |    2 +
1172  arch/arm/mach-at91/at91sam9g45_devices.c           |    6 +
1173  arch/arm/mach-at91/board-rsi-ews.c                 |  233 ++
1174  arch/arm/mach-at91/board-usb-a9260.c               |  230 --
1175  .../{board-usb-a9263.c => board-usb-a926x.c}       |  179 +-
1176  arch/arm/mach-at91/include/mach/board.h            |    5 +
1177  arch/arm/mach-at91/include/mach/timex.h            |    5 +
1178  arch/arm/mach-davinci/Kconfig                      |   10 +
1179  arch/arm/mach-davinci/board-da850-evm.c            |  114 +
1180  arch/arm/mach-davinci/da850.c                      |    9 +
1181  arch/arm/mach-davinci/devices-da8xx.c              |    3 +
1182  arch/arm/mach-davinci/devices-tnetv107x.c          |    1 +
1183  arch/arm/mach-davinci/dm355.c                      |    1 +
1184  arch/arm/mach-davinci/dm644x.c                     |    1 +
1185  arch/arm/mach-davinci/dm646x.c                     |    1 +
1186  arch/arm/mach-davinci/dma.c                        |    5 +-
1187  arch/arm/mach-davinci/include/mach/mmc.h           |    3 +
1188  arch/arm/mach-davinci/include/mach/mux.h           |   10 +
1189  arch/arm/mach-exynos4/Kconfig                      |   57 +-
1190  arch/arm/mach-exynos4/Makefile                     |   11 +-
1191  arch/arm/mach-exynos4/clock-exynos4210.c           |  139 +
1192  arch/arm/mach-exynos4/clock-exynos4212.c           |  118 +
1193  arch/arm/mach-exynos4/clock.c                      |  218 +-
1194  arch/arm/mach-exynos4/cpu.c                        |   40 +-
1195  arch/arm/mach-exynos4/hotplug.c                    |    2 +-
1196  arch/arm/mach-exynos4/include/mach/exynos4-clock.h |   43 +
1197  arch/arm/mach-exynos4/include/mach/map.h           |    3 +-
1198  arch/arm/mach-exynos4/include/mach/regs-clock.h    |   54 +-
1199  arch/arm/mach-exynos4/mach-origen.c                |  108 +
1200  arch/arm/mach-exynos4/mach-smdk4212.c              |  292 ++
1201  arch/arm/mach-exynos4/mach-smdkc210.c              |  309 --
1202  arch/arm/mach-exynos4/mach-smdkv310.c              |   78 +
1203  arch/arm/mach-exynos4/platsmp.c                    |   10 +-
1204  arch/arm/mach-exynos4/pm.c                         |   79 +-
1205  arch/arm/mach-imx/Kconfig                          |   51 +-
1206  arch/arm/mach-imx/Makefile                         |   10 +-
1207  arch/arm/mach-imx/cache-l2x0.c                     |    2 +-
1208  arch/arm/mach-imx/clock-imx25.c                    |    6 +
1209  arch/arm/mach-imx/clock-imx27.c                    |    6 +-
1210  arch/arm/mach-imx/clock-imx31.c                    |    8 +-
1211  arch/arm/mach-imx/clock-imx35.c                    |    7 +-
1212  arch/arm/mach-imx/cpu-imx25.c                      |   41 +
1213  arch/arm/mach-imx/cpu-imx27.c                      |   28 +-
1214  arch/arm/mach-imx/cpu-imx31.c                      |   49 +-
1215  arch/arm/mach-imx/cpu-imx35.c                      |   30 +-
1216  arch/arm/mach-imx/devices-imx27.h                  |    4 +
1217  arch/arm/mach-imx/devices-imx31.h                  |    4 +
1218  arch/arm/mach-imx/devices-imx35.h                  |    4 +
1219  arch/arm/mach-imx/mach-armadillo5x0.c              |   18 +-
1220  arch/arm/mach-imx/mach-cpuimx35.c                  |    2 +-
1221  arch/arm/mach-imx/mach-mx1ads.c                    |   15 +-
1222  arch/arm/mach-imx/mach-mx25_3ds.c                  |   10 +
1223  arch/arm/mach-imx/mach-mx27_3ds.c                  |    2 +-
1224  arch/arm/mach-imx/mach-vpr200.c                    |    2 +-
1225  arch/arm/mach-ixp4xx/Kconfig                       |   19 +
1226  arch/arm/mach-ixp4xx/Makefile                      |    4 +
1227  arch/arm/mach-ixp4xx/include/mach/uncompress.h     |    3 +-
1228  arch/arm/mach-ixp4xx/miccpt-pci.c                  |   78 +
1229  arch/arm/mach-ixp4xx/omixp-setup.c                 |  273 ++
1230  arch/arm/mach-msm/board-msm8x60.c                  |   58 +-
1231  arch/arm/mach-msm/hotplug.c                        |    2 +-
1232  arch/arm/mach-msm/platsmp.c                        |    2 +-
1233  arch/arm/mach-mx5/Kconfig                          |   29 +-
1234  arch/arm/mach-mx5/Makefile                         |    2 +-
1235  arch/arm/mach-mx5/board-cpuimx51.c                 |   27 +-
1236  arch/arm/mach-mx5/board-cpuimx51sd.c               |   25 +-
1237  arch/arm/mach-mx5/board-mx51_3ds.c                 |    1 -
1238  arch/arm/mach-mx5/board-mx51_babbage.c             |   26 +-
1239  arch/arm/mach-mx5/board-mx51_efikamx.c             |   13 +-
1240  arch/arm/mach-mx5/board-mx51_efikasb.c             |   24 +-
1241  arch/arm/mach-mx5/board-mx53_ard.c                 |    4 +-
1242  arch/arm/mach-mx5/board-mx53_loco.c                |   20 +
1243  arch/arm/mach-mx5/clock-mx51-mx53.c                |   14 +-
1244  arch/arm/mach-mx5/cpu.c                            |   74 +-
1245  arch/arm/mach-mx5/devices-imx51.h                  |   17 +
1246  arch/arm/mach-mx5/devices-imx53.h                  |    4 +
1247  arch/arm/mach-mx5/devices.c                        |  120 -
1248  arch/arm/mach-mx5/devices.h                        |    5 -
1249  arch/arm/mach-mx5/ehci.c                           |    2 +-
1250  arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c       |    3 +-
1251  arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c       |    6 +-
1252  arch/arm/mach-mx5/mm.c                             |    8 +-
1253  arch/arm/mach-mx5/mx51_efika.c                     |   20 +-
1254  arch/arm/mach-mx5/pm-imx5.c                        |   15 +-
1255  arch/arm/mach-mxs/Kconfig                          |    6 +
1256  arch/arm/mach-mxs/clock-mx28.c                     |    8 +-
1257  arch/arm/mach-mxs/devices-mx23.h                   |    2 +
1258  arch/arm/mach-mxs/devices-mx28.h                   |    5 +
1259  arch/arm/mach-mxs/devices/Kconfig                  |    6 +
1260  arch/arm/mach-mxs/devices/Makefile                 |    2 +
1261  arch/arm/mach-mxs/devices/platform-mxs-saif.c      |   60 +
1262  arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c  |   51 +
1263  arch/arm/mach-mxs/include/mach/devices-common.h    |   12 +
1264  arch/arm/mach-mxs/include/mach/gpio.h              |    4 -
1265  arch/arm/mach-mxs/include/mach/mxs.h               |    2 +
1266  arch/arm/mach-mxs/mach-mx23evk.c                   |    2 +-
1267  arch/arm/mach-mxs/mach-mx28evk.c                   |   79 +-
1268  arch/arm/mach-mxs/mach-stmp378x_devb.c             |    2 +-
1269  arch/arm/mach-mxs/mach-tx28.c                      |    1 +
1270  arch/arm/mach-nuc93x/Kconfig                       |   19 -
1271  arch/arm/mach-nuc93x/Makefile                      |   14 -
1272  arch/arm/mach-nuc93x/Makefile.boot                 |    3 -
1273  arch/arm/mach-nuc93x/clock.c                       |   83 -
1274  arch/arm/mach-nuc93x/clock.h                       |   36 -
1275  arch/arm/mach-nuc93x/cpu.c                         |  135 -
1276  arch/arm/mach-nuc93x/cpu.h                         |   48 -
1277  arch/arm/mach-nuc93x/dev.c                         |   42 -
1278  arch/arm/mach-nuc93x/include/mach/entry-macro.S    |   32 -
1279  arch/arm/mach-nuc93x/include/mach/hardware.h       |   22 -
1280  arch/arm/mach-nuc93x/include/mach/io.h             |   28 -
1281  arch/arm/mach-nuc93x/include/mach/irqs.h           |   59 -
1282  arch/arm/mach-nuc93x/include/mach/map.h            |  139 -
1283  arch/arm/mach-nuc93x/include/mach/memory.h         |   21 -
1284  arch/arm/mach-nuc93x/include/mach/regs-clock.h     |   53 -
1285  arch/arm/mach-nuc93x/include/mach/regs-ebi.h       |   33 -
1286  arch/arm/mach-nuc93x/include/mach/regs-irq.h       |   42 -
1287  arch/arm/mach-nuc93x/include/mach/regs-serial.h    |   52 -
1288  arch/arm/mach-nuc93x/include/mach/regs-timer.h     |   28 -
1289  arch/arm/mach-nuc93x/include/mach/system.h         |   28 -
1290  arch/arm/mach-nuc93x/include/mach/timex.h          |   25 -
1291  arch/arm/mach-nuc93x/include/mach/uncompress.h     |   50 -
1292  arch/arm/mach-nuc93x/include/mach/vmalloc.h        |   23 -
1293  arch/arm/mach-nuc93x/irq.c                         |   66 -
1294  arch/arm/mach-nuc93x/mach-nuc932evb.c              |   42 -
1295  arch/arm/mach-nuc93x/nuc932.c                      |   65 -
1296  arch/arm/mach-nuc93x/nuc932.h                      |   29 -
1297  arch/arm/mach-nuc93x/time.c                        |  100 -
1298  arch/arm/mach-omap1/Makefile                       |    2 +-
1299  arch/arm/mach-omap1/mcbsp.c                        |   45 +
1300  arch/arm/mach-omap1/timer.c                        |  173 +
1301  arch/arm/mach-omap2/Makefile                       |   88 +-
1302  arch/arm/mach-omap2/board-2430sdp.c                |   17 +-
1303  arch/arm/mach-omap2/board-3430sdp.c                |    9 +-
1304  arch/arm/mach-omap2/board-3630sdp.c                |   11 +-
1305  arch/arm/mach-omap2/board-4430sdp.c                |   17 +-
1306  arch/arm/mach-omap2/board-am3517crane.c            |    9 +-
1307  arch/arm/mach-omap2/board-am3517evm.c              |    8 +-
1308  arch/arm/mach-omap2/board-apollon.c                |   17 +-
1309  arch/arm/mach-omap2/board-cm-t35.c                 |   13 +-
1310  arch/arm/mach-omap2/board-cm-t3517.c               |    9 +-
1311  arch/arm/mach-omap2/board-devkit8000.c             |   19 +-
1312  arch/arm/mach-omap2/board-flash.c                  |    5 -
1313  arch/arm/mach-omap2/board-flash.h                  |   19 +
1314  arch/arm/mach-omap2/board-generic.c                |    2 +-
1315  arch/arm/mach-omap2/board-h4.c                     |   24 +-
1316  arch/arm/mach-omap2/board-igep0020.c               |   13 +-
1317  arch/arm/mach-omap2/board-ldp.c                    |    9 +-
1318  arch/arm/mach-omap2/board-n8x0.c                   |   25 +-
1319  arch/arm/mach-omap2/board-omap3beagle.c            |   11 +-
1320  arch/arm/mach-omap2/board-omap3evm.c               |    9 +-
1321  arch/arm/mach-omap2/board-omap3logic.c             |   11 +-
1322  arch/arm/mach-omap2/board-omap3pandora.c           |   11 +-
1323  arch/arm/mach-omap2/board-omap3stalker.c           |   16 +-
1324  arch/arm/mach-omap2/board-omap3touchbook.c         |   18 +-
1325  arch/arm/mach-omap2/board-omap4panda.c             |   17 +-
1326  arch/arm/mach-omap2/board-overo.c                  |   11 +-
1327  arch/arm/mach-omap2/board-rm680.c                  |   25 +-
1328  arch/arm/mach-omap2/board-rx51.c                   |   25 +-
1329  arch/arm/mach-omap2/board-ti8168evm.c              |    9 +-
1330  arch/arm/mach-omap2/board-zoom.c                   |   23 +-
1331  arch/arm/mach-omap2/clock2420_data.c               |   48 +
1332  arch/arm/mach-omap2/clock2430_data.c               |   48 +
1333  arch/arm/mach-omap2/clock3xxx_data.c               |   47 +-
1334  arch/arm/mach-omap2/clock44xx_data.c               |   33 +
1335  arch/arm/mach-omap2/clockdomain.c                  |  147 +-
1336  arch/arm/mach-omap2/clockdomain.h                  |   22 +-
1337  arch/arm/mach-omap2/clockdomain2xxx_3xxx.c         |    4 -
1338  arch/arm/mach-omap2/clockdomain44xx.c              |    2 -
1339  arch/arm/mach-omap2/clockdomains2420_data.c        |  154 +
1340  arch/arm/mach-omap2/clockdomains2430_data.c        |  181 +
1341  arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c   |  803 +-----
1342  arch/arm/mach-omap2/clockdomains3xxx_data.c        |  398 +++
1343  arch/arm/mach-omap2/clockdomains44xx_data.c        |  409 +--
1344  arch/arm/mach-omap2/common.c                       |   18 +
1345  arch/arm/mach-omap2/devices.c                      |   44 +-
1346  arch/arm/mach-omap2/display.c                      |    6 +-
1347  arch/arm/mach-omap2/dma.c                          |   16 +-
1348  arch/arm/mach-omap2/gpio.c                         |   10 +-
1349  arch/arm/mach-omap2/hsmmc.c                        |    8 +-
1350  arch/arm/mach-omap2/hwspinlock.c                   |    8 +-
1351  arch/arm/mach-omap2/id.c                           |  191 +-
1352  arch/arm/mach-omap2/io.c                           |   57 +-
1353  arch/arm/mach-omap2/mcbsp.c                        |  111 +-
1354  arch/arm/mach-omap2/omap_hwmod.c                   |    3 -
1355  arch/arm/mach-omap2/omap_hwmod_2420_data.c         |   59 +-
1356  arch/arm/mach-omap2/omap_hwmod_2430_data.c         |   67 +-
1357  arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |  200 +-
1358  arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |  104 +-
1359  arch/arm/mach-omap2/omap_twl.c                     |  107 +-
1360  arch/arm/mach-omap2/opp.c                          |    2 +-
1361  arch/arm/mach-omap2/pm.c                           |   36 +-
1362  arch/arm/mach-omap2/pm24xx.c                       |   27 -
1363  arch/arm/mach-omap2/pm34xx.c                       |    2 +-
1364  arch/arm/mach-omap2/powerdomain-common.c           |    7 +-
1365  arch/arm/mach-omap2/powerdomain.c                  |  110 +-
1366  arch/arm/mach-omap2/powerdomain.h                  |   19 +-
1367  arch/arm/mach-omap2/powerdomain2xxx_3xxx.c         |    2 +-
1368  arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c   |   21 +-
1369  arch/arm/mach-omap2/powerdomains2xxx_data.c        |   48 +-
1370  arch/arm/mach-omap2/powerdomains3xxx_data.c        |   97 +-
1371  arch/arm/mach-omap2/powerdomains44xx_data.c        |   36 +-
1372  arch/arm/mach-omap2/prm2xxx_3xxx.c                 |   56 +
1373  arch/arm/mach-omap2/prm2xxx_3xxx.h                 |   12 +
1374  arch/arm/mach-omap2/prm44xx.c                      |   71 +
1375  arch/arm/mach-omap2/prm44xx.h                      |   12 +
1376  arch/arm/mach-omap2/serial.c                       |   14 +-
1377  arch/arm/mach-omap2/smartreflex-class3.c           |    4 +-
1378  arch/arm/mach-omap2/smartreflex.c                  |   29 +-
1379  arch/arm/mach-omap2/sr_device.c                    |    8 +-
1380  arch/arm/mach-omap2/timer.c                        |  194 +-
1381  arch/arm/mach-omap2/vc.c                           |  367 ++
1382  arch/arm/mach-omap2/vc.h                           |   88 +-
1383  arch/arm/mach-omap2/vc3xxx_data.c                  |   31 +-
1384  arch/arm/mach-omap2/vc44xx_data.c                  |   44 +-
1385  arch/arm/mach-omap2/voltage.c                      | 1088 ++-----
1386  arch/arm/mach-omap2/voltage.h                      |  150 +-
1387  arch/arm/mach-omap2/voltagedomains2xxx_data.c      |   32 +
1388  arch/arm/mach-omap2/voltagedomains3xxx_data.c      |   83 +-
1389  arch/arm/mach-omap2/voltagedomains44xx_data.c      |   99 +-
1390  arch/arm/mach-omap2/vp.c                           |  278 ++
1391  arch/arm/mach-omap2/vp.h                           |  133 +-
1392  arch/arm/mach-omap2/vp3xxx_data.c                  |   35 +-
1393  arch/arm/mach-omap2/vp44xx_data.c                  |   47 +-
1394  arch/arm/mach-picoxcell/Makefile                   |    3 +
1395  arch/arm/mach-picoxcell/Makefile.boot              |    1 +
1396  arch/arm/mach-picoxcell/common.c                   |   55 +
1397  arch/arm/mach-picoxcell/common.h                   |   18 +
1398  arch/arm/mach-picoxcell/include/mach/debug-macro.S |   35 +
1399  arch/arm/mach-picoxcell/include/mach/entry-macro.S |   19 +
1400  arch/arm/mach-picoxcell/include/mach/gpio.h        |    1 +
1401  arch/arm/mach-picoxcell/include/mach/hardware.h    |   21 +
1402  arch/arm/mach-picoxcell/include/mach/io.h          |   22 +
1403  arch/arm/mach-picoxcell/include/mach/irqs.h        |   25 +
1404  arch/arm/mach-picoxcell/include/mach/map.h         |   25 +
1405  arch/arm/mach-picoxcell/include/mach/memory.h      |    1 +
1406  .../mach-picoxcell/include/mach/picoxcell_soc.h    |   25 +
1407  arch/arm/mach-picoxcell/include/mach/system.h      |   31 +
1408  arch/arm/mach-picoxcell/include/mach/timex.h       |   25 +
1409  arch/arm/mach-picoxcell/include/mach/uncompress.h  |   21 +
1410  arch/arm/mach-picoxcell/io.c                       |   32 +
1411  arch/arm/mach-picoxcell/time.c                     |  132 +
1412  arch/arm/mach-prima2/Makefile                      |    2 +
1413  arch/arm/mach-prima2/irq.c                         |   43 +
1414  arch/arm/mach-prima2/pm.c                          |  149 +
1415  arch/arm/mach-prima2/pm.h                          |   29 +
1416  arch/arm/mach-prima2/rtciobrg.c                    |  139 +
1417  arch/arm/mach-prima2/sleep.S                       |   64 +
1418  arch/arm/mach-prima2/timer.c                       |   34 +
1419  arch/arm/mach-realview/hotplug.c                   |    2 +-
1420  arch/arm/mach-s3c2410/Kconfig                      |    6 -
1421  arch/arm/mach-s3c2410/Makefile                     |    1 -
1422  arch/arm/mach-s3c2410/dma.c                        |   14 -
1423  arch/arm/mach-s3c2410/gpio.c                       |   72 -
1424  arch/arm/mach-s3c2410/include/mach/map.h           |   52 +-
1425  arch/arm/mach-s3c2412/Kconfig                      |    1 -
1426  arch/arm/mach-s3c2412/Makefile                     |    1 -
1427  arch/arm/mach-s3c2412/dma.c                        |   18 -
1428  arch/arm/mach-s3c2412/gpio.c                       |   62 -
1429  arch/arm/mach-s3c2440/Kconfig                      |    2 -
1430  arch/arm/mach-s3c2440/dma.c                        |   17 -
1431  arch/arm/mach-s3c2443/dma.c                        |   27 -
1432  arch/arm/mach-s3c64xx/cpu.c                        |   22 +-
1433  arch/arm/mach-s3c64xx/include/mach/map.h           |    9 +-
1434  arch/arm/mach-s3c64xx/mach-crag6410.c              |    3 -
1435  arch/arm/mach-s3c64xx/mach-mini6410.c              |    8 +-
1436  arch/arm/mach-s3c64xx/mach-real6410.c              |    8 +-
1437  arch/arm/mach-s3c64xx/mach-smdk6410.c              |    8 +-
1438  arch/arm/mach-s5p64x0/dev-spi.c                    |    8 +-
1439  arch/arm/mach-s5p64x0/dma.c                        |    7 +-
1440  arch/arm/mach-s5p64x0/gpiolib.c                    |    7 +-
1441  arch/arm/mach-s5p64x0/irq-eint.c                   |    3 +-
1442  arch/arm/mach-s5p64x0/mach-smdk6440.c              |    8 +-
1443  arch/arm/mach-s5p64x0/mach-smdk6450.c              |    8 +-
1444  arch/arm/mach-s5pc100/mach-smdkc100.c              |    8 +-
1445  arch/arm/mach-s5pv210/Kconfig                      |    6 -
1446  arch/arm/mach-s5pv210/Makefile                     |    2 +-
1447  arch/arm/mach-s5pv210/mach-smdkv210.c              |    8 +-
1448  arch/arm/mach-shmobile/smp-sh73a0.c                |    6 +-
1449  arch/arm/mach-tegra/board-harmony.c                |    5 +-
1450  arch/arm/mach-tegra/board-paz00-pinmux.c           |    3 +
1451  arch/arm/mach-tegra/board-paz00.c                  |   62 +-
1452  arch/arm/mach-tegra/board-paz00.h                  |   16 +-
1453  arch/arm/mach-tegra/board-seaboard-pinmux.c        |    6 +-
1454  arch/arm/mach-tegra/board-seaboard.c               |   81 +-
1455  arch/arm/mach-tegra/board-seaboard.h               |   12 +-
1456  arch/arm/mach-tegra/board-trimslice.c              |    3 +-
1457  arch/arm/mach-u300/Kconfig                         |   46 -
1458  arch/arm/mach-u300/Makefile.boot                   |   17 +-
1459  arch/arm/mach-u300/core.c                          |   82 +-
1460  arch/arm/mach-u300/include/mach/memory.h           |   22 +-
1461  arch/arm/mach-u300/u300.c                          |   16 -
1462  arch/arm/mach-ux500/Kconfig                        |    1 +
1463  arch/arm/mach-ux500/Makefile                       |    3 +-
1464  arch/arm/mach-ux500/board-mop500-pins.c            |   34 +-
1465  arch/arm/mach-ux500/board-mop500-sdi.c             |   52 +-
1466  arch/arm/mach-ux500/board-mop500.c                 |   78 +-
1467  arch/arm/mach-ux500/board-mop500.h                 |    3 +
1468  arch/arm/mach-ux500/cache-l2x0.c                   |   95 +
1469  arch/arm/mach-ux500/cpu.c                          |   98 +-
1470  arch/arm/mach-ux500/hotplug.c                      |    2 +-
1471  arch/arm/mach-ux500/include/mach/db5500-regs.h     |    2 +
1472  arch/arm/mach-ux500/include/mach/db8500-regs.h     |    3 +
1473  arch/arm/mach-ux500/include/mach/uncompress.h      |   10 +-
1474  arch/arm/mach-ux500/pins-db8500.h                  |  142 +-
1475  arch/arm/mach-ux500/platsmp.c                      |    2 +-
1476  arch/arm/mach-ux500/timer.c                        |   65 +
1477  arch/arm/mach-vexpress/hotplug.c                   |    2 +-
1478  arch/arm/plat-mxc/Kconfig                          |   39 +-
1479  arch/arm/plat-mxc/audmux-v2.c                      |   18 +-
1480  arch/arm/plat-mxc/cpu.c                            |    9 +
1481  arch/arm/plat-mxc/devices.c                        |   14 -
1482  arch/arm/plat-mxc/devices/Kconfig                  |    5 +-
1483  arch/arm/plat-mxc/devices/Makefile                 |    1 +
1484  arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c  |    5 +
1485  arch/arm/plat-mxc/devices/platform-imx-i2c.c       |    6 +
1486  arch/arm/plat-mxc/devices/platform-mxc-ehci.c      |    9 +
1487  arch/arm/plat-mxc/devices/platform-pata_imx.c      |   59 +
1488  arch/arm/plat-mxc/include/mach/common.h            |    2 +-
1489  arch/arm/plat-mxc/include/mach/devices-common.h    |    8 +
1490  arch/arm/plat-mxc/include/mach/gpio.h              |    8 -
1491  arch/arm/plat-mxc/include/mach/hardware.h          |    6 +
1492  arch/arm/plat-mxc/include/mach/iomux-mx51.h        | 2270 +++++---------
1493  arch/arm/plat-mxc/include/mach/iomux-mx53.h        | 3530 +++++++-------------
1494  arch/arm/plat-mxc/include/mach/iomux-v3.h          |    1 +
1495  arch/arm/plat-mxc/include/mach/memory.h            |   16 +-
1496  arch/arm/plat-mxc/include/mach/mx25.h              |    5 +
1497  arch/arm/plat-mxc/include/mach/mx35.h              |    2 +-
1498  arch/arm/plat-mxc/include/mach/mx3x.h              |   18 +-
1499  arch/arm/plat-mxc/include/mach/mx51.h              |  167 +-
1500  arch/arm/plat-mxc/pwm.c                            |    2 +-
1501  arch/arm/plat-nomadik/Kconfig                      |    8 +-
1502  arch/arm/plat-nomadik/include/plat/mtu.h           |   47 +-
1503  arch/arm/plat-nomadik/include/plat/pincfg.h        |    5 -
1504  arch/arm/plat-nomadik/timer.c                      |  138 +-
1505  arch/arm/plat-omap/devices.c                       |   46 -
1506  arch/arm/plat-omap/dmtimer.c                       |  713 +++--
1507  arch/arm/plat-omap/i2c.c                           |    8 +-
1508  arch/arm/plat-omap/include/plat/clock.h            |    2 -
1509  arch/arm/plat-omap/include/plat/common.h           |   13 +
1510  arch/arm/plat-omap/include/plat/cpu.h              |  108 +-
1511  arch/arm/plat-omap/include/plat/dmtimer.h          |  233 +-
1512  arch/arm/plat-omap/include/plat/io.h               |    2 +-
1513  arch/arm/plat-omap/include/plat/mcbsp.h            |  208 +-
1514  arch/arm/plat-omap/include/plat/omap_device.h      |   30 +-
1515  arch/arm/plat-omap/include/plat/omap_hwmod.h       |    3 -
1516  arch/arm/plat-omap/include/plat/voltage.h          |   20 +
1517  arch/arm/plat-omap/mcbsp.c                         |  385 +--
1518  arch/arm/plat-omap/omap_device.c                   |  185 +-
1519  arch/arm/plat-s3c24xx/cpu.c                        |    9 +-
1520  arch/arm/plat-s3c24xx/include/plat/map.h           |  100 -
1521  arch/arm/plat-s5p/cpu.c                            |   37 +-
1522  arch/arm/plat-s5p/include/plat/exynos4.h           |    5 +-
1523  arch/arm/plat-s5p/include/plat/pll.h               |   56 +-
1524  arch/arm/plat-samsung/Makefile                     |    2 +-
1525  arch/arm/plat-samsung/cpu.c                        |   58 +
1526  arch/arm/plat-samsung/dev-hsmmc.c                  |   19 +-
1527  arch/arm/plat-samsung/dev-hsmmc1.c                 |   19 +-
1528  arch/arm/plat-samsung/dev-hsmmc2.c                 |   19 +-
1529  arch/arm/plat-samsung/dev-hsmmc3.c                 |   19 +-
1530  arch/arm/plat-samsung/dev-ts.c                     |    9 +
1531  arch/arm/plat-samsung/include/plat/cpu.h           |  105 +-
1532  arch/arm/plat-samsung/include/plat/dma-s3c24xx.h   |    6 -
1533  arch/arm/plat-samsung/include/plat/map-s3c.h       |   84 +
1534  .../include/plat/map-s5p.h                         |    6 +-
1535  arch/arm/plat-samsung/include/plat/sdhci.h         |    7 +
1536  arch/arm/plat-samsung/platformdata.c               |   22 +
1537  arch/arm/plat-versatile/platsmp.c                  |    2 +-
1538  drivers/clocksource/Kconfig                        |   15 +
1539  drivers/clocksource/Makefile                       |    1 +
1540  drivers/clocksource/clksrc-dbx500-prcmu.c          |  104 +
1541  drivers/gpio/gpio-mxc.c                            |   12 +
1542  drivers/gpio/gpio-mxs.c                            |    2 +
1543  drivers/misc/Kconfig                               |    1 -
1544  drivers/mmc/host/davinci_mmc.c                     |   13 +
1545  drivers/tty/serial/msm_serial.c                    |   30 +-
1546  drivers/usb/host/ohci-at91.c                       |  239 ++-
1547  include/linux/clksrc-dbx500-prcmu.h                |   22 +
1548  include/linux/rtc/sirfsoc_rtciobrg.h               |   18 +
1549  409 files changed, 13379 insertions(+), 12321 deletions(-)
1550  create mode 100644 Documentation/devicetree/bindings/arm/picoxcell.txt
1551  create mode 100644 Documentation/devicetree/bindings/tty/serial/msm_serial.txt
1552  create mode 100644 arch/arm/boot/dts/msm8660-surf.dts
1553  create mode 100644 arch/arm/boot/dts/picoxcell-pc3x2.dtsi
1554  create mode 100644 arch/arm/boot/dts/picoxcell-pc3x3.dtsi
1555  create mode 100644 arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts
1556  create mode 100644 arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts
1557  create mode 100644 arch/arm/configs/at91sam9g45_defconfig
1558  rename arch/arm/configs/{mx27_defconfig => imx_v4_v5_defconfig} (69%)
1559  delete mode 100644 arch/arm/configs/mx1_defconfig
1560  delete mode 100644 arch/arm/configs/mx21_defconfig
1561  rename arch/arm/configs/{mx51_defconfig => mx5_defconfig} (82%)
1562  create mode 100644 arch/arm/mach-at91/board-rsi-ews.c
1563  delete mode 100644 arch/arm/mach-at91/board-usb-a9260.c
1564  rename arch/arm/mach-at91/{board-usb-a9263.c => board-usb-a926x.c} (54%)
1565  create mode 100644 arch/arm/mach-exynos4/clock-exynos4210.c
1566  create mode 100644 arch/arm/mach-exynos4/clock-exynos4212.c
1567  create mode 100644 arch/arm/mach-exynos4/include/mach/exynos4-clock.h
1568  create mode 100644 arch/arm/mach-exynos4/mach-origen.c
1569  create mode 100644 arch/arm/mach-exynos4/mach-smdk4212.c
1570  delete mode 100644 arch/arm/mach-exynos4/mach-smdkc210.c
1571  create mode 100644 arch/arm/mach-imx/cpu-imx25.c
1572  create mode 100644 arch/arm/mach-ixp4xx/miccpt-pci.c
1573  create mode 100644 arch/arm/mach-ixp4xx/omixp-setup.c
1574  delete mode 100644 arch/arm/mach-mx5/devices.c
1575  delete mode 100644 arch/arm/mach-mx5/devices.h
1576  create mode 100644 arch/arm/mach-mxs/devices/platform-mxs-saif.c
1577  create mode 100644 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c
1578  delete mode 100644 arch/arm/mach-nuc93x/Kconfig
1579  delete mode 100644 arch/arm/mach-nuc93x/Makefile
1580  delete mode 100644 arch/arm/mach-nuc93x/Makefile.boot
1581  delete mode 100644 arch/arm/mach-nuc93x/clock.c
1582  delete mode 100644 arch/arm/mach-nuc93x/clock.h
1583  delete mode 100644 arch/arm/mach-nuc93x/cpu.c
1584  delete mode 100644 arch/arm/mach-nuc93x/cpu.h
1585  delete mode 100644 arch/arm/mach-nuc93x/dev.c
1586  delete mode 100644 arch/arm/mach-nuc93x/include/mach/entry-macro.S
1587  delete mode 100644 arch/arm/mach-nuc93x/include/mach/hardware.h
1588  delete mode 100644 arch/arm/mach-nuc93x/include/mach/io.h
1589  delete mode 100644 arch/arm/mach-nuc93x/include/mach/irqs.h
1590  delete mode 100644 arch/arm/mach-nuc93x/include/mach/map.h
1591  delete mode 100644 arch/arm/mach-nuc93x/include/mach/memory.h
1592  delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-clock.h
1593  delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-ebi.h
1594  delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-irq.h
1595  delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-serial.h
1596  delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-timer.h
1597  delete mode 100644 arch/arm/mach-nuc93x/include/mach/system.h
1598  delete mode 100644 arch/arm/mach-nuc93x/include/mach/timex.h
1599  delete mode 100644 arch/arm/mach-nuc93x/include/mach/uncompress.h
1600  delete mode 100644 arch/arm/mach-nuc93x/include/mach/vmalloc.h
1601  delete mode 100644 arch/arm/mach-nuc93x/irq.c
1602  delete mode 100644 arch/arm/mach-nuc93x/mach-nuc932evb.c
1603  delete mode 100644 arch/arm/mach-nuc93x/nuc932.c
1604  delete mode 100644 arch/arm/mach-nuc93x/nuc932.h
1605  delete mode 100644 arch/arm/mach-nuc93x/time.c
1606  create mode 100644 arch/arm/mach-omap1/timer.c
1607  create mode 100644 arch/arm/mach-omap2/clockdomains2420_data.c
1608  create mode 100644 arch/arm/mach-omap2/clockdomains2430_data.c
1609  create mode 100644 arch/arm/mach-omap2/clockdomains3xxx_data.c
1610  create mode 100644 arch/arm/mach-omap2/vc.c
1611  create mode 100644 arch/arm/mach-omap2/voltagedomains2xxx_data.c
1612  create mode 100644 arch/arm/mach-omap2/vp.c
1613  create mode 100644 arch/arm/mach-picoxcell/Makefile
1614  create mode 100644 arch/arm/mach-picoxcell/Makefile.boot
1615  create mode 100644 arch/arm/mach-picoxcell/common.c
1616  create mode 100644 arch/arm/mach-picoxcell/common.h
1617  create mode 100644 arch/arm/mach-picoxcell/include/mach/debug-macro.S
1618  create mode 100644 arch/arm/mach-picoxcell/include/mach/entry-macro.S
1619  create mode 100644 arch/arm/mach-picoxcell/include/mach/gpio.h
1620  create mode 100644 arch/arm/mach-picoxcell/include/mach/hardware.h
1621  create mode 100644 arch/arm/mach-picoxcell/include/mach/io.h
1622  create mode 100644 arch/arm/mach-picoxcell/include/mach/irqs.h
1623  create mode 100644 arch/arm/mach-picoxcell/include/mach/map.h
1624  create mode 100644 arch/arm/mach-picoxcell/include/mach/memory.h
1625  create mode 100644 arch/arm/mach-picoxcell/include/mach/picoxcell_soc.h
1626  create mode 100644 arch/arm/mach-picoxcell/include/mach/system.h
1627  create mode 100644 arch/arm/mach-picoxcell/include/mach/timex.h
1628  create mode 100644 arch/arm/mach-picoxcell/include/mach/uncompress.h
1629  create mode 100644 arch/arm/mach-picoxcell/io.c
1630  create mode 100644 arch/arm/mach-picoxcell/time.c
1631  create mode 100644 arch/arm/mach-prima2/pm.c
1632  create mode 100644 arch/arm/mach-prima2/pm.h
1633  create mode 100644 arch/arm/mach-prima2/rtciobrg.c
1634  create mode 100644 arch/arm/mach-prima2/sleep.S
1635  delete mode 100644 arch/arm/mach-s3c2410/gpio.c
1636  delete mode 100644 arch/arm/mach-s3c2412/gpio.c
1637  create mode 100644 arch/arm/mach-ux500/cache-l2x0.c
1638  create mode 100644 arch/arm/mach-ux500/timer.c
1639  create mode 100644 arch/arm/plat-mxc/devices/platform-pata_imx.c
1640  create mode 100644 arch/arm/plat-omap/include/plat/voltage.h
1641  delete mode 100644 arch/arm/plat-s3c24xx/include/plat/map.h
1642  create mode 100644 arch/arm/plat-samsung/cpu.c
1643  create mode 100644 arch/arm/plat-samsung/include/plat/map-s3c.h
1644  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/map-s5p.h (94%)
1645  create mode 100644 drivers/clocksource/clksrc-dbx500-prcmu.c
1646  create mode 100644 include/linux/clksrc-dbx500-prcmu.h
1647  create mode 100644 include/linux/rtc/sirfsoc_rtciobrg.h
1648 $ git am -3 ../patches/0001-arm-soc-merge-fixup-for-fixup-reserve-being-added-to.patch
1649 Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
1650 $ git reset HEAD^
1651 Unstaged changes after reset:
1652 M       arch/arm/mach-msm/board-msm8x60.c
1653 $ git add .
1654 $ git commit -v -a --amend
1655 [master 478784b] Merge remote-tracking branch 'arm-soc/for-next'
1656 $ git reset --hard HEAD^
1657 HEAD is now at f331c45 Merge remote-tracking branch 'arm-lpae/for-next'
1658 Merging refs/next/20110930/arm-soc
1659 $ git merge refs/next/20110930/arm-soc
1660 Auto-merging Documentation/devicetree/bindings/arm/l2cc.txt
1661 CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/arm/l2cc.txt
1662 Auto-merging arch/arm/Kconfig
1663 Auto-merging arch/arm/Makefile
1664 Auto-merging arch/arm/configs/imx_v4_v5_defconfig
1665 Removing arch/arm/configs/mx1_defconfig
1666 Removing arch/arm/configs/mx21_defconfig
1667 Auto-merging arch/arm/configs/mx5_defconfig
1668 Auto-merging arch/arm/mach-at91/at91cap9_devices.c
1669 Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
1670 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
1671 Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
1672 Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
1673 Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
1674 CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in refs/next/20110930/arm-soc and modified in HEAD. Version HEAD of arch/arm/mach-at91/board-usb-a9260.c left in tree.
1675 Auto-merging arch/arm/mach-at91/board-usb-a926x.c
1676 Auto-merging arch/arm/mach-davinci/da850.c
1677 Auto-merging arch/arm/mach-davinci/dm355.c
1678 Auto-merging arch/arm/mach-davinci/dm644x.c
1679 Auto-merging arch/arm/mach-davinci/dm646x.c
1680 Auto-merging arch/arm/mach-exynos4/clock.c
1681 Removing arch/arm/mach-exynos4/mach-smdkc210.c
1682 Auto-merging arch/arm/mach-msm/board-msm8x60.c
1683 CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm8x60.c
1684 Removing arch/arm/mach-mx5/devices.c
1685 Removing arch/arm/mach-mx5/devices.h
1686 Auto-merging arch/arm/mach-mxs/include/mach/gpio.h
1687 CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/gpio.h
1688 Removing arch/arm/mach-nuc93x/Kconfig
1689 Removing arch/arm/mach-nuc93x/Makefile
1690 CONFLICT (delete/modify): arch/arm/mach-nuc93x/Makefile.boot deleted in refs/next/20110930/arm-soc and modified in HEAD. Version HEAD of arch/arm/mach-nuc93x/Makefile.boot left in tree.
1691 Removing arch/arm/mach-nuc93x/clock.c
1692 Removing arch/arm/mach-nuc93x/clock.h
1693 Removing arch/arm/mach-nuc93x/cpu.c
1694 Removing arch/arm/mach-nuc93x/cpu.h
1695 Removing arch/arm/mach-nuc93x/dev.c
1696 Removing arch/arm/mach-nuc93x/include/mach/entry-macro.S
1697 Removing arch/arm/mach-nuc93x/include/mach/hardware.h
1698 Removing arch/arm/mach-nuc93x/include/mach/io.h
1699 Removing arch/arm/mach-nuc93x/include/mach/irqs.h
1700 Removing arch/arm/mach-nuc93x/include/mach/map.h
1701 Removing arch/arm/mach-nuc93x/include/mach/memory.h
1702 Removing arch/arm/mach-nuc93x/include/mach/regs-clock.h
1703 Removing arch/arm/mach-nuc93x/include/mach/regs-ebi.h
1704 Removing arch/arm/mach-nuc93x/include/mach/regs-irq.h
1705 Removing arch/arm/mach-nuc93x/include/mach/regs-serial.h
1706 Removing arch/arm/mach-nuc93x/include/mach/regs-timer.h
1707 Removing arch/arm/mach-nuc93x/include/mach/system.h
1708 Removing arch/arm/mach-nuc93x/include/mach/timex.h
1709 Removing arch/arm/mach-nuc93x/include/mach/uncompress.h
1710 Removing arch/arm/mach-nuc93x/include/mach/vmalloc.h
1711 Removing arch/arm/mach-nuc93x/irq.c
1712 Removing arch/arm/mach-nuc93x/mach-nuc932evb.c
1713 Removing arch/arm/mach-nuc93x/nuc932.c
1714 Removing arch/arm/mach-nuc93x/nuc932.h
1715 Removing arch/arm/mach-nuc93x/time.c
1716 Auto-merging arch/arm/mach-omap2/board-generic.c
1717 Auto-merging arch/arm/mach-omap2/board-h4.c
1718 Auto-merging arch/arm/mach-omap2/board-ldp.c
1719 Removing arch/arm/mach-s3c2410/gpio.c
1720 Removing arch/arm/mach-s3c2412/gpio.c
1721 Auto-merging arch/arm/mach-tegra/board-harmony.c
1722 Auto-merging arch/arm/mach-tegra/board-paz00.c
1723 Auto-merging arch/arm/mach-tegra/board-paz00.h
1724 CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-paz00.h
1725 Auto-merging arch/arm/mach-tegra/board-seaboard.h
1726 CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-seaboard.h
1727 Auto-merging arch/arm/mach-tegra/board-trimslice.c
1728 Auto-merging arch/arm/mach-u300/Kconfig
1729 Auto-merging arch/arm/mach-u300/Makefile.boot
1730 CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
1731 Auto-merging arch/arm/mach-u300/core.c
1732 Auto-merging arch/arm/mach-ux500/board-mop500-pins.c
1733 Auto-merging arch/arm/mach-ux500/board-mop500.c
1734 Auto-merging arch/arm/mach-vexpress/hotplug.c
1735 Auto-merging arch/arm/mm/cache-l2x0.c
1736 CONFLICT (content): Merge conflict in arch/arm/mm/cache-l2x0.c
1737 Auto-merging arch/arm/plat-mxc/include/mach/gpio.h
1738 CONFLICT (content): Merge cResolved 'Documentation/devicetree/bindings/arm/l2cc.txt' using previous resolution.
1739 Resolved 'arch/arm/mach-msm/board-msm8x60.c' using previous resolution.
1740 Resolved 'arch/arm/mach-mxs/include/mach/gpio.h' using previous resolution.
1741 Resolved 'arch/arm/mach-tegra/board-paz00.h' using previous resolution.
1742 Resolved 'arch/arm/mach-tegra/board-seaboard.h' using previous resolution.
1743 Resolved 'arch/arm/mach-u300/Makefile.boot' using previous resolution.
1744 Resolved 'arch/arm/mm/cache-l2x0.c' using previous resolution.
1745 Resolved 'arch/arm/plat-mxc/include/mach/gpio.h' using previous resolution.
1746 onflict in arch/arm/plat-mxc/include/mach/gpio.h
1747 Removing arch/arm/plat-s3c24xx/include/plat/map.h
1748 Auto-merging arch/arm/plat-samsung/include/plat/map-s5p.h
1749 Automatic merge failed; fix conflicts and then commit the result.
1750 $ git rm -f arch/arm/mach-at91/board-usb-a9260.c arch/arm/mach-nuc93x/Makefile.boot
1751 Documentation/devicetree/bindings/arm/l2cc.txt: needs merge
1752 arch/arm/mach-at91/board-usb-a9260.c: needs merge
1753 arch/arm/mach-msm/board-msm8x60.c: needs merge
1754 arch/arm/mach-mxs/include/mach/gpio.h: needs merge
1755 arch/arm/mach-nuc93x/Makefile.boot: needs merge
1756 arch/arm/mach-tegra/board-paz00.h: needs merge
1757 arch/arm/mach-tegra/board-seaboard.h: needs merge
1758 arch/arm/mach-u300/Makefile.boot: needs merge
1759 arch/arm/mm/cache-l2x0.c: needs merge
1760 arch/arm/plat-mxc/include/mach/gpio.h: needs merge
1761 rm 'arch/arm/mach-at91/board-usb-a9260.c'
1762 rm 'arch/arm/mach-nuc93x/Makefile.boot'
1763 $ git commit -v -a
1764 [master f509a10] Merge commit 'refs/next/20110930/arm-soc'
1765 $ git diff -M --stat --summary HEAD^..
1766  .../devicetree/bindings/tty/serial/msm_serial.txt  |   27 +
1767  arch/arm/Kconfig                                   |   11 +-
1768  arch/arm/Makefile                                  |    5 +-
1769  arch/arm/boot/dts/msm8660-surf.dts                 |   24 +
1770  arch/arm/boot/dts/prima2-cb.dts                    |    9 +-
1771  arch/arm/boot/dts/tegra-harmony.dts                |    1 +
1772  arch/arm/boot/dts/tegra-seaboard.dts               |    4 +
1773  arch/arm/configs/exynos4_defconfig                 |    1 +
1774  .../{mx27_defconfig => imx_v4_v5_defconfig}        |   68 +-
1775  arch/arm/configs/mx1_defconfig                     |   91 -
1776  arch/arm/configs/mx21_defconfig                    |   97 -
1777  arch/arm/configs/{mx51_defconfig => mx5_defconfig} |   60 +-
1778  arch/arm/mach-at91/Kconfig                         |   13 +
1779  arch/arm/mach-at91/Makefile                        |    6 +-
1780  arch/arm/mach-at91/at91cap9.c                      |    2 +
1781  arch/arm/mach-at91/at91cap9_devices.c              |    6 +
1782  arch/arm/mach-at91/at91rm9200.c                    |    2 +
1783  arch/arm/mach-at91/at91rm9200_devices.c            |    8 +
1784  arch/arm/mach-at91/at91sam9260.c                   |    2 +
1785  arch/arm/mach-at91/at91sam9260_devices.c           |    8 +
1786  arch/arm/mach-at91/at91sam9261.c                   |   29 +-
1787  arch/arm/mach-at91/at91sam9261_devices.c           |    8 +
1788  arch/arm/mach-at91/at91sam9263.c                   |    2 +
1789  arch/arm/mach-at91/at91sam9263_devices.c           |    6 +
1790  arch/arm/mach-at91/at91sam9g45.c                   |    2 +
1791  arch/arm/mach-at91/at91sam9g45_devices.c           |    6 +
1792  arch/arm/mach-at91/board-rsi-ews.c                 |  233 ++
1793  arch/arm/mach-at91/board-usb-a9260.c               |  230 --
1794  .../{board-usb-a9263.c => board-usb-a926x.c}       |  179 +-
1795  arch/arm/mach-at91/include/mach/board.h            |    5 +
1796  arch/arm/mach-at91/include/mach/timex.h            |    5 +
1797  arch/arm/mach-davinci/Kconfig                      |   10 +
1798  arch/arm/mach-davinci/board-da850-evm.c            |  114 +
1799  arch/arm/mach-davinci/da850.c                      |    9 +
1800  arch/arm/mach-davinci/devices-da8xx.c              |    3 +
1801  arch/arm/mach-davinci/devices-tnetv107x.c          |    1 +
1802  arch/arm/mach-davinci/dm355.c                      |    1 +
1803  arch/arm/mach-davinci/dm644x.c                     |    1 +
1804  arch/arm/mach-davinci/dm646x.c                     |    1 +
1805  arch/arm/mach-davinci/dma.c                        |    5 +-
1806  arch/arm/mach-davinci/include/mach/mmc.h           |    3 +
1807  arch/arm/mach-davinci/include/mach/mux.h           |   10 +
1808  arch/arm/mach-exynos4/Kconfig                      |   57 +-
1809  arch/arm/mach-exynos4/Makefile                     |   11 +-
1810  arch/arm/mach-exynos4/clock-exynos4210.c           |  139 +
1811  arch/arm/mach-exynos4/clock-exynos4212.c           |  118 +
1812  arch/arm/mach-exynos4/clock.c                      |  218 +-
1813  arch/arm/mach-exynos4/cpu.c                        |   40 +-
1814  arch/arm/mach-exynos4/hotplug.c                    |    2 +-
1815  arch/arm/mach-exynos4/include/mach/exynos4-clock.h |   43 +
1816  arch/arm/mach-exynos4/include/mach/map.h           |    3 +-
1817  arch/arm/mach-exynos4/include/mach/regs-clock.h    |   54 +-
1818  arch/arm/mach-exynos4/mach-origen.c                |  108 +
1819  arch/arm/mach-exynos4/mach-smdk4212.c              |  292 ++
1820  arch/arm/mach-exynos4/mach-smdkc210.c              |  309 --
1821  arch/arm/mach-exynos4/mach-smdkv310.c              |   78 +
1822  arch/arm/mach-exynos4/platsmp.c                    |   10 +-
1823  arch/arm/mach-exynos4/pm.c                         |   79 +-
1824  arch/arm/mach-imx/Kconfig                          |   51 +-
1825  arch/arm/mach-imx/Makefile                         |   10 +-
1826  arch/arm/mach-imx/cache-l2x0.c                     |    2 +-
1827  arch/arm/mach-imx/clock-imx25.c                    |    6 +
1828  arch/arm/mach-imx/clock-imx27.c                    |    6 +-
1829  arch/arm/mach-imx/clock-imx31.c                    |    8 +-
1830  arch/arm/mach-imx/clock-imx35.c                    |    7 +-
1831  arch/arm/mach-imx/cpu-imx25.c                      |   41 +
1832  arch/arm/mach-imx/cpu-imx27.c                      |   28 +-
1833  arch/arm/mach-imx/cpu-imx31.c                      |   49 +-
1834  arch/arm/mach-imx/cpu-imx35.c                      |   30 +-
1835  arch/arm/mach-imx/devices-imx27.h                  |    4 +
1836  arch/arm/mach-imx/devices-imx31.h                  |    4 +
1837  arch/arm/mach-imx/devices-imx35.h                  |    4 +
1838  arch/arm/mach-imx/mach-armadillo5x0.c              |   18 +-
1839  arch/arm/mach-imx/mach-cpuimx35.c                  |    2 +-
1840  arch/arm/mach-imx/mach-mx1ads.c                    |   15 +-
1841  arch/arm/mach-imx/mach-mx25_3ds.c                  |   10 +
1842  arch/arm/mach-imx/mach-mx27_3ds.c                  |    2 +-
1843  arch/arm/mach-imx/mach-vpr200.c                    |    2 +-
1844  arch/arm/mach-msm/board-msm8x60.c                  |   58 +-
1845  arch/arm/mach-msm/hotplug.c                        |    2 +-
1846  arch/arm/mach-msm/platsmp.c                        |    2 +-
1847  arch/arm/mach-mx5/Kconfig                          |   29 +-
1848  arch/arm/mach-mx5/Makefile                         |    2 +-
1849  arch/arm/mach-mx5/board-cpuimx51.c                 |   27 +-
1850  arch/arm/mach-mx5/board-cpuimx51sd.c               |   25 +-
1851  arch/arm/mach-mx5/board-mx51_3ds.c                 |    1 -
1852  arch/arm/mach-mx5/board-mx51_babbage.c             |   26 +-
1853  arch/arm/mach-mx5/board-mx51_efikamx.c             |   13 +-
1854  arch/arm/mach-mx5/board-mx51_efikasb.c             |   24 +-
1855  arch/arm/mach-mx5/board-mx53_ard.c                 |    4 +-
1856  arch/arm/mach-mx5/board-mx53_loco.c                |   20 +
1857  arch/arm/mach-mx5/clock-mx51-mx53.c                |   14 +-
1858  arch/arm/mach-mx5/cpu.c                            |   74 +-
1859  arch/arm/mach-mx5/devices-imx51.h                  |   17 +
1860  arch/arm/mach-mx5/devices-imx53.h                  |    4 +
1861  arch/arm/mach-mx5/devices.c                        |  120 -
1862  arch/arm/mach-mx5/devices.h                        |    5 -
1863  arch/arm/mach-mx5/ehci.c                           |    2 +-
1864  arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c       |    3 +-
1865  arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c       |    6 +-
1866  arch/arm/mach-mx5/mm.c                             |    8 +-
1867  arch/arm/mach-mx5/mx51_efika.c                     |   20 +-
1868  arch/arm/mach-mx5/pm-imx5.c                        |   15 +-
1869  arch/arm/mach-mxs/Kconfig                          |    6 +
1870  arch/arm/mach-mxs/clock-mx28.c                     |    8 +-
1871  arch/arm/mach-mxs/devices-mx23.h                   |    2 +
1872  arch/arm/mach-mxs/devices-mx28.h                   |    5 +
1873  arch/arm/mach-mxs/devices/Kconfig                  |    6 +
1874  arch/arm/mach-mxs/devices/Makefile                 |    2 +
1875  arch/arm/mach-mxs/devices/platform-mxs-saif.c      |   60 +
1876  arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c  |   51 +
1877  arch/arm/mach-mxs/include/mach/devices-common.h    |   12 +
1878  arch/arm/mach-mxs/include/mach/gpio.h              |    4 -
1879  arch/arm/mach-mxs/include/mach/mxs.h               |    2 +
1880  arch/arm/mach-mxs/mach-mx23evk.c                   |    2 +-
1881  arch/arm/mach-mxs/mach-mx28evk.c                   |   79 +-
1882  arch/arm/mach-mxs/mach-stmp378x_devb.c             |    2 +-
1883  arch/arm/mach-mxs/mach-tx28.c                      |    1 +
1884  arch/arm/mach-nuc93x/Kconfig                       |   19 -
1885  arch/arm/mach-nuc93x/Makefile                      |   14 -
1886  arch/arm/mach-nuc93x/Makefile.boot                 |    3 -
1887  arch/arm/mach-nuc93x/clock.c                       |   83 -
1888  arch/arm/mach-nuc93x/clock.h                       |   36 -
1889  arch/arm/mach-nuc93x/cpu.c                         |  135 -
1890  arch/arm/mach-nuc93x/cpu.h                         |   48 -
1891  arch/arm/mach-nuc93x/dev.c                         |   42 -
1892  arch/arm/mach-nuc93x/include/mach/entry-macro.S    |   32 -
1893  arch/arm/mach-nuc93x/include/mach/hardware.h       |   22 -
1894  arch/arm/mach-nuc93x/include/mach/io.h             |   28 -
1895  arch/arm/mach-nuc93x/include/mach/irqs.h           |   59 -
1896  arch/arm/mach-nuc93x/include/mach/map.h            |  139 -
1897  arch/arm/mach-nuc93x/include/mach/memory.h         |   21 -
1898  arch/arm/mach-nuc93x/include/mach/regs-clock.h     |   53 -
1899  arch/arm/mach-nuc93x/include/mach/regs-ebi.h       |   33 -
1900  arch/arm/mach-nuc93x/include/mach/regs-irq.h       |   42 -
1901  arch/arm/mach-nuc93x/include/mach/regs-serial.h    |   52 -
1902  arch/arm/mach-nuc93x/include/mach/regs-timer.h     |   28 -
1903  arch/arm/mach-nuc93x/include/mach/system.h         |   28 -
1904  arch/arm/mach-nuc93x/include/mach/timex.h          |   25 -
1905  arch/arm/mach-nuc93x/include/mach/uncompress.h     |   50 -
1906  arch/arm/mach-nuc93x/include/mach/vmalloc.h        |   23 -
1907  arch/arm/mach-nuc93x/irq.c                         |   66 -
1908  arch/arm/mach-nuc93x/mach-nuc932evb.c              |   42 -
1909  arch/arm/mach-nuc93x/nuc932.c                      |   65 -
1910  arch/arm/mach-nuc93x/nuc932.h                      |   29 -
1911  arch/arm/mach-nuc93x/time.c                        |  100 -
1912  arch/arm/mach-omap2/Makefile                       |   86 +-
1913  arch/arm/mach-omap2/board-2430sdp.c                |    9 +-
1914  arch/arm/mach-omap2/board-3430sdp.c                |    9 +-
1915  arch/arm/mach-omap2/board-3630sdp.c                |   11 +-
1916  arch/arm/mach-omap2/board-4430sdp.c                |    9 +-
1917  arch/arm/mach-omap2/board-am3517crane.c            |    9 +-
1918  arch/arm/mach-omap2/board-am3517evm.c              |    8 +-
1919  arch/arm/mach-omap2/board-apollon.c                |    9 +-
1920  arch/arm/mach-omap2/board-cm-t35.c                 |   13 +-
1921  arch/arm/mach-omap2/board-cm-t3517.c               |    9 +-
1922  arch/arm/mach-omap2/board-devkit8000.c             |   12 +-
1923  arch/arm/mach-omap2/board-generic.c                |    2 +-
1924  arch/arm/mach-omap2/board-h4.c                     |    9 +-
1925  arch/arm/mach-omap2/board-igep0020.c               |   13 +-
1926  arch/arm/mach-omap2/board-ldp.c                    |    9 +-
1927  arch/arm/mach-omap2/board-n8x0.c                   |   13 +-
1928  arch/arm/mach-omap2/board-omap3beagle.c            |    4 +-
1929  arch/arm/mach-omap2/board-omap3evm.c               |    9 +-
1930  arch/arm/mach-omap2/board-omap3logic.c             |   11 +-
1931  arch/arm/mach-omap2/board-omap3pandora.c           |   11 +-
1932  arch/arm/mach-omap2/board-omap3stalker.c           |    9 +-
1933  arch/arm/mach-omap2/board-omap3touchbook.c         |   11 +-
1934  arch/arm/mach-omap2/board-omap4panda.c             |    9 +-
1935  arch/arm/mach-omap2/board-overo.c                  |   11 +-
1936  arch/arm/mach-omap2/board-rm680.c                  |   17 +-
1937  arch/arm/mach-omap2/board-rx51.c                   |   17 +-
1938  arch/arm/mach-omap2/board-ti8168evm.c              |    9 +-
1939  arch/arm/mach-omap2/board-zoom.c                   |   23 +-
1940  arch/arm/mach-omap2/clock3xxx_data.c               |   11 +-
1941  arch/arm/mach-omap2/clockdomain.c                  |  147 +-
1942  arch/arm/mach-omap2/clockdomain.h                  |   22 +-
1943  arch/arm/mach-omap2/clockdomain2xxx_3xxx.c         |    4 -
1944  arch/arm/mach-omap2/clockdomain44xx.c              |    2 -
1945  arch/arm/mach-omap2/clockdomains2420_data.c        |  154 +
1946  arch/arm/mach-omap2/clockdomains2430_data.c        |  181 +
1947  arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c   |  803 +-----
1948  arch/arm/mach-omap2/clockdomains3xxx_data.c        |  398 +++
1949  arch/arm/mach-omap2/clockdomains44xx_data.c        |  409 +--
1950  arch/arm/mach-omap2/id.c                           |  191 +-
1951  arch/arm/mach-omap2/io.c                           |   57 +-
1952  arch/arm/mach-omap2/omap_hwmod.c                   |    3 -
1953  arch/arm/mach-omap2/omap_hwmod_2420_data.c         |   37 -
1954  arch/arm/mach-omap2/omap_hwmod_2430_data.c         |   45 -
1955  arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |  173 +-
1956  arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |   82 -
1957  arch/arm/mach-omap2/omap_twl.c                     |  107 +-
1958  arch/arm/mach-omap2/pm.c                           |    6 +-
1959  arch/arm/mach-omap2/powerdomain-common.c           |    7 +-
1960  arch/arm/mach-omap2/powerdomain.c                  |  110 +-
1961  arch/arm/mach-omap2/powerdomain.h                  |   19 +-
1962  arch/arm/mach-omap2/powerdomain2xxx_3xxx.c         |    2 +-
1963  arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c   |   21 +-
1964  arch/arm/mach-omap2/powerdomains2xxx_data.c        |   48 +-
1965  arch/arm/mach-omap2/powerdomains3xxx_data.c        |   97 +-
1966  arch/arm/mach-omap2/powerdomains44xx_data.c        |   36 +-
1967  arch/arm/mach-omap2/prm2xxx_3xxx.c                 |   56 +
1968  arch/arm/mach-omap2/prm2xxx_3xxx.h                 |   12 +
1969  arch/arm/mach-omap2/prm44xx.c                      |   71 +
1970  arch/arm/mach-omap2/prm44xx.h                      |   12 +
1971  arch/arm/mach-omap2/smartreflex-class3.c           |    4 +-
1972  arch/arm/mach-omap2/smartreflex.c                  |   29 +-
1973  arch/arm/mach-omap2/sr_device.c                    |    2 +-
1974  arch/arm/mach-omap2/vc.c                           |  367 ++
1975  arch/arm/mach-omap2/vc.h                           |   88 +-
1976  arch/arm/mach-omap2/vc3xxx_data.c                  |   31 +-
1977  arch/arm/mach-omap2/vc44xx_data.c                  |   44 +-
1978  arch/arm/mach-omap2/voltage.c                      | 1088 ++-----
1979  arch/arm/mach-omap2/voltage.h                      |  138 +-
1980  arch/arm/mach-omap2/voltagedomains2xxx_data.c      |   32 +
1981  arch/arm/mach-omap2/voltagedomains3xxx_data.c      |   83 +-
1982  arch/arm/mach-omap2/voltagedomains44xx_data.c      |   99 +-
1983  arch/arm/mach-omap2/vp.c                           |  278 ++
1984  arch/arm/mach-omap2/vp.h                           |  133 +-
1985  arch/arm/mach-omap2/vp3xxx_data.c                  |   35 +-
1986  arch/arm/mach-omap2/vp44xx_data.c                  |   47 +-
1987  arch/arm/mach-prima2/Makefile                      |    2 +
1988  arch/arm/mach-prima2/irq.c                         |   43 +
1989  arch/arm/mach-prima2/pm.c                          |  149 +
1990  arch/arm/mach-prima2/pm.h                          |   29 +
1991  arch/arm/mach-prima2/rtciobrg.c                    |  139 +
1992  arch/arm/mach-prima2/sleep.S                       |   64 +
1993  arch/arm/mach-prima2/timer.c                       |   34 +
1994  arch/arm/mach-realview/hotplug.c                   |    2 +-
1995  arch/arm/mach-s3c2410/Kconfig                      |    6 -
1996  arch/arm/mach-s3c2410/Makefile                     |    1 -
1997  arch/arm/mach-s3c2410/dma.c                        |   14 -
1998  arch/arm/mach-s3c2410/gpio.c                       |   72 -
1999  arch/arm/mach-s3c2410/include/mach/map.h           |   52 +-
2000  arch/arm/mach-s3c2412/Kconfig                      |    1 -
2001  arch/arm/mach-s3c2412/Makefile                     |    1 -
2002  arch/arm/mach-s3c2412/dma.c                        |   18 -
2003  arch/arm/mach-s3c2412/gpio.c                       |   62 -
2004  arch/arm/mach-s3c2440/Kconfig                      |    2 -
2005  arch/arm/mach-s3c2440/dma.c                        |   17 -
2006  arch/arm/mach-s3c2443/dma.c                        |   27 -
2007  arch/arm/mach-s3c64xx/cpu.c                        |   22 +-
2008  arch/arm/mach-s3c64xx/include/mach/map.h           |    9 +-
2009  arch/arm/mach-s3c64xx/mach-crag6410.c              |    3 -
2010  arch/arm/mach-s3c64xx/mach-mini6410.c              |    8 +-
2011  arch/arm/mach-s3c64xx/mach-real6410.c              |    8 +-
2012  arch/arm/mach-s3c64xx/mach-smdk6410.c              |    8 +-
2013  arch/arm/mach-s5p64x0/dev-spi.c                    |    8 +-
2014  arch/arm/mach-s5p64x0/dma.c                        |    7 +-
2015  arch/arm/mach-s5p64x0/gpiolib.c                    |    7 +-
2016  arch/arm/mach-s5p64x0/irq-eint.c                   |    3 +-
2017  arch/arm/mach-s5p64x0/mach-smdk6440.c              |    8 +-
2018  arch/arm/mach-s5p64x0/mach-smdk6450.c              |    8 +-
2019  arch/arm/mach-s5pc100/mach-smdkc100.c              |    8 +-
2020  arch/arm/mach-s5pv210/Kconfig                      |    6 -
2021  arch/arm/mach-s5pv210/Makefile                     |    2 +-
2022  arch/arm/mach-s5pv210/mach-smdkv210.c              |    8 +-
2023  arch/arm/mach-shmobile/smp-sh73a0.c                |    6 +-
2024  arch/arm/mach-tegra/board-harmony.c                |    5 +-
2025  arch/arm/mach-tegra/board-paz00-pinmux.c           |    3 +
2026  arch/arm/mach-tegra/board-paz00.c                  |   62 +-
2027  arch/arm/mach-tegra/board-paz00.h                  |   16 +-
2028  arch/arm/mach-tegra/board-seaboard-pinmux.c        |    6 +-
2029  arch/arm/mach-tegra/board-seaboard.c               |   81 +-
2030  arch/arm/mach-tegra/board-seaboard.h               |   12 +-
2031  arch/arm/mach-tegra/board-trimslice.c              |    3 +-
2032  arch/arm/mach-u300/Kconfig                         |   46 -
2033  arch/arm/mach-u300/Makefile.boot                   |   17 +-
2034  arch/arm/mach-u300/core.c                          |   82 +-
2035  arch/arm/mach-u300/include/mach/memory.h           |   22 +-
2036  arch/arm/mach-u300/u300.c                          |   16 -
2037  arch/arm/mach-ux500/Kconfig                        |    1 +
2038  arch/arm/mach-ux500/Makefile                       |    1 +
2039  arch/arm/mach-ux500/board-mop500-pins.c            |   34 +-
2040  arch/arm/mach-ux500/board-mop500-sdi.c             |   52 +-
2041  arch/arm/mach-ux500/board-mop500.c                 |   78 +-
2042  arch/arm/mach-ux500/board-mop500.h                 |    3 +
2043  arch/arm/mach-ux500/cache-l2x0.c                   |   95 +
2044  arch/arm/mach-ux500/cpu.c                          |   69 -
2045  arch/arm/mach-ux500/hotplug.c                      |    2 +-
2046  arch/arm/mach-ux500/include/mach/uncompress.h      |   10 +-
2047  arch/arm/mach-ux500/pins-db8500.h                  |  142 +-
2048  arch/arm/mach-ux500/platsmp.c                      |    2 +-
2049  arch/arm/mach-vexpress/hotplug.c                   |    2 +-
2050  arch/arm/plat-mxc/Kconfig                          |   39 +-
2051  arch/arm/plat-mxc/audmux-v2.c                      |   18 +-
2052  arch/arm/plat-mxc/cpu.c                            |    9 +
2053  arch/arm/plat-mxc/devices.c                        |   14 -
2054  arch/arm/plat-mxc/devices/Kconfig                  |    5 +-
2055  arch/arm/plat-mxc/devices/Makefile                 |    1 +
2056  arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c  |    5 +
2057  arch/arm/plat-mxc/devices/platform-imx-i2c.c       |    6 +
2058  arch/arm/plat-mxc/devices/platform-mxc-ehci.c      |    9 +
2059  arch/arm/plat-mxc/devices/platform-pata_imx.c      |   59 +
2060  arch/arm/plat-mxc/include/mach/common.h            |    2 +-
2061  arch/arm/plat-mxc/include/mach/devices-common.h    |    8 +
2062  arch/arm/plat-mxc/include/mach/gpio.h              |    8 -
2063  arch/arm/plat-mxc/include/mach/hardware.h          |    6 +
2064  arch/arm/plat-mxc/include/mach/iomux-mx51.h        | 2270 +++++---------
2065  arch/arm/plat-mxc/include/mach/iomux-mx53.h        | 3530 +++++++-------------
2066  arch/arm/plat-mxc/include/mach/iomux-v3.h          |    1 +
2067  arch/arm/plat-mxc/include/mach/memory.h            |   16 +-
2068  arch/arm/plat-mxc/include/mach/mx25.h              |    5 +
2069  arch/arm/plat-mxc/include/mach/mx35.h              |    2 +-
2070  arch/arm/plat-mxc/include/mach/mx3x.h              |   18 +-
2071  arch/arm/plat-mxc/include/mach/mx51.h              |  167 +-
2072  arch/arm/plat-mxc/pwm.c                            |    2 +-
2073  arch/arm/plat-nomadik/include/plat/pincfg.h        |    5 -
2074  arch/arm/plat-omap/include/plat/clock.h            |    2 -
2075  arch/arm/plat-omap/include/plat/common.h           |    9 +
2076  arch/arm/plat-omap/include/plat/cpu.h              |  108 +-
2077  arch/arm/plat-omap/include/plat/io.h               |    2 +-
2078  arch/arm/plat-omap/include/plat/omap_hwmod.h       |    3 -
2079  arch/arm/plat-omap/include/plat/voltage.h          |   20 +
2080  arch/arm/plat-s3c24xx/cpu.c                        |    9 +-
2081  arch/arm/plat-s3c24xx/include/plat/map.h           |  100 -
2082  arch/arm/plat-s5p/cpu.c                            |   37 +-
2083  arch/arm/plat-s5p/include/plat/exynos4.h           |    5 +-
2084  arch/arm/plat-s5p/include/plat/pll.h               |   56 +-
2085  arch/arm/plat-samsung/Makefile                     |    2 +-
2086  arch/arm/plat-samsung/cpu.c                        |   58 +
2087  arch/arm/plat-samsung/dev-hsmmc.c                  |   19 +-
2088  arch/arm/plat-samsung/dev-hsmmc1.c                 |   19 +-
2089  arch/arm/plat-samsung/dev-hsmmc2.c                 |   19 +-
2090  arch/arm/plat-samsung/dev-hsmmc3.c                 |   19 +-
2091  arch/arm/plat-samsung/dev-ts.c                     |    9 +
2092  arch/arm/plat-samsung/include/plat/cpu.h           |  105 +-
2093  arch/arm/plat-samsung/include/plat/dma-s3c24xx.h   |    6 -
2094  arch/arm/plat-samsung/include/plat/map-s3c.h       |   84 +
2095  .../include/plat/map-s5p.h                         |    6 +-
2096  arch/arm/plat-samsung/include/plat/sdhci.h         |    7 +
2097  arch/arm/plat-samsung/platformdata.c               |   22 +
2098  arch/arm/plat-versatile/platsmp.c                  |    2 +-
2099  drivers/gpio/gpio-mxc.c                            |   12 +
2100  drivers/gpio/gpio-mxs.c                            |    2 +
2101  drivers/mmc/host/davinci_mmc.c                     |   13 +
2102  drivers/tty/serial/msm_serial.c                    |   30 +-
2103  drivers/usb/host/ohci-at91.c                       |  239 ++-
2104  include/linux/rtc/sirfsoc_rtciobrg.h               |   18 +
2105  339 files changed, 9354 insertions(+), 11059 deletions(-)
2106  create mode 100644 Documentation/devicetree/bindings/tty/serial/msm_serial.txt
2107  create mode 100644 arch/arm/boot/dts/msm8660-surf.dts
2108  rename arch/arm/configs/{mx27_defconfig => imx_v4_v5_defconfig} (69%)
2109  delete mode 100644 arch/arm/configs/mx1_defconfig
2110  delete mode 100644 arch/arm/configs/mx21_defconfig
2111  rename arch/arm/configs/{mx51_defconfig => mx5_defconfig} (82%)
2112  create mode 100644 arch/arm/mach-at91/board-rsi-ews.c
2113  delete mode 100644 arch/arm/mach-at91/board-usb-a9260.c
2114  rename arch/arm/mach-at91/{board-usb-a9263.c => board-usb-a926x.c} (54%)
2115  create mode 100644 arch/arm/mach-exynos4/clock-exynos4210.c
2116  create mode 100644 arch/arm/mach-exynos4/clock-exynos4212.c
2117  create mode 100644 arch/arm/mach-exynos4/include/mach/exynos4-clock.h
2118  create mode 100644 arch/arm/mach-exynos4/mach-origen.c
2119  create mode 100644 arch/arm/mach-exynos4/mach-smdk4212.c
2120  delete mode 100644 arch/arm/mach-exynos4/mach-smdkc210.c
2121  create mode 100644 arch/arm/mach-imx/cpu-imx25.c
2122  delete mode 100644 arch/arm/mach-mx5/devices.c
2123  delete mode 100644 arch/arm/mach-mx5/devices.h
2124  create mode 100644 arch/arm/mach-mxs/devices/platform-mxs-saif.c
2125  create mode 100644 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c
2126  delete mode 100644 arch/arm/mach-nuc93x/Kconfig
2127  delete mode 100644 arch/arm/mach-nuc93x/Makefile
2128  delete mode 100644 arch/arm/mach-nuc93x/Makefile.boot
2129  delete mode 100644 arch/arm/mach-nuc93x/clock.c
2130  delete mode 100644 arch/arm/mach-nuc93x/clock.h
2131  delete mode 100644 arch/arm/mach-nuc93x/cpu.c
2132  delete mode 100644 arch/arm/mach-nuc93x/cpu.h
2133  delete mode 100644 arch/arm/mach-nuc93x/dev.c
2134  delete mode 100644 arch/arm/mach-nuc93x/include/mach/entry-macro.S
2135  delete mode 100644 arch/arm/mach-nuc93x/include/mach/hardware.h
2136  delete mode 100644 arch/arm/mach-nuc93x/include/mach/io.h
2137  delete mode 100644 arch/arm/mach-nuc93x/include/mach/irqs.h
2138  delete mode 100644 arch/arm/mach-nuc93x/include/mach/map.h
2139  delete mode 100644 arch/arm/mach-nuc93x/include/mach/memory.h
2140  delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-clock.h
2141  delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-ebi.h
2142  delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-irq.h
2143  delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-serial.h
2144  delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-timer.h
2145  delete mode 100644 arch/arm/mach-nuc93x/include/mach/system.h
2146  delete mode 100644 arch/arm/mach-nuc93x/include/mach/timex.h
2147  delete mode 100644 arch/arm/mach-nuc93x/include/mach/uncompress.h
2148  delete mode 100644 arch/arm/mach-nuc93x/include/mach/vmalloc.h
2149  delete mode 100644 arch/arm/mach-nuc93x/irq.c
2150  delete mode 100644 arch/arm/mach-nuc93x/mach-nuc932evb.c
2151  delete mode 100644 arch/arm/mach-nuc93x/nuc932.c
2152  delete mode 100644 arch/arm/mach-nuc93x/nuc932.h
2153  delete mode 100644 arch/arm/mach-nuc93x/time.c
2154  create mode 100644 arch/arm/mach-omap2/clockdomains2420_data.c
2155  create mode 100644 arch/arm/mach-omap2/clockdomains2430_data.c
2156  create mode 100644 arch/arm/mach-omap2/clockdomains3xxx_data.c
2157  create mode 100644 arch/arm/mach-omap2/vc.c
2158  create mode 100644 arch/arm/mach-omap2/voltagedomains2xxx_data.c
2159  create mode 100644 arch/arm/mach-omap2/vp.c
2160  create mode 100644 arch/arm/mach-prima2/pm.c
2161  create mode 100644 arch/arm/mach-prima2/pm.h
2162  create mode 100644 arch/arm/mach-prima2/rtciobrg.c
2163  create mode 100644 arch/arm/mach-prima2/sleep.S
2164  delete mode 100644 arch/arm/mach-s3c2410/gpio.c
2165  delete mode 100644 arch/arm/mach-s3c2412/gpio.c
2166  create mode 100644 arch/arm/mach-ux500/cache-l2x0.c
2167  create mode 100644 arch/arm/plat-mxc/devices/platform-pata_imx.c
2168  create mode 100644 arch/arm/plat-omap/include/plat/voltage.h
2169  delete mode 100644 arch/arm/plat-s3c24xx/include/plat/map.h
2170  create mode 100644 arch/arm/plat-samsung/cpu.c
2171  create mode 100644 arch/arm/plat-samsung/include/plat/map-s3c.h
2172  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/map-s5p.h (94%)
2173  create mode 100644 include/linux/rtc/sirfsoc_rtciobrg.h
2174 $ git am -3 ../patches/0001-arm-soc-merge-fixup-for-fixup-reserve-being-added-to.patch
2175 Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
2176 $ git reset HEAD^
2177 Unstaged changes after reset:
2178 M       arch/arm/mach-msm/board-msm8x60.c
2179 $ git add .
2180 $ git commit -v -a --amend
2181 [master 6272ae0] Merge commit 'refs/next/20110930/arm-soc'
2182 Merging at91/at91-next
2183 $ git merge at91/at91-next
2184 Auto-merging arch/arm/mach-at91/at91cap9.c
2185 Auto-merging arch/arm/mach-at91/at91cap9_devices.c
2186 Auto-merging arch/arm/mach-at91/at91rm9200.c
2187 Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
2188 Auto-merging arch/arm/mach-at91/at91sam9260.c
2189 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
2190 Auto-merging arch/arm/mach-at91/at91sam9261.c
2191 Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
2192 Auto-merging arch/arm/mach-at91/at91sam9263.c
2193 Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
2194 Auto-merging arch/arm/mach-at91/at91sam9g45.c
2195 Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
2196 Auto-merging arch/arm/mach-at91/at91sam9rl_devices.c
2197 Auto-merging arch/arm/mach-at91/board-1arm.c
2198 Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
2199 Auto-merging arch/arm/mach-at91/board-cam60.c
2200 Auto-merging arch/arm/mach-at91/board-cap9adk.c
2201 Auto-merging arch/arm/mach-at91/board-carmeva.c
2202 Auto-merging arch/arm/mach-at91/board-cpu9krea.c
2203 Auto-merging arch/arm/mach-at91/board-cpuat91.c
2204 Auto-merging arch/arm/mach-at91/board-csb337.c
2205 Auto-merging arch/arm/mach-at91/board-csb637.c
2206 Auto-merging arch/arm/mach-at91/board-eb9200.c
2207 Auto-merging arch/arm/mach-at91/board-ecbat91.c
2208 Auto-merging arch/arm/mach-at91/board-kafa.c
2209 Auto-merging arch/arm/mach-at91/board-kb9202.c
2210 Auto-merging arch/arm/mach-at91/board-neocore926.c
2211 Auto-merging arch/arm/mach-at91/board-picotux200.c
2212 Auto-merging arch/arm/mach-at91/board-qil-a9260.c
2213 Auto-merging arch/arm/mach-at91/board-rm9200dk.c
2214 Auto-merging arch/arm/mach-at91/board-rm9200ek.c
2215 Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
2216 Auto-merging arch/arm/mach-at91/board-sam9260ek.c
2217 Auto-merging arch/arm/mach-at91/board-sam9261ek.c
2218 Auto-merging arch/arm/mach-at91/board-sam9263ek.c
2219 Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
2220 Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
2221 Auto-merging arch/arm/mach-at91/board-sam9rlek.c
2222 Auto-merging arch/arm/mach-at91/board-usb-a926x.c
2223 Auto-merging arch/arm/mach-at91/board-yl-9200.c
2224 Auto-merging arch/arm/mach-at91/gpio.c
2225 Auto-merging arch/arm/mach-at91/include/mach/at91sam9g45.h
2226 Auto-merging arch/arm/mach-at91/include/mach/gpio.h
2227 Auto-merging drivers/ata/pata_at91.c
2228 Auto-merging drivers/ide/at91_ide.c
2229 Auto-merging drivers/usb/host/ohci-at91.c
2230 Merge made by recursive.
2231  arch/arm/mach-at91/at91cap9.c                 |    8 +-
2232  arch/arm/mach-at91/at91cap9_devices.c         |   20 +-
2233  arch/arm/mach-at91/at91rm9200.c               |    8 +-
2234  arch/arm/mach-at91/at91rm9200_devices.c       |   22 +-
2235  arch/arm/mach-at91/at91sam9260.c              |    6 +-
2236  arch/arm/mach-at91/at91sam9260_devices.c      |   26 +-
2237  arch/arm/mach-at91/at91sam9261.c              |    6 +-
2238  arch/arm/mach-at91/at91sam9261_devices.c      |   14 +-
2239  arch/arm/mach-at91/at91sam9263.c              |   10 +-
2240  arch/arm/mach-at91/at91sam9263_devices.c      |   26 +-
2241  arch/arm/mach-at91/at91sam9g45.c              |   10 +-
2242  arch/arm/mach-at91/at91sam9g45_devices.c      |   20 +-
2243  arch/arm/mach-at91/at91sam9rl.c               |    8 +-
2244  arch/arm/mach-at91/at91sam9rl_devices.c       |   16 +-
2245  arch/arm/mach-at91/board-1arm.c               |    1 +
2246  arch/arm/mach-at91/board-afeb-9260v1.c        |    7 +-
2247  arch/arm/mach-at91/board-cam60.c              |    3 +-
2248  arch/arm/mach-at91/board-cap9adk.c            |   14 +-
2249  arch/arm/mach-at91/board-carmeva.c            |    6 +-
2250  arch/arm/mach-at91/board-cpu9krea.c           |    7 +-
2251  arch/arm/mach-at91/board-cpuat91.c            |    4 +
2252  arch/arm/mach-at91/board-csb337.c             |    4 +-
2253  arch/arm/mach-at91/board-csb637.c             |    1 +
2254  arch/arm/mach-at91/board-eb9200.c             |    8 +-
2255  arch/arm/mach-at91/board-ecbat91.c            |    4 +
2256  arch/arm/mach-at91/board-eco920.c             |    4 +
2257  arch/arm/mach-at91/board-flexibity.c          |    4 +-
2258  arch/arm/mach-at91/board-foxg20.c             |    6 +-
2259  arch/arm/mach-at91/board-gsia18s.c            |    4 +-
2260  arch/arm/mach-at91/board-kafa.c               |    1 +
2261  arch/arm/mach-at91/board-kb9202.c             |    5 +-
2262  arch/arm/mach-at91/board-neocore926.c         |    4 +-
2263  arch/arm/mach-at91/board-pcontrol-g20.c       |    1 +
2264  arch/arm/mach-at91/board-picotux200.c         |    2 +
2265  arch/arm/mach-at91/board-qil-a9260.c          |   11 +-
2266  arch/arm/mach-at91/board-rm9200dk.c           |   10 +-
2267  arch/arm/mach-at91/board-rm9200ek.c           |    2 +
2268  arch/arm/mach-at91/board-sam9-l9260.c         |    7 +-
2269  arch/arm/mach-at91/board-sam9260ek.c          |   11 +-
2270  arch/arm/mach-at91/board-sam9261ek.c          |    8 +-
2271  arch/arm/mach-at91/board-sam9263ek.c          |    7 +-
2272  arch/arm/mach-at91/board-sam9g20ek.c          |    8 +-
2273  arch/arm/mach-at91/board-sam9m10g45ek.c       |    3 +
2274  arch/arm/mach-at91/board-sam9rlek.c           |    7 +-
2275  arch/arm/mach-at91/board-snapper9260.c        |    5 +
2276  arch/arm/mach-at91/board-stamp9g20.c          |   11 +-
2277  arch/arm/mach-at91/board-usb-a926x.c          |    5 +-
2278  arch/arm/mach-at91/board-yl-9200.c            |    6 +-
2279  arch/arm/mach-at91/generic.h                  |    2 +-
2280  arch/arm/mach-at91/gpio.c                     |   62 +++--
2281  arch/arm/mach-at91/include/mach/at91cap9.h    |    9 +-
2282  arch/arm/mach-at91/include/mach/at91rm9200.h  |    9 +-
2283  arch/arm/mach-at91/include/mach/at91sam9260.h |    7 +-
2284  arch/arm/mach-at91/include/mach/at91sam9261.h |    7 +-
2285  arch/arm/mach-at91/include/mach/at91sam9263.h |   11 +-
2286  arch/arm/mach-at91/include/mach/at91sam9g45.h |   11 +-
2287  arch/arm/mach-at91/include/mach/at91sam9rl.h  |    9 +-
2288  arch/arm/mach-at91/include/mach/gpio.h        |  336 ++++++++++++-------------
2289  drivers/ata/pata_at91.c                       |    6 +-
2290  drivers/ide/at91_ide.c                        |    2 +-
2291  drivers/mmc/host/at91_mci.c                   |   30 ++--
2292  drivers/mtd/nand/atmel_nand.c                 |    8 +-
2293  drivers/usb/gadget/at91_udc.c                 |   14 +-
2294  drivers/usb/host/ohci-at91.c                  |    4 +-
2295  64 files changed, 510 insertions(+), 408 deletions(-)
2296 Merging davinci/davinci-next
2297 $ git merge davinci/davinci-next
2298 Already up-to-date.
2299 Merging i.MX/for-next
2300 $ git merge i.MX/for-next
2301 Resolved 'arch/arm/mach-imx/Makefile' using previous resolution.
2302 Auto-merging arch/arm/mach-imx/Makefile
2303 CONFLICT (content): Merge conflict in arch/arm/mach-imx/Makefile
2304 Removing arch/arm/mach-mx5/mm-mx50.c
2305 Automatic merge failed; fix conflicts and then commit the result.
2306 $ git commit -v -a
2307 [master a908ade] Merge remote-tracking branch 'i.MX/for-next'
2308 $ git diff -M --stat --summary HEAD^..
2309  arch/arm/mach-imx/Kconfig                 |    1 +
2310  arch/arm/mach-imx/Makefile                |    2 +-
2311  arch/arm/mach-mx5/Makefile                |    1 -
2312  arch/arm/mach-mx5/mm-mx50.c               |   72 ---------------------------
2313  arch/arm/mach-mx5/mm.c                    |   76 ++++++++++++++++++-----------
2314  arch/arm/mach-mxs/clock-mx28.c            |    6 ++-
2315  arch/arm/plat-mxc/include/mach/hardware.h |    7 ++-
2316  arch/arm/plat-mxc/include/mach/mx51.h     |   16 +------
2317  arch/arm/plat-mxc/include/mach/mx53.h     |    1 +
2318  9 files changed, 62 insertions(+), 120 deletions(-)
2319  delete mode 100644 arch/arm/mach-mx5/mm-mx50.c
2320 Merging linux-spec/for-next
2321 $ git merge linux-spec/for-next
2322 Already up-to-date.
2323 Merging omap/for-next
2324 $ git merge omap/for-next
2325 Already up-to-date.
2326 Merging pxa/for-next
2327 $ git merge pxa/for-next
2328 Already up-to-date.
2329 Merging samsung/next-samsung
2330 $ git merge samsung/next-samsung
2331 Already up-to-date.
2332 Merging s5p/for-next
2333 $ git merge s5p/for-next
2334 Auto-merging arch/arm/Kconfig
2335 Removing arch/arm/mach-exynos4/include/mach/clkdev.h
2336 Auto-merging arch/arm/mach-exynos4/mach-nuri.c
2337 Auto-merging arch/arm/mach-exynos4/mach-origen.c
2338 Auto-merging arch/arm/mach-exynos4/mach-smdk4x12.c
2339 Auto-merging arch/arm/mach-exynos4/mach-smdkv310.c
2340 Auto-merging arch/arm/mach-exynos4/mach-universal_c210.c
2341 Auto-merging arch/arm/mach-exynos4/platsmp.c
2342 Auto-merging arch/arm/mach-s3c2410/mach-h1940.c
2343 Auto-merging arch/arm/mach-s3c64xx/cpu.c
2344 Removing arch/arm/mach-s3c64xx/gpiolib.c
2345 Removing arch/arm/mach-s3c64xx/include/mach/clkdev.h
2346 Removing arch/arm/mach-s3c64xx/include/mach/pll.h
2347 Removing arch/arm/mach-s3c64xx/include/mach/pwm-clock.h
2348 Auto-merging arch/arm/mach-s3c64xx/mach-anw6410.c
2349 Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
2350 Auto-merging arch/arm/mach-s3c64xx/mach-hmt.c
2351 Auto-merging arch/arm/mach-s3c64xx/mach-mini6410.c
2352 Auto-merging arch/arm/mach-s3c64xx/mach-ncp.c
2353 Auto-merging arch/arm/mach-s3c64xx/mach-real6410.c
2354 Auto-merging arch/arm/mach-s3c64xx/mach-smartq5.c
2355 Auto-merging arch/arm/mach-s3c64xx/mach-smartq7.c
2356 Auto-merging arch/arm/mach-s3c64xx/mach-smdk6400.c
2357 Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c
2358 Auto-merging arch/arm/mach-s5p64x0/cpu.c
2359 Removing arch/arm/mach-s5p64x0/include/mach/clkdev.h
2360 Removing arch/arm/mach-s5p64x0/include/mach/pwm-clock.h
2361 Auto-merging arch/arm/mach-s5p64x0/mach-smdk6440.c
2362 Auto-merging arch/arm/mach-s5p64x0/mach-smdk6450.c
2363 Removing arch/arm/mach-s5pc100/include/mach/clkdev.h
2364 Removing arch/arm/mach-s5pc100/include/mach/pwm-clock.h
2365 Auto-merging arch/arm/mach-s5pv210/cpu.c
2366 Removing arch/arm/mach-s5pv210/include/mach/clkdev.h
2367 Removing arch/arm/mach-s5pv210/include/mach/pwm-clock.h
2368 Auto-merging arch/arm/mach-s5pv210/mach-goni.c
2369 Removing arch/arm/mach-s5pv210/sleep.S
2370 Removing arch/arm/plat-s3c24xx/gpio.c
2371 Removing arch/arm/plat-s3c24xx/gpiolib.c
2372 Removing arch/arm/plat-s3c24xx/include/mach/clkdev.h
2373 Removing arch/arm/plat-s3c24xx/include/mach/pwm-clock.h
2374 Removing arch/arm/plat-s3c24xx/include/plat/pll.h
2375 Removing arch/arm/plat-s3c24xx/include/plat/regs-iis.h
2376 Removing arch/arm/plat-s3c24xx/include/plat/regs-spi.h
2377 Auto-merging arch/arm/plat-s5p/sleep.S
2378 Removing arch/arm/plat-samsung/gpio-config.c
2379 Removing arch/arm/plat-samsung/gpio.c
2380 Auto-merging arch/arm/plat-samsung/include/plat/audio-simtec.h
2381 Auto-merging arch/arm/plat-samsung/include/plat/camport.h
2382 Auto-merging arch/arm/plat-samsung/include/plat/common-smdk.h
2383 Auto-merging arch/arm/plat-samsung/include/plat/cpu-freq-core.h
2384 Auto-merging arch/arm/plat-samsung/include/plat/dma-pl330.h
2385 Auto-merging arch/arm/plat-samsung/include/plat/ehci.h
2386 Auto-merging arch/arm/plat-samsung/include/plat/exynos4.h
2387 Auto-merging arch/arm/plat-samsung/include/plat/fiq.h
2388 Auto-merging arch/arm/plat-samsung/include/plat/irq.h
2389 Auto-merging arch/arm/plat-samsung/include/plat/irqs.h
2390 Auto-merging arch/arm/plat-samsung/include/plat/mci.h
2391 Auto-merging arch/arm/plat-samsung/include/plat/mfc.h
2392 Auto-merging arch/arm/plat-samsung/include/plat/mipi_csis.h
2393 Auto-merging arch/arm/plat-samsung/include/plat/pll.h
2394 Removing arch/arm/plat-samsung/include/plat/pll6553x.h
2395 Auto-merging arch/arm/plat-samsung/include/plat/pwm-clock.h
2396 Auto-merging arch/arm/plat-samsung/include/plat/regs-dma.h
2397 Auto-merging arch/arm/plat-samsung/include/plat/regs-srom.h
2398 Auto-merging arch/arm/plat-samsung/include/plat/regs-udc.h
2399 Auto-merging arch/arm/plat-samsung/include/plat/reset.h
2400 Removing arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h
2401 Auto-merging arch/arm/plat-samsung/include/plat/s3c2410.h
2402 Auto-merging arch/arm/plat-samsung/include/plat/s3c2412.h
2403 Auto-merging arch/arm/plat-samsung/include/plat/s3c2416.h
2404 Auto-merging arch/arm/plat-samsung/include/plat/s3c2443.h
2405 Auto-merging arch/arm/plat-samsung/include/plat/s3c244x.h
2406 Auto-merging arch/arm/plat-samsung/include/plat/s3c6400.h
2407 Auto-merging arch/arm/plat-samsung/include/plat/s3c6410.h
2408 Auto-merging arch/arm/plat-samsung/include/plat/s5p-clock.h
2409 Auto-merging arch/arm/plat-samsung/include/plat/s5p-time.h
2410 Auto-merging arch/arm/plat-samsung/include/plat/s5p6440.h
2411 Auto-merging arch/arm/plat-samsung/include/plat/s5p6450.h
2412 AutResolved 'drivers/gpio/Makefile' using previous resolution.
2413 o-merging arch/arm/plat-samsung/include/plat/s5pc100.h
2414 Auto-merging arch/arm/plat-samsung/include/plat/s5pv210.h
2415 Auto-merging arch/arm/plat-samsung/include/plat/sysmmu.h
2416 Auto-merging arch/arm/plat-samsung/include/plat/system-reset.h
2417 Auto-merging arch/arm/plat-samsung/include/plat/udc.h
2418 Auto-merging arch/arm/plat-samsung/include/plat/usb-phy.h
2419 Removing arch/arm/plat-samsung/s3c-pl330.c
2420 Auto-merging drivers/gpio/Kconfig
2421 Auto-merging drivers/gpio/Makefile
2422 CONFLICT (content): Merge conflict in drivers/gpio/Makefile
2423 Removing drivers/gpio/gpio-exynos4.c
2424 Removing drivers/gpio/gpio-plat-samsung.c
2425 Removing drivers/gpio/gpio-s5pc100.c
2426 Removing drivers/gpio/gpio-s5pv210.c
2427 Automatic merge failed; fix conflicts and then commit the result.
2428 $ git commit -v -a
2429 [master aa2c6e5] Merge remote-tracking branch 's5p/for-next'
2430 $ git diff -M --stat --summary HEAD^..
2431  arch/arm/Kconfig                                   |    5 +-
2432  arch/arm/include/asm/hardware/pl080.h              |    4 +
2433  arch/arm/mach-exynos4/Kconfig                      |   53 +-
2434  arch/arm/mach-exynos4/Makefile                     |    5 +-
2435  arch/arm/mach-exynos4/clock.c                      |  224 ++-
2436  arch/arm/mach-exynos4/cpu.c                        |   23 +-
2437  arch/arm/mach-exynos4/dma.c                        |  300 ++-
2438  arch/arm/mach-exynos4/include/mach/clkdev.h        |    7 -
2439  arch/arm/mach-exynos4/include/mach/dma.h           |    4 +-
2440  arch/arm/mach-exynos4/include/mach/entry-macro.S   |   29 +-
2441  arch/arm/mach-exynos4/include/mach/i2c-hdmiphy.h   |   16 +
2442  arch/arm/mach-exynos4/include/mach/irqs.h          |    6 +
2443  arch/arm/mach-exynos4/include/mach/map.h           |   13 +-
2444  arch/arm/mach-exynos4/include/mach/pm-core.h       |    8 +-
2445  arch/arm/mach-exynos4/include/mach/pmu.h           |    7 +
2446  arch/arm/mach-exynos4/include/mach/regs-mct.h      |    5 +-
2447  arch/arm/mach-exynos4/include/mach/regs-pmu.h      |   74 +-
2448  arch/arm/mach-exynos4/mach-nuri.c                  |   34 +
2449  arch/arm/mach-exynos4/mach-origen.c                |  577 +++++-
2450  .../{mach-smdk4212.c => mach-smdk4x12.c}           |  126 +-
2451  arch/arm/mach-exynos4/mach-smdkv310.c              |   49 +
2452  arch/arm/mach-exynos4/mach-universal_c210.c        |  312 +++-
2453  arch/arm/mach-exynos4/mct.c                        |  166 +-
2454  arch/arm/mach-exynos4/platsmp.c                    |    5 +-
2455  arch/arm/mach-exynos4/pm.c                         |    7 +
2456  arch/arm/mach-exynos4/pmu.c                        |  353 ++--
2457  arch/arm/mach-exynos4/setup-sdhci.c                |   47 -
2458  arch/arm/mach-s3c2410/Kconfig                      |    1 -
2459  arch/arm/mach-s3c2410/include/mach/dma.h           |   20 +-
2460  arch/arm/mach-s3c2410/include/mach/gpio-fns.h      |   99 +-
2461  arch/arm/mach-s3c2410/include/mach/gpio-track.h    |    6 +-
2462  arch/arm/mach-s3c2410/include/mach/pm-core.h       |    2 +-
2463  .../mach-s3c2410/include/mach/regs-s3c2443-clock.h |    1 +
2464  arch/arm/mach-s3c2410/mach-h1940.c                 |    6 +-
2465  arch/arm/mach-s3c2410/s3c2410.c                    |    4 +-
2466  arch/arm/mach-s3c2412/dma.c                        |    4 +-
2467  arch/arm/mach-s3c2412/gpio.c                       |   62 +
2468  arch/arm/mach-s3c2416/Kconfig                      |    1 -
2469  arch/arm/mach-s3c2416/clock.c                      |   29 +-
2470  arch/arm/mach-s3c2416/s3c2416.c                    |    4 +-
2471  arch/arm/mach-s3c2416/setup-sdhci.c                |   37 -
2472  arch/arm/mach-s3c2440/Kconfig                      |    2 -
2473  arch/arm/mach-s3c2440/s3c2440.c                    |    4 +-
2474  arch/arm/mach-s3c2440/s3c2442.c                    |    4 +-
2475  arch/arm/mach-s3c2443/Kconfig                      |    1 -
2476  arch/arm/mach-s3c2443/clock.c                      |   55 +-
2477  arch/arm/mach-s3c2443/s3c2443.c                    |    4 +-
2478  arch/arm/mach-s3c64xx/Kconfig                      |    1 +
2479  arch/arm/mach-s3c64xx/Makefile                     |    3 +-
2480  arch/arm/mach-s3c64xx/clock.c                      |   13 +-
2481  arch/arm/mach-s3c64xx/cpu.c                        |    4 +-
2482  arch/arm/mach-s3c64xx/dma.c                        |   12 +-
2483  arch/arm/mach-s3c64xx/gpiolib.c                    |  290 ---
2484  arch/arm/mach-s3c64xx/include/mach/clkdev.h        |    7 -
2485  arch/arm/mach-s3c64xx/include/mach/crag6410.h      |   23 +
2486  arch/arm/mach-s3c64xx/include/mach/dma.h           |    8 +-
2487  arch/arm/mach-s3c64xx/include/mach/pll.h           |   45 -
2488  arch/arm/mach-s3c64xx/include/mach/pm-core.h       |    2 +-
2489  arch/arm/mach-s3c64xx/include/mach/pwm-clock.h     |   56 -
2490  arch/arm/mach-s3c64xx/include/mach/regs-sys.h      |    3 +
2491  arch/arm/mach-s3c64xx/mach-anw6410.c               |    2 +-
2492  arch/arm/mach-s3c64xx/mach-crag6410-module.c       |  182 ++
2493  arch/arm/mach-s3c64xx/mach-crag6410.c              |  108 +-
2494  arch/arm/mach-s3c64xx/mach-hmt.c                   |    2 +-
2495  arch/arm/mach-s3c64xx/mach-mini6410.c              |    2 +-
2496  arch/arm/mach-s3c64xx/mach-ncp.c                   |    2 +-
2497  arch/arm/mach-s3c64xx/mach-real6410.c              |    2 +-
2498  arch/arm/mach-s3c64xx/mach-smartq5.c               |    2 +-
2499  arch/arm/mach-s3c64xx/mach-smartq7.c               |    2 +-
2500  arch/arm/mach-s3c64xx/mach-smdk6400.c              |    2 +-
2501  arch/arm/mach-s3c64xx/mach-smdk6410.c              |    2 +-
2502  arch/arm/mach-s3c64xx/pm.c                         |    4 +
2503  arch/arm/mach-s3c64xx/s3c6400.c                    |    2 +-
2504  arch/arm/mach-s3c64xx/s3c6410.c                    |    4 +-
2505  arch/arm/mach-s3c64xx/setup-sdhci.c                |   48 -
2506  arch/arm/mach-s5p64x0/Kconfig                      |   18 +-
2507  arch/arm/mach-s5p64x0/Makefile                     |    4 +-
2508  arch/arm/mach-s5p64x0/clock-s5p6440.c              |   10 +-
2509  arch/arm/mach-s5p64x0/clock-s5p6450.c              |   10 +-
2510  arch/arm/mach-s5p64x0/cpu.c                        |    3 +
2511  arch/arm/mach-s5p64x0/dma.c                        |  269 ++-
2512  arch/arm/mach-s5p64x0/include/mach/clkdev.h        |    7 -
2513  arch/arm/mach-s5p64x0/include/mach/dma.h           |    4 +-
2514  arch/arm/mach-s5p64x0/include/mach/irqs.h          |    4 +
2515  arch/arm/mach-s5p64x0/include/mach/map.h           |    4 +
2516  arch/arm/mach-s5p64x0/include/mach/pm-core.h       |  117 +
2517  arch/arm/mach-s5p64x0/include/mach/pwm-clock.h     |   68 -
2518  arch/arm/mach-s5p64x0/include/mach/regs-clock.h    |   33 +
2519  arch/arm/mach-s5p64x0/include/mach/regs-gpio.h     |   21 +
2520  arch/arm/mach-s5p64x0/irq-eint.c                   |    2 +
2521  arch/arm/mach-s5p64x0/irq-pm.c                     |   92 +
2522  arch/arm/mach-s5p64x0/mach-smdk6440.c              |   74 +
2523  arch/arm/mach-s5p64x0/mach-smdk6450.c              |   75 +
2524  arch/arm/mach-s5p64x0/pm.c                         |  204 ++
2525  arch/arm/mach-s5p64x0/setup-fb-24bpp.c             |   29 +
2526  arch/arm/mach-s5pc100/Kconfig                      |    2 +-
2527  arch/arm/mach-s5pc100/clock.c                      |   15 +-
2528  arch/arm/mach-s5pc100/dma.c                        |  324 ++-
2529  arch/arm/mach-s5pc100/include/mach/clkdev.h        |    7 -
2530  arch/arm/mach-s5pc100/include/mach/dma.h           |    4 +-
2531  arch/arm/mach-s5pc100/include/mach/pwm-clock.h     |   56 -
2532  arch/arm/mach-s5pc100/setup-sdhci.c                |   42 -
2533  arch/arm/mach-s5pv210/Kconfig                      |    6 +-
2534  arch/arm/mach-s5pv210/Makefile                     |    2 +-
2535  arch/arm/mach-s5pv210/clock.c                      |  151 +-
2536  arch/arm/mach-s5pv210/cpu.c                        |    4 +
2537  arch/arm/mach-s5pv210/dma.c                        |  317 ++-
2538  arch/arm/mach-s5pv210/include/mach/clkdev.h        |    7 -
2539  arch/arm/mach-s5pv210/include/mach/dma.h           |    4 +-
2540  arch/arm/mach-s5pv210/include/mach/i2c-hdmiphy.h   |   16 +
2541  arch/arm/mach-s5pv210/include/mach/irqs.h          |    4 +-
2542  arch/arm/mach-s5pv210/include/mach/map.h           |   13 +
2543  arch/arm/mach-s5pv210/include/mach/pm-core.h       |    2 +-
2544  arch/arm/mach-s5pv210/include/mach/pwm-clock.h     |   70 -
2545  arch/arm/mach-s5pv210/include/mach/regs-clock.h    |    3 +-
2546  arch/arm/mach-s5pv210/mach-goni.c                  |   62 +
2547  arch/arm/mach-s5pv210/setup-sdhci.c                |   41 -
2548  arch/arm/mach-s5pv210/sleep.S                      |   52 -
2549  arch/arm/plat-s3c24xx/Kconfig                      |    1 -
2550  arch/arm/plat-s3c24xx/Makefile                     |    2 -
2551  arch/arm/plat-s3c24xx/dma.c                        |   10 +-
2552  arch/arm/plat-s3c24xx/gpio.c                       |   96 -
2553  arch/arm/plat-s3c24xx/gpiolib.c                    |  229 --
2554  arch/arm/plat-s3c24xx/include/mach/clkdev.h        |    7 -
2555  arch/arm/plat-s3c24xx/include/mach/pwm-clock.h     |   55 -
2556  arch/arm/plat-s3c24xx/include/plat/pll.h           |   62 -
2557  arch/arm/plat-s3c24xx/include/plat/regs-iis.h      |   68 -
2558  arch/arm/plat-s3c24xx/include/plat/regs-spi.h      |   81 -
2559  arch/arm/plat-s3c24xx/s3c2443-clock.c              |   57 +
2560  arch/arm/plat-s5p/Kconfig                          |   25 +-
2561  arch/arm/plat-s5p/Makefile                         |    6 +-
2562  arch/arm/plat-s5p/cpu.c                            |    9 +
2563  arch/arm/plat-s5p/dev-i2c-hdmiphy.c                |   59 +
2564  arch/arm/plat-s5p/dev-tv.c                         |   98 +
2565  arch/arm/plat-s5p/irq-gpioint.c                    |   10 +-
2566  arch/arm/{mach-exynos4 => plat-s5p}/sleep.S        |   13 +-
2567  arch/arm/plat-samsung/Kconfig                      |   36 +-
2568  arch/arm/plat-samsung/Makefile                     |    6 +-
2569  arch/arm/plat-samsung/dma-ops.c                    |  131 +
2570  arch/arm/plat-samsung/gpio-config.c                |  431 ----
2571  arch/arm/plat-samsung/gpio.c                       |  167 --
2572  .../include/plat/audio-simtec.h                    |    2 +-
2573  .../include/plat/camport.h                         |    6 +-
2574  .../include/plat/common-smdk.h                     |    2 +-
2575  .../include/plat/cpu-freq-core.h                   |    5 +-
2576  arch/arm/plat-samsung/include/plat/cpu.h           |    8 +
2577  arch/arm/plat-samsung/include/plat/devs.h          |    6 +
2578  arch/arm/plat-samsung/include/plat/dma-ops.h       |   63 +
2579  .../include/plat/{s3c-dma-pl330.h => dma-pl330.h}  |   24 +-
2580  arch/arm/plat-samsung/include/plat/dma-s3c24xx.h   |    2 +-
2581  arch/arm/plat-samsung/include/plat/dma.h           |   10 +-
2582  .../{plat-s5p => plat-samsung}/include/plat/ehci.h |    6 +-
2583  .../include/plat/exynos4.h                         |    2 +-
2584  arch/arm/plat-samsung/include/plat/fb.h            |    7 +
2585  .../include/plat/fiq.h                             |    2 +-
2586  .../plat-samsung/include/plat/gpio-cfg-helpers.h   |  172 +-
2587  arch/arm/plat-samsung/include/plat/gpio-cfg.h      |   34 +-
2588  arch/arm/plat-samsung/include/plat/gpio-core.h     |   97 +-
2589  arch/arm/plat-samsung/include/plat/gpio-fns.h      |   98 +
2590  arch/arm/plat-samsung/include/plat/iic.h           |    1 +
2591  .../include/plat/irq.h                             |   25 +-
2592  .../{plat-s5p => plat-samsung}/include/plat/irqs.h |    8 +-
2593  .../include/plat/mci.h                             |   10 +-
2594  .../{plat-s5p => plat-samsung}/include/plat/mfc.h  |    6 +-
2595  .../include/plat/mipi_csis.h                       |    6 +-
2596  .../{plat-s5p => plat-samsung}/include/plat/pll.h  |  134 +-
2597  arch/arm/plat-samsung/include/plat/pll6553x.h      |   51 -
2598  arch/arm/plat-samsung/include/plat/pm.h            |   10 +-
2599  .../mach => plat-samsung/include/plat}/pwm-clock.h |   39 +-
2600  .../include/plat/regs-dma.h                        |  112 +-
2601  arch/arm/plat-samsung/include/plat/regs-iis.h      |   70 +
2602  arch/arm/plat-samsung/include/plat/regs-spi.h      |   48 +
2603  .../include/plat/regs-srom.h                       |    8 +-
2604  .../include/plat/regs-udc.h                        |  132 +-
2605  .../include/plat/reset.h                           |    8 +-
2606  .../plat-samsung/include/plat/s3c-pl330-pdata.h    |   32 -
2607  .../include/plat/s3c2410.h                         |    2 +-
2608  .../include/plat/s3c2412.h                         |    2 +-
2609  .../include/plat/s3c2416.h                         |    2 +-
2610  .../include/plat/s3c2443.h                         |    2 +-
2611  .../include/plat/s3c244x.h                         |    2 +-
2612  .../mach => plat-samsung/include/plat}/s3c6400.h   |    2 +-
2613  .../mach => plat-samsung/include/plat}/s3c6410.h   |    2 +-
2614  .../include/plat/s5p-clock.h                       |    2 +-
2615  .../include/plat/s5p-time.h                        |    2 +-
2616  .../include/plat/s5p6440.h                         |    2 +-
2617  .../include/plat/s5p6450.h                         |    2 +-
2618  .../include/plat/s5pc100.h                         |    2 +-
2619  .../include/plat/s5pv210.h                         |    2 +-
2620  arch/arm/plat-samsung/include/plat/sdhci.h         |   57 -
2621  .../include/plat/sysmmu.h                          |    6 +-
2622  .../include/plat/system-reset.h                    |    2 +-
2623  arch/arm/plat-samsung/include/plat/tv-core.h       |   44 +
2624  .../include/plat/udc.h                             |    4 +-
2625  .../include/plat/usb-phy.h                         |    6 +-
2626  arch/arm/plat-samsung/platformdata.c               |    2 -
2627  arch/arm/plat-samsung/pm-gpio.c                    |   72 +-
2628  arch/arm/plat-samsung/pm.c                         |    6 +-
2629  arch/arm/plat-samsung/pwm-clock.c                  |   13 +-
2630  arch/arm/plat-samsung/s3c-dma-ops.c                |  130 +
2631  arch/arm/plat-samsung/s3c-pl330.c                  | 1244 ---------
2632  drivers/dma/Kconfig                                |    3 +-
2633  drivers/dma/amba-pl08x.c                           |  455 ++--
2634  drivers/dma/at_hdmac.c                             |  159 +-
2635  drivers/dma/at_hdmac_regs.h                        |   24 +
2636  drivers/dma/dmatest.c                              |   23 +-
2637  drivers/dma/imx-sdma.c                             |   47 +-
2638  drivers/dma/mxs-dma.c                              |   45 +-
2639  drivers/dma/pl330.c                                |  229 ++-
2640  drivers/gpio/Kconfig                               |   16 -
2641  drivers/gpio/Makefile                              |    6 +-
2642  drivers/gpio/gpio-exynos4.c                        |  385 ---
2643  drivers/gpio/gpio-plat-samsung.c                   |  205 --
2644  drivers/gpio/gpio-s5pc100.c                        |  354 ---
2645  drivers/gpio/gpio-s5pv210.c                        |  287 ---
2646  drivers/gpio/gpio-samsung.c                        | 2688 ++++++++++++++++++++
2647  drivers/mmc/host/s3cmci.c                          |    6 +-
2648  drivers/spi/spi-s3c64xx.c                          |  175 +-
2649  include/linux/amba/pl08x.h                         |   14 +-
2650  include/linux/amba/pl330.h                         |    6 +-
2651  include/linux/dmaengine.h                          |   13 +-
2652  sound/soc/samsung/ac97.c                           |   10 +-
2653  sound/soc/samsung/dma.c                            |  148 +-
2654  sound/soc/samsung/dma.h                            |    4 +-
2655  224 files changed, 8821 insertions(+), 6888 deletions(-)
2656  delete mode 100644 arch/arm/mach-exynos4/include/mach/clkdev.h
2657  create mode 100644 arch/arm/mach-exynos4/include/mach/i2c-hdmiphy.h
2658  rename arch/arm/mach-exynos4/{mach-smdk4212.c => mach-smdk4x12.c} (61%)
2659  create mode 100644 arch/arm/mach-s3c2412/gpio.c
2660  delete mode 100644 arch/arm/mach-s3c64xx/gpiolib.c
2661  delete mode 100644 arch/arm/mach-s3c64xx/include/mach/clkdev.h
2662  create mode 100644 arch/arm/mach-s3c64xx/include/mach/crag6410.h
2663  delete mode 100644 arch/arm/mach-s3c64xx/include/mach/pll.h
2664  delete mode 100644 arch/arm/mach-s3c64xx/include/mach/pwm-clock.h
2665  create mode 100644 arch/arm/mach-s3c64xx/mach-crag6410-module.c
2666  delete mode 100644 arch/arm/mach-s5p64x0/include/mach/clkdev.h
2667  create mode 100644 arch/arm/mach-s5p64x0/include/mach/pm-core.h
2668  delete mode 100644 arch/arm/mach-s5p64x0/include/mach/pwm-clock.h
2669  create mode 100644 arch/arm/mach-s5p64x0/irq-pm.c
2670  create mode 100644 arch/arm/mach-s5p64x0/pm.c
2671  create mode 100644 arch/arm/mach-s5p64x0/setup-fb-24bpp.c
2672  delete mode 100644 arch/arm/mach-s5pc100/include/mach/clkdev.h
2673  delete mode 100644 arch/arm/mach-s5pc100/include/mach/pwm-clock.h
2674  delete mode 100644 arch/arm/mach-s5pv210/include/mach/clkdev.h
2675  create mode 100644 arch/arm/mach-s5pv210/include/mach/i2c-hdmiphy.h
2676  delete mode 100644 arch/arm/mach-s5pv210/include/mach/pwm-clock.h
2677  delete mode 100644 arch/arm/mach-s5pv210/sleep.S
2678  delete mode 100644 arch/arm/plat-s3c24xx/gpio.c
2679  delete mode 100644 arch/arm/plat-s3c24xx/gpiolib.c
2680  delete mode 100644 arch/arm/plat-s3c24xx/include/mach/clkdev.h
2681  delete mode 100644 arch/arm/plat-s3c24xx/include/mach/pwm-clock.h
2682  delete mode 100644 arch/arm/plat-s3c24xx/include/plat/pll.h
2683  delete mode 100644 arch/arm/plat-s3c24xx/include/plat/regs-iis.h
2684  delete mode 100644 arch/arm/plat-s3c24xx/include/plat/regs-spi.h
2685  create mode 100644 arch/arm/plat-s5p/dev-i2c-hdmiphy.c
2686  create mode 100644 arch/arm/plat-s5p/dev-tv.c
2687  rename arch/arm/{mach-exynos4 => plat-s5p}/sleep.S (81%)
2688  create mode 100644 arch/arm/plat-samsung/dma-ops.c
2689  delete mode 100644 arch/arm/plat-samsung/gpio-config.c
2690  delete mode 100644 arch/arm/plat-samsung/gpio.c
2691  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/audio-simtec.h (95%)
2692  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/camport.h (86%)
2693  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/common-smdk.h (87%)
2694  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/cpu-freq-core.h (98%)
2695  create mode 100644 arch/arm/plat-samsung/include/plat/dma-ops.h
2696  rename arch/arm/plat-samsung/include/plat/{s3c-dma-pl330.h => dma-pl330.h} (84%)
2697  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/ehci.h (84%)
2698  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/exynos4.h (94%)
2699  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/fiq.h (88%)
2700  create mode 100644 arch/arm/plat-samsung/include/plat/gpio-fns.h
2701  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/irq.h (81%)
2702  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/irqs.h (96%)
2703  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/mci.h (90%)
2704  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/mfc.h (90%)
2705  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/mipi_csis.h (90%)
2706  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/pll.h (57%)
2707  delete mode 100644 arch/arm/plat-samsung/include/plat/pll6553x.h
2708  rename arch/arm/{mach-exynos4/include/mach => plat-samsung/include/plat}/pwm-clock.h (68%)
2709  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/regs-dma.h (58%)
2710  create mode 100644 arch/arm/plat-samsung/include/plat/regs-iis.h
2711  create mode 100644 arch/arm/plat-samsung/include/plat/regs-spi.h
2712  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/regs-srom.h (89%)
2713  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/regs-udc.h (51%)
2714  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/reset.h (66%)
2715  delete mode 100644 arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h
2716  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2410.h (93%)
2717  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2412.h (92%)
2718  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2416.h (92%)
2719  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2443.h (96%)
2720  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c244x.h (94%)
2721  rename arch/arm/{mach-s3c64xx/include/mach => plat-samsung/include/plat}/s3c6400.h (94%)
2722  rename arch/arm/{mach-s3c64xx/include/mach => plat-samsung/include/plat}/s3c6410.h (93%)
2723  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p-clock.h (96%)
2724  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p-time.h (94%)
2725  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p6440.h (94%)
2726  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p6450.h (94%)
2727  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5pc100.h (94%)
2728  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5pv210.h (94%)
2729  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/sysmmu.h (96%)
2730  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/system-reset.h (92%)
2731  create mode 100644 arch/arm/plat-samsung/include/plat/tv-core.h
2732  rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/udc.h (95%)
2733  rename arch/arm/{plat-s5p => plat-samsung}/include/plat/usb-phy.h (83%)
2734  create mode 100644 arch/arm/plat-samsung/s3c-dma-ops.c
2735  delete mode 100644 arch/arm/plat-samsung/s3c-pl330.c
2736  delete mode 100644 drivers/gpio/gpio-exynos4.c
2737  delete mode 100644 drivers/gpio/gpio-plat-samsung.c
2738  delete mode 100644 drivers/gpio/gpio-s5pc100.c
2739  delete mode 100644 drivers/gpio/gpio-s5pv210.c
2740  create mode 100644 drivers/gpio/gpio-samsung.c
2741 Merging tegra/for-next
2742 $ git merge tegra/for-next
2743 Already up-to-date.
2744 Merging xilinx/arm-next
2745 $ git merge xilinx/arm-next
2746 Already up-to-date.
2747 Merging blackfin/for-linus
2748 $ git merge blackfin/for-linus
2749 Removing arch/blackfin/include/asm/mutex.h
2750 Merge made by recursive.
2751  arch/blackfin/include/asm/Kbuild             |    1 +
2752  arch/blackfin/include/asm/bfin_serial.h      |    2 +
2753  arch/blackfin/include/asm/mutex.h            |    1 -
2754  arch/blackfin/include/asm/uaccess.h          |    6 ++--
2755  arch/blackfin/mach-bf518/boards/ezbrd.c      |   14 +++++++++++-
2756  arch/blackfin/mach-bf518/boards/tcm-bf518.c  |   14 +++++++++++-
2757  arch/blackfin/mach-bf527/boards/ad7160eval.c |   14 +++++++++++-
2758  arch/blackfin/mach-bf527/boards/cm_bf527.c   |   14 +++++++++++-
2759  arch/blackfin/mach-bf527/boards/ezbrd.c      |   14 +++++++++++-
2760  arch/blackfin/mach-bf527/boards/ezkit.c      |   14 +++++++++++-
2761  arch/blackfin/mach-bf527/boards/tll6527m.c   |   14 +++++++++++-
2762  arch/blackfin/mach-bf533/boards/H8606.c      |   10 +++++++-
2763  arch/blackfin/mach-bf533/boards/blackstamp.c |    7 +++++-
2764  arch/blackfin/mach-bf533/boards/cm_bf533.c   |    7 +++++-
2765  arch/blackfin/mach-bf533/boards/ezkit.c      |    7 +++++-
2766  arch/blackfin/mach-bf533/boards/ip0x.c       |    7 +++++-
2767  arch/blackfin/mach-bf533/boards/stamp.c      |    7 +++++-
2768  arch/blackfin/mach-bf537/boards/cm_bf537e.c  |   14 +++++++++++-
2769  arch/blackfin/mach-bf537/boards/cm_bf537u.c  |   14 +++++++++++-
2770  arch/blackfin/mach-bf537/boards/dnp5370.c    |   14 +++++++++++-
2771  arch/blackfin/mach-bf537/boards/minotaur.c   |   14 +++++++++++-
2772  arch/blackfin/mach-bf537/boards/pnav10.c     |   14 +++++++++++-
2773  arch/blackfin/mach-bf537/boards/stamp.c      |   14 +++++++++++-
2774  arch/blackfin/mach-bf537/boards/tcm_bf537.c  |   14 +++++++++++-
2775  arch/blackfin/mach-bf538/boards/ezkit.c      |   21 ++++++++++++++++--
2776  arch/blackfin/mach-bf548/boards/cm_bf548.c   |   28 ++++++++++++++++++++++---
2777  arch/blackfin/mach-bf548/boards/ezkit.c      |   28 ++++++++++++++++++++++---
2778  arch/blackfin/mach-bf561/boards/acvilon.c    |    7 +++++-
2779  arch/blackfin/mach-bf561/boards/cm_bf561.c   |    7 +++++-
2780  arch/blackfin/mach-bf561/boards/ezkit.c      |    7 +++++-
2781  arch/blackfin/mach-bf561/boards/tepla.c      |    7 +++++-
2782  31 files changed, 302 insertions(+), 54 deletions(-)
2783  delete mode 100644 arch/blackfin/include/asm/mutex.h
2784 Merging cris/for-next
2785 $ git merge cris/for-next
2786 Auto-merging arch/cris/arch-v32/drivers/cryptocop.c
2787 Auto-merging drivers/net/cris/eth_v10.c
2788 Merge made by recursive.
2789  Documentation/cris/README               |   62 +++++++++++++++---------------
2790  arch/cris/arch-v32/drivers/cryptocop.c  |    6 +--
2791  arch/cris/arch-v32/kernel/ptrace.c      |    2 -
2792  arch/cris/include/arch-v32/arch/cache.h |    2 +-
2793  drivers/net/cris/eth_v10.c              |    1 -
2794  5 files changed, 34 insertions(+), 39 deletions(-)
2795 Merging quilt/hexagon
2796 $ git merge quilt/hexagon
2797 Auto-merging MAINTAINERS
2798 Merge made by recursive.
2799  MAINTAINERS                               |    6 +
2800  arch/hexagon/Kconfig                      |  220 ++++++++++++
2801  arch/hexagon/Makefile                     |   59 +++
2802  arch/hexagon/configs/comet_defconfig      |   85 +++++
2803  arch/hexagon/include/asm/Kbuild           |   60 ++++
2804  arch/hexagon/include/asm/asm-offsets.h    |    1 +
2805  arch/hexagon/include/asm/atomic.h         |  164 +++++++++
2806  arch/hexagon/include/asm/bitops.h         |  301 ++++++++++++++++
2807  arch/hexagon/include/asm/bitsperlong.h    |   26 ++
2808  arch/hexagon/include/asm/byteorder.h      |   28 ++
2809  arch/hexagon/include/asm/cache.h          |   34 ++
2810  arch/hexagon/include/asm/cacheflush.h     |   99 ++++++
2811  arch/hexagon/include/asm/checksum.h       |   50 +++
2812  arch/hexagon/include/asm/delay.h          |   28 ++
2813  arch/hexagon/include/asm/dma-mapping.h    |  101 ++++++
2814  arch/hexagon/include/asm/dma.h            |   29 ++
2815  arch/hexagon/include/asm/elf.h            |  229 ++++++++++++
2816  arch/hexagon/include/asm/fixmap.h         |   73 ++++
2817  arch/hexagon/include/asm/fpu.h            |    4 +
2818  arch/hexagon/include/asm/futex.h          |  137 ++++++++
2819  arch/hexagon/include/asm/hexagon_vm.h     |  281 +++++++++++++++
2820  arch/hexagon/include/asm/intrinsics.h     |   26 ++
2821  arch/hexagon/include/asm/io.h             |  326 +++++++++++++++++
2822  arch/hexagon/include/asm/irq.h            |   36 ++
2823  arch/hexagon/include/asm/irqflags.h       |   62 ++++
2824  arch/hexagon/include/asm/kgdb.h           |   43 +++
2825  arch/hexagon/include/asm/linkage.h        |   25 ++
2826  arch/hexagon/include/asm/mem-layout.h     |  112 ++++++
2827  arch/hexagon/include/asm/mmu.h            |   37 ++
2828  arch/hexagon/include/asm/mmu_context.h    |  100 ++++++
2829  arch/hexagon/include/asm/module.h         |   26 ++
2830  arch/hexagon/include/asm/mutex.h          |    8 +
2831  arch/hexagon/include/asm/page.h           |  157 +++++++++
2832  arch/hexagon/include/asm/param.h          |   26 ++
2833  arch/hexagon/include/asm/perf_event.h     |   24 ++
2834  arch/hexagon/include/asm/pgalloc.h        |  146 ++++++++
2835  arch/hexagon/include/asm/pgtable.h        |  518 +++++++++++++++++++++++++++
2836  arch/hexagon/include/asm/processor.h      |  123 +++++++
2837  arch/hexagon/include/asm/ptrace.h         |   48 +++
2838  arch/hexagon/include/asm/registers.h      |  236 +++++++++++++
2839  arch/hexagon/include/asm/setup.h          |   29 ++
2840  arch/hexagon/include/asm/sigcontext.h     |   33 ++
2841  arch/hexagon/include/asm/signal.h         |   26 ++
2842  arch/hexagon/include/asm/smp.h            |   44 +++
2843  arch/hexagon/include/asm/spinlock.h       |  186 ++++++++++
2844  arch/hexagon/include/asm/spinlock_types.h |   42 +++
2845  arch/hexagon/include/asm/string.h         |   32 ++
2846  arch/hexagon/include/asm/suspend.h        |   27 ++
2847  arch/hexagon/include/asm/swab.h           |   24 ++
2848  arch/hexagon/include/asm/syscall.h        |   54 +++
2849  arch/hexagon/include/asm/system.h         |  126 +++++++
2850  arch/hexagon/include/asm/thread_info.h    |  154 ++++++++
2851  arch/hexagon/include/asm/time.h           |   29 ++
2852  arch/hexagon/include/asm/timer-regs.h     |   39 ++
2853  arch/hexagon/include/asm/timex.h          |   37 ++
2854  arch/hexagon/include/asm/tlb.h            |   39 ++
2855  arch/hexagon/include/asm/tlbflush.h       |   58 +++
2856  arch/hexagon/include/asm/traps.h          |   29 ++
2857  arch/hexagon/include/asm/uaccess.h        |  116 ++++++
2858  arch/hexagon/include/asm/unistd.h         |   36 ++
2859  arch/hexagon/include/asm/user.h           |   83 +++++
2860  arch/hexagon/include/asm/vdso.h           |   31 ++
2861  arch/hexagon/include/asm/vm_fault.h       |   26 ++
2862  arch/hexagon/include/asm/vm_mmu.h         |  111 ++++++
2863  arch/hexagon/kernel/Makefile              |   19 +
2864  arch/hexagon/kernel/asm-offsets.c         |  104 ++++++
2865  arch/hexagon/kernel/dma.c                 |  220 ++++++++++++
2866  arch/hexagon/kernel/head.S                |  162 +++++++++
2867  arch/hexagon/kernel/hexagon_ksyms.c       |   42 +++
2868  arch/hexagon/kernel/init_task.c           |   54 +++
2869  arch/hexagon/kernel/irq_cpu.c             |   90 +++++
2870  arch/hexagon/kernel/kgdb.c                |  247 +++++++++++++
2871  arch/hexagon/kernel/module.c              |  162 +++++++++
2872  arch/hexagon/kernel/process.c             |  279 +++++++++++++++
2873  arch/hexagon/kernel/ptrace.c              |  178 ++++++++++
2874  arch/hexagon/kernel/reset.c               |   38 ++
2875  arch/hexagon/kernel/setup.c               |  145 ++++++++
2876  arch/hexagon/kernel/signal.c              |  345 ++++++++++++++++++
2877  arch/hexagon/kernel/smp.c                 |  280 +++++++++++++++
2878  arch/hexagon/kernel/stacktrace.c          |   66 ++++
2879  arch/hexagon/kernel/syscall.c             |   90 +++++
2880  arch/hexagon/kernel/syscalltab.c          |   32 ++
2881  arch/hexagon/kernel/time.c                |  258 ++++++++++++++
2882  arch/hexagon/kernel/topology.c            |   52 +++
2883  arch/hexagon/kernel/trampoline.S          |   35 ++
2884  arch/hexagon/kernel/traps.c               |  370 ++++++++++++++++++++
2885  arch/hexagon/kernel/vdso.c                |  101 ++++++
2886  arch/hexagon/kernel/vm_entry.S            |  269 ++++++++++++++
2887  arch/hexagon/kernel/vm_events.c           |  101 ++++++
2888  arch/hexagon/kernel/vm_init_segtable.S    |  442 +++++++++++++++++++++++
2889  arch/hexagon/kernel/vm_ops.S              |  102 ++++++
2890  arch/hexagon/kernel/vm_switch.S           |   95 +++++
2891  arch/hexagon/kernel/vm_vectors.S          |   50 +++
2892  arch/hexagon/kernel/vmlinux.lds.S         |   93 +++++
2893  arch/hexagon/lib/Makefile                 |    4 +
2894  arch/hexagon/lib/checksum.c               |  203 +++++++++++
2895  arch/hexagon/lib/io.c                     |   91 +++++
2896  arch/hexagon/lib/memcpy.S                 |  543 +++++++++++++++++++++++++++++
2897  arch/hexagon/lib/memset.S                 |  316 +++++++++++++++++
2898  arch/hexagon/mm/Makefile                  |    7 +
2899  arch/hexagon/mm/cache.c                   |  128 +++++++
2900  arch/hexagon/mm/copy_from_user.S          |  114 ++++++
2901  arch/hexagon/mm/copy_to_user.S            |   92 +++++
2902  arch/hexagon/mm/copy_user_template.S      |  185 ++++++++++
2903  arch/hexagon/mm/init.c                    |  276 +++++++++++++++
2904  arch/hexagon/mm/ioremap.c                 |   56 +++
2905  arch/hexagon/mm/pgalloc.c                 |   25 ++
2906  arch/hexagon/mm/strnlen_user.S            |  140 ++++++++
2907  arch/hexagon/mm/uaccess.c                 |   59 +++
2908  arch/hexagon/mm/vm_fault.c                |  187 ++++++++++
2909  arch/hexagon/mm/vm_tlb.c                  |   93 +++++
2910  include/asm-generic/checksum.h            |    4 +
2911  include/asm-generic/rwsem.h               |  132 +++++++
2912  113 files changed, 12681 insertions(+), 0 deletions(-)
2913  create mode 100644 arch/hexagon/Kconfig
2914  create mode 100644 arch/hexagon/Makefile
2915  create mode 100644 arch/hexagon/configs/comet_defconfig
2916  create mode 100644 arch/hexagon/include/asm/Kbuild
2917  create mode 100644 arch/hexagon/include/asm/asm-offsets.h
2918  create mode 100644 arch/hexagon/include/asm/atomic.h
2919  create mode 100644 arch/hexagon/include/asm/bitops.h
2920  create mode 100644 arch/hexagon/include/asm/bitsperlong.h
2921  create mode 100644 arch/hexagon/include/asm/byteorder.h
2922  create mode 100644 arch/hexagon/include/asm/cache.h
2923  create mode 100644 arch/hexagon/include/asm/cacheflush.h
2924  create mode 100644 arch/hexagon/include/asm/checksum.h
2925  create mode 100644 arch/hexagon/include/asm/delay.h
2926  create mode 100644 arch/hexagon/include/asm/dma-mapping.h
2927  create mode 100644 arch/hexagon/include/asm/dma.h
2928  create mode 100644 arch/hexagon/include/asm/elf.h
2929  create mode 100644 arch/hexagon/include/asm/fixmap.h
2930  create mode 100644 arch/hexagon/include/asm/fpu.h
2931  create mode 100644 arch/hexagon/include/asm/futex.h
2932  create mode 100644 arch/hexagon/include/asm/hexagon_vm.h
2933  create mode 100644 arch/hexagon/include/asm/intrinsics.h
2934  create mode 100644 arch/hexagon/include/asm/io.h
2935  create mode 100644 arch/hexagon/include/asm/irq.h
2936  create mode 100644 arch/hexagon/include/asm/irqflags.h
2937  create mode 100644 arch/hexagon/include/asm/kgdb.h
2938  create mode 100644 arch/hexagon/include/asm/linkage.h
2939  create mode 100644 arch/hexagon/include/asm/mem-layout.h
2940  create mode 100644 arch/hexagon/include/asm/mmu.h
2941  create mode 100644 arch/hexagon/include/asm/mmu_context.h
2942  create mode 100644 arch/hexagon/include/asm/module.h
2943  create mode 100644 arch/hexagon/include/asm/mutex.h
2944  create mode 100644 arch/hexagon/include/asm/page.h
2945  create mode 100644 arch/hexagon/include/asm/param.h
2946  create mode 100644 arch/hexagon/include/asm/perf_event.h
2947  create mode 100644 arch/hexagon/include/asm/pgalloc.h
2948  create mode 100644 arch/hexagon/include/asm/pgtable.h
2949  create mode 100644 arch/hexagon/include/asm/processor.h
2950  create mode 100644 arch/hexagon/include/asm/ptrace.h
2951  create mode 100644 arch/hexagon/include/asm/registers.h
2952  create mode 100644 arch/hexagon/include/asm/setup.h
2953  create mode 100644 arch/hexagon/include/asm/sigcontext.h
2954  create mode 100644 arch/hexagon/include/asm/signal.h
2955  create mode 100644 arch/hexagon/include/asm/smp.h
2956  create mode 100644 arch/hexagon/include/asm/spinlock.h
2957  create mode 100644 arch/hexagon/include/asm/spinlock_types.h
2958  create mode 100644 arch/hexagon/include/asm/string.h
2959  create mode 100644 arch/hexagon/include/asm/suspend.h
2960  create mode 100644 arch/hexagon/include/asm/swab.h
2961  create mode 100644 arch/hexagon/include/asm/syscall.h
2962  create mode 100644 arch/hexagon/include/asm/system.h
2963  create mode 100644 arch/hexagon/include/asm/thread_info.h
2964  create mode 100644 arch/hexagon/include/asm/time.h
2965  create mode 100644 arch/hexagon/include/asm/timer-regs.h
2966  create mode 100644 arch/hexagon/include/asm/timex.h
2967  create mode 100644 arch/hexagon/include/asm/tlb.h
2968  create mode 100644 arch/hexagon/include/asm/tlbflush.h
2969  create mode 100644 arch/hexagon/include/asm/traps.h
2970  create mode 100644 arch/hexagon/include/asm/uaccess.h
2971  create mode 100644 arch/hexagon/include/asm/unistd.h
2972  create mode 100644 arch/hexagon/include/asm/user.h
2973  create mode 100644 arch/hexagon/include/asm/vdso.h
2974  create mode 100644 arch/hexagon/include/asm/vm_fault.h
2975  create mode 100644 arch/hexagon/include/asm/vm_mmu.h
2976  create mode 100644 arch/hexagon/kernel/Makefile
2977  create mode 100644 arch/hexagon/kernel/asm-offsets.c
2978  create mode 100644 arch/hexagon/kernel/dma.c
2979  create mode 100644 arch/hexagon/kernel/head.S
2980  create mode 100644 arch/hexagon/kernel/hexagon_ksyms.c
2981  create mode 100644 arch/hexagon/kernel/init_task.c
2982  create mode 100644 arch/hexagon/kernel/irq_cpu.c
2983  create mode 100644 arch/hexagon/kernel/kgdb.c
2984  create mode 100644 arch/hexagon/kernel/module.c
2985  create mode 100644 arch/hexagon/kernel/process.c
2986  create mode 100644 arch/hexagon/kernel/ptrace.c
2987  create mode 100644 arch/hexagon/kernel/reset.c
2988  create mode 100644 arch/hexagon/kernel/setup.c
2989  create mode 100644 arch/hexagon/kernel/signal.c
2990  create mode 100644 arch/hexagon/kernel/smp.c
2991  create mode 100644 arch/hexagon/kernel/stacktrace.c
2992  create mode 100644 arch/hexagon/kernel/syscall.c
2993  create mode 100644 arch/hexagon/kernel/syscalltab.c
2994  create mode 100644 arch/hexagon/kernel/time.c
2995  create mode 100644 arch/hexagon/kernel/topology.c
2996  create mode 100644 arch/hexagon/kernel/trampoline.S
2997  create mode 100644 arch/hexagon/kernel/traps.c
2998  create mode 100644 arch/hexagon/kernel/vdso.c
2999  create mode 100644 arch/hexagon/kernel/vm_entry.S
3000  create mode 100644 arch/hexagon/kernel/vm_events.c
3001  create mode 100644 arch/hexagon/kernel/vm_init_segtable.S
3002  create mode 100644 arch/hexagon/kernel/vm_ops.S
3003  create mode 100644 arch/hexagon/kernel/vm_switch.S
3004  create mode 100644 arch/hexagon/kernel/vm_vectors.S
3005  create mode 100644 arch/hexagon/kernel/vmlinux.lds.S
3006  create mode 100644 arch/hexagon/lib/Makefile
3007  create mode 100644 arch/hexagon/lib/checksum.c
3008  create mode 100644 arch/hexagon/lib/io.c
3009  create mode 100644 arch/hexagon/lib/memcpy.S
3010  create mode 100644 arch/hexagon/lib/memset.S
3011  create mode 100644 arch/hexagon/mm/Makefile
3012  create mode 100644 arch/hexagon/mm/cache.c
3013  create mode 100644 arch/hexagon/mm/copy_from_user.S
3014  create mode 100644 arch/hexagon/mm/copy_to_user.S
3015  create mode 100644 arch/hexagon/mm/copy_user_template.S
3016  create mode 100644 arch/hexagon/mm/init.c
3017  create mode 100644 arch/hexagon/mm/ioremap.c
3018  create mode 100644 arch/hexagon/mm/pgalloc.c
3019  create mode 100644 arch/hexagon/mm/strnlen_user.S
3020  create mode 100644 arch/hexagon/mm/uaccess.c
3021  create mode 100644 arch/hexagon/mm/vm_fault.c
3022  create mode 100644 arch/hexagon/mm/vm_tlb.c
3023  create mode 100644 include/asm-generic/rwsem.h
3024 Merging ia64/test
3025 $ git merge ia64/test
3026 Merge made by recursive.
3027  arch/ia64/configs/generic_defconfig   |    1 +
3028  arch/ia64/configs/gensparse_defconfig |    1 +
3029  arch/ia64/configs/tiger_defconfig     |    1 +
3030  arch/ia64/configs/xen_domu_defconfig  |    1 +
3031  arch/ia64/configs/zx1_defconfig       |    1 +
3032  arch/ia64/sn/kernel/sn2/sn_hwperf.c   |   12 +++--
3033  drivers/acpi/apei/erst.c              |    2 +-
3034  drivers/char/agp/hp-agp.c             |    6 ++-
3035  drivers/firmware/efivars.c            |    2 +-
3036  fs/pstore/inode.c                     |   40 ++++++++++++++--
3037  fs/pstore/internal.h                  |    2 +-
3038  fs/pstore/platform.c                  |   82 ++++++++++++++++++++++++++------
3039  include/linux/pstore.h                |    2 +-
3040  13 files changed, 123 insertions(+), 30 deletions(-)
3041 Merging m68k/for-next
3042 $ git merge m68k/for-next
3043 Merge made by recursive.
3044  arch/m68k/mac/macints.c      |    2 +-
3045  arch/m68k/mac/misc.c         |   40 +++++++++++++++++++++++-----------------
3046  drivers/zorro/zorro-driver.c |    8 ++++----
3047  3 files changed, 28 insertions(+), 22 deletions(-)
3048 Merging m68knommu/for-next
3049 $ git merge m68knommu/for-next
3050 Auto-merging arch/m68k/Kconfig.machine
3051 Removing arch/m68k/Kconfig.mmu
3052 Removing arch/m68k/Makefile_mm
3053 Removing arch/m68k/Makefile_no
3054 Removing arch/m68k/include/asm/entry_mm.h
3055 Removing arch/m68k/include/asm/entry_no.h
3056 Removing arch/m68k/kernel/Makefile_mm
3057 Removing arch/m68k/kernel/Makefile_no
3058 Removing arch/m68k/kernel/traps_mm.c
3059 Removing arch/m68k/kernel/traps_no.c
3060 Merge made by recursive.
3061  arch/m68k/Kconfig                            |  195 +----
3062  arch/m68k/Kconfig.bus                        |   55 ++
3063  arch/m68k/Kconfig.cpu                        |  429 +++++++++
3064  arch/m68k/Kconfig.devices                    |  171 ++++
3065  arch/m68k/{Kconfig.nommu => Kconfig.machine} |  543 ++++--------
3066  arch/m68k/Kconfig.mmu                        |  411 ---------
3067  arch/m68k/Makefile                           |  168 ++++-
3068  arch/m68k/Makefile_mm                        |  121 ---
3069  arch/m68k/Makefile_no                        |  124 ---
3070  arch/m68k/include/asm/entry.h                |  255 ++++++-
3071  arch/m68k/include/asm/entry_mm.h             |  128 ---
3072  arch/m68k/include/asm/entry_no.h             |  181 ----
3073  arch/m68k/include/asm/m520xsim.h             |   26 +-
3074  arch/m68k/include/asm/mcfqspi.h              |    8 +-
3075  arch/m68k/include/asm/page_no.h              |    3 +
3076  arch/m68k/include/asm/processor.h            |    6 +
3077  arch/m68k/include/asm/sections.h             |    2 +
3078  arch/m68k/kernel/Makefile                    |   24 +-
3079  arch/m68k/kernel/Makefile_mm                 |   17 -
3080  arch/m68k/kernel/Makefile_no                 |   10 -
3081  arch/m68k/kernel/entry_no.S                  |    6 +-
3082  arch/m68k/kernel/setup_no.c                  |    4 +-
3083  arch/m68k/kernel/traps.c                     | 1108 +++++++++++++++++++++++-
3084  arch/m68k/kernel/traps_mm.c                  | 1207 --------------------------
3085  arch/m68k/kernel/traps_no.c                  |  361 --------
3086  arch/m68k/kernel/vectors.c                   |  145 +++
3087  arch/m68k/lib/memcpy.c                       |    9 +
3088  arch/m68k/mm/init_no.c                       |   21 +-
3089  arch/m68k/platform/520x/config.c             |    6 +-
3090  arch/m68k/platform/520x/gpio.c               |   50 +-
3091  arch/m68k/platform/68328/Makefile            |    5 +-
3092  arch/m68k/platform/68328/entry.S             |   18 +-
3093  arch/m68k/platform/68360/Makefile            |    6 +-
3094  arch/m68k/platform/68360/entry.S             |    4 +-
3095  arch/m68k/platform/coldfire/entry.S          |    6 +-
3096  35 files changed, 2656 insertions(+), 3177 deletions(-)
3097  create mode 100644 arch/m68k/Kconfig.bus
3098  create mode 100644 arch/m68k/Kconfig.cpu
3099  create mode 100644 arch/m68k/Kconfig.devices
3100  rename arch/m68k/{Kconfig.nommu => Kconfig.machine} (62%)
3101  delete mode 100644 arch/m68k/Kconfig.mmu
3102  delete mode 100644 arch/m68k/Makefile_mm
3103  delete mode 100644 arch/m68k/Makefile_no
3104  delete mode 100644 arch/m68k/include/asm/entry_mm.h
3105  delete mode 100644 arch/m68k/include/asm/entry_no.h
3106  delete mode 100644 arch/m68k/kernel/Makefile_mm
3107  delete mode 100644 arch/m68k/kernel/Makefile_no
3108  delete mode 100644 arch/m68k/kernel/traps_mm.c
3109  delete mode 100644 arch/m68k/kernel/traps_no.c
3110  create mode 100644 arch/m68k/kernel/vectors.c
3111 Merging microblaze/next
3112 $ git merge microblaze/next
3113 Already up-to-date.
3114 Merging mips/mips-for-linux-next
3115 $ git merge mips/mips-for-linux-next
3116 Auto-merging arch/mips/alchemy/common/gpiolib.c
3117 Removing arch/mips/alchemy/common/pci.c
3118 Removing arch/mips/include/asm/mach-au1x00/au1xxx.h
3119 Removing arch/mips/pci/fixup-au1000.c
3120 Removing arch/mips/pci/ops-au1000.c
3121 Merge made by recursive.
3122  arch/mips/Kconfig                                  |   11 +-
3123  arch/mips/alchemy/Kconfig                          |   50 +-
3124  arch/mips/alchemy/common/Makefile                  |    6 +-
3125  arch/mips/alchemy/common/dbdma.c                   |  203 ++--
3126  arch/mips/alchemy/common/dma.c                     |   72 +-
3127  .../alchemy/common/{gpiolib-au1000.c => gpiolib.c} |   35 +-
3128  arch/mips/alchemy/common/pci.c                     |  104 --
3129  arch/mips/alchemy/common/platform.c                |  372 ++-----
3130  arch/mips/alchemy/common/power.c                   |   68 +-
3131  arch/mips/alchemy/common/setup.c                   |    6 +-
3132  arch/mips/alchemy/devboards/bcsr.c                 |    4 +
3133  arch/mips/alchemy/devboards/db1200/platform.c      |  153 ++-
3134  arch/mips/alchemy/devboards/db1200/setup.c         |    7 -
3135  arch/mips/alchemy/devboards/db1x00/board_setup.c   |   28 +-
3136  arch/mips/alchemy/devboards/db1x00/platform.c      |  199 +++-
3137  arch/mips/alchemy/devboards/pb1100/platform.c      |   49 +-
3138  arch/mips/alchemy/devboards/pb1200/platform.c      |  190 +++-
3139  arch/mips/alchemy/devboards/pb1500/board_setup.c   |   33 +-
3140  arch/mips/alchemy/devboards/pb1500/platform.c      |   71 +-
3141  arch/mips/alchemy/devboards/pb1550/board_setup.c   |    6 -
3142  arch/mips/alchemy/devboards/pb1550/platform.c      |  119 ++-
3143  arch/mips/alchemy/gpr/board_setup.c                |   12 -
3144  arch/mips/alchemy/gpr/platform.c                   |   47 +
3145  arch/mips/alchemy/mtx-1/board_setup.c              |   40 -
3146  arch/mips/alchemy/mtx-1/platform.c                 |   62 +
3147  arch/mips/alchemy/xxs1500/board_setup.c            |    8 -
3148  arch/mips/alchemy/xxs1500/platform.c               |   12 +-
3149  arch/mips/ar7/irq.c                                |    3 +-
3150  arch/mips/bcm63xx/irq.c                            |    1 +
3151  arch/mips/cobalt/irq.c                             |    1 +
3152  arch/mips/dec/setup.c                              |    4 +
3153  arch/mips/emma/markeins/irq.c                      |    2 +-
3154  arch/mips/include/asm/cpu.h                        |    3 +
3155  arch/mips/include/asm/mach-au1x00/au1000.h         |  559 ++++------
3156  arch/mips/include/asm/mach-au1x00/au1xxx.h         |   43 -
3157  arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h   |  114 +-
3158  arch/mips/include/asm/mach-au1x00/au1xxx_ide.h     |    1 +
3159  arch/mips/include/asm/mach-au1x00/au1xxx_psc.h     |   26 -
3160  arch/mips/include/asm/mach-au1x00/gpio-au1000.h    |   31 +-
3161  arch/mips/include/asm/mach-au1x00/gpio.h           |   79 ++-
3162  .../asm/mach-cavium-octeon/cpu-feature-overrides.h |    1 -
3163  arch/mips/include/asm/mach-db1x00/db1200.h         |    2 -
3164  arch/mips/include/asm/mach-db1x00/db1x00.h         |   16 +-
3165  arch/mips/include/asm/mach-pb1x00/pb1200.h         |   18 +-
3166  arch/mips/include/asm/mach-pb1x00/pb1550.h         |   16 +-
3167  arch/mips/include/asm/mach-powertv/dma-coherence.h |    1 -
3168  arch/mips/include/asm/mipsregs.h                   |    8 +
3169  arch/mips/include/asm/regdef.h                     |    6 +
3170  arch/mips/include/asm/stackframe.h                 |    4 +-
3171  arch/mips/jz4740/gpio.c                            |  148 +--
3172  arch/mips/jz4740/irq.c                             |   92 +-
3173  arch/mips/jz4740/irq.h                             |    6 +-
3174  arch/mips/jz4740/pm.c                              |    3 -
3175  arch/mips/kernel/Makefile                          |    5 +-
3176  arch/mips/kernel/cpu-probe.c                       |    3 +
3177  arch/mips/kernel/ftrace.c                          |   39 +-
3178  arch/mips/kernel/i8259.c                           |    3 +-
3179  arch/mips/kernel/linux32.c                         |    7 +
3180  arch/mips/kernel/perf_event.c                      |  519 +--------
3181  arch/mips/kernel/perf_event_mipsxx.c               | 1265 ++++++++++++++------
3182  arch/mips/kernel/scall64-n32.S                     |    2 +-
3183  arch/mips/kernel/scall64-o32.S                     |    2 +-
3184  arch/mips/kernel/signal.c                          |    3 +
3185  arch/mips/kernel/traps.c                           |    6 +-
3186  arch/mips/kernel/vpe.c                             |    2 +-
3187  arch/mips/lantiq/irq.c                             |    6 +-
3188  arch/mips/lantiq/xway/ebu.c                        |    1 -
3189  arch/mips/lantiq/xway/pmu.c                        |    1 -
3190  arch/mips/lasat/interrupt.c                        |    1 +
3191  arch/mips/loongson/fuloong-2e/irq.c                |    1 +
3192  arch/mips/loongson/lemote-2f/irq.c                 |    3 +-
3193  arch/mips/mm/mmap.c                                |   48 +-
3194  arch/mips/mm/tlb-r3k.c                             |    4 +-
3195  arch/mips/mm/tlb-r4k.c                             |    4 +-
3196  arch/mips/mm/tlbex.c                               |    6 +-
3197  arch/mips/mti-malta/malta-int.c                    |    6 +-
3198  arch/mips/netlogic/xlr/Makefile                    |    2 +-
3199  arch/mips/netlogic/xlr/smp.c                       |    4 +
3200  arch/mips/pci/Makefile                             |    3 +-
3201  arch/mips/pci/fixup-au1000.c                       |   43 -
3202  arch/mips/pci/ops-au1000.c                         |  308 -----
3203  arch/mips/pci/pci-alchemy.c                        |  516 ++++++++
3204  arch/mips/pci/pci-lantiq.c                         |    9 +-
3205  arch/mips/pci/pci-rc32434.c                        |    2 +-
3206  arch/mips/pmc-sierra/msp71xx/msp_irq.c             |    6 +-
3207  arch/mips/pnx8550/common/int.c                     |    2 +-
3208  arch/mips/sgi-ip22/ip22-int.c                      |   10 +-
3209  arch/mips/sni/rm200.c                              |    1 +
3210  arch/mips/vr41xx/common/irq.c                      |    1 +
3211  drivers/i2c/busses/Kconfig                         |    2 +-
3212  drivers/i2c/busses/i2c-au1550.c                    |    2 +-
3213  drivers/ide/Kconfig                                |    6 +-
3214  drivers/ide/au1xxx-ide.c                           |   46 +-
3215  drivers/mmc/host/Kconfig                           |    2 +-
3216  drivers/mmc/host/au1xmmc.c                         |   93 +-
3217  drivers/mtd/nand/Kconfig                           |    2 +-
3218  drivers/mtd/nand/au1550nd.c                        |    6 +-
3219  drivers/net/au1000_eth.c                           |   48 +-
3220  drivers/net/au1000_eth.h                           |    2 +-
3221  drivers/net/irda/Kconfig                           |    2 +-
3222  drivers/spi/Kconfig                                |    2 +-
3223  drivers/staging/octeon/ethernet-rx.c               |    3 +-
3224  drivers/tty/serial/lantiq.c                        |    4 +-
3225  drivers/usb/Kconfig                                |    1 -
3226  drivers/usb/host/Makefile                          |    1 +
3227  drivers/usb/host/alchemy-common.c                  |  337 ++++++
3228  drivers/usb/host/ehci-au1xxx.c                     |   77 +-
3229  drivers/usb/host/ehci-hcd.c                        |    2 +-
3230  drivers/usb/host/ohci-au1xxx.c                     |  110 +--
3231  drivers/video/Kconfig                              |    4 +-
3232  sound/mips/Kconfig                                 |    2 +-
3233  sound/soc/au1x/Kconfig                             |    2 +-
3234  112 files changed, 3571 insertions(+), 3184 deletions(-)
3235  rename arch/mips/alchemy/common/{gpiolib-au1000.c => gpiolib.c} (83%)
3236  delete mode 100644 arch/mips/alchemy/common/pci.c
3237  delete mode 100644 arch/mips/include/asm/mach-au1x00/au1xxx.h
3238  delete mode 100644 arch/mips/pci/fixup-au1000.c
3239  delete mode 100644 arch/mips/pci/ops-au1000.c
3240  create mode 100644 arch/mips/pci/pci-alchemy.c
3241  create mode 100644 drivers/usb/host/alchemy-common.c
3242 Merging openrisc/for-upstream
3243 $ git merge openrisc/for-upstream
3244 Already up-to-date.
3245 Merging parisc/for-next
3246 $ git merge parisc/for-next
3247 Already up-to-date.
3248 Merging powerpc/next
3249 $ git merge powerpc/next
3250 Removing arch/powerpc/boot/dts/hcu4.dts
3251 Removing arch/powerpc/configs/40x/hcu4_defconfig
3252 Removing arch/powerpc/platforms/40x/hcu4.c
3253 Auto-merging drivers/gpio/Kconfig
3254 Auto-merging drivers/gpio/Makefile
3255 Auto-merging kernel/sched.c
3256 Merge made by recursive.
3257  arch/powerpc/Kconfig                               |    7 +-
3258  arch/powerpc/Kconfig.debug                         |   46 +-
3259  arch/powerpc/boot/Makefile                         |    3 +-
3260  arch/powerpc/boot/dts/digsy_mtc.dts                |   59 +-
3261  arch/powerpc/boot/dts/hcu4.dts                     |  168 ---
3262  arch/powerpc/boot/dts/mpc5200b.dtsi                |    2 +
3263  arch/powerpc/boot/dts/yosemite.dts                 |   36 +
3264  arch/powerpc/configs/40x/hcu4_defconfig            |   80 --
3265  arch/powerpc/configs/85xx/p1023rds_defconfig       |    2 +-
3266  arch/powerpc/configs/85xx/xes_mpc85xx_defconfig    |    2 +-
3267  arch/powerpc/configs/mpc512x_defconfig             |   19 +-
3268  arch/powerpc/configs/mpc5200_defconfig             |   12 +
3269  arch/powerpc/configs/mpc85xx_defconfig             |    2 +-
3270  arch/powerpc/configs/mpc85xx_smp_defconfig         |    2 +-
3271  arch/powerpc/configs/ppc40x_defconfig              |    1 -
3272  arch/powerpc/configs/ppc6xx_defconfig              |    2 +-
3273  arch/powerpc/include/asm/device.h                  |    2 +
3274  arch/powerpc/include/asm/firmware.h                |   10 +
3275  arch/powerpc/include/asm/hugetlb.h                 |   63 ++-
3276  arch/powerpc/include/asm/kexec.h                   |    2 +-
3277  arch/powerpc/include/asm/machdep.h                 |    3 +-
3278  arch/powerpc/include/asm/mmu-book3e.h              |    7 +
3279  arch/powerpc/include/asm/mmu-hash64.h              |    3 +-
3280  arch/powerpc/include/asm/mmu.h                     |   18 +-
3281  arch/powerpc/include/asm/mpic.h                    |    2 -
3282  arch/powerpc/include/asm/opal.h                    |  443 ++++++++
3283  arch/powerpc/include/asm/paca.h                    |    8 +
3284  arch/powerpc/include/asm/page.h                    |   31 +-
3285  arch/powerpc/include/asm/page_64.h                 |   11 -
3286  arch/powerpc/include/asm/pte-book3e.h              |    3 +
3287  arch/powerpc/include/asm/rtas.h                    |    6 +-
3288  arch/powerpc/include/asm/smp.h                     |    1 +
3289  arch/powerpc/include/asm/sparsemem.h               |    2 +-
3290  arch/powerpc/include/asm/topology.h                |   14 +-
3291  arch/powerpc/include/asm/udbg.h                    |    3 +
3292  arch/powerpc/include/asm/xics.h                    |   19 +
3293  arch/powerpc/kernel/asm-offsets.c                  |   10 +
3294  arch/powerpc/kernel/dma-iommu.c                    |   28 +-
3295  arch/powerpc/kernel/dma-swiotlb.c                  |   16 +
3296  arch/powerpc/kernel/dma.c                          |   44 +-
3297  arch/powerpc/kernel/exceptions-64s.S               |   27 +-
3298  arch/powerpc/kernel/head_32.S                      |    7 +-
3299  arch/powerpc/kernel/head_40x.S                     |   15 +-
3300  arch/powerpc/kernel/head_44x.S                     |   16 +-
3301  arch/powerpc/kernel/head_64.S                      |   22 +-
3302  arch/powerpc/kernel/head_8xx.S                     |   13 +-
3303  arch/powerpc/kernel/head_fsl_booke.S               |  175 +++-
3304  arch/powerpc/kernel/ibmebus.c                      |   22 +-
3305  arch/powerpc/kernel/iommu.c                        |    8 +
3306  arch/powerpc/kernel/legacy_serial.c                |   25 +
3307  arch/powerpc/kernel/machine_kexec_64.c             |    3 +-
3308  arch/powerpc/kernel/misc_32.S                      |  171 +++
3309  arch/powerpc/kernel/pci-common.c                   |   11 +
3310  arch/powerpc/kernel/power6-pmu.c                   |    4 +-
3311  arch/powerpc/kernel/power7-pmu.c                   |    2 +
3312  arch/powerpc/kernel/prom.c                         |   14 +
3313  arch/powerpc/kernel/prom_init.c                    |  383 ++++++-
3314  arch/powerpc/kernel/prom_init_check.sh             |    4 +-
3315  arch/powerpc/kernel/ptrace.c                       |   18 +-
3316  arch/powerpc/kernel/setup_32.c                     |    2 +-
3317  arch/powerpc/kernel/setup_64.c                     |   22 +-
3318  arch/powerpc/kernel/smp.c                          |   30 +-
3319  arch/powerpc/kernel/swsusp.c                       |    2 +-
3320  arch/powerpc/kernel/udbg.c                         |    6 +
3321  arch/powerpc/kernel/vio.c                          |   21 +-
3322  arch/powerpc/mm/Makefile                           |    1 +
3323  arch/powerpc/mm/hash_utils_64.c                    |    9 +-
3324  arch/powerpc/mm/hugetlbpage-book3e.c               |  121 +++
3325  arch/powerpc/mm/hugetlbpage.c                      |  379 ++++++-
3326  arch/powerpc/mm/init_32.c                          |    9 +
3327  arch/powerpc/mm/mem.c                              |    8 +-
3328  arch/powerpc/mm/mmu_context_hash64.c               |   12 +-
3329  arch/powerpc/mm/mmu_context_nohash.c               |    5 +
3330  arch/powerpc/mm/numa.c                             |   20 +-
3331  arch/powerpc/mm/pgtable.c                          |    3 +-
3332  arch/powerpc/mm/tlb_low_64e.S                      |   24 +-
3333  arch/powerpc/mm/tlb_nohash.c                       |   46 +-
3334  arch/powerpc/platforms/40x/Kconfig                 |    8 -
3335  arch/powerpc/platforms/40x/Makefile                |    1 -
3336  arch/powerpc/platforms/40x/hcu4.c                  |   61 --
3337  arch/powerpc/platforms/512x/Kconfig                |    1 +
3338  arch/powerpc/platforms/83xx/Kconfig                |    9 +-
3339  arch/powerpc/platforms/85xx/Kconfig                |   12 +-
3340  arch/powerpc/platforms/86xx/Kconfig                |    1 +
3341  arch/powerpc/platforms/Kconfig                     |   11 +-
3342  arch/powerpc/platforms/Kconfig.cputype             |    4 +-
3343  arch/powerpc/platforms/Makefile                    |    1 +
3344  arch/powerpc/platforms/cell/iommu.c                |   21 +
3345  arch/powerpc/platforms/powernv/Kconfig             |   16 +
3346  arch/powerpc/platforms/powernv/Makefile            |    5 +
3347  arch/powerpc/platforms/powernv/opal-nvram.c        |   88 ++
3348  arch/powerpc/platforms/powernv/opal-rtc.c          |   97 ++
3349  arch/powerpc/platforms/powernv/opal-takeover.S     |  140 +++
3350  arch/powerpc/platforms/powernv/opal-wrappers.S     |  101 ++
3351  arch/powerpc/platforms/powernv/opal.c              |  322 ++++++
3352  arch/powerpc/platforms/powernv/pci-p5ioc2.c        |  234 ++++
3353  arch/powerpc/platforms/powernv/pci.c               |  427 ++++++++
3354  arch/powerpc/platforms/powernv/pci.h               |   48 +
3355  arch/powerpc/platforms/powernv/powernv.h           |   16 +
3356  arch/powerpc/platforms/powernv/setup.c             |  196 ++++
3357  arch/powerpc/platforms/powernv/smp.c               |  182 ++++
3358  arch/powerpc/platforms/ps3/Kconfig                 |   12 +
3359  arch/powerpc/platforms/ps3/Makefile                |    1 +
3360  arch/powerpc/platforms/ps3/gelic_udbg.c            |  273 +++++
3361  arch/powerpc/platforms/ps3/system-bus.c            |    7 +
3362  arch/powerpc/platforms/pseries/Kconfig             |    1 +
3363  arch/powerpc/platforms/pseries/dlpar.c             |    4 +
3364  arch/powerpc/platforms/pseries/eeh.c               |    2 +-
3365  arch/powerpc/platforms/pseries/iommu.c             |   34 +-
3366  arch/powerpc/platforms/pseries/nvram.c             |  171 +++-
3367  arch/powerpc/platforms/wsp/Kconfig                 |   11 +-
3368  arch/powerpc/platforms/wsp/Makefile                |    2 +
3369  arch/powerpc/platforms/wsp/ics.c                   |   48 +
3370  arch/powerpc/platforms/wsp/ics.h                   |    5 +
3371  arch/powerpc/platforms/wsp/msi.c                   |  102 ++
3372  arch/powerpc/platforms/wsp/msi.h                   |   19 +
3373  arch/powerpc/platforms/wsp/psr2.c                  |    4 +
3374  arch/powerpc/platforms/wsp/wsp.h                   |    3 +
3375  arch/powerpc/platforms/wsp/wsp_pci.c               | 1133 ++++++++++++++++++++
3376  arch/powerpc/platforms/wsp/wsp_pci.h               |  268 +++++
3377  arch/powerpc/sysdev/Makefile                       |    1 -
3378  arch/powerpc/sysdev/mpic.c                         |   24 +-
3379  arch/powerpc/sysdev/ppc4xx_pci.c                   |  101 ++-
3380  arch/powerpc/sysdev/ppc4xx_pci.h                   |   12 +
3381  arch/powerpc/sysdev/xics/Makefile                  |    1 +
3382  arch/powerpc/sysdev/xics/icp-native.c              |    2 +-
3383  arch/powerpc/sysdev/xics/ics-opal.c                |  244 +++++
3384  arch/powerpc/sysdev/xics/xics-common.c             |    8 +-
3385  arch/powerpc/xmon/xmon.c                           |    4 +-
3386  drivers/edac/cpc925_edac.c                         |   67 ++-
3387  drivers/edac/ppc4xx_edac.c                         |    2 +-
3388  drivers/gpio/Kconfig                               |    8 +
3389  drivers/gpio/Makefile                              |    1 +
3390  .../mpc8xxx_gpio.c => drivers/gpio/gpio-mpc8xxx.c  |    0
3391  drivers/net/ps3_gelic_net.c                        |    3 +
3392  drivers/net/ps3_gelic_net.h                        |    6 +
3393  drivers/of/fdt.c                                   |    7 +-
3394  drivers/tty/hvc/Kconfig                            |    9 +
3395  drivers/tty/hvc/Makefile                           |    1 +
3396  drivers/tty/hvc/hvc_opal.c                         |  424 ++++++++
3397  drivers/tty/hvc/hvcs.c                             |    6 +-
3398  drivers/tty/hvc/hvsi_lib.c                         |    4 +-
3399  drivers/tty/serial/8250.c                          |   23 -
3400  include/linux/dma-mapping.h                        |    3 +
3401  include/linux/topology.h                           |    4 +
3402  kernel/sched.c                                     |    2 -
3403  146 files changed, 7176 insertions(+), 745 deletions(-)
3404  delete mode 100644 arch/powerpc/boot/dts/hcu4.dts
3405  delete mode 100644 arch/powerpc/configs/40x/hcu4_defconfig
3406  create mode 100644 arch/powerpc/include/asm/opal.h
3407  create mode 100644 arch/powerpc/mm/hugetlbpage-book3e.c
3408  delete mode 100644 arch/powerpc/platforms/40x/hcu4.c
3409  create mode 100644 arch/powerpc/platforms/powernv/Kconfig
3410  create mode 100644 arch/powerpc/platforms/powernv/Makefile
3411  create mode 100644 arch/powerpc/platforms/powernv/opal-nvram.c
3412  create mode 100644 arch/powerpc/platforms/powernv/opal-rtc.c
3413  create mode 100644 arch/powerpc/platforms/powernv/opal-takeover.S
3414  create mode 100644 arch/powerpc/platforms/powernv/opal-wrappers.S
3415  create mode 100644 arch/powerpc/platforms/powernv/opal.c
3416  create mode 100644 arch/powerpc/platforms/powernv/pci-p5ioc2.c
3417  create mode 100644 arch/powerpc/platforms/powernv/pci.c
3418  create mode 100644 arch/powerpc/platforms/powernv/pci.h
3419  create mode 100644 arch/powerpc/platforms/powernv/powernv.h
3420  create mode 100644 arch/powerpc/platforms/powernv/setup.c
3421  create mode 100644 arch/powerpc/platforms/powernv/smp.c
3422  create mode 100644 arch/powerpc/platforms/ps3/gelic_udbg.c
3423  create mode 100644 arch/powerpc/platforms/wsp/msi.c
3424  create mode 100644 arch/powerpc/platforms/wsp/msi.h
3425  create mode 100644 arch/powerpc/platforms/wsp/wsp_pci.c
3426  create mode 100644 arch/powerpc/platforms/wsp/wsp_pci.h
3427  create mode 100644 arch/powerpc/sysdev/xics/ics-opal.c
3428  rename arch/powerpc/sysdev/mpc8xxx_gpio.c => drivers/gpio/gpio-mpc8xxx.c (100%)
3429  create mode 100644 drivers/tty/hvc/hvc_opal.c
3430 Merging 4xx/next
3431 $ git merge 4xx/next
3432 Already up-to-date.
3433 Merging 52xx-and-virtex/powerpc/next
3434 $ git merge 52xx-and-virtex/powerpc/next
3435 Merge made by recursive.
3436  arch/powerpc/boot/dts/charon.dts             |  236 ++++++++++++++++++++++++++
3437  arch/powerpc/configs/52xx/tqm5200_defconfig  |   20 ++-
3438  arch/powerpc/platforms/52xx/mpc5200_simple.c |    1 +
3439  3 files changed, 249 insertions(+), 8 deletions(-)
3440  create mode 100644 arch/powerpc/boot/dts/charon.dts
3441 Merging galak/next
3442 $ git merge galak/next
3443 Already up-to-date.
3444 Merging s390/features
3445 $ git merge s390/features
3446 Merge made by recursive.
3447  Documentation/kernel-parameters.txt |    6 +-
3448  arch/s390/Kconfig                   |   10 +
3449  arch/s390/defconfig                 |    2 +-
3450  arch/s390/include/asm/ccwdev.h      |    3 +
3451  arch/s390/include/asm/compat.h      |   13 +-
3452  arch/s390/include/asm/ipl.h         |    1 +
3453  arch/s390/include/asm/irq.h         |    3 +-
3454  arch/s390/include/asm/kexec.h       |    6 +
3455  arch/s390/include/asm/lowcore.h     |   10 +-
3456  arch/s390/include/asm/processor.h   |   46 +++--
3457  arch/s390/include/asm/ptrace.h      |   29 ++--
3458  arch/s390/include/asm/reset.h       |    2 +-
3459  arch/s390/include/asm/setup.h       |    9 +
3460  arch/s390/include/asm/smp.h         |    5 +
3461  arch/s390/include/asm/syscall.h     |    5 +-
3462  arch/s390/include/asm/system.h      |    8 +-
3463  arch/s390/include/asm/thread_info.h |    3 +-
3464  arch/s390/kernel/Makefile           |    1 +
3465  arch/s390/kernel/asm-offsets.c      |    4 +-
3466  arch/s390/kernel/base.S             |    6 +
3467  arch/s390/kernel/compat_linux.c     |    9 +-
3468  arch/s390/kernel/compat_signal.c    |   20 ++-
3469  arch/s390/kernel/crash_dump.c       |   39 ++++
3470  arch/s390/kernel/early.c            |    2 +-
3471  arch/s390/kernel/entry.S            |   30 ++--
3472  arch/s390/kernel/entry64.S          |   29 ++--
3473  arch/s390/kernel/head.S             |   16 ++
3474  arch/s390/kernel/head_kdump.S       |  116 ++++++++++++
3475  arch/s390/kernel/ipl.c              |   17 ++-
3476  arch/s390/kernel/irq.c              |    3 +-
3477  arch/s390/kernel/machine_kexec.c    |  313 ++++++++++++++++++++++++++++++++-
3478  arch/s390/kernel/mem_detect.c       |   69 +++++++
3479  arch/s390/kernel/process.c          |    3 +-
3480  arch/s390/kernel/processor.c        |    2 +-
3481  arch/s390/kernel/ptrace.c           |  155 ++++++++++++++---
3482  arch/s390/kernel/reipl.S            |    6 +
3483  arch/s390/kernel/reipl64.S          |    9 +-
3484  arch/s390/kernel/setup.c            |  275 +++++++++++++++++++++++++----
3485  arch/s390/kernel/signal.c           |  123 +++++++------
3486  arch/s390/kernel/smp.c              |   37 ++++-
3487  arch/s390/kernel/traps.c            |    2 +-
3488  arch/s390/kernel/vtime.c            |    9 +-
3489  arch/s390/lib/delay.c               |    3 +-
3490  arch/s390/mm/fault.c                |    4 +-
3491  arch/s390/mm/maccess.c              |   56 ++++++
3492  arch/s390/mm/vmem.c                 |    6 +
3493  drivers/s390/block/dasd.c           |    2 -
3494  drivers/s390/block/dasd_eckd.c      |    1 +
3495  drivers/s390/block/dasd_fba.c       |    1 +
3496  drivers/s390/char/con3215.c         |    3 +-
3497  drivers/s390/char/raw3270.c         |    3 +-
3498  drivers/s390/char/sclp_cmd.c        |    4 +-
3499  drivers/s390/char/sclp_quiesce.c    |    3 +-
3500  drivers/s390/char/tape_34xx.c       |    1 +
3501  drivers/s390/char/tape_3590.c       |    1 +
3502  drivers/s390/char/tape_core.c       |    2 -
3503  drivers/s390/char/vmur.c            |    3 +-
3504  drivers/s390/char/zcore.c           |   20 +--
3505  drivers/s390/cio/ccwgroup.c         |  333 ++++++++++++++--------------------
3506  drivers/s390/cio/ccwreq.c           |   23 ++-
3507  drivers/s390/cio/chsc_sch.c         |    5 +-
3508  drivers/s390/cio/cio.c              |   19 ++-
3509  drivers/s390/cio/device.c           |   13 ++
3510  drivers/s390/cio/device.h           |   13 ++-
3511  drivers/s390/cio/io_sch.h           |    2 +
3512  drivers/s390/cio/qdio_main.c        |    2 -
3513  drivers/s390/net/claw.c             |    3 +-
3514  drivers/s390/net/ctcm_main.c        |    3 +-
3515  drivers/s390/net/lcs.c              |    3 +-
3516  include/linux/crash_dump.h          |    1 +
3517  include/linux/elf.h                 |    1 +
3518  include/linux/kexec.h               |   10 +
3519  kernel/crash_dump.c                 |   11 ++
3520  kernel/kexec.c                      |   41 +++--
3521  74 files changed, 1545 insertions(+), 507 deletions(-)
3522  create mode 100644 arch/s390/kernel/crash_dump.c
3523  create mode 100644 arch/s390/kernel/head_kdump.S
3524 Merging sh/sh-latest
3525 $ git merge sh/sh-latest
3526 Merge made by recursive.
3527  arch/sh/boards/mach-ecovec24/setup.c |    4 ++++
3528  1 files changed, 4 insertions(+), 0 deletions(-)
3529 Merging rmobile/rmobile-latest
3530 $ git merge rmobile/rmobile-latest
3531 Merge made by recursive.
3532  arch/arm/mach-shmobile/include/mach/sh73a0.h |   13 ++++
3533  arch/arm/mach-shmobile/pfc-sh73a0.c          |   77 +++++++++++++++++++++-----
3534  2 files changed, 75 insertions(+), 15 deletions(-)
3535 Merging sparc/master
3536 $ git merge sparc/master
3537 Already up-to-date.
3538 Merging tile/master
3539 $ git merge tile/master
3540 Merge made by recursive.
3541  arch/tile/kernel/intvec_32.S  |    2 +-
3542  arch/tile/lib/atomic_asm_32.S |    2 +-
3543  fs/nfs/nfs4filelayout.c       |    6 +++---
3544  3 files changed, 5 insertions(+), 5 deletions(-)
3545 Merging unicore32/unicore32
3546 $ git merge unicore32/unicore32
3547 Merge made by recursive.
3548  arch/unicore32/boot/compressed/Makefile |    4 ++--
3549  arch/unicore32/include/asm/bitops.h     |   12 ++++++------
3550  arch/unicore32/kernel/ksyms.c           |    4 ++--
3551  arch/unicore32/lib/findbit.S            |   14 ++++++++------
3552  4 files changed, 18 insertions(+), 16 deletions(-)
3553 Merging xtensa/master
3554 $ git merge xtensa/master
3555 Merge made by recursive.
3556  arch/xtensa/include/asm/irqflags.h |    1 +
3557  arch/xtensa/include/asm/regs.h     |   91 ++++++++++++++++++---------------
3558  arch/xtensa/include/asm/timex.h    |    4 +-
3559  arch/xtensa/include/asm/uaccess.h  |    2 +-
3560  arch/xtensa/kernel/align.S         |   14 +++---
3561  arch/xtensa/kernel/coprocessor.S   |   10 ++--
3562  arch/xtensa/kernel/entry.S         |   98 ++++++++++++++++++------------------
3563  arch/xtensa/kernel/head.S          |   12 ++--
3564  arch/xtensa/kernel/irq.c           |    5 ++
3565  arch/xtensa/kernel/traps.c         |    4 +-
3566  arch/xtensa/kernel/vectors.S       |   22 ++++----
3567  arch/xtensa/kernel/vmlinux.lds.S   |    1 +
3568  12 files changed, 139 insertions(+), 125 deletions(-)
3569 Merging ceph/for-next
3570 $ git merge ceph/for-next
3571 Auto-merging fs/ceph/caps.c
3572 Auto-merging fs/ceph/inode.c
3573 Auto-merging fs/ceph/super.h
3574 Auto-merging include/linux/ceph/libceph.h
3575 Auto-merging net/ceph/ceph_common.c
3576 Auto-merging net/ceph/messenger.c
3577 Auto-merging net/ceph/osd_client.c
3578 Merge made by recursive.
3579  drivers/block/rbd.c            |    2 +-
3580  fs/ceph/addr.c                 |  192 +++++++++++++++++++++++++---------------
3581  fs/ceph/caps.c                 |    2 +-
3582  fs/ceph/inode.c                |   46 +---------
3583  fs/ceph/ioctl.c                |   34 ++++++--
3584  fs/ceph/ioctl.h                |   55 +++++++++++-
3585  fs/ceph/mds_client.c           |   11 ++-
3586  fs/ceph/super.c                |   61 ++++++++-----
3587  fs/ceph/super.h                |    8 +-
3588  include/linux/ceph/libceph.h   |    4 +-
3589  include/linux/ceph/messenger.h |    3 +-
3590  net/ceph/ceph_common.c         |   47 +++++-----
3591  net/ceph/messenger.c           |   16 +++-
3592  net/ceph/mon_client.c          |   79 +++++++++--------
3593  net/ceph/msgpool.c             |    4 +-
3594  net/ceph/osd_client.c          |    8 +-
3595  16 files changed, 344 insertions(+), 228 deletions(-)
3596 Merging cifs/master
3597 $ git merge cifs/master
3598 Already up-to-date.
3599 Merging configfs/linux-next
3600 $ git merge configfs/linux-next
3601 Already up-to-date.
3602 Merging ecryptfs/next
3603 $ git merge ecryptfs/next
3604 Already up-to-date.
3605 Merging ext3/for_next
3606 $ git merge ext3/for_next
3607 Already up-to-date.
3608 Merging ext4/dev
3609 $ git merge ext4/dev
3610 Already up-to-date.
3611 Merging fatfs/master
3612 $ git merge fatfs/master
3613 Already up-to-date.
3614 Merging fuse/for-next
3615 $ git merge fuse/for-next
3616 Already up-to-date.
3617 Merging gfs2/master
3618 $ git merge gfs2/master
3619 Auto-merging fs/gfs2/acl.c
3620 Auto-merging fs/gfs2/quota.c
3621 Merge made by recursive.
3622  fs/gfs2/acl.c    |    5 +-
3623  fs/gfs2/aops.c   |    6 ---
3624  fs/gfs2/dir.c    |   42 +++++---------------
3625  fs/gfs2/file.c   |   50 ++++++++++++++++++------
3626  fs/gfs2/glops.c  |   29 +++++++++++---
3627  fs/gfs2/incore.h |    1 +
3628  fs/gfs2/inode.c  |   85 +++++++++++++++--------------------------
3629  fs/gfs2/inode.h  |    2 +-
3630  fs/gfs2/quota.c  |   13 +-----
3631  fs/gfs2/super.c  |  111 +++++++++++++++++++++++++++++++++++-------------------
3632  fs/gfs2/xattr.c  |    5 +-
3633  11 files changed, 182 insertions(+), 167 deletions(-)
3634 Merging hfsplus/for-next
3635 $ git merge hfsplus/for-next
3636 Already up-to-date.
3637 Merging jfs/next
3638 $ git merge jfs/next
3639 Already up-to-date.
3640 Merging logfs/master
3641 $ git merge logfs/master
3642 Auto-merging fs/logfs/logfs.h
3643 Merge made by recursive.
3644  fs/logfs/dev_mtd.c   |   26 ++++++++++++--------------
3645  fs/logfs/logfs.h     |    1 +
3646  fs/logfs/readwrite.c |    4 ++++
3647  fs/logfs/segment.c   |   14 ++++++++++----
3648  fs/logfs/super.c     |    1 +
3649  5 files changed, 28 insertions(+), 18 deletions(-)
3650 Merging nfs/linux-next
3651 $ git merge nfs/linux-next
3652 Already up-to-date.
3653 Merging nfsd/nfsd-next
3654 $ git merge nfsd/nfsd-next
3655 Auto-merging fs/compat.c
3656 Auto-merging fs/nfs/nfs4_fs.h
3657 Auto-merging include/linux/fs.h
3658 Removing include/linux/nfsd/const.h
3659 Removing include/linux/nfsd/syscall.h
3660 Merge made by recursive.
3661  arch/alpha/include/asm/fcntl.h |    2 -
3662  fs/compat.c                    |    1 -
3663  fs/lockd/host.c                |   25 +-
3664  fs/lockd/svc.c                 |    2 +-
3665  fs/locks.c                     |  223 ++++---
3666  fs/nfs/callback.c              |    4 +-
3667  fs/nfs/nfs4_fs.h               |   24 -
3668  fs/nfsd/export.c               |   16 +-
3669  fs/nfsd/nfs4callback.c         |    2 +-
3670  fs/nfsd/nfs4proc.c             |  346 ++++++++--
3671  fs/nfsd/nfs4recover.c          |   53 ++-
3672  fs/nfsd/nfs4state.c            | 1431 ++++++++++++++++++----------------------
3673  fs/nfsd/nfs4xdr.c              |  227 ++++---
3674  fs/nfsd/nfsctl.c               |    1 -
3675  fs/nfsd/nfsd.h                 |   33 +
3676  fs/nfsd/nfsfh.c                |   39 +-
3677  fs/nfsd/state.h                |  128 ++--
3678  fs/nfsd/vfs.c                  |   29 +-
3679  fs/nfsd/vfs.h                  |   27 +-
3680  fs/nfsd/xdr4.h                 |   15 +-
3681  include/asm-generic/fcntl.h    |    5 -
3682  include/linux/fs.h             |    8 +-
3683  include/linux/nfs4.h           |   16 +
3684  include/linux/nfsd/Kbuild      |    2 -
3685  include/linux/nfsd/const.h     |   55 --
3686  include/linux/nfsd/export.h    |    2 +-
3687  include/linux/nfsd/nfsfh.h     |    7 +-
3688  include/linux/nfsd/syscall.h   |  116 ----
3689  include/linux/sunrpc/clnt.h    |    8 +-
3690  include/linux/sunrpc/svc.h     |   32 +-
3691  net/sunrpc/svc.c               |   33 +-
3692  net/sunrpc/svc_xprt.c          |   13 +-
3693  net/sunrpc/svcsock.c           |   23 +-
3694  33 files changed, 1512 insertions(+), 1436 deletions(-)
3695  delete mode 100644 include/linux/nfsd/const.h
3696  delete mode 100644 include/linux/nfsd/syscall.h
3697 Merging nilfs2/for-next
3698 $ git merge nilfs2/for-next
3699 Already up-to-date.
3700 Merging ocfs2/linux-next
3701 $ git merge ocfs2/linux-next
3702 Auto-merging fs/ocfs2/file.c
3703 Auto-merging fs/ocfs2/move_extents.c
3704 Merge made by recursive.
3705  fs/ocfs2/aops.c              |   69 +++++++++++++--
3706  fs/ocfs2/aops.h              |   14 +++
3707  fs/ocfs2/cluster/heartbeat.c |  194 ++++++++++++++++++++++++++----------------
3708  fs/ocfs2/cluster/netdebug.c  |  102 +++++++++++++++-------
3709  fs/ocfs2/cluster/tcp.c       |  138 ++++++++++++++++--------------
3710  fs/ocfs2/cluster/tcp.h       |    2 +
3711  fs/ocfs2/dir.c               |    3 +-
3712  fs/ocfs2/dlm/dlmcommon.h     |   56 +++----------
3713  fs/ocfs2/dlm/dlmdomain.c     |   44 +++++-----
3714  fs/ocfs2/dlm/dlmlock.c       |   54 ++++++------
3715  fs/ocfs2/dlm/dlmmaster.c     |  175 +++++++++++++++++++-------------------
3716  fs/ocfs2/dlm/dlmrecovery.c   |  164 ++++++++++++++++++------------------
3717  fs/ocfs2/dlm/dlmthread.c     |   16 ++--
3718  fs/ocfs2/dlmglue.c           |   21 +++--
3719  fs/ocfs2/extent_map.c        |   96 +++++++++++++++++++++
3720  fs/ocfs2/extent_map.h        |    2 +
3721  fs/ocfs2/file.c              |   93 ++++++++++++++++++++-
3722  fs/ocfs2/inode.h             |    3 +
3723  fs/ocfs2/ioctl.c             |    8 +-
3724  fs/ocfs2/journal.c           |   23 +++++-
3725  fs/ocfs2/mmap.c              |   53 +++++------
3726  fs/ocfs2/move_extents.c      |    2 +-
3727  fs/ocfs2/ocfs2.h             |    4 +-
3728  fs/ocfs2/quota_local.c       |   13 ++-
3729  fs/ocfs2/slot_map.c          |    4 +-
3730  fs/ocfs2/stack_o2cb.c        |   71 ++++++++++++++--
3731  fs/ocfs2/super.c             |   23 +++--
3732  fs/ocfs2/xattr.c             |    9 ++-
3733  28 files changed, 932 insertions(+), 524 deletions(-)
3734 Merging omfs/for-next
3735 $ git merge omfs/for-next
3736 Already up-to-date.
3737 Merging squashfs/master
3738 $ git merge squashfs/master
3739 Already up-to-date.
3740 Merging udf/for_next
3741 $ git merge udf/for_next
3742 Already up-to-date.
3743 Merging v9fs/for-next
3744 $ git merge v9fs/for-next
3745 Merge made by recursive.
3746  Documentation/filesystems/9p.txt |    2 +-
3747  fs/9p/v9fs.c                     |   33 ++-
3748  fs/9p/vfs_dir.c                  |   14 +-
3749  fs/9p/vfs_inode.c                |    2 -
3750  include/net/9p/9p.h              |   14 +-
3751  include/net/9p/client.h          |    8 +-
3752  include/net/9p/transport.h       |   10 +-
3753  include/trace/events/9p.h        |  176 ++++++++++++++
3754  net/9p/client.c                  |  469 +++++++++++++++++++++++++++-----------
3755  net/9p/protocol.c                |   99 +-------
3756  net/9p/protocol.h                |    4 +-
3757  net/9p/trans_common.c            |   53 ++---
3758  net/9p/trans_common.h            |   21 +--
3759  net/9p/trans_virtio.c            |  319 +++++++++++++++-----------
3760  14 files changed, 772 insertions(+), 452 deletions(-)
3761  create mode 100644 include/trace/events/9p.h
3762 Merging ubifs/linux-next
3763 $ git merge ubifs/linux-next
3764 Already up-to-date.
3765 Merging xfs/master
3766 $ git merge xfs/master
3767 Resolved 'fs/xfs/xfs_aops.c' using previous resolution.
3768 Resolved 'fs/xfs/xfs_super.c' using previous resolution.
3769 Auto-merging fs/xfs/xfs_aops.c
3770 CONFLICT (content): Merge conflict in fs/xfs/xfs_aops.c
3771 Auto-merging fs/xfs/xfs_iops.c
3772 Auto-merging fs/xfs/xfs_super.c
3773 CONFLICT (content): Merge conflict in fs/xfs/xfs_super.c
3774 Automatic merge failed; fix conflicts and then commit the result.
3775 $ git commit -v -a
3776 [master f603595] Merge remote-tracking branch 'xfs/master'
3777 $ git diff -M --stat --summary HEAD^..
3778  fs/xfs/xfs_aops.c        |  118 +--
3779  fs/xfs/xfs_aops.h        |    4 +-
3780  fs/xfs/xfs_attr.c        |   60 +-
3781  fs/xfs/xfs_attr_leaf.c   |    7 +-
3782  fs/xfs/xfs_bmap.c        | 2527 +++++++++++++++++++++++-----------------------
3783  fs/xfs/xfs_bmap.h        |  318 ++-----
3784  fs/xfs/xfs_btree.c       |    3 +-
3785  fs/xfs/xfs_buf.c         |  113 +--
3786  fs/xfs/xfs_buf.h         |   14 +-
3787  fs/xfs/xfs_buf_item.c    |    4 +-
3788  fs/xfs/xfs_da_btree.c    |   43 +-
3789  fs/xfs/xfs_dfrag.c       |    2 +-
3790  fs/xfs/xfs_dir2_leaf.c   |    6 +-
3791  fs/xfs/xfs_discard.c     |   20 +-
3792  fs/xfs/xfs_dquot.c       |   28 +-
3793  fs/xfs/xfs_export.c      |   12 +-
3794  fs/xfs/xfs_file.c        |  135 ++-
3795  fs/xfs/xfs_filestream.c  |    4 +-
3796  fs/xfs/xfs_fsops.c       |   60 +-
3797  fs/xfs/xfs_ialloc.c      |   13 +-
3798  fs/xfs/xfs_iget.c        |    2 -
3799  fs/xfs/xfs_inode.c       |   27 +-
3800  fs/xfs/xfs_inode.h       |    1 -
3801  fs/xfs/xfs_iomap.c       |   33 +-
3802  fs/xfs/xfs_iops.c        |   10 +-
3803  fs/xfs/xfs_log_recover.c |   18 +-
3804  fs/xfs/xfs_mount.c       |    2 +-
3805  fs/xfs/xfs_qm.c          |   10 +-
3806  fs/xfs/xfs_rtalloc.c     |   38 +-
3807  fs/xfs/xfs_rw.c          |    2 +-
3808  fs/xfs/xfs_super.c       |    7 +-
3809  fs/xfs/xfs_sync.c        |   14 +-
3810  fs/xfs/xfs_trace.h       |    1 -
3811  fs/xfs/xfs_trans.c       |   11 +-
3812  fs/xfs/xfs_trans.h       |    5 +-
3813  fs/xfs/xfs_trans_buf.c   |    5 +-
3814  fs/xfs/xfs_vnodeops.c    |   66 +-
3815  37 files changed, 1739 insertions(+), 2004 deletions(-)
3816 Merging vfs/for-next
3817 $ git merge vfs/for-next
3818 Already up-to-date.
3819 Merging vfs-scale/vfs-scale-working
3820 $ git merge vfs-scale/vfs-scale-working
3821 Already up-to-date.
3822 Merging pci/linux-next
3823 $ git merge pci/linux-next
3824 Already up-to-date.
3825 Merging hid/for-next
3826 $ git merge hid/for-next
3827 Auto-merging MAINTAINERS
3828 Merge made by recursive.
3829  .../ABI/testing/sysfs-driver-hid-logitech-lg4ff    |    7 +
3830  MAINTAINERS                                        |    6 +
3831  drivers/hid/Kconfig                                |   29 +-
3832  drivers/hid/Makefile                               |    3 +-
3833  drivers/hid/hid-apple.c                            |   40 +
3834  drivers/hid/hid-axff.c                             |   36 +-
3835  drivers/hid/hid-core.c                             |   75 ++-
3836  drivers/hid/hid-debug.c                            |    5 +
3837  drivers/hid/hid-ids.h                              |   15 +
3838  drivers/hid/hid-input.c                            |   11 +
3839  drivers/hid/hid-lg.c                               |   29 +-
3840  drivers/hid/hid-lg.h                               |    4 +-
3841  drivers/hid/hid-lg4ff.c                            |  403 ++++++++-
3842  drivers/hid/hid-lgff.c                             |   13 -
3843  drivers/hid/hid-logitech-dj.c                      |  922 ++++++++++++++++++++
3844  drivers/hid/hid-logitech-dj.h                      |  123 +++
3845  drivers/hid/hid-multitouch.c                       |   93 ++-
3846  drivers/hid/hid-prodikeys.c                        |    8 +-
3847  drivers/hid/hid-roccat-kone.c                      |   63 +-
3848  drivers/hid/hid-roccat-kovaplus.c                  |   17 +-
3849  drivers/hid/hid-roccat-pyra.c                      |   23 +-
3850  drivers/hid/hid-sjoy.c                             |   68 +-
3851  drivers/hid/hid-wiimote.c                          |  800 +++++++++++++++++-
3852  drivers/hid/hid-zydacron.c                         |    4 +-
3853  drivers/hid/hidraw.c                               |   11 +-
3854  drivers/hid/usbhid/hid-quirks.c                    |    1 -
3855  drivers/hid/usbhid/hiddev.c                        |    2 +
3856  include/linux/hid.h                                |    3 +
3857  28 files changed, 2631 insertions(+), 183 deletions(-)
3858  create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
3859  create mode 100644 drivers/hid/hid-logitech-dj.c
3860  create mode 100644 drivers/hid/hid-logitech-dj.h
3861 Merging quilt/i2c
3862 $ git merge quilt/i2c
3863 Auto-merging drivers/i2c/busses/Kconfig
3864 Merge made by recursive.
3865  drivers/i2c/busses/Kconfig |    2 +-
3866  1 files changed, 1 insertions(+), 1 deletions(-)
3867 Merging bjdooks-i2c/next-i2c
3868 $ git merge bjdooks-i2c/next-i2c
3869 Merge made by recursive.
3870  .../devicetree/bindings/i2c/fsl-imx-i2c.txt        |   25 ++++
3871  .../devicetree/bindings/i2c/samsung-i2c.txt        |   39 ++++++
3872  arch/arm/plat-mxc/include/mach/i2c.h               |    4 -
3873  arch/arm/plat-omap/i2c.c                           |   27 ++++
3874  drivers/i2c/busses/i2c-imx.c                       |   46 ++++----
3875  drivers/i2c/busses/i2c-omap.c                      |   99 ++++++++-------
3876  drivers/i2c/busses/i2c-s3c2410.c                   |  128 ++++++++++++++++++--
3877  include/linux/i2c-omap.h                           |    2 +
3878  8 files changed, 289 insertions(+), 81 deletions(-)
3879  create mode 100644 Documentation/devicetree/bindings/i2c/fsl-imx-i2c.txt
3880  create mode 100644 Documentation/devicetree/bindings/i2c/samsung-i2c.txt
3881 Merging quilt/jdelvare-hwmon
3882 $ git merge quilt/jdelvare-hwmon
3883 Merge made by recursive.
3884  drivers/hwmon/Kconfig      |   15 ++++-
3885  drivers/hwmon/ibmaem.c     |   60 ++++++++++--------
3886  drivers/hwmon/lm90.c       |  146 +++++++++++++++++++++----------------------
3887  drivers/hwmon/smsc47b397.c |   13 +++--
3888  4 files changed, 126 insertions(+), 108 deletions(-)
3889 Merging hwmon-staging/hwmon-next
3890 $ git merge hwmon-staging/hwmon-next
3891 Auto-merging drivers/hwmon/Kconfig
3892 Merge made by recursive.
3893  Documentation/hwmon/ad7314                |   25 ++
3894  Documentation/hwmon/adm1275               |   40 ++-
3895  Documentation/hwmon/exynos4_tmu           |   81 +++++
3896  Documentation/hwmon/ltc2978               |  103 ++++++
3897  Documentation/hwmon/pmbus                 |   13 +-
3898  Documentation/hwmon/pmbus-core            |  283 ++++++++++++++++
3899  Documentation/hwmon/zl6100                |  125 +++++++
3900  drivers/hwmon/Kconfig                     |   20 ++
3901  drivers/hwmon/Makefile                    |    2 +
3902  drivers/hwmon/ad7314.c                    |  186 ++++++++++
3903  drivers/hwmon/exynos4_tmu.c               |  524 +++++++++++++++++++++++++++++
3904  drivers/hwmon/f71882fg.c                  |  231 +++++++------
3905  drivers/hwmon/pmbus/Kconfig               |   28 ++-
3906  drivers/hwmon/pmbus/Makefile              |    2 +
3907  drivers/hwmon/pmbus/adm1275.c             |  159 ++++++++-
3908  drivers/hwmon/pmbus/lm25066.c             |   17 +-
3909  drivers/hwmon/pmbus/ltc2978.c             |  408 ++++++++++++++++++++++
3910  drivers/hwmon/pmbus/max16064.c            |    3 +-
3911  drivers/hwmon/pmbus/max34440.c            |   13 +-
3912  drivers/hwmon/pmbus/max8688.c             |    9 +-
3913  drivers/hwmon/pmbus/pmbus.c               |   10 +-
3914  drivers/hwmon/pmbus/pmbus.h               |   23 ++-
3915  drivers/hwmon/pmbus/pmbus_core.c          |   85 +++--
3916  drivers/hwmon/pmbus/ucd9000.c             |   13 +-
3917  drivers/hwmon/pmbus/ucd9200.c             |    5 +-
3918  drivers/hwmon/pmbus/zl6100.c              |  256 ++++++++++++++
3919  drivers/hwmon/w83627ehf.c                 |   62 ++++
3920  include/linux/platform_data/exynos4_tmu.h |   83 +++++
3921  28 files changed, 2593 insertions(+), 216 deletions(-)
3922  create mode 100644 Documentation/hwmon/ad7314
3923  create mode 100644 Documentation/hwmon/exynos4_tmu
3924  create mode 100644 Documentation/hwmon/ltc2978
3925  create mode 100644 Documentation/hwmon/pmbus-core
3926  create mode 100644 Documentation/hwmon/zl6100
3927  create mode 100644 drivers/hwmon/ad7314.c
3928  create mode 100644 drivers/hwmon/exynos4_tmu.c
3929  create mode 100644 drivers/hwmon/pmbus/ltc2978.c
3930  create mode 100644 drivers/hwmon/pmbus/zl6100.c
3931  create mode 100644 include/linux/platform_data/exynos4_tmu.h
3932 Merging quilt/kernel-doc
3933 $ git merge quilt/kernel-doc
3934 Merge made by recursive.
3935  Documentation/CodingStyle               |    4 ++--
3936  Documentation/PCI/pci.txt               |    4 ++--
3937  Documentation/block/switching-sched.txt |    4 ++--
3938  Documentation/cgroups/cgroups.txt       |    4 ++--
3939  Documentation/filesystems/hfs.txt       |    9 ++++-----
3940  Documentation/filesystems/inotify.txt   |    3 ++-
3941  Documentation/laptops/thinkpad-acpi.txt |    4 ++--
3942  Documentation/leds/leds-class.txt       |    4 ++--
3943  Documentation/serial/computone.txt      |    2 --
3944  9 files changed, 18 insertions(+), 20 deletions(-)
3945 Merging docs/docs-move
3946 $ git merge docs/docs-move
3947 Auto-merging drivers/gpu/drm/i915/i915_drv.c
3948 Merge made by recursive.
3949  Documentation/DocBook/drm.tmpl  |  308 +++++++++++++++++++++------------------
3950  drivers/gpu/drm/i915/i915_drv.c |    4 +-
3951  2 files changed, 170 insertions(+), 142 deletions(-)
3952 Merging v4l-dvb/master
3953 $ git merge v4l-dvb/master
3954 Auto-merging MAINTAINERS
3955 Auto-merging drivers/media/dvb/frontends/a8293.h
3956 Auto-merging drivers/media/rc/ati_remote.c
3957 Auto-merging drivers/media/video/tm6000/tm6000-alsa.c
3958 Auto-merging drivers/media/video/tm6000/tm6000-cards.c
3959 Auto-merging drivers/media/video/tm6000/tm6000-core.c
3960 Auto-merging drivers/media/video/tm6000/tm6000-dvb.c
3961 Auto-merging drivers/media/video/tm6000/tm6000-i2c.c
3962 Auto-merging drivers/media/video/tm6000/tm6000-input.c
3963 Auto-merging drivers/media/video/tm6000/tm6000-regs.h
3964 Auto-merging drivers/media/video/tm6000/tm6000-usb-isoc.h
3965 Auto-merging drivers/media/video/tm6000/tm6000-video.c
3966 Auto-merging drivers/media/video/tm6000/tm6000.h
3967 Auto-merging drivers/misc/altera-stapl/Kconfig
3968 Auto-merging drivers/misc/altera-stapl/altera-jtag.c
3969 Auto-merging drivers/misc/altera-stapl/altera.c
3970 Removing drivers/staging/altera-stapl/Makefile
3971 Removing drivers/staging/tm6000/README
3972 Removing drivers/staging/tm6000/TODO
3973 Removing drivers/staging/tm6000/tm6000-stds.c
3974 Merge made by recursive.
3975  Documentation/DocBook/media/dvb/dvbproperty.xml    |   24 +-
3976  Documentation/DocBook/media/dvb/intro.xml          |    2 +-
3977  Documentation/DocBook/media/v4l/compat.xml         |    8 +
3978  Documentation/DocBook/media/v4l/v4l2.xml           |    9 +-
3979  Documentation/DocBook/media/v4l/vidioc-dqevent.xml |  129 +
3980  .../DocBook/media/v4l/vidioc-queryctrl.xml         |    9 +
3981  .../DocBook/media/v4l/vidioc-subscribe-event.xml   |  123 +-
3982  Documentation/dvb/get_dvb_firmware                 |   38 +-
3983  Documentation/dvb/it9137.txt                       |    9 +
3984  Documentation/feature-removal-schedule.txt         |   23 -
3985  .../video4linux/CARDLIST.tm6000                    |    0
3986  Documentation/video4linux/gspca.txt                |    4 +
3987  Documentation/video4linux/omap3isp.txt             |    9 +-
3988  Documentation/video4linux/v4l2-controls.txt        |   43 +-
3989  MAINTAINERS                                        |   18 +
3990  drivers/input/misc/Kconfig                         |   16 -
3991  drivers/input/misc/Makefile                        |    1 -
3992  drivers/media/common/saa7146_core.c                |   74 +-
3993  drivers/media/common/saa7146_fops.c                |  118 +-
3994  drivers/media/common/saa7146_hlp.c                 |   14 +-
3995  drivers/media/common/saa7146_i2c.c                 |   60 +-
3996  drivers/media/common/saa7146_vbi.c                 |   48 +-
3997  drivers/media/common/saa7146_video.c               |  183 +-
3998  drivers/media/common/tuners/Makefile               |    4 +-
3999  drivers/media/common/tuners/mt20xx.c               |   24 +-
4000  drivers/media/common/tuners/mxl5005s.c             |   22 +-
4001  drivers/media/common/tuners/tda18212.c             |   31 +-
4002  drivers/media/common/tuners/tda18271-common.c      |   32 +-
4003  drivers/media/common/tuners/tda18271-fe.c          |    2 +-
4004  drivers/media/common/tuners/tda18271-priv.h        |   39 +-
4005  drivers/media/common/tuners/tda827x.c              |    8 +-
4006  drivers/media/common/tuners/tuner-xc2028.c         |   18 +-
4007  drivers/media/common/tuners/tuner-xc2028.h         |    1 +
4008  drivers/media/dvb/b2c2/Makefile                    |    4 +-
4009  drivers/media/dvb/bt8xx/Makefile                   |    8 +-
4010  drivers/media/dvb/ddbridge/Makefile                |    8 +-
4011  drivers/media/dvb/ddbridge/ddbridge-core.c         |   43 +-
4012  drivers/media/dvb/dm1105/Makefile                  |    2 +-
4013  drivers/media/dvb/dvb-core/dvb_frontend.c          |   95 +-
4014  drivers/media/dvb/dvb-core/dvb_frontend.h          |    1 +
4015  drivers/media/dvb/dvb-usb/Kconfig                  |   28 +
4016  drivers/media/dvb/dvb-usb/Makefile                 |   15 +-
4017  drivers/media/dvb/dvb-usb/a800.c                   |    4 +-
4018  drivers/media/dvb/dvb-usb/af9005-fe.c              |    2 -
4019  drivers/media/dvb/dvb-usb/af9005.c                 |    5 +-
4020  drivers/media/dvb/dvb-usb/af9015.c                 |   70 +-
4021  drivers/media/dvb/dvb-usb/anysee.c                 |  337 +-
4022  drivers/media/dvb/dvb-usb/anysee.h                 |    1 +
4023  drivers/media/dvb/dvb-usb/au6610.c                 |    9 +-
4024  drivers/media/dvb/dvb-usb/az6027.c                 |   26 +-
4025  drivers/media/dvb/dvb-usb/ce6230.c                 |    9 +-
4026  drivers/media/dvb/dvb-usb/cinergyT2-core.c         |    5 +-
4027  drivers/media/dvb/dvb-usb/cxusb.c                  |  142 +-
4028  drivers/media/dvb/dvb-usb/dib0700_core.c           |   99 +-
4029  drivers/media/dvb/dvb-usb/dib0700_devices.c        |  377 +-
4030  drivers/media/dvb/dvb-usb/dibusb-common.c          |   27 +-
4031  drivers/media/dvb/dvb-usb/dibusb-mb.c              |   31 +-
4032  drivers/media/dvb/dvb-usb/dibusb-mc.c              |    3 +
4033  drivers/media/dvb/dvb-usb/digitv.c                 |   16 +-
4034  drivers/media/dvb/dvb-usb/dtt200u.c                |   14 +-
4035  drivers/media/dvb/dvb-usb/dtv5100.c                |   11 +-
4036  drivers/media/dvb/dvb-usb/dvb-usb-dvb.c            |  153 +-
4037  drivers/media/dvb/dvb-usb/dvb-usb-ids.h            |    4 +
4038  drivers/media/dvb/dvb-usb/dvb-usb-init.c           |   41 +-
4039  drivers/media/dvb/dvb-usb/dvb-usb-urb.c            |   28 +-
4040  drivers/media/dvb/dvb-usb/dvb-usb.h                |   37 +-
4041  drivers/media/dvb/dvb-usb/dw2102.c                 |  115 +-
4042  drivers/media/dvb/dvb-usb/ec168.c                  |    9 +-
4043  drivers/media/dvb/dvb-usb/friio.c                  |    7 +-
4044  drivers/media/dvb/dvb-usb/gl861.c                  |    9 +-
4045  drivers/media/dvb/dvb-usb/gp8psk-fe.c              |   17 +-
4046  drivers/media/dvb/dvb-usb/gp8psk.c                 |    5 +-
4047  drivers/media/dvb/dvb-usb/it913x.c                 |  651 +++
4048  drivers/media/dvb/dvb-usb/lmedm04.c                |   60 +-
4049  drivers/media/dvb/dvb-usb/m920x.c                  |   58 +-
4050  drivers/media/dvb/dvb-usb/mxl111sf-gpio.c          |  763 +++
4051  drivers/media/dvb/dvb-usb/mxl111sf-gpio.h          |   56 +
4052  drivers/media/dvb/dvb-usb/mxl111sf-i2c.c           |  851 ++++
4053  drivers/media/dvb/dvb-usb/mxl111sf-i2c.h           |   35 +
4054  drivers/media/dvb/dvb-usb/mxl111sf-phy.c           |  342 ++
4055  drivers/media/dvb/dvb-usb/mxl111sf-phy.h           |   53 +
4056  drivers/media/dvb/dvb-usb/mxl111sf-reg.h           |  179 +
4057  drivers/media/dvb/dvb-usb/mxl111sf-tuner.c         |  476 ++
4058  drivers/media/dvb/dvb-usb/mxl111sf-tuner.h         |   89 +
4059  drivers/media/dvb/dvb-usb/mxl111sf.c               |  864 ++++
4060  drivers/media/dvb/dvb-usb/mxl111sf.h               |  158 +
4061  drivers/media/dvb/dvb-usb/nova-t-usb2.c            |    4 +-
4062  drivers/media/dvb/dvb-usb/opera1.c                 |   13 +-
4063  drivers/media/dvb/dvb-usb/pctv452e.c               | 1093 +++++
4064  drivers/media/dvb/dvb-usb/technisat-usb2.c         |   28 +-
4065  drivers/media/dvb/dvb-usb/ttusb2.c                 |  407 ++-
4066  drivers/media/dvb/dvb-usb/umt-010.c                |    8 +-
4067  drivers/media/dvb/dvb-usb/usb-urb.c                |    4 +-
4068  drivers/media/dvb/dvb-usb/vp702x.c                 |    5 +-
4069  drivers/media/dvb/dvb-usb/vp7045.c                 |    5 +-
4070  drivers/media/dvb/frontends/Kconfig                |   30 +
4071  drivers/media/dvb/frontends/Makefile               |    8 +-
4072  drivers/media/dvb/frontends/a8293.c                |  184 +
4073  .../tda18212_priv.h => dvb/frontends/a8293.h}      |   39 +-
4074  drivers/media/dvb/frontends/cxd2820r.h             |    9 -
4075  drivers/media/dvb/frontends/cxd2820r_c.c           |    1 -
4076  drivers/media/dvb/frontends/cxd2820r_core.c        |   80 +-
4077  drivers/media/dvb/frontends/cxd2820r_priv.h        |    1 -
4078  drivers/media/dvb/frontends/cxd2820r_t.c           |    1 -
4079  drivers/media/dvb/frontends/cxd2820r_t2.c          |    1 -
4080  drivers/media/dvb/frontends/dib0070.c              |   37 +-
4081  drivers/media/dvb/frontends/dib0090.c              |   70 +-
4082  drivers/media/dvb/frontends/dib7000m.c             |   27 +-
4083  drivers/media/dvb/frontends/dib7000p.c             |   34 +-
4084  drivers/media/dvb/frontends/dib8000.c              |   72 +-
4085  drivers/media/dvb/frontends/dib9000.c              |  166 +-
4086  drivers/media/dvb/frontends/dibx000_common.c       |   76 +-
4087  drivers/media/dvb/frontends/dibx000_common.h       |    1 +
4088  drivers/media/dvb/frontends/drxd_hard.c            |   24 +-
4089  drivers/media/dvb/frontends/drxk_hard.c            |   10 +-
4090  drivers/media/dvb/frontends/it913x-fe-priv.h       |  328 ++
4091  drivers/media/dvb/frontends/it913x-fe.c            |  824 ++++
4092  drivers/media/dvb/frontends/it913x-fe.h            |  196 +
4093  drivers/media/dvb/frontends/lnbp22.c               |  148 +
4094  drivers/media/dvb/frontends/lnbp22.h               |   57 +
4095  drivers/media/dvb/frontends/stb0899_drv.c          |    6 +-
4096  drivers/media/dvb/frontends/stv0288.c              |   29 +-
4097  drivers/media/dvb/frontends/stv090x.c              |   35 +-
4098  drivers/media/dvb/frontends/tda10048.c             |   37 +-
4099  drivers/media/dvb/frontends/tda10048.h             |    8 +
4100  drivers/media/dvb/frontends/tda10071.c             | 1269 +++++
4101  drivers/media/dvb/frontends/tda10071.h             |   81 +
4102  drivers/media/dvb/frontends/tda10071_priv.h        |  122 +
4103  drivers/media/dvb/frontends/tda18271c2dd.c         |    4 +-
4104  drivers/media/dvb/mantis/Makefile                  |    2 +-
4105  drivers/media/dvb/mantis/hopper_cards.c            |    6 +-
4106  drivers/media/dvb/mantis/mantis_cards.c            |    6 +-
4107  drivers/media/dvb/mantis/mantis_common.h           |    5 +-
4108  drivers/media/dvb/mantis/mantis_dma.c              |   92 +-
4109  drivers/media/dvb/mantis/mantis_vp1041.c           |    1 -
4110  drivers/media/dvb/ngene/Makefile                   |    8 +-
4111  drivers/media/dvb/pluto2/Makefile                  |    2 +-
4112  drivers/media/dvb/pt1/Makefile                     |    2 +-
4113  drivers/media/dvb/siano/Makefile                   |    4 +-
4114  drivers/media/dvb/ttpci/Makefile                   |    4 +-
4115  drivers/media/dvb/ttpci/av7110_v4l.c               |   32 +-
4116  drivers/media/dvb/ttpci/budget-av.c                |   47 +-
4117  drivers/media/dvb/ttpci/budget-ci.c                |    1 -
4118  drivers/media/dvb/ttpci/budget-core.c              |    2 +
4119  drivers/media/dvb/ttpci/budget.h                   |    1 +
4120  drivers/media/dvb/ttpci/ttpci-eeprom.c             |   29 +
4121  drivers/media/dvb/ttpci/ttpci-eeprom.h             |    1 +
4122  drivers/media/dvb/ttusb-budget/Makefile            |    2 +-
4123  drivers/media/dvb/ttusb-dec/Makefile               |    2 +-
4124  drivers/media/radio/Makefile                       |    2 +-
4125  drivers/media/radio/radio-si4713.c                 |    4 -
4126  drivers/media/radio/radio-wl1273.c                 |    2 +-
4127  drivers/media/radio/si470x/radio-si470x-usb.c      |    2 -
4128  drivers/media/radio/wl128x/fmdrv_v4l2.c            |    6 +-
4129  drivers/media/rc/Kconfig                           |   23 +-
4130  drivers/media/rc/Makefile                          |    1 +
4131  drivers/{input/misc => media/rc}/ati_remote.c      |  301 +-
4132  drivers/media/rc/ene_ir.c                          |   73 +-
4133  drivers/media/rc/ene_ir.h                          |   19 +-
4134  drivers/media/rc/imon.c                            |   36 +-
4135  drivers/media/rc/keymaps/Makefile                  |    3 +
4136  drivers/media/rc/keymaps/rc-ati-x10.c              |  104 +
4137  drivers/media/rc/keymaps/rc-medion-x10.c           |  117 +
4138  drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c     |    1 +
4139  drivers/media/rc/keymaps/rc-snapstream-firefly.c   |  107 +
4140  drivers/media/rc/mceusb.c                          |  410 ++-
4141  drivers/media/rc/rc-core-priv.h                    |   14 +-
4142  drivers/media/rc/rc-main.c                         |   29 +-
4143  drivers/media/rc/redrat3.c                         |    7 -
4144  drivers/media/rc/winbond-cir.c                     |    6 +-
4145  drivers/media/video/Kconfig                        |   49 +-
4146  drivers/media/video/Makefile                       |    9 +-
4147  drivers/media/video/adp1653.c                      |   20 +-
4148  drivers/media/video/atmel-isi.c                    |   24 +-
4149  drivers/media/video/au0828/Makefile                |    8 +-
4150  drivers/media/video/bt819.c                        |    2 +-
4151  drivers/media/video/bt8xx/Makefile                 |    6 +-
4152  drivers/media/video/bt8xx/bttv-cards.c             |  242 +-
4153  drivers/media/video/bt8xx/bttv-driver.c            |  294 +-
4154  drivers/media/video/bt8xx/bttv-gpio.c              |    4 +-
4155  drivers/media/video/bt8xx/bttv-i2c.c               |   56 +-
4156  drivers/media/video/bt8xx/bttv-input.c             |   37 +-
4157  drivers/media/video/bt8xx/bttv-risc.c              |   25 +-
4158  drivers/media/video/bt8xx/bttv-vbi.c               |    9 +-
4159  drivers/media/video/bt8xx/bttvp.h                  |   18 +-
4160  drivers/media/video/cx18/Makefile                  |    6 +-
4161  drivers/media/video/cx18/cx18-driver.h             |    5 +-
4162  drivers/media/video/cx18/cx18-fileops.c            |    2 -
4163  drivers/media/video/cx18/cx18-ioctl.c              |   18 +-
4164  drivers/media/video/cx18/cx18-mailbox.c            |    2 +-
4165  drivers/media/video/cx18/cx18-streams.c            |   13 +
4166  drivers/media/video/cx231xx/Makefile               |   10 +-
4167  drivers/media/video/cx23885/Kconfig                |    2 +-
4168  drivers/media/video/cx23885/Makefile               |   10 +-
4169  drivers/media/video/cx23885/cx23885-cards.c        |    2 +-
4170  drivers/media/video/cx23885/cx23885-dvb.c          |    2 +-
4171  drivers/media/video/cx23885/cx23888-ir.c           |   12 +-
4172  drivers/media/video/cx25840/Makefile               |    2 +-
4173  drivers/media/video/cx25840/cx25840-ir.c           |   12 +-
4174  drivers/media/video/cx88/Makefile                  |    8 +-
4175  drivers/media/video/cx88/cx88-core.c               |    3 -
4176  drivers/media/video/cx88/cx88-video.c              |    2 +-
4177  drivers/media/video/davinci/vpbe_display.c         |    1 -
4178  drivers/media/video/davinci/vpbe_osd.c             |    2 +-
4179  drivers/media/video/em28xx/Kconfig                 |    2 +
4180  drivers/media/video/em28xx/Makefile                |    8 +-
4181  drivers/media/video/em28xx/em28xx-cards.c          |  155 +-
4182  drivers/media/video/em28xx/em28xx-core.c           |   45 +-
4183  drivers/media/video/em28xx/em28xx-dvb.c            |  117 +-
4184  drivers/media/video/em28xx/em28xx-input.c          |    6 +-
4185  drivers/media/video/em28xx/em28xx-video.c          |    1 +
4186  drivers/media/video/em28xx/em28xx.h                |    3 +-
4187  drivers/media/video/et61x251/et61x251.h            |   66 +-
4188  drivers/media/video/et61x251/et61x251_core.c       |    2 +
4189  drivers/media/video/et61x251/et61x251_tas5130d1b.c |    2 +
4190  drivers/media/video/gspca/Kconfig                  |   10 +
4191  drivers/media/video/gspca/Makefile                 |    2 +
4192  drivers/media/video/gspca/benq.c                   |   31 +-
4193  drivers/media/video/gspca/conex.c                  |    6 +-
4194  drivers/media/video/gspca/cpia1.c                  |    7 +-
4195  drivers/media/video/gspca/etoms.c                  |    6 +-
4196  drivers/media/video/gspca/finepix.c                |    8 +-
4197  drivers/media/video/gspca/gl860/Makefile           |    2 +-
4198  drivers/media/video/gspca/gl860/gl860.c            |    8 +-
4199  drivers/media/video/gspca/gspca.c                  |  287 +-
4200  drivers/media/video/gspca/gspca.h                  |   22 +-
4201  drivers/media/video/gspca/jeilinj.c                |   20 +-
4202  drivers/media/video/gspca/kinect.c                 |   41 +-
4203  drivers/media/video/gspca/konica.c                 |   16 +-
4204  drivers/media/video/gspca/m5602/Makefile           |    2 +-
4205  drivers/media/video/gspca/m5602/m5602_core.c       |    9 +-
4206  drivers/media/video/gspca/m5602/m5602_mt9m111.c    |   28 +-
4207  drivers/media/video/gspca/m5602/m5602_ov7660.c     |   21 +-
4208  drivers/media/video/gspca/m5602/m5602_ov9650.c     |   19 +-
4209  drivers/media/video/gspca/m5602/m5602_po1030.c     |   21 +-
4210  drivers/media/video/gspca/m5602/m5602_s5k4aa.c     |   35 +-
4211  drivers/media/video/gspca/m5602/m5602_s5k83a.c     |   30 +-
4212  drivers/media/video/gspca/mars.c                   |    6 +-
4213  drivers/media/video/gspca/mr97310a.c               |   24 +-
4214  drivers/media/video/gspca/nw80x.c                  |    9 +-
4215  drivers/media/video/gspca/ov519.c                  |   41 +-
4216  drivers/media/video/gspca/ov534.c                  |   12 +-
4217  drivers/media/video/gspca/ov534_9.c                |  516 +--
4218  drivers/media/video/gspca/pac207.c                 |   14 +-
4219  drivers/media/video/gspca/pac7302.c                |   15 +-
4220  drivers/media/video/gspca/pac7311.c                |   15 +-
4221  drivers/media/video/gspca/se401.c                  |   46 +-
4222  drivers/media/video/gspca/sn9c2028.c               |   14 +-
4223  drivers/media/video/gspca/sn9c20x.c                |   76 +-
4224  drivers/media/video/gspca/sonixj.c                 |   45 +-
4225  drivers/media/video/gspca/spca1528.c               |   34 +-
4226  drivers/media/video/gspca/spca500.c                |    6 +-
4227  drivers/media/video/gspca/spca501.c                |    4 +-
4228  drivers/media/video/gspca/spca505.c                |    8 +-
4229  drivers/media/video/gspca/spca508.c                |    6 +-
4230  drivers/media/video/gspca/spca561.c                |    4 +-
4231  drivers/media/video/gspca/sq905.c                  |   17 +-
4232  drivers/media/video/gspca/sq905c.c                 |   10 +-
4233  drivers/media/video/gspca/sq930x.c                 |   21 +-
4234  drivers/media/video/gspca/stk014.c                 |   16 +-
4235  drivers/media/video/gspca/stv0680.c                |    6 +-
4236  drivers/media/video/gspca/stv06xx/Makefile         |    2 +-
4237  drivers/media/video/gspca/stv06xx/stv06xx.c        |   18 +-
4238  drivers/media/video/gspca/stv06xx/stv06xx.h        |    6 +-
4239  drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c   |   10 +-
4240  drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c |    4 +-
4241  drivers/media/video/gspca/stv06xx/stv06xx_st6422.c |    4 +-
4242  drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c |   32 +-
4243  drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h |   56 +-
4244  drivers/media/video/gspca/sunplus.c                |   10 +-
4245  drivers/media/video/gspca/t613.c                   |   12 +-
4246  drivers/media/video/gspca/topro.c                  | 4989 ++++++++++++++++++++
4247  drivers/media/video/gspca/vc032x.c                 |   13 +-
4248  drivers/media/video/gspca/vicam.c                  |   12 +-
4249  drivers/media/video/gspca/w996Xcf.c                |    8 +-
4250  drivers/media/video/gspca/xirlink_cit.c            |   14 +-
4251  drivers/media/video/gspca/zc3xx.c                  |   15 +-
4252  drivers/media/video/hdpvr/Makefile                 |    4 +-
4253  drivers/media/video/hexium_gemini.c                |   44 +-
4254  drivers/media/video/hexium_orion.c                 |   38 +-
4255  drivers/media/video/ivtv/Makefile                  |    8 +-
4256  drivers/media/video/ivtv/ivtv-ioctl.c              |   15 +-
4257  drivers/media/video/m5mols/m5mols_core.c           |    6 +-
4258  drivers/media/video/marvell-ccic/mcam-core.c       |   12 +-
4259  drivers/media/video/marvell-ccic/mmp-driver.c      |    1 +
4260  drivers/media/video/mem2mem_testdev.c              |   16 +-
4261  drivers/media/video/mt9m111.c                      |    9 +-
4262  drivers/media/video/mt9p031.c                      |  963 ++++
4263  drivers/media/video/mt9t001.c                      |  835 ++++
4264  drivers/media/video/mx3_camera.c                   |    4 +-
4265  drivers/media/video/mxb.c                          |   80 +-
4266  drivers/media/video/noon010pc30.c                  |  263 +-
4267  drivers/media/video/omap3isp/Makefile              |    4 +-
4268  drivers/media/video/omap3isp/isp.c                 |    6 +-
4269  drivers/media/video/omap3isp/isp.h                 |   85 +-
4270  drivers/media/video/omap3isp/ispccdc.c             |   11 +-
4271  drivers/media/video/omap3isp/ispccp2.c             |    4 +-
4272  drivers/media/video/omap3isp/ispqueue.c            |    4 +
4273  drivers/media/video/omap3isp/ispvideo.c            |   22 +-
4274  drivers/media/video/pvrusb2/Makefile               |    8 +-
4275  drivers/media/video/pwc/pwc-if.c                   |    4 +-
4276  drivers/media/video/pwc/pwc-v4l.c                  |  136 +-
4277  drivers/media/video/s5p-fimc/Makefile              |    2 +-
4278  drivers/media/video/s5p-fimc/fimc-capture.c        | 1462 ++++--
4279  drivers/media/video/s5p-fimc/fimc-core.c           | 1134 +++---
4280  drivers/media/video/s5p-fimc/fimc-core.h           |  221 +-
4281  drivers/media/video/s5p-fimc/fimc-mdevice.c        |  858 ++++
4282  drivers/media/video/s5p-fimc/fimc-mdevice.h        |  118 +
4283  drivers/media/video/s5p-fimc/fimc-reg.c            |   90 +-
4284  drivers/media/video/s5p-fimc/mipi-csis.c           |   90 +-
4285  drivers/media/video/s5p-fimc/regs-fimc.h           |    9 +-
4286  drivers/media/video/s5p-mfc/s5p_mfc.c              |   15 +-
4287  drivers/media/video/s5p-mfc/s5p_mfc_dec.c          |   18 +-
4288  drivers/media/video/s5p-mfc/s5p_mfc_enc.c          |   36 +-
4289  drivers/media/video/s5p-mfc/s5p_mfc_opr.c          |   14 +-
4290  drivers/media/video/s5p-tv/Kconfig                 |    2 +-
4291  drivers/media/video/s5p-tv/hdmi_drv.c              |   15 +-
4292  drivers/media/video/s5p-tv/mixer.h                 |    2 -
4293  drivers/media/video/s5p-tv/mixer_grp_layer.c       |    2 +-
4294  drivers/media/video/s5p-tv/mixer_reg.c             |   11 +-
4295  drivers/media/video/s5p-tv/mixer_video.c           |   24 +-
4296  drivers/media/video/s5p-tv/mixer_vp_layer.c        |    4 +-
4297  drivers/media/video/s5p-tv/regs-hdmi.h             |    4 +
4298  drivers/media/video/s5p-tv/regs-mixer.h            |    1 +
4299  drivers/media/video/s5p-tv/sdo_drv.c               |    1 +
4300  drivers/media/video/saa7115.c                      |    5 +-
4301  drivers/media/video/saa7134/Makefile               |    8 +-
4302  drivers/media/video/saa7164/Makefile               |   10 +-
4303  drivers/media/video/saa7164/saa7164-cards.c        |  128 +
4304  drivers/media/video/saa7164/saa7164-dvb.c          |    2 +
4305  drivers/media/video/saa7164/saa7164.h              |    2 +
4306  drivers/media/video/sh_mobile_ceu_camera.c         |    6 +-
4307  drivers/media/video/sr030pc30.c                    |    6 -
4308  drivers/media/video/stk-webcam.c                   |   29 +-
4309  drivers/media/video/tlg2300/Makefile               |    8 +-
4310  drivers/{staging => media/video}/tm6000/Kconfig    |    0
4311  drivers/{staging => media/video}/tm6000/Makefile   |    0
4312  .../{staging => media/video}/tm6000/tm6000-alsa.c  |    9 +-
4313  .../{staging => media/video}/tm6000/tm6000-cards.c |   44 +-
4314  .../{staging => media/video}/tm6000/tm6000-core.c  |  108 +-
4315  .../{staging => media/video}/tm6000/tm6000-dvb.c   |   18 +-
4316  .../{staging => media/video}/tm6000/tm6000-i2c.c   |   21 +-
4317  .../{staging => media/video}/tm6000/tm6000-input.c |    2 +-
4318  .../{staging => media/video}/tm6000/tm6000-regs.h  |    6 +-
4319  drivers/media/video/tm6000/tm6000-stds.c           |  659 +++
4320  .../video}/tm6000/tm6000-usb-isoc.h                |    2 +-
4321  .../{staging => media/video}/tm6000/tm6000-video.c |  122 +-
4322  drivers/{staging => media/video}/tm6000/tm6000.h   |   15 +-
4323  drivers/media/video/tvaudio.c                      |    9 +-
4324  drivers/media/video/tvp7002.c                      |   14 +-
4325  drivers/media/video/usbvision/Makefile             |    4 +-
4326  drivers/media/video/uvc/uvc_driver.c               |   13 +
4327  drivers/media/video/uvc/uvc_v4l2.c                 |   54 +-
4328  drivers/media/video/uvc/uvc_video.c                |   17 +-
4329  drivers/media/video/uvc/uvcvideo.h                 |  104 +-
4330  drivers/media/video/v4l2-ctrls.c                   |  104 +-
4331  drivers/media/video/v4l2-ioctl.c                   |  517 +--
4332  drivers/media/video/v4l2-mem2mem.c                 |   18 +-
4333  drivers/media/video/v4l2-subdev.c                  |   19 +
4334  drivers/media/video/videobuf2-core.c               |  205 +-
4335  drivers/media/video/videobuf2-dma-contig.c         |   16 +-
4336  drivers/media/video/videobuf2-dma-sg.c             |    6 -
4337  drivers/media/video/videobuf2-memops.c             |    6 +-
4338  drivers/media/video/vivi.c                         |   23 +-
4339  drivers/media/video/vpx3220.c                      |    2 +-
4340  drivers/media/video/zr364xx.c                      |    3 +
4341  drivers/misc/Kconfig                               |    1 +
4342  drivers/misc/Makefile                              |    1 +
4343  drivers/{staging => misc}/altera-stapl/Kconfig     |    2 +
4344  drivers/misc/altera-stapl/Makefile                 |    3 +
4345  .../{staging => misc}/altera-stapl/altera-comp.c   |    0
4346  .../{staging => misc}/altera-stapl/altera-exprt.h  |    0
4347  .../{staging => misc}/altera-stapl/altera-jtag.c   |    2 +-
4348  .../{staging => misc}/altera-stapl/altera-jtag.h   |    0
4349  .../{staging => misc}/altera-stapl/altera-lpt.c    |    0
4350  drivers/{staging => misc}/altera-stapl/altera.c    |    2 +-
4351  drivers/staging/Kconfig                            |    4 -
4352  drivers/staging/Makefile                           |    2 -
4353  drivers/staging/altera-stapl/Makefile              |    3 -
4354  drivers/staging/dt3155v4l/dt3155v4l.c              |    4 +-
4355  drivers/staging/tm6000/README                      |   22 -
4356  drivers/staging/tm6000/TODO                        |    8 -
4357  drivers/staging/tm6000/tm6000-stds.c               |  679 ---
4358  include/linux/dvb/frontend.h                       |    1 +
4359  include/linux/dvb/version.h                        |    2 +-
4360  include/linux/omap3isp.h                           |    2 -
4361  include/linux/usb/Kbuild                           |    1 +
4362  include/linux/videodev2.h                          |   13 +-
4363  include/media/m5mols.h                             |    4 +-
4364  include/media/mt9p031.h                            |   19 +
4365  include/media/mt9t001.h                            |    8 +
4366  include/media/omap3isp.h                           |  140 +
4367  include/media/rc-core.h                            |    7 +-
4368  include/media/rc-map.h                             |    3 +
4369  include/media/s5p_fimc.h                           |   18 +-
4370  include/media/saa7146.h                            |   36 +-
4371  include/media/v4l2-chip-ident.h                    |    3 -
4372  include/media/v4l2-ctrls.h                         |   15 +-
4373  include/media/v4l2-mediabus.h                      |   12 +-
4374  include/media/videobuf2-core.h                     |   23 +-
4375  include/media/videobuf2-dma-contig.h               |    6 +-
4376  .../staging/altera-stapl => include/misc}/altera.h |    0
4377  402 files changed, 26444 insertions(+), 6479 deletions(-)
4378  create mode 100644 Documentation/dvb/it9137.txt
4379  rename drivers/staging/tm6000/CARDLIST => Documentation/video4linux/CARDLIST.tm6000 (100%)
4380  create mode 100644 drivers/media/dvb/dvb-usb/it913x.c
4381  create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-gpio.c
4382  create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-gpio.h
4383  create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-i2c.c
4384  create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-i2c.h
4385  create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-phy.c
4386  create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-phy.h
4387  create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-reg.h
4388  create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-tuner.c
4389  create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-tuner.h
4390  create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf.c
4391  create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf.h
4392  create mode 100644 drivers/media/dvb/dvb-usb/pctv452e.c
4393  create mode 100644 drivers/media/dvb/frontends/a8293.c
4394  rename drivers/media/{common/tuners/tda18212_priv.h => dvb/frontends/a8293.h} (58%)
4395  create mode 100644 drivers/media/dvb/frontends/it913x-fe-priv.h
4396  create mode 100644 drivers/media/dvb/frontends/it913x-fe.c
4397  create mode 100644 drivers/media/dvb/frontends/it913x-fe.h
4398  create mode 100644 drivers/media/dvb/frontends/lnbp22.c
4399  create mode 100644 drivers/media/dvb/frontends/lnbp22.h
4400  create mode 100644 drivers/media/dvb/frontends/tda10071.c
4401  create mode 100644 drivers/media/dvb/frontends/tda10071.h
4402  create mode 100644 drivers/media/dvb/frontends/tda10071_priv.h
4403  rename drivers/{input/misc => media/rc}/ati_remote.c (77%)
4404  create mode 100644 drivers/media/rc/keymaps/rc-ati-x10.c
4405  create mode 100644 drivers/media/rc/keymaps/rc-medion-x10.c
4406  create mode 100644 drivers/media/rc/keymaps/rc-snapstream-firefly.c
4407  create mode 100644 drivers/media/video/gspca/topro.c
4408  create mode 100644 drivers/media/video/mt9p031.c
4409  create mode 100644 drivers/media/video/mt9t001.c
4410  create mode 100644 drivers/media/video/s5p-fimc/fimc-mdevice.c
4411  create mode 100644 drivers/media/video/s5p-fimc/fimc-mdevice.h
4412  rename drivers/{staging => media/video}/tm6000/Kconfig (100%)
4413  rename drivers/{staging => media/video}/tm6000/Makefile (100%)
4414  rename drivers/{staging => media/video}/tm6000/tm6000-alsa.c (97%)
4415  rename drivers/{staging => media/video}/tm6000/tm6000-cards.c (97%)
4416  rename drivers/{staging => media/video}/tm6000/tm6000-core.c (91%)
4417  rename drivers/{staging => media/video}/tm6000/tm6000-dvb.c (95%)
4418  rename drivers/{staging => media/video}/tm6000/tm6000-i2c.c (95%)
4419  rename drivers/{staging => media/video}/tm6000/tm6000-input.c (99%)
4420  rename drivers/{staging => media/video}/tm6000/tm6000-regs.h (99%)
4421  create mode 100644 drivers/media/video/tm6000/tm6000-stds.c
4422  rename drivers/{staging => media/video}/tm6000/tm6000-usb-isoc.h (97%)
4423  rename drivers/{staging => media/video}/tm6000/tm6000-video.c (96%)
4424  rename drivers/{staging => media/video}/tm6000/tm6000.h (98%)
4425  rename drivers/{staging => misc}/altera-stapl/Kconfig (77%)
4426  create mode 100644 drivers/misc/altera-stapl/Makefile
4427  rename drivers/{staging => misc}/altera-stapl/altera-comp.c (100%)
4428  rename drivers/{staging => misc}/altera-stapl/altera-exprt.h (100%)
4429  rename drivers/{staging => misc}/altera-stapl/altera-jtag.c (99%)
4430  rename drivers/{staging => misc}/altera-stapl/altera-jtag.h (100%)
4431  rename drivers/{staging => misc}/altera-stapl/altera-lpt.c (100%)
4432  rename drivers/{staging => misc}/altera-stapl/altera.c (99%)
4433  delete mode 100644 drivers/staging/altera-stapl/Makefile
4434  delete mode 100644 drivers/staging/tm6000/README
4435  delete mode 100644 drivers/staging/tm6000/TODO
4436  delete mode 100644 drivers/staging/tm6000/tm6000-stds.c
4437  create mode 100644 include/media/mt9p031.h
4438  create mode 100644 include/media/mt9t001.h
4439  create mode 100644 include/media/omap3isp.h
4440  rename {drivers/staging/altera-stapl => include/misc}/altera.h (100%)
4441 Merging kbuild/for-next
4442 $ git merge kbuild/for-next
4443 Auto-merging Makefile
4444 Auto-merging scripts/checkpatch.pl
4445 Merge made by recursive.
4446  Makefile                             |    3 +-
4447  scripts/Makefile.build               |    2 +-
4448  scripts/Makefile.lib                 |    4 ++
4449  scripts/basic/fixdep.c               |    1 +
4450  scripts/checkpatch.pl                |   14 ++++++
4451  scripts/extract-vmlinux              |   62 ++++++++++++++++++++++++
4452  scripts/kconfig/Makefile             |   28 +----------
4453  scripts/kconfig/confdata.c           |   49 ++++++++++++++-----
4454  scripts/kconfig/lxdialog/textbox.c   |    3 +-
4455  scripts/kconfig/mconf.c              |   86 ++++++++++++++++++++-------------
4456  scripts/kconfig/menu.c               |   13 ++---
4457  scripts/kconfig/nconf.c              |   23 ++++-----
4458  scripts/kconfig/nconf.gui.c          |   59 ++++++++++++++++++-----
4459  scripts/kconfig/nconf.h              |    2 +-
4460  scripts/kconfig/streamline_config.pl |   22 +++++++-
4461  scripts/tags.sh                      |    4 +-
4462  16 files changed, 258 insertions(+), 117 deletions(-)
4463  create mode 100755 scripts/extract-vmlinux
4464 Merging kconfig/for-next
4465 $ git merge kconfig/for-next
4466 Already up-to-date!
4467 Merge made by recursive.
4468 Merging ide/master
4469 $ git merge ide/master
4470 Already up-to-date.
4471 Merging libata/NEXT
4472 $ git merge libata/NEXT
4473 Merge made by recursive.
4474  drivers/ata/libata-eh.c  |    5 ++---
4475  drivers/ata/sata_sil24.c |    4 ++--
4476  2 files changed, 4 insertions(+), 5 deletions(-)
4477 Merging infiniband/for-next
4478 $ git merge infiniband/for-next
4479 Merge made by recursive.
4480  drivers/infiniband/core/cma.c                |   52 ++++++++++++++++++--------
4481  drivers/infiniband/core/mad.c                |    3 +
4482  drivers/infiniband/core/ucm.c                |    2 +-
4483  drivers/infiniband/core/ucma.c               |    2 +-
4484  drivers/infiniband/core/user_mad.c           |    5 +-
4485  drivers/infiniband/core/uverbs_main.c        |    3 +-
4486  drivers/infiniband/hw/amso1100/c2_provider.c |    5 +--
4487  drivers/infiniband/hw/cxgb4/device.c         |   41 ++++++++++++++++----
4488  drivers/infiniband/hw/ehca/ehca_eq.c         |    4 +-
4489  drivers/infiniband/hw/mthca/mthca_mr.c       |    2 +-
4490  drivers/infiniband/hw/qib/qib.h              |    4 ++
4491  drivers/infiniband/hw/qib/qib_file_ops.c     |    2 +
4492  drivers/infiniband/hw/qib/qib_init.c         |    1 +
4493  drivers/infiniband/hw/qib/qib_sysfs.c        |    3 +-
4494  drivers/net/mlx4/eq.c                        |    2 +-
4495  drivers/net/mlx4/mr.c                        |    2 +-
4496  drivers/net/mlx4/port.c                      |   30 ++++++++------
4497  17 files changed, 108 insertions(+), 55 deletions(-)
4498 Merging acpi/acpi
4499 $ git merge acpi/acpi
4500 Already up-to-date.
4501 Merging idle-test/idle-test
4502 $ git merge idle-test/idle-test
4503 Already up-to-date.
4504 Merging powertools/tools-test
4505 $ git merge powertools/tools-test
4506 Already up-to-date.
4507 Merging cpupowerutils/master
4508 $ git merge cpupowerutils/master
4509 Already up-to-date.
4510 Merging ieee1394/for-next
4511 $ git merge ieee1394/for-next
4512 Merge made by recursive.
4513  drivers/firewire/ohci.c |  203 +++++++++++++++++++++++++++++++++++--
4514  drivers/firewire/sbp2.c |  256 +++++++++++++++++++++--------------------------
4515  2 files changed, 305 insertions(+), 154 deletions(-)
4516 Merging ubi/linux-next
4517 $ git merge ubi/linux-next
4518 Already up-to-date.
4519 Merging dlm/next
4520 $ git merge dlm/next
4521 Already up-to-date.
4522 Merging swiotlb/master
4523 $ git merge swiotlb/master
4524 Merge made by recursive.
4525 Merging ibft/master
4526 $ git merge ibft/master
4527 Merge made by recursive.
4528 Merging scsi/master
4529 $ git merge scsi/master
4530 Auto-merging drivers/s390/cio/qdio_main.c
4531 Auto-merging drivers/scsi/Kconfig
4532 Auto-merging drivers/scsi/Makefile
4533 Auto-merging drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
4534 Auto-merging drivers/scsi/fcoe/fcoe.c
4535 Auto-merging drivers/scsi/libfc/fc_exch.c
4536 Auto-merging drivers/scsi/libfc/fc_fcp.c
4537 Auto-merging drivers/scsi/libsas/sas_expander.c
4538 Auto-merging drivers/scsi/qla2xxx/qla_isr.c
4539 Auto-merging drivers/scsi/qla2xxx/qla_os.c
4540 Auto-merging drivers/scsi/qla4xxx/Kconfig
4541 Merge made by recursive.
4542  Documentation/ABI/testing/sysfs-block      |   13 +
4543  Documentation/scsi/bnx2fc.txt              |   75 +
4544  arch/s390/include/asm/qdio.h               |    5 +
4545  block/genhd.c                              |   71 +
4546  drivers/ata/libata-core.c                  |    1 +
4547  drivers/ata/libata-scsi.c                  |   44 +-
4548  drivers/infiniband/ulp/iser/iscsi_iser.c   |   80 +-
4549  drivers/message/fusion/mptbase.c           |   92 ++-
4550  drivers/message/fusion/mptbase.h           |   72 +-
4551  drivers/message/fusion/mptsas.c            |   47 +-
4552  drivers/message/fusion/mptscsih.c          |   18 +-
4553  drivers/message/fusion/mptscsih.h          |    1 +
4554  drivers/s390/cio/qdio_main.c               |   11 +-
4555  drivers/s390/cio/qdio_setup.c              |    1 +
4556  drivers/s390/scsi/zfcp_dbf.c               |   36 +
4557  drivers/s390/scsi/zfcp_def.h               |    7 +
4558  drivers/s390/scsi/zfcp_ext.h               |    1 +
4559  drivers/s390/scsi/zfcp_fsf.c               |   80 +-
4560  drivers/s390/scsi/zfcp_qdio.c              |   58 +-
4561  drivers/s390/scsi/zfcp_qdio.h              |   66 +-
4562  drivers/s390/scsi/zfcp_scsi.c              |   15 +-
4563  drivers/scsi/Kconfig                       |   14 +-
4564  drivers/scsi/Makefile                      |    1 +
4565  drivers/scsi/aic94xx/aic94xx_scb.c         |    1 +
4566  drivers/scsi/be2iscsi/be_iscsi.c           |   60 +-
4567  drivers/scsi/be2iscsi/be_iscsi.h           |    2 +
4568  drivers/scsi/be2iscsi/be_main.c            |  101 +-
4569  drivers/scsi/be2iscsi/be_main.h            |    3 +
4570  drivers/scsi/bnx2fc/bnx2fc.h               |    3 +-
4571  drivers/scsi/bnx2fc/bnx2fc_els.c           |   26 +-
4572  drivers/scsi/bnx2fc/bnx2fc_fcoe.c          |  204 ++-
4573  drivers/scsi/bnx2fc/bnx2fc_hwi.c           |   16 +-
4574  drivers/scsi/bnx2fc/bnx2fc_io.c            |   32 +-
4575  drivers/scsi/bnx2fc/bnx2fc_tgt.c           |   23 +-
4576  drivers/scsi/bnx2i/bnx2i_iscsi.c           |   80 +-
4577  drivers/scsi/cxgbi/cxgb3i/cxgb3i.c         |   20 +-
4578  drivers/scsi/cxgbi/cxgb4i/cxgb4i.c         |   20 +-
4579  drivers/scsi/cxgbi/libcxgbi.c              |   56 +
4580  drivers/scsi/cxgbi/libcxgbi.h              |    1 +
4581  drivers/scsi/device_handler/scsi_dh.c      |   61 +-
4582  drivers/scsi/device_handler/scsi_dh_alua.c |   92 +-
4583  drivers/scsi/device_handler/scsi_dh_rdac.c |    6 +-
4584  drivers/scsi/fcoe/fcoe.c                   |   82 +-
4585  drivers/scsi/fcoe/fcoe.h                   |   11 +-
4586  drivers/scsi/fcoe/fcoe_transport.c         |   72 +
4587  drivers/scsi/ipr.c                         |   17 +-
4588  drivers/scsi/ipr.h                         |    1 +
4589  drivers/scsi/isci/host.c                   |   69 +
4590  drivers/scsi/isci/host.h                   |   15 +
4591  drivers/scsi/isci/init.c                   |    3 +
4592  drivers/scsi/isci/isci.h                   |    2 +-
4593  drivers/scsi/isci/phy.c                    |   11 +
4594  drivers/scsi/isci/port.c                   |    2 +-
4595  drivers/scsi/isci/port_config.c            |    2 +-
4596  drivers/scsi/isci/registers.h              |  122 +--
4597  drivers/scsi/isci/remote_device.c          |   24 +
4598  drivers/scsi/isci/remote_device.h          |    9 +
4599  drivers/scsi/isci/request.c                |  380 +++++-
4600  drivers/scsi/isci/request.h                |   31 +-
4601  drivers/scsi/isci/sas.h                    |    2 -
4602  drivers/scsi/isci/task.c                   |   29 +-
4603  drivers/scsi/isci/task.h                   |   19 +
4604  drivers/scsi/iscsi_tcp.c                   |   83 +-
4605  drivers/scsi/libfc/fc_exch.c               |   11 +-
4606  drivers/scsi/libfc/fc_fcp.c                |    2 -
4607  drivers/scsi/libiscsi.c                    |    9 -
4608  drivers/scsi/libsas/sas_expander.c         |   22 +-
4609  drivers/scsi/libsas/sas_host_smp.c         |  103 ++-
4610  drivers/scsi/libsas/sas_init.c             |   43 +-
4611  drivers/scsi/libsas/sas_scsi_host.c        |  147 +-
4612  drivers/scsi/lpfc/lpfc_attr.c              |   42 +-
4613  drivers/scsi/lpfc/lpfc_els.c               |   11 +-
4614  drivers/scsi/lpfc/lpfc_hbadisc.c           |    2 +-
4615  drivers/scsi/lpfc/lpfc_hw4.h               |    2 +
4616  drivers/scsi/lpfc/lpfc_init.c              |   63 +-
4617  drivers/scsi/lpfc/lpfc_scsi.c              |   11 +-
4618  drivers/scsi/lpfc/lpfc_sli.c               |   13 +-
4619  drivers/scsi/lpfc/lpfc_version.h           |    2 +-
4620  drivers/scsi/mac_esp.c                     |    9 -
4621  drivers/scsi/mpt2sas/mpt2sas_base.c        |  447 +++++--
4622  drivers/scsi/mpt2sas/mpt2sas_base.h        |   46 +-
4623  drivers/scsi/mpt2sas/mpt2sas_ctl.c         |   28 +
4624  drivers/scsi/mpt2sas/mpt2sas_scsih.c       |    2 +
4625  drivers/scsi/mpt2sas/mpt2sas_transport.c   |    2 +-
4626  drivers/scsi/mvsas/mv_94xx.c               |   35 +
4627  drivers/scsi/mvsas/mv_defs.h               |    2 +
4628  drivers/scsi/mvsas/mv_init.c               |   13 +-
4629  drivers/scsi/mvsas/mv_sas.c                |   79 +-
4630  drivers/scsi/mvsas/mv_sas.h                |    4 +-
4631  drivers/scsi/mvumi.c                       | 2018 +++++++++++++++++++++++++
4632  drivers/scsi/mvumi.h                       |  505 +++++++
4633  drivers/scsi/pm8001/pm8001_hwi.c           |   73 +-
4634  drivers/scsi/pm8001/pm8001_init.c          |    4 +-
4635  drivers/scsi/pm8001/pm8001_sas.c           |   93 +-
4636  drivers/scsi/pm8001/pm8001_sas.h           |    2 -
4637  drivers/scsi/qla2xxx/qla_attr.c            |  111 +-
4638  drivers/scsi/qla2xxx/qla_bsg.c             |  152 ++
4639  drivers/scsi/qla2xxx/qla_bsg.h             |   42 +
4640  drivers/scsi/qla2xxx/qla_dbg.c             |    6 +-
4641  drivers/scsi/qla2xxx/qla_def.h             |    9 +-
4642  drivers/scsi/qla2xxx/qla_gbl.h             |   18 +
4643  drivers/scsi/qla2xxx/qla_init.c            |   36 +-
4644  drivers/scsi/qla2xxx/qla_isr.c             |    5 +
4645  drivers/scsi/qla2xxx/qla_mbx.c             |  127 ++
4646  drivers/scsi/qla2xxx/qla_nx.c              |  970 ++++++++++++-
4647  drivers/scsi/qla2xxx/qla_nx.h              |  255 ++++-
4648  drivers/scsi/qla2xxx/qla_os.c              |   46 +-
4649  drivers/scsi/qla4xxx/Kconfig               |    1 +
4650  drivers/scsi/qla4xxx/Makefile              |    2 +-
4651  drivers/scsi/qla4xxx/ql4_attr.c            |   76 +
4652  drivers/scsi/qla4xxx/ql4_bsg.c             |  513 +++++++
4653  drivers/scsi/qla4xxx/ql4_bsg.h             |   19 +
4654  drivers/scsi/qla4xxx/ql4_def.h             |  201 ++-
4655  drivers/scsi/qla4xxx/ql4_fw.h              |  192 +++-
4656  drivers/scsi/qla4xxx/ql4_glbl.h            |   71 +-
4657  drivers/scsi/qla4xxx/ql4_init.c            |  786 ++---------
4658  drivers/scsi/qla4xxx/ql4_iocb.c            |   68 +-
4659  drivers/scsi/qla4xxx/ql4_isr.c             |   83 +-
4660  drivers/scsi/qla4xxx/ql4_mbx.c             |  752 +++++++++--
4661  drivers/scsi/qla4xxx/ql4_nvram.c           |   21 +
4662  drivers/scsi/qla4xxx/ql4_nx.c              |    9 +
4663  drivers/scsi/qla4xxx/ql4_os.c              | 2199 ++++++++++++++++++++++++----
4664  drivers/scsi/scsi_error.c                  |   12 +-
4665  drivers/scsi/scsi_sysfs.c                  |   38 +
4666  drivers/scsi/scsi_transport_iscsi.c        |  683 ++++++++--
4667  drivers/scsi/scsi_transport_sas.c          |   10 +-
4668  drivers/scsi/sd.c                          |    7 +-
4669  include/linux/genhd.h                      |    4 +
4670  include/linux/libata.h                     |    2 +
4671  include/scsi/iscsi_if.h                    |  134 ++-
4672  include/scsi/libfc.h                       |   76 +-
4673  include/scsi/libfcoe.h                     |    3 +
4674  include/scsi/libsas.h                      |   52 +-
4675  include/scsi/sas.h                         |   24 +-
4676  include/scsi/scsi_bsg_iscsi.h              |  110 ++
4677  include/scsi/scsi_device.h                 |    6 +
4678  include/scsi/scsi_host.h                   |   16 +-
4679  include/scsi/scsi_transport_iscsi.h        |   45 +-
4680  138 files changed, 11643 insertions(+), 2796 deletions(-)
4681  create mode 100644 Documentation/scsi/bnx2fc.txt
4682  create mode 100644 drivers/scsi/mvumi.c
4683  create mode 100644 drivers/scsi/mvumi.h
4684  create mode 100644 drivers/scsi/qla4xxx/ql4_bsg.c
4685  create mode 100644 drivers/scsi/qla4xxx/ql4_bsg.h
4686  create mode 100644 include/scsi/scsi_bsg_iscsi.h
4687 Merging iscsi-target/for-next
4688 $ git merge iscsi-target/for-next
4689 Already up-to-date.
4690 Merging slave-dma/next
4691 $ git merge slave-dma/next
4692 Auto-merging drivers/tty/serial/sh-sci.c
4693 Merge made by recursive.
4694  drivers/dma/amba-pl08x.c    |  381 ++++++++++++++++++++++++-------------------
4695  drivers/dma/at_hdmac.c      |    5 +-
4696  drivers/dma/dw_dmac.c       |    5 +-
4697  drivers/dma/imx-dma.c       |    1 +
4698  drivers/dma/imx-sdma.c      |    1 +
4699  drivers/dma/intel_mid_dma.c |    2 -
4700  drivers/dma/mpc512x_dma.c   |    1 -
4701  drivers/dma/pch_dma.c       |    2 -
4702  drivers/dma/pl330.c         |    2 -
4703  drivers/dma/shdma.c         |  129 ++++++++++-----
4704  drivers/dma/shdma.h         |    7 +
4705  drivers/dma/timb_dma.c      |    3 +-
4706  drivers/tty/serial/sh-sci.c |   25 +--
4707  include/linux/amba/pl08x.h  |   22 ++-
4708  include/linux/serial_sci.h  |    2 -
4709  15 files changed, 341 insertions(+), 247 deletions(-)
4710 Merging async_tx/next
4711 $ git merge async_tx/next
4712 Already up-to-date.
4713 Merging net/master
4714 $ git merge net/master
4715 Auto-merging Documentation/networking/ip-sysctl.txt
4716 Auto-merging MAINTAINERS
4717 Auto-merging arch/mips/Kconfig
4718 Auto-merging arch/powerpc/Kconfig
4719 CONFLICT (delete/modify): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net/master. Version net/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
4720 Auto-merging arch/powerpc/configs/ppc40x_defconfig
4721 Auto-merging arch/powerpc/platforms/40x/Kconfig
4722 Auto-merging arch/s390/include/asm/qdio.h
4723 Removing drivers/net/arm/Kconfig
4724 Removing drivers/net/arm/Makefile
4725 Removing drivers/net/benet/Kconfig
4726 Removing drivers/net/bna/bfa_ioc_ct.c
4727 Removing drivers/net/bna/bfi_ctreg.h
4728 Removing drivers/net/bna/bfi_ll.h
4729 Removing drivers/net/bna/bna_ctrl.c
4730 Removing drivers/net/bna/bna_hw.h
4731 Removing drivers/net/bna/bna_txrx.c
4732 Auto-merging drivers/net/bonding/bond_main.c
4733 Auto-merging drivers/net/cris/eth_v10.c
4734 Auto-merging drivers/net/ethernet/3com/3c501.c
4735 Auto-merging drivers/net/ethernet/3com/3c509.c
4736 Auto-merging drivers/net/ethernet/3com/3c515.c
4737 Auto-merging drivers/net/ethernet/3com/3c574_cs.c
4738 Auto-merging drivers/net/ethernet/3com/3c589_cs.c
4739 Auto-merging drivers/net/ethernet/3com/3c59x.c
4740 Auto-merging drivers/net/ethernet/3com/typhoon.c
4741 Auto-merging drivers/net/ethernet/8390/3c503.c
4742 Auto-merging drivers/net/ethernet/8390/8390.c
4743 Auto-merging drivers/net/ethernet/8390/8390p.c
4744 Auto-merging drivers/net/ethernet/8390/ac3200.c
4745 Auto-merging drivers/net/ethernet/8390/ax88796.c
4746 Auto-merging drivers/net/ethernet/8390/axnet_cs.c
4747 Auto-merging drivers/net/ethernet/8390/e2100.c
4748 Auto-merging drivers/net/ethernet/8390/etherh.c
4749 Auto-merging drivers/net/ethernet/8390/hp-plus.c
4750 Auto-merging drivers/net/ethernet/8390/hydra.c
4751 Auto-merging drivers/net/ethernet/8390/mac8390.c
4752 Auto-merging drivers/net/ethernet/8390/ne-h8300.c
4753 Auto-merging drivers/net/ethernet/8390/ne2k-pci.c
4754 Auto-merging drivers/net/ethernet/8390/pcnet_cs.c
4755 Auto-merging drivers/net/ethernet/8390/smc-mca.c
4756 Auto-merging drivers/net/ethernet/8390/smc-ultra.c
4757 Auto-merging drivers/net/ethernet/8390/smc-ultra32.c
4758 Auto-merging drivers/net/ethernet/8390/wd.c
4759 Auto-merging drivers/net/ethernet/8390/zorro8390.c
4760 Auto-merging drivers/net/ethernet/adaptec/starfire.c
4761 Auto-merging drivers/net/ethernet/adi/bfin_mac.c
4762 Auto-merging drivers/net/ethernet/aeroflex/greth.c
4763 Auto-merging drivers/net/ethernet/alteon/acenic.c
4764 Auto-merging drivers/net/ethernet/amd/a2065.c
4765 Auto-merging drivers/net/ethernet/amd/am79c961a.c
4766 Auto-merging drivers/net/ethernet/amd/amd8111e.c
4767 Auto-merging drivers/net/ethernet/amd/ariadne.c
4768 Auto-merging drivers/net/ethernet/amd/atarilance.c
4769 Auto-merging drivers/net/ethernet/amd/au1000_eth.c
4770 Auto-merging drivers/net/ethernet/amd/declance.c
4771 Auto-merging drivers/net/ethernet/amd/depca.c
4772 Auto-merging drivers/net/ethernet/amd/depca.h
4773 Auto-merging drivers/net/ethernet/amd/hplance.c
4774 Auto-merging drivers/net/ethernet/amd/lance.c
4775 Auto-merging drivers/net/ethernet/amd/mvme147.c
4776 Auto-merging drivers/net/ethernet/amd/ni65.c
4777 Auto-merging drivers/net/ethernet/amd/nmclan_cs.c
4778 Auto-merging drivers/net/ethernet/amd/pcnet32.c
4779 Auto-merging drivers/net/ethernet/amd/sun3lance.c
4780 Auto-merging drivers/net/ethernet/amd/sunlance.c
4781 Auto-merging drivers/net/ethernet/apple/bmac.c
4782 Auto-merging drivers/net/ethernet/apple/cs89x0.c
4783 Auto-merging drivers/net/ethernet/apple/mac89x0.c
4784 Auto-merging drivers/net/ethernet/apple/mace.c
4785 Auto-merging drivers/net/ethernet/apple/macmace.c
4786 Auto-merging drivers/net/ethernet/atheros/atl1c/atl1c_main.c
4787 Auto-merging drivers/net/ethernet/atheros/atl1e/atl1e_main.c
4788 Auto-merging drivers/net/ethernet/atheros/atlx/atl1.c
4789 Auto-merging drivers/net/ethernet/atheros/atlx/atl2.c
4790 Auto-merging drivers/net/ethernet/broadcom/b44.c
4791 Auto-merging drivers/net/ethernet/broadcom/bcm63xx_enet.c
4792 Auto-merging drivers/net/ethernet/broadcom/bnx2.c
4793 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
4794 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
4795 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
4796 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
4797 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
4798 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
4799 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
4800 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
4801 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
4802 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
4803 Auto-merging drivers/net/ethernet/broadcom/cnic.c
4804 Auto-merging drivers/net/ethernet/broadcom/cnic.h
4805 Auto-merging drivers/net/ethernet/broadcom/cnic_defs.h
4806 Auto-merging drivers/net/ethernet/broadcom/sb1250-mac.c
4807 Auto-merging drivers/net/ethernet/broadcom/tg3.c
4808 Auto-merging drivers/net/ethernet/broadcom/tg3.h
4809 Auto-merging drivers/net/ethernet/brocade/bna/Makefile
4810 Auto-merging drivers/net/ethernet/brocade/bna/bfa_cee.c
4811 Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs.h
4812 Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs_cna.h
4813 Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
4814 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.c
4815 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.h
4816 Auto-merging drivers/net/ethernet/brocade/bna/bfi.h
4817 Auto-merging drivers/net/ethernet/brocade/bna/bna.h
4818 Auto-merging drivers/net/ethernet/brocade/bna/bna_types.h
4819 Auto-merging drivers/net/ethernet/brocade/bna/bnad.c
4820 Auto-merging drivers/net/ethernet/brocade/bna/bnad.h
4821 Auto-merging drivers/net/ethernet/brocade/bna/bnad_ethtool.c
4822 Auto-merging drivers/net/ethernet/brocade/bna/cna.h
4823 Auto-merging drivers/net/ethernet/brocade/bna/cna_fwimg.c
4824 Auto-merging drivers/net/ethernet/cadence/at91_ether.c
4825 Auto-merging drivers/net/ethernet/cadence/macb.c
4826 Auto-merging drivers/net/ethernet/chelsio/cxgb/cxgb2.c
4827 Auto-merging drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
4828 Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
4829 Auto-merging drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
4830 Auto-merging drivers/net/ethernet/cisco/enic/enic.h
4831 Auto-merging drivers/net/ethernet/cisco/enic/enic_dev.h
4832 Auto-merging drivers/net/ethernet/cisco/enic/enic_main.c
4833 Auto-merging drivers/net/ethernet/cisco/enic/enic_pp.c
4834 Auto-merging drivers/net/ethernet/cisco/enic/enic_pp.h
4835 Auto-merging drivers/net/ethernet/cisco/enic/vnic_dev.c
4836 Auto-merging drivers/net/ethernet/cisco/enic/vnic_dev.h
4837 Auto-merging drivers/net/ethernet/davicom/dm9000.c
4838 Auto-merging drivers/net/ethernet/dec/ewrk3.c
4839 Auto-merging drivers/net/ethernet/dec/tulip/Kconfig
4840 Auto-merging drivers/net/ethernet/dec/tulip/de2104x.c
4841 Auto-merging drivers/net/ethernet/dec/tulip/de4x5.c
4842 Auto-merging drivers/net/ethernet/dec/tulip/de4x5.h
4843 Auto-merging drivers/net/ethernet/dec/tulip/dmfe.c
4844 Auto-merging drivers/net/ethernet/dec/tulip/tulip_core.c
4845 Auto-merging drivers/net/ethernet/dec/tulip/uli526x.c
4846 Auto-merging drivers/net/ethernet/dec/tulip/winbond-840.c
4847 Auto-merging drivers/net/ethernet/dlink/de620.c
4848 Auto-merging drivers/net/ethernet/dlink/dl2k.c
4849 Auto-merging drivers/net/ethernet/dlink/dl2k.h
4850 Auto-merging drivers/net/ethernet/dlink/sundance.c
4851 Auto-merging drivers/net/ethernet/emulex/benet/be.h
4852 Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.c
4853 Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.h
4854 Auto-merging drivers/net/ethernet/emulex/benet/be_ethtool.c
4855 Auto-merging drivers/net/ethernet/emulex/benet/be_hw.h
4856 Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
4857 Auto-merging drivers/net/ethernet/ethoc.c
4858 Auto-merging drivers/net/ethernet/fealnx.c
4859 Auto-merging drivers/net/ethernet/freescale/fec.c
4860 Auto-merging drivers/net/ethernet/freescale/fec_mpc52xx.c
4861 Auto-merging drivers/net/ethernet/freescale/fs_enet/Kconfig
4862 Auto-merging drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
4863 Auto-merging drivers/net/ethernet/freescale/gianfar.c
4864 Auto-merging drivers/net/ethernet/freescale/gianfar_ethtool.c
4865 Auto-merging drivers/net/ethernet/freescale/ucc_geth.c
4866 Auto-merging drivers/net/ethernet/fujitsu/at1700.c
4867 Auto-merging drivers/net/ethernet/fujitsu/eth16i.c
4868 Auto-merging drivers/net/ethernet/fujitsu/fmvj18x_cs.c
4869 Auto-merging drivers/net/ethernet/hp/hp100.c
4870 Auto-merging drivers/net/ethernet/i825xx/3c505.c
4871 Auto-merging drivers/net/ethernet/i825xx/3c523.c
4872 Auto-merging drivers/net/ethernet/i825xx/3c527.c
4873 Auto-merging drivers/net/ethernet/i825xx/82596.c
4874 Auto-merging drivers/net/ethernet/i825xx/eepro.c
4875 Auto-merging drivers/net/ethernet/i825xx/eexpress.c
4876 Auto-merging drivers/net/ethernet/i825xx/ether1.c
4877 Auto-merging drivers/net/ethernet/i825xx/lib82596.c
4878 Auto-merging drivers/net/ethernet/i825xx/lp486e.c
4879 Auto-merging drivers/net/ethernet/i825xx/ni52.c
4880 Auto-merging drivers/net/ethernet/i825xx/sun3_82586.c
4881 Auto-merging drivers/net/ethernet/i825xx/znet.c
4882 Auto-merging drivers/net/ethernet/ibm/ehea/ehea.h
4883 Auto-merging drivers/net/ethernet/ibm/ehea/ehea_main.c
4884 Auto-merging drivers/net/ethernet/ibm/emac/Kconfig
4885 Auto-merging drivers/net/ethernet/ibm/emac/core.c
4886 Auto-merging drivers/net/ethernet/ibm/emac/core.h
4887 Auto-merging drivers/net/ethernet/ibm/emac/debug.h
4888 Auto-merging drivers/net/ethernet/ibm/emac/mal.c
4889 Auto-merging drivers/net/ethernet/ibm/emac/mal.h
4890 Auto-merging drivers/net/ethernet/ibm/emac/rgmii.h
4891 Auto-merging drivers/net/ethernet/ibm/emac/tah.h
4892 Auto-merging drivers/net/ethernet/ibm/emac/zmii.h
4893 Auto-merging drivers/net/ethernet/ibm/ibmveth.c
4894 Auto-merging drivers/net/ethernet/ibm/iseries_veth.c
4895 Auto-merging drivers/net/ethernet/icplus/ipg.c
4896 Auto-merging drivers/net/ethernet/intel/e100.c
4897 Auto-merging drivers/net/ethernet/intel/e1000/e1000.h
4898 Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c
4899 Auto-merging drivers/net/ethernet/intel/e1000e/80003es2lan.c
4900 Auto-merging drivers/net/ethernet/intel/e1000e/82571.c
4901 Auto-merging drivers/net/ethernet/intel/e1000e/Makefile
4902 Auto-merging drivers/net/ethernet/intel/e1000e/e1000.h
4903 Auto-merging drivers/net/ethernet/intel/e1000e/ethtool.c
4904 Auto-merging drivers/net/ethernet/intel/e1000e/ich8lan.c
4905 Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
4906 Auto-merging drivers/net/ethernet/intel/igb/igb.h
4907 Auto-merging drivers/net/ethernet/intel/igb/igb_ethtool.c
4908 Auto-merging drivers/net/ethernet/intel/igb/igb_main.c
4909 Auto-merging drivers/net/ethernet/intel/igbvf/netdev.c
4910 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb.h
4911 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_ee.c
4912 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_ee.h
4913 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
4914 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_hw.c
4915 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_hw.h
4916 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_main.c
4917 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_osdep.h
4918 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_param.c
4919 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe.h
4920 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
4921 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
4922 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
4923 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
4924 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c
4925 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h
4926 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
4927 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
4928 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
4929 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
4930 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
4931 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
4932 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
4933 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
4934 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
4935 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
4936 Auto-merging drivers/net/ethernet/intel/ixgbevf/ethtool.c
4937 Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
4938 Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
4939 Auto-merging drivers/net/ethernet/jme.c
4940 Auto-merging drivers/net/ethernet/jme.h
4941 Auto-merging drivers/net/ethernet/korina.c
4942 Auto-merging drivers/net/ethernet/lantiq_etop.c
4943 Auto-merging drivers/net/ethernet/marvell/mv643xx_eth.c
4944 Auto-merging drivers/net/ethernet/marvell/skge.c
4945 Auto-merging drivers/net/ethernet/marvell/sky2.c
4946 Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c
4947 Auto-merging drivers/net/ethernet/micrel/ks8695net.c
4948 Auto-merging drivers/net/ethernet/micrel/ksz884x.c
4949 Auto-merging drivers/net/ethernet/microchip/enc28j60.c
4950 Auto-merging drivers/net/ethernet/mipsnet.c
4951 Auto-merging drivers/net/ethernet/myricom/myri10ge/myri10ge.c
4952 Auto-merging drivers/net/ethernet/natsemi/ibmlana.c
4953 Auto-merging drivers/net/ethernet/natsemi/jazzsonic.c
4954 Auto-merging drivers/net/ethernet/natsemi/macsonic.c
4955 Auto-merging drivers/net/ethernet/natsemi/natsemi.c
4956 Auto-merging drivers/net/ethernet/natsemi/ns83820.c
4957 Auto-merging drivers/net/ethernet/natsemi/xtsonic.c
4958 Auto-merging drivers/net/ethernet/neterion/s2io.c
4959 Auto-merging drivers/net/ethernet/neterion/vxge/vxge-config.c
4960 Auto-merging drivers/net/ethernet/neterion/vxge/vxge-config.h
4961 Auto-merging drivers/net/ethernet/neterion/vxge/vxge-main.c
4962 Auto-merging drivers/net/ethernet/neterion/vxge/vxge-traffic.c
4963 Auto-merging drivers/net/ethernet/netx-eth.c
4964 Auto-merging drivers/net/ethernet/nuvoton/w90p910_ether.c
4965 Auto-merging drivers/net/ethernet/nvidia/forcedeth.c
4966 Auto-merging drivers/net/ethernet/octeon/Kconfig
4967 Auto-merging drivers/net/ethernet/octeon/octeon_mgmt.c
4968 Auto-merging drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
4969 Auto-merging drivers/net/ethernet/packetengines/hamachi.c
4970 Auto-merging drivers/net/ethernet/packetengines/yellowfin.c
4971 Auto-merging drivers/net/ethernet/pasemi/pasemi_mac.c
4972 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic.h
4973 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
4974 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
4975 Auto-merging drivers/net/ethernet/qlogic/qla3xxx.c
4976 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
4977 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
4978 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
4979 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
4980 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
4981 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
4982 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
4983 Auto-merging drivers/net/ethernet/qlogic/qlge/qlge_main.c
4984 Auto-merging drivers/net/ethernet/racal/ni5010.c
4985 Auto-merging drivers/net/ethernet/rdc/r6040.c
4986 Auto-merging drivers/net/ethernet/realtek/8139cp.c
4987 Auto-merging drivers/net/ethernet/realtek/8139too.c
4988 Auto-merging drivers/net/ethernet/realtek/atp.c
4989 Auto-merging drivers/net/ethernet/realtek/r8169.c
4990 Auto-merging drivers/net/ethernet/realtek/sc92031.c
4991 Auto-merging drivers/net/ethernet/renesas/sh_eth.c
4992 Auto-merging drivers/net/ethernet/renesas/sh_eth.h
4993 Auto-merging drivers/net/ethernet/seeq/ether3.c
4994 Auto-merging drivers/net/ethernet/seeq/seeq8005.c
4995 Auto-merging drivers/net/ethernet/seeq/sgiseeq.c
4996 Auto-merging drivers/net/ethernet/sfc/Kconfig
4997 Auto-merging drivers/net/ethernet/sfc/efx.c
4998 Auto-merging drivers/net/ethernet/sfc/efx.h
4999 Auto-merging drivers/net/ethernet/sfc/ethtool.c
5000 Auto-merging drivers/net/ethernet/sfc/falcon.c
5001 Auto-merging drivers/net/ethernet/sfc/nic.h
5002 Auto-merging drivers/net/ethernet/sfc/rx.c
5003 Auto-merging drivers/net/ethernet/sfc/siena.c
5004 Auto-merging drivers/net/ethernet/sfc/tx.c
5005 Auto-merging drivers/net/ethernet/sgi/ioc3-eth.c
5006 Auto-merging drivers/net/ethernet/sis/sis190.c
5007 Auto-merging drivers/net/ethernet/sis/sis900.c
5008 Auto-merging drivers/net/ethernet/smsc/epic100.c
5009 Auto-merging drivers/net/ethernet/smsc/smc911x.c
5010 Auto-merging drivers/net/ethernet/smsc/smc9194.c
5011 Auto-merging drivers/net/ethernet/smsc/smc91c92_cs.c
5012 Auto-merging drivers/net/ethernet/smsc/smc91x.c
5013 Auto-merging drivers/net/ethernet/smsc/smsc911x.c
5014 Auto-merging drivers/net/ethernet/smsc/smsc9420.c
5015 Auto-merging drivers/net/ethernet/stmicro/stmmac/Kconfig
5016 Auto-merging drivers/net/ethernet/stmicro/stmmac/Makefile
5017 Auto-merging drivers/net/ethernet/stmicro/stmmac/common.h
5018 Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
5019 Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
5020 Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
5021 Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
5022 Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac.h
5023 Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
5024 Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
5025 Auto-merging drivers/net/ethernet/sun/cassini.c
5026 Auto-merging drivers/net/ethernet/sun/niu.c
5027 Auto-merging drivers/net/ethernet/sun/sunbmac.c
5028 Auto-merging drivers/net/ethernet/sun/sunbmac.h
5029 Auto-merging drivers/net/ethernet/sun/sungem.c
5030 Auto-merging drivers/net/ethernet/sun/sunhme.c
5031 Auto-merging drivers/net/ethernet/sun/sunqe.c
5032 Auto-merging drivers/net/ethernet/sun/sunvnet.c
5033 Auto-merging drivers/net/ethernet/tehuti/tehuti.c
5034 Auto-merging drivers/net/ethernet/ti/cpmac.c
5035 Auto-merging drivers/net/ethernet/ti/davinci_emac.c
5036 Auto-merging drivers/net/ethernet/ti/tlan.c
5037 Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_net.c
5038 Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
5039 Auto-merging drivers/net/ethernet/toshiba/spider_net.c
5040 Auto-merging drivers/net/ethernet/toshiba/spider_net.h
5041 Auto-merging drivers/net/ethernet/toshiba/tc35815.c
5042 Auto-merging drivers/net/ethernet/tundra/tsi108_eth.c
5043 Auto-merging drivers/net/ethernet/via/via-rhine.c
5044 Auto-merging drivers/net/ethernet/via/via-velocity.c
5045 Auto-merging drivers/net/ethernet/xilinx/ll_temac_main.c
5046 Auto-merging drivers/net/ethernet/xircom/xirc2ps_cs.c
5047 Auto-merging drivers/net/ethernet/xscale/ixp2000/Kconfig
5048 Auto-merging drivers/net/ethernet/xscale/ixp4xx_eth.c
5049 Auto-merging drivers/net/fddi/defxx.c
5050 Auto-merging drivers/net/fddi/skfp/h/cmtdef.h
5051 Auto-merging drivers/net/fddi/skfp/h/hwmtm.h
5052 Auto-merging drivers/net/fddi/skfp/h/sba.h
5053 Auto-merging drivers/net/fddi/skfp/h/skfbiinc.h
5054 Auto-merging drivers/net/fddi/skfp/h/smc.h
5055 Auto-merging drivers/net/fddi/skfp/h/targethw.h
5056 Auto-merging drivers/net/fddi/skfp/h/targetos.h
5057 Auto-merging drivers/net/fddi/skfp/skfddi.c
5058 Removing drivers/net/ibm_newemac/Makefile
5059 Removing drivers/net/octeon/Makefile
5060 Removing drivers/net/pci-skeleton.c
5061 Removing drivers/net/pcmcia/Kconfig
5062 Removing drivers/net/pcmcia/Makefile
5063 Auto-merging drivers/net/phy/dp83640.c
5064 Auto-merging drivers/net/slip/slip.c
5065 Auto-merging drivers/net/slip/slip.h
5066 Auto-merging drivers/net/tokenring/ibmtr_cs.c
5067 Removing drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
5068 Removing drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h
5069 Auto-merging drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
5070 Removing drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c
5071 Auto-merging drivers/s390/cio/qdio_main.c
5072 CONFLICT (content): Merge conflict in drivers/s390/cio/qdio_main.c
5073 Auto-merging drivers/s390/cio/qdio_setup.c
5074 Auto-merging drivers/s390/net/lcs.c
5075 Auto-merging drivers/scsi/bnx2fc/bnx2fc.h
5076 Auto-merging drivers/scsi/bnx2fc/bnx2fc_fcoe.c
5077 Auto-merging drivers/scsi/fcoe/fcoe.c
5078 Auto-merging drivers/scsi/fcoe/fcoe_transport.c
5079 Auto-merging drivers/staging/Kconfig
5080 Auto-merging drivers/staging/Makefile
5081 Removing drivers/staging/ath6kl/Kconfig
5082 Removing drivers/staging/ath6kl/Makefile
5083 Removing drivers/staging/ath6kl/TODO
5084 Removing drivers/staging/ath6kl/bmi/include/bmi_internal.h
5085 Removing drivers/staging/ath6kl/bmi/src/bmi.c
5086 Removing drivers/staging/ath6kl/hif/common/hif_sdio_common.h
5087 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
5088 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
5089 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
5090 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.c
5091 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.h
5092 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
5093 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
5094 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
5095 Removing drivers/staging/ath6kl/htc2/htc.c
5096 Removing drivers/staging/ath6kl/htc2/htc_debug.h
5097 Removing drivers/staging/ath6kl/htc2/htc_internal.h
5098 Removing drivers/staging/ath6kl/htc2/htc_recv.c
5099 Removing drivers/staging/ath6kl/htc2/htc_send.c
5100 Removing drivers/staging/ath6kl/htc2/htc_services.c
5101 Removing drivers/staging/ath6kl/include/a_config.h
5102 Removing drivers/staging/ath6kl/include/a_debug.h
5103 Removing drivers/staging/ath6kl/include/a_drv.h
5104 Removing drivers/staging/ath6kl/include/a_drv_api.h
5105 Removing drivers/staging/ath6kl/include/a_osapi.h
5106 Removing drivers/staging/ath6kl/include/aggr_recv_api.h
5107 Removing drivers/staging/ath6kl/include/ar3kconfig.h
5108 Removing drivers/staging/ath6kl/include/ar6000_api.h
5109 Removing drivers/staging/ath6kl/include/ar6000_diag.h
5110 Removing drivers/staging/ath6kl/include/ar6kap_common.h
5111 Removing drivers/staging/ath6kl/include/athbtfilter.h
5112 Removing drivers/staging/ath6kl/include/bmi.h
5113 Removing drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
5114 Removing drivers/staging/ath6kl/include/common/AR6002/addrs.h
5115 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
5116 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
5117 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
5118 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
5119 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
5120 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
5121 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
5122 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
5123 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
5124 Removing drivers/staging/ath6kl/include/common/athdefs.h
5125 Removing drivers/staging/ath6kl/include/common/bmi_msg.h
5126 Removing drivers/staging/ath6kl/include/common/cnxmgmt.h
5127 Removing drivers/staging/ath6kl/include/common/dbglog.h
5128 Removing drivers/staging/ath6kl/include/common/dbglog_id.h
5129 Removing drivers/staging/ath6kl/include/common/discovery.h
5130 Removing drivers/staging/ath6kl/include/common/epping_test.h
5131 Removing drivers/staging/ath6kl/include/common/gmboxif.h
5132 Removing drivers/staging/ath6kl/include/common/gpio_reg.h
5133 Removing drivers/staging/ath6kl/include/common/htc.h
5134 Removing drivers/staging/ath6kl/include/common/htc_services.h
5135 Removing drivers/staging/ath6kl/include/common/pkt_log.h
5136 Removing drivers/staging/ath6kl/include/common/roaming.h
5137 Removing drivers/staging/ath6kl/include/common/targaddrs.h
5138 Removing drivers/staging/ath6kl/include/common/testcmd.h
5139 Removing drivers/staging/ath6kl/include/common/tlpm.h
5140 Removing drivers/staging/ath6kl/include/common/wlan_defs.h
5141 Removing drivers/staging/ath6kl/include/common/wmi.h
5142 Removing drivers/staging/ath6kl/include/common/wmix.h
5143 Removing drivers/staging/ath6kl/include/common_drv.h
5144 Removing drivers/staging/ath6kl/include/dbglog_api.h
5145 Removing drivers/staging/ath6kl/include/dl_list.h
5146 Removing drivers/staging/ath6kl/include/dset_api.h
5147 Removing drivers/staging/ath6kl/include/hci_transport_api.h
5148 Removing drivers/staging/ath6kl/include/hif.h
5149 Removing drivers/staging/ath6kl/include/host_version.h
5150 Removing drivers/staging/ath6kl/include/htc_api.h
5151 Removing drivers/staging/ath6kl/include/htc_packet.h
5152 Removing drivers/staging/ath6kl/include/wlan_api.h
5153 Removing drivers/staging/ath6kl/include/wmi_api.h
5154 Removing drivers/staging/ath6kl/miscdrv/ar3kconfig.c
5155 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
5156 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
5157 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
5158 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
5159 Removing drivers/staging/ath6kl/miscdrv/common_drv.c
5160 Removing drivers/staging/ath6kl/miscdrv/credit_dist.c
5161 Removing drivers/staging/ath6kl/miscdrv/miscdrv.h
5162 Removing drivers/staging/ath6kl/os/linux/ar6000_drv.c
5163 Removing drivers/staging/ath6kl/os/linux/ar6000_pm.c
5164 Removing drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
5165 Removing drivers/staging/ath6kl/os/linux/cfg80211.c
5166 Removing drivers/staging/ath6kl/os/linux/export_hci_transport.c
5167 Removing drivers/staging/ath6kl/os/linux/hci_bridge.c
5168 Removing drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
5169 Removing drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
5170 Removing drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
5171 Removing drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
5172 Removing drivers/staging/ath6kl/os/linux/include/cfg80211.h
5173 Removing drivers/staging/ath6kl/os/linux/include/config_linux.h
5174 Removing drivers/staging/ath6kl/os/linux/include/debug_linux.h
5175 Removing drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
5176 Removing drivers/staging/ath6klResolved 'drivers/s390/cio/qdio_main.c' using previous resolution.
5177 Resolved 'net/batman-adv/soft-interface.c' using previous resolution.
5178 /os/linux/include/ieee80211_ioctl.h
5179 Removing drivers/staging/ath6kl/os/linux/include/osapi_linux.h
5180 Removing drivers/staging/ath6kl/os/linux/include/wlan_config.h
5181 Removing drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
5182 Removing drivers/staging/ath6kl/os/linux/netbuf.c
5183 Removing drivers/staging/ath6kl/reorder/aggr_rx_internal.h
5184 Removing drivers/staging/ath6kl/reorder/rcv_aggr.c
5185 Removing drivers/staging/ath6kl/wlan/include/ieee80211.h
5186 Removing drivers/staging/ath6kl/wlan/include/ieee80211_node.h
5187 Removing drivers/staging/ath6kl/wlan/src/wlan_node.c
5188 Removing drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
5189 Removing drivers/staging/ath6kl/wlan/src/wlan_utils.c
5190 Removing drivers/staging/ath6kl/wmi/wmi.c
5191 Removing drivers/staging/ath6kl/wmi/wmi_host.h
5192 Auto-merging include/linux/pci.h
5193 Auto-merging include/linux/sh_eth.h
5194 Auto-merging include/linux/sungem_phy.h
5195 Auto-merging include/net/nfc/nfc.h
5196 Removing net/batman-adv/aggregation.c
5197 Removing net/batman-adv/aggregation.h
5198 Auto-merging net/batman-adv/soft-interface.c
5199 CONFLICT (content): Merge conflict in net/batman-adv/soft-interface.c
5200 Auto-merging net/ipv6/tcp_ipv6.c
5201 Auto-merging net/packet/af_packet.c
5202 Removing net/rds/xlist.h
5203 Automatic merge failed; fix conflicts and then commit the result.
5204 $ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
5205 arch/powerpc/configs/40x/hcu4_defconfig: needs merge
5206 drivers/s390/cio/qdio_main.c: needs merge
5207 net/batman-adv/soft-interface.c: needs merge
5208 rm 'arch/powerpc/configs/40x/hcu4_defconfig'
5209 $ git commit -v -a
5210 [master 535ce95] Merge remote-tracking branch 'net/master'
5211 $ git diff -M --stat --summary HEAD^..
5212  Documentation/ABI/testing/sysfs-class-net-mesh     |    8 +
5213  .../devicetree/bindings/net/can/fsl-flexcan.txt    |   63 +-
5214  Documentation/devicetree/bindings/net/smsc911x.txt |   38 +
5215  Documentation/networking/batman-adv.txt            |    8 +-
5216  Documentation/networking/ip-sysctl.txt             |   17 +-
5217  Documentation/networking/netdevices.txt            |    4 +-
5218  Documentation/networking/stmmac.txt                |   33 +-
5219  MAINTAINERS                                        |  214 +-
5220  arch/cris/arch-v10/drivers/Kconfig                 |    1 +
5221  arch/cris/arch-v32/drivers/Kconfig                 |    1 +
5222  arch/ia64/hp/sim/simeth.c                          |    2 +-
5223  arch/mips/Kconfig                                  |    8 +-
5224  arch/mips/bcm47xx/Kconfig                          |   31 +
5225  arch/mips/bcm47xx/Makefile                         |    3 +-
5226  arch/mips/bcm47xx/gpio.c                           |   82 +-
5227  arch/mips/bcm47xx/irq.c                            |   12 +
5228  arch/mips/bcm47xx/nvram.c                          |   29 +-
5229  arch/mips/bcm47xx/serial.c                         |   46 +-
5230  arch/mips/bcm47xx/setup.c                          |   90 +-
5231  arch/mips/bcm47xx/time.c                           |   16 +-
5232  arch/mips/bcm47xx/wgt634u.c                        |   14 +-
5233  arch/mips/include/asm/mach-bcm47xx/bcm47xx.h       |   26 +-
5234  arch/mips/include/asm/mach-bcm47xx/gpio.h          |  108 +-
5235  arch/mips/pci/pci-bcm47xx.c                        |    6 +
5236  arch/mips/txx9/generic/setup_tx4939.c              |    2 +-
5237  arch/powerpc/Kconfig                               |    2 +
5238  arch/powerpc/boot/dts/p1010rdb.dts                 |   10 +-
5239  arch/powerpc/boot/dts/p1010si.dtsi                 |   10 +-
5240  arch/powerpc/configs/40x/acadia_defconfig          |   11 +-
5241  arch/powerpc/configs/40x/ep405_defconfig           |    5 +-
5242  arch/powerpc/configs/40x/kilauea_defconfig         |    9 +-
5243  arch/powerpc/configs/40x/makalu_defconfig          |    9 +-
5244  arch/powerpc/configs/40x/walnut_defconfig          |    5 +-
5245  arch/powerpc/configs/44x/arches_defconfig          |    9 +-
5246  arch/powerpc/configs/44x/bamboo_defconfig          |    5 +-
5247  arch/powerpc/configs/44x/bluestone_defconfig       |    9 +-
5248  arch/powerpc/configs/44x/canyonlands_defconfig     |    9 +-
5249  arch/powerpc/configs/44x/ebony_defconfig           |    5 +-
5250  arch/powerpc/configs/44x/eiger_defconfig           |    9 +-
5251  arch/powerpc/configs/44x/icon_defconfig            |    5 +-
5252  arch/powerpc/configs/44x/katmai_defconfig          |    5 +-
5253  arch/powerpc/configs/44x/redwood_defconfig         |   11 +-
5254  arch/powerpc/configs/44x/sam440ep_defconfig        |    5 +-
5255  arch/powerpc/configs/44x/sequoia_defconfig         |    5 +-
5256  arch/powerpc/configs/44x/taishan_defconfig         |    5 +-
5257  arch/powerpc/configs/44x/warp_defconfig            |    5 +-
5258  arch/powerpc/configs/ppc40x_defconfig              |    5 +-
5259  arch/powerpc/configs/ppc44x_defconfig              |    5 +-
5260  arch/powerpc/platforms/40x/Kconfig                 |   12 +-
5261  arch/powerpc/platforms/44x/Kconfig                 |   54 +-
5262  arch/powerpc/platforms/cell/Kconfig                |    8 +-
5263  arch/s390/include/asm/qdio.h                       |   78 +-
5264  arch/um/drivers/net_kern.c                         |    2 +-
5265  arch/xtensa/platforms/iss/network.c                |    2 +-
5266  drivers/atm/eni.c                                  |    3 +-
5267  drivers/atm/iphase.c                               |  265 +-
5268  drivers/atm/iphase.h                               |  391 +-
5269  drivers/bcma/Kconfig                               |   13 +
5270  drivers/bcma/Makefile                              |    2 +
5271  drivers/bcma/bcma_private.h                        |   16 +
5272  drivers/bcma/core.c                                |    2 +
5273  drivers/bcma/driver_chipcommon.c                   |   53 +
5274  drivers/bcma/driver_chipcommon_pmu.c               |  191 +-
5275  drivers/bcma/driver_mips.c                         |  256 +
5276  drivers/bcma/driver_pci.c                          |   16 +-
5277  drivers/bcma/host_soc.c                            |  183 +
5278  drivers/bcma/main.c                                |   70 +-
5279  drivers/bcma/scan.c                                |  348 +-
5280  drivers/bcma/sprom.c                               |   15 +
5281  drivers/connector/cn_proc.c                        |   26 +
5282  drivers/infiniband/hw/amso1100/c2.c                |    8 +-
5283  drivers/infiniband/hw/cxgb3/Makefile               |    2 +-
5284  drivers/infiniband/hw/cxgb4/Makefile               |    2 +-
5285  drivers/infiniband/hw/mlx4/Kconfig                 |    3 +-
5286  drivers/infiniband/hw/nes/nes_nic.c                |   23 +-
5287  drivers/infiniband/ulp/ipoib/ipoib_cm.c            |    5 +-
5288  drivers/infiniband/ulp/ipoib/ipoib_ib.c            |    5 +-
5289  drivers/infiniband/ulp/ipoib/ipoib_main.c          |    2 +-
5290  drivers/media/dvb/dvb-core/dvb_net.c               |    2 +-
5291  drivers/net/Kconfig                                | 3448 +----------
5292  drivers/net/Makefile                               |  326 +-
5293  drivers/net/appletalk/cops.c                       |    2 +-
5294  drivers/net/appletalk/ltpc.c                       |    2 +-
5295  drivers/net/arcnet/Kconfig                         |   14 +-
5296  drivers/net/arcnet/Makefile                        |    1 +
5297  drivers/net/arcnet/com20020.c                      |    2 +-
5298  drivers/net/{pcmcia => arcnet}/com20020_cs.c       |    0
5299  drivers/net/arm/Kconfig                            |   74 -
5300  drivers/net/arm/Makefile                           |   14 -
5301  drivers/net/benet/Kconfig                          |    6 -
5302  drivers/net/bna/bfa_ioc_ct.c                       |  516 --
5303  drivers/net/bna/bfi_ctreg.h                        |  646 --
5304  drivers/net/bna/bfi_ll.h                           |  438 --
5305  drivers/net/bna/bna_ctrl.c                         | 3076 ----------
5306  drivers/net/bna/bna_hw.h                           | 1490 -----
5307  drivers/net/bna/bna_txrx.c                         | 4185 -------------
5308  drivers/net/bonding/bond_main.c                    |   68 +-
5309  drivers/net/bonding/bonding.h                      |    1 -
5310  drivers/net/caif/caif_hsi.c                        |    9 +-
5311  drivers/net/caif/caif_spi.c                        |    4 -
5312  drivers/net/can/dev.c                              |   14 +-
5313  drivers/net/can/flexcan.c                          |  189 +-
5314  drivers/net/can/mscan/mscan.c                      |   26 +-
5315  drivers/net/can/sja1000/Kconfig                    |   14 +
5316  drivers/net/can/sja1000/Makefile                   |    2 +
5317  drivers/net/can/sja1000/ems_pcmcia.c               |  331 +
5318  drivers/net/can/sja1000/peak_pci.c                 |  291 +
5319  drivers/net/cris/eth_v10.c                         |    2 +-
5320  drivers/net/dummy.c                                |    2 +-
5321  drivers/net/{ => ethernet/3com}/3c501.c            |    2 +-
5322  drivers/net/{ => ethernet/3com}/3c501.h            |    0
5323  drivers/net/{ => ethernet/3com}/3c509.c            |    2 +-
5324  drivers/net/{ => ethernet/3com}/3c515.c            |    2 +-
5325  drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c   |    2 +-
5326  drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c   |    2 +-
5327  drivers/net/{ => ethernet/3com}/3c59x.c            |   11 +-
5328  drivers/net/ethernet/3com/Kconfig                  |  122 +
5329  drivers/net/ethernet/3com/Makefile                 |   11 +
5330  drivers/net/{ => ethernet/3com}/typhoon.c          |    5 +-
5331  drivers/net/{ => ethernet/3com}/typhoon.h          |    0
5332  drivers/net/{ => ethernet/8390}/3c503.c            |    2 +-
5333  drivers/net/{ => ethernet/8390}/3c503.h            |    0
5334  drivers/net/{ => ethernet/8390}/8390.c             |    2 +-
5335  drivers/net/{ => ethernet/8390}/8390.h             |    0
5336  drivers/net/{ => ethernet/8390}/8390p.c            |    2 +-
5337  drivers/net/ethernet/8390/Kconfig                  |  337 +
5338  drivers/net/ethernet/8390/Makefile                 |   29 +
5339  drivers/net/{ => ethernet/8390}/ac3200.c           |    2 +-
5340  drivers/net/{ => ethernet/8390}/apne.c             |    0
5341  drivers/net/{ => ethernet/8390}/ax88796.c          |    2 +-
5342  drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c   |    4 +-
5343  drivers/net/{ => ethernet/8390}/e2100.c            |    2 +-
5344  drivers/net/{ => ethernet/8390}/es3210.c           |    0
5345  drivers/net/{arm => ethernet/8390}/etherh.c        |    4 +-
5346  drivers/net/{ => ethernet/8390}/hp-plus.c          |    2 +-
5347  drivers/net/{ => ethernet/8390}/hp.c               |    0
5348  drivers/net/{ => ethernet/8390}/hydra.c            |    2 +-
5349  drivers/net/{ => ethernet/8390}/lib8390.c          |    0
5350  drivers/net/{ => ethernet/8390}/lne390.c           |    0
5351  drivers/net/{ => ethernet/8390}/mac8390.c          |    2 +-
5352  drivers/net/{ => ethernet/8390}/ne-h8300.c         |    2 +-
5353  drivers/net/{ => ethernet/8390}/ne.c               |    0
5354  drivers/net/{ => ethernet/8390}/ne2.c              |    0
5355  drivers/net/{ => ethernet/8390}/ne2k-pci.c         |    2 +-
5356  drivers/net/{ => ethernet/8390}/ne3210.c           |    0
5357  drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c   |    4 +-
5358  drivers/net/{ => ethernet/8390}/smc-mca.c          |    2 +-
5359  drivers/net/{ => ethernet/8390}/smc-ultra.c        |    2 +-
5360  drivers/net/{ => ethernet/8390}/smc-ultra32.c      |    2 +-
5361  drivers/net/{ => ethernet/8390}/stnic.c            |    0
5362  drivers/net/{ => ethernet/8390}/wd.c               |    2 +-
5363  drivers/net/{ => ethernet/8390}/zorro8390.c        |    2 +-
5364  drivers/net/ethernet/Kconfig                       |  177 +
5365  drivers/net/ethernet/Makefile                      |   74 +
5366  drivers/net/ethernet/adaptec/Kconfig               |   36 +
5367  drivers/net/ethernet/adaptec/Makefile              |    5 +
5368  drivers/net/{ => ethernet/adaptec}/starfire.c      |    7 +-
5369  drivers/net/ethernet/adi/Kconfig                   |   69 +
5370  drivers/net/ethernet/adi/Makefile                  |    5 +
5371  drivers/net/{ => ethernet/adi}/bfin_mac.c          |    2 +-
5372  drivers/net/{ => ethernet/adi}/bfin_mac.h          |    0
5373  drivers/net/ethernet/aeroflex/Kconfig              |   11 +
5374  drivers/net/ethernet/aeroflex/Makefile             |    5 +
5375  drivers/net/{ => ethernet/aeroflex}/greth.c        |   14 +-
5376  drivers/net/{ => ethernet/aeroflex}/greth.h        |    0
5377  drivers/net/ethernet/alteon/Kconfig                |   48 +
5378  drivers/net/ethernet/alteon/Makefile               |    5 +
5379  drivers/net/{ => ethernet/alteon}/acenic.c         |    8 +-
5380  drivers/net/{ => ethernet/alteon}/acenic.h         |    0
5381  drivers/net/{ => ethernet/amd}/7990.c              |    0
5382  drivers/net/{ => ethernet/amd}/7990.h              |    0
5383  drivers/net/ethernet/amd/Kconfig                   |  195 +
5384  drivers/net/ethernet/amd/Makefile                  |   20 +
5385  drivers/net/{ => ethernet/amd}/a2065.c             |    2 +-
5386  drivers/net/{ => ethernet/amd}/a2065.h             |    0
5387  drivers/net/{arm => ethernet/amd}/am79c961a.c      |    2 +-
5388  drivers/net/{arm => ethernet/amd}/am79c961a.h      |    0
5389  drivers/net/{ => ethernet/amd}/amd8111e.c          |    2 +-
5390  drivers/net/{ => ethernet/amd}/amd8111e.h          |    0
5391  drivers/net/{ => ethernet/amd}/ariadne.c           |    2 +-
5392  drivers/net/{ => ethernet/amd}/ariadne.h           |    0
5393  drivers/net/{ => ethernet/amd}/atarilance.c        |    2 +-
5394  drivers/net/{ => ethernet/amd}/au1000_eth.c        |    2 +-
5395  drivers/net/{ => ethernet/amd}/au1000_eth.h        |    0
5396  drivers/net/{ => ethernet/amd}/declance.c          |    2 +-
5397  drivers/net/{ => ethernet/amd}/depca.c             |    2 +-
5398  drivers/net/{ => ethernet/amd}/depca.h             |    2 -
5399  drivers/net/{ => ethernet/amd}/hplance.c           |    2 +-
5400  drivers/net/{ => ethernet/amd}/hplance.h           |    0
5401  drivers/net/{ => ethernet/amd}/lance.c             |    2 +-
5402  drivers/net/{ => ethernet/amd}/mvme147.c           |    2 +-
5403  drivers/net/{ => ethernet/amd}/ni65.c              |    2 +-
5404  drivers/net/{ => ethernet/amd}/ni65.h              |    0
5405  drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c   |    2 +-
5406  drivers/net/{ => ethernet/amd}/pcnet32.c           |  204 +-
5407  drivers/net/{ => ethernet/amd}/sun3lance.c         |    2 +-
5408  drivers/net/{ => ethernet/amd}/sunlance.c          |    2 +-
5409  drivers/net/ethernet/apple/Kconfig                 |   97 +
5410  drivers/net/ethernet/apple/Makefile                |    9 +
5411  drivers/net/{ => ethernet/apple}/bmac.c            |    2 +-
5412  drivers/net/{ => ethernet/apple}/bmac.h            |    0
5413  drivers/net/{ => ethernet/apple}/cs89x0.c          |    2 +-
5414  drivers/net/{ => ethernet/apple}/cs89x0.h          |    0
5415  drivers/net/{ => ethernet/apple}/mac89x0.c         |    2 +-
5416  drivers/net/{ => ethernet/apple}/mace.c            |    2 +-
5417  drivers/net/{ => ethernet/apple}/mace.h            |    0
5418  drivers/net/{ => ethernet/apple}/macmace.c         |   11 +-
5419  drivers/net/ethernet/atheros/Kconfig               |   70 +
5420  drivers/net/ethernet/atheros/Makefile              |    8 +
5421  drivers/net/{ => ethernet/atheros}/atl1c/Makefile  |    0
5422  drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h   |    0
5423  .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c   |    0
5424  .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c    |    0
5425  .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h    |    0
5426  .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c  |   11 +-
5427  drivers/net/{ => ethernet/atheros}/atl1e/Makefile  |    0
5428  drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h   |    0
5429  .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c   |    0
5430  .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c    |    0
5431  .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h    |    0
5432  .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c  |   13 +-
5433  .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c |    0
5434  drivers/net/{ => ethernet/atheros}/atlx/Makefile   |    0
5435  drivers/net/{ => ethernet/atheros}/atlx/atl1.c     |    7 +-
5436  drivers/net/{ => ethernet/atheros}/atlx/atl1.h     |    0
5437  drivers/net/{ => ethernet/atheros}/atlx/atl2.c     |    2 +-
5438  drivers/net/{ => ethernet/atheros}/atlx/atl2.h     |    0
5439  drivers/net/{ => ethernet/atheros}/atlx/atlx.c     |    0
5440  drivers/net/{ => ethernet/atheros}/atlx/atlx.h     |    0
5441  drivers/net/ethernet/broadcom/Kconfig              |  122 +
5442  drivers/net/ethernet/broadcom/Makefile             |   11 +
5443  drivers/net/{ => ethernet/broadcom}/b44.c          |    2 +-
5444  drivers/net/{ => ethernet/broadcom}/b44.h          |    0
5445  drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c |    2 +-
5446  drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h |    0
5447  drivers/net/{ => ethernet/broadcom}/bnx2.c         |   77 +-
5448  drivers/net/{ => ethernet/broadcom}/bnx2.h         |    0
5449  drivers/net/{ => ethernet/broadcom}/bnx2_fw.h      |    0
5450  drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile |    0
5451  drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h  |   67 +-
5452  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c  |   53 +-
5453  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h  |   10 +-
5454  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c  |    5 +-
5455  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h  |    0
5456  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h |    0
5457  .../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c  |   25 +-
5458  .../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h  |    0
5459  .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h            |    0
5460  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h  |    2 +
5461  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h |    0
5462  .../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h |    0
5463  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c |  150 +-
5464  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h |    0
5465  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c |   79 +-
5466  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h  |    0
5467  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c   |   67 +-
5468  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h   |    0
5469  .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c    |   46 +-
5470  .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h    |    0
5471  drivers/net/{ => ethernet/broadcom}/cnic.c         |   35 +-
5472  drivers/net/{ => ethernet/broadcom}/cnic.h         |    4 +-
5473  drivers/net/{ => ethernet/broadcom}/cnic_defs.h    |    1 +
5474  drivers/net/{ => ethernet/broadcom}/cnic_if.h      |    0
5475  drivers/net/{ => ethernet/broadcom}/sb1250-mac.c   |    2 +-
5476  drivers/net/{ => ethernet/broadcom}/tg3.c          | 1553 +++---
5477  drivers/net/{ => ethernet/broadcom}/tg3.h          |    3 +
5478  drivers/net/ethernet/brocade/Kconfig               |   23 +
5479  drivers/net/ethernet/brocade/Makefile              |    5 +
5480  drivers/net/ethernet/brocade/bna/Kconfig           |   17 +
5481  drivers/net/{ => ethernet/brocade}/bna/Makefile    |    5 +-
5482  drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c   |    5 -
5483  drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h   |    0
5484  drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h    |    0
5485  drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h  |   64 +-
5486  .../net/{ => ethernet/brocade}/bna/bfa_defs_cna.h  |    8 +-
5487  .../{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h |   69 +-
5488  .../{ => ethernet/brocade}/bna/bfa_defs_status.h   |    0
5489  drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c   |  456 +-
5490  drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h   |   68 +-
5491  drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c      |  878 +++
5492  drivers/net/ethernet/brocade/bna/bfa_msgq.c        |  669 ++
5493  drivers/net/ethernet/brocade/bna/bfa_msgq.h        |  130 +
5494  drivers/net/{ => ethernet/brocade}/bna/bfi.h       |  257 +-
5495  drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h   |    0
5496  drivers/net/ethernet/brocade/bna/bfi_enet.h        |  901 +++
5497  drivers/net/ethernet/brocade/bna/bfi_reg.h         |  452 ++
5498  drivers/net/{ => ethernet/brocade}/bna/bna.h       |  351 +-
5499  drivers/net/ethernet/brocade/bna/bna_enet.c        | 2144 +++++++
5500  drivers/net/ethernet/brocade/bna/bna_hw_defs.h     |  422 ++
5501  drivers/net/ethernet/brocade/bna/bna_tx_rx.c       | 3798 ++++++++++++
5502  drivers/net/{ => ethernet/brocade}/bna/bna_types.h |  656 +--
5503  drivers/net/{ => ethernet/brocade}/bna/bnad.c      | 1176 +++--
5504  drivers/net/{ => ethernet/brocade}/bna/bnad.h      |  101 +-
5505  .../net/{ => ethernet/brocade}/bna/bnad_ethtool.c  |  486 +--
5506  drivers/net/{ => ethernet/brocade}/bna/cna.h       |   43 +-
5507  drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c |   48 +-
5508  drivers/net/ethernet/cadence/Kconfig               |   45 +
5509  drivers/net/ethernet/cadence/Makefile              |    6 +
5510  drivers/net/{arm => ethernet/cadence}/at91_ether.c |    2 +-
5511  drivers/net/{arm => ethernet/cadence}/at91_ether.h |    0
5512  drivers/net/{ => ethernet/cadence}/macb.c          |    2 +-
5513  drivers/net/{ => ethernet/cadence}/macb.h          |    0
5514  drivers/net/ethernet/chelsio/Kconfig               |  107 +
5515  drivers/net/ethernet/chelsio/Makefile              |    8 +
5516  .../{chelsio => ethernet/chelsio/cxgb}/Makefile    |    0
5517  .../{chelsio => ethernet/chelsio/cxgb}/common.h    |    0
5518  .../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h  |    0
5519  .../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h  |    0
5520  .../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c |    2 +-
5521  .../{chelsio => ethernet/chelsio/cxgb}/elmer0.h    |    0
5522  .../net/{chelsio => ethernet/chelsio/cxgb}/espi.c  |    0
5523  .../net/{chelsio => ethernet/chelsio/cxgb}/espi.h  |    0
5524  .../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h |    0
5525  .../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h  |    0
5526  .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c |    0
5527  .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h |    0
5528  .../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c |    0
5529  .../{chelsio => ethernet/chelsio/cxgb}/my3126.c    |    0
5530  .../{chelsio => ethernet/chelsio/cxgb}/pm3393.c    |    0
5531  .../net/{chelsio => ethernet/chelsio/cxgb}/regs.h  |    0
5532  .../net/{chelsio => ethernet/chelsio/cxgb}/sge.c   |    0
5533  .../net/{chelsio => ethernet/chelsio/cxgb}/sge.h   |    0
5534  .../net/{chelsio => ethernet/chelsio/cxgb}/subr.c  |    0
5535  .../chelsio/cxgb}/suni1x10gexp_regs.h              |    0
5536  .../net/{chelsio => ethernet/chelsio/cxgb}/tp.c    |    0
5537  .../net/{chelsio => ethernet/chelsio/cxgb}/tp.h    |    0
5538  .../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c   |    0
5539  .../chelsio/cxgb}/vsc7326_reg.h                    |    0
5540  drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile  |    0
5541  drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h |    0
5542  drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c |    0
5543  drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c  |    0
5544  drivers/net/{ => ethernet/chelsio}/cxgb3/common.h  |    0
5545  .../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h  |    0
5546  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h  |    0
5547  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h |    0
5548  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c  |    2 +-
5549  .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c   |    0
5550  .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h   |    0
5551  .../chelsio}/cxgb3/firmware_exports.h              |    0
5552  drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c     |    0
5553  drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h     |    0
5554  drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c     |    0
5555  drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h    |    0
5556  drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c     |    0
5557  .../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h    |    0
5558  drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h  |    0
5559  drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c   |    0
5560  drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h  |    0
5561  drivers/net/{ => ethernet/chelsio}/cxgb3/version.h |    0
5562  drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c |    0
5563  drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c   |    0
5564  drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile  |    0
5565  drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h   |    0
5566  .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c  |    5 +-
5567  .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h   |    0
5568  drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c     |    0
5569  drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h     |    0
5570  drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c     |    0
5571  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c   |    0
5572  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h   |    0
5573  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h  |    0
5574  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h |    0
5575  .../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h    |    0
5576  .../net/{ => ethernet/chelsio}/cxgb4vf/Makefile    |    0
5577  .../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h   |    0
5578  .../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c  |    2 +
5579  drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c   |    0
5580  .../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h   |    0
5581  .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h |    0
5582  .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c   |    0
5583  drivers/net/ethernet/cirrus/Kconfig                |   30 +
5584  drivers/net/ethernet/cirrus/Makefile               |    5 +
5585  drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c  |    0
5586  drivers/net/ethernet/cisco/Kconfig                 |   23 +
5587  drivers/net/ethernet/cisco/Makefile                |    5 +
5588  drivers/net/ethernet/cisco/enic/Kconfig            |    9 +
5589  drivers/net/{ => ethernet/cisco}/enic/Makefile     |    0
5590  drivers/net/{ => ethernet/cisco}/enic/cq_desc.h    |    0
5591  .../net/{ => ethernet/cisco}/enic/cq_enet_desc.h   |    0
5592  drivers/net/{ => ethernet/cisco}/enic/enic.h       |   15 +-
5593  drivers/net/{ => ethernet/cisco}/enic/enic_dev.c   |    0
5594  drivers/net/{ => ethernet/cisco}/enic/enic_dev.h   |   19 +
5595  drivers/net/{ => ethernet/cisco}/enic/enic_main.c  |  192 +-
5596  drivers/net/{ => ethernet/cisco}/enic/enic_pp.c    |  192 +-
5597  drivers/net/{ => ethernet/cisco}/enic/enic_pp.h    |   15 +-
5598  drivers/net/{ => ethernet/cisco}/enic/enic_res.c   |    0
5599  drivers/net/{ => ethernet/cisco}/enic/enic_res.h   |    0
5600  .../net/{ => ethernet/cisco}/enic/rq_enet_desc.h   |    0
5601  drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c    |    0
5602  drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h    |    0
5603  drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c   |   28 +-
5604  drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h   |    2 +
5605  .../net/{ => ethernet/cisco}/enic/vnic_devcmd.h    |    0
5606  drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h  |    0
5607  drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c  |    0
5608  drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h  |    0
5609  drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h   |    0
5610  .../net/{ => ethernet/cisco}/enic/vnic_resource.h  |    0
5611  drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c    |    0
5612  drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h    |    0
5613  drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h   |    0
5614  drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h |    0
5615  drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c   |    0
5616  drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h   |    0
5617  drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c    |    0
5618  drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h    |    0
5619  .../net/{ => ethernet/cisco}/enic/wq_enet_desc.h   |    0
5620  drivers/net/ethernet/davicom/Kconfig               |   24 +
5621  drivers/net/ethernet/davicom/Makefile              |    5 +
5622  drivers/net/{ => ethernet/davicom}/dm9000.c        |   13 +-
5623  drivers/net/{ => ethernet/davicom}/dm9000.h        |    0
5624  drivers/net/ethernet/dec/Kconfig                   |   37 +
5625  drivers/net/ethernet/dec/Makefile                  |    6 +
5626  drivers/net/{ => ethernet/dec}/ewrk3.c             |    2 +-
5627  drivers/net/{ => ethernet/dec}/ewrk3.h             |    0
5628  drivers/net/{ => ethernet/dec}/tulip/21142.c       |    0
5629  drivers/net/{ => ethernet/dec}/tulip/Kconfig       |   21 +-
5630  drivers/net/{ => ethernet/dec}/tulip/Makefile      |    0
5631  drivers/net/{ => ethernet/dec}/tulip/de2104x.c     |    2 +-
5632  drivers/net/{ => ethernet/dec}/tulip/de4x5.c       |    2 +-
5633  drivers/net/{ => ethernet/dec}/tulip/de4x5.h       |    2 -
5634  drivers/net/{ => ethernet/dec}/tulip/dmfe.c        |    2 +-
5635  drivers/net/{ => ethernet/dec}/tulip/eeprom.c      |    0
5636  drivers/net/{ => ethernet/dec}/tulip/interrupt.c   |    0
5637  drivers/net/{ => ethernet/dec}/tulip/media.c       |    0
5638  drivers/net/{ => ethernet/dec}/tulip/pnic.c        |    0
5639  drivers/net/{ => ethernet/dec}/tulip/pnic2.c       |    0
5640  drivers/net/{ => ethernet/dec}/tulip/timer.c       |    0
5641  drivers/net/{ => ethernet/dec}/tulip/tulip.h       |    0
5642  drivers/net/{ => ethernet/dec}/tulip/tulip_core.c  |    2 +-
5643  drivers/net/{ => ethernet/dec}/tulip/uli526x.c     |    2 +-
5644  drivers/net/{ => ethernet/dec}/tulip/winbond-840.c |    2 +-
5645  drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c   |    0
5646  drivers/net/ethernet/dlink/Kconfig                 |   86 +
5647  drivers/net/ethernet/dlink/Makefile                |    8 +
5648  drivers/net/{ => ethernet/dlink}/de600.c           |    0
5649  drivers/net/{ => ethernet/dlink}/de600.h           |    0
5650  drivers/net/{ => ethernet/dlink}/de620.c           |    2 +-
5651  drivers/net/{ => ethernet/dlink}/de620.h           |    0
5652  drivers/net/{ => ethernet/dlink}/dl2k.c            |  107 +-
5653  drivers/net/{ => ethernet/dlink}/dl2k.h            |  110 +-
5654  drivers/net/{ => ethernet/dlink}/sundance.c        |    2 +-
5655  drivers/net/{ => ethernet}/dnet.c                  |    0
5656  drivers/net/{ => ethernet}/dnet.h                  |    0
5657  drivers/net/ethernet/emulex/Kconfig                |   23 +
5658  drivers/net/ethernet/emulex/Makefile               |    5 +
5659  drivers/net/ethernet/emulex/benet/Kconfig          |    6 +
5660  drivers/net/{ => ethernet/emulex}/benet/Makefile   |    0
5661  drivers/net/{ => ethernet/emulex}/benet/be.h       |  132 +-
5662  drivers/net/{ => ethernet/emulex}/benet/be_cmds.c  |  241 +-
5663  drivers/net/{ => ethernet/emulex}/benet/be_cmds.h  |   94 +-
5664  .../net/{ => ethernet/emulex}/benet/be_ethtool.c   |  168 +-
5665  drivers/net/{ => ethernet/emulex}/benet/be_hw.h    |   21 +-
5666  drivers/net/{ => ethernet/emulex}/benet/be_main.c  |  550 +-
5667  drivers/net/{ => ethernet}/ethoc.c                 |    2 +-
5668  drivers/net/ethernet/faraday/Kconfig               |   40 +
5669  drivers/net/ethernet/faraday/Makefile              |    6 +
5670  drivers/net/{ => ethernet/faraday}/ftgmac100.c     |    0
5671  drivers/net/{ => ethernet/faraday}/ftgmac100.h     |    0
5672  drivers/net/{ => ethernet/faraday}/ftmac100.c      |    0
5673  drivers/net/{ => ethernet/faraday}/ftmac100.h      |    0
5674  drivers/net/{ => ethernet}/fealnx.c                |    2 +-
5675  drivers/net/ethernet/freescale/Kconfig             |   88 +
5676  drivers/net/ethernet/freescale/Makefile            |   18 +
5677  drivers/net/{ => ethernet/freescale}/fec.c         |  117 +-
5678  drivers/net/{ => ethernet/freescale}/fec.h         |    0
5679  drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c |    2 +-
5680  drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h |    0
5681  .../net/{ => ethernet/freescale}/fec_mpc52xx_phy.c |    0
5682  .../net/{ => ethernet/freescale}/fs_enet/Kconfig   |    3 +-
5683  .../net/{ => ethernet/freescale}/fs_enet/Makefile  |    0
5684  drivers/net/{ => ethernet/freescale}/fs_enet/fec.h |    0
5685  .../freescale}/fs_enet/fs_enet-main.c              |    2 +-
5686  .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h |    0
5687  .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c |    0
5688  .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c |    0
5689  .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c |    0
5690  .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c |    0
5691  .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c |    0
5692  drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c |    0
5693  drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h |    0
5694  drivers/net/{ => ethernet/freescale}/gianfar.c     |   12 +-
5695  drivers/net/{ => ethernet/freescale}/gianfar.h     |    0
5696  .../net/{ => ethernet/freescale}/gianfar_ethtool.c |    5 +-
5697  drivers/net/{ => ethernet/freescale}/gianfar_ptp.c |    0
5698  .../net/{ => ethernet/freescale}/gianfar_sysfs.c   |    0
5699  drivers/net/{ => ethernet/freescale}/ucc_geth.c    |   12 +-
5700  drivers/net/{ => ethernet/freescale}/ucc_geth.h    |    0
5701  .../{ => ethernet/freescale}/ucc_geth_ethtool.c    |    0
5702  drivers/net/ethernet/fujitsu/Kconfig               |   54 +
5703  drivers/net/ethernet/fujitsu/Makefile              |    7 +
5704  drivers/net/{ => ethernet/fujitsu}/at1700.c        |    2 +-
5705  drivers/net/{ => ethernet/fujitsu}/eth16i.c        |    2 +-
5706  .../net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c  |    2 +-
5707  drivers/net/ethernet/hp/Kconfig                    |   32 +
5708  drivers/net/ethernet/hp/Makefile                   |    5 +
5709  drivers/net/{ => ethernet/hp}/hp100.c              |    4 +-
5710  drivers/net/{ => ethernet/hp}/hp100.h              |    0
5711  drivers/net/{ => ethernet/i825xx}/3c505.c          |    2 +-
5712  drivers/net/{ => ethernet/i825xx}/3c505.h          |    0
5713  drivers/net/{ => ethernet/i825xx}/3c507.c          |    0
5714  drivers/net/{ => ethernet/i825xx}/3c523.c          |    2 +-
5715  drivers/net/{ => ethernet/i825xx}/3c523.h          |    0
5716  drivers/net/{ => ethernet/i825xx}/3c527.c          |    2 +-
5717  drivers/net/{ => ethernet/i825xx}/3c527.h          |    0
5718  drivers/net/{ => ethernet/i825xx}/82596.c          |    2 +-
5719  drivers/net/ethernet/i825xx/Kconfig                |  183 +
5720  drivers/net/ethernet/i825xx/Makefile               |   20 +
5721  drivers/net/{ => ethernet/i825xx}/eepro.c          |    2 +-
5722  drivers/net/{ => ethernet/i825xx}/eexpress.c       |    2 +-
5723  drivers/net/{ => ethernet/i825xx}/eexpress.h       |    0
5724  drivers/net/{arm => ethernet/i825xx}/ether1.c      |    2 +-
5725  drivers/net/{arm => ethernet/i825xx}/ether1.h      |    0
5726  drivers/net/{ => ethernet/i825xx}/lasi_82596.c     |    0
5727  drivers/net/{ => ethernet/i825xx}/lib82596.c       |    2 +-
5728  drivers/net/{ => ethernet/i825xx}/lp486e.c         |    2 +-
5729  drivers/net/{ => ethernet/i825xx}/ni52.c           |    2 +-
5730  drivers/net/{ => ethernet/i825xx}/ni52.h           |    0
5731  drivers/net/{ => ethernet/i825xx}/sni_82596.c      |    0
5732  drivers/net/{ => ethernet/i825xx}/sun3_82586.c     |    2 +-
5733  drivers/net/{ => ethernet/i825xx}/sun3_82586.h     |    0
5734  drivers/net/{ => ethernet/i825xx}/znet.c           |    2 +-
5735  drivers/net/ethernet/ibm/Kconfig                   |   48 +
5736  drivers/net/ethernet/ibm/Makefile                  |    8 +
5737  drivers/net/{ => ethernet/ibm}/ehea/Makefile       |    0
5738  drivers/net/{ => ethernet/ibm}/ehea/ehea.h         |    1 +
5739  drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c |    0
5740  drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h      |    0
5741  drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c    |   61 +-
5742  drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c    |    0
5743  drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h    |    0
5744  drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c     |    0
5745  drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h     |    0
5746  .../net/{ibm_newemac => ethernet/ibm/emac}/Kconfig |   40 +-
5747  drivers/net/ethernet/ibm/emac/Makefile             |   11 +
5748  .../net/{ibm_newemac => ethernet/ibm/emac}/core.c  |   16 +-
5749  .../net/{ibm_newemac => ethernet/ibm/emac}/core.h  |   16 +-
5750  .../net/{ibm_newemac => ethernet/ibm/emac}/debug.c |    0
5751  .../net/{ibm_newemac => ethernet/ibm/emac}/debug.h |    2 +-
5752  .../net/{ibm_newemac => ethernet/ibm/emac}/emac.h  |    0
5753  .../net/{ibm_newemac => ethernet/ibm/emac}/mal.c   |    6 +-
5754  .../net/{ibm_newemac => ethernet/ibm/emac}/mal.h   |    4 +-
5755  .../net/{ibm_newemac => ethernet/ibm/emac}/phy.c   |    0
5756  .../net/{ibm_newemac => ethernet/ibm/emac}/phy.h   |    0
5757  .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c |    0
5758  .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h |    4 +-
5759  .../net/{ibm_newemac => ethernet/ibm/emac}/tah.c   |    0
5760  .../net/{ibm_newemac => ethernet/ibm/emac}/tah.h   |    4 +-
5761  .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.c  |    0
5762  .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.h  |    4 +-
5763  drivers/net/{ => ethernet/ibm}/ibmveth.c           |    7 +-
5764  drivers/net/{ => ethernet/ibm}/ibmveth.h           |    0
5765  drivers/net/{ => ethernet/ibm}/iseries_veth.c      |    2 +-
5766  drivers/net/ethernet/icplus/Kconfig                |   14 +
5767  drivers/net/ethernet/icplus/Makefile               |    5 +
5768  drivers/net/{ => ethernet/icplus}/ipg.c            |  199 +-
5769  drivers/net/{ => ethernet/icplus}/ipg.h            |    0
5770  drivers/net/ethernet/intel/Kconfig                 |  222 +
5771  drivers/net/ethernet/intel/Makefile                |   12 +
5772  drivers/net/{ => ethernet/intel}/e100.c            |    2 +-
5773  drivers/net/{ => ethernet/intel}/e1000/Makefile    |    0
5774  drivers/net/{ => ethernet/intel}/e1000/e1000.h     |    2 +
5775  .../net/{ => ethernet/intel}/e1000/e1000_ethtool.c |    0
5776  drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c  |    0
5777  drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h  |    0
5778  .../net/{ => ethernet/intel}/e1000/e1000_main.c    |   42 +-
5779  .../net/{ => ethernet/intel}/e1000/e1000_osdep.h   |    0
5780  .../net/{ => ethernet/intel}/e1000/e1000_param.c   |    0
5781  .../intel/e1000e/80003es2lan.c}                    |    1 -
5782  drivers/net/{ => ethernet/intel}/e1000e/82571.c    |    5 -
5783  drivers/net/{ => ethernet/intel}/e1000e/Makefile   |    2 +-
5784  drivers/net/{ => ethernet/intel}/e1000e/defines.h  |    0
5785  drivers/net/{ => ethernet/intel}/e1000e/e1000.h    |    6 +-
5786  drivers/net/{ => ethernet/intel}/e1000e/ethtool.c  |   97 +-
5787  drivers/net/{ => ethernet/intel}/e1000e/hw.h       |    0
5788  drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c  |    5 -
5789  drivers/net/{ => ethernet/intel}/e1000e/lib.c      |    0
5790  drivers/net/{ => ethernet/intel}/e1000e/netdev.c   |  257 +-
5791  drivers/net/{ => ethernet/intel}/e1000e/param.c    |    0
5792  drivers/net/{ => ethernet/intel}/e1000e/phy.c      |    0
5793  drivers/net/{ => ethernet/intel}/igb/Makefile      |    0
5794  drivers/net/{ => ethernet/intel}/igb/e1000_82575.c |    0
5795  drivers/net/{ => ethernet/intel}/igb/e1000_82575.h |    0
5796  .../net/{ => ethernet/intel}/igb/e1000_defines.h   |    0
5797  drivers/net/{ => ethernet/intel}/igb/e1000_hw.h    |    0
5798  drivers/net/{ => ethernet/intel}/igb/e1000_mac.c   |    0
5799  drivers/net/{ => ethernet/intel}/igb/e1000_mac.h   |    0
5800  drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c   |    0
5801  drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h   |    0
5802  drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c   |    0
5803  drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h   |    0
5804  drivers/net/{ => ethernet/intel}/igb/e1000_phy.c   |    0
5805  drivers/net/{ => ethernet/intel}/igb/e1000_phy.h   |    0
5806  drivers/net/{ => ethernet/intel}/igb/e1000_regs.h  |    0
5807  drivers/net/{ => ethernet/intel}/igb/igb.h         |  117 +-
5808  drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c |   15 +-
5809  drivers/net/{ => ethernet/intel}/igb/igb_main.c    |  533 +-
5810  drivers/net/{ => ethernet/intel}/igbvf/Makefile    |    0
5811  drivers/net/{ => ethernet/intel}/igbvf/defines.h   |    0
5812  drivers/net/{ => ethernet/intel}/igbvf/ethtool.c   |    0
5813  drivers/net/{ => ethernet/intel}/igbvf/igbvf.h     |    0
5814  drivers/net/{ => ethernet/intel}/igbvf/mbx.c       |    0
5815  drivers/net/{ => ethernet/intel}/igbvf/mbx.h       |    0
5816  drivers/net/{ => ethernet/intel}/igbvf/netdev.c    |    7 +-
5817  drivers/net/{ => ethernet/intel}/igbvf/regs.h      |    0
5818  drivers/net/{ => ethernet/intel}/igbvf/vf.c        |    0
5819  drivers/net/{ => ethernet/intel}/igbvf/vf.h        |    0
5820  drivers/net/{ => ethernet/intel}/ixgb/Makefile     |    0
5821  drivers/net/{ => ethernet/intel}/ixgb/ixgb.h       |    2 +
5822  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c    |    2 +-
5823  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h    |    4 +-
5824  .../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c   |   98 +-
5825  drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c    |    2 +-
5826  drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h    |    4 +-
5827  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h   |    0
5828  drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c  |   74 +-
5829  drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h |    1 +
5830  drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c |   18 +-
5831  drivers/net/{ => ethernet/intel}/ixgbe/Makefile    |    0
5832  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h     |   77 +-
5833  .../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c   |   36 +-
5834  .../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c   |  140 +-
5835  .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c  |  166 +-
5836  .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h  |    2 +-
5837  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c |   36 +-
5838  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h |    4 +-
5839  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c   |    9 +-
5840  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h   |    0
5841  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c   |   12 +-
5842  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h   |    0
5843  .../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c  |  105 +-
5844  .../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c |  204 +-
5845  .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c    |   15 +-
5846  .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h    |    0
5847  .../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c    | 2057 +++----
5848  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c |    0
5849  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h |    0
5850  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c |    0
5851  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h |    0
5852  .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c   |  207 +-
5853  .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h   |    5 +
5854  .../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h    |   76 +-
5855  .../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c    |   91 +-
5856  drivers/net/{ => ethernet/intel}/ixgbevf/Makefile  |    0
5857  drivers/net/{ => ethernet/intel}/ixgbevf/defines.h |    0
5858  drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c |   46 -
5859  drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h |    8 +-
5860  .../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c    |  101 +-
5861  drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c     |    0
5862  drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h     |    0
5863  drivers/net/{ => ethernet/intel}/ixgbevf/regs.h    |    0
5864  drivers/net/{ => ethernet/intel}/ixgbevf/vf.c      |    0
5865  drivers/net/{ => ethernet/intel}/ixgbevf/vf.h      |    0
5866  drivers/net/{ => ethernet}/jme.c                   |    7 +-
5867  drivers/net/{ => ethernet}/jme.h                   |    1 -
5868  drivers/net/{ => ethernet}/korina.c                |    3 +-
5869  drivers/net/{ => ethernet}/lantiq_etop.c           |    2 +-
5870  drivers/net/ethernet/marvell/Kconfig               |  111 +
5871  drivers/net/ethernet/marvell/Makefile              |    8 +
5872  drivers/net/{ => ethernet/marvell}/mv643xx_eth.c   |   10 +-
5873  drivers/net/{ => ethernet/marvell}/pxa168_eth.c    |    0
5874  drivers/net/{ => ethernet/marvell}/skge.c          |   78 +-
5875  drivers/net/{ => ethernet/marvell}/skge.h          |    0
5876  drivers/net/{ => ethernet/marvell}/sky2.c          |  102 +-
5877  drivers/net/{ => ethernet/marvell}/sky2.h          |    0
5878  drivers/net/ethernet/mellanox/Kconfig              |   23 +
5879  drivers/net/ethernet/mellanox/Makefile             |    5 +
5880  drivers/net/ethernet/mellanox/mlx4/Kconfig         |   27 +
5881  drivers/net/{ => ethernet/mellanox}/mlx4/Makefile  |    0
5882  drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c   |    0
5883  drivers/net/{ => ethernet/mellanox}/mlx4/catas.c   |    0
5884  drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c     |    0
5885  drivers/net/{ => ethernet/mellanox}/mlx4/cq.c      |    0
5886  drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c   |    0
5887  .../net/{ => ethernet/mellanox}/mlx4/en_ethtool.c  |    0
5888  drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c |    0
5889  .../net/{ => ethernet/mellanox}/mlx4/en_netdev.c   |    2 +-
5890  drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c |    0
5891  drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h |    0
5892  .../{ => ethernet/mellanox}/mlx4/en_resources.c    |    0
5893  drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c   |    0
5894  .../net/{ => ethernet/mellanox}/mlx4/en_selftest.c |    0
5895  drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c   |    0
5896  drivers/net/{ => ethernet/mellanox}/mlx4/eq.c      |    0
5897  drivers/net/{ => ethernet/mellanox}/mlx4/fw.c      |    0
5898  drivers/net/{ => ethernet/mellanox}/mlx4/fw.h      |    0
5899  drivers/net/{ => ethernet/mellanox}/mlx4/icm.c     |    0
5900  drivers/net/{ => ethernet/mellanox}/mlx4/icm.h     |    0
5901  drivers/net/{ => ethernet/mellanox}/mlx4/intf.c    |    0
5902  drivers/net/{ => ethernet/mellanox}/mlx4/main.c    |    0
5903  drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c     |    0
5904  drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h    |    0
5905  drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h |    0
5906  drivers/net/{ => ethernet/mellanox}/mlx4/mr.c      |    0
5907  drivers/net/{ => ethernet/mellanox}/mlx4/pd.c      |    0
5908  drivers/net/{ => ethernet/mellanox}/mlx4/port.c    |    0
5909  drivers/net/{ => ethernet/mellanox}/mlx4/profile.c |    0
5910  drivers/net/{ => ethernet/mellanox}/mlx4/qp.c      |    0
5911  drivers/net/{ => ethernet/mellanox}/mlx4/reset.c   |    0
5912  drivers/net/{ => ethernet/mellanox}/mlx4/sense.c   |    0
5913  drivers/net/{ => ethernet/mellanox}/mlx4/srq.c     |    0
5914  drivers/net/ethernet/micrel/Kconfig                |   69 +
5915  drivers/net/ethernet/micrel/Makefile               |    9 +
5916  drivers/net/{arm => ethernet/micrel}/ks8695net.c   |    2 +-
5917  drivers/net/{arm => ethernet/micrel}/ks8695net.h   |    0
5918  drivers/net/{ => ethernet/micrel}/ks8842.c         |    0
5919  drivers/net/{ => ethernet/micrel}/ks8851.c         |    0
5920  drivers/net/{ => ethernet/micrel}/ks8851.h         |    0
5921  drivers/net/{ => ethernet/micrel}/ks8851_mll.c     |    0
5922  drivers/net/{ => ethernet/micrel}/ksz884x.c        |    3 +-
5923  drivers/net/ethernet/microchip/Kconfig             |   38 +
5924  drivers/net/ethernet/microchip/Makefile            |    5 +
5925  drivers/net/{ => ethernet/microchip}/enc28j60.c    |    2 +-
5926  drivers/net/{ => ethernet/microchip}/enc28j60_hw.h |    0
5927  drivers/net/{ => ethernet}/mipsnet.c               |    2 +-
5928  drivers/net/ethernet/myricom/Kconfig               |   47 +
5929  drivers/net/ethernet/myricom/Makefile              |    5 +
5930  .../net/{ => ethernet/myricom}/myri10ge/Makefile   |    0
5931  .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c |    2 +-
5932  .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h |    0
5933  .../myricom}/myri10ge/myri10ge_mcp_gen_header.h    |    0
5934  drivers/net/ethernet/natsemi/Kconfig               |   83 +
5935  drivers/net/ethernet/natsemi/Makefile              |   10 +
5936  drivers/net/{ => ethernet/natsemi}/ibmlana.c       |    2 +-
5937  drivers/net/{ => ethernet/natsemi}/ibmlana.h       |    0
5938  drivers/net/{ => ethernet/natsemi}/jazzsonic.c     |    2 +-
5939  drivers/net/{ => ethernet/natsemi}/macsonic.c      |   11 +-
5940  drivers/net/{ => ethernet/natsemi}/natsemi.c       |    2 +-
5941  drivers/net/{ => ethernet/natsemi}/ns83820.c       |    7 +-
5942  drivers/net/{ => ethernet/natsemi}/sonic.c         |    0
5943  drivers/net/{ => ethernet/natsemi}/sonic.h         |    0
5944  drivers/net/{ => ethernet/natsemi}/xtsonic.c       |    2 +-
5945  drivers/net/ethernet/neterion/Kconfig              |   55 +
5946  drivers/net/ethernet/neterion/Makefile             |    6 +
5947  drivers/net/{ => ethernet/neterion}/s2io-regs.h    |    0
5948  drivers/net/{ => ethernet/neterion}/s2io.c         |   10 +-
5949  drivers/net/{ => ethernet/neterion}/s2io.h         |    0
5950  drivers/net/{ => ethernet/neterion}/vxge/Makefile  |    0
5951  .../net/{ => ethernet/neterion}/vxge/vxge-config.c |   11 +-
5952  .../net/{ => ethernet/neterion}/vxge/vxge-config.h |    4 +-
5953  .../{ => ethernet/neterion}/vxge/vxge-ethtool.c    |    0
5954  .../{ => ethernet/neterion}/vxge/vxge-ethtool.h    |    0
5955  .../net/{ => ethernet/neterion}/vxge/vxge-main.c   |   12 +-
5956  .../net/{ => ethernet/neterion}/vxge/vxge-main.h   |    0
5957  .../net/{ => ethernet/neterion}/vxge/vxge-reg.h    |    0
5958  .../{ => ethernet/neterion}/vxge/vxge-traffic.c    |   12 +-
5959  .../{ => ethernet/neterion}/vxge/vxge-traffic.h    |    0
5960  .../{ => ethernet/neterion}/vxge/vxge-version.h    |    0
5961  drivers/net/{ => ethernet}/netx-eth.c              |    2 +-
5962  drivers/net/ethernet/nuvoton/Kconfig               |   31 +
5963  drivers/net/ethernet/nuvoton/Makefile              |    5 +
5964  .../net/{arm => ethernet/nuvoton}/w90p910_ether.c  |    2 +-
5965  drivers/net/ethernet/nvidia/Kconfig                |   32 +
5966  drivers/net/ethernet/nvidia/Makefile               |    5 +
5967  drivers/net/{ => ethernet/nvidia}/forcedeth.c      |   18 +-
5968  drivers/net/{ => ethernet}/octeon/Kconfig          |    6 +-
5969  drivers/net/ethernet/octeon/Makefile               |    5 +
5970  drivers/net/{ => ethernet}/octeon/octeon_mgmt.c    |    4 +-
5971  drivers/net/ethernet/oki-semi/Kconfig              |   23 +
5972  drivers/net/ethernet/oki-semi/Makefile             |    5 +
5973  drivers/net/ethernet/oki-semi/pch_gbe/Kconfig      |   22 +
5974  .../net/{ => ethernet/oki-semi}/pch_gbe/Makefile   |    0
5975  .../net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h  |    0
5976  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c  |    0
5977  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h  |    0
5978  .../oki-semi}/pch_gbe/pch_gbe_ethtool.c            |    0
5979  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c |    3 +-
5980  .../oki-semi}/pch_gbe/pch_gbe_param.c              |    0
5981  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c  |    0
5982  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h  |    0
5983  drivers/net/ethernet/packetengines/Kconfig         |   47 +
5984  drivers/net/ethernet/packetengines/Makefile        |    6 +
5985  drivers/net/{ => ethernet/packetengines}/hamachi.c |    2 +-
5986  .../net/{ => ethernet/packetengines}/yellowfin.c   |    2 +-
5987  drivers/net/ethernet/pasemi/Kconfig                |   30 +
5988  drivers/net/ethernet/pasemi/Makefile               |    5 +
5989  drivers/net/{ => ethernet/pasemi}/pasemi_mac.c     |    7 +-
5990  drivers/net/{ => ethernet/pasemi}/pasemi_mac.h     |    0
5991  .../net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c |    0
5992  drivers/net/ethernet/qlogic/Kconfig                |   54 +
5993  drivers/net/ethernet/qlogic/Makefile               |    8 +
5994  drivers/net/{ => ethernet/qlogic}/netxen/Makefile  |    0
5995  .../net/{ => ethernet/qlogic}/netxen/netxen_nic.h  |   10 +-
5996  .../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c  |    0
5997  .../qlogic}/netxen/netxen_nic_ethtool.c            |    0
5998  .../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h  |    0
5999  .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c   |    0
6000  .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h   |    0
6001  .../{ => ethernet/qlogic}/netxen/netxen_nic_init.c |    8 +-
6002  .../{ => ethernet/qlogic}/netxen/netxen_nic_main.c |  172 +-
6003  drivers/net/{ => ethernet/qlogic}/qla3xxx.c        |    8 +-
6004  drivers/net/{ => ethernet/qlogic}/qla3xxx.h        |    0
6005  drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile  |    0
6006  drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h  |   32 +-
6007  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c  |  312 +-
6008  .../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c  |   53 +-
6009  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h  |    4 +-
6010  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c   |    4 +-
6011  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c |   21 +-
6012  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c |  179 +-
6013  drivers/net/{ => ethernet/qlogic}/qlge/Makefile    |    0
6014  drivers/net/{ => ethernet/qlogic}/qlge/qlge.h      |    0
6015  drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c  |    0
6016  .../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c  |    0
6017  drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c |   20 +-
6018  drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c  |    0
6019  drivers/net/ethernet/racal/Kconfig                 |   33 +
6020  drivers/net/ethernet/racal/Makefile                |    5 +
6021  drivers/net/{ => ethernet/racal}/ni5010.c          |    2 +-
6022  drivers/net/{ => ethernet/racal}/ni5010.h          |    0
6023  drivers/net/ethernet/rdc/Kconfig                   |   35 +
6024  drivers/net/ethernet/rdc/Makefile                  |    5 +
6025  drivers/net/{ => ethernet/rdc}/r6040.c             |    2 +-
6026  drivers/net/{ => ethernet/realtek}/8139cp.c        |    5 +-
6027  drivers/net/{ => ethernet/realtek}/8139too.c       |    2 +-
6028  drivers/net/ethernet/realtek/Kconfig               |  130 +
6029  drivers/net/ethernet/realtek/Makefile              |    9 +
6030  drivers/net/{ => ethernet/realtek}/atp.c           |    2 +-
6031  drivers/net/{ => ethernet/realtek}/atp.h           |    0
6032  drivers/net/{ => ethernet/realtek}/r8169.c         |  491 ++-
6033  drivers/net/{ => ethernet/realtek}/sc92031.c       |   10 +-
6034  drivers/net/ethernet/renesas/Kconfig               |   19 +
6035  drivers/net/ethernet/renesas/Makefile              |    5 +
6036  drivers/net/{ => ethernet/renesas}/sh_eth.c        |   44 +-
6037  drivers/net/{ => ethernet/renesas}/sh_eth.h        |   17 +-
6038  drivers/net/{ => ethernet}/s6gmac.c                |    0
6039  drivers/net/ethernet/seeq/Kconfig                  |   47 +
6040  drivers/net/ethernet/seeq/Makefile                 |    7 +
6041  drivers/net/{arm => ethernet/seeq}/ether3.c        |    2 +-
6042  drivers/net/{arm => ethernet/seeq}/ether3.h        |    0
6043  drivers/net/{ => ethernet/seeq}/seeq8005.c         |    2 +-
6044  drivers/net/{ => ethernet/seeq}/seeq8005.h         |    0
6045  drivers/net/{ => ethernet/seeq}/sgiseeq.c          |    2 +-
6046  drivers/net/{ => ethernet/seeq}/sgiseeq.h          |    0
6047  drivers/net/{ => ethernet}/sfc/Kconfig             |    4 +-
6048  drivers/net/{ => ethernet}/sfc/Makefile            |    0
6049  drivers/net/{ => ethernet}/sfc/bitfield.h          |    0
6050  drivers/net/{ => ethernet}/sfc/efx.c               |   46 +-
6051  drivers/net/{ => ethernet}/sfc/efx.h               |    7 +-
6052  drivers/net/{ => ethernet}/sfc/enum.h              |    0
6053  drivers/net/{ => ethernet}/sfc/ethtool.c           |  107 +-
6054  drivers/net/{ => ethernet}/sfc/falcon.c            |    2 +
6055  drivers/net/{ => ethernet}/sfc/falcon_boards.c     |    0
6056  drivers/net/{ => ethernet}/sfc/falcon_xmac.c       |    0
6057  drivers/net/{ => ethernet}/sfc/filter.c            |    0
6058  drivers/net/{ => ethernet}/sfc/filter.h            |    0
6059  drivers/net/{ => ethernet}/sfc/io.h                |    0
6060  drivers/net/{ => ethernet}/sfc/mac.h               |    0
6061  drivers/net/{ => ethernet}/sfc/mcdi.c              |    0
6062  drivers/net/{ => ethernet}/sfc/mcdi.h              |    0
6063  drivers/net/{ => ethernet}/sfc/mcdi_mac.c          |    0
6064  drivers/net/{ => ethernet}/sfc/mcdi_pcol.h         |    0
6065  drivers/net/{ => ethernet}/sfc/mcdi_phy.c          |    0
6066  drivers/net/{ => ethernet}/sfc/mdio_10g.c          |    0
6067  drivers/net/{ => ethernet}/sfc/mdio_10g.h          |    0
6068  drivers/net/{ => ethernet}/sfc/mtd.c               |    0
6069  drivers/net/{ => ethernet}/sfc/net_driver.h        |    0
6070  drivers/net/{ => ethernet}/sfc/nic.c               |    0
6071  drivers/net/{ => ethernet}/sfc/nic.h               |    3 +-
6072  drivers/net/{ => ethernet}/sfc/phy.h               |    0
6073  drivers/net/{ => ethernet}/sfc/qt202x_phy.c        |    0
6074  drivers/net/{ => ethernet}/sfc/regs.h              |    0
6075  drivers/net/{ => ethernet}/sfc/rx.c                |    2 +-
6076  drivers/net/{ => ethernet}/sfc/selftest.c          |    0
6077  drivers/net/{ => ethernet}/sfc/selftest.h          |    0
6078  drivers/net/{ => ethernet}/sfc/siena.c             |    2 +
6079  drivers/net/{ => ethernet}/sfc/spi.h               |    0
6080  drivers/net/{ => ethernet}/sfc/tenxpress.c         |    0
6081  drivers/net/{ => ethernet}/sfc/tx.c                |   13 +-
6082  drivers/net/{ => ethernet}/sfc/txc43128_phy.c      |    0
6083  drivers/net/{ => ethernet}/sfc/workarounds.h       |    0
6084  drivers/net/ethernet/sgi/Kconfig                   |   36 +
6085  drivers/net/ethernet/sgi/Makefile                  |    6 +
6086  drivers/net/{ => ethernet/sgi}/ioc3-eth.c          |    2 +-
6087  drivers/net/{ => ethernet/sgi}/meth.c              |    0
6088  drivers/net/{ => ethernet/sgi}/meth.h              |    0
6089  drivers/net/ethernet/sis/Kconfig                   |   53 +
6090  drivers/net/ethernet/sis/Makefile                  |    6 +
6091  drivers/net/{ => ethernet/sis}/sis190.c            |    2 +-
6092  drivers/net/{ => ethernet/sis}/sis900.c            |    2 +-
6093  drivers/net/{ => ethernet/sis}/sis900.h            |    0
6094  drivers/net/ethernet/smsc/Kconfig                  |  137 +
6095  drivers/net/ethernet/smsc/Makefile                 |   11 +
6096  drivers/net/{ => ethernet/smsc}/epic100.c          |    2 +-
6097  drivers/net/{ => ethernet/smsc}/smc911x.c          |    2 +-
6098  drivers/net/{ => ethernet/smsc}/smc911x.h          |    0
6099  drivers/net/{ => ethernet/smsc}/smc9194.c          |    2 +-
6100  drivers/net/{ => ethernet/smsc}/smc9194.h          |    0
6101  .../net/{pcmcia => ethernet/smsc}/smc91c92_cs.c    |    2 +-
6102  drivers/net/{ => ethernet/smsc}/smc91x.c           |    2 +-
6103  drivers/net/{ => ethernet/smsc}/smc91x.h           |    0
6104  drivers/net/{ => ethernet/smsc}/smsc911x.c         |   89 +-
6105  drivers/net/{ => ethernet/smsc}/smsc911x.h         |    0
6106  drivers/net/{ => ethernet/smsc}/smsc9420.c         |    2 +-
6107  drivers/net/{ => ethernet/smsc}/smsc9420.h         |    0
6108  drivers/net/ethernet/stmicro/Kconfig               |   23 +
6109  drivers/net/ethernet/stmicro/Makefile              |    5 +
6110  drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig  |   23 +-
6111  drivers/net/{ => ethernet/stmicro}/stmmac/Makefile |    3 +-
6112  drivers/net/{ => ethernet/stmicro}/stmmac/common.h |   46 +-
6113  drivers/net/{ => ethernet/stmicro}/stmmac/descs.h  |    0
6114  .../net/{ => ethernet/stmicro}/stmmac/dwmac100.h   |    0
6115  .../net/{ => ethernet/stmicro}/stmmac/dwmac1000.h  |    0
6116  .../{ => ethernet/stmicro}/stmmac/dwmac1000_core.c |   11 +-
6117  .../{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c  |   14 +-
6118  .../{ => ethernet/stmicro}/stmmac/dwmac100_core.c  |   12 +-
6119  .../{ => ethernet/stmicro}/stmmac/dwmac100_dma.c   |    0
6120  .../net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h  |    1 +
6121  .../net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c  |    0
6122  .../net/{ => ethernet/stmicro}/stmmac/enh_desc.c   |    0
6123  drivers/net/ethernet/stmicro/stmmac/mmc.h          |  131 +
6124  drivers/net/ethernet/stmicro/stmmac/mmc_core.c     |  265 +
6125  .../net/{ => ethernet/stmicro}/stmmac/norm_desc.c  |    0
6126  drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h |    5 +-
6127  .../{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c |  144 +-
6128  .../{ => ethernet/stmicro}/stmmac/stmmac_main.c    |  305 +-
6129  .../{ => ethernet/stmicro}/stmmac/stmmac_mdio.c    |    0
6130  .../{ => ethernet/stmicro}/stmmac/stmmac_timer.c   |    0
6131  .../{ => ethernet/stmicro}/stmmac/stmmac_timer.h   |    0
6132  drivers/net/ethernet/sun/Kconfig                   |   88 +
6133  drivers/net/ethernet/sun/Makefile                  |   11 +
6134  drivers/net/{ => ethernet/sun}/cassini.c           |   17 +-
6135  drivers/net/{ => ethernet/sun}/cassini.h           |    0
6136  drivers/net/{ => ethernet/sun}/niu.c               |   18 +-
6137  drivers/net/{ => ethernet/sun}/niu.h               |    0
6138  drivers/net/{ => ethernet/sun}/sunbmac.c           |   33 +-
6139  drivers/net/{ => ethernet/sun}/sunbmac.h           |   17 -
6140  drivers/net/{ => ethernet/sun}/sungem.c            |   12 +-
6141  drivers/net/{ => ethernet/sun}/sungem.h            |    0
6142  drivers/net/{ => ethernet/sun}/sunhme.c            |    7 +-
6143  drivers/net/{ => ethernet/sun}/sunhme.h            |    0
6144  drivers/net/{ => ethernet/sun}/sunqe.c             |    2 +-
6145  drivers/net/{ => ethernet/sun}/sunqe.h             |    0
6146  drivers/net/{ => ethernet/sun}/sunvnet.c           |    2 +-
6147  drivers/net/{ => ethernet/sun}/sunvnet.h           |    0
6148  drivers/net/ethernet/tehuti/Kconfig                |   27 +
6149  drivers/net/ethernet/tehuti/Makefile               |    5 +
6150  drivers/net/{ => ethernet/tehuti}/tehuti.c         |   16 +-
6151  drivers/net/{ => ethernet/tehuti}/tehuti.h         |    0
6152  drivers/net/ethernet/ti/Kconfig                    |   77 +
6153  drivers/net/ethernet/ti/Makefile                   |    9 +
6154  drivers/net/{ => ethernet/ti}/cpmac.c              |    2 +-
6155  drivers/net/{ => ethernet/ti}/davinci_cpdma.c      |    0
6156  drivers/net/{ => ethernet/ti}/davinci_cpdma.h      |    0
6157  drivers/net/{ => ethernet/ti}/davinci_emac.c       |    2 +-
6158  drivers/net/{ => ethernet/ti}/davinci_mdio.c       |    0
6159  drivers/net/{ => ethernet/ti}/tlan.c               |    2 +-
6160  drivers/net/{ => ethernet/ti}/tlan.h               |    0
6161  drivers/net/ethernet/tile/Kconfig                  |   15 +
6162  drivers/net/{ => ethernet}/tile/Makefile           |    0
6163  drivers/net/{ => ethernet}/tile/tilepro.c          |    0
6164  drivers/net/ethernet/toshiba/Kconfig               |   57 +
6165  drivers/net/ethernet/toshiba/Makefile              |   10 +
6166  drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c |    2 +-
6167  drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h |    0
6168  .../{ => ethernet/toshiba}/ps3_gelic_wireless.c    |    2 +-
6169  .../{ => ethernet/toshiba}/ps3_gelic_wireless.h    |    0
6170  drivers/net/{ => ethernet/toshiba}/spider_net.c    |    6 +-
6171  drivers/net/{ => ethernet/toshiba}/spider_net.h    |    2 +-
6172  .../{ => ethernet/toshiba}/spider_net_ethtool.c    |    0
6173  drivers/net/{ => ethernet/toshiba}/tc35815.c       |    2 +-
6174  drivers/net/ethernet/tundra/Kconfig                |   29 +
6175  drivers/net/ethernet/tundra/Makefile               |    5 +
6176  drivers/net/{ => ethernet/tundra}/tsi108_eth.c     |    9 +-
6177  drivers/net/{ => ethernet/tundra}/tsi108_eth.h     |    0
6178  drivers/net/ethernet/via/Kconfig                   |   59 +
6179  drivers/net/ethernet/via/Makefile                  |    6 +
6180  drivers/net/{ => ethernet/via}/via-rhine.c         |    2 +-
6181  drivers/net/{ => ethernet/via}/via-velocity.c      |  155 +-
6182  drivers/net/{ => ethernet/via}/via-velocity.h      |    0
6183  drivers/net/ethernet/xilinx/Kconfig                |   36 +
6184  drivers/net/ethernet/xilinx/Makefile               |    7 +
6185  drivers/net/{ => ethernet/xilinx}/ll_temac.h       |    0
6186  drivers/net/{ => ethernet/xilinx}/ll_temac_main.c  |    1 -
6187  drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c  |    0
6188  .../net/{ => ethernet/xilinx}/xilinx_emaclite.c    |    0
6189  drivers/net/ethernet/xircom/Kconfig                |   31 +
6190  drivers/net/ethernet/xircom/Makefile               |    5 +
6191  .../net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c   |    2 +-
6192  drivers/net/ethernet/xscale/Kconfig                |   32 +
6193  drivers/net/ethernet/xscale/Makefile               |    6 +
6194  drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig  |    2 +-
6195  drivers/net/{ => ethernet/xscale}/ixp2000/Makefile |    0
6196  drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c  |    0
6197  drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h  |    0
6198  .../net/{ => ethernet/xscale}/ixp2000/enp2611.c    |    0
6199  .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.c    |    0
6200  .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.h    |    0
6201  .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc    |    0
6202  .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode |    0
6203  .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc    |    0
6204  .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode |    0
6205  drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c |    0
6206  drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h |    0
6207  .../{ => ethernet/xscale}/ixp2000/ixpdev_priv.h    |    0
6208  drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c |    0
6209  drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h |    0
6210  drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c  |    2 +-
6211  drivers/net/fddi/Kconfig                           |   77 +
6212  drivers/net/fddi/Makefile                          |    6 +
6213  drivers/net/{ => fddi}/defxx.c                     |    2 +-
6214  drivers/net/{ => fddi}/defxx.h                     |    0
6215  drivers/net/{ => fddi}/skfp/Makefile               |    0
6216  drivers/net/{ => fddi}/skfp/cfm.c                  |    0
6217  drivers/net/{ => fddi}/skfp/drvfbi.c               |    0
6218  drivers/net/{ => fddi}/skfp/ecm.c                  |    0
6219  drivers/net/{ => fddi}/skfp/ess.c                  |    0
6220  drivers/net/{ => fddi}/skfp/fplustm.c              |    0
6221  drivers/net/{ => fddi}/skfp/h/cmtdef.h             |    4 +-
6222  drivers/net/{ => fddi}/skfp/h/fddi.h               |    0
6223  drivers/net/{ => fddi}/skfp/h/fddimib.h            |    0
6224  drivers/net/{ => fddi}/skfp/h/fplustm.h            |    0
6225  drivers/net/{ => fddi}/skfp/h/hwmtm.h              |    2 +-
6226  drivers/net/{ => fddi}/skfp/h/mbuf.h               |    0
6227  drivers/net/{ => fddi}/skfp/h/osdef1st.h           |    0
6228  drivers/net/{ => fddi}/skfp/h/sba.h                |    4 +-
6229  drivers/net/{ => fddi}/skfp/h/sba_def.h            |    0
6230  drivers/net/{ => fddi}/skfp/h/skfbi.h              |    0
6231  drivers/net/{ => fddi}/skfp/h/skfbiinc.h           |    2 +-
6232  drivers/net/{ => fddi}/skfp/h/smc.h                |   14 +-
6233  drivers/net/{ => fddi}/skfp/h/smt.h                |    0
6234  drivers/net/{ => fddi}/skfp/h/smt_p.h              |    0
6235  drivers/net/{ => fddi}/skfp/h/smtstate.h           |    0
6236  drivers/net/{ => fddi}/skfp/h/supern_2.h           |    0
6237  drivers/net/{ => fddi}/skfp/h/targethw.h           |    6 +-
6238  drivers/net/{ => fddi}/skfp/h/targetos.h           |    2 +-
6239  drivers/net/{ => fddi}/skfp/h/types.h              |    0
6240  drivers/net/{ => fddi}/skfp/hwmtm.c                |    0
6241  drivers/net/{ => fddi}/skfp/hwt.c                  |    0
6242  drivers/net/{ => fddi}/skfp/pcmplc.c               |    0
6243  drivers/net/{ => fddi}/skfp/pmf.c                  |    0
6244  drivers/net/{ => fddi}/skfp/queue.c                |    0
6245  drivers/net/{ => fddi}/skfp/rmt.c                  |    0
6246  drivers/net/{ => fddi}/skfp/skfddi.c               |    2 +-
6247  drivers/net/{ => fddi}/skfp/smt.c                  |    0
6248  drivers/net/{ => fddi}/skfp/smtdef.c               |    0
6249  drivers/net/{ => fddi}/skfp/smtinit.c              |    0
6250  drivers/net/{ => fddi}/skfp/smttimer.c             |    0
6251  drivers/net/{ => fddi}/skfp/srf.c                  |    0
6252  drivers/net/hippi/Kconfig                          |   39 +
6253  drivers/net/hippi/Makefile                         |    5 +
6254  drivers/net/{ => hippi}/rrunner.c                  |    0
6255  drivers/net/{ => hippi}/rrunner.h                  |    0
6256  drivers/net/ibm_newemac/Makefile                   |   11 -
6257  drivers/net/irda/sh_irda.c                         |  124 +-
6258  drivers/net/macvlan.c                              |    5 +-
6259  drivers/net/macvtap.c                              |   12 +-
6260  drivers/net/octeon/Makefile                        |    2 -
6261  drivers/net/pci-skeleton.c                         | 1923 ------
6262  drivers/net/pcmcia/Kconfig                         |  123 -
6263  drivers/net/pcmcia/Makefile                        |   16 -
6264  drivers/net/phy/Kconfig                            |    2 +-
6265  drivers/net/phy/dp83640.c                          |  205 +-
6266  drivers/net/phy/icplus.c                           |   93 +-
6267  drivers/net/phy/phy_device.c                       |    4 +-
6268  drivers/net/plip/Kconfig                           |   38 +
6269  drivers/net/plip/Makefile                          |    5 +
6270  drivers/net/{ => plip}/plip.c                      |    0
6271  drivers/net/ppp/Kconfig                            |  175 +
6272  drivers/net/ppp/Makefile                           |   13 +
6273  drivers/net/{ => ppp}/bsd_comp.c                   |    0
6274  drivers/net/{ => ppp}/ppp_async.c                  |    0
6275  drivers/net/{ => ppp}/ppp_deflate.c                |    0
6276  drivers/net/{ => ppp}/ppp_generic.c                |    0
6277  drivers/net/{ => ppp}/ppp_mppe.c                   |    0
6278  drivers/net/{ => ppp}/ppp_mppe.h                   |    0
6279  drivers/net/{ => ppp}/ppp_synctty.c                |    0
6280  drivers/net/{ => ppp}/pppoe.c                      |    0
6281  drivers/net/{ => ppp}/pppox.c                      |    0
6282  drivers/net/{ => ppp}/pptp.c                       |    0
6283  drivers/net/slip/Kconfig                           |   79 +
6284  drivers/net/slip/Makefile                          |    6 +
6285  drivers/net/{ => slip}/slhc.c                      |    0
6286  drivers/net/{ => slip}/slip.c                      |   29 +-
6287  drivers/net/{ => slip}/slip.h                      |    9 -
6288  drivers/net/sungem_phy.c                           |    7 +-
6289  drivers/net/tokenring/3c359.c                      |    2 +-
6290  drivers/net/tokenring/Kconfig                      |   15 +-
6291  drivers/net/tokenring/Makefile                     |   21 +-
6292  drivers/net/tokenring/ibmtr.c                      |    2 +-
6293  drivers/net/{pcmcia => tokenring}/ibmtr_cs.c       |    2 +-
6294  drivers/net/tokenring/lanstreamer.c                |    2 +-
6295  drivers/net/tokenring/olympic.c                    |    2 +-
6296  drivers/net/tokenring/smctr.c                      |    2 +-
6297  drivers/net/tokenring/tms380tr.c                   |    2 +-
6298  drivers/net/tun.c                                  |    2 +-
6299  drivers/net/usb/Kconfig                            |    3 +
6300  drivers/net/usb/asix.c                             |  409 +-
6301  drivers/net/usb/catc.c                             |    2 +-
6302  drivers/net/usb/dm9601.c                           |    2 +-
6303  drivers/net/usb/int51x1.c                          |    2 +-
6304  drivers/net/usb/kaweth.c                           |    2 +-
6305  drivers/net/usb/lg-vl600.c                         |   19 +
6306  drivers/net/usb/mcs7830.c                          |    2 +-
6307  drivers/net/usb/pegasus.c                          |    2 +-
6308  drivers/net/usb/rtl8150.c                          |  113 +-
6309  drivers/net/usb/smsc75xx.c                         |    2 +-
6310  drivers/net/usb/smsc95xx.c                         |    2 +-
6311  drivers/net/usb/usbnet.c                           |    6 +
6312  drivers/net/virtio_net.c                           |    3 +-
6313  drivers/net/vmxnet3/vmxnet3_drv.c                  |   10 +-
6314  drivers/net/vmxnet3/vmxnet3_ethtool.c              |    2 +-
6315  drivers/net/wan/hdlc_ppp.c                         |   14 +-
6316  drivers/net/wan/hdlc_x25.c                         |   16 +-
6317  drivers/net/wan/lapbether.c                        |    3 +-
6318  drivers/net/wan/sbni.c                             |    2 +-
6319  drivers/net/wan/x25_asy.c                          |    3 +-
6320  drivers/net/wireless/adm8211.c                     |    3 +-
6321  drivers/net/wireless/airo.c                        |    4 +-
6322  drivers/net/wireless/ath/Kconfig                   |    1 +
6323  drivers/net/wireless/ath/Makefile                  |    1 +
6324  drivers/net/wireless/ath/ath.h                     |   51 +-
6325  drivers/net/wireless/ath/ath5k/ahb.c               |    4 +-
6326  drivers/net/wireless/ath/ath5k/ani.c               |    1 -
6327  drivers/net/wireless/ath/ath5k/ani.h               |    4 +
6328  drivers/net/wireless/ath/ath5k/ath5k.h             |   98 +-
6329  drivers/net/wireless/ath/ath5k/attach.c            |   18 +-
6330  drivers/net/wireless/ath/ath5k/base.c              |   31 +-
6331  drivers/net/wireless/ath/ath5k/base.h              |   55 +-
6332  drivers/net/wireless/ath/ath5k/caps.c              |    2 +-
6333  drivers/net/wireless/ath/ath5k/debug.c             |   15 +-
6334  drivers/net/wireless/ath/ath5k/desc.c              |    1 -
6335  drivers/net/wireless/ath/ath5k/dma.c               |    1 -
6336  drivers/net/wireless/ath/ath5k/eeprom.c            |   10 +-
6337  drivers/net/wireless/ath/ath5k/gpio.c              |    1 -
6338  drivers/net/wireless/ath/ath5k/initvals.c          |    1 -
6339  drivers/net/wireless/ath/ath5k/led.c               |    1 -
6340  drivers/net/wireless/ath/ath5k/mac80211-ops.c      |   11 +-
6341  drivers/net/wireless/ath/ath5k/pci.c               |    4 +-
6342  drivers/net/wireless/ath/ath5k/pcu.c               |    5 +-
6343  drivers/net/wireless/ath/ath5k/phy.c               |   91 +-
6344  drivers/net/wireless/ath/ath5k/qcu.c               |   10 +-
6345  drivers/net/wireless/ath/ath5k/reset.c             |   79 +-
6346  drivers/net/wireless/ath/ath5k/rfkill.c            |    2 +-
6347  drivers/net/wireless/ath/ath5k/sysfs.c             |    1 -
6348  drivers/net/wireless/ath/ath5k/trace.h             |    3 +-
6349  drivers/net/wireless/ath/ath6kl/Kconfig            |   15 +
6350  drivers/net/wireless/ath/ath6kl/Makefile           |   35 +
6351  drivers/net/wireless/ath/ath6kl/bmi.c              |  692 +++
6352  drivers/net/wireless/ath/ath6kl/bmi.h              |  250 +
6353  drivers/net/wireless/ath/ath6kl/cfg80211.c         | 1538 +++++
6354  drivers/net/wireless/ath/ath6kl/cfg80211.h         |   39 +
6355  drivers/net/wireless/ath/ath6kl/common.h           |  180 +
6356  drivers/net/wireless/ath/ath6kl/core.h             |  544 ++
6357  drivers/net/wireless/ath/ath6kl/debug.c            |  150 +
6358  drivers/net/wireless/ath/ath6kl/debug.h            |  105 +
6359  drivers/net/wireless/ath/ath6kl/hif-ops.h          |   72 +
6360  drivers/net/wireless/ath/ath6kl/hif.h              |  207 +
6361  drivers/net/wireless/ath/ath6kl/htc.c              | 2457 ++++++++
6362  drivers/net/wireless/ath/ath6kl/htc.h              |  607 ++
6363  drivers/net/wireless/ath/ath6kl/htc_hif.c          |  641 ++
6364  drivers/net/wireless/ath/ath6kl/htc_hif.h          |   92 +
6365  drivers/net/wireless/ath/ath6kl/init.c             | 1303 ++++
6366  drivers/net/wireless/ath/ath6kl/main.c             | 1337 ++++
6367  drivers/net/wireless/ath/ath6kl/node.c             |  234 +
6368  drivers/net/wireless/ath/ath6kl/sdio.c             |  912 +++
6369  drivers/net/wireless/ath/ath6kl/target.h           |  331 +
6370  drivers/net/wireless/ath/ath6kl/txrx.c             | 1457 +++++
6371  drivers/net/wireless/ath/ath6kl/wmi.c              | 2743 +++++++++
6372  drivers/net/wireless/ath/ath6kl/wmi.h              | 2018 ++++++
6373  drivers/net/wireless/ath/ath9k/ahb.c               |    2 +-
6374  drivers/net/wireless/ath/ath9k/ani.c               |   12 +-
6375  drivers/net/wireless/ath/ath9k/ani.h               |    6 +-
6376  drivers/net/wireless/ath/ath9k/ar5008_initvals.h   |  131 +-
6377  drivers/net/wireless/ath/ath9k/ar5008_phy.c        |   32 +-
6378  drivers/net/wireless/ath/ath9k/ar9001_initvals.h   |  266 +-
6379  drivers/net/wireless/ath/ath9k/ar9002_calib.c      |    1 +
6380  drivers/net/wireless/ath/ath9k/ar9002_hw.c         |   56 +-
6381  drivers/net/wireless/ath/ath9k/ar9002_initvals.h   | 3403 ++++++-----
6382  drivers/net/wireless/ath/ath9k/ar9002_mac.c        |  257 +-
6383  .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h   |  192 +-
6384  drivers/net/wireless/ath/ath9k/ar9003_calib.c      |   36 +-
6385  drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |  269 +-
6386  drivers/net/wireless/ath/ath9k/ar9003_eeprom.h     |    3 +-
6387  drivers/net/wireless/ath/ath9k/ar9003_hw.c         |  610 ++-
6388  drivers/net/wireless/ath/ath9k/ar9003_mac.c        |  374 +-
6389  drivers/net/wireless/ath/ath9k/ar9003_paprd.c      |   15 +-
6390  drivers/net/wireless/ath/ath9k/ar9003_phy.c        |   32 +-
6391  drivers/net/wireless/ath/ath9k/ar9003_phy.h        |  102 +-
6392  .../net/wireless/ath/ath9k/ar9480_1p0_initvals.h   | 1833 ++++++
6393  .../net/wireless/ath/ath9k/ar9480_2p0_initvals.h   | 1928 ++++++
6394  .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h   | 1673 +++++
6395  drivers/net/wireless/ath/ath9k/ath9k.h             |   31 +-
6396  drivers/net/wireless/ath/ath9k/beacon.c            |   74 +-
6397  drivers/net/wireless/ath/ath9k/calib.c             |   18 +-
6398  drivers/net/wireless/ath/ath9k/calib.h             |    1 +
6399  drivers/net/wireless/ath/ath9k/common.c            |   26 +
6400  drivers/net/wireless/ath/ath9k/common.h            |    1 +
6401  drivers/net/wireless/ath/ath9k/debug.c             |  474 ++-
6402  drivers/net/wireless/ath/ath9k/debug.h             |   55 +-
6403  drivers/net/wireless/ath/ath9k/eeprom.c            |    7 +-
6404  drivers/net/wireless/ath/ath9k/eeprom.h            |    2 +
6405  drivers/net/wireless/ath/ath9k/eeprom_4k.c         |  243 +-
6406  drivers/net/wireless/ath/ath9k/eeprom_9287.c       |  134 +-
6407  drivers/net/wireless/ath/ath9k/eeprom_def.c        |  196 +-
6408  drivers/net/wireless/ath/ath9k/gpio.c              |    4 +
6409  drivers/net/wireless/ath/ath9k/htc.h               |    3 -
6410  drivers/net/wireless/ath/ath9k/htc_drv_init.c      |   29 +-
6411  drivers/net/wireless/ath/ath9k/htc_drv_main.c      |   30 +-
6412  drivers/net/wireless/ath/ath9k/hw-ops.h            |   71 +-
6413  drivers/net/wireless/ath/ath9k/hw.c                |  132 +-
6414  drivers/net/wireless/ath/ath9k/hw.h                |   46 +-
6415  drivers/net/wireless/ath/ath9k/init.c              |   79 +-
6416  drivers/net/wireless/ath/ath9k/mac.c               |   49 +-
6417  drivers/net/wireless/ath/ath9k/mac.h               |   51 +-
6418  drivers/net/wireless/ath/ath9k/main.c              |  602 +-
6419  drivers/net/wireless/ath/ath9k/pci.c               |   57 +-
6420  drivers/net/wireless/ath/ath9k/rc.c                |   38 +-
6421  drivers/net/wireless/ath/ath9k/rc.h                |    6 -
6422  drivers/net/wireless/ath/ath9k/recv.c              |   53 +-
6423  drivers/net/wireless/ath/ath9k/reg.h               |   82 +-
6424  drivers/net/wireless/ath/ath9k/xmit.c              |  841 ++--
6425  drivers/net/wireless/ath/carl9170/Kconfig          |   14 +
6426  drivers/net/wireless/ath/carl9170/carl9170.h       |   24 +
6427  drivers/net/wireless/ath/carl9170/cmd.c            |   34 +
6428  drivers/net/wireless/ath/carl9170/cmd.h            |    1 +
6429  drivers/net/wireless/ath/carl9170/fw.c             |    3 +
6430  drivers/net/wireless/ath/carl9170/fwcmd.h          |   11 +
6431  drivers/net/wireless/ath/carl9170/main.c           |  232 +-
6432  drivers/net/wireless/ath/carl9170/phy.c            |   16 +-
6433  drivers/net/wireless/ath/carl9170/version.h        |    4 +-
6434  drivers/net/wireless/ath/main.c                    |    8 +-
6435  drivers/net/wireless/ath/regd.h                    |    2 +-
6436  drivers/net/wireless/ath/regd_common.h             |    2 +-
6437  drivers/net/wireless/b43/Kconfig                   |   22 +-
6438  drivers/net/wireless/b43/b43.h                     |   65 +-
6439  drivers/net/wireless/b43/bus.c                     |    2 +
6440  drivers/net/wireless/b43/dma.c                     |  157 +-
6441  drivers/net/wireless/b43/dma.h                     |   16 +-
6442  drivers/net/wireless/b43/main.c                    |  130 +-
6443  drivers/net/wireless/b43/phy_common.c              |   32 +
6444  drivers/net/wireless/b43/phy_common.h              |    2 +
6445  drivers/net/wireless/b43/phy_ht.c                  |  205 +
6446  drivers/net/wireless/b43/phy_ht.h                  |   19 +
6447  drivers/net/wireless/b43/phy_lcn.c                 |  853 +++-
6448  drivers/net/wireless/b43/phy_lcn.h                 |   19 +-
6449  drivers/net/wireless/b43/phy_n.c                   |  583 ++-
6450  drivers/net/wireless/b43/phy_n.h                   |    4 +
6451  drivers/net/wireless/b43/pio.c                     |   12 +-
6452  drivers/net/wireless/b43/radio_2055.c              |    1 +
6453  drivers/net/wireless/b43/radio_2056.c              |    2 +
6454  drivers/net/wireless/b43/radio_2056.h              |   26 -
6455  drivers/net/wireless/b43/radio_2059.c              |    2 +
6456  drivers/net/wireless/b43/tables_nphy.c             |    1 +
6457  drivers/net/wireless/b43/tables_phy_ht.c           |   86 +
6458  drivers/net/wireless/b43/tables_phy_ht.h           |    4 +
6459  drivers/net/wireless/b43/tables_phy_lcn.c          |  690 +++
6460  drivers/net/wireless/b43/tables_phy_lcn.h          |   18 +
6461  drivers/net/wireless/b43/xmit.c                    |  120 +-
6462  drivers/net/wireless/b43/xmit.h                    |   62 +-
6463  drivers/net/wireless/b43legacy/b43legacy.h         |    5 -
6464  drivers/net/wireless/b43legacy/dma.c               |  374 +-
6465  drivers/net/wireless/b43legacy/dma.h               |  107 -
6466  drivers/net/wireless/b43legacy/main.c              |    8 +-
6467  drivers/net/wireless/hostap/hostap_main.c          |    6 +-
6468  drivers/net/wireless/ipw2x00/ipw2200.c             |    3 +-
6469  drivers/net/wireless/iwlegacy/iwl-3945-led.c       |    1 -
6470  drivers/net/wireless/iwlegacy/iwl-3945-rs.c        |    1 -
6471  drivers/net/wireless/iwlegacy/iwl-3945.c           |    1 -
6472  drivers/net/wireless/iwlegacy/iwl-4965-led.c       |    1 -
6473  drivers/net/wireless/iwlegacy/iwl-4965-rs.c        |    1 -
6474  drivers/net/wireless/iwlegacy/iwl-4965.c           |    1 -
6475  drivers/net/wireless/iwlegacy/iwl-core.c           |    3 +-
6476  drivers/net/wireless/iwlegacy/iwl-core.h           |    3 +-
6477  drivers/net/wireless/iwlegacy/iwl-led.c            |    1 -
6478  drivers/net/wireless/iwlegacy/iwl3945-base.c       |    1 -
6479  drivers/net/wireless/iwlegacy/iwl4965-base.c       |    1 -
6480  drivers/net/wireless/iwlwifi/Kconfig               |   17 -
6481  drivers/net/wireless/iwlwifi/Makefile              |   23 +-
6482  drivers/net/wireless/iwlwifi/iwl-1000.c            |   57 +-
6483  drivers/net/wireless/iwlwifi/iwl-2000.c            |   82 +-
6484  drivers/net/wireless/iwlwifi/iwl-5000-hw.h         |    4 +-
6485  drivers/net/wireless/iwlwifi/iwl-5000.c            |   86 +-
6486  drivers/net/wireless/iwlwifi/iwl-6000.c            |   83 +-
6487  drivers/net/wireless/iwlwifi/iwl-agn-calib.c       |  133 +-
6488  drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c      |  299 -
6489  drivers/net/wireless/iwlwifi/iwl-agn-hw.h          |   17 +-
6490  drivers/net/wireless/iwlwifi/iwl-agn-lib.c         | 1118 +----
6491  drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |  110 +-
6492  drivers/net/wireless/iwlwifi/iwl-agn-rxon.c        |   94 +-
6493  drivers/net/wireless/iwlwifi/iwl-agn-sta.c         |   84 +-
6494  drivers/net/wireless/iwlwifi/iwl-agn-tt.c          |   82 +-
6495  drivers/net/wireless/iwlwifi/iwl-agn-tt.h          |    1 -
6496  drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |  958 ++--
6497  drivers/net/wireless/iwlwifi/iwl-agn-ucode.c       |  118 +-
6498  drivers/net/wireless/iwlwifi/iwl-agn.c             | 1384 ++---
6499  drivers/net/wireless/iwlwifi/iwl-agn.h             |   85 +-
6500  drivers/net/wireless/iwlwifi/iwl-bus.h             |   90 +-
6501  drivers/net/wireless/iwlwifi/iwl-cfg.h             |  115 +
6502  drivers/net/wireless/iwlwifi/iwl-commands.h        |   55 +-
6503  drivers/net/wireless/iwlwifi/iwl-core.c            |  329 +-
6504  drivers/net/wireless/iwlwifi/iwl-core.h            |  158 +-
6505  drivers/net/wireless/iwlwifi/iwl-csr.h             |   18 +
6506  drivers/net/wireless/iwlwifi/iwl-debug.h           |   40 +-
6507  drivers/net/wireless/iwlwifi/iwl-debugfs.c         |  430 +-
6508  drivers/net/wireless/iwlwifi/iwl-dev.h             |  555 +--
6509  drivers/net/wireless/iwlwifi/iwl-devtrace.h        |    2 +
6510  drivers/net/wireless/iwlwifi/iwl-eeprom.c          |  306 +-
6511  drivers/net/wireless/iwlwifi/iwl-eeprom.h          |   11 +-
6512  drivers/net/wireless/iwlwifi/iwl-fh.h              |   20 +-
6513  drivers/net/wireless/iwlwifi/iwl-helpers.h         |  114 +-
6514  drivers/net/wireless/iwlwifi/iwl-io.c              |  192 +-
6515  drivers/net/wireless/iwlwifi/iwl-io.h              |   61 +-
6516  drivers/net/wireless/iwlwifi/iwl-led.c             |   13 +-
6517  drivers/net/wireless/iwlwifi/iwl-pci.c             |   47 +-
6518  drivers/net/wireless/iwlwifi/iwl-power.c           |   19 +-
6519  drivers/net/wireless/iwlwifi/iwl-prph.h            |    4 +-
6520  drivers/net/wireless/iwlwifi/iwl-rx.c              |  220 +-
6521  drivers/net/wireless/iwlwifi/iwl-scan.c            |  760 ++-
6522  drivers/net/wireless/iwlwifi/iwl-shared.h          |  536 ++
6523  drivers/net/wireless/iwlwifi/iwl-sta.c             |  143 +-
6524  drivers/net/wireless/iwlwifi/iwl-sta.h             |    9 +-
6525  drivers/net/wireless/iwlwifi/iwl-sv-open.c         |   22 +-
6526  drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h  |   82 -
6527  drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h  |  436 ++
6528  drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c   | 1436 +++++
6529  .../{iwl-trans-tx-pcie.c => iwl-trans-pcie-tx.c}   |  682 ++-
6530  drivers/net/wireless/iwlwifi/iwl-trans-pcie.c      | 1989 ++++++
6531  drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c   |  979 ---
6532  drivers/net/wireless/iwlwifi/iwl-trans.c           | 1115 +----
6533  drivers/net/wireless/iwlwifi/iwl-trans.h           |  278 +-
6534  drivers/net/wireless/libertas/README               |   25 -
6535  drivers/net/wireless/libertas/cfg.c                |  102 +-
6536  drivers/net/wireless/libertas/cfg.h                |    1 +
6537  drivers/net/wireless/libertas/cmd.c                |    6 +-
6538  drivers/net/wireless/libertas/decl.h               |    4 +
6539  drivers/net/wireless/libertas/dev.h                |   29 +-
6540  drivers/net/wireless/libertas/ethtool.c            |    1 +
6541  drivers/net/wireless/libertas/if_sdio.c            |  277 +-
6542  drivers/net/wireless/libertas/if_spi.c             |    4 -
6543  drivers/net/wireless/libertas/if_usb.c             |   34 +-
6544  drivers/net/wireless/libertas/main.c               |  182 +-
6545  drivers/net/wireless/libertas/mesh.c               |   79 +-
6546  drivers/net/wireless/libertas/mesh.h               |   27 +-
6547  drivers/net/wireless/libertas/rx.c                 |    1 +
6548  drivers/net/wireless/libertas/tx.c                 |    1 +
6549  drivers/net/wireless/mac80211_hwsim.c              |    6 +
6550  drivers/net/wireless/mwifiex/cfg80211.c            |  216 +-
6551  drivers/net/wireless/mwifiex/cmdevt.c              |    3 +
6552  drivers/net/wireless/mwifiex/fw.h                  |   15 +-
6553  drivers/net/wireless/mwifiex/init.c                |   21 -
6554  drivers/net/wireless/mwifiex/ioctl.h               |    5 +-
6555  drivers/net/wireless/mwifiex/join.c                |   35 +-
6556  drivers/net/wireless/mwifiex/main.c                |    6 +-
6557  drivers/net/wireless/mwifiex/main.h                |   55 +-
6558  drivers/net/wireless/mwifiex/scan.c                | 1591 +----
6559  drivers/net/wireless/mwifiex/sta_event.c           |    9 +-
6560  drivers/net/wireless/mwifiex/sta_ioctl.c           |  237 +-
6561  drivers/net/wireless/mwl8k.c                       |   11 +-
6562  drivers/net/wireless/orinoco/main.c                |    2 +-
6563  drivers/net/wireless/orinoco/orinoco_usb.c         |    2 +-
6564  drivers/net/wireless/orinoco/wext.c                |    1 +
6565  drivers/net/wireless/p54/eeprom.c                  |   26 +-
6566  drivers/net/wireless/p54/fwio.c                    |    2 +
6567  drivers/net/wireless/p54/main.c                    |  113 +-
6568  drivers/net/wireless/p54/p54.h                     |   18 +
6569  drivers/net/wireless/p54/p54spi.c                  |    2 +-
6570  drivers/net/wireless/p54/txrx.c                    |   70 +
6571  drivers/net/wireless/ray_cs.c                      |    2 +-
6572  drivers/net/wireless/rndis_wlan.c                  |    4 +-
6573  drivers/net/wireless/rt2x00/rt2400pci.c            |   44 +-
6574  drivers/net/wireless/rt2x00/rt2500pci.c            |   42 +-
6575  drivers/net/wireless/rt2x00/rt2800.h               |    3 +
6576  drivers/net/wireless/rt2x00/rt2800lib.c            |  193 +-
6577  drivers/net/wireless/rt2x00/rt2800lib.h            |    7 +-
6578  drivers/net/wireless/rt2x00/rt2800pci.c            |   61 +-
6579  drivers/net/wireless/rt2x00/rt2800usb.c            |    7 +-
6580  drivers/net/wireless/rt2x00/rt2x00.h               |   30 +
6581  drivers/net/wireless/rt2x00/rt2x00dev.c            |   22 +-
6582  drivers/net/wireless/rt2x00/rt2x00mac.c            |   50 +-
6583  drivers/net/wireless/rt2x00/rt2x00queue.c          |    7 +-
6584  drivers/net/wireless/rt2x00/rt2x00queue.h          |    5 +-
6585  drivers/net/wireless/rt2x00/rt61pci.c              |   36 +-
6586  drivers/net/wireless/rt2x00/rt73usb.c              |    2 +-
6587  drivers/net/wireless/rtl818x/rtl8180/dev.c         |    5 +-
6588  drivers/net/wireless/rtl818x/rtl8187/dev.c         |    2 +-
6589  drivers/net/wireless/rtlwifi/base.c                |  161 +
6590  drivers/net/wireless/rtlwifi/base.h                |    2 +
6591  drivers/net/wireless/rtlwifi/core.c                |    8 +-
6592  drivers/net/wireless/rtlwifi/debug.c               |    6 +-
6593  drivers/net/wireless/rtlwifi/pci.c                 |   37 +-
6594  drivers/net/wireless/rtlwifi/pci.h                 |   26 -
6595  drivers/net/wireless/rtlwifi/rtl8192ce/def.h       |  139 -
6596  drivers/net/wireless/rtlwifi/rtl8192ce/sw.c        |   42 +-
6597  drivers/net/wireless/rtlwifi/rtl8192ce/trx.c       |  116 +-
6598  drivers/net/wireless/rtlwifi/rtl8192ce/trx.h       |    6 -
6599  drivers/net/wireless/rtlwifi/rtl8192cu/mac.c       |    4 +-
6600  drivers/net/wireless/rtlwifi/rtl8192cu/mac.h       |    6 -
6601  drivers/net/wireless/rtlwifi/rtl8192cu/rf.c        |    2 +-
6602  drivers/net/wireless/rtlwifi/rtl8192cu/sw.c        |   28 +-
6603  drivers/net/wireless/rtlwifi/rtl8192cu/trx.c       |   23 +-
6604  drivers/net/wireless/rtlwifi/rtl8192de/def.h       |   35 -
6605  drivers/net/wireless/rtlwifi/rtl8192de/sw.c        |   42 +-
6606  drivers/net/wireless/rtlwifi/rtl8192de/trx.c       |  121 +-
6607  drivers/net/wireless/rtlwifi/rtl8192de/trx.h       |    6 -
6608  drivers/net/wireless/rtlwifi/rtl8192se/def.h       |   41 +-
6609  drivers/net/wireless/rtlwifi/rtl8192se/sw.c        |   44 +-
6610  drivers/net/wireless/rtlwifi/rtl8192se/trx.c       |  126 +-
6611  drivers/net/wireless/rtlwifi/wifi.h                |   41 +
6612  drivers/net/wireless/wl1251/cmd.h                  |    2 +-
6613  drivers/net/wireless/wl1251/wl12xx_80211.h         |    2 +-
6614  drivers/net/wireless/wl12xx/Kconfig                |   10 -
6615  drivers/net/wireless/wl12xx/Makefile               |    6 +-
6616  drivers/net/wireless/wl12xx/acx.c                  |  362 +-
6617  drivers/net/wireless/wl12xx/acx.h                  |  412 +-
6618  drivers/net/wireless/wl12xx/boot.c                 |   47 +-
6619  drivers/net/wireless/wl12xx/boot.h                 |    3 +-
6620  drivers/net/wireless/wl12xx/cmd.c                  |  823 ++-
6621  drivers/net/wireless/wl12xx/cmd.h                  |  334 +-
6622  drivers/net/wireless/wl12xx/conf.h                 |  381 +-
6623  drivers/net/wireless/wl12xx/debugfs.c              |  105 +-
6624  drivers/net/wireless/wl12xx/event.c                |   43 +-
6625  drivers/net/wireless/wl12xx/event.h                |   80 +-
6626  drivers/net/wireless/wl12xx/init.c                 |  113 +-
6627  drivers/net/wireless/wl12xx/io.h                   |    1 -
6628  drivers/net/wireless/wl12xx/main.c                 | 1294 +++--
6629  drivers/net/wireless/wl12xx/ps.c                   |   12 +-
6630  drivers/net/wireless/wl12xx/reg.h                  |   75 -
6631  drivers/net/wireless/wl12xx/rx.c                   |   69 +-
6632  drivers/net/wireless/wl12xx/rx.h                   |   18 +-
6633  drivers/net/wireless/wl12xx/scan.c                 |  200 +-
6634  drivers/net/wireless/wl12xx/scan.h                 |   31 +-
6635  drivers/net/wireless/wl12xx/sdio.c                 |    4 +-
6636  drivers/net/wireless/wl12xx/sdio_test.c            |   17 +-
6637  drivers/net/wireless/wl12xx/spi.c                  |    4 +-
6638  drivers/net/wireless/wl12xx/tx.c                   |  192 +-
6639  drivers/net/wireless/wl12xx/tx.h                   |   26 +-
6640  drivers/net/wireless/wl12xx/wl12xx.h               |  167 +-
6641  drivers/net/wireless/wl12xx/wl12xx_80211.h         |   27 +-
6642  drivers/net/wireless/wl3501_cs.c                   |    2 +-
6643  drivers/net/wireless/zd1201.c                      |    2 +-
6644  drivers/net/wireless/zd1211rw/zd_mac.c             |    2 +-
6645  drivers/nfc/Kconfig                                |   11 +
6646  drivers/nfc/Makefile                               |    1 +
6647  drivers/nfc/nfcwilink.c                            |  342 ++
6648  drivers/nfc/pn533.c                                |   21 +-
6649  drivers/s390/cio/qdio.h                            |   38 +-
6650  drivers/s390/cio/qdio_debug.c                      |    3 +
6651  drivers/s390/cio/qdio_main.c                       |  208 +-
6652  drivers/s390/cio/qdio_setup.c                      |   83 +-
6653  drivers/s390/cio/qdio_thinint.c                    |   88 +-
6654  drivers/s390/net/lcs.c                             |    2 +-
6655  drivers/s390/net/qeth_core.h                       |   50 +-
6656  drivers/s390/net/qeth_core_main.c                  |  780 +++-
6657  drivers/s390/net/qeth_l2_main.c                    |    4 +-
6658  drivers/s390/net/qeth_l3.h                         |    4 +
6659  drivers/s390/net/qeth_l3_main.c                    |   92 +-
6660  drivers/s390/net/qeth_l3_sys.c                     |  110 +-
6661  drivers/scsi/bnx2fc/Kconfig                        |    3 +-
6662  drivers/scsi/bnx2fc/bnx2fc.h                       |    4 +-
6663  drivers/scsi/bnx2fc/bnx2fc_fcoe.c                  |    6 +-
6664  drivers/scsi/bnx2i/Kconfig                         |    3 +-
6665  drivers/scsi/bnx2i/bnx2i.h                         |    2 +-
6666  drivers/scsi/cxgbi/cxgb3i/Kbuild                   |    2 +-
6667  drivers/scsi/cxgbi/cxgb3i/Kconfig                  |    3 +-
6668  drivers/scsi/cxgbi/cxgb4i/Kbuild                   |    2 +-
6669  drivers/scsi/cxgbi/cxgb4i/Kconfig                  |    3 +-
6670  drivers/scsi/fcoe/fcoe.c                           |    6 +-
6671  drivers/scsi/fcoe/fcoe_transport.c                 |    5 +-
6672  drivers/ssb/main.c                                 |   24 +-
6673  drivers/staging/Kconfig                            |    2 -
6674  drivers/staging/Makefile                           |    1 -
6675  drivers/staging/ath6kl/Kconfig                     |  158 -
6676  drivers/staging/ath6kl/Makefile                    |  122 -
6677  drivers/staging/ath6kl/TODO                        |   25 -
6678  drivers/staging/ath6kl/bmi/include/bmi_internal.h  |   54 -
6679  drivers/staging/ath6kl/bmi/src/bmi.c               | 1010 ---
6680  .../staging/ath6kl/hif/common/hif_sdio_common.h    |   87 -
6681  .../hif/sdio/linux_sdio/include/hif_internal.h     |  131 -
6682  .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c   | 1273 ----
6683  .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c   |  393 --
6684  drivers/staging/ath6kl/htc2/AR6000/ar6k.c          | 1479 -----
6685  drivers/staging/ath6kl/htc2/AR6000/ar6k.h          |  401 --
6686  drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c   |  783 ---
6687  drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c    |  755 ---
6688  .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c        | 1284 ----
6689  drivers/staging/ath6kl/htc2/htc.c                  |  575 --
6690  drivers/staging/ath6kl/htc2/htc_debug.h            |   38 -
6691  drivers/staging/ath6kl/htc2/htc_internal.h         |  211 -
6692  drivers/staging/ath6kl/htc2/htc_recv.c             | 1572 -----
6693  drivers/staging/ath6kl/htc2/htc_send.c             | 1018 ---
6694  drivers/staging/ath6kl/htc2/htc_services.c         |  450 --
6695  drivers/staging/ath6kl/include/a_config.h          |   31 -
6696  drivers/staging/ath6kl/include/a_debug.h           |  195 -
6697  drivers/staging/ath6kl/include/a_drv.h             |   32 -
6698  drivers/staging/ath6kl/include/a_drv_api.h         |  204 -
6699  drivers/staging/ath6kl/include/a_osapi.h           |   32 -
6700  drivers/staging/ath6kl/include/aggr_recv_api.h     |  140 -
6701  drivers/staging/ath6kl/include/ar3kconfig.h        |   65 -
6702  drivers/staging/ath6kl/include/ar6000_api.h        |   32 -
6703  drivers/staging/ath6kl/include/ar6000_diag.h       |   48 -
6704  drivers/staging/ath6kl/include/ar6kap_common.h     |   44 -
6705  drivers/staging/ath6kl/include/athbtfilter.h       |  135 -
6706  drivers/staging/ath6kl/include/bmi.h               |  134 -
6707  .../ath6kl/include/common/AR6002/AR6K_version.h    |   52 -
6708  .../staging/ath6kl/include/common/AR6002/addrs.h   |   90 -
6709  .../common/AR6002/hw4.0/hw/apb_athr_wlan_map.h     |   40 -
6710  .../include/common/AR6002/hw4.0/hw/apb_map.h       |   40 -
6711  .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h |   24 -
6712  .../include/common/AR6002/hw4.0/hw/mbox_reg.h      |  552 --
6713  .../common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h    |  471 --
6714  .../include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h |  589 --
6715  .../include/common/AR6002/hw4.0/hw/rtc_reg.h       |  187 -
6716  .../include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h  |  162 -
6717  .../include/common/AR6002/hw4.0/hw/uart_reg.h      |   40 -
6718  drivers/staging/ath6kl/include/common/athdefs.h    |   75 -
6719  drivers/staging/ath6kl/include/common/bmi_msg.h    |  233 -
6720  drivers/staging/ath6kl/include/common/cnxmgmt.h    |   36 -
6721  drivers/staging/ath6kl/include/common/dbglog.h     |  126 -
6722  drivers/staging/ath6kl/include/common/dbglog_id.h  |  558 --
6723  drivers/staging/ath6kl/include/common/discovery.h  |   75 -
6724  .../staging/ath6kl/include/common/epping_test.h    |  111 -
6725  drivers/staging/ath6kl/include/common/gmboxif.h    |   70 -
6726  drivers/staging/ath6kl/include/common/gpio_reg.h   |    9 -
6727  drivers/staging/ath6kl/include/common/htc.h        |  227 -
6728  .../staging/ath6kl/include/common/htc_services.h   |   52 -
6729  drivers/staging/ath6kl/include/common/pkt_log.h    |   45 -
6730  drivers/staging/ath6kl/include/common/roaming.h    |   41 -
6731  drivers/staging/ath6kl/include/common/targaddrs.h  |  395 --
6732  drivers/staging/ath6kl/include/common/testcmd.h    |  185 -
6733  drivers/staging/ath6kl/include/common/tlpm.h       |   38 -
6734  drivers/staging/ath6kl/include/common/wlan_defs.h  |   79 -
6735  drivers/staging/ath6kl/include/common/wmi.h        | 3220 ----------
6736  drivers/staging/ath6kl/include/common/wmix.h       |  271 -
6737  drivers/staging/ath6kl/include/common_drv.h        |  104 -
6738  drivers/staging/ath6kl/include/dbglog_api.h        |   52 -
6739  drivers/staging/ath6kl/include/dl_list.h           |  153 -
6740  drivers/staging/ath6kl/include/dset_api.h          |   65 -
6741  drivers/staging/ath6kl/include/hci_transport_api.h |  259 -
6742  drivers/staging/ath6kl/include/hif.h               |  456 --
6743  drivers/staging/ath6kl/include/host_version.h      |   52 -
6744  drivers/staging/ath6kl/include/htc_api.h           |  575 --
6745  drivers/staging/ath6kl/include/htc_packet.h        |  227 -
6746  drivers/staging/ath6kl/include/wlan_api.h          |  128 -
6747  drivers/staging/ath6kl/include/wmi_api.h           |  441 --
6748  drivers/staging/ath6kl/miscdrv/ar3kconfig.c        |  565 --
6749  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c   |  572 --
6750  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h   |   75 -
6751  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c   |  969 ---
6752  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h   |  113 -
6753  drivers/staging/ath6kl/miscdrv/common_drv.c        |  910 ---
6754  drivers/staging/ath6kl/miscdrv/credit_dist.c       |  417 --
6755  drivers/staging/ath6kl/miscdrv/miscdrv.h           |   42 -
6756  drivers/staging/ath6kl/os/linux/ar6000_drv.c       | 6267 -------------------
6757  drivers/staging/ath6kl/os/linux/ar6000_pm.c        |  626 --
6758  drivers/staging/ath6kl/os/linux/ar6000_raw_if.c    |  455 --
6759  drivers/staging/ath6kl/os/linux/cfg80211.c         | 1892 ------
6760  .../staging/ath6kl/os/linux/export_hci_transport.c |  124 -
6761  drivers/staging/ath6kl/os/linux/hci_bridge.c       | 1141 ----
6762  .../staging/ath6kl/os/linux/include/ar6000_drv.h   |  776 ---
6763  drivers/staging/ath6kl/os/linux/include/ar6k_pal.h |   36 -
6764  .../ath6kl/os/linux/include/ar6xapi_linux.h        |  190 -
6765  .../staging/ath6kl/os/linux/include/athdrv_linux.h | 1217 ----
6766  drivers/staging/ath6kl/os/linux/include/cfg80211.h |   61 -
6767  .../staging/ath6kl/os/linux/include/config_linux.h |   51 -
6768  .../staging/ath6kl/os/linux/include/debug_linux.h  |   50 -
6769  .../ath6kl/os/linux/include/export_hci_transport.h |   76 -
6770  .../ath6kl/os/linux/include/ieee80211_ioctl.h      |  177 -
6771  .../staging/ath6kl/os/linux/include/osapi_linux.h  |  339 -
6772  .../staging/ath6kl/os/linux/include/wlan_config.h  |  108 -
6773  .../ath6kl/os/linux/include/wmi_filter_linux.h     |  300 -
6774  drivers/staging/ath6kl/os/linux/netbuf.c           |  231 -
6775  drivers/staging/ath6kl/reorder/aggr_rx_internal.h  |  117 -
6776  drivers/staging/ath6kl/reorder/rcv_aggr.c          |  661 --
6777  drivers/staging/ath6kl/wlan/include/ieee80211.h    |  397 --
6778  .../staging/ath6kl/wlan/include/ieee80211_node.h   |   93 -
6779  drivers/staging/ath6kl/wlan/src/wlan_node.c        |  636 --
6780  drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c |  199 -
6781  drivers/staging/ath6kl/wlan/src/wlan_utils.c       |   58 -
6782  drivers/staging/ath6kl/wmi/wmi.c                   | 6444 --------------------
6783  drivers/staging/ath6kl/wmi/wmi_host.h              |  102 -
6784  drivers/staging/brcm80211/brcmfmac/dhd_linux.c     |    2 +-
6785  drivers/staging/brcm80211/brcmsmac/mac80211_if.c   |   12 +-
6786  drivers/staging/et131x/et131x_netdev.c             |    2 +-
6787  drivers/staging/hv/netvsc_drv.c                    |    2 +-
6788  drivers/staging/octeon/ethernet.c                  |   12 +-
6789  drivers/staging/rtl8187se/r8180_core.c             |    2 +-
6790  drivers/staging/rtl8192e/r8192E_core.c             |    2 +-
6791  drivers/staging/rtl8192u/r8192U_core.c             |    2 +-
6792  drivers/staging/slicoss/slicoss.c                  |    2 +-
6793  drivers/staging/vt6655/device_main.c               |    2 +-
6794  drivers/staging/vt6656/main_usb.c                  |    2 +-
6795  drivers/staging/winbond/wbusb.c                    |    2 +-
6796  drivers/staging/wlags49_h2/wl_netdev.c             |    2 +-
6797  drivers/staging/wlan-ng/p80211netdev.c             |    2 +-
6798  drivers/watchdog/bcm47xx_wdt.c                     |   27 +-
6799  drivers/xen/xen-pciback/xenbus.c                   |    2 +
6800  include/linux/atalk.h                              |    3 +-
6801  include/linux/ax25.h                               |    2 +-
6802  include/linux/bcma/bcma.h                          |    9 +-
6803  include/linux/bcma/bcma_driver_chipcommon.h        |   94 +
6804  include/linux/bcma/bcma_driver_mips.h              |   51 +
6805  include/linux/bcma/bcma_soc.h                      |   16 +
6806  include/linux/caif/caif_socket.h                   |    7 +-
6807  include/linux/can.h                                |    2 +-
6808  include/linux/can/Kbuild                           |    1 +
6809  include/linux/can/bcm.h                            |    1 +
6810  include/linux/can/gw.h                             |  164 +
6811  include/linux/cn_proc.h                            |   11 +
6812  include/linux/ethtool.h                            |  180 +-
6813  include/linux/ieee80211.h                          |   71 +-
6814  include/linux/if.h                                 |    1 +
6815  include/linux/if_ether.h                           |    1 +
6816  include/linux/if_packet.h                          |  119 +
6817  include/linux/if_pppol2tp.h                        |    2 +-
6818  include/linux/if_pppox.h                           |    9 +-
6819  include/linux/in.h                                 |    2 +-
6820  include/linux/ip6_tunnel.h                         |    2 +
6821  include/linux/ipx.h                                |    2 +-
6822  include/linux/irda.h                               |    9 +-
6823  include/linux/l2tp.h                               |    7 +-
6824  include/linux/lapb.h                               |    3 +-
6825  include/linux/llc.h                                |   10 +-
6826  include/linux/mii.h                                |  210 +-
6827  include/linux/net_tstamp.h                         |    9 +
6828  include/linux/netdevice.h                          |   13 +-
6829  include/linux/netfilter/xt_connlimit.h             |    1 +
6830  include/linux/netfilter/xt_conntrack.h             |    1 +
6831  include/linux/netfilter/xt_iprange.h               |    1 +
6832  include/linux/netfilter_arp/arp_tables.h           |   14 +-
6833  include/linux/netfilter_decnet.h                   |    3 +
6834  include/linux/netfilter_ipv4.h                     |    3 +
6835  include/linux/netfilter_ipv4/ip_tables.h           |   20 +-
6836  include/linux/netfilter_ipv6.h                     |    3 +
6837  include/linux/netfilter_ipv6/ip6_tables.h          |   22 +-
6838  include/linux/netlink.h                            |    2 +-
6839  include/linux/netrom.h                             |    2 +
6840  include/linux/nfc.h                                |    8 +
6841  include/linux/nl80211.h                            |  192 +-
6842  include/linux/pci.h                                |    2 +
6843  include/linux/phonet.h                             |    5 +-
6844  include/linux/rose.h                               |    7 +-
6845  {arch/sh/include/asm => include/linux}/sh_eth.h    |    2 +-
6846  include/linux/skbuff.h                             |  181 +-
6847  include/linux/ssb/ssb.h                            |    2 +-
6848  include/linux/ssb/ssb_regs.h                       |   40 +
6849  {drivers/net => include/linux}/sungem_phy.h        |    2 +-
6850  include/linux/sysctl.h                             |    2 +-
6851  include/linux/tcp.h                                |    7 +-
6852  include/linux/tipc_config.h                        |    4 +
6853  include/linux/un.h                                 |    4 +-
6854  include/linux/x25.h                                |    3 +-
6855  include/net/addrconf.h                             |    2 +-
6856  include/net/bluetooth/hci.h                        |   10 +
6857  include/net/bluetooth/hci_core.h                   |   25 +-
6858  include/net/bluetooth/l2cap.h                      |    8 +-
6859  include/net/bluetooth/mgmt.h                       |   16 +
6860  include/net/bluetooth/smp.h                        |   17 +
6861  include/net/cfg80211-wext.h                        |   55 +
6862  include/net/cfg80211.h                             |  353 +-
6863  include/net/dst.h                                  |    9 +-
6864  include/net/if_inet6.h                             |    1 +
6865  include/net/iucv/af_iucv.h                         |   52 +
6866  include/net/iucv/iucv.h                            |   36 +-
6867  include/net/lapb.h                                 |    2 +-
6868  include/net/lib80211.h                             |    3 -
6869  include/net/mac80211.h                             |   55 +-
6870  include/net/nfc/nci.h                              |  313 +
6871  include/net/nfc/nci_core.h                         |  184 +
6872  include/net/{ => nfc}/nfc.h                        |   11 +-
6873  include/net/regulatory.h                           |   16 +-
6874  include/net/scm.h                                  |    5 +-
6875  include/net/sctp/structs.h                         |    1 +
6876  include/net/sock.h                                 |   15 +-
6877  include/net/tcp.h                                  |    8 +-
6878  include/rdma/ib_addr.h                             |    6 +-
6879  kernel/sys.c                                       |    1 +
6880  kernel/sysctl_binary.c                             |    2 +-
6881  net/802/garp.c                                     |    4 +-
6882  net/802/stp.c                                      |    4 +-
6883  net/8021q/vlan.c                                   |    2 +-
6884  net/8021q/vlan_dev.c                               |    4 +-
6885  net/atm/lec.c                                      |    2 +-
6886  net/batman-adv/Makefile                            |    2 +-
6887  net/batman-adv/aggregation.c                       |  293 -
6888  net/batman-adv/aggregation.h                       |   46 -
6889  net/batman-adv/bat_iv_ogm.c                        | 1170 ++++
6890  net/batman-adv/bat_ogm.h                           |   35 +
6891  net/batman-adv/bat_sysfs.c                         |    2 +
6892  net/batman-adv/bitarray.c                          |    6 +-
6893  net/batman-adv/gateway_client.c                    |   10 +-
6894  net/batman-adv/hard-interface.c                    |   88 +-
6895  net/batman-adv/hard-interface.h                    |    1 +
6896  net/batman-adv/hash.h                              |   25 +-
6897  net/batman-adv/main.c                              |    4 +-
6898  net/batman-adv/main.h                              |    8 +-
6899  net/batman-adv/originator.c                        |   21 +-
6900  net/batman-adv/packet.h                            |   19 +-
6901  net/batman-adv/routing.c                           |  669 +--
6902  net/batman-adv/routing.h                           |   17 +-
6903  net/batman-adv/send.c                              |  313 +-
6904  net/batman-adv/send.h                              |    9 +-
6905  net/batman-adv/soft-interface.c                    |   34 +-
6906  net/batman-adv/translation-table.c                 |  199 +-
6907  net/batman-adv/translation-table.h                 |   21 +-
6908  net/batman-adv/types.h                             |    5 +-
6909  net/batman-adv/unicast.c                           |    6 +-
6910  net/batman-adv/unicast.h                           |    2 +-
6911  net/batman-adv/vis.c                               |   10 +-
6912  net/bluetooth/bnep/netdev.c                        |    2 +-
6913  net/bluetooth/hci_conn.c                           |    2 +-
6914  net/bluetooth/hci_core.c                           |   57 +-
6915  net/bluetooth/hci_event.c                          |   16 +-
6916  net/bluetooth/hci_sock.c                           |   18 +-
6917  net/bluetooth/hci_sysfs.c                          |    2 +
6918  net/bluetooth/hidp/core.c                          |    3 +
6919  net/bluetooth/l2cap_core.c                         |   18 +-
6920  net/bluetooth/mgmt.c                               |  212 +-
6921  net/bluetooth/smp.c                                |  421 +-
6922  net/bridge/br_device.c                             |    2 +-
6923  net/bridge/br_fdb.c                                |   23 +-
6924  net/bridge/br_if.c                                 |   41 +-
6925  net/bridge/netfilter/ebtable_broute.c              |    4 +-
6926  net/caif/cfcnfg.c                                  |   38 +-
6927  net/caif/cfctrl.c                                  |   23 +-
6928  net/caif/cfdbgl.c                                  |    7 +-
6929  net/caif/cfdgml.c                                  |    7 +-
6930  net/caif/cffrml.c                                  |    7 +-
6931  net/caif/cfmuxl.c                                  |    6 +-
6932  net/caif/cfrfml.c                                  |    7 +-
6933  net/caif/cfserl.c                                  |    7 +-
6934  net/caif/cfsrvl.c                                  |    8 +-
6935  net/caif/cfutill.c                                 |    7 +-
6936  net/caif/cfveil.c                                  |    7 +-
6937  net/caif/cfvidl.c                                  |    7 +-
6938  net/can/Kconfig                                    |   11 +
6939  net/can/Makefile                                   |    3 +
6940  net/can/af_can.c                                   |    4 +-
6941  net/can/gw.c                                       |  959 +++
6942  net/core/datagram.c                                |    8 +-
6943  net/core/dev.c                                     |  163 +-
6944  net/core/dev_addr_lists.c                          |    4 +-
6945  net/core/dst.c                                     |   15 +-
6946  net/core/ethtool.c                                 |   20 +-
6947  net/core/fib_rules.c                               |    4 +-
6948  net/core/filter.c                                  |    2 +-
6949  net/core/kmap_skb.h                                |    2 +-
6950  net/core/link_watch.c                              |    9 +-
6951  net/core/neighbour.c                               |   40 +-
6952  net/core/net-sysfs.c                               |   12 +-
6953  net/core/netpoll.c                                 |    4 +-
6954  net/core/pktgen.c                                  |    3 +-
6955  net/core/rtnetlink.c                               |    1 -
6956  net/core/scm.c                                     |   10 +-
6957  net/core/skbuff.c                                  |   31 +-
6958  net/core/sock.c                                    |   16 +-
6959  net/core/user_dma.c                                |    2 +-
6960  net/dccp/ccids/ccid2.c                             |   84 +-
6961  net/dccp/ccids/ccid2.h                             |    6 +
6962  net/dccp/dccp.h                                    |    1 +
6963  net/dccp/feat.c                                    |  202 +-
6964  net/dccp/feat.h                                    |    1 +
6965  net/dccp/proto.c                                   |    1 -
6966  net/decnet/dn_dev.c                                |    6 +-
6967  net/dsa/slave.c                                    |    3 -
6968  net/ieee802154/6lowpan.c                           |  891 +++
6969  net/ieee802154/6lowpan.h                           |  212 +
6970  net/ieee802154/Kconfig                             |    6 +
6971  net/ieee802154/Makefile                            |    8 +-
6972  net/ipv4/devinet.c                                 |    6 +-
6973  net/ipv4/fib_trie.c                                |   12 +-
6974  net/ipv4/gre.c                                     |    4 +-
6975  net/ipv4/igmp.c                                    |   12 +-
6976  net/ipv4/inet_lro.c                                |    2 +-
6977  net/ipv4/ip_output.c                               |    7 +-
6978  net/ipv4/ipip.c                                    |   10 +-
6979  net/ipv4/ipmr.c                                    |    8 +-
6980  net/ipv4/netfilter/nf_nat_amanda.c                 |    4 +-
6981  net/ipv4/netfilter/nf_nat_core.c                   |   24 +-
6982  net/ipv4/netfilter/nf_nat_ftp.c                    |    4 +-
6983  net/ipv4/netfilter/nf_nat_h323.c                   |   36 +-
6984  net/ipv4/netfilter/nf_nat_irc.c                    |    4 +-
6985  net/ipv4/netfilter/nf_nat_pptp.c                   |   16 +-
6986  net/ipv4/netfilter/nf_nat_sip.c                    |   28 +-
6987  net/ipv4/netfilter/nf_nat_snmp_basic.c             |    4 +-
6988  net/ipv4/netfilter/nf_nat_standalone.c             |    6 +-
6989  net/ipv4/netfilter/nf_nat_tftp.c                   |    4 +-
6990  net/ipv4/route.c                                   |   14 +-
6991  net/ipv4/tcp.c                                     |   56 +-
6992  net/ipv4/tcp_input.c                               |   85 +-
6993  net/ipv4/tcp_ipv4.c                                |    8 +-
6994  net/ipv4/tcp_output.c                              |   72 +-
6995  net/ipv4/udp.c                                     |   11 +-
6996  net/ipv6/addrconf.c                                |   81 +-
6997  net/ipv6/exthdrs.c                                 |    7 +-
6998  net/ipv6/icmp.c                                    |   25 +-
6999  net/ipv6/inet6_connection_sock.c                   |    9 +-
7000  net/ipv6/ip6_output.c                              |    7 +-
7001  net/ipv6/ip6_tunnel.c                              |   54 +-
7002  net/ipv6/ndisc.c                                   |   31 +-
7003  net/ipv6/raw.c                                     |    8 +-
7004  net/ipv6/sit.c                                     |   12 +-
7005  net/ipv6/tcp_ipv6.c                                |    8 +-
7006  net/ipv6/udp.c                                     |    4 +-
7007  net/irda/irlan/irlan_eth.c                         |    2 +-
7008  net/iucv/Kconfig                                   |   14 +-
7009  net/iucv/af_iucv.c                                 |  868 +++-
7010  net/iucv/iucv.c                                    |   23 +
7011  net/lapb/lapb_iface.c                              |   29 +-
7012  net/mac80211/Kconfig                               |   13 +
7013  net/mac80211/agg-rx.c                              |   23 +-
7014  net/mac80211/agg-tx.c                              |   62 +-
7015  net/mac80211/cfg.c                                 |   99 +-
7016  net/mac80211/debugfs.c                             |   71 +-
7017  net/mac80211/debugfs_netdev.c                      |   59 +-
7018  net/mac80211/driver-ops.h                          |   58 +-
7019  net/mac80211/driver-trace.h                        |   40 +-
7020  net/mac80211/ht.c                                  |    6 +-
7021  net/mac80211/ibss.c                                |   12 +-
7022  net/mac80211/ieee80211_i.h                         |   73 +-
7023  net/mac80211/iface.c                               |   22 +-
7024  net/mac80211/main.c                                |    1 +
7025  net/mac80211/mesh.c                                |  267 +-
7026  net/mac80211/mesh.h                                |   42 +-
7027  net/mac80211/mesh_hwmp.c                           |  168 +-
7028  net/mac80211/mesh_pathtbl.c                        |  481 ++-
7029  net/mac80211/mesh_plink.c                          |  251 +-
7030  net/mac80211/mlme.c                                |  104 +-
7031  net/mac80211/rate.c                                |   29 +-
7032  net/mac80211/rc80211_minstrel_ht.c                 |   11 +-
7033  net/mac80211/rx.c                                  |   83 +-
7034  net/mac80211/scan.c                                |    3 +-
7035  net/mac80211/spectmgmt.c                           |    6 +-
7036  net/mac80211/sta_info.c                            |  347 +-
7037  net/mac80211/sta_info.h                            |   35 +-
7038  net/mac80211/status.c                              |   60 +-
7039  net/mac80211/tx.c                                  |   60 +-
7040  net/mac80211/util.c                                |  204 +-
7041  net/mac80211/wme.c                                 |   16 +-
7042  net/mac80211/wme.h                                 |    3 +-
7043  net/mac80211/work.c                                |    8 +-
7044  net/netfilter/core.c                               |    4 +-
7045  net/netfilter/nf_conntrack_core.c                  |   12 +-
7046  net/netfilter/nf_conntrack_ecache.c                |    8 +-
7047  net/netfilter/nf_conntrack_extend.c                |    4 +-
7048  net/netfilter/nf_conntrack_helper.c                |    6 +-
7049  net/netfilter/nf_conntrack_netlink.c               |    6 +-
7050  net/netfilter/nf_log.c                             |   10 +-
7051  net/netfilter/nf_queue.c                           |    6 +-
7052  net/netfilter/nfnetlink.c                          |    6 +-
7053  net/netlabel/netlabel_domainhash.c                 |    6 +-
7054  net/netlabel/netlabel_unlabeled.c                  |    6 +-
7055  net/netlink/af_netlink.c                           |    7 +-
7056  net/nfc/Kconfig                                    |    2 +
7057  net/nfc/Makefile                                   |    1 +
7058  net/nfc/core.c                                     |   83 +-
7059  net/nfc/nci/Kconfig                                |   10 +
7060  net/nfc/nci/Makefile                               |    7 +
7061  net/nfc/nci/core.c                                 |  797 +++
7062  net/nfc/nci/data.c                                 |  247 +
7063  net/nfc/nci/lib.c                                  |   94 +
7064  net/nfc/nci/ntf.c                                  |  258 +
7065  net/nfc/nci/rsp.c                                  |  226 +
7066  net/nfc/netlink.c                                  |   56 +
7067  net/nfc/nfc.h                                      |    6 +-
7068  net/nfc/rawsock.c                                  |   13 +-
7069  net/packet/af_packet.c                             |  946 +++-
7070  net/phonet/af_phonet.c                             |    4 +-
7071  net/phonet/pn_dev.c                                |    6 +-
7072  net/phonet/socket.c                                |    6 +-
7073  net/rds/Kconfig                                    |    1 +
7074  net/rds/ib_rdma.c                                  |  112 +-
7075  net/rds/xlist.h                                    |   80 -
7076  net/rfkill/core.c                                  |    2 +-
7077  net/rfkill/rfkill-regulator.c                      |    1 -
7078  net/sched/sch_sfb.c                                |   13 +-
7079  net/sctp/associola.c                               |    1 +
7080  net/sctp/outqueue.c                                |    4 +
7081  net/sctp/sm_make_chunk.c                           |    1 +
7082  net/sctp/sm_statefuns.c                            |    5 +
7083  net/socket.c                                       |    4 +-
7084  net/sunrpc/auth_gss/auth_gss.c                     |    4 +-
7085  net/tipc/bcast.c                                   |  111 +-
7086  net/tipc/bcast.h                                   |    1 -
7087  net/tipc/bearer.c                                  |    8 +-
7088  net/tipc/bearer.h                                  |    4 +-
7089  net/tipc/config.h                                  |    1 -
7090  net/tipc/discover.c                                |    6 -
7091  net/tipc/eth_media.c                               |   32 +-
7092  net/tipc/link.c                                    |  111 +-
7093  net/tipc/link.h                                    |    1 +
7094  net/tipc/name_distr.c                              |   35 +-
7095  net/tipc/net.c                                     |   11 -
7096  net/tipc/node.c                                    |   45 +-
7097  net/tipc/node.h                                    |   10 +-
7098  net/tipc/socket.c                                  |   51 +-
7099  net/tipc/subscr.c                                  |    3 +-
7100  net/tipc/subscr.h                                  |    6 -
7101  net/unix/af_unix.c                                 |   24 +-
7102  net/wireless/core.c                                |    2 +-
7103  net/wireless/core.h                                |    6 +-
7104  net/wireless/lib80211.c                            |   15 +-
7105  net/wireless/lib80211_crypt_ccmp.c                 |    2 -
7106  net/wireless/lib80211_crypt_tkip.c                 |    4 -
7107  net/wireless/lib80211_crypt_wep.c                  |    4 -
7108  net/wireless/mesh.c                                |    3 +
7109  net/wireless/mlme.c                                |   16 +-
7110  net/wireless/nl80211.c                             |  294 +-
7111  net/wireless/nl80211.h                             |    4 +
7112  net/wireless/reg.c                                 |   47 +-
7113  net/wireless/reg.h                                 |    2 +
7114  net/wireless/scan.c                                |   28 +
7115  net/wireless/sme.c                                 |   19 +-
7116  net/wireless/util.c                                |  189 +-
7117  net/wireless/wext-compat.c                         |  137 +-
7118  net/wireless/wext-compat.h                         |    8 +
7119  net/wireless/wext-sme.c                            |    3 +-
7120  net/xfrm/xfrm_ipcomp.c                             |   11 +-
7121  net/xfrm/xfrm_user.c                               |    4 +-
7122  virt/kvm/assigned-dev.c                            |    2 +
7123  virt/kvm/iommu.c                                   |    4 +
7124  1912 files changed, 88301 insertions(+), 97589 deletions(-)
7125  create mode 100644 Documentation/devicetree/bindings/net/smsc911x.txt
7126  create mode 100644 arch/mips/bcm47xx/Kconfig
7127  create mode 100644 drivers/bcma/driver_mips.c
7128  create mode 100644 drivers/bcma/host_soc.c
7129  rename drivers/net/{pcmcia => arcnet}/com20020_cs.c (100%)
7130  delete mode 100644 drivers/net/arm/Kconfig
7131  delete mode 100644 drivers/net/arm/Makefile
7132  delete mode 100644 drivers/net/benet/Kconfig
7133  delete mode 100644 drivers/net/bna/bfa_ioc_ct.c
7134  delete mode 100644 drivers/net/bna/bfi_ctreg.h
7135  delete mode 100644 drivers/net/bna/bfi_ll.h
7136  delete mode 100644 drivers/net/bna/bna_ctrl.c
7137  delete mode 100644 drivers/net/bna/bna_hw.h
7138  delete mode 100644 drivers/net/bna/bna_txrx.c
7139  create mode 100644 drivers/net/can/sja1000/ems_pcmcia.c
7140  create mode 100644 drivers/net/can/sja1000/peak_pci.c
7141  rename drivers/net/{ => ethernet/3com}/3c501.c (99%)
7142  rename drivers/net/{ => ethernet/3com}/3c501.h (100%)
7143  rename drivers/net/{ => ethernet/3com}/3c509.c (99%)
7144  rename drivers/net/{ => ethernet/3com}/3c515.c (99%)
7145  rename drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c (99%)
7146  rename drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c (99%)
7147  rename drivers/net/{ => ethernet/3com}/3c59x.c (99%)
7148  create mode 100644 drivers/net/ethernet/3com/Kconfig
7149  create mode 100644 drivers/net/ethernet/3com/Makefile
7150  rename drivers/net/{ => ethernet/3com}/typhoon.c (99%)
7151  rename drivers/net/{ => ethernet/3com}/typhoon.h (100%)
7152  rename drivers/net/{ => ethernet/8390}/3c503.c (99%)
7153  rename drivers/net/{ => ethernet/8390}/3c503.h (100%)
7154  rename drivers/net/{ => ethernet/8390}/8390.c (97%)
7155  rename drivers/net/{ => ethernet/8390}/8390.h (100%)
7156  rename drivers/net/{ => ethernet/8390}/8390p.c (97%)
7157  create mode 100644 drivers/net/ethernet/8390/Kconfig
7158  create mode 100644 drivers/net/ethernet/8390/Makefile
7159  rename drivers/net/{ => ethernet/8390}/ac3200.c (99%)
7160  rename drivers/net/{ => ethernet/8390}/apne.c (100%)
7161  rename drivers/net/{ => ethernet/8390}/ax88796.c (99%)
7162  rename drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c (99%)
7163  rename drivers/net/{ => ethernet/8390}/e2100.c (99%)
7164  rename drivers/net/{ => ethernet/8390}/es3210.c (100%)
7165  rename drivers/net/{arm => ethernet/8390}/etherh.c (99%)
7166  rename drivers/net/{ => ethernet/8390}/hp-plus.c (99%)
7167  rename drivers/net/{ => ethernet/8390}/hp.c (100%)
7168  rename drivers/net/{ => ethernet/8390}/hydra.c (99%)
7169  rename drivers/net/{ => ethernet/8390}/lib8390.c (100%)
7170  rename drivers/net/{ => ethernet/8390}/lne390.c (100%)
7171  rename drivers/net/{ => ethernet/8390}/mac8390.c (99%)
7172  rename drivers/net/{ => ethernet/8390}/ne-h8300.c (99%)
7173  rename drivers/net/{ => ethernet/8390}/ne.c (100%)
7174  rename drivers/net/{ => ethernet/8390}/ne2.c (100%)
7175  rename drivers/net/{ => ethernet/8390}/ne2k-pci.c (99%)
7176  rename drivers/net/{ => ethernet/8390}/ne3210.c (100%)
7177  rename drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c (99%)
7178  rename drivers/net/{ => ethernet/8390}/smc-mca.c (99%)
7179  rename drivers/net/{ => ethernet/8390}/smc-ultra.c (99%)
7180  rename drivers/net/{ => ethernet/8390}/smc-ultra32.c (99%)
7181  rename drivers/net/{ => ethernet/8390}/stnic.c (100%)
7182  rename drivers/net/{ => ethernet/8390}/wd.c (99%)
7183  rename drivers/net/{ => ethernet/8390}/zorro8390.c (99%)
7184  create mode 100644 drivers/net/ethernet/Kconfig
7185  create mode 100644 drivers/net/ethernet/Makefile
7186  create mode 100644 drivers/net/ethernet/adaptec/Kconfig
7187  create mode 100644 drivers/net/ethernet/adaptec/Makefile
7188  rename drivers/net/{ => ethernet/adaptec}/starfire.c (99%)
7189  create mode 100644 drivers/net/ethernet/adi/Kconfig
7190  create mode 100644 drivers/net/ethernet/adi/Makefile
7191  rename drivers/net/{ => ethernet/adi}/bfin_mac.c (99%)
7192  rename drivers/net/{ => ethernet/adi}/bfin_mac.h (100%)
7193  create mode 100644 drivers/net/ethernet/aeroflex/Kconfig
7194  create mode 100644 drivers/net/ethernet/aeroflex/Makefile
7195  rename drivers/net/{ => ethernet/aeroflex}/greth.c (99%)
7196  rename drivers/net/{ => ethernet/aeroflex}/greth.h (100%)
7197  create mode 100644 drivers/net/ethernet/alteon/Kconfig
7198  create mode 100644 drivers/net/ethernet/alteon/Makefile
7199  rename drivers/net/{ => ethernet/alteon}/acenic.c (99%)
7200  rename drivers/net/{ => ethernet/alteon}/acenic.h (100%)
7201  rename drivers/net/{ => ethernet/amd}/7990.c (100%)
7202  rename drivers/net/{ => ethernet/amd}/7990.h (100%)
7203  create mode 100644 drivers/net/ethernet/amd/Kconfig
7204  create mode 100644 drivers/net/ethernet/amd/Makefile
7205  rename drivers/net/{ => ethernet/amd}/a2065.c (99%)
7206  rename drivers/net/{ => ethernet/amd}/a2065.h (100%)
7207  rename drivers/net/{arm => ethernet/amd}/am79c961a.c (99%)
7208  rename drivers/net/{arm => ethernet/amd}/am79c961a.h (100%)
7209  rename drivers/net/{ => ethernet/amd}/amd8111e.c (99%)
7210  rename drivers/net/{ => ethernet/amd}/amd8111e.h (100%)
7211  rename drivers/net/{ => ethernet/amd}/ariadne.c (99%)
7212  rename drivers/net/{ => ethernet/amd}/ariadne.h (100%)
7213  rename drivers/net/{ => ethernet/amd}/atarilance.c (99%)
7214  rename drivers/net/{ => ethernet/amd}/au1000_eth.c (99%)
7215  rename drivers/net/{ => ethernet/amd}/au1000_eth.h (100%)
7216  rename drivers/net/{ => ethernet/amd}/declance.c (99%)
7217  rename drivers/net/{ => ethernet/amd}/depca.c (99%)
7218  rename drivers/net/{ => ethernet/amd}/depca.h (99%)
7219  rename drivers/net/{ => ethernet/amd}/hplance.c (99%)
7220  rename drivers/net/{ => ethernet/amd}/hplance.h (100%)
7221  rename drivers/net/{ => ethernet/amd}/lance.c (99%)
7222  rename drivers/net/{ => ethernet/amd}/mvme147.c (99%)
7223  rename drivers/net/{ => ethernet/amd}/ni65.c (99%)
7224  rename drivers/net/{ => ethernet/amd}/ni65.h (100%)
7225  rename drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c (99%)
7226  rename drivers/net/{ => ethernet/amd}/pcnet32.c (94%)
7227  rename drivers/net/{ => ethernet/amd}/sun3lance.c (99%)
7228  rename drivers/net/{ => ethernet/amd}/sunlance.c (99%)
7229  create mode 100644 drivers/net/ethernet/apple/Kconfig
7230  create mode 100644 drivers/net/ethernet/apple/Makefile
7231  rename drivers/net/{ => ethernet/apple}/bmac.c (99%)
7232  rename drivers/net/{ => ethernet/apple}/bmac.h (100%)
7233  rename drivers/net/{ => ethernet/apple}/cs89x0.c (99%)
7234  rename drivers/net/{ => ethernet/apple}/cs89x0.h (100%)
7235  rename drivers/net/{ => ethernet/apple}/mac89x0.c (99%)
7236  rename drivers/net/{ => ethernet/apple}/mace.c (99%)
7237  rename drivers/net/{ => ethernet/apple}/mace.h (100%)
7238  rename drivers/net/{ => ethernet/apple}/macmace.c (98%)
7239  create mode 100644 drivers/net/ethernet/atheros/Kconfig
7240  create mode 100644 drivers/net/ethernet/atheros/Makefile
7241  rename drivers/net/{ => ethernet/atheros}/atl1c/Makefile (100%)
7242  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h (100%)
7243  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_ethtool.c (100%)
7244  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.c (100%)
7245  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.h (100%)
7246  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_main.c (99%)
7247  rename drivers/net/{ => ethernet/atheros}/atl1e/Makefile (100%)
7248  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h (100%)
7249  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_ethtool.c (100%)
7250  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.c (100%)
7251  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.h (100%)
7252  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_main.c (99%)
7253  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_param.c (100%)
7254  rename drivers/net/{ => ethernet/atheros}/atlx/Makefile (100%)
7255  rename drivers/net/{ => ethernet/atheros}/atlx/atl1.c (99%)
7256  rename drivers/net/{ => ethernet/atheros}/atlx/atl1.h (100%)
7257  rename drivers/net/{ => ethernet/atheros}/atlx/atl2.c (99%)
7258  rename drivers/net/{ => ethernet/atheros}/atlx/atl2.h (100%)
7259  rename drivers/net/{ => ethernet/atheros}/atlx/atlx.c (100%)
7260  rename drivers/net/{ => ethernet/atheros}/atlx/atlx.h (100%)
7261  create mode 100644 drivers/net/ethernet/broadcom/Kconfig
7262  create mode 100644 drivers/net/ethernet/broadcom/Makefile
7263  rename drivers/net/{ => ethernet/broadcom}/b44.c (99%)
7264  rename drivers/net/{ => ethernet/broadcom}/b44.h (100%)
7265  rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c (99%)
7266  rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h (100%)
7267  rename drivers/net/{ => ethernet/broadcom}/bnx2.c (99%)
7268  rename drivers/net/{ => ethernet/broadcom}/bnx2.h (100%)
7269  rename drivers/net/{ => ethernet/broadcom}/bnx2_fw.h (100%)
7270  rename drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile (100%)
7271  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h (98%)
7272  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c (98%)
7273  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h (99%)
7274  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c (99%)
7275  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h (100%)
7276  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h (100%)
7277  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c (98%)
7278  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h (100%)
7279  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_file_hdr.h (100%)
7280  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h (99%)
7281  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h (100%)
7282  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h (100%)
7283  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c (99%)
7284  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h (100%)
7285  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c (99%)
7286  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h (100%)
7287  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c (98%)
7288  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h (100%)
7289  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c (98%)
7290  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h (100%)
7291  rename drivers/net/{ => ethernet/broadcom}/cnic.c (99%)
7292  rename drivers/net/{ => ethernet/broadcom}/cnic.h (99%)
7293  rename drivers/net/{ => ethernet/broadcom}/cnic_defs.h (99%)
7294  rename drivers/net/{ => ethernet/broadcom}/cnic_if.h (100%)
7295  rename drivers/net/{ => ethernet/broadcom}/sb1250-mac.c (99%)
7296  rename drivers/net/{ => ethernet/broadcom}/tg3.c (98%)
7297  rename drivers/net/{ => ethernet/broadcom}/tg3.h (99%)
7298  create mode 100644 drivers/net/ethernet/brocade/Kconfig
7299  create mode 100644 drivers/net/ethernet/brocade/Makefile
7300  create mode 100644 drivers/net/ethernet/brocade/bna/Kconfig
7301  rename drivers/net/{ => ethernet/brocade}/bna/Makefile (52%)
7302  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c (97%)
7303  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h (100%)
7304  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h (100%)
7305  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h (81%)
7306  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_cna.h (94%)
7307  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h (73%)
7308  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_status.h (100%)
7309  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c (85%)
7310  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h (84%)
7311  create mode 100644 drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
7312  create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.c
7313  create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.h
7314  rename drivers/net/{ => ethernet/brocade}/bna/bfi.h (65%)
7315  rename drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h (100%)
7316  create mode 100644 drivers/net/ethernet/brocade/bna/bfi_enet.h
7317  create mode 100644 drivers/net/ethernet/brocade/bna/bfi_reg.h
7318  rename drivers/net/{ => ethernet/brocade}/bna/bna.h (66%)
7319  create mode 100644 drivers/net/ethernet/brocade/bna/bna_enet.c
7320  create mode 100644 drivers/net/ethernet/brocade/bna/bna_hw_defs.h
7321  create mode 100644 drivers/net/ethernet/brocade/bna/bna_tx_rx.c
7322  rename drivers/net/{ => ethernet/brocade}/bna/bna_types.h (58%)
7323  rename drivers/net/{ => ethernet/brocade}/bna/bnad.c (76%)
7324  rename drivers/net/{ => ethernet/brocade}/bna/bnad.h (74%)
7325  rename drivers/net/{ => ethernet/brocade}/bna/bnad_ethtool.c (66%)
7326  rename drivers/net/{ => ethernet/brocade}/bna/cna.h (62%)
7327  rename drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c (53%)
7328  create mode 100644 drivers/net/ethernet/cadence/Kconfig
7329  create mode 100644 drivers/net/ethernet/cadence/Makefile
7330  rename drivers/net/{arm => ethernet/cadence}/at91_ether.c (99%)
7331  rename drivers/net/{arm => ethernet/cadence}/at91_ether.h (100%)
7332  rename drivers/net/{ => ethernet/cadence}/macb.c (99%)
7333  rename drivers/net/{ => ethernet/cadence}/macb.h (100%)
7334  create mode 100644 drivers/net/ethernet/chelsio/Kconfig
7335  create mode 100644 drivers/net/ethernet/chelsio/Makefile
7336  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/Makefile (100%)
7337  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/common.h (100%)
7338  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cphy.h (100%)
7339  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h (100%)
7340  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c (99%)
7341  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/elmer0.h (100%)
7342  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.c (100%)
7343  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.h (100%)
7344  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h (100%)
7345  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/gmac.h (100%)
7346  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c (100%)
7347  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h (100%)
7348  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c (100%)
7349  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/my3126.c (100%)
7350  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/pm3393.c (100%)
7351  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/regs.h (100%)
7352  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.c (100%)
7353  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.h (100%)
7354  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/subr.c (100%)
7355  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/suni1x10gexp_regs.h (100%)
7356  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.c (100%)
7357  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.h (100%)
7358  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326.c (100%)
7359  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326_reg.h (100%)
7360  rename drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile (100%)
7361  rename drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h (100%)
7362  rename drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c (100%)
7363  rename drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c (100%)
7364  rename drivers/net/{ => ethernet/chelsio}/cxgb3/common.h (100%)
7365  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h (100%)
7366  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h (100%)
7367  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h (100%)
7368  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c (99%)
7369  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c (100%)
7370  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h (100%)
7371  rename drivers/net/{ => ethernet/chelsio}/cxgb3/firmware_exports.h (100%)
7372  rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c (100%)
7373  rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h (100%)
7374  rename drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c (100%)
7375  rename drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h (100%)
7376  rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c (100%)
7377  rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge_defs.h (100%)
7378  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h (100%)
7379  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c (100%)
7380  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h (100%)
7381  rename drivers/net/{ => ethernet/chelsio}/cxgb3/version.h (100%)
7382  rename drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c (100%)
7383  rename drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c (100%)
7384  rename drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile (100%)
7385  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h (100%)
7386  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c (99%)
7387  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h (100%)
7388  rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c (100%)
7389  rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h (100%)
7390  rename drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c (100%)
7391  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c (100%)
7392  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h (100%)
7393  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h (100%)
7394  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h (100%)
7395  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h (100%)
7396  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/Makefile (100%)
7397  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/adapter.h (100%)
7398  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c (99%)
7399  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c (100%)
7400  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h (100%)
7401  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h (100%)
7402  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c (100%)
7403  create mode 100644 drivers/net/ethernet/cirrus/Kconfig
7404  create mode 100644 drivers/net/ethernet/cirrus/Makefile
7405  rename drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c (100%)
7406  create mode 100644 drivers/net/ethernet/cisco/Kconfig
7407  create mode 100644 drivers/net/ethernet/cisco/Makefile
7408  create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig
7409  rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%)
7410  rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%)
7411  rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%)
7412  rename drivers/net/{ => ethernet/cisco}/enic/enic.h (90%)
7413  rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%)
7414  rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (78%)
7415  rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (94%)
7416  rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (52%)
7417  rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (68%)
7418  rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%)
7419  rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%)
7420  rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%)
7421  rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%)
7422  rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%)
7423  rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (97%)
7424  rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (97%)
7425  rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%)
7426  rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%)
7427  rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%)
7428  rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%)
7429  rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%)
7430  rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%)
7431  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%)
7432  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%)
7433  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%)
7434  rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%)
7435  rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%)
7436  rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%)
7437  rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%)
7438  rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%)
7439  rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%)
7440  create mode 100644 drivers/net/ethernet/davicom/Kconfig
7441  create mode 100644 drivers/net/ethernet/davicom/Makefile
7442  rename drivers/net/{ => ethernet/davicom}/dm9000.c (99%)
7443  rename drivers/net/{ => ethernet/davicom}/dm9000.h (100%)
7444  create mode 100644 drivers/net/ethernet/dec/Kconfig
7445  create mode 100644 drivers/net/ethernet/dec/Makefile
7446  rename drivers/net/{ => ethernet/dec}/ewrk3.c (99%)
7447  rename drivers/net/{ => ethernet/dec}/ewrk3.h (100%)
7448  rename drivers/net/{ => ethernet/dec}/tulip/21142.c (100%)
7449  rename drivers/net/{ => ethernet/dec}/tulip/Kconfig (96%)
7450  rename drivers/net/{ => ethernet/dec}/tulip/Makefile (100%)
7451  rename drivers/net/{ => ethernet/dec}/tulip/de2104x.c (99%)
7452  rename drivers/net/{ => ethernet/dec}/tulip/de4x5.c (99%)
7453  rename drivers/net/{ => ethernet/dec}/tulip/de4x5.h (99%)
7454  rename drivers/net/{ => ethernet/dec}/tulip/dmfe.c (99%)
7455  rename drivers/net/{ => ethernet/dec}/tulip/eeprom.c (100%)
7456  rename drivers/net/{ => ethernet/dec}/tulip/interrupt.c (100%)
7457  rename drivers/net/{ => ethernet/dec}/tulip/media.c (100%)
7458  rename drivers/net/{ => ethernet/dec}/tulip/pnic.c (100%)
7459  rename drivers/net/{ => ethernet/dec}/tulip/pnic2.c (100%)
7460  rename drivers/net/{ => ethernet/dec}/tulip/timer.c (100%)
7461  rename drivers/net/{ => ethernet/dec}/tulip/tulip.h (100%)
7462  rename drivers/net/{ => ethernet/dec}/tulip/tulip_core.c (99%)
7463  rename drivers/net/{ => ethernet/dec}/tulip/uli526x.c (99%)
7464  rename drivers/net/{ => ethernet/dec}/tulip/winbond-840.c (99%)
7465  rename drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c (100%)
7466  create mode 100644 drivers/net/ethernet/dlink/Kconfig
7467  create mode 100644 drivers/net/ethernet/dlink/Makefile
7468  rename drivers/net/{ => ethernet/dlink}/de600.c (100%)
7469  rename drivers/net/{ => ethernet/dlink}/de600.h (100%)
7470  rename drivers/net/{ => ethernet/dlink}/de620.c (99%)
7471  rename drivers/net/{ => ethernet/dlink}/de620.h (100%)
7472  rename drivers/net/{ => ethernet/dlink}/dl2k.c (95%)
7473  rename drivers/net/{ => ethernet/dlink}/dl2k.h (81%)
7474  rename drivers/net/{ => ethernet/dlink}/sundance.c (99%)
7475  rename drivers/net/{ => ethernet}/dnet.c (100%)
7476  rename drivers/net/{ => ethernet}/dnet.h (100%)
7477  create mode 100644 drivers/net/ethernet/emulex/Kconfig
7478  create mode 100644 drivers/net/ethernet/emulex/Makefile
7479  create mode 100644 drivers/net/ethernet/emulex/benet/Kconfig
7480  rename drivers/net/{ => ethernet/emulex}/benet/Makefile (100%)
7481  rename drivers/net/{ => ethernet/emulex}/benet/be.h (84%)
7482  rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.c (93%)
7483  rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.h (95%)
7484  rename drivers/net/{ => ethernet/emulex}/benet/be_ethtool.c (84%)
7485  rename drivers/net/{ => ethernet/emulex}/benet/be_hw.h (94%)
7486  rename drivers/net/{ => ethernet/emulex}/benet/be_main.c (90%)
7487  rename drivers/net/{ => ethernet}/ethoc.c (99%)
7488  create mode 100644 drivers/net/ethernet/faraday/Kconfig
7489  create mode 100644 drivers/net/ethernet/faraday/Makefile
7490  rename drivers/net/{ => ethernet/faraday}/ftgmac100.c (100%)
7491  rename drivers/net/{ => ethernet/faraday}/ftgmac100.h (100%)
7492  rename drivers/net/{ => ethernet/faraday}/ftmac100.c (100%)
7493  rename drivers/net/{ => ethernet/faraday}/ftmac100.h (100%)
7494  rename drivers/net/{ => ethernet}/fealnx.c (99%)
7495  create mode 100644 drivers/net/ethernet/freescale/Kconfig
7496  create mode 100644 drivers/net/ethernet/freescale/Makefile
7497  rename drivers/net/{ => ethernet/freescale}/fec.c (93%)
7498  rename drivers/net/{ => ethernet/freescale}/fec.h (100%)
7499  rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c (99%)
7500  rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h (100%)
7501  rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx_phy.c (100%)
7502  rename drivers/net/{ => ethernet/freescale}/fs_enet/Kconfig (89%)
7503  rename drivers/net/{ => ethernet/freescale}/fs_enet/Makefile (100%)
7504  rename drivers/net/{ => ethernet/freescale}/fs_enet/fec.h (100%)
7505  rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet-main.c (99%)
7506  rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet.h (100%)
7507  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fcc.c (100%)
7508  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fec.c (100%)
7509  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-scc.c (100%)
7510  rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-bitbang.c (100%)
7511  rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-fec.c (100%)
7512  rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c (100%)
7513  rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h (100%)
7514  rename drivers/net/{ => ethernet/freescale}/gianfar.c (99%)
7515  rename drivers/net/{ => ethernet/freescale}/gianfar.h (100%)
7516  rename drivers/net/{ => ethernet/freescale}/gianfar_ethtool.c (99%)
7517  rename drivers/net/{ => ethernet/freescale}/gianfar_ptp.c (100%)
7518  rename drivers/net/{ => ethernet/freescale}/gianfar_sysfs.c (100%)
7519  rename drivers/net/{ => ethernet/freescale}/ucc_geth.c (99%)
7520  rename drivers/net/{ => ethernet/freescale}/ucc_geth.h (100%)
7521  rename drivers/net/{ => ethernet/freescale}/ucc_geth_ethtool.c (100%)
7522  create mode 100644 drivers/net/ethernet/fujitsu/Kconfig
7523  create mode 100644 drivers/net/ethernet/fujitsu/Makefile
7524  rename drivers/net/{ => ethernet/fujitsu}/at1700.c (99%)
7525  rename drivers/net/{ => ethernet/fujitsu}/eth16i.c (99%)
7526  rename drivers/net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c (99%)
7527  create mode 100644 drivers/net/ethernet/hp/Kconfig
7528  create mode 100644 drivers/net/ethernet/hp/Makefile
7529  rename drivers/net/{ => ethernet/hp}/hp100.c (99%)
7530  rename drivers/net/{ => ethernet/hp}/hp100.h (100%)
7531  rename drivers/net/{ => ethernet/i825xx}/3c505.c (99%)
7532  rename drivers/net/{ => ethernet/i825xx}/3c505.h (100%)
7533  rename drivers/net/{ => ethernet/i825xx}/3c507.c (100%)
7534  rename drivers/net/{ => ethernet/i825xx}/3c523.c (99%)
7535  rename drivers/net/{ => ethernet/i825xx}/3c523.h (100%)
7536  rename drivers/net/{ => ethernet/i825xx}/3c527.c (99%)
7537  rename drivers/net/{ => ethernet/i825xx}/3c527.h (100%)
7538  rename drivers/net/{ => ethernet/i825xx}/82596.c (99%)
7539  create mode 100644 drivers/net/ethernet/i825xx/Kconfig
7540  create mode 100644 drivers/net/ethernet/i825xx/Makefile
7541  rename drivers/net/{ => ethernet/i825xx}/eepro.c (99%)
7542  rename drivers/net/{ => ethernet/i825xx}/eexpress.c (99%)
7543  rename drivers/net/{ => ethernet/i825xx}/eexpress.h (100%)
7544  rename drivers/net/{arm => ethernet/i825xx}/ether1.c (99%)
7545  rename drivers/net/{arm => ethernet/i825xx}/ether1.h (100%)
7546  rename drivers/net/{ => ethernet/i825xx}/lasi_82596.c (100%)
7547  rename drivers/net/{ => ethernet/i825xx}/lib82596.c (99%)
7548  rename drivers/net/{ => ethernet/i825xx}/lp486e.c (99%)
7549  rename drivers/net/{ => ethernet/i825xx}/ni52.c (99%)
7550  rename drivers/net/{ => ethernet/i825xx}/ni52.h (100%)
7551  rename drivers/net/{ => ethernet/i825xx}/sni_82596.c (100%)
7552  rename drivers/net/{ => ethernet/i825xx}/sun3_82586.c (99%)
7553  rename drivers/net/{ => ethernet/i825xx}/sun3_82586.h (100%)
7554  rename drivers/net/{ => ethernet/i825xx}/znet.c (99%)
7555  create mode 100644 drivers/net/ethernet/ibm/Kconfig
7556  create mode 100644 drivers/net/ethernet/ibm/Makefile
7557  rename drivers/net/{ => ethernet/ibm}/ehea/Makefile (100%)
7558  rename drivers/net/{ => ethernet/ibm}/ehea/ehea.h (99%)
7559  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c (100%)
7560  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h (100%)
7561  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c (99%)
7562  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c (100%)
7563  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h (100%)
7564  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c (100%)
7565  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h (100%)
7566  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Kconfig (63%)
7567  create mode 100644 drivers/net/ethernet/ibm/emac/Makefile
7568  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.c (99%)
7569  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.h (97%)
7570  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.c (100%)
7571  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.h (98%)
7572  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/emac.h (100%)
7573  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.c (99%)
7574  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.h (99%)
7575  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.c (100%)
7576  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.h (100%)
7577  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c (100%)
7578  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h (96%)
7579  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.c (100%)
7580  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.h (97%)
7581  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.c (100%)
7582  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.h (96%)
7583  rename drivers/net/{ => ethernet/ibm}/ibmveth.c (99%)
7584  rename drivers/net/{ => ethernet/ibm}/ibmveth.h (100%)
7585  rename drivers/net/{ => ethernet/ibm}/iseries_veth.c (99%)
7586  create mode 100644 drivers/net/ethernet/icplus/Kconfig
7587  create mode 100644 drivers/net/ethernet/icplus/Makefile
7588  rename drivers/net/{ => ethernet/icplus}/ipg.c (92%)
7589  rename drivers/net/{ => ethernet/icplus}/ipg.h (100%)
7590  create mode 100644 drivers/net/ethernet/intel/Kconfig
7591  create mode 100644 drivers/net/ethernet/intel/Makefile
7592  rename drivers/net/{ => ethernet/intel}/e100.c (99%)
7593  rename drivers/net/{ => ethernet/intel}/e1000/Makefile (100%)
7594  rename drivers/net/{ => ethernet/intel}/e1000/e1000.h (99%)
7595  rename drivers/net/{ => ethernet/intel}/e1000/e1000_ethtool.c (100%)
7596  rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c (100%)
7597  rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h (100%)
7598  rename drivers/net/{ => ethernet/intel}/e1000/e1000_main.c (99%)
7599  rename drivers/net/{ => ethernet/intel}/e1000/e1000_osdep.h (100%)
7600  rename drivers/net/{ => ethernet/intel}/e1000/e1000_param.c (100%)
7601  rename drivers/net/{e1000e/es2lan.c => ethernet/intel/e1000e/80003es2lan.c} (99%)
7602  rename drivers/net/{ => ethernet/intel}/e1000e/82571.c (99%)
7603  rename drivers/net/{ => ethernet/intel}/e1000e/Makefile (96%)
7604  rename drivers/net/{ => ethernet/intel}/e1000e/defines.h (100%)
7605  rename drivers/net/{ => ethernet/intel}/e1000e/e1000.h (99%)
7606  rename drivers/net/{ => ethernet/intel}/e1000e/ethtool.c (96%)
7607  rename drivers/net/{ => ethernet/intel}/e1000e/hw.h (100%)
7608  rename drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c (99%)
7609  rename drivers/net/{ => ethernet/intel}/e1000e/lib.c (100%)
7610  rename drivers/net/{ => ethernet/intel}/e1000e/netdev.c (96%)
7611  rename drivers/net/{ => ethernet/intel}/e1000e/param.c (100%)
7612  rename drivers/net/{ => ethernet/intel}/e1000e/phy.c (100%)
7613  rename drivers/net/{ => ethernet/intel}/igb/Makefile (100%)
7614  rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.c (100%)
7615  rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.h (100%)
7616  rename drivers/net/{ => ethernet/intel}/igb/e1000_defines.h (100%)
7617  rename drivers/net/{ => ethernet/intel}/igb/e1000_hw.h (100%)
7618  rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.c (100%)
7619  rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.h (100%)
7620  rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c (100%)
7621  rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h (100%)
7622  rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c (100%)
7623  rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h (100%)
7624  rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.c (100%)
7625  rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.h (100%)
7626  rename drivers/net/{ => ethernet/intel}/igb/e1000_regs.h (100%)
7627  rename drivers/net/{ => ethernet/intel}/igb/igb.h (87%)
7628  rename drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c (99%)
7629  rename drivers/net/{ => ethernet/intel}/igb/igb_main.c (95%)
7630  rename drivers/net/{ => ethernet/intel}/igbvf/Makefile (100%)
7631  rename drivers/net/{ => ethernet/intel}/igbvf/defines.h (100%)
7632  rename drivers/net/{ => ethernet/intel}/igbvf/ethtool.c (100%)
7633  rename drivers/net/{ => ethernet/intel}/igbvf/igbvf.h (100%)
7634  rename drivers/net/{ => ethernet/intel}/igbvf/mbx.c (100%)
7635  rename drivers/net/{ => ethernet/intel}/igbvf/mbx.h (100%)
7636  rename drivers/net/{ => ethernet/intel}/igbvf/netdev.c (99%)
7637  rename drivers/net/{ => ethernet/intel}/igbvf/regs.h (100%)
7638  rename drivers/net/{ => ethernet/intel}/igbvf/vf.c (100%)
7639  rename drivers/net/{ => ethernet/intel}/igbvf/vf.h (100%)
7640  rename drivers/net/{ => ethernet/intel}/ixgb/Makefile (100%)
7641  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb.h (98%)
7642  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c (99%)
7643  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h (97%)
7644  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c (90%)
7645  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c (99%)
7646  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h (99%)
7647  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h (100%)
7648  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c (97%)
7649  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h (98%)
7650  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c (97%)
7651  rename drivers/net/{ => ethernet/intel}/ixgbe/Makefile (100%)
7652  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h (92%)
7653  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c (97%)
7654  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c (95%)
7655  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.c (97%)
7656  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.h (99%)
7657  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c (90%)
7658  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h (98%)
7659  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c (97%)
7660  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h (100%)
7661  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c (97%)
7662  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h (100%)
7663  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c (91%)
7664  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c (94%)
7665  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c (98%)
7666  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h (100%)
7667  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_main.c (86%)
7668  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c (100%)
7669  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h (100%)
7670  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c (100%)
7671  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h (100%)
7672  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c (78%)
7673  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h (90%)
7674  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_type.h (97%)
7675  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c (91%)
7676  rename drivers/net/{ => ethernet/intel}/ixgbevf/Makefile (100%)
7677  rename drivers/net/{ => ethernet/intel}/ixgbevf/defines.h (100%)
7678  rename drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c (94%)
7679  rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h (98%)
7680  rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf_main.c (97%)
7681  rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c (100%)
7682  rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h (100%)
7683  rename drivers/net/{ => ethernet/intel}/ixgbevf/regs.h (100%)
7684  rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.c (100%)
7685  rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.h (100%)
7686  rename drivers/net/{ => ethernet}/jme.c (99%)
7687  rename drivers/net/{ => ethernet}/jme.h (99%)
7688  rename drivers/net/{ => ethernet}/korina.c (99%)
7689  rename drivers/net/{ => ethernet}/lantiq_etop.c (99%)
7690  create mode 100644 drivers/net/ethernet/marvell/Kconfig
7691  create mode 100644 drivers/net/ethernet/marvell/Makefile
7692  rename drivers/net/{ => ethernet/marvell}/mv643xx_eth.c (99%)
7693  rename drivers/net/{ => ethernet/marvell}/pxa168_eth.c (100%)
7694  rename drivers/net/{ => ethernet/marvell}/skge.c (98%)
7695  rename drivers/net/{ => ethernet/marvell}/skge.h (100%)
7696  rename drivers/net/{ => ethernet/marvell}/sky2.c (98%)
7697  rename drivers/net/{ => ethernet/marvell}/sky2.h (100%)
7698  create mode 100644 drivers/net/ethernet/mellanox/Kconfig
7699  create mode 100644 drivers/net/ethernet/mellanox/Makefile
7700  create mode 100644 drivers/net/ethernet/mellanox/mlx4/Kconfig
7701  rename drivers/net/{ => ethernet/mellanox}/mlx4/Makefile (100%)
7702  rename drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c (100%)
7703  rename drivers/net/{ => ethernet/mellanox}/mlx4/catas.c (100%)
7704  rename drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c (100%)
7705  rename drivers/net/{ => ethernet/mellanox}/mlx4/cq.c (100%)
7706  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c (100%)
7707  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_ethtool.c (100%)
7708  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c (100%)
7709  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_netdev.c (99%)
7710  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c (100%)
7711  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h (100%)
7712  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_resources.c (100%)
7713  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c (100%)
7714  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_selftest.c (100%)
7715  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c (100%)
7716  rename drivers/net/{ => ethernet/mellanox}/mlx4/eq.c (100%)
7717  rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.c (100%)
7718  rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.h (100%)
7719  rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.c (100%)
7720  rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.h (100%)
7721  rename drivers/net/{ => ethernet/mellanox}/mlx4/intf.c (100%)
7722  rename drivers/net/{ => ethernet/mellanox}/mlx4/main.c (100%)
7723  rename drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c (100%)
7724  rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h (100%)
7725  rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h (100%)
7726  rename drivers/net/{ => ethernet/mellanox}/mlx4/mr.c (100%)
7727  rename drivers/net/{ => ethernet/mellanox}/mlx4/pd.c (100%)
7728  rename drivers/net/{ => ethernet/mellanox}/mlx4/port.c (100%)
7729  rename drivers/net/{ => ethernet/mellanox}/mlx4/profile.c (100%)
7730  rename drivers/net/{ => ethernet/mellanox}/mlx4/qp.c (100%)
7731  rename drivers/net/{ => ethernet/mellanox}/mlx4/reset.c (100%)
7732  rename drivers/net/{ => ethernet/mellanox}/mlx4/sense.c (100%)
7733  rename drivers/net/{ => ethernet/mellanox}/mlx4/srq.c (100%)
7734  create mode 100644 drivers/net/ethernet/micrel/Kconfig
7735  create mode 100644 drivers/net/ethernet/micrel/Makefile
7736  rename drivers/net/{arm => ethernet/micrel}/ks8695net.c (99%)
7737  rename drivers/net/{arm => ethernet/micrel}/ks8695net.h (100%)
7738  rename drivers/net/{ => ethernet/micrel}/ks8842.c (100%)
7739  rename drivers/net/{ => ethernet/micrel}/ks8851.c (100%)
7740  rename drivers/net/{ => ethernet/micrel}/ks8851.h (100%)
7741  rename drivers/net/{ => ethernet/micrel}/ks8851_mll.c (100%)
7742  rename drivers/net/{ => ethernet/micrel}/ksz884x.c (99%)
7743  create mode 100644 drivers/net/ethernet/microchip/Kconfig
7744  create mode 100644 drivers/net/ethernet/microchip/Makefile
7745  rename drivers/net/{ => ethernet/microchip}/enc28j60.c (99%)
7746  rename drivers/net/{ => ethernet/microchip}/enc28j60_hw.h (100%)
7747  rename drivers/net/{ => ethernet}/mipsnet.c (99%)
7748  create mode 100644 drivers/net/ethernet/myricom/Kconfig
7749  create mode 100644 drivers/net/ethernet/myricom/Makefile
7750  rename drivers/net/{ => ethernet/myricom}/myri10ge/Makefile (100%)
7751  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge.c (99%)
7752  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h (100%)
7753  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp_gen_header.h (100%)
7754  create mode 100644 drivers/net/ethernet/natsemi/Kconfig
7755  create mode 100644 drivers/net/ethernet/natsemi/Makefile
7756  rename drivers/net/{ => ethernet/natsemi}/ibmlana.c (99%)
7757  rename drivers/net/{ => ethernet/natsemi}/ibmlana.h (100%)
7758  rename drivers/net/{ => ethernet/natsemi}/jazzsonic.c (99%)
7759  rename drivers/net/{ => ethernet/natsemi}/macsonic.c (98%)
7760  rename drivers/net/{ => ethernet/natsemi}/natsemi.c (99%)
7761  rename drivers/net/{ => ethernet/natsemi}/ns83820.c (99%)
7762  rename drivers/net/{ => ethernet/natsemi}/sonic.c (100%)
7763  rename drivers/net/{ => ethernet/natsemi}/sonic.h (100%)
7764  rename drivers/net/{ => ethernet/natsemi}/xtsonic.c (99%)
7765  create mode 100644 drivers/net/ethernet/neterion/Kconfig
7766  create mode 100644 drivers/net/ethernet/neterion/Makefile
7767  rename drivers/net/{ => ethernet/neterion}/s2io-regs.h (100%)
7768  rename drivers/net/{ => ethernet/neterion}/s2io.c (99%)
7769  rename drivers/net/{ => ethernet/neterion}/s2io.h (100%)
7770  rename drivers/net/{ => ethernet/neterion}/vxge/Makefile (100%)
7771  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.c (99%)
7772  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.h (99%)
7773  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.c (100%)
7774  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.h (100%)
7775  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.c (99%)
7776  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.h (100%)
7777  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-reg.h (100%)
7778  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.c (99%)
7779  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.h (100%)
7780  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-version.h (100%)
7781  rename drivers/net/{ => ethernet}/netx-eth.c (99%)
7782  create mode 100644 drivers/net/ethernet/nuvoton/Kconfig
7783  create mode 100644 drivers/net/ethernet/nuvoton/Makefile
7784  rename drivers/net/{arm => ethernet/nuvoton}/w90p910_ether.c (99%)
7785  create mode 100644 drivers/net/ethernet/nvidia/Kconfig
7786  create mode 100644 drivers/net/ethernet/nvidia/Makefile
7787  rename drivers/net/{ => ethernet/nvidia}/forcedeth.c (99%)
7788  rename drivers/net/{ => ethernet}/octeon/Kconfig (85%)
7789  create mode 100644 drivers/net/ethernet/octeon/Makefile
7790  rename drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (99%)
7791  create mode 100644 drivers/net/ethernet/oki-semi/Kconfig
7792  create mode 100644 drivers/net/ethernet/oki-semi/Makefile
7793  create mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
7794  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/Makefile (100%)
7795  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h (100%)
7796  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c (100%)
7797  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h (100%)
7798  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_ethtool.c (100%)
7799  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c (99%)
7800  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_param.c (100%)
7801  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c (100%)
7802  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h (100%)
7803  create mode 100644 drivers/net/ethernet/packetengines/Kconfig
7804  create mode 100644 drivers/net/ethernet/packetengines/Makefile
7805  rename drivers/net/{ => ethernet/packetengines}/hamachi.c (99%)
7806  rename drivers/net/{ => ethernet/packetengines}/yellowfin.c (99%)
7807  create mode 100644 drivers/net/ethernet/pasemi/Kconfig
7808  create mode 100644 drivers/net/ethernet/pasemi/Makefile
7809  rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.c (99%)
7810  rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.h (100%)
7811  rename drivers/net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c (100%)
7812  create mode 100644 drivers/net/ethernet/qlogic/Kconfig
7813  create mode 100644 drivers/net/ethernet/qlogic/Makefile
7814  rename drivers/net/{ => ethernet/qlogic}/netxen/Makefile (100%)
7815  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic.h (99%)
7816  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c (100%)
7817  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ethtool.c (100%)
7818  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h (100%)
7819  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.c (100%)
7820  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.h (100%)
7821  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_init.c (99%)
7822  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_main.c (94%)
7823  rename drivers/net/{ => ethernet/qlogic}/qla3xxx.c (99%)
7824  rename drivers/net/{ => ethernet/qlogic}/qla3xxx.h (100%)
7825  rename drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile (100%)
7826  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h (98%)
7827  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c (82%)
7828  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c (96%)
7829  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h (99%)
7830  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c (99%)
7831  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c (98%)
7832  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c (95%)
7833  rename drivers/net/{ => ethernet/qlogic}/qlge/Makefile (100%)
7834  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge.h (100%)
7835  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c (100%)
7836  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c (100%)
7837  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c (99%)
7838  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c (100%)
7839  create mode 100644 drivers/net/ethernet/racal/Kconfig
7840  create mode 100644 drivers/net/ethernet/racal/Makefile
7841  rename drivers/net/{ => ethernet/racal}/ni5010.c (99%)
7842  rename drivers/net/{ => ethernet/racal}/ni5010.h (100%)
7843  create mode 100644 drivers/net/ethernet/rdc/Kconfig
7844  create mode 100644 drivers/net/ethernet/rdc/Makefile
7845  rename drivers/net/{ => ethernet/rdc}/r6040.c (99%)
7846  rename drivers/net/{ => ethernet/realtek}/8139cp.c (99%)
7847  rename drivers/net/{ => ethernet/realtek}/8139too.c (99%)
7848  create mode 100644 drivers/net/ethernet/realtek/Kconfig
7849  create mode 100644 drivers/net/ethernet/realtek/Makefile
7850  rename drivers/net/{ => ethernet/realtek}/atp.c (99%)
7851  rename drivers/net/{ => ethernet/realtek}/atp.h (100%)
7852  rename drivers/net/{ => ethernet/realtek}/r8169.c (91%)
7853  rename drivers/net/{ => ethernet/realtek}/sc92031.c (98%)
7854  create mode 100644 drivers/net/ethernet/renesas/Kconfig
7855  create mode 100644 drivers/net/ethernet/renesas/Makefile
7856  rename drivers/net/{ => ethernet/renesas}/sh_eth.c (98%)
7857  rename drivers/net/{ => ethernet/renesas}/sh_eth.h (97%)
7858  rename drivers/net/{ => ethernet}/s6gmac.c (100%)
7859  create mode 100644 drivers/net/ethernet/seeq/Kconfig
7860  create mode 100644 drivers/net/ethernet/seeq/Makefile
7861  rename drivers/net/{arm => ethernet/seeq}/ether3.c (99%)
7862  rename drivers/net/{arm => ethernet/seeq}/ether3.h (100%)
7863  rename drivers/net/{ => ethernet/seeq}/seeq8005.c (99%)
7864  rename drivers/net/{ => ethernet/seeq}/seeq8005.h (100%)
7865  rename drivers/net/{ => ethernet/seeq}/sgiseeq.c (99%)
7866  rename drivers/net/{ => ethernet/seeq}/sgiseeq.h (100%)
7867  rename drivers/net/{ => ethernet}/sfc/Kconfig (96%)
7868  rename drivers/net/{ => ethernet}/sfc/Makefile (100%)
7869  rename drivers/net/{ => ethernet}/sfc/bitfield.h (100%)
7870  rename drivers/net/{ => ethernet}/sfc/efx.c (98%)
7871  rename drivers/net/{ => ethernet}/sfc/efx.h (95%)
7872  rename drivers/net/{ => ethernet}/sfc/enum.h (100%)
7873  rename drivers/net/{ => ethernet}/sfc/ethtool.c (91%)
7874  rename drivers/net/{ => ethernet}/sfc/falcon.c (99%)
7875  rename drivers/net/{ => ethernet}/sfc/falcon_boards.c (100%)
7876  rename drivers/net/{ => ethernet}/sfc/falcon_xmac.c (100%)
7877  rename drivers/net/{ => ethernet}/sfc/filter.c (100%)
7878  rename drivers/net/{ => ethernet}/sfc/filter.h (100%)
7879  rename drivers/net/{ => ethernet}/sfc/io.h (100%)
7880  rename drivers/net/{ => ethernet}/sfc/mac.h (100%)
7881  rename drivers/net/{ => ethernet}/sfc/mcdi.c (100%)
7882  rename drivers/net/{ => ethernet}/sfc/mcdi.h (100%)
7883  rename drivers/net/{ => ethernet}/sfc/mcdi_mac.c (100%)
7884  rename drivers/net/{ => ethernet}/sfc/mcdi_pcol.h (100%)
7885  rename drivers/net/{ => ethernet}/sfc/mcdi_phy.c (100%)
7886  rename drivers/net/{ => ethernet}/sfc/mdio_10g.c (100%)
7887  rename drivers/net/{ => ethernet}/sfc/mdio_10g.h (100%)
7888  rename drivers/net/{ => ethernet}/sfc/mtd.c (100%)
7889  rename drivers/net/{ => ethernet}/sfc/net_driver.h (100%)
7890  rename drivers/net/{ => ethernet}/sfc/nic.c (100%)
7891  rename drivers/net/{ => ethernet}/sfc/nic.h (99%)
7892  rename drivers/net/{ => ethernet}/sfc/phy.h (100%)
7893  rename drivers/net/{ => ethernet}/sfc/qt202x_phy.c (100%)
7894  rename drivers/net/{ => ethernet}/sfc/regs.h (100%)
7895  rename drivers/net/{ => ethernet}/sfc/rx.c (99%)
7896  rename drivers/net/{ => ethernet}/sfc/selftest.c (100%)
7897  rename drivers/net/{ => ethernet}/sfc/selftest.h (100%)
7898  rename drivers/net/{ => ethernet}/sfc/siena.c (99%)
7899  rename drivers/net/{ => ethernet}/sfc/spi.h (100%)
7900  rename drivers/net/{ => ethernet}/sfc/tenxpress.c (100%)
7901  rename drivers/net/{ => ethernet}/sfc/tx.c (99%)
7902  rename drivers/net/{ => ethernet}/sfc/txc43128_phy.c (100%)
7903  rename drivers/net/{ => ethernet}/sfc/workarounds.h (100%)
7904  create mode 100644 drivers/net/ethernet/sgi/Kconfig
7905  create mode 100644 drivers/net/ethernet/sgi/Makefile
7906  rename drivers/net/{ => ethernet/sgi}/ioc3-eth.c (99%)
7907  rename drivers/net/{ => ethernet/sgi}/meth.c (100%)
7908  rename drivers/net/{ => ethernet/sgi}/meth.h (100%)
7909  create mode 100644 drivers/net/ethernet/sis/Kconfig
7910  create mode 100644 drivers/net/ethernet/sis/Makefile
7911  rename drivers/net/{ => ethernet/sis}/sis190.c (99%)
7912  rename drivers/net/{ => ethernet/sis}/sis900.c (99%)
7913  rename drivers/net/{ => ethernet/sis}/sis900.h (100%)
7914  create mode 100644 drivers/net/ethernet/smsc/Kconfig
7915  create mode 100644 drivers/net/ethernet/smsc/Makefile
7916  rename drivers/net/{ => ethernet/smsc}/epic100.c (99%)
7917  rename drivers/net/{ => ethernet/smsc}/smc911x.c (99%)
7918  rename drivers/net/{ => ethernet/smsc}/smc911x.h (100%)
7919  rename drivers/net/{ => ethernet/smsc}/smc9194.c (99%)
7920  rename drivers/net/{ => ethernet/smsc}/smc9194.h (100%)
7921  rename drivers/net/{pcmcia => ethernet/smsc}/smc91c92_cs.c (99%)
7922  rename drivers/net/{ => ethernet/smsc}/smc91x.c (99%)
7923  rename drivers/net/{ => ethernet/smsc}/smc91x.h (100%)
7924  rename drivers/net/{ => ethernet/smsc}/smsc911x.c (96%)
7925  rename drivers/net/{ => ethernet/smsc}/smsc911x.h (100%)
7926  rename drivers/net/{ => ethernet/smsc}/smsc9420.c (99%)
7927  rename drivers/net/{ => ethernet/smsc}/smsc9420.h (100%)
7928  create mode 100644 drivers/net/ethernet/stmicro/Kconfig
7929  create mode 100644 drivers/net/ethernet/stmicro/Makefile
7930  rename drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig (80%)
7931  rename drivers/net/{ => ethernet/stmicro}/stmmac/Makefile (68%)
7932  rename drivers/net/{ => ethernet/stmicro}/stmmac/common.h (89%)
7933  rename drivers/net/{ => ethernet/stmicro}/stmmac/descs.h (100%)
7934  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100.h (100%)
7935  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000.h (100%)
7936  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_core.c (96%)
7937  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c (95%)
7938  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_core.c (91%)
7939  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_dma.c (100%)
7940  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h (98%)
7941  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c (100%)
7942  rename drivers/net/{ => ethernet/stmicro}/stmmac/enh_desc.c (100%)
7943  create mode 100644 drivers/net/ethernet/stmicro/stmmac/mmc.h
7944  create mode 100644 drivers/net/ethernet/stmicro/stmmac/mmc_core.c
7945  rename drivers/net/{ => ethernet/stmicro}/stmmac/norm_desc.c (100%)
7946  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h (95%)
7947  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c (66%)
7948  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_main.c (84%)
7949  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_mdio.c (100%)
7950  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.c (100%)
7951  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.h (100%)
7952  create mode 100644 drivers/net/ethernet/sun/Kconfig
7953  create mode 100644 drivers/net/ethernet/sun/Makefile
7954  rename drivers/net/{ => ethernet/sun}/cassini.c (99%)
7955  rename drivers/net/{ => ethernet/sun}/cassini.h (100%)
7956  rename drivers/net/{ => ethernet/sun}/niu.c (99%)
7957  rename drivers/net/{ => ethernet/sun}/niu.h (100%)
7958  rename drivers/net/{ => ethernet/sun}/sunbmac.c (97%)
7959  rename drivers/net/{ => ethernet/sun}/sunbmac.h (95%)
7960  rename drivers/net/{ => ethernet/sun}/sungem.c (99%)
7961  rename drivers/net/{ => ethernet/sun}/sungem.h (100%)
7962  rename drivers/net/{ => ethernet/sun}/sunhme.c (99%)
7963  rename drivers/net/{ => ethernet/sun}/sunhme.h (100%)
7964  rename drivers/net/{ => ethernet/sun}/sunqe.c (99%)
7965  rename drivers/net/{ => ethernet/sun}/sunqe.h (100%)
7966  rename drivers/net/{ => ethernet/sun}/sunvnet.c (99%)
7967  rename drivers/net/{ => ethernet/sun}/sunvnet.h (100%)
7968  create mode 100644 drivers/net/ethernet/tehuti/Kconfig
7969  create mode 100644 drivers/net/ethernet/tehuti/Makefile
7970  rename drivers/net/{ => ethernet/tehuti}/tehuti.c (99%)
7971  rename drivers/net/{ => ethernet/tehuti}/tehuti.h (100%)
7972  create mode 100644 drivers/net/ethernet/ti/Kconfig
7973  create mode 100644 drivers/net/ethernet/ti/Makefile
7974  rename drivers/net/{ => ethernet/ti}/cpmac.c (99%)
7975  rename drivers/net/{ => ethernet/ti}/davinci_cpdma.c (100%)
7976  rename drivers/net/{ => ethernet/ti}/davinci_cpdma.h (100%)
7977  rename drivers/net/{ => ethernet/ti}/davinci_emac.c (99%)
7978  rename drivers/net/{ => ethernet/ti}/davinci_mdio.c (100%)
7979  rename drivers/net/{ => ethernet/ti}/tlan.c (99%)
7980  rename drivers/net/{ => ethernet/ti}/tlan.h (100%)
7981  create mode 100644 drivers/net/ethernet/tile/Kconfig
7982  rename drivers/net/{ => ethernet}/tile/Makefile (100%)
7983  rename drivers/net/{ => ethernet}/tile/tilepro.c (100%)
7984  create mode 100644 drivers/net/ethernet/toshiba/Kconfig
7985  create mode 100644 drivers/net/ethernet/toshiba/Makefile
7986  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c (99%)
7987  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h (100%)
7988  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.c (99%)
7989  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.h (100%)
7990  rename drivers/net/{ => ethernet/toshiba}/spider_net.c (99%)
7991  rename drivers/net/{ => ethernet/toshiba}/spider_net.h (99%)
7992  rename drivers/net/{ => ethernet/toshiba}/spider_net_ethtool.c (100%)
7993  rename drivers/net/{ => ethernet/toshiba}/tc35815.c (99%)
7994  create mode 100644 drivers/net/ethernet/tundra/Kconfig
7995  create mode 100644 drivers/net/ethernet/tundra/Makefile
7996  rename drivers/net/{ => ethernet/tundra}/tsi108_eth.c (99%)
7997  rename drivers/net/{ => ethernet/tundra}/tsi108_eth.h (100%)
7998  create mode 100644 drivers/net/ethernet/via/Kconfig
7999  create mode 100644 drivers/net/ethernet/via/Makefile
8000  rename drivers/net/{ => ethernet/via}/via-rhine.c (99%)
8001  rename drivers/net/{ => ethernet/via}/via-velocity.c (97%)
8002  rename drivers/net/{ => ethernet/via}/via-velocity.h (100%)
8003  create mode 100644 drivers/net/ethernet/xilinx/Kconfig
8004  create mode 100644 drivers/net/ethernet/xilinx/Makefile
8005  rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%)
8006  rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (99%)
8007  rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%)
8008  rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%)
8009  create mode 100644 drivers/net/ethernet/xircom/Kconfig
8010  create mode 100644 drivers/net/ethernet/xircom/Makefile
8011  rename drivers/net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c (99%)
8012  create mode 100644 drivers/net/ethernet/xscale/Kconfig
8013  create mode 100644 drivers/net/ethernet/xscale/Makefile
8014  rename drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig (94%)
8015  rename drivers/net/{ => ethernet/xscale}/ixp2000/Makefile (100%)
8016  rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c (100%)
8017  rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h (100%)
8018  rename drivers/net/{ => ethernet/xscale}/ixp2000/enp2611.c (100%)
8019  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.c (100%)
8020  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.h (100%)
8021  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc (100%)
8022  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode (100%)
8023  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc (100%)
8024  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode (100%)
8025  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c (100%)
8026  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h (100%)
8027  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev_priv.h (100%)
8028  rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c (100%)
8029  rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h (100%)
8030  rename drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c (99%)
8031  create mode 100644 drivers/net/fddi/Kconfig
8032  create mode 100644 drivers/net/fddi/Makefile
8033  rename drivers/net/{ => fddi}/defxx.c (99%)
8034  rename drivers/net/{ => fddi}/defxx.h (100%)
8035  rename drivers/net/{ => fddi}/skfp/Makefile (100%)
8036  rename drivers/net/{ => fddi}/skfp/cfm.c (100%)
8037  rename drivers/net/{ => fddi}/skfp/drvfbi.c (100%)
8038  rename drivers/net/{ => fddi}/skfp/ecm.c (100%)
8039  rename drivers/net/{ => fddi}/skfp/ess.c (100%)
8040  rename drivers/net/{ => fddi}/skfp/fplustm.c (100%)
8041  rename drivers/net/{ => fddi}/skfp/h/cmtdef.h (99%)
8042  rename drivers/net/{ => fddi}/skfp/h/fddi.h (100%)
8043  rename drivers/net/{ => fddi}/skfp/h/fddimib.h (100%)
8044  rename drivers/net/{ => fddi}/skfp/h/fplustm.h (100%)
8045  rename drivers/net/{ => fddi}/skfp/h/hwmtm.h (99%)
8046  rename drivers/net/{ => fddi}/skfp/h/mbuf.h (100%)
8047  rename drivers/net/{ => fddi}/skfp/h/osdef1st.h (100%)
8048  rename drivers/net/{ => fddi}/skfp/h/sba.h (98%)
8049  rename drivers/net/{ => fddi}/skfp/h/sba_def.h (100%)
8050  rename drivers/net/{ => fddi}/skfp/h/skfbi.h (100%)
8051  rename drivers/net/{ => fddi}/skfp/h/skfbiinc.h (99%)
8052  rename drivers/net/{ => fddi}/skfp/h/smc.h (98%)
8053  rename drivers/net/{ => fddi}/skfp/h/smt.h (100%)
8054  rename drivers/net/{ => fddi}/skfp/h/smt_p.h (100%)
8055  rename drivers/net/{ => fddi}/skfp/h/smtstate.h (100%)
8056  rename drivers/net/{ => fddi}/skfp/h/supern_2.h (100%)
8057  rename drivers/net/{ => fddi}/skfp/h/targethw.h (98%)
8058  rename drivers/net/{ => fddi}/skfp/h/targetos.h (99%)
8059  rename drivers/net/{ => fddi}/skfp/h/types.h (100%)
8060  rename drivers/net/{ => fddi}/skfp/hwmtm.c (100%)
8061  rename drivers/net/{ => fddi}/skfp/hwt.c (100%)
8062  rename drivers/net/{ => fddi}/skfp/pcmplc.c (100%)
8063  rename drivers/net/{ => fddi}/skfp/pmf.c (100%)
8064  rename drivers/net/{ => fddi}/skfp/queue.c (100%)
8065  rename drivers/net/{ => fddi}/skfp/rmt.c (100%)
8066  rename drivers/net/{ => fddi}/skfp/skfddi.c (99%)
8067  rename drivers/net/{ => fddi}/skfp/smt.c (100%)
8068  rename drivers/net/{ => fddi}/skfp/smtdef.c (100%)
8069  rename drivers/net/{ => fddi}/skfp/smtinit.c (100%)
8070  rename drivers/net/{ => fddi}/skfp/smttimer.c (100%)
8071  rename drivers/net/{ => fddi}/skfp/srf.c (100%)
8072  create mode 100644 drivers/net/hippi/Kconfig
8073  create mode 100644 drivers/net/hippi/Makefile
8074  rename drivers/net/{ => hippi}/rrunner.c (100%)
8075  rename drivers/net/{ => hippi}/rrunner.h (100%)
8076  delete mode 100644 drivers/net/ibm_newemac/Makefile
8077  delete mode 100644 drivers/net/octeon/Makefile
8078  delete mode 100644 drivers/net/pci-skeleton.c
8079  delete mode 100644 drivers/net/pcmcia/Kconfig
8080  delete mode 100644 drivers/net/pcmcia/Makefile
8081  create mode 100644 drivers/net/plip/Kconfig
8082  create mode 100644 drivers/net/plip/Makefile
8083  rename drivers/net/{ => plip}/plip.c (100%)
8084  create mode 100644 drivers/net/ppp/Kconfig
8085  create mode 100644 drivers/net/ppp/Makefile
8086  rename drivers/net/{ => ppp}/bsd_comp.c (100%)
8087  rename drivers/net/{ => ppp}/ppp_async.c (100%)
8088  rename drivers/net/{ => ppp}/ppp_deflate.c (100%)
8089  rename drivers/net/{ => ppp}/ppp_generic.c (100%)
8090  rename drivers/net/{ => ppp}/ppp_mppe.c (100%)
8091  rename drivers/net/{ => ppp}/ppp_mppe.h (100%)
8092  rename drivers/net/{ => ppp}/ppp_synctty.c (100%)
8093  rename drivers/net/{ => ppp}/pppoe.c (100%)
8094  rename drivers/net/{ => ppp}/pppox.c (100%)
8095  rename drivers/net/{ => ppp}/pptp.c (100%)
8096  create mode 100644 drivers/net/slip/Kconfig
8097  create mode 100644 drivers/net/slip/Makefile
8098  rename drivers/net/{ => slip}/slhc.c (100%)
8099  rename drivers/net/{ => slip}/slip.c (98%)
8100  rename drivers/net/{ => slip}/slip.h (94%)
8101  rename drivers/net/{pcmcia => tokenring}/ibmtr_cs.c (99%)
8102  create mode 100644 drivers/net/wireless/ath/ath6kl/Kconfig
8103  create mode 100644 drivers/net/wireless/ath/ath6kl/Makefile
8104  create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.c
8105  create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.h
8106  create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.c
8107  create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.h
8108  create mode 100644 drivers/net/wireless/ath/ath6kl/common.h
8109  create mode 100644 drivers/net/wireless/ath/ath6kl/core.h
8110  create mode 100644 drivers/net/wireless/ath/ath6kl/debug.c
8111  create mode 100644 drivers/net/wireless/ath/ath6kl/debug.h
8112  create mode 100644 drivers/net/wireless/ath/ath6kl/hif-ops.h
8113  create mode 100644 drivers/net/wireless/ath/ath6kl/hif.h
8114  create mode 100644 drivers/net/wireless/ath/ath6kl/htc.c
8115  create mode 100644 drivers/net/wireless/ath/ath6kl/htc.h
8116  create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.c
8117  create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.h
8118  create mode 100644 drivers/net/wireless/ath/ath6kl/init.c
8119  create mode 100644 drivers/net/wireless/ath/ath6kl/main.c
8120  create mode 100644 drivers/net/wireless/ath/ath6kl/node.c
8121  create mode 100644 drivers/net/wireless/ath/ath6kl/sdio.c
8122  create mode 100644 drivers/net/wireless/ath/ath6kl/target.h
8123  create mode 100644 drivers/net/wireless/ath/ath6kl/txrx.c
8124  create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.c
8125  create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.h
8126  create mode 100644 drivers/net/wireless/ath/ath9k/ar9480_1p0_initvals.h
8127  create mode 100644 drivers/net/wireless/ath/ath9k/ar9480_2p0_initvals.h
8128  create mode 100644 drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
8129  delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
8130  create mode 100644 drivers/net/wireless/iwlwifi/iwl-cfg.h
8131  create mode 100644 drivers/net/wireless/iwlwifi/iwl-shared.h
8132  delete mode 100644 drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h
8133  create mode 100644 drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
8134  create mode 100644 drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
8135  rename drivers/net/wireless/iwlwifi/{iwl-trans-tx-pcie.c => iwl-trans-pcie-tx.c} (53%)
8136  create mode 100644 drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
8137  delete mode 100644 drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c
8138  create mode 100644 drivers/nfc/nfcwilink.c
8139  delete mode 100644 drivers/staging/ath6kl/Kconfig
8140  delete mode 100644 drivers/staging/ath6kl/Makefile
8141  delete mode 100644 drivers/staging/ath6kl/TODO
8142  delete mode 100644 drivers/staging/ath6kl/bmi/include/bmi_internal.h
8143  delete mode 100644 drivers/staging/ath6kl/bmi/src/bmi.c
8144  delete mode 100644 drivers/staging/ath6kl/hif/common/hif_sdio_common.h
8145  delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
8146  delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
8147  delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
8148  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.c
8149  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.h
8150  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
8151  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
8152  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
8153  delete mode 100644 drivers/staging/ath6kl/htc2/htc.c
8154  delete mode 100644 drivers/staging/ath6kl/htc2/htc_debug.h
8155  delete mode 100644 drivers/staging/ath6kl/htc2/htc_internal.h
8156  delete mode 100644 drivers/staging/ath6kl/htc2/htc_recv.c
8157  delete mode 100644 drivers/staging/ath6kl/htc2/htc_send.c
8158  delete mode 100644 drivers/staging/ath6kl/htc2/htc_services.c
8159  delete mode 100644 drivers/staging/ath6kl/include/a_config.h
8160  delete mode 100644 drivers/staging/ath6kl/include/a_debug.h
8161  delete mode 100644 drivers/staging/ath6kl/include/a_drv.h
8162  delete mode 100644 drivers/staging/ath6kl/include/a_drv_api.h
8163  delete mode 100644 drivers/staging/ath6kl/include/a_osapi.h
8164  delete mode 100644 drivers/staging/ath6kl/include/aggr_recv_api.h
8165  delete mode 100644 drivers/staging/ath6kl/include/ar3kconfig.h
8166  delete mode 100644 drivers/staging/ath6kl/include/ar6000_api.h
8167  delete mode 100644 drivers/staging/ath6kl/include/ar6000_diag.h
8168  delete mode 100644 drivers/staging/ath6kl/include/ar6kap_common.h
8169  delete mode 100644 drivers/staging/ath6kl/include/athbtfilter.h
8170  delete mode 100644 drivers/staging/ath6kl/include/bmi.h
8171  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
8172  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/addrs.h
8173  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
8174  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
8175  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
8176  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
8177  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
8178  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
8179  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
8180  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
8181  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
8182  delete mode 100644 drivers/staging/ath6kl/include/common/athdefs.h
8183  delete mode 100644 drivers/staging/ath6kl/include/common/bmi_msg.h
8184  delete mode 100644 drivers/staging/ath6kl/include/common/cnxmgmt.h
8185  delete mode 100644 drivers/staging/ath6kl/include/common/dbglog.h
8186  delete mode 100644 drivers/staging/ath6kl/include/common/dbglog_id.h
8187  delete mode 100644 drivers/staging/ath6kl/include/common/discovery.h
8188  delete mode 100644 drivers/staging/ath6kl/include/common/epping_test.h
8189  delete mode 100644 drivers/staging/ath6kl/include/common/gmboxif.h
8190  delete mode 100644 drivers/staging/ath6kl/include/common/gpio_reg.h
8191  delete mode 100644 drivers/staging/ath6kl/include/common/htc.h
8192  delete mode 100644 drivers/staging/ath6kl/include/common/htc_services.h
8193  delete mode 100644 drivers/staging/ath6kl/include/common/pkt_log.h
8194  delete mode 100644 drivers/staging/ath6kl/include/common/roaming.h
8195  delete mode 100644 drivers/staging/ath6kl/include/common/targaddrs.h
8196  delete mode 100644 drivers/staging/ath6kl/include/common/testcmd.h
8197  delete mode 100644 drivers/staging/ath6kl/include/common/tlpm.h
8198  delete mode 100644 drivers/staging/ath6kl/include/common/wlan_defs.h
8199  delete mode 100644 drivers/staging/ath6kl/include/common/wmi.h
8200  delete mode 100644 drivers/staging/ath6kl/include/common/wmix.h
8201  delete mode 100644 drivers/staging/ath6kl/include/common_drv.h
8202  delete mode 100644 drivers/staging/ath6kl/include/dbglog_api.h
8203  delete mode 100644 drivers/staging/ath6kl/include/dl_list.h
8204  delete mode 100644 drivers/staging/ath6kl/include/dset_api.h
8205  delete mode 100644 drivers/staging/ath6kl/include/hci_transport_api.h
8206  delete mode 100644 drivers/staging/ath6kl/include/hif.h
8207  delete mode 100644 drivers/staging/ath6kl/include/host_version.h
8208  delete mode 100644 drivers/staging/ath6kl/include/htc_api.h
8209  delete mode 100644 drivers/staging/ath6kl/include/htc_packet.h
8210  delete mode 100644 drivers/staging/ath6kl/include/wlan_api.h
8211  delete mode 100644 drivers/staging/ath6kl/include/wmi_api.h
8212  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kconfig.c
8213  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
8214  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
8215  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
8216  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
8217  delete mode 100644 drivers/staging/ath6kl/miscdrv/common_drv.c
8218  delete mode 100644 drivers/staging/ath6kl/miscdrv/credit_dist.c
8219  delete mode 100644 drivers/staging/ath6kl/miscdrv/miscdrv.h
8220  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_drv.c
8221  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_pm.c
8222  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
8223  delete mode 100644 drivers/staging/ath6kl/os/linux/cfg80211.c
8224  delete mode 100644 drivers/staging/ath6kl/os/linux/export_hci_transport.c
8225  delete mode 100644 drivers/staging/ath6kl/os/linux/hci_bridge.c
8226  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
8227  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
8228  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
8229  delete mode 100644 drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
8230  delete mode 100644 drivers/staging/ath6kl/os/linux/include/cfg80211.h
8231  delete mode 100644 drivers/staging/ath6kl/os/linux/include/config_linux.h
8232  delete mode 100644 drivers/staging/ath6kl/os/linux/include/debug_linux.h
8233  delete mode 100644 drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
8234  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
8235  delete mode 100644 drivers/staging/ath6kl/os/linux/include/osapi_linux.h
8236  delete mode 100644 drivers/staging/ath6kl/os/linux/include/wlan_config.h
8237  delete mode 100644 drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
8238  delete mode 100644 drivers/staging/ath6kl/os/linux/netbuf.c
8239  delete mode 100644 drivers/staging/ath6kl/reorder/aggr_rx_internal.h
8240  delete mode 100644 drivers/staging/ath6kl/reorder/rcv_aggr.c
8241  delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211.h
8242  delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211_node.h
8243  delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_node.c
8244  delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
8245  delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_utils.c
8246  delete mode 100644 drivers/staging/ath6kl/wmi/wmi.c
8247  delete mode 100644 drivers/staging/ath6kl/wmi/wmi_host.h
8248  create mode 100644 include/linux/bcma/bcma_driver_mips.h
8249  create mode 100644 include/linux/bcma/bcma_soc.h
8250  create mode 100644 include/linux/can/gw.h
8251  rename {arch/sh/include/asm => include/linux}/sh_eth.h (90%)
8252  rename {drivers/net => include/linux}/sungem_phy.h (98%)
8253  create mode 100644 include/net/cfg80211-wext.h
8254  create mode 100644 include/net/nfc/nci.h
8255  create mode 100644 include/net/nfc/nci_core.h
8256  rename include/net/{ => nfc}/nfc.h (94%)
8257  delete mode 100644 net/batman-adv/aggregation.c
8258  delete mode 100644 net/batman-adv/aggregation.h
8259  create mode 100644 net/batman-adv/bat_iv_ogm.c
8260  create mode 100644 net/batman-adv/bat_ogm.h
8261  create mode 100644 net/can/gw.c
8262  create mode 100644 net/ieee802154/6lowpan.c
8263  create mode 100644 net/ieee802154/6lowpan.h
8264  create mode 100644 net/nfc/nci/Kconfig
8265  create mode 100644 net/nfc/nci/Makefile
8266  create mode 100644 net/nfc/nci/core.c
8267  create mode 100644 net/nfc/nci/data.c
8268  create mode 100644 net/nfc/nci/lib.c
8269  create mode 100644 net/nfc/nci/ntf.c
8270  create mode 100644 net/nfc/nci/rsp.c
8271  delete mode 100644 net/rds/xlist.h
8272 Merging wireless/master
8273 $ git merge wireless/master
8274 Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution.
8275 Auto-merging Documentation/feature-removal-schedule.txt
8276 CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
8277 Removing drivers/net/wireless/ath/ath6kl/node.c
8278 Auto-merging drivers/net/wireless/libertas/main.c
8279 Auto-merging drivers/net/wireless/mwifiex/main.c
8280 Auto-merging include/linux/if_ether.h
8281 Auto-merging net/mac80211/agg-rx.c
8282 Auto-merging net/mac80211/cfg.c
8283 Auto-merging net/mac80211/ibss.c
8284 Auto-merging net/mac80211/iface.c
8285 Auto-merging net/mac80211/sta_info.c
8286 Automatic merge failed; fix conflicts and then commit the result.
8287 $ git commit -v -a
8288 [master bcbfd1cd] Merge remote-tracking branch 'wireless/master'
8289 $ git diff -M --stat --summary HEAD^..
8290  Documentation/DocBook/80211.tmpl                 |   11 +-
8291  Documentation/feature-removal-schedule.txt       |    8 +
8292  drivers/net/wireless/Makefile                    |    2 +-
8293  drivers/net/wireless/at76c50x-usb.c              |   18 +-
8294  drivers/net/wireless/ath/ath5k/mac80211-ops.c    |    2 +-
8295  drivers/net/wireless/ath/ath6kl/Makefile         |    4 +-
8296  drivers/net/wireless/ath/ath6kl/bmi.c            |   23 +-
8297  drivers/net/wireless/ath/ath6kl/bmi.h            |    4 +-
8298  drivers/net/wireless/ath/ath6kl/cfg80211.c       |  894 ++++++++++++-----
8299  drivers/net/wireless/ath/ath6kl/common.h         |   83 --
8300  drivers/net/wireless/ath/ath6kl/core.h           |  145 +++-
8301  drivers/net/wireless/ath/ath6kl/debug.c          |  784 +++++++++++++++
8302  drivers/net/wireless/ath/ath6kl/debug.h          |   49 +-
8303  drivers/net/wireless/ath/ath6kl/hif-ops.h        |    5 +
8304  drivers/net/wireless/ath/ath6kl/hif.h            |    1 +
8305  drivers/net/wireless/ath/ath6kl/htc.c            |  271 +++---
8306  drivers/net/wireless/ath/ath6kl/init.c           |  794 ++++++++++++----
8307  drivers/net/wireless/ath/ath6kl/main.c           |  448 ++++++---
8308  drivers/net/wireless/ath/ath6kl/node.c           |  234 -----
8309  drivers/net/wireless/ath/ath6kl/sdio.c           |   79 ++-
8310  drivers/net/wireless/ath/ath6kl/target.h         |   41 +-
8311  drivers/net/wireless/ath/ath6kl/testmode.c       |  167 ++++
8312  drivers/net/wireless/ath/ath6kl/testmode.h       |   36 +
8313  drivers/net/wireless/ath/ath6kl/txrx.c           |   61 +-
8314  drivers/net/wireless/ath/ath6kl/wmi.c            | 1126 +++++++++++++++-------
8315  drivers/net/wireless/ath/ath6kl/wmi.h            |  350 ++++++-
8316  drivers/net/wireless/ath/ath9k/ath9k.h           |    3 +-
8317  drivers/net/wireless/ath/ath9k/eeprom.h          |    7 +-
8318  drivers/net/wireless/ath/ath9k/gpio.c            |    7 +-
8319  drivers/net/wireless/ath/ath9k/hif_usb.c         |    1 +
8320  drivers/net/wireless/ath/ath9k/htc_drv_gpio.c    |   10 +-
8321  drivers/net/wireless/ath/ath9k/htc_drv_main.c    |    3 +-
8322  drivers/net/wireless/ath/ath9k/hw.c              |   11 +-
8323  drivers/net/wireless/ath/ath9k/main.c            |    6 +-
8324  drivers/net/wireless/ath/ath9k/rc.c              |    6 -
8325  drivers/net/wireless/ath/ath9k/recv.c            |   23 +-
8326  drivers/net/wireless/ath/ath9k/xmit.c            |   19 +-
8327  drivers/net/wireless/ath/carl9170/main.c         |    3 +-
8328  drivers/net/wireless/b43/main.c                  |    3 +-
8329  drivers/net/wireless/b43legacy/main.c            |    3 +-
8330  drivers/net/wireless/iwlegacy/iwl-4965-tx.c      |    2 +-
8331  drivers/net/wireless/iwlegacy/iwl-core.c         |    3 +-
8332  drivers/net/wireless/iwlegacy/iwl-core.h         |    3 +-
8333  drivers/net/wireless/iwlwifi/Kconfig             |   22 +-
8334  drivers/net/wireless/iwlwifi/Makefile            |   40 +-
8335  drivers/net/wireless/iwlwifi/iwl-agn-rs.c        |    3 -
8336  drivers/net/wireless/iwlwifi/iwl-agn-tx.c        |    2 +-
8337  drivers/net/wireless/iwlwifi/iwl-agn.c           |    1 +
8338  drivers/net/wireless/iwlwifi/iwl-core.c          |    5 +-
8339  drivers/net/wireless/iwlwifi/iwl-core.h          |    3 +-
8340  drivers/net/wireless/iwlwifi/iwl-shared.h        |    2 +-
8341  drivers/net/wireless/libertas/dev.h              |    1 +
8342  drivers/net/wireless/libertas/main.c             |   35 +
8343  drivers/net/wireless/mac80211_hwsim.c            |    3 +-
8344  drivers/net/wireless/mwifiex/11n_aggr.c          |    2 -
8345  drivers/net/wireless/mwifiex/11n_aggr.h          |    1 +
8346  drivers/net/wireless/mwifiex/cfg80211.c          |  176 +++-
8347  drivers/net/wireless/mwifiex/cfg80211.h          |    3 +-
8348  drivers/net/wireless/mwifiex/decl.h              |    8 -
8349  drivers/net/wireless/mwifiex/init.c              |    2 +-
8350  drivers/net/wireless/mwifiex/main.c              |  266 +----
8351  drivers/net/wireless/mwifiex/main.h              |   19 +-
8352  drivers/net/wireless/mwifiex/sta_ioctl.c         |   46 +-
8353  drivers/net/wireless/mwifiex/wmm.c               |   32 +-
8354  drivers/net/wireless/mwl8k.c                     |    5 +-
8355  drivers/net/wireless/p54/main.c                  |    3 +-
8356  drivers/net/wireless/p54/txrx.c                  |    2 +-
8357  drivers/net/wireless/rt2x00/rt2400pci.c          |    5 +-
8358  drivers/net/wireless/rt2x00/rt2800lib.c          |    5 +-
8359  drivers/net/wireless/rt2x00/rt2800lib.h          |    3 +-
8360  drivers/net/wireless/rt2x00/rt2x00.h             |    3 +-
8361  drivers/net/wireless/rt2x00/rt2x00mac.c          |    3 +-
8362  drivers/net/wireless/rt2x00/rt61pci.c            |    5 +-
8363  drivers/net/wireless/rt2x00/rt73usb.c            |    5 +-
8364  drivers/net/wireless/rtl818x/rtl8187/dev.c       |    3 +-
8365  drivers/net/wireless/rtlwifi/core.c              |    3 +-
8366  drivers/net/wireless/rtlwifi/usb.c               |   40 -
8367  drivers/net/wireless/rtlwifi/wifi.h              |    8 +-
8368  drivers/net/wireless/wl1251/main.c               |    3 +-
8369  drivers/net/wireless/wl12xx/main.c               |    3 +-
8370  drivers/staging/brcm80211/brcmsmac/mac80211_if.c |    7 +-
8371  include/linux/ieee80211.h                        |   85 ++
8372  include/linux/if_ether.h                         |    1 +
8373  include/linux/nl80211.h                          |   44 +
8374  include/linux/rfkill-gpio.h                      |    4 +
8375  include/net/cfg80211.h                           |   29 +
8376  include/net/ieee80211_radiotap.h                 |    1 +
8377  include/net/mac80211.h                           |  229 +++++-
8378  net/mac80211/Kconfig                             |   12 +
8379  net/mac80211/agg-rx.c                            |    2 +-
8380  net/mac80211/agg-tx.c                            |    2 +-
8381  net/mac80211/cfg.c                               |  380 +++++++-
8382  net/mac80211/debugfs_sta.c                       |   37 +-
8383  net/mac80211/driver-ops.h                        |   33 +-
8384  net/mac80211/driver-trace.h                      |   77 ++
8385  net/mac80211/ht.c                                |    2 +-
8386  net/mac80211/ibss.c                              |    4 +-
8387  net/mac80211/ieee80211_i.h                       |   16 +-
8388  net/mac80211/iface.c                             |    4 +-
8389  net/mac80211/key.c                               |    4 +-
8390  net/mac80211/main.c                              |   18 +
8391  net/mac80211/mesh.c                              |   58 --
8392  net/mac80211/mesh.h                              |    4 -
8393  net/mac80211/mesh_plink.c                        |   12 +-
8394  net/mac80211/mlme.c                              |   34 +-
8395  net/mac80211/pm.c                                |    2 +-
8396  net/mac80211/rate.c                              |    8 +-
8397  net/mac80211/rc80211_minstrel_ht.c               |    2 +
8398  net/mac80211/rx.c                                |  118 ++-
8399  net/mac80211/sta_info.c                          |  636 ++++++++++---
8400  net/mac80211/sta_info.h                          |  136 ++--
8401  net/mac80211/status.c                            |   54 +-
8402  net/mac80211/tx.c                                |  187 +++--
8403  net/mac80211/util.c                              |   76 ++-
8404  net/mac80211/wme.c                               |    4 +-
8405  net/rfkill/rfkill-gpio.c                         |   11 +
8406  net/wireless/nl80211.c                           |  109 ++-
8407  net/wireless/util.c                              |    5 +-
8408  118 files changed, 6471 insertions(+), 2500 deletions(-)
8409  delete mode 100644 drivers/net/wireless/ath/ath6kl/node.c
8410  create mode 100644 drivers/net/wireless/ath/ath6kl/testmode.c
8411  create mode 100644 drivers/net/wireless/ath/ath6kl/testmode.h
8412 Merging bluetooth/master
8413 $ git merge bluetooth/master
8414 Resolved 'net/bluetooth/hci_core.c' using previous resolution.
8415 Resolved 'net/bluetooth/l2cap_core.c' using previous resolution.
8416 Resolved 'net/bluetooth/mgmt.c' using previous resolution.
8417 Resolved 'net/bluetooth/smp.c' using previous resolution.
8418 Auto-merging drivers/bluetooth/btusb.c
8419 Auto-merging include/net/bluetooth/l2cap.h
8420 Auto-merging net/bluetooth/hci_conn.c
8421 Auto-merging net/bluetooth/hci_core.c
8422 CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c
8423 Auto-merging net/bluetooth/hidp/core.c
8424 Auto-merging net/bluetooth/l2cap_core.c
8425 CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
8426 Auto-merging net/bluetooth/mgmt.c
8427 CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c
8428 Auto-merging net/bluetooth/smp.c
8429 CONFLICT (content): Merge conflict in net/bluetooth/smp.c
8430 Automatic merge failed; fix conflicts and then commit the result.
8431 $ git commit -v -a
8432 [master c595820] Merge remote-tracking branch 'bluetooth/master'
8433 $ git diff -M --stat --summary HEAD^..
8434  drivers/bluetooth/btusb.c     |    3 +-
8435  include/net/bluetooth/l2cap.h |    3 +-
8436  net/bluetooth/af_bluetooth.c  |   30 +++++-
8437  net/bluetooth/bnep/core.c     |    5 +-
8438  net/bluetooth/cmtp/core.c     |    5 +-
8439  net/bluetooth/hci_conn.c      |   14 +-
8440  net/bluetooth/hidp/core.c     |   10 ++-
8441  net/bluetooth/l2cap_core.c    |  255 ++++++++++++++---------------------------
8442  net/bluetooth/rfcomm/core.c   |    5 +-
8443  9 files changed, 143 insertions(+), 187 deletions(-)
8444 Merging mtd/master
8445 $ git merge mtd/master
8446 Already up-to-date.
8447 Merging l2-mtd/master
8448 $ git merge l2-mtd/master
8449 Resolved 'arch/arm/mach-at91/board-afeb-9260v1.c' using previous resolution.
8450 Resolved 'arch/arm/mach-at91/board-neocore926.c' using previous resolution.
8451 Resolved 'arch/arm/mach-at91/board-rm9200dk.c' using previous resolution.
8452 Resolved 'arch/arm/mach-at91/board-sam9g20ek.c' using previous resolution.
8453 Resolved 'arch/arm/mach-at91/board-sam9m10g45ek.c' using previous resolution.
8454 Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
8455 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-afeb-9260v1.c
8456 Auto-merging arch/arm/mach-at91/board-cam60.c
8457 Auto-merging arch/arm/mach-at91/board-cap9adk.c
8458 Auto-merging arch/arm/mach-at91/board-kb9202.c
8459 Auto-merging arch/arm/mach-at91/board-neocore926.c
8460 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-neocore926.c
8461 Auto-merging arch/arm/mach-at91/board-qil-a9260.c
8462 Auto-merging arch/arm/mach-at91/board-rm9200dk.c
8463 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-rm9200dk.c
8464 Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
8465 Auto-merging arch/arm/mach-at91/board-sam9260ek.c
8466 Auto-merging arch/arm/mach-at91/board-sam9261ek.c
8467 Auto-merging arch/arm/mach-at91/board-sam9263ek.c
8468 Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
8469 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9g20ek.c
8470 Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
8471 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9m10g45ek.c
8472 Auto-merging arch/arm/mach-at91/board-sam9rlek.c
8473 Auto-merging arch/arm/mach-at91/board-snapper9260.c
8474 CONFLICT (delete/modify): 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.
8475 Auto-merging arch/arm/mach-at91/board-usb-a926x.c
8476 Auto-merging arch/arm/mach-at91/board-yl-9200.c
8477 Auto-merging arch/arm/mach-at91/include/mach/board.h
8478 Auto-merging arch/arm/mach-davinci/board-da830-evm.c
8479 Auto-merging arch/arm/mach-davinci/board-da850-evm.c
8480 Auto-merging arch/arm/mach-davinci/board-dm355-evm.c
8481 Auto-merging arch/arm/mach-davinci/board-dm355-leopard.c
8482 Auto-merging arch/arm/mach-davinci/board-dm365-evm.c
8483 Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
8484 Auto-merging arch/arm/mach-davinci/board-mityomapl138.c
8485 Auto-merging arch/arm/mach-davinci/board-neuros-osd2.c
8486 Auto-merging arch/arm/mach-davinci/board-tnetv107x-evm.c
8487 Auto-merging arch/arm/mach-ep93xx/ts72xx.c
8488 Auto-merging arch/arm/mach-mmp/aspenite.c
8489 Auto-merging arch/arm/mach-orion5x/ts78xx-setup.c
8490 Auto-merging arch/arm/mach-pxa/cm-x300.c
8491 Auto-merging arch/arm/mach-pxa/littleton.c
8492 Auto-merging arch/arm/mach-pxa/raumfeld.c
8493 Auto-merging arch/arm/mach-pxa/zylonite.c
8494 Removing drivers/mtd/maps/ceiva.c
8495 Removing drivers/mtd/maps/edb7312.c
8496 Auto-merging drivers/mtd/nand/Kconfig
8497 Auto-merging drivers/mtd/nand/atmel_nand.c
8498 Auto-merging drivers/mtd/nand/au1550nd.c
8499 Removing drivers/mtd/nand/edb7312.c
8500 Auto-merging drivers/mtd/onenand/omap2.c
8501 Automatic merge failed; fix conflicts and then commit the result.
8502 $ git rm -f arch/arm/mach-at91/board-usb-a9260.c
8503 arch/arm/mach-at91/board-afeb-9260v1.c: needs merge
8504 arch/arm/mach-at91/board-neocore926.c: needs merge
8505 arch/arm/mach-at91/board-rm9200dk.c: needs merge
8506 arch/arm/mach-at91/board-sam9g20ek.c: needs merge
8507 arch/arm/mach-at91/board-sam9m10g45ek.c: needs merge
8508 arch/arm/mach-at91/board-usb-a9260.c: needs merge
8509 rm 'arch/arm/mach-at91/board-usb-a9260.c'
8510 $ git commit -v -a
8511 [master 5405487] Merge remote-tracking branch 'l2-mtd/master'
8512 $ git diff -M --stat --summary HEAD^..
8513  Documentation/DocBook/mtdnand.tmpl                 |   19 +-
8514  .../devicetree/bindings/mtd/atmel-dataflash.txt    |   14 +
8515  arch/arm/mach-at91/board-afeb-9260v1.c             |    9 +-
8516  arch/arm/mach-at91/board-cam60.c                   |    9 +-
8517  arch/arm/mach-at91/board-cap9adk.c                 |    9 +-
8518  arch/arm/mach-at91/board-kb9202.c                  |    9 +-
8519  arch/arm/mach-at91/board-neocore926.c              |    9 +-
8520  arch/arm/mach-at91/board-qil-a9260.c               |    9 +-
8521  arch/arm/mach-at91/board-rm9200dk.c                |    9 +-
8522  arch/arm/mach-at91/board-sam9-l9260.c              |    9 +-
8523  arch/arm/mach-at91/board-sam9260ek.c               |    9 +-
8524  arch/arm/mach-at91/board-sam9261ek.c               |    9 +-
8525  arch/arm/mach-at91/board-sam9263ek.c               |    9 +-
8526  arch/arm/mach-at91/board-sam9g20ek.c               |    9 +-
8527  arch/arm/mach-at91/board-sam9m10g45ek.c            |    9 +-
8528  arch/arm/mach-at91/board-sam9rlek.c                |    9 +-
8529  arch/arm/mach-at91/board-snapper9260.c             |   10 +-
8530  arch/arm/mach-at91/board-usb-a926x.c               |    9 +-
8531  arch/arm/mach-at91/board-yl-9200.c                 |    9 +-
8532  arch/arm/mach-at91/include/mach/board.h            |    3 +-
8533  arch/arm/mach-davinci/board-da830-evm.c            |    2 +-
8534  arch/arm/mach-davinci/board-da850-evm.c            |    2 +-
8535  arch/arm/mach-davinci/board-dm355-evm.c            |    2 +-
8536  arch/arm/mach-davinci/board-dm355-leopard.c        |    2 +-
8537  arch/arm/mach-davinci/board-dm365-evm.c            |    2 +-
8538  arch/arm/mach-davinci/board-dm644x-evm.c           |    2 +-
8539  arch/arm/mach-davinci/board-mityomapl138.c         |    3 +-
8540  arch/arm/mach-davinci/board-neuros-osd2.c          |    2 +-
8541  arch/arm/mach-davinci/board-tnetv107x-evm.c        |    2 +-
8542  arch/arm/mach-davinci/include/mach/nand.h          |    4 +-
8543  arch/arm/mach-ep93xx/ts72xx.c                      |   23 +-
8544  arch/arm/mach-mmp/aspenite.c                       |    5 +-
8545  arch/arm/mach-orion5x/ts78xx-setup.c               |    2 +-
8546  arch/arm/mach-pxa/cm-x300.c                        |    5 +-
8547  arch/arm/mach-pxa/colibri-pxa3xx.c                 |    5 +-
8548  arch/arm/mach-pxa/littleton.c                      |    5 +-
8549  arch/arm/mach-pxa/mxm8x10.c                        |    9 +-
8550  arch/arm/mach-pxa/raumfeld.c                       |    5 +-
8551  arch/arm/mach-pxa/zylonite.c                       |    5 +-
8552  arch/arm/plat-pxa/include/plat/pxa3xx_nand.h       |   20 +-
8553  arch/avr32/boards/atngw100/setup.c                 |    8 +-
8554  arch/avr32/boards/atstk1000/atstk1002.c            |    9 +-
8555  arch/avr32/mach-at32ap/include/mach/board.h        |    3 +-
8556  arch/cris/arch-v32/drivers/mach-a3/nandflash.c     |    2 +-
8557  arch/cris/arch-v32/drivers/mach-fs/nandflash.c     |    2 +-
8558  drivers/mtd/Kconfig                                |   16 +-
8559  drivers/mtd/Makefile                               |    2 +-
8560  drivers/mtd/afs.c                                  |    4 +-
8561  drivers/mtd/ar7part.c                              |    2 +-
8562  drivers/mtd/chips/cfi_cmdset_0002.c                |   31 +-
8563  drivers/mtd/chips/fwh_lock.h                       |    3 +-
8564  drivers/mtd/chips/jedec_probe.c                    |   34 +-
8565  drivers/mtd/cmdlinepart.c                          |    7 +-
8566  drivers/mtd/devices/doc2000.c                      |   17 +-
8567  drivers/mtd/devices/doc2001.c                      |   11 +-
8568  drivers/mtd/devices/doc2001plus.c                  |   11 +-
8569  drivers/mtd/devices/docecc.c                       |    2 +-
8570  drivers/mtd/devices/lart.c                         |   18 +-
8571  drivers/mtd/devices/m25p80.c                       |   85 +-
8572  drivers/mtd/devices/mtd_dataflash.c                |   91 +-
8573  drivers/mtd/devices/sst25l.c                       |   42 +-
8574  drivers/mtd/ftl.c                                  |   40 +-
8575  drivers/mtd/inftlcore.c                            |   69 +-
8576  drivers/mtd/inftlmount.c                           |  116 +-
8577  drivers/mtd/maps/Kconfig                           |   26 -
8578  drivers/mtd/maps/Makefile                          |    2 -
8579  drivers/mtd/maps/bfin-async-flash.c                |   16 +-
8580  drivers/mtd/maps/ceiva.c                           |  341 ----
8581  drivers/mtd/maps/dc21285.c                         |    9 +-
8582  drivers/mtd/maps/edb7312.c                         |  134 --
8583  drivers/mtd/maps/gpio-addr-flash.c                 |   16 +-
8584  drivers/mtd/maps/h720x-flash.c                     |   23 +-
8585  drivers/mtd/maps/impa7.c                           |   28 +-
8586  drivers/mtd/maps/intel_vr_nor.c                    |    7 +-
8587  drivers/mtd/maps/ixp2000.c                         |   11 +-
8588  drivers/mtd/maps/ixp4xx.c                          |   29 +-
8589  drivers/mtd/maps/lantiq-flash.c                    |   17 +-
8590  drivers/mtd/maps/latch-addr-flash.c                |   24 +-
8591  drivers/mtd/maps/pcmciamtd.c                       |  124 +-
8592  drivers/mtd/maps/physmap.c                         |   38 +-
8593  drivers/mtd/maps/physmap_of.c                      |   80 +-
8594  drivers/mtd/maps/plat-ram.c                        |   23 +-
8595  drivers/mtd/maps/pxa2xx-flash.c                    |   20 +-
8596  drivers/mtd/maps/rbtx4939-flash.c                  |   24 +-
8597  drivers/mtd/maps/sa1100-flash.c                    |   30 +-
8598  drivers/mtd/maps/solutionengine.c                  |   30 +-
8599  drivers/mtd/maps/wr_sbc82xx_flash.c                |   33 +-
8600  drivers/mtd/mtdblock.c                             |   18 +-
8601  drivers/mtd/mtdchar.c                              |  162 ++-
8602  drivers/mtd/mtdconcat.c                            |   10 +-
8603  drivers/mtd/mtdcore.c                              |   70 +-
8604  drivers/mtd/mtdcore.h                              |    3 +
8605  drivers/mtd/mtdoops.c                              |    2 +-
8606  drivers/mtd/mtdpart.c                              |   62 +-
8607  drivers/mtd/mtdsuper.c                             |   20 +-
8608  drivers/mtd/mtdswap.c                              |   31 +-
8609  drivers/mtd/nand/Kconfig                           |   27 +-
8610  drivers/mtd/nand/Makefile                          |    2 +-
8611  drivers/mtd/nand/atmel_nand.c                      |   74 +-
8612  drivers/mtd/nand/au1550nd.c                        |   29 +-
8613  drivers/mtd/nand/autcpu12.c                        |    4 +-
8614  drivers/mtd/nand/bcm_umi_nand.c                    |   57 +-
8615  drivers/mtd/nand/cafe_nand.c                       |   21 +-
8616  drivers/mtd/nand/cmx270_nand.c                     |   23 +-
8617  drivers/mtd/nand/cs553x_nand.c                     |   15 +-
8618  drivers/mtd/nand/davinci_nand.c                    |   39 +-
8619  drivers/mtd/nand/denali.c                          |    6 +-
8620  drivers/mtd/nand/diskonchip.c                      |    8 +-
8621  drivers/mtd/nand/edb7312.c                         |  203 ---
8622  drivers/mtd/nand/fsl_elbc_nand.c                   |   75 +-
8623  drivers/mtd/nand/fsl_upm.c                         |   16 +-
8624  drivers/mtd/nand/fsmc_nand.c                       |   77 +-
8625  drivers/mtd/nand/gpmi-nand/Makefile                |    3 +
8626  drivers/mtd/nand/gpmi-nand/bch-regs.h              |   84 +
8627  drivers/mtd/nand/gpmi-nand/gpmi-lib.c              | 1057 +++++++++++++
8628  drivers/mtd/nand/gpmi-nand/gpmi-nand.c             | 1619 ++++++++++++++++++++
8629  drivers/mtd/nand/gpmi-nand/gpmi-nand.h             |  273 ++++
8630  drivers/mtd/nand/gpmi-nand/gpmi-regs.h             |  172 +++
8631  drivers/mtd/nand/h1910.c                           |   19 +-
8632  drivers/mtd/nand/jz4740_nand.c                     |   18 +-
8633  drivers/mtd/nand/mpc5121_nfc.c                     |   22 +-
8634  drivers/mtd/nand/mxc_nand.c                        |   37 +-
8635  drivers/mtd/nand/nand_base.c                       | 1105 +++++++-------
8636  drivers/mtd/nand/nand_bbt.c                        |  692 ++++-----
8637  drivers/mtd/nand/nand_bch.c                        |    4 +-
8638  drivers/mtd/nand/nand_ecc.c                        |   10 +-
8639  drivers/mtd/nand/nandsim.c                         |    4 +-
8640  drivers/mtd/nand/ndfc.c                            |   22 +-
8641  drivers/mtd/nand/nomadik_nand.c                    |    1 +
8642  drivers/mtd/nand/nuc900_nand.c                     |    1 +
8643  drivers/mtd/nand/omap2.c                           |   22 +-
8644  drivers/mtd/nand/orion_nand.c                      |   16 +-
8645  drivers/mtd/nand/pasemi_nand.c                     |    3 +-
8646  drivers/mtd/nand/plat_nand.c                       |   25 +-
8647  drivers/mtd/nand/ppchameleonevb.c                  |   47 +-
8648  drivers/mtd/nand/pxa3xx_nand.c                     |  471 ++++---
8649  drivers/mtd/nand/r852.c                            |    6 +-
8650  drivers/mtd/nand/rtc_from4.c                       |    5 +-
8651  drivers/mtd/nand/s3c2410.c                         |   27 +-
8652  drivers/mtd/nand/sharpsl.c                         |   13 +-
8653  drivers/mtd/nand/sm_common.c                       |    2 +-
8654  drivers/mtd/nand/socrates_nand.c                   |   28 +-
8655  drivers/mtd/nand/tmio_nand.c                       |   17 +-
8656  drivers/mtd/nand/txx9ndfmc.c                       |    8 +-
8657  drivers/mtd/nftlcore.c                             |   37 +-
8658  drivers/mtd/nftlmount.c                            |   26 +-
8659  drivers/mtd/ofpart.c                               |  112 ++-
8660  drivers/mtd/onenand/generic.c                      |   14 +-
8661  drivers/mtd/onenand/omap2.c                        |   16 +-
8662  drivers/mtd/onenand/onenand_base.c                 |  114 +-
8663  drivers/mtd/onenand/onenand_bbt.c                  |    8 +-
8664  drivers/mtd/onenand/samsung.c                      |   13 +-
8665  drivers/mtd/redboot.c                              |   13 +-
8666  drivers/mtd/sm_ftl.c                               |   26 +-
8667  drivers/mtd/ssfdc.c                                |   46 +-
8668  drivers/mtd/tests/mtd_oobtest.c                    |   24 +-
8669  drivers/mtd/tests/mtd_pagetest.c                   |   28 +-
8670  drivers/mtd/tests/mtd_readtest.c                   |    5 +-
8671  drivers/mtd/tests/mtd_speedtest.c                  |    8 +-
8672  drivers/mtd/tests/mtd_stresstest.c                 |    2 +-
8673  drivers/mtd/tests/mtd_subpagetest.c                |    8 +-
8674  drivers/mtd/tests/mtd_torturetest.c                |    2 +-
8675  drivers/mtd/ubi/eba.c                              |    2 +-
8676  drivers/mtd/ubi/io.c                               |   24 +-
8677  drivers/mtd/ubi/kapi.c                             |    2 +-
8678  drivers/mtd/ubi/misc.c                             |    2 +-
8679  drivers/mtd/ubi/scan.c                             |    4 +-
8680  drivers/mtd/ubi/vtbl.c                             |    2 +-
8681  drivers/staging/spectra/lld_mtd.c                  |    6 +-
8682  fs/jffs2/scan.c                                    |    4 +-
8683  fs/jffs2/wbuf.c                                    |    9 +-
8684  include/linux/mtd/bbm.h                            |   39 +-
8685  include/linux/mtd/mtd.h                            |   82 +-
8686  include/linux/mtd/nand.h                           |   92 +-
8687  include/linux/mtd/onenand.h                        |    4 +
8688  include/linux/mtd/partitions.h                     |   46 +-
8689  include/linux/mtd/physmap.h                        |   17 -
8690  include/mtd/mtd-abi.h                              |  122 ++-
8691  178 files changed, 5862 insertions(+), 3991 deletions(-)
8692  create mode 100644 Documentation/devicetree/bindings/mtd/atmel-dataflash.txt
8693  delete mode 100644 drivers/mtd/maps/ceiva.c
8694  delete mode 100644 drivers/mtd/maps/edb7312.c
8695  delete mode 100644 drivers/mtd/nand/edb7312.c
8696  create mode 100644 drivers/mtd/nand/gpmi-nand/Makefile
8697  create mode 100644 drivers/mtd/nand/gpmi-nand/bch-regs.h
8698  create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-lib.c
8699  create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-nand.c
8700  create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-nand.h
8701  create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-regs.h
8702 Merging crypto/master
8703 $ git merge crypto/master
8704 Auto-merging arch/x86/include/asm/cpufeature.h
8705 Auto-merging crypto/blowfish_common.c
8706 Merge made by recursive.
8707  .../devicetree/bindings/crypto/picochip-spacc.txt  |   23 +
8708  arch/x86/crypto/Makefile                           |   10 +
8709  arch/x86/crypto/aes_glue.c                         |    1 +
8710  arch/x86/crypto/blowfish-x86_64-asm_64.S           |  392 ++++++++++++++
8711  arch/x86/crypto/blowfish_glue.c                    |  487 +++++++++++++++++
8712  arch/x86/crypto/sha1_ssse3_asm.S                   |  558 ++++++++++++++++++++
8713  arch/x86/crypto/sha1_ssse3_glue.c                  |  240 +++++++++
8714  arch/x86/include/asm/cpufeature.h                  |    3 +
8715  crypto/Kconfig                                     |   35 ++
8716  crypto/Makefile                                    |    3 +-
8717  crypto/{blowfish.c => blowfish_common.c}           |   98 +----
8718  crypto/blowfish_generic.c                          |  142 +++++
8719  crypto/cryptd.c                                    |    2 +-
8720  crypto/sha1_generic.c                              |    9 +-
8721  crypto/tcrypt.c                                    |    4 +
8722  drivers/crypto/n2_core.c                           |    4 +-
8723  drivers/crypto/padlock-aes.c                       |    4 +-
8724  drivers/crypto/picoxcell_crypto.c                  |  121 ++---
8725  include/crypto/blowfish.h                          |   23 +
8726  include/crypto/sha.h                               |    5 +
8727  20 files changed, 2002 insertions(+), 162 deletions(-)
8728  create mode 100644 Documentation/devicetree/bindings/crypto/picochip-spacc.txt
8729  create mode 100644 arch/x86/crypto/blowfish-x86_64-asm_64.S
8730  create mode 100644 arch/x86/crypto/blowfish_glue.c
8731  create mode 100644 arch/x86/crypto/sha1_ssse3_asm.S
8732  create mode 100644 arch/x86/crypto/sha1_ssse3_glue.c
8733  rename crypto/{blowfish.c => blowfish_common.c} (87%)
8734  create mode 100644 crypto/blowfish_generic.c
8735  create mode 100644 include/crypto/blowfish.h
8736 Merging sound/for-next
8737 $ git merge sound/for-next
8738 Resolved 'arch/mips/alchemy/devboards/db1x00/platform.c' using previous resolution.
8739 Resolved 'sound/mips/Kconfig' using previous resolution.
8740 Auto-merging arch/arm/mach-ep93xx/edb93xx.c
8741 Auto-merging arch/arm/mach-ep93xx/simone.c
8742 Auto-merging arch/arm/mach-ep93xx/snappercl15.c
8743 Auto-merging arch/arm/mach-omap2/devices.c
8744 Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c
8745 Auto-merging arch/arm/plat-omap/devices.c
8746 Auto-merging arch/mips/alchemy/devboards/db1200/platform.c
8747 Auto-merging arch/mips/alchemy/devboards/db1x00/platform.c
8748 CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/db1x00/platform.c
8749 Auto-merging drivers/base/regmap/regmap.c
8750 Auto-merging include/linux/regulator/consumer.h
8751 Auto-merging sound/mips/Kconfig
8752 CONFLICT (content): Merge conflict in sound/mips/Kconfig
8753 Removing sound/pci/hda/alc268_quirks.c
8754 Removing sound/pci/hda/alc269_quirks.c
8755 Removing sound/pci/hda/alc662_quirks.c
8756 Removing sound/pci/hda/alc680_quirks.c
8757 Removing sound/pci/hda/alc861_quirks.c
8758 Removing sound/pci/hda/alc861vd_quirks.c
8759 Auto-merging sound/soc/au1x/Kconfig
8760 Removing sound/soc/omap/mcpdm.c
8761 Removing sound/soc/omap/mcpdm.h
8762 Auto-merging sound/soc/samsung/ac97.c
8763 Removing sound/usb/urb.c
8764 Removing sound/usb/urb.h
8765 Automatic merge failed; fix conflicts and then commit the result.
8766 $ git commit -v -a
8767 [master a62db33] Merge remote-tracking branch 'sound/for-next'
8768 $ git diff -M --stat --summary HEAD^..
8769  Documentation/DocBook/writing-an-alsa-driver.tmpl  |   36 +-
8770  .../bindings/sound/soc/codecs/fsl-sgtl5000.txt     |   11 +
8771  Documentation/devicetree/bindings/sound/wm8510.txt |   18 +
8772  Documentation/devicetree/bindings/sound/wm8523.txt |   16 +
8773  Documentation/devicetree/bindings/sound/wm8580.txt |   16 +
8774  Documentation/devicetree/bindings/sound/wm8711.txt |   18 +
8775  Documentation/devicetree/bindings/sound/wm8728.txt |   18 +
8776  Documentation/devicetree/bindings/sound/wm8731.txt |   18 +
8777  Documentation/devicetree/bindings/sound/wm8737.txt |   18 +
8778  Documentation/devicetree/bindings/sound/wm8741.txt |   18 +
8779  Documentation/devicetree/bindings/sound/wm8750.txt |   18 +
8780  Documentation/devicetree/bindings/sound/wm8753.txt |   18 +
8781  Documentation/devicetree/bindings/sound/wm8770.txt |   16 +
8782  Documentation/devicetree/bindings/sound/wm8776.txt |   18 +
8783  Documentation/devicetree/bindings/sound/wm8804.txt |   18 +
8784  Documentation/sound/alsa/ALSA-Configuration.txt    |    6 +
8785  Documentation/sound/alsa/HD-Audio-Controls.txt     |   16 +
8786  Documentation/sound/alsa/HD-Audio-Models.txt       |   67 +-
8787  Documentation/sound/alsa/HD-Audio.txt              |   53 +-
8788  arch/arm/mach-ep93xx/edb93xx.c                     |    6 +
8789  arch/arm/mach-ep93xx/simone.c                      |   13 +-
8790  arch/arm/mach-ep93xx/snappercl15.c                 |   13 +-
8791  arch/arm/mach-omap2/board-rx51-peripherals.c       |    1 -
8792  arch/arm/mach-omap2/devices.c                      |   33 +
8793  arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |    2 +-
8794  arch/arm/plat-omap/devices.c                       |   36 -
8795  arch/mips/alchemy/devboards/db1200/platform.c      |   16 +
8796  arch/mips/alchemy/devboards/db1x00/platform.c      |   47 +
8797  drivers/base/regmap/regmap.c                       |    9 +
8798  drivers/input/misc/twl6040-vibra.c                 |    2 +-
8799  drivers/mfd/twl6040-core.c                         |   38 +-
8800  drivers/mfd/wm8994-core.c                          |   27 +
8801  drivers/regulator/core.c                           |   59 +
8802  include/linux/mfd/twl6040.h                        |   21 +-
8803  include/linux/mfd/wm8994/core.h                    |    1 +
8804  include/linux/mfd/wm8994/registers.h               |   88 +
8805  include/linux/regmap.h                             |   52 +
8806  include/linux/regulator/consumer.h                 |    7 +
8807  include/linux/regulator/driver.h                   |    3 +
8808  include/linux/usb/ch9.h                            |   17 +-
8809  include/sound/adau1373.h                           |   34 +
8810  include/sound/initval.h                            |    2 +-
8811  include/sound/mpu401.h                             |    7 +-
8812  include/sound/pcm.h                                |    4 +
8813  include/sound/saif.h                               |   16 +
8814  include/sound/soc-dai.h                            |   37 +-
8815  include/sound/soc-dapm.h                           |    8 +
8816  include/sound/soc.h                                |   21 +-
8817  include/sound/tpa6130a2-plat.h                     |    6 -
8818  include/sound/wm1250-ev1.h                         |   27 +
8819  include/sound/wm5100.h                             |   59 +
8820  include/trace/events/asoc.h                        |   25 +
8821  sound/aoa/codecs/onyx.c                            |    4 +-
8822  sound/arm/aaci.c                                   |    2 +-
8823  sound/arm/pxa2xx-ac97-lib.c                        |    2 +-
8824  sound/core/control.c                               |    4 +-
8825  sound/core/oss/mixer_oss.c                         |    2 +-
8826  sound/core/pcm_lib.c                               |   26 +
8827  sound/core/pcm_native.c                            |    7 +-
8828  sound/drivers/aloop.c                              |   13 +-
8829  sound/drivers/ml403-ac97cr.c                       |    4 +-
8830  sound/drivers/mpu401/mpu401.c                      |    3 +-
8831  sound/drivers/mpu401/mpu401_uart.c                 |   20 +-
8832  sound/drivers/mtpav.c                              |    2 +-
8833  sound/drivers/serial-u16550.c                      |    2 +-
8834  sound/firewire/isight.c                            |    1 -
8835  sound/firewire/speakers.c                          |    5 +-
8836  sound/isa/ad1816a/ad1816a.c                        |    2 +-
8837  sound/isa/ad1816a/ad1816a_lib.c                    |    2 +-
8838  sound/isa/als100.c                                 |    1 -
8839  sound/isa/azt2320.c                                |    3 +-
8840  sound/isa/cmi8330.c                                |    2 +-
8841  sound/isa/cs423x/cs4231.c                          |    1 -
8842  sound/isa/cs423x/cs4236.c                          |    3 +-
8843  sound/isa/es1688/es1688.c                          |    2 +-
8844  sound/isa/es1688/es1688_lib.c                      |    2 +-
8845  sound/isa/es18xx.c                                 |    6 +-
8846  sound/isa/galaxy/galaxy.c                          |    3 +-
8847  sound/isa/gus/gus_main.c                           |    2 +-
8848  sound/isa/gus/gusextreme.c                         |    3 +-
8849  sound/isa/gus/gusmax.c                             |    2 +-
8850  sound/isa/gus/interwave.c                          |    2 +-
8851  sound/isa/msnd/msnd_pinnacle.c                     |    2 +-
8852  sound/isa/opl3sa2.c                                |    7 +-
8853  sound/isa/opti9xx/miro.c                           |    3 +-
8854  sound/isa/opti9xx/opti92x-ad1848.c                 |    4 +-
8855  sound/isa/sb/jazz16.c                              |    1 -
8856  sound/isa/sb/sb16.c                                |    5 +-
8857  sound/isa/sb/sb_common.c                           |    2 +-
8858  sound/isa/sc6000.c                                 |    3 +-
8859  sound/isa/sscape.c                                 |    3 +-
8860  sound/isa/wavefront/wavefront.c                    |    5 +-
8861  sound/isa/wss/wss_lib.c                            |    2 +-
8862  sound/mips/Kconfig                                 |    5 +-
8863  sound/mips/au1x00.c                                |    4 +-
8864  sound/oss/sound_timer.c                            |    2 +-
8865  sound/pci/als4000.c                                |    5 +-
8866  sound/pci/au88x0/au88x0_mpu401.c                   |    6 +-
8867  sound/pci/azt3328.c                                |    5 +-
8868  sound/pci/cmipci.c                                 |    5 +-
8869  sound/pci/ctxfi/ctpcm.c                            |    2 +-
8870  sound/pci/ctxfi/ctsrc.c                            |    2 +-
8871  sound/pci/ctxfi/ctvmem.h                           |    2 +-
8872  sound/pci/emu10k1/emupcm.c                         |    5 +
8873  sound/pci/es1938.c                                 |    5 +-
8874  sound/pci/es1968.c                                 |    5 +-
8875  sound/pci/fm801.c                                  |   20 +-
8876  sound/pci/hda/Makefile                             |    3 +
8877  sound/pci/hda/alc260_quirks.c                      |  304 --
8878  sound/pci/hda/alc262_quirks.c                      |  530 +--
8879  sound/pci/hda/alc268_quirks.c                      |  636 ---
8880  sound/pci/hda/alc269_quirks.c                      |  674 ---
8881  sound/pci/hda/alc662_quirks.c                      | 1408 ------
8882  sound/pci/hda/alc680_quirks.c                      |  222 -
8883  sound/pci/hda/alc861_quirks.c                      |  725 ---
8884  sound/pci/hda/alc861vd_quirks.c                    |  605 ---
8885  sound/pci/hda/alc880_quirks.c                      |   17 +-
8886  sound/pci/hda/alc882_quirks.c                      |   85 +-
8887  sound/pci/hda/alc_quirks.c                         |   13 +
8888  sound/pci/hda/hda_codec.c                          |   78 +-
8889  sound/pci/hda/hda_eld.c                            |   13 +-
8890  sound/pci/hda/hda_hwdep.c                          |    6 +-
8891  sound/pci/hda/hda_intel.c                          |  216 +-
8892  sound/pci/hda/hda_local.h                          |   26 +-
8893  sound/pci/hda/hda_trace.h                          |  117 +
8894  sound/pci/hda/patch_analog.c                       |  176 +-
8895  sound/pci/hda/patch_conexant.c                     |   93 +-
8896  sound/pci/hda/patch_hdmi.c                         |   99 +-
8897  sound/pci/hda/patch_realtek.c                      | 1070 +++--
8898  sound/pci/hda/patch_sigmatel.c                     |   14 +-
8899  sound/pci/hda/patch_via.c                          |   68 +-
8900  sound/pci/ice1712/ice1712.c                        |   10 +-
8901  sound/pci/maestro3.c                               |    4 +-
8902  sound/pci/oxygen/oxygen_lib.c                      |    6 +-
8903  sound/pci/oxygen/xonar_pcm179x.c                   |    1 +
8904  sound/pci/riptide/riptide.c                        |    2 +-
8905  sound/pci/rme9652/hdspm.c                          |  153 +-
8906  sound/pci/sis7019.c                                |    4 +-
8907  sound/pci/sonicvibes.c                             |    7 +-
8908  sound/pci/trident/trident.c                        |    5 +-
8909  sound/pci/via82xx.c                                |   13 +-
8910  sound/pci/ymfpci/ymfpci.c                          |    5 +-
8911  sound/pci/ymfpci/ymfpci_main.c                     |   32 +-
8912  sound/ppc/keywest.c                                |    1 -
8913  sound/ppc/snd_ps3.c                                |    2 +-
8914  sound/soc/Kconfig                                  |    3 +
8915  sound/soc/Makefile                                 |    1 +
8916  sound/soc/atmel/playpaq_wm8510.c                   |    5 +-
8917  sound/soc/au1x/Kconfig                             |   28 +
8918  sound/soc/au1x/Makefile                            |   10 +
8919  sound/soc/au1x/ac97c.c                             |  363 ++
8920  sound/soc/au1x/db1000.c                            |   75 +
8921  sound/soc/au1x/db1200.c                            |   64 +-
8922  sound/soc/au1x/dbdma2.c                            |   91 +-
8923  sound/soc/au1x/dma.c                               |  377 ++
8924  sound/soc/au1x/i2sc.c                              |  346 ++
8925  sound/soc/au1x/psc-ac97.c                          |   48 +-
8926  sound/soc/au1x/psc-i2s.c                           |   42 +-
8927  sound/soc/au1x/psc.h                               |   16 +-
8928  sound/soc/blackfin/Kconfig                         |   13 +
8929  sound/soc/blackfin/Makefile                        |    2 +
8930  sound/soc/blackfin/bf5xx-ac97-pcm.c                |    2 +-
8931  sound/soc/blackfin/bf5xx-i2s-pcm.c                 |    2 +-
8932  sound/soc/blackfin/bfin-eval-adau1373.c            |  202 +
8933  sound/soc/codecs/88pm860x-codec.c                  |   14 +-
8934  sound/soc/codecs/Kconfig                           |   12 +
8935  sound/soc/codecs/Makefile                          |    6 +
8936  sound/soc/codecs/ad193x.c                          |   65 +-
8937  sound/soc/codecs/ad193x.h                          |   34 +-
8938  sound/soc/codecs/ad1980.c                          |   11 +-
8939  sound/soc/codecs/adau1373.c                        | 1414 ++++++
8940  sound/soc/codecs/adau1373.h                        |   29 +
8941  sound/soc/codecs/adau1701.c                        |    3 +-
8942  sound/soc/codecs/adav80x.c                         |    3 +-
8943  sound/soc/codecs/ak4671.c                          |    2 -
8944  sound/soc/codecs/alc5623.c                         |    4 -
8945  sound/soc/codecs/cs4270.c                          |    6 +-
8946  sound/soc/codecs/cs4271.c                          |    5 -
8947  sound/soc/codecs/cs42l51.c                         |    6 +-
8948  sound/soc/codecs/max98088.c                        |   36 +-
8949  sound/soc/codecs/max98095.c                        |   34 +-
8950  sound/soc/codecs/rt5631.c                          | 1775 +++++++
8951  sound/soc/codecs/rt5631.h                          |  701 +++
8952  sound/soc/codecs/sgtl5000.c                        |    8 +
8953  sound/soc/codecs/sn95031.c                         |   16 +-
8954  sound/soc/codecs/ssm2602.c                         |   77 +-
8955  sound/soc/codecs/ssm2602.h                         |    6 +-
8956  sound/soc/codecs/sta32x.c                          |   21 +-
8957  sound/soc/codecs/tlv320aic3x.c                     |   16 +-
8958  sound/soc/codecs/tlv320dac33.c                     |    8 +-
8959  sound/soc/codecs/tpa6130a2.c                       |   13 +-
8960  sound/soc/codecs/twl6040.c                         |  570 +--
8961  sound/soc/codecs/twl6040.h                         |   13 +
8962  sound/soc/codecs/wl1273.c                          |    1 -
8963  sound/soc/codecs/wm1250-ev1.c                      |  140 +-
8964  sound/soc/codecs/wm5100-tables.c                   | 1530 ++++++
8965  sound/soc/codecs/wm5100.c                          | 2644 ++++++++++
8966  sound/soc/codecs/wm5100.h                          | 5146 ++++++++++++++++++++
8967  sound/soc/codecs/wm8510.c                          |    8 +
8968  sound/soc/codecs/wm8523.c                          |   35 +-
8969  sound/soc/codecs/wm8580.c                          |    9 +-
8970  sound/soc/codecs/wm8711.c                          |   19 +-
8971  sound/soc/codecs/wm8728.c                          |   13 +-
8972  sound/soc/codecs/wm8731.c                          |   10 +
8973  sound/soc/codecs/wm8737.c                          |   10 +
8974  sound/soc/codecs/wm8741.c                          |  137 +-
8975  sound/soc/codecs/wm8750.c                          |   14 +-
8976  sound/soc/codecs/wm8753.c                          |   13 +-
8977  sound/soc/codecs/wm8770.c                          |    8 +
8978  sound/soc/codecs/wm8776.c                          |   51 +-
8979  sound/soc/codecs/wm8782.c                          |    2 +-
8980  sound/soc/codecs/wm8804.c                          |    9 +
8981  sound/soc/codecs/wm8904.c                          |    2 -
8982  sound/soc/codecs/wm8940.c                          |    3 -
8983  sound/soc/codecs/wm8960.c                          |    3 -
8984  sound/soc/codecs/wm8962.c                          |  201 +-
8985  sound/soc/codecs/wm8971.c                          |   27 +-
8986  sound/soc/codecs/wm8978.c                          |    3 -
8987  sound/soc/codecs/wm8988.c                          |   15 +-
8988  sound/soc/codecs/wm8993.c                          |    7 +-
8989  sound/soc/codecs/wm8994-tables.c                   |   16 +-
8990  sound/soc/codecs/wm8994.c                          |  364 ++-
8991  sound/soc/codecs/wm8994.h                          |    2 +
8992  sound/soc/codecs/wm8995.c                          |   22 +-
8993  sound/soc/codecs/wm8996.c                          |  319 +-
8994  sound/soc/codecs/wm9081.c                          |    7 +-
8995  sound/soc/codecs/wm9090.c                          |    6 +-
8996  sound/soc/codecs/wm_hubs.c                         |   48 +-
8997  sound/soc/codecs/wm_hubs.h                         |    3 +-
8998  sound/soc/davinci/davinci-i2s.c                    |    5 +-
8999  sound/soc/davinci/davinci-mcasp.c                  |   20 +-
9000  sound/soc/davinci/davinci-pcm.c                    |  123 +-
9001  sound/soc/ep93xx/edb93xx.c                         |   60 +-
9002  sound/soc/ep93xx/ep93xx-ac97.c                     |    2 +-
9003  sound/soc/ep93xx/ep93xx-pcm.c                      |    1 +
9004  sound/soc/ep93xx/simone.c                          |   64 +-
9005  sound/soc/ep93xx/snappercl15.c                     |   53 +-
9006  sound/soc/fsl/fsl_dma.c                            |    1 -
9007  sound/soc/fsl/fsl_ssi.c                            |  206 +-
9008  sound/soc/fsl/mpc8610_hpcd.c                       |    2 +-
9009  sound/soc/fsl/p1022_ds.c                           |    4 +-
9010  sound/soc/imx/Kconfig                              |    1 +
9011  sound/soc/imx/imx-pcm-fiq.c                        |   11 +-
9012  sound/soc/imx/imx-ssi.c                            |    8 +-
9013  sound/soc/jz4740/jz4740-pcm.c                      |    2 +-
9014  sound/soc/kirkwood/kirkwood-i2s.c                  |    2 +-
9015  sound/soc/mid-x86/mfld_machine.c                   |    2 -
9016  sound/soc/mid-x86/sst_platform.c                   |   19 +-
9017  sound/soc/mxs/Kconfig                              |   20 +
9018  sound/soc/mxs/Makefile                             |   10 +
9019  sound/soc/mxs/mxs-pcm.c                            |  359 ++
9020  sound/soc/mxs/mxs-pcm.h                            |   43 +
9021  sound/soc/mxs/mxs-saif.c                           |  797 +++
9022  sound/soc/mxs/mxs-saif.h                           |  134 +
9023  sound/soc/mxs/mxs-sgtl5000.c                       |  173 +
9024  sound/soc/nuc900/nuc900-pcm.c                      |    5 +-
9025  sound/soc/omap/Makefile                            |    2 +-
9026  sound/soc/omap/am3517evm.c                         |   22 +-
9027  sound/soc/omap/igep0020.c                          |   23 +-
9028  sound/soc/omap/mcpdm.c                             |  470 --
9029  sound/soc/omap/mcpdm.h                             |  153 -
9030  sound/soc/omap/n810.c                              |   19 +-
9031  sound/soc/omap/omap-mcbsp.c                        |   24 +-
9032  sound/soc/omap/omap-mcpdm.c                        |  481 ++-
9033  sound/soc/omap/omap-mcpdm.h                        |  107 +
9034  sound/soc/omap/omap-pcm.c                          |    8 +
9035  sound/soc/omap/omap3evm.c                          |   23 +-
9036  sound/soc/omap/omap3pandora.c                      |   20 +-
9037  sound/soc/omap/osk5912.c                           |   23 +-
9038  sound/soc/omap/overo.c                             |   23 +-
9039  sound/soc/omap/rx51.c                              |   20 +-
9040  sound/soc/omap/sdp3430.c                           |   70 +-
9041  sound/soc/omap/sdp4430.c                           |   22 +-
9042  sound/soc/omap/zoom2.c                             |   70 +-
9043  sound/soc/pxa/magician.c                           |    3 +-
9044  sound/soc/pxa/raumfeld.c                           |    4 +-
9045  sound/soc/pxa/spitz.c                              |    2 +-
9046  sound/soc/pxa/z2.c                                 |    2 +-
9047  sound/soc/s6000/s6000-pcm.c                        |    1 -
9048  sound/soc/samsung/Kconfig                          |   12 +-
9049  sound/soc/samsung/ac97.c                           |    4 +-
9050  sound/soc/samsung/i2s.c                            |    2 +-
9051  sound/soc/samsung/jive_wm8750.c                    |    2 +-
9052  sound/soc/samsung/pcm.c                            |    2 +-
9053  sound/soc/samsung/s3c-i2s-v2.c                     |    1 +
9054  sound/soc/samsung/s3c2412-i2s.c                    |    6 +-
9055  sound/soc/samsung/s3c24xx-i2s.c                    |    6 +-
9056  sound/soc/samsung/s3c24xx_simtec.c                 |    2 +-
9057  sound/soc/samsung/s3c24xx_uda134x.c                |    8 +-
9058  sound/soc/samsung/smartq_wm8987.c                  |    2 +-
9059  sound/soc/samsung/smdk_wm8580.c                    |    6 +-
9060  sound/soc/samsung/smdk_wm8580pcm.c                 |    4 +-
9061  sound/soc/samsung/spdif.c                          |    4 +-
9062  sound/soc/samsung/speyside.c                       |   10 +-
9063  sound/soc/samsung/speyside_wm8962.c                |   41 +-
9064  sound/soc/sh/fsi.c                                 |   12 +-
9065  sound/soc/sh/ssi.c                                 |    2 +-
9066  sound/soc/soc-cache.c                              |    7 -
9067  sound/soc/soc-core.c                               |   47 +-
9068  sound/soc/soc-dapm.c                               |  158 +-
9069  sound/soc/soc-io.c                                 |  357 +--
9070  sound/soc/soc-pcm.c                                |   42 +-
9071  sound/soc/tegra/tegra_i2s.c                        |    2 +-
9072  sound/soc/tegra/tegra_spdif.c                      |    5 +-
9073  sound/soc/txx9/txx9aclc-ac97.c                     |    2 +-
9074  sound/soc/txx9/txx9aclc-generic.c                  |    2 +-
9075  sound/sparc/amd7930.c                              |    2 +-
9076  sound/usb/6fire/firmware.c                         |   25 +-
9077  sound/usb/Makefile                                 |   12 +-
9078  sound/usb/card.c                                   |    4 +-
9079  sound/usb/card.h                                   |    2 +
9080  sound/usb/clock.c                                  |   12 +-
9081  sound/usb/endpoint.c                               | 1199 ++++--
9082  sound/usb/endpoint.h                               |   20 +-
9083  sound/usb/format.c                                 |    4 +-
9084  sound/usb/helper.c                                 |    4 +-
9085  sound/usb/helper.h                                 |    2 +-
9086  sound/usb/midi.c                                   |   27 +
9087  sound/usb/mixer.c                                  |   19 +-
9088  sound/usb/mixer_quirks.c                           |   10 +-
9089  sound/usb/pcm.c                                    |   34 +-
9090  sound/usb/pcm.h                                    |    3 +
9091  sound/usb/quirks-table.h                           |   25 +
9092  sound/usb/quirks.c                                 |   16 +-
9093  sound/usb/stream.c                                 |  452 ++
9094  sound/usb/stream.h                                 |   12 +
9095  sound/usb/urb.c                                    |  941 ----
9096  sound/usb/urb.h                                    |   21 -
9097  sound/usb/usbaudio.h                               |    1 +
9098  329 files changed, 23420 insertions(+), 10179 deletions(-)
9099  create mode 100644 Documentation/devicetree/bindings/sound/soc/codecs/fsl-sgtl5000.txt
9100  create mode 100644 Documentation/devicetree/bindings/sound/wm8510.txt
9101  create mode 100644 Documentation/devicetree/bindings/sound/wm8523.txt
9102  create mode 100644 Documentation/devicetree/bindings/sound/wm8580.txt
9103  create mode 100644 Documentation/devicetree/bindings/sound/wm8711.txt
9104  create mode 100644 Documentation/devicetree/bindings/sound/wm8728.txt
9105  create mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt
9106  create mode 100644 Documentation/devicetree/bindings/sound/wm8737.txt
9107  create mode 100644 Documentation/devicetree/bindings/sound/wm8741.txt
9108  create mode 100644 Documentation/devicetree/bindings/sound/wm8750.txt
9109  create mode 100644 Documentation/devicetree/bindings/sound/wm8753.txt
9110  create mode 100644 Documentation/devicetree/bindings/sound/wm8770.txt
9111  create mode 100644 Documentation/devicetree/bindings/sound/wm8776.txt
9112  create mode 100644 Documentation/devicetree/bindings/sound/wm8804.txt
9113  create mode 100644 include/sound/adau1373.h
9114  create mode 100644 include/sound/saif.h
9115  create mode 100644 include/sound/wm1250-ev1.h
9116  create mode 100644 include/sound/wm5100.h
9117  delete mode 100644 sound/pci/hda/alc268_quirks.c
9118  delete mode 100644 sound/pci/hda/alc269_quirks.c
9119  delete mode 100644 sound/pci/hda/alc662_quirks.c
9120  delete mode 100644 sound/pci/hda/alc680_quirks.c
9121  delete mode 100644 sound/pci/hda/alc861_quirks.c
9122  delete mode 100644 sound/pci/hda/alc861vd_quirks.c
9123  create mode 100644 sound/pci/hda/hda_trace.h
9124  create mode 100644 sound/soc/au1x/ac97c.c
9125  create mode 100644 sound/soc/au1x/db1000.c
9126  create mode 100644 sound/soc/au1x/dma.c
9127  create mode 100644 sound/soc/au1x/i2sc.c
9128  create mode 100644 sound/soc/blackfin/bfin-eval-adau1373.c
9129  create mode 100644 sound/soc/codecs/adau1373.c
9130  create mode 100644 sound/soc/codecs/adau1373.h
9131  create mode 100644 sound/soc/codecs/rt5631.c
9132  create mode 100644 sound/soc/codecs/rt5631.h
9133  create mode 100644 sound/soc/codecs/wm5100-tables.c
9134  create mode 100644 sound/soc/codecs/wm5100.c
9135  create mode 100644 sound/soc/codecs/wm5100.h
9136  create mode 100644 sound/soc/mxs/Kconfig
9137  create mode 100644 sound/soc/mxs/Makefile
9138  create mode 100644 sound/soc/mxs/mxs-pcm.c
9139  create mode 100644 sound/soc/mxs/mxs-pcm.h
9140  create mode 100644 sound/soc/mxs/mxs-saif.c
9141  create mode 100644 sound/soc/mxs/mxs-saif.h
9142  create mode 100644 sound/soc/mxs/mxs-sgtl5000.c
9143  delete mode 100644 sound/soc/omap/mcpdm.c
9144  delete mode 100644 sound/soc/omap/mcpdm.h
9145  create mode 100644 sound/soc/omap/omap-mcpdm.h
9146  create mode 100644 sound/usb/stream.c
9147  create mode 100644 sound/usb/stream.h
9148  delete mode 100644 sound/usb/urb.c
9149  delete mode 100644 sound/usb/urb.h
9150 Merging sound-asoc/for-next
9151 $ git merge sound-asoc/for-next
9152 Merge made by recursive.
9153  include/sound/soc.h        |   53 +++++++++++++++++++++----------------------
9154  sound/soc/codecs/ak4671.c  |    2 -
9155  sound/soc/codecs/twl6040.c |   12 ++++-----
9156  sound/soc/codecs/wm8523.c  |    1 -
9157  sound/soc/codecs/wm8711.c  |    2 +-
9158  sound/soc/codecs/wm8750.c  |   26 +++++++--------------
9159  sound/soc/codecs/wm8971.c  |    2 +-
9160  sound/soc/codecs/wm8988.c  |    1 -
9161  sound/soc/codecs/wm8994.c  |    2 +-
9162  9 files changed, 43 insertions(+), 58 deletions(-)
9163 Merging cpufreq/next
9164 $ git merge cpufreq/next
9165 Merge made by recursive.
9166  Documentation/cpu-freq/governors.txt |    2 +-
9167  drivers/cpufreq/cpufreq_ondemand.c   |    2 +-
9168  drivers/cpufreq/db8500-cpufreq.c     |    7 +-
9169  drivers/cpufreq/e_powersaver.c       |  135 +++++++++++++++++++++++++++++++---
9170  drivers/cpufreq/exynos4210-cpufreq.c |  129 +++++++++++++++++++++++++++++++-
9171  5 files changed, 254 insertions(+), 21 deletions(-)
9172 Merging quilt/rr
9173 $ git merge quilt/rr
9174 Auto-merging drivers/net/virtio_net.c
9175 Merge made by recursive.
9176  arch/x86/lguest/boot.c        |   10 ++++
9177  drivers/char/virtio_console.c |  120 +++++++++++++++++++++++++++--------------
9178  drivers/lguest/core.c         |    2 +-
9179  drivers/net/virtio_net.c      |   14 ++---
9180  include/linux/virtio.h        |    4 +-
9181  include/linux/virtio_config.h |    3 +
9182  include/linux/virtio_ring.h   |    6 +-
9183  kernel/kmod.c                 |    4 +-
9184  8 files changed, 106 insertions(+), 57 deletions(-)
9185 Merging input/next
9186 $ git merge input/next
9187 Removing Documentation/ABI/testing/sysfs-wacom
9188 Auto-merging drivers/input/keyboard/adp5588-keys.c
9189 Auto-merging drivers/input/misc/Kconfig
9190 Auto-merging drivers/input/misc/Makefile
9191 Auto-merging drivers/input/misc/twl6040-vibra.c
9192 Auto-merging drivers/input/tablet/wacom_sys.c
9193 Auto-merging drivers/input/touchscreen/wacom_w8001.c
9194 Merge made by recursive.
9195  Documentation/ABI/testing/sysfs-driver-wacom |   64 +++
9196  Documentation/ABI/testing/sysfs-wacom        |   10 -
9197  Documentation/input/elantech.txt             |  295 +++++++++++-
9198  Documentation/input/multi-touch-protocol.txt |   14 +
9199  drivers/input/input-mt.c                     |    1 +
9200  drivers/input/input-polldev.c                |    6 +-
9201  drivers/input/keyboard/adp5588-keys.c        |    2 +-
9202  drivers/input/keyboard/davinci_keyscan.c     |    2 +-
9203  drivers/input/keyboard/ep93xx_keypad.c       |    2 +-
9204  drivers/input/keyboard/gpio_keys.c           |   24 +-
9205  drivers/input/keyboard/imx_keypad.c          |    2 +-
9206  drivers/input/keyboard/jornada720_kbd.c      |    2 +-
9207  drivers/input/keyboard/matrix_keypad.c       |    1 -
9208  drivers/input/keyboard/pxa27x_keypad.c       |    2 +-
9209  drivers/input/keyboard/pxa930_rotary.c       |    2 +-
9210  drivers/input/keyboard/tc3589x-keypad.c      |    2 +-
9211  drivers/input/keyboard/tegra-kbc.c           |   85 ++--
9212  drivers/input/keyboard/w90p910_keypad.c      |    2 +-
9213  drivers/input/misc/Kconfig                   |   45 ++-
9214  drivers/input/misc/Makefile                  |    4 +-
9215  drivers/input/misc/ad714x-i2c.c              |    4 +-
9216  drivers/input/misc/bma150.c                  |  691 ++++++++++++++++++++++++++
9217  drivers/input/misc/ixp4xx-beeper.c           |    2 +-
9218  drivers/input/misc/pm8xxx-vibrator.c         |  296 +++++++++++
9219  drivers/input/misc/twl6040-vibra.c           |    2 +-
9220  drivers/input/mouse/elantech.c               |  664 ++++++++++++++++++++++---
9221  drivers/input/mouse/elantech.h               |   57 ++-
9222  drivers/input/mouse/pxa930_trkball.c         |    2 +-
9223  drivers/input/mouse/synaptics.c              |  527 ++++++++++++++++++--
9224  drivers/input/mouse/synaptics.h              |   27 +-
9225  drivers/input/mouse/synaptics_i2c.c          |    2 +-
9226  drivers/input/tablet/wacom.h                 |    6 +
9227  drivers/input/tablet/wacom_sys.c             |  301 ++++++++++--
9228  drivers/input/touchscreen/Kconfig            |   12 +
9229  drivers/input/touchscreen/Makefile           |    1 +
9230  drivers/input/touchscreen/atmel_tsadcc.c     |    2 +-
9231  drivers/input/touchscreen/h3600_ts_input.c   |    4 +-
9232  drivers/input/touchscreen/hp680_ts_input.c   |    2 +-
9233  drivers/input/touchscreen/jornada720_ts.c    |    2 +-
9234  drivers/input/touchscreen/lpc32xx_ts.c       |    2 +-
9235  drivers/input/touchscreen/penmount.c         |  199 +++++++-
9236  drivers/input/touchscreen/s3c2410_ts.c       |    2 +-
9237  drivers/input/touchscreen/tsc2007.c          |  194 ++++----
9238  drivers/input/touchscreen/tsc40.c            |  184 +++++++
9239  drivers/input/touchscreen/w90p910_ts.c       |    2 +-
9240  drivers/input/touchscreen/wacom_w8001.c      |   29 +-
9241  include/linux/bma150.h                       |   46 ++
9242  include/linux/input.h                        |    1 +
9243  include/linux/input/adxl34x.h                |   21 +-
9244  include/linux/serio.h                        |    1 +
9245  50 files changed, 3438 insertions(+), 414 deletions(-)
9246  create mode 100644 Documentation/ABI/testing/sysfs-driver-wacom
9247  delete mode 100644 Documentation/ABI/testing/sysfs-wacom
9248  create mode 100644 drivers/input/misc/bma150.c
9249  create mode 100644 drivers/input/misc/pm8xxx-vibrator.c
9250  create mode 100644 drivers/input/touchscreen/tsc40.c
9251  create mode 100644 include/linux/bma150.h
9252 Merging input-mt/next
9253 $ git merge input-mt/next
9254 Already up-to-date.
9255 Merging lsm/for-next
9256 $ git merge lsm/for-next
9257 Already up-to-date.
9258 Merging block/for-next
9259 $ git merge block/for-next
9260 Auto-merging block/blk-core.c
9261 Auto-merging block/blk-sysfs.c
9262 Auto-merging block/genhd.c
9263 Auto-merging drivers/md/md.c
9264 Auto-merging drivers/md/raid1.c
9265 Auto-merging drivers/md/raid10.c
9266 Auto-merging drivers/md/raid5.c
9267 Auto-merging fs/block_dev.c
9268 Auto-merging include/linux/genhd.h
9269 Merge made by recursive.
9270  .../ABI/testing/sysfs-bus-pci-devices-cciss        |    7 +
9271  Documentation/blockdev/cciss.txt                   |   10 +
9272  arch/m68k/emu/nfblock.c                            |    3 +-
9273  arch/powerpc/sysdev/axonram.c                      |    8 +-
9274  block/blk-core.c                                   |  261 +-
9275  block/blk-sysfs.c                                  |    6 +-
9276  block/elevator.c                                   |    2 +-
9277  block/genhd.c                                      |    4 +-
9278  block/ioctl.c                                      |    2 +-
9279  drivers/block/Kconfig                              |    2 +
9280  drivers/block/Makefile                             |    1 +
9281  drivers/block/aoe/aoeblk.c                         |   14 +-
9282  drivers/block/brd.c                                |    4 +-
9283  drivers/block/cciss.c                              |   69 +-
9284  drivers/block/cciss.h                              |    1 +
9285  drivers/block/cpqarray.c                           |    2 +-
9286  drivers/block/drbd/drbd_int.h                      |    2 +-
9287  drivers/block/drbd/drbd_req.c                      |    8 +-
9288  drivers/block/loop.c                               |  116 +-
9289  drivers/block/mtip32xx/Kconfig                     |    9 +
9290  drivers/block/mtip32xx/Makefile                    |    5 +
9291  drivers/block/mtip32xx/mtip32xx.c                  | 3567 ++++++++++++++++++++
9292  drivers/block/mtip32xx/mtip32xx.h                  |  408 +++
9293  drivers/block/nbd.c                                |   69 +-
9294  drivers/block/pktcdvd.c                            |   11 +-
9295  drivers/block/ps3vram.c                            |    6 +-
9296  drivers/block/umem.c                               |    4 +-
9297  drivers/md/dm.c                                    |   25 +-
9298  drivers/md/faulty.c                                |   14 +-
9299  drivers/md/linear.c                                |   17 +-
9300  drivers/md/md.c                                    |   12 +-
9301  drivers/md/md.h                                    |    2 +-
9302  drivers/md/multipath.c                             |    8 +-
9303  drivers/md/raid0.c                                 |   22 +-
9304  drivers/md/raid1.c                                 |    8 +-
9305  drivers/md/raid10.c                                |   19 +-
9306  drivers/md/raid5.c                                 |    8 +-
9307  drivers/s390/block/dcssblk.c                       |    7 +-
9308  drivers/s390/block/xpram.c                         |    5 +-
9309  drivers/staging/zram/zram_drv.c                    |    8 +-
9310  fs/block_dev.c                                     |    2 +-
9311  include/linux/blkdev.h                             |   27 +-
9312  include/linux/genhd.h                              |    6 +-
9313  include/linux/loop.h                               |    1 +
9314  44 files changed, 4449 insertions(+), 343 deletions(-)
9315  create mode 100644 drivers/block/mtip32xx/Kconfig
9316  create mode 100644 drivers/block/mtip32xx/Makefile
9317  create mode 100644 drivers/block/mtip32xx/mtip32xx.c
9318  create mode 100644 drivers/block/mtip32xx/mtip32xx.h
9319 Merging quilt/device-mapper
9320 $ git merge quilt/device-mapper
9321 Auto-merging drivers/md/dm.c
9322 Merge made by recursive.
9323  Documentation/device-mapper/persistent-data.txt    |   84 +
9324  Documentation/device-mapper/thin-provisioning.txt  |  275 +++
9325  drivers/md/Kconfig                                 |    9 +
9326  drivers/md/Makefile                                |    3 +
9327  drivers/md/dm-crypt.c                              |    2 +
9328  drivers/md/dm-flakey.c                             |    4 +-
9329  drivers/md/dm-kcopyd.c                             |   31 +-
9330  drivers/md/dm-raid.c                               |    2 +-
9331  drivers/md/dm-table.c                              |   84 +-
9332  drivers/md/dm-thin-metadata.c                      | 1406 ++++++++++++
9333  drivers/md/dm-thin-metadata.h                      |  168 ++
9334  drivers/md/dm-thin.c                               | 2280 ++++++++++++++++++++
9335  drivers/md/dm.c                                    |   12 +-
9336  drivers/md/persistent-data/Kconfig                 |    7 +
9337  drivers/md/persistent-data/Makefile                |    9 +
9338  drivers/md/persistent-data/dm-block-manager.c      |  998 +++++++++
9339  drivers/md/persistent-data/dm-block-manager.h      |  134 ++
9340  drivers/md/persistent-data/dm-btree-internal.h     |  133 ++
9341  drivers/md/persistent-data/dm-btree-remove.c       |  571 +++++
9342  drivers/md/persistent-data/dm-btree-spine.c        |  222 ++
9343  drivers/md/persistent-data/dm-btree.c              |  861 ++++++++
9344  drivers/md/persistent-data/dm-btree.h              |  158 ++
9345  .../persistent-data/dm-persistent-data-internal.h  |   20 +
9346  drivers/md/persistent-data/dm-space-map-common.h   |   94 +
9347  drivers/md/persistent-data/dm-space-map-disk.c     |  663 ++++++
9348  drivers/md/persistent-data/dm-space-map-disk.h     |   25 +
9349  drivers/md/persistent-data/dm-space-map-metadata.c |  956 ++++++++
9350  drivers/md/persistent-data/dm-space-map-metadata.h |   33 +
9351  drivers/md/persistent-data/dm-space-map.h          |  118 +
9352  .../md/persistent-data/dm-transaction-manager.c    |  414 ++++
9353  .../md/persistent-data/dm-transaction-manager.h    |  130 ++
9354  include/linux/device-mapper.h                      |   40 +-
9355  include/linux/dm-kcopyd.h                          |    4 +
9356  33 files changed, 9928 insertions(+), 22 deletions(-)
9357  create mode 100644 Documentation/device-mapper/persistent-data.txt
9358  create mode 100644 Documentation/device-mapper/thin-provisioning.txt
9359  create mode 100644 drivers/md/dm-thin-metadata.c
9360  create mode 100644 drivers/md/dm-thin-metadata.h
9361  create mode 100644 drivers/md/dm-thin.c
9362  create mode 100644 drivers/md/persistent-data/Kconfig
9363  create mode 100644 drivers/md/persistent-data/Makefile
9364  create mode 100644 drivers/md/persistent-data/dm-block-manager.c
9365  create mode 100644 drivers/md/persistent-data/dm-block-manager.h
9366  create mode 100644 drivers/md/persistent-data/dm-btree-internal.h
9367  create mode 100644 drivers/md/persistent-data/dm-btree-remove.c
9368  create mode 100644 drivers/md/persistent-data/dm-btree-spine.c
9369  create mode 100644 drivers/md/persistent-data/dm-btree.c
9370  create mode 100644 drivers/md/persistent-data/dm-btree.h
9371  create mode 100644 drivers/md/persistent-data/dm-persistent-data-internal.h
9372  create mode 100644 drivers/md/persistent-data/dm-space-map-common.h
9373  create mode 100644 drivers/md/persistent-data/dm-space-map-disk.c
9374  create mode 100644 drivers/md/persistent-data/dm-space-map-disk.h
9375  create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.c
9376  create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.h
9377  create mode 100644 drivers/md/persistent-data/dm-space-map.h
9378  create mode 100644 drivers/md/persistent-data/dm-transaction-manager.c
9379  create mode 100644 drivers/md/persistent-data/dm-transaction-manager.h
9380 Merging embedded/master
9381 $ git merge embedded/master
9382 Already up-to-date.
9383 Merging firmware/master
9384 $ git merge firmware/master
9385 Already up-to-date.
9386 Merging pcmcia/master
9387 $ git merge pcmcia/master
9388 Already up-to-date.
9389 Merging battery/master
9390 $ git merge battery/master
9391 Merge made by recursive.
9392  .../bindings/power_supply/olpc_battery.txt         |    5 +
9393  drivers/power/ds2780_battery.c                     |    2 +-
9394  drivers/power/max17042_battery.c                   |   17 ++--
9395  drivers/power/max8903_charger.c                    |    2 +-
9396  drivers/power/max8997_charger.c                    |    1 +
9397  drivers/power/max8998_charger.c                    |    2 +
9398  drivers/power/olpc_battery.c                       |   79 ++++++++++++++-----
9399  drivers/power/pda_power.c                          |   74 ++++++++++++++++--
9400  drivers/power/power_supply_sysfs.c                 |    4 +-
9401  drivers/power/wm831x_power.c                       |   44 +++++++----
9402  drivers/power/z2_battery.c                         |    2 +-
9403  include/linux/pda_power.h                          |    2 +
9404  12 files changed, 175 insertions(+), 59 deletions(-)
9405  create mode 100644 Documentation/devicetree/bindings/power_supply/olpc_battery.txt
9406 Merging leds/for-mm
9407 $ git merge leds/for-mm
9408 Resolved 'drivers/leds/Kconfig' using previous resolution.
9409 Auto-merging drivers/leds/Kconfig
9410 CONFLICT (content): Merge conflict in drivers/leds/Kconfig
9411 Automatic merge failed; fix conflicts and then commit the result.
9412 $ git commit -v -a
9413 [master 39c9b53] Merge remote-tracking branch 'leds/for-mm'
9414 $ git diff -M --stat --summary HEAD^..
9415 Merging backlight/for-mm
9416 $ git merge backlight/for-mm
9417 Already up-to-date.
9418 Merging mmc/mmc-next
9419 $ git merge mmc/mmc-next
9420 Resolved 'drivers/mmc/core/core.c' using previous resolution.
9421 Resolved 'drivers/mmc/core/sd.c' using previous resolution.
9422 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
9423 Auto-merging arch/arm/mach-shmobile/board-ag5evm.c
9424 Auto-merging arch/arm/mach-shmobile/board-mackerel.c
9425 Auto-merging drivers/mmc/card/block.c
9426 Auto-merging drivers/mmc/core/core.c
9427 CONFLICT (content): Merge conflict in drivers/mmc/core/core.c
9428 Auto-merging drivers/mmc/core/host.c
9429 Auto-merging drivers/mmc/core/sd.c
9430 CONFLICT (content): Merge conflict in drivers/mmc/core/sd.c
9431 Auto-merging drivers/mmc/host/Kconfig
9432 Auto-merging drivers/mmc/host/at91_mci.c
9433 Auto-merging drivers/mmc/host/mmci.c
9434 Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c
9435 Auto-merging drivers/mmc/host/sdhci-s3c.c
9436 Auto-merging drivers/mmc/host/sdhci-tegra.c
9437 Auto-merging drivers/mmc/host/sh_mobile_sdhi.c
9438 Automatic merge failed; fix conflicts and then commit the result.
9439 $ git commit -v -a
9440 [master e03120a] Merge remote-tracking branch 'mmc/mmc-next'
9441 $ git diff -M --stat --summary HEAD^..
9442  .../devicetree/bindings/mmc/nvidia-sdhci.txt       |   27 +
9443  Documentation/fault-injection/fault-injection.txt  |    8 +-
9444  arch/arm/mach-at91/at91sam9260_devices.c           |    2 +-
9445  arch/arm/mach-msm/devices-msm7x00.c                |   24 -
9446  arch/arm/mach-msm/devices-qsd8x50.c                |   24 -
9447  arch/arm/mach-msm/include/mach/mmc.h               |    9 +-
9448  arch/arm/mach-shmobile/board-ag5evm.c              |    6 +
9449  arch/arm/mach-shmobile/board-mackerel.c            |    6 +
9450  drivers/mmc/card/block.c                           |  223 ++++--
9451  drivers/mmc/card/mmc_test.c                        |   30 +
9452  drivers/mmc/card/queue.c                           |    2 +-
9453  drivers/mmc/core/core.c                            |  172 ++++-
9454  drivers/mmc/core/core.h                            |    1 +
9455  drivers/mmc/core/debugfs.c                         |   27 +
9456  drivers/mmc/core/host.c                            |   11 +
9457  drivers/mmc/core/mmc.c                             |  120 +++-
9458  drivers/mmc/core/mmc_ops.c                         |    4 +-
9459  drivers/mmc/core/quirks.c                          |   11 +
9460  drivers/mmc/core/sd.c                              |    3 +-
9461  drivers/mmc/core/sd_ops.c                          |    8 +-
9462  drivers/mmc/core/sdio.c                            |    3 +-
9463  drivers/mmc/core/sdio_ops.c                        |    9 +-
9464  drivers/mmc/host/Kconfig                           |   16 +-
9465  drivers/mmc/host/at91_mci.c                        |    6 +-
9466  drivers/mmc/host/atmel-mci-regs.h                  |  220 +++---
9467  drivers/mmc/host/atmel-mci.c                       |  823 +++++++++++++-------
9468  drivers/mmc/host/dw_mmc.c                          |   36 +-
9469  drivers/mmc/host/dw_mmc.h                          |    2 +-
9470  drivers/mmc/host/mmci.c                            |    2 +-
9471  drivers/mmc/host/msm_sdcc.c                        |   78 ++-
9472  drivers/mmc/host/msm_sdcc.h                        |    6 +-
9473  drivers/mmc/host/omap_hsmmc.c                      |    5 +-
9474  drivers/mmc/host/sdhci-esdhc-imx.c                 |   80 ++-
9475  drivers/mmc/host/sdhci-of-esdhc.c                  |   18 +-
9476  drivers/mmc/host/sdhci-pci.c                       |   74 ++
9477  drivers/mmc/host/sdhci-pxav2.c                     |    4 +-
9478  drivers/mmc/host/sdhci-s3c.c                       |   28 +-
9479  drivers/mmc/host/sdhci-spear.c                     |    2 -
9480  drivers/mmc/host/sdhci-tegra.c                     |   54 +-
9481  drivers/mmc/host/sdhci.c                           |    9 +
9482  drivers/mmc/host/sdhci.h                           |    2 +-
9483  drivers/mmc/host/sh_mmcif.c                        |   20 +-
9484  drivers/mmc/host/sh_mobile_sdhi.c                  |   98 ++-
9485  drivers/mmc/host/tmio_mmc.c                        |    4 +-
9486  drivers/mmc/host/tmio_mmc.h                        |    7 +
9487  drivers/mmc/host/tmio_mmc_pio.c                    |  149 +++--
9488  include/linux/atmel-mci.h                          |    4 +-
9489  include/linux/atmel_pdc.h                          |    2 +
9490  include/linux/mmc/card.h                           |    8 +
9491  include/linux/mmc/core.h                           |    3 +
9492  include/linux/mmc/host.h                           |   20 +
9493  include/linux/mmc/mmc.h                            |   18 +
9494  include/linux/mmc/sh_mmcif.h                       |    4 +-
9495  include/linux/mmc/sh_mobile_sdhi.h                 |    4 +
9496  lib/Kconfig.debug                                  |   11 +
9497  lib/fault-inject.c                                 |    5 +-
9498  56 files changed, 1859 insertions(+), 693 deletions(-)
9499  create mode 100644 Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt
9500 Merging kgdb/kgdb-next
9501 $ git merge kgdb/kgdb-next
9502 Merge made by recursive.
9503 Merging slab/for-next
9504 $ git merge slab/for-next
9505 Merge made by recursive.
9506  Documentation/vm/00-INDEX |    2 -
9507  Documentation/vm/slub.txt |    2 +-
9508  include/linux/mm_types.h  |   14 +-
9509  include/linux/slub_def.h  |    4 +
9510  mm/slab.c                 |   19 +-
9511  mm/slub.c                 |  558 +++++++++++++++++++++++++++++++--------------
9512  tools/slub/slabinfo.c     |    8 +
9513  7 files changed, 425 insertions(+), 182 deletions(-)
9514 Merging uclinux/for-next
9515 $ git merge uclinux/for-next
9516 Already up-to-date.
9517 Merging md/for-next
9518 $ git merge md/for-next
9519 Auto-merging drivers/md/md.c
9520 Auto-merging drivers/md/md.h
9521 Auto-merging drivers/md/multipath.c
9522 Auto-merging drivers/md/raid1.c
9523 Auto-merging drivers/md/raid10.c
9524 Auto-merging drivers/md/raid5.c
9525 Merge made by recursive.
9526  drivers/md/bitmap.c    |   71 +++++++++++++++++++++++++----------------------
9527  drivers/md/md.c        |   30 +++++++++++++++++---
9528  drivers/md/md.h        |    4 +-
9529  drivers/md/multipath.c |    3 +-
9530  drivers/md/raid1.c     |    3 +-
9531  drivers/md/raid10.c    |    5 +--
9532  drivers/md/raid5.c     |    6 +---
9533  7 files changed, 71 insertions(+), 51 deletions(-)
9534 Merging mfd/for-next
9535 $ git merge mfd/for-next
9536 Resolved 'arch/arm/mach-u300/include/mach/irqs.h' using previous resolution.
9537 Auto-merging arch/arm/mach-imx/mach-mx27_3ds.c
9538 Auto-merging arch/arm/mach-imx/mach-mx31_3ds.c
9539 Auto-merging arch/arm/mach-imx/mach-mx31lite.c
9540 Auto-merging arch/arm/mach-imx/mach-mx31moboard.c
9541 Auto-merging arch/arm/mach-imx/mach-pcm038.c
9542 Auto-merging arch/arm/mach-mx5/mx51_efika.c
9543 Auto-merging arch/arm/mach-omap2/board-omap3beagle.c
9544 Auto-merging arch/arm/mach-u300/include/mach/irqs.h
9545 CONFLICT (content): Merge conflict in arch/arm/mach-u300/include/mach/irqs.h
9546 Auto-merging arch/arm/mach-ux500/board-u5500.c
9547 Auto-merging drivers/gpio/Kconfig
9548 Auto-merging drivers/i2c/busses/Kconfig
9549 Auto-merging drivers/input/misc/Kconfig
9550 Auto-merging drivers/input/misc/Makefile
9551 Removing drivers/mfd/ab3550-core.c
9552 Auto-merging drivers/mfd/jz4740-adc.c
9553 Auto-merging drivers/mfd/menelaus.c
9554 Auto-merging drivers/mfd/wm8994-core.c
9555 Auto-merging include/linux/mfd/wm8994/core.h
9556 Automatic merge failed; fix conflicts and then commit the result.
9557 $ git commit -v -a
9558 [master a2b09c7] Merge remote-tracking branch 'mfd/for-next'
9559 $ git diff -M --stat --summary HEAD^..
9560  arch/arm/mach-imx/mach-mx27_3ds.c       |    3 +-
9561  arch/arm/mach-imx/mach-mx31_3ds.c       |    2 +-
9562  arch/arm/mach-imx/mach-mx31lite.c       |    3 +-
9563  arch/arm/mach-imx/mach-mx31moboard.c    |   15 +-
9564  arch/arm/mach-imx/mach-pcm038.c         |    3 +-
9565  arch/arm/mach-mx5/mx51_efika.c          |    2 +-
9566  arch/arm/mach-omap2/Kconfig             |    1 -
9567  arch/arm/mach-omap2/board-omap3beagle.c |    9 +-
9568  arch/arm/mach-u300/i2c.c                |   51 +--
9569  arch/arm/mach-u300/include/mach/irqs.h  |   10 +-
9570  arch/arm/mach-ux500/board-u5500.c       |   29 +-
9571  arch/x86/include/asm/intel_scu_ipc.h    |   22 +
9572  arch/x86/platform/mrst/mrst.c           |  174 ++++-
9573  drivers/gpio/Kconfig                    |    3 +-
9574  drivers/hwmon/mc13783-adc.c             |   12 +-
9575  drivers/i2c/busses/Kconfig              |    1 -
9576  drivers/input/misc/Kconfig              |   10 +
9577  drivers/input/misc/Makefile             |    1 +
9578  drivers/input/misc/mc13783-pwrbutton.c  |  282 ++++++
9579  drivers/input/touchscreen/mc13783_ts.c  |   34 +-
9580  drivers/leds/leds-asic3.c               |   35 +-
9581  drivers/leds/leds-mc13783.c             |   60 +-
9582  drivers/media/radio/Kconfig             |    1 -
9583  drivers/mfd/Kconfig                     |   64 +-
9584  drivers/mfd/Makefile                    |    4 +-
9585  drivers/mfd/aat2870-core.c              |    2 +-
9586  drivers/mfd/ab3100-core.c               |    2 +-
9587  drivers/mfd/ab3550-core.c               | 1380 -----------------------------
9588  drivers/mfd/ab5500-core.c               | 1439 +++++++++++++++++++++++++++++++
9589  drivers/mfd/ab5500-core.h               |   87 ++
9590  drivers/mfd/ab5500-debugfs.c            |  806 +++++++++++++++++
9591  drivers/mfd/ab5500-debugfs.h            |   22 +
9592  drivers/mfd/ab8500-gpadc.c              |   56 +-
9593  drivers/mfd/asic3.c                     |   26 +-
9594  drivers/mfd/da903x.c                    |    2 +-
9595  drivers/mfd/intel_msic.c                |  501 +++++++++++
9596  drivers/mfd/jz4740-adc.c                |    2 +-
9597  drivers/mfd/max8997.c                   |   27 +-
9598  drivers/mfd/mc13xxx-core.c              |  116 ++--
9599  drivers/mfd/menelaus.c                  |    2 +-
9600  drivers/mfd/pcf50633-core.c             |  114 +--
9601  drivers/mfd/tc3589x.c                   |    2 +
9602  drivers/mfd/timberdale.c                |    9 +-
9603  drivers/mfd/tps65912-core.c             |    6 +-
9604  drivers/mfd/twl-core.c                  |    2 +-
9605  drivers/mfd/twl4030-irq.c               |  342 +++-----
9606  drivers/mfd/twl4030-madc.c              |   22 +
9607  drivers/mfd/twl6030-irq.c               |   75 ++-
9608  drivers/mfd/wm831x-core.c               |   11 +
9609  drivers/mfd/wm831x-i2c.c                |    8 +
9610  drivers/mfd/wm831x-irq.c                |   24 +-
9611  drivers/mfd/wm831x-spi.c                |    8 +
9612  drivers/mfd/wm8994-core.c               |   53 ++
9613  drivers/regulator/mc13783-regulator.c   |    6 +-
9614  include/linux/i2c/twl4030-madc.h        |    4 +
9615  include/linux/mfd/ab5500/ab5500.h       |  140 +++
9616  include/linux/mfd/ab8500/gpadc.h        |    5 +-
9617  include/linux/mfd/abx500.h              |   52 +--
9618  include/linux/mfd/intel_msic.h          |  456 ++++++++++
9619  include/linux/mfd/max8997-private.h     |    1 -
9620  include/linux/mfd/mc13783.h             |  111 ---
9621  include/linux/mfd/mc13xxx.h             |   38 +-
9622  include/linux/mfd/pcf50633/core.h       |    3 +-
9623  include/linux/mfd/wm831x/core.h         |    4 +
9624  include/linux/mfd/wm831x/pdata.h        |    3 +
9625  include/linux/mfd/wm8994/core.h         |    2 +
9626  include/linux/mfd/wm8994/pdata.h        |    7 +
9627  67 files changed, 4690 insertions(+), 2119 deletions(-)
9628  create mode 100644 drivers/input/misc/mc13783-pwrbutton.c
9629  delete mode 100644 drivers/mfd/ab3550-core.c
9630  create mode 100644 drivers/mfd/ab5500-core.c
9631  create mode 100644 drivers/mfd/ab5500-core.h
9632  create mode 100644 drivers/mfd/ab5500-debugfs.c
9633  create mode 100644 drivers/mfd/ab5500-debugfs.h
9634  create mode 100644 drivers/mfd/intel_msic.c
9635  create mode 100644 include/linux/mfd/ab5500/ab5500.h
9636  create mode 100644 include/linux/mfd/intel_msic.h
9637 Merging hdlc/hdlc-next
9638 $ git merge hdlc/hdlc-next
9639 Already up-to-date.
9640 Merging drm/drm-next
9641 $ git merge drm/drm-next
9642 Already up-to-date.
9643 Merging fbdev/fbdev-next
9644 $ git merge fbdev/fbdev-next
9645 Resolved 'drivers/video/Kconfig' using previous resolution.
9646 Auto-merging MAINTAINERS
9647 Auto-merging arch/arm/mach-shmobile/board-mackerel.c
9648 Auto-merging drivers/video/Kconfig
9649 CONFLICT (content): Merge conflict in drivers/video/Kconfig
9650 Auto-merging drivers/video/atmel_lcdfb.c
9651 Auto-merging drivers/video/backlight/adp8870_bl.c
9652 Removing drivers/video/sh_mobile_meram.h
9653 Automatic merge failed; fix conflicts and then commit the result.
9654 $ git commit -v -a
9655 [master d26a9fb] Merge remote-tracking branch 'fbdev/fbdev-next'
9656 $ git diff -M --stat --summary HEAD^..
9657  Documentation/fb/udlfb.txt                   |   39 +-
9658  MAINTAINERS                                  |    6 +
9659  arch/arm/mach-shmobile/board-mackerel.c      |    1 +
9660  arch/powerpc/platforms/512x/mpc512x_shared.c |   22 +-
9661  arch/powerpc/platforms/85xx/p1022_ds.c       |   47 +-
9662  arch/powerpc/platforms/86xx/mpc8610_hpcd.c   |   55 +-
9663  arch/powerpc/sysdev/fsl_soc.h                |   25 +-
9664  drivers/staging/xgifb/XGI_main_26.c          |   22 +-
9665  drivers/video/68328fb.c                      |    4 +-
9666  drivers/video/Kconfig                        |   34 +-
9667  drivers/video/Makefile                       |    2 +
9668  drivers/video/acornfb.c                      |    5 +-
9669  drivers/video/arkfb.c                        |    9 +-
9670  drivers/video/atmel_lcdfb.c                  |   15 +-
9671  drivers/video/aty/radeon_base.c              |   10 +-
9672  drivers/video/au1100fb.c                     |  181 +--
9673  drivers/video/au1100fb.h                     |    6 +-
9674  drivers/video/au1200fb.c                     |  299 ++---
9675  drivers/video/backlight/adp8860_bl.c         |    1 -
9676  drivers/video/backlight/adp8870_bl.c         |    1 -
9677  drivers/video/bf54x-lq043fb.c                |    2 +-
9678  drivers/video/bfin-lq035q1-fb.c              |    2 +-
9679  drivers/video/bfin-t350mcqb-fb.c             |    2 +-
9680  drivers/video/bfin_adv7393fb.c               |    2 +-
9681  drivers/video/carminefb.c                    |    6 +-
9682  drivers/video/controlfb.c                    |    2 +-
9683  drivers/video/da8xx-fb.c                     |  186 +++-
9684  drivers/video/fb-puv3.c                      |    4 +-
9685  drivers/video/fb_defio.c                     |    3 +-
9686  drivers/video/fbmem.c                        |    3 -
9687  drivers/video/fbmon.c                        |   21 +-
9688  drivers/video/fbsysfs.c                      |    3 +
9689  drivers/video/fsl-diu-fb.c                   |  434 +++----
9690  drivers/video/g364fb.c                       |    5 +-
9691  drivers/video/grvga.c                        |  579 ++++++++
9692  drivers/video/gxt4500.c                      |    4 +-
9693  drivers/video/hgafb.c                        |    4 +-
9694  drivers/video/imsttfb.c                      |    2 +-
9695  drivers/video/intelfb/intelfbhw.c            |    6 +-
9696  drivers/video/mb862xx/mb862xx-i2c.c          |    2 +-
9697  drivers/video/mb862xx/mb862xxfbdrv.c         |    6 +-
9698  drivers/video/modedb.c                       |  444 +++---
9699  drivers/video/msm/mddi.c                     |    2 +-
9700  drivers/video/msm/mdp.c                      |    6 +-
9701  drivers/video/mx3fb.c                        |   19 +-
9702  drivers/video/mxsfb.c                        |    1 +
9703  drivers/video/neofb.c                        |    4 +-
9704  drivers/video/nuc900fb.c                     |    3 +-
9705  drivers/video/omap2/displays/panel-taal.c    |    2 +-
9706  drivers/video/platinumfb.c                   |    2 +-
9707  drivers/video/pm2fb.c                        |    6 +-
9708  drivers/video/pm3fb.c                        |    6 +-
9709  drivers/video/ps3fb.c                        |    2 +-
9710  drivers/video/pxa3xx-gcu.c                   |    4 +-
9711  drivers/video/pxafb.c                        |    2 +-
9712  drivers/video/s3c-fb.c                       |  117 ++-
9713  drivers/video/s3c2410fb.c                    |    3 +-
9714  drivers/video/s3fb.c                         |    9 +-
9715  drivers/video/sa1100fb.c                     |    3 +-
9716  drivers/video/savage/savagefb_driver.c       |   16 +-
9717  drivers/video/sh_mobile_hdmi.c               |   47 +-
9718  drivers/video/sh_mobile_lcdcfb.c             | 1162 ++++++++--------
9719  drivers/video/sh_mobile_lcdcfb.h             |   12 +-
9720  drivers/video/sh_mobile_meram.c              |  208 +++-
9721  drivers/video/sh_mobile_meram.h              |   41 -
9722  drivers/video/sis/sis_main.c                 |   30 +-
9723  drivers/video/skeletonfb.c                   |    2 +-
9724  drivers/video/sm501fb.c                      |    6 +-
9725  drivers/video/smscufx.c                      | 1994 ++++++++++++++++++++++++++
9726  drivers/video/tmiofb.c                       |    2 +-
9727  drivers/video/tridentfb.c                    |    4 +-
9728  drivers/video/udlfb.c                        |  187 ++-
9729  drivers/video/valkyriefb.c                   |    2 +-
9730  drivers/video/vfb.c                          |    4 +-
9731  drivers/video/vga16fb.c                      |    2 +-
9732  drivers/video/via/dvi.c                      |   34 +-
9733  drivers/video/via/dvi.h                      |    3 +-
9734  drivers/video/via/global.c                   |    2 +
9735  drivers/video/via/global.h                   |    2 +
9736  drivers/video/via/hw.c                       |  544 ++------
9737  drivers/video/via/hw.h                       |  285 +----
9738  drivers/video/via/lcd.c                      |   53 +-
9739  drivers/video/via/lcd.h                      |    7 +-
9740  drivers/video/via/share.h                    |   23 +-
9741  drivers/video/via/via-core.c                 |    2 +-
9742  drivers/video/via/via_modesetting.c          |  104 ++
9743  drivers/video/via/via_modesetting.h          |   23 +
9744  drivers/video/via/viafbdev.c                 |  182 ++--
9745  drivers/video/via/viamode.c                  |   60 +-
9746  drivers/video/via/viamode.h                  |    4 +-
9747  drivers/video/vt8500lcdfb.c                  |    6 +-
9748  drivers/video/vt8623fb.c                     |    9 +-
9749  drivers/video/xilinxfb.c                     |    1 -
9750  include/linux/fsl-diu-fb.h                   |   12 +-
9751  include/video/sh_mobile_lcdc.h               |  135 ++-
9752  include/video/udlfb.h                        |    1 +
9753  96 files changed, 5180 insertions(+), 2728 deletions(-)
9754  create mode 100644 drivers/video/grvga.c
9755  delete mode 100644 drivers/video/sh_mobile_meram.h
9756  create mode 100644 drivers/video/smscufx.c
9757 Merging viafb/viafb-next
9758 $ git merge viafb/viafb-next
9759 Already up-to-date.
9760 Merging omap_dss2/for-next
9761 $ git merge omap_dss2/for-next
9762 Resolved 'arch/arm/mach-omap2/board-2430sdp.c' using previous resolution.
9763 Resolved 'arch/arm/mach-omap2/board-4430sdp.c' using previous resolution.
9764 Resolved 'arch/arm/mach-omap2/board-apollon.c' using previous resolution.
9765 Resolved 'arch/arm/mach-omap2/board-h4.c' using previous resolution.
9766 Resolved 'arch/arm/mach-omap2/board-ldp.c' using previous resolution.
9767 Resolved 'arch/arm/mach-omap2/board-rx51.c' using previous resolution.
9768 Auto-merging arch/arm/mach-omap2/board-2430sdp.c
9769 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-2430sdp.c
9770 Auto-merging arch/arm/mach-omap2/board-3430sdp.c
9771 Auto-merging arch/arm/mach-omap2/board-4430sdp.c
9772 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-4430sdp.c
9773 Auto-merging arch/arm/mach-omap2/board-am3517evm.c
9774 Auto-merging arch/arm/mach-omap2/board-apollon.c
9775 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-apollon.c
9776 Auto-merging arch/arm/mach-omap2/board-cm-t35.c
9777 Auto-merging arch/arm/mach-omap2/board-devkit8000.c
9778 Auto-merging arch/arm/mach-omap2/board-h4.c
9779 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-h4.c
9780 Auto-merging arch/arm/mach-omap2/board-igep0020.c
9781 Auto-merging arch/arm/mach-omap2/board-ldp.c
9782 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-ldp.c
9783 Auto-merging arch/arm/mach-omap2/board-omap3beagle.c
9784 Auto-merging arch/arm/mach-omap2/board-omap3evm.c
9785 Auto-merging arch/arm/mach-omap2/board-omap3pandora.c
9786 Auto-merging arch/arm/mach-omap2/board-omap3stalker.c
9787 Auto-merging arch/arm/mach-omap2/board-omap3touchbook.c
9788 Auto-merging arch/arm/mach-omap2/board-omap4panda.c
9789 Auto-merging arch/arm/mach-omap2/board-overo.c
9790 Auto-merging arch/arm/mach-omap2/board-rx51.c
9791 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-rx51.c
9792 Auto-merging drivers/media/video/omap/omap_vout.c
9793 Removing drivers/video/omap/lcd_2430sdp.c
9794 CONFLICT (delete/modify): drivers/video/omap/lcd_apollon.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_apollon.c left in tree.
9795 Removing drivers/video/omap/lcd_h4.c
9796 CONFLICT (delete/modify): drivers/video/omap/lcd_ldp.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_ldp.c left in tree.
9797 Removing drivers/video/omap/lcd_omap3beagle.c
9798 Removing drivers/video/omap/lcd_omap3evm.c
9799 CONFLICT (delete/modify): drivers/video/omap/lcd_overo.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_overo.c left in tree.
9800 Auto-merging drivers/video/omap2/displays/panel-taal.c
9801 Auto-merging drivers/video/omap2/dss/hdmi_panel.c
9802 Auto-merging drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
9803 Automatic merge failed; fix conflicts and then commit the result.
9804 $ git rm -f drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c
9805 arch/arm/mach-omap2/board-2430sdp.c: needs merge
9806 arch/arm/mach-omap2/board-4430sdp.c: needs merge
9807 arch/arm/mach-omap2/board-apollon.c: needs merge
9808 arch/arm/mach-omap2/board-h4.c: needs merge
9809 arch/arm/mach-omap2/board-ldp.c: needs merge
9810 arch/arm/mach-omap2/board-rx51.c: needs merge
9811 drivers/video/omap/lcd_apollon.c: needs merge
9812 drivers/video/omap/lcd_ldp.c: needs merge
9813 drivers/video/omap/lcd_overo.c: needs merge
9814 rm 'drivers/video/omap/lcd_apollon.c'
9815 rm 'drivers/video/omap/lcd_ldp.c'
9816 rm 'drivers/video/omap/lcd_overo.c'
9817 $ git commit -v -a
9818 [master 4e4e28c] Merge remote-tracking branch 'omap_dss2/for-next'
9819 $ git diff -M --stat --summary HEAD^..
9820  arch/arm/mach-omap2/board-2430sdp.c                |   78 +-
9821  arch/arm/mach-omap2/board-3430sdp.c                |    7 +-
9822  arch/arm/mach-omap2/board-4430sdp.c                |  208 +++-
9823  arch/arm/mach-omap2/board-am3517evm.c              |    6 +-
9824  arch/arm/mach-omap2/board-apollon.c                |   35 +-
9825  arch/arm/mach-omap2/board-cm-t35.c                 |    6 +-
9826  arch/arm/mach-omap2/board-devkit8000.c             |   10 +-
9827  arch/arm/mach-omap2/board-h4.c                     |   42 +-
9828  arch/arm/mach-omap2/board-igep0020.c               |    8 +-
9829  arch/arm/mach-omap2/board-ldp.c                    |  122 ++-
9830  arch/arm/mach-omap2/board-omap3beagle.c            |    8 +-
9831  arch/arm/mach-omap2/board-omap3evm.c               |    7 +-
9832  arch/arm/mach-omap2/board-omap3pandora.c           |    2 +-
9833  arch/arm/mach-omap2/board-omap3stalker.c           |   40 +-
9834  arch/arm/mach-omap2/board-omap3touchbook.c         |   18 -
9835  arch/arm/mach-omap2/board-omap4panda.c             |    8 +-
9836  arch/arm/mach-omap2/board-overo.c                  |    7 +-
9837  arch/arm/mach-omap2/board-rx51.c                   |   25 -
9838  arch/arm/mach-omap2/display.c                      |   60 +-
9839  arch/arm/mach-omap2/twl-common.c                   |   11 +-
9840  drivers/media/video/omap/omap_vout.c               |   18 +-
9841  drivers/video/omap/Kconfig                         |   29 -
9842  drivers/video/omap/Makefile                        |    8 -
9843  drivers/video/omap/lcd_2430sdp.c                   |  203 ---
9844  drivers/video/omap/lcd_apollon.c                   |  136 --
9845  drivers/video/omap/lcd_h4.c                        |  117 --
9846  drivers/video/omap/lcd_ldp.c                       |  201 ---
9847  drivers/video/omap/lcd_omap3beagle.c               |  130 --
9848  drivers/video/omap/lcd_omap3evm.c                  |  193 ---
9849  drivers/video/omap/lcd_overo.c                     |  180 ---
9850  drivers/video/omap2/displays/Kconfig               |   28 +-
9851  drivers/video/omap2/displays/Makefile              |    3 +
9852  drivers/video/omap2/displays/panel-dvi.c           |  363 +++++
9853  drivers/video/omap2/displays/panel-generic-dpi.c   |  113 +-
9854  drivers/video/omap2/displays/panel-n8x0.c          |  747 +++++++++
9855  drivers/video/omap2/displays/panel-picodlp.c       |  594 +++++++
9856  drivers/video/omap2/displays/panel-picodlp.h       |  288 ++++
9857  drivers/video/omap2/displays/panel-taal.c          |  123 +-
9858  drivers/video/omap2/dss/Kconfig                    |    2 +-
9859  drivers/video/omap2/dss/Makefile                   |    2 +-
9860  drivers/video/omap2/dss/core.c                     |    4 +
9861  drivers/video/omap2/dss/dispc.c                    | 1700 ++++++++------------
9862  drivers/video/omap2/dss/dispc.h                    |   57 +
9863  drivers/video/omap2/dss/display.c                  |   31 +-
9864  drivers/video/omap2/dss/dpi.c                      |   28 +-
9865  drivers/video/omap2/dss/dsi.c                      |  929 +++++++-----
9866  drivers/video/omap2/dss/dss.c                      |   18 +-
9867  drivers/video/omap2/dss/dss.h                      |  156 +-
9868  drivers/video/omap2/dss/dss_features.c             |  130 ++-
9869  drivers/video/omap2/dss/dss_features.h             |   17 +-
9870  drivers/video/omap2/dss/hdmi.c                     | 1260 ++-------------
9871  .../omap2/dss/{hdmi_omap4_panel.c => hdmi_panel.c} |   68 +-
9872  drivers/video/omap2/dss/manager.c                  |  191 +--
9873  drivers/video/omap2/dss/overlay.c                  |  122 +-
9874  drivers/video/omap2/dss/rfbi.c                     |   45 +-
9875  drivers/video/omap2/dss/sdi.c                      |   19 +-
9876  drivers/video/omap2/dss/ti_hdmi.h                  |  138 ++
9877  drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c          | 1239 ++++++++++++++
9878  .../video/omap2/dss/{hdmi.h => ti_hdmi_4xxx_ip.h}  |  400 +++---
9879  drivers/video/omap2/dss/venc.c                     |   27 +-
9880  drivers/video/omap2/omapfb/Kconfig                 |    2 +-
9881  drivers/video/omap2/omapfb/omapfb-main.c           |  134 ++-
9882  drivers/video/omap2/omapfb/omapfb-sysfs.c          |    6 +-
9883  include/video/omap-panel-dvi.h                     |   37 +
9884  include/video/omap-panel-n8x0.h                    |   15 +
9885  include/video/omap-panel-nokia-dsi.h               |    8 +-
9886  include/video/omap-panel-picodlp.h                 |   23 +
9887  include/video/omapdss.h                            |  100 +-
9888  68 files changed, 6495 insertions(+), 4595 deletions(-)
9889  delete mode 100644 drivers/video/omap/lcd_2430sdp.c
9890  delete mode 100644 drivers/video/omap/lcd_apollon.c
9891  delete mode 100644 drivers/video/omap/lcd_h4.c
9892  delete mode 100644 drivers/video/omap/lcd_ldp.c
9893  delete mode 100644 drivers/video/omap/lcd_omap3beagle.c
9894  delete mode 100644 drivers/video/omap/lcd_omap3evm.c
9895  delete mode 100644 drivers/video/omap/lcd_overo.c
9896  create mode 100644 drivers/video/omap2/displays/panel-dvi.c
9897  create mode 100644 drivers/video/omap2/displays/panel-n8x0.c
9898  create mode 100644 drivers/video/omap2/displays/panel-picodlp.c
9899  create mode 100644 drivers/video/omap2/displays/panel-picodlp.h
9900  rename drivers/video/omap2/dss/{hdmi_omap4_panel.c => hdmi_panel.c} (79%)
9901  create mode 100644 drivers/video/omap2/dss/ti_hdmi.h
9902  create mode 100644 drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
9903  rename drivers/video/omap2/dss/{hdmi.h => ti_hdmi_4xxx_ip.h} (54%)
9904  create mode 100644 include/video/omap-panel-dvi.h
9905  create mode 100644 include/video/omap-panel-n8x0.h
9906  create mode 100644 include/video/omap-panel-picodlp.h
9907 Merging voltage/for-next
9908 $ git merge voltage/for-next
9909 Auto-merging drivers/regulator/core.c
9910 Merge made by recursive.
9911  drivers/regulator/88pm8607.c           |    2 +-
9912  drivers/regulator/aat2870-regulator.c  |    1 +
9913  drivers/regulator/core.c               |   41 +++++++
9914  drivers/regulator/max8649.c            |    2 +-
9915  drivers/regulator/max8952.c            |    3 -
9916  drivers/regulator/tps65023-regulator.c |  190 +++++++++++++++++++++++++++----
9917  drivers/regulator/tps6507x-regulator.c |    8 +-
9918  drivers/regulator/tps6586x-regulator.c |   32 +++++-
9919  drivers/regulator/tps65912-regulator.c |    2 -
9920  include/linux/mfd/tps6586x.h           |   16 +++
9921  10 files changed, 257 insertions(+), 40 deletions(-)
9922 Merging security/next
9923 $ git merge security/next
9924 Resolved 'fs/ocfs2/xattr.c' using previous resolution.
9925 Auto-merging Documentation/kernel-parameters.txt
9926 Auto-merging MAINTAINERS
9927 Auto-merging drivers/char/tpm/tpm.c
9928 Auto-merging fs/btrfs/xattr.c
9929 Auto-merging fs/gfs2/inode.c
9930 Auto-merging fs/ocfs2/xattr.c
9931 CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
9932 Auto-merging fs/xfs/xfs_iops.c
9933 Auto-merging kernel/cred.c
9934 Removing security/integrity/ima/ima_iint.c
9935 Auto-merging security/keys/encrypted-keys/encrypted.c
9936 Auto-merging security/keys/encrypted-keys/encrypted.h
9937 Auto-merging security/tomoyo/common.c
9938 Automatic merge failed; fix conflicts and then commit the result.
9939 $ git commit -v -a
9940 [master 129fd82] Merge remote-tracking branch 'security/next'
9941 $ git diff -M --stat --summary HEAD^..
9942  Documentation/ABI/testing/evm                      |   23 +
9943  Documentation/kernel-parameters.txt                |    6 +
9944  MAINTAINERS                                        |    7 +-
9945  drivers/char/tpm/tpm.c                             |    3 +
9946  drivers/target/target_core_fabric_lib.c            |   12 +-
9947  fs/attr.c                                          |    5 +-
9948  fs/btrfs/xattr.c                                   |   50 +-
9949  fs/cifs/xattr.c                                    |   40 +-
9950  fs/ext2/xattr_security.c                           |   34 +-
9951  fs/ext3/xattr_security.c                           |   36 +-
9952  fs/ext4/xattr_security.c                           |   36 +-
9953  fs/gfs2/inode.c                                    |   38 +-
9954  fs/jffs2/security.c                                |   35 +-
9955  fs/jfs/xattr.c                                     |   57 +-
9956  fs/ocfs2/xattr.c                                   |   41 +-
9957  fs/reiserfs/xattr_security.c                       |    4 +-
9958  fs/xattr.c                                         |   63 ++-
9959  fs/xfs/xfs_iops.c                                  |   39 +-
9960  include/linux/evm.h                                |  100 +++
9961  include/linux/ima.h                                |   13 -
9962  include/linux/integrity.h                          |   39 +
9963  include/linux/kernel.h                             |    2 +-
9964  include/linux/security.h                           |   32 +-
9965  include/linux/xattr.h                              |   19 +-
9966  kernel/cred.c                                      |   18 +-
9967  lib/hexdump.c                                      |   15 +-
9968  mm/shmem.c                                         |    4 +-
9969  security/Kconfig                                   |    6 +-
9970  security/Makefile                                  |    4 +-
9971  security/apparmor/apparmorfs.c                     |    2 +-
9972  security/apparmor/ipc.c                            |    1 +
9973  security/apparmor/lib.c                            |    1 +
9974  security/apparmor/policy_unpack.c                  |   12 +-
9975  security/apparmor/procattr.c                       |    1 +
9976  security/commoncap.c                               |   16 +-
9977  security/integrity/Kconfig                         |    7 +
9978  security/integrity/Makefile                        |   12 +
9979  security/integrity/evm/Kconfig                     |   13 +
9980  security/integrity/evm/Makefile                    |    7 +
9981  security/integrity/evm/evm.h                       |   38 +
9982  security/integrity/evm/evm_crypto.c                |  216 ++++++
9983  security/integrity/evm/evm_main.c                  |  384 ++++++++++
9984  security/integrity/evm/evm_posix_acl.c             |   26 +
9985  security/integrity/evm/evm_secfs.c                 |  108 +++
9986  security/integrity/iint.c                          |  172 +++++
9987  security/integrity/ima/Kconfig                     |    1 +
9988  security/integrity/ima/Makefile                    |    2 +-
9989  security/integrity/ima/ima.h                       |   30 +-
9990  security/integrity/ima/ima_api.c                   |    7 +-
9991  security/integrity/ima/ima_fs.c                    |    2 +-
9992  security/integrity/ima/ima_iint.c                  |  169 -----
9993  security/integrity/ima/ima_main.c                  |   13 +-
9994  security/integrity/integrity.h                     |   50 ++
9995  security/keys/Makefile                             |    2 +-
9996  security/keys/encrypted-keys/Makefile              |    6 +
9997  .../keys/{ => encrypted-keys}/ecryptfs_format.c    |    0
9998  .../keys/{ => encrypted-keys}/ecryptfs_format.h    |    0
9999  security/keys/{ => encrypted-keys}/encrypted.c     |   49 +-
10000  security/keys/{ => encrypted-keys}/encrypted.h     |   11 +
10001  security/keys/encrypted-keys/masterkey_trusted.c   |   45 ++
10002  security/keys/gc.c                                 |  386 +++++++---
10003  security/keys/internal.h                           |    4 +
10004  security/keys/key.c                                |  121 +---
10005  security/keys/keyring.c                            |    3 +-
10006  security/keys/process_keys.c                       |   16 +-
10007  security/keys/trusted.c                            |   19 +-
10008  security/security.c                                |   76 ++-
10009  security/selinux/exports.c                         |    1 +
10010  security/selinux/hooks.c                           |   13 +-
10011  security/selinux/include/avc_ss.h                  |    6 +
10012  security/selinux/include/security.h                |    8 +
10013  security/selinux/netlink.c                         |    2 +
10014  security/selinux/nlmsgtab.c                        |    1 +
10015  security/selinux/selinuxfs.c                       |    5 +-
10016  security/selinux/ss/conditional.c                  |    2 +-
10017  security/selinux/ss/conditional.h                  |    1 +
10018  security/selinux/ss/policydb.c                     |    2 -
10019  security/selinux/ss/services.c                     |    3 -
10020  security/tomoyo/Kconfig                            |    2 +
10021  security/tomoyo/Makefile                           |    4 +-
10022  security/tomoyo/audit.c                            |    7 +-
10023  security/tomoyo/common.c                           |  217 +++++-
10024  security/tomoyo/common.h                           |  189 +++++-
10025  security/tomoyo/condition.c                        |   71 ++-
10026  security/tomoyo/domain.c                           |  209 +++++-
10027  security/tomoyo/environ.c                          |  122 +++
10028  security/tomoyo/file.c                             |   42 +-
10029  security/tomoyo/gc.c                               |  533 ++++++--------
10030  security/tomoyo/group.c                            |   61 ++-
10031  security/tomoyo/memory.c                           |   39 +-
10032  security/tomoyo/network.c                          |  771 ++++++++++++++++++++
10033  security/tomoyo/realpath.c                         |   32 +-
10034  security/tomoyo/securityfs_if.c                    |  123 +++-
10035  security/tomoyo/tomoyo.c                           |   62 ++
10036  security/tomoyo/util.c                             |   69 ++-
10037  95 files changed, 4208 insertions(+), 1198 deletions(-)
10038  create mode 100644 Documentation/ABI/testing/evm
10039  create mode 100644 include/linux/evm.h
10040  create mode 100644 include/linux/integrity.h
10041  create mode 100644 security/integrity/Kconfig
10042  create mode 100644 security/integrity/Makefile
10043  create mode 100644 security/integrity/evm/Kconfig
10044  create mode 100644 security/integrity/evm/Makefile
10045  create mode 100644 security/integrity/evm/evm.h
10046  create mode 100644 security/integrity/evm/evm_crypto.c
10047  create mode 100644 security/integrity/evm/evm_main.c
10048  create mode 100644 security/integrity/evm/evm_posix_acl.c
10049  create mode 100644 security/integrity/evm/evm_secfs.c
10050  create mode 100644 security/integrity/iint.c
10051  delete mode 100644 security/integrity/ima/ima_iint.c
10052  create mode 100644 security/integrity/integrity.h
10053  create mode 100644 security/keys/encrypted-keys/Makefile
10054  rename security/keys/{ => encrypted-keys}/ecryptfs_format.c (100%)
10055  rename security/keys/{ => encrypted-keys}/ecryptfs_format.h (100%)
10056  rename security/keys/{ => encrypted-keys}/encrypted.c (96%)
10057  rename security/keys/{ => encrypted-keys}/encrypted.h (81%)
10058  create mode 100644 security/keys/encrypted-keys/masterkey_trusted.c
10059  create mode 100644 security/tomoyo/environ.c
10060  create mode 100644 security/tomoyo/network.c
10061 Merging selinux/master
10062 $ git merge selinux/master
10063 Already up-to-date.
10064 Merging lblnet/master
10065 $ git merge lblnet/master
10066 Already up-to-date.
10067 Merging agp/agp-next
10068 $ git merge agp/agp-next
10069 Merge made by recursive.
10070 Merging watchdog/master
10071 $ git merge watchdog/master
10072 Merge made by recursive.
10073 Merging bdev/master
10074 $ git merge bdev/master
10075 Already up-to-date.
10076 Merging dwmw2-iommu/master
10077 $ git merge dwmw2-iommu/master
10078 Already up-to-date.
10079 Merging iommu/next
10080 $ git merge iommu/next
10081 Auto-merging arch/arm/plat-omap/include/plat/iopgtable.h
10082 Auto-merging drivers/iommu/amd_iommu.c
10083 Auto-merging drivers/iommu/omap-iommu-debug.c
10084 Auto-merging drivers/iommu/omap-iommu.c
10085 Auto-merging drivers/iommu/omap-iovmm.c
10086 Auto-merging drivers/media/video/Kconfig
10087 Auto-merging drivers/media/video/omap3isp/isp.c
10088 Auto-merging drivers/media/video/omap3isp/isp.h
10089 Auto-merging drivers/media/video/omap3isp/ispccdc.c
10090 Auto-merging drivers/media/video/omap3isp/ispvideo.c
10091 Auto-merging virt/kvm/iommu.c
10092 Merge made by recursive.
10093  arch/arm/mach-omap2/iommu2.c                       |   31 +-
10094  arch/arm/plat-omap/Kconfig                         |   12 -
10095  arch/arm/plat-omap/Makefile                        |    2 -
10096  arch/arm/plat-omap/include/plat/iommu.h            |   78 ++--
10097  arch/arm/plat-omap/include/plat/iommu2.h           |    4 +-
10098  arch/arm/plat-omap/{ => include/plat}/iopgtable.h  |   20 +-
10099  arch/arm/plat-omap/include/plat/iovmm.h            |   30 +-
10100  arch/ia64/kvm/kvm-ia64.c                           |    3 +-
10101  arch/x86/kvm/x86.c                                 |    3 +-
10102  drivers/iommu/Kconfig                              |   19 +
10103  drivers/iommu/Makefile                             |    3 +
10104  drivers/iommu/amd_iommu.c                          |    2 +-
10105  drivers/iommu/intel-iommu.c                        |    2 +-
10106  drivers/iommu/iommu.c                              |  114 ++++-
10107  drivers/iommu/msm_iommu.c                          |    9 +-
10108  .../iommu/omap-iommu-debug.c                       |   36 +-
10109  .../iommu.c => drivers/iommu/omap-iommu.c          |  527 +++++++++++++-------
10110  .../iovmm.c => drivers/iommu/omap-iovmm.c          |  370 ++++----------
10111  drivers/media/video/Kconfig                        |    3 +-
10112  drivers/media/video/omap3isp/isp.c                 |   45 ++-
10113  drivers/media/video/omap3isp/isp.h                 |    5 +-
10114  drivers/media/video/omap3isp/ispccdc.c             |   25 +-
10115  drivers/media/video/omap3isp/ispstat.c             |   11 +-
10116  drivers/media/video/omap3isp/ispvideo.c            |    4 +-
10117  include/linux/device.h                             |    6 +
10118  include/linux/iommu.h                              |   76 +++-
10119  lib/dma-debug.c                                    |   68 +++-
10120  virt/kvm/iommu.c                                   |    4 +-
10121  28 files changed, 867 insertions(+), 645 deletions(-)
10122  rename arch/arm/plat-omap/{ => include/plat}/iopgtable.h (82%)
10123  rename arch/arm/plat-omap/iommu-debug.c => drivers/iommu/omap-iommu-debug.c (91%)
10124  rename arch/arm/plat-omap/iommu.c => drivers/iommu/omap-iommu.c (61%)
10125  rename arch/arm/plat-omap/iovmm.c => drivers/iommu/omap-iovmm.c (62%)
10126 Merging cputime/cputime
10127 $ git merge cputime/cputime
10128 Already up-to-date.
10129 Merging osd/linux-next
10130 $ git merge osd/linux-next
10131 Merge made by recursive.
10132  drivers/scsi/osd/Kconfig     |    4 -
10133  fs/exofs/exofs.h             |   26 +-
10134  fs/exofs/inode.c             |  167 ++++++---
10135  fs/exofs/ore.c               |  330 +++++++++++------
10136  fs/exofs/super.c             |  205 +++++------
10137  fs/nfs/objlayout/objio_osd.c |  848 +++++++++---------------------------------
10138  fs/nfs/objlayout/objlayout.c |  209 ++++-------
10139  fs/nfs/objlayout/objlayout.h |   48 ++--
10140  include/scsi/osd_ore.h       |   53 +++-
10141  9 files changed, 752 insertions(+), 1138 deletions(-)
10142 Merging jc_docs/docs-next
10143 $ git merge jc_docs/docs-next
10144 Already up-to-date.
10145 Merging nommu/master
10146 $ git merge nommu/master
10147 Already up-to-date.
10148 Merging trivial/for-next
10149 $ git merge trivial/for-next
10150 Resolved 'Documentation/PCI/pci.txt' using previous resolution.
10151 Resolved 'drivers/net/Kconfig' using previous resolution.
10152 Auto-merging Documentation/PCI/pci.txt
10153 CONFLICT (content): Merge conflict in Documentation/PCI/pci.txt
10154 Auto-merging Documentation/kernel-parameters.txt
10155 Auto-merging Documentation/laptops/thinkpad-acpi.txt
10156 Auto-merging Documentation/networking/scaling.txt
10157 Auto-merging arch/arm/Kconfig
10158 Auto-merging arch/arm/include/asm/io.h
10159 CONFLICT (delete/modify): arch/arm/mach-nuc93x/time.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-nuc93x/time.c left in tree.
10160 Auto-merging arch/arm/mach-omap2/smartreflex.c
10161 Auto-merging arch/arm/mach-pxa/xcep.c
10162 Auto-merging drivers/block/drbd/drbd_int.h
10163 Auto-merging drivers/block/rbd.c
10164 Auto-merging drivers/block/xen-blkback/common.h
10165 Auto-merging drivers/media/dvb/dvb-usb/af9005.c
10166 Auto-merging drivers/media/radio/wl128x/fmdrv_v4l2.c
10167 Auto-merging drivers/mtd/Kconfig
10168 Auto-merging drivers/net/Kconfig
10169 CONFLICT (content): Merge conflict in drivers/net/Kconfig
10170 Auto-merging drivers/net/ethernet/atheros/atlx/atl1.c
10171 Auto-merging drivers/net/ethernet/broadcom/bnx2.h
10172 Auto-merging drivers/net/ethernet/dec/tulip/21142.c
10173 Auto-merging drivers/net/ethernet/dec/tulip/eeprom.c
10174 Auto-merging drivers/net/ethernet/dec/tulip/interrupt.c
10175 Auto-merging drivers/net/ethernet/dec/tulip/media.c
10176 Auto-merging drivers/net/ethernet/dec/tulip/pnic.c
10177 Auto-merging drivers/net/ethernet/dec/tulip/pnic2.c
10178 Auto-merging drivers/net/ethernet/dec/tulip/timer.c
10179 Auto-merging drivers/net/ethernet/dec/tulip/tulip.h
10180 Auto-merging drivers/net/ethernet/dec/tulip/tulip_core.c
10181 Auto-merging drivers/net/ethernet/intel/igb/e1000_mbx.c
10182 Auto-merging drivers/net/ethernet/intel/igbvf/mbx.c
10183 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
10184 Auto-merging drivers/net/ethernet/intel/ixgbevf/mbx.c
10185 Auto-merging drivers/net/ethernet/marvell/sky2.c
10186 Auto-merging drivers/net/ethernet/micrel/ks8695net.c
10187 Auto-merging drivers/net/ethernet/tile/tilepro.c
10188 Auto-merging drivers/net/wireless/rtlwifi/pci.c
10189 Auto-merging drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
10190 Auto-merging drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
10191 Auto-merging drivers/scsi/fcoe/fcoe.c
10192 Auto-merging drivers/scsi/isci/phy.c
10193 Auto-merging drivers/scsi/mpt2sas/mpt2sas_base.c
10194 Auto-merging drivers/scsi/mpt2sas/mpt2sas_ctl.c
10195 Auto-merging drivers/scsi/mpt2sas/mpt2sas_scsih.c
10196 Auto-merging drivers/scsi/mvsas/mv_sas.h
10197 Auto-merging drivers/target/target_core_transport.c
10198 Auto-merging drivers/target/tcm_fc/tfc_cmd.c
10199 Auto-merging drivers/target/tcm_fc/tfc_conf.c
10200 Auto-merging drivers/target/tcm_fc/tfc_io.c
10201 Auto-merging fs/cifs/connect.c
10202 Auto-merging fs/locks.c
10203 Auto-merging include/linux/ceph/messenger.h
10204 Auto-merging kernel/sched.c
10205 Auto-merging lib/Kconfig.debug
10206 Auto-merging scripts/checkpatch.pl
10207 Automatic merge failed; fix conflicts and then commit the result.
10208 $ git rm -f arch/arm/mach-nuc93x/time.c
10209 Documentation/PCI/pci.txt: needs merge
10210 arch/arm/mach-nuc93x/time.c: needs merge
10211 drivers/net/Kconfig: needs merge
10212 rm 'arch/arm/mach-nuc93x/time.c'
10213 $ git commit -v -a
10214 [master 5c83ac8] Merge remote-tracking branch 'trivial/for-next'
10215 $ git diff -M --stat --summary HEAD^..
10216  Documentation/ABI/removed/o2cb                     |    2 +-
10217  Documentation/ABI/removed/raw1394                  |    2 +-
10218  Documentation/ABI/testing/sysfs-bus-bcma           |    8 ++--
10219  .../testing/sysfs-class-backlight-driver-adp8870   |   16 ++++----
10220  Documentation/blackfin/bfin-gpio-notes.txt         |    2 +-
10221  Documentation/block/biodoc.txt                     |    2 +-
10222  Documentation/bus-virt-phys-mapping.txt            |    2 +-
10223  Documentation/cdrom/packet-writing.txt             |    2 +-
10224  Documentation/development-process/4.Coding         |    2 +-
10225  Documentation/devicetree/bindings/gpio/led.txt     |    2 +-
10226  Documentation/filesystems/caching/object.txt       |    6 +-
10227  Documentation/filesystems/locks.txt                |   11 +++--
10228  Documentation/filesystems/nfs/idmapper.txt         |    2 +-
10229  .../filesystems/pohmelfs/design_notes.txt          |    5 +-
10230  Documentation/filesystems/proc.txt                 |    2 +-
10231  Documentation/filesystems/vfs.txt                  |    3 -
10232  Documentation/frv/booting.txt                      |    6 ---
10233  Documentation/input/input.txt                      |    2 +-
10234  Documentation/kernel-docs.txt                      |    4 +-
10235  Documentation/kernel-parameters.txt                |   12 +++---
10236  Documentation/laptops/thinkpad-acpi.txt            |    4 +-
10237  Documentation/media-framework.txt                  |    4 +-
10238  Documentation/memory-barriers.txt                  |    2 +-
10239  Documentation/networking/scaling.txt               |    2 +-
10240  Documentation/power/basic-pm-debugging.txt         |    2 +-
10241  Documentation/power/userland-swsusp.txt            |    3 +-
10242  Documentation/rfkill.txt                           |    3 +-
10243  Documentation/scsi/aic7xxx_old.txt                 |    2 +-
10244  Documentation/scsi/scsi_mid_low_api.txt            |    5 --
10245  Documentation/security/keys-trusted-encrypted.txt  |    3 +-
10246  Documentation/sound/oss/PAS16                      |    3 +-
10247  Documentation/spi/pxa2xx                           |    4 +-
10248  Documentation/timers/highres.txt                   |    2 +-
10249  Documentation/usb/dma.txt                          |    6 +-
10250  Documentation/virtual/lguest/lguest.c              |    2 +-
10251  Documentation/vm/numa                              |    4 +-
10252  arch/alpha/kernel/srm_env.c                        |    5 +-
10253  arch/arm/Kconfig                                   |    2 +-
10254  arch/arm/include/asm/io.h                          |    2 +-
10255  arch/arm/mach-bcmring/irq.c                        |    1 -
10256  arch/arm/mach-bcmring/timer.c                      |    1 -
10257  arch/arm/mach-omap2/smartreflex.c                  |    2 +-
10258  arch/arm/mach-pxa/xcep.c                           |    3 +-
10259  arch/arm/mach-w90x900/cpu.c                        |    2 +-
10260  arch/ia64/hp/common/sba_iommu.c                    |   12 +++---
10261  arch/m68k/q40/README                               |    2 +-
10262  arch/microblaze/include/asm/dma-mapping.h          |    2 +-
10263  arch/mips/include/asm/lasat/lasat.h                |    6 +--
10264  arch/mn10300/Kconfig                               |    2 +-
10265  arch/mn10300/kernel/irq.c                          |    1 -
10266  arch/openrisc/Kconfig                              |    2 +-
10267  arch/openrisc/include/asm/dma-mapping.h            |    2 +-
10268  arch/parisc/include/asm/dma-mapping.h              |    2 +-
10269  arch/parisc/kernel/pci-dma.c                       |    2 +-
10270  arch/powerpc/include/asm/qe.h                      |    2 +-
10271  arch/powerpc/platforms/embedded6xx/storcenter.c    |    2 +-
10272  arch/powerpc/sysdev/qe_lib/qe.c                    |    2 +-
10273  arch/s390/hypfs/hypfs_diag.c                       |    3 +-
10274  arch/unicore32/include/asm/io.h                    |    2 +-
10275  arch/x86/Kconfig                                   |    2 +-
10276  arch/x86/Kconfig.debug                             |    2 +-
10277  arch/x86/boot/header.S                             |    2 +-
10278  arch/x86/include/asm/dma-mapping.h                 |    2 +-
10279  arch/x86/kernel/amd_gart_64.c                      |    2 +-
10280  arch/x86/kernel/apm_32.c                           |    2 -
10281  arch/x86/kernel/pci-dma.c                          |    4 +-
10282  arch/x86/kernel/process_32.c                       |    2 +-
10283  arch/x86/mm/mmio-mod.c                             |    1 -
10284  drivers/atm/idt77252.c                             |   11 +++--
10285  drivers/atm/lanai.c                                |    3 +-
10286  drivers/block/drbd/drbd_bitmap.c                   |    5 +-
10287  drivers/block/drbd/drbd_int.h                      |    3 +-
10288  drivers/block/drbd/drbd_nl.c                       |    4 +-
10289  drivers/block/rbd.c                                |    2 +-
10290  drivers/block/xen-blkback/common.h                 |    1 -
10291  drivers/char/agp/backend.c                         |    3 +-
10292  drivers/char/apm-emulation.c                       |    5 +--
10293  drivers/char/raw.c                                 |    3 +-
10294  drivers/char/rtc.c                                 |    7 +--
10295  drivers/gpu/drm/radeon/radeon_fence.c              |    2 +-
10296  drivers/i2c/busses/i2c-designware.c                |    2 +-
10297  drivers/input/misc/rotary_encoder.c                |    2 +-
10298  drivers/isdn/i4l/isdn_common.c                     |    4 +-
10299  drivers/isdn/mISDN/dsp_core.c                      |    3 +-
10300  drivers/isdn/mISDN/l1oip_codec.c                   |    6 +--
10301  drivers/leds/Kconfig                               |    2 +-
10302  drivers/media/dvb/dvb-usb/af9005-remote.c          |    2 +-
10303  drivers/media/dvb/dvb-usb/af9005.c                 |    2 +-
10304  drivers/media/dvb/frontends/dib3000.h              |    2 +-
10305  drivers/media/dvb/frontends/dib3000mb.c            |    2 +-
10306  drivers/media/radio/wl128x/fmdrv_v4l2.c            |    2 +-
10307  drivers/media/video/cx18/cx18-mailbox.h            |    2 +-
10308  drivers/mtd/Kconfig                                |    2 +-
10309  drivers/net/can/sja1000/sja1000_of_platform.c      |    2 +-
10310  drivers/net/ethernet/atheros/atlx/atl1.c           |    2 +-
10311  drivers/net/ethernet/broadcom/bnx2.h               |   12 +++---
10312  drivers/net/ethernet/dec/tulip/21142.c             |    3 -
10313  drivers/net/ethernet/dec/tulip/eeprom.c            |    2 -
10314  drivers/net/ethernet/dec/tulip/interrupt.c         |    3 -
10315  drivers/net/ethernet/dec/tulip/media.c             |    3 -
10316  drivers/net/ethernet/dec/tulip/pnic.c              |    3 -
10317  drivers/net/ethernet/dec/tulip/pnic2.c             |    3 -
10318  drivers/net/ethernet/dec/tulip/timer.c             |    3 -
10319  drivers/net/ethernet/dec/tulip/tulip.h             |    3 -
10320  drivers/net/ethernet/dec/tulip/tulip_core.c        |    3 -
10321  drivers/net/ethernet/intel/igb/e1000_mbx.c         |    2 +-
10322  drivers/net/ethernet/intel/igbvf/mbx.c             |    2 +-
10323  drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c       |    2 +-
10324  drivers/net/ethernet/intel/ixgbevf/mbx.c           |    2 +-
10325  drivers/net/ethernet/marvell/sky2.c                |    2 +-
10326  drivers/net/ethernet/micrel/ks8695net.c            |    2 +-
10327  drivers/net/ethernet/tile/tilepro.c                |    2 +-
10328  drivers/net/phy/broadcom.c                         |    2 +-
10329  drivers/net/wireless/ipw2x00/libipw_tx.c           |    2 +-
10330  drivers/net/wireless/libertas_tf/deb_defs.h        |    2 +-
10331  drivers/net/wireless/rtlwifi/pci.c                 |    6 +-
10332  drivers/parisc/sba_iommu.c                         |   16 ++++----
10333  drivers/platform/x86/Kconfig                       |    5 +--
10334  drivers/s390/cio/blacklist.c                       |    3 +-
10335  drivers/scsi/aacraid/src.c                         |    1 -
10336  drivers/scsi/aic94xx/aic94xx_dump.c                |    2 +-
10337  drivers/scsi/bfa/bfad_drv.h                        |    1 -
10338  drivers/scsi/cxgbi/cxgb3i/cxgb3i.c                 |    1 -
10339  drivers/scsi/cxgbi/cxgb4i/cxgb4i.c                 |    1 -
10340  drivers/scsi/fcoe/fcoe.c                           |    1 -
10341  drivers/scsi/isci/phy.c                            |    2 +-
10342  drivers/scsi/megaraid/megaraid_mbox.c              |    2 +-
10343  drivers/scsi/mpt2sas/mpt2sas_base.c                |    1 -
10344  drivers/scsi/mpt2sas/mpt2sas_config.c              |    1 -
10345  drivers/scsi/mpt2sas/mpt2sas_ctl.c                 |    1 -
10346  drivers/scsi/mpt2sas/mpt2sas_scsih.c               |    1 -
10347  drivers/scsi/mvsas/mv_sas.h                        |    1 -
10348  drivers/scsi/pmcraid.c                             |    1 -
10349  drivers/scsi/pmcraid.h                             |    1 -
10350  drivers/scsi/sg.c                                  |   18 +++++----
10351  drivers/staging/cxt1e1/Kconfig                     |    3 +-
10352  drivers/staging/iio/addac/adt7316-i2c.c            |    2 +-
10353  drivers/staging/iio/dds/ad9832.c                   |    2 +-
10354  drivers/target/iscsi/iscsi_target_nego.c           |    2 +-
10355  drivers/target/target_core_alua.c                  |    1 -
10356  drivers/target/target_core_configfs.c              |    1 -
10357  drivers/target/target_core_fabric_configfs.c       |    1 -
10358  drivers/target/target_core_file.c                  |    1 -
10359  drivers/target/target_core_iblock.c                |    1 -
10360  drivers/target/target_core_pr.c                    |    1 -
10361  drivers/target/target_core_pscsi.c                 |    1 -
10362  drivers/target/target_core_rd.c                    |    1 -
10363  drivers/target/target_core_stat.c                  |    1 -
10364  drivers/target/target_core_tmr.c                   |    1 -
10365  drivers/target/target_core_tpg.c                   |    2 +-
10366  drivers/target/target_core_transport.c             |    1 -
10367  drivers/target/target_core_ua.c                    |    1 -
10368  drivers/target/tcm_fc/tfc_cmd.c                    |    1 -
10369  drivers/target/tcm_fc/tfc_conf.c                   |    1 -
10370  drivers/target/tcm_fc/tfc_io.c                     |    1 -
10371  drivers/target/tcm_fc/tfc_sess.c                   |    1 -
10372  drivers/tty/serial/mrst_max3110.c                  |    2 +-
10373  drivers/usb/gadget/langwell_udc.c                  |    2 +-
10374  drivers/usb/gadget/mv_udc_core.c                   |    4 +-
10375  drivers/usb/gadget/net2280.c                       |    2 +-
10376  drivers/usb/gadget/uvc.h                           |    1 +
10377  drivers/usb/gadget/uvc_v4l2.c                      |    1 -
10378  drivers/usb/musb/musb_gadget.c                     |    2 +-
10379  drivers/usb/serial/digi_acceleport.c               |    2 +-
10380  drivers/usb/serial/mos7720.c                       |    1 -
10381  drivers/usb/serial/mos7840.c                       |    1 -
10382  drivers/usb/storage/realtek_cr.c                   |    1 -
10383  drivers/uwb/uwb-internal.h                         |    1 -
10384  drivers/video/igafb.c                              |    2 +-
10385  drivers/watchdog/smsc37b787_wdt.c                  |    2 +-
10386  fs/cifs/connect.c                                  |    2 +-
10387  fs/coda/coda_linux.h                               |    5 +-
10388  fs/configfs/inode.c                                |    3 +-
10389  fs/configfs/item.c                                 |    2 +-
10390  fs/eventpoll.c                                     |    2 +-
10391  fs/locks.c                                         |    2 +-
10392  fs/reiserfs/journal.c                              |    9 +---
10393  fs/reiserfs/resize.c                               |    4 +-
10394  fs/squashfs/Kconfig                                |    6 +-
10395  fs/xfs/kmem.h                                      |    7 +---
10396  include/linux/ceph/messenger.h                     |    1 -
10397  include/linux/drbd_tag_magic.h                     |    2 +-
10398  include/linux/io-mapping.h                         |    2 +-
10399  include/linux/isdn.h                               |    2 +-
10400  include/linux/platform_data/ntc_thermistor.h       |    2 +-
10401  include/media/pwc-ioctl.h                          |    1 -
10402  include/media/videobuf-dma-sg.h                    |    2 +-
10403  include/target/configfs_macros.h                   |    4 +-
10404  kernel/async.c                                     |    4 +-
10405  kernel/futex.c                                     |   10 ++--
10406  kernel/sched.c                                     |    2 +-
10407  lib/Kconfig.debug                                  |   40 ++++++++++----------
10408  lib/dynamic_debug.c                                |    1 -
10409  lib/idr.c                                          |    2 +-
10410  mm/page_cgroup.c                                   |    3 +-
10411  mm/vmscan.c                                        |    2 +-
10412  net/netfilter/Kconfig                              |    2 +-
10413  net/netfilter/x_tables.c                           |    5 +-
10414  net/rds/ib_cm.c                                    |    6 +--
10415  scripts/checkpatch.pl                              |    4 +-
10416  sound/core/memalloc.c                              |    4 +-
10417  sound/oss/Kconfig                                  |    4 +-
10418  tools/perf/util/config.c                           |    4 +-
10419  203 files changed, 261 insertions(+), 376 deletions(-)
10420 Merging audit/for-next
10421 $ git merge audit/for-next
10422 Already up-to-date.
10423 Merging pm/linux-next
10424 $ git merge pm/linux-next
10425 Resolved 'arch/arm/mach-shmobile/board-ap4evb.c' using previous resolution.
10426 Auto-merging Documentation/power/basic-pm-debugging.txt
10427 Auto-merging arch/arm/mach-shmobile/board-ap4evb.c
10428 CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c
10429 Auto-merging arch/arm/mach-shmobile/board-mackerel.c
10430 Auto-merging arch/s390/Kconfig
10431 Auto-merging drivers/bluetooth/btusb.c
10432 Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
10433 Auto-merging drivers/net/usb/usbnet.c
10434 Auto-merging include/linux/device.h
10435 Auto-merging include/linux/netdevice.h
10436 Removing include/linux/pm_qos_params.h
10437 Auto-merging include/sound/pcm.h
10438 Auto-merging kernel/Makefile
10439 Auto-merging kernel/power/Kconfig
10440 Auto-merging kernel/power/qos.c
10441 Auto-merging net/mac80211/main.c
10442 Auto-merging net/mac80211/mlme.c
10443 Auto-merging net/mac80211/scan.c
10444 Auto-merging sound/core/pcm_native.c
10445 Auto-merging sound/usb/card.c
10446 Automatic merge failed; fix conflicts and then commit the result.
10447 $ git commit -v -a
10448 [master 6c2a48e] Merge remote-tracking branch 'pm/linux-next'
10449 $ git diff -M --stat --summary HEAD^..
10450  Documentation/ABI/testing/sysfs-class-devfreq |   52 ++
10451  Documentation/power/basic-pm-debugging.txt    |   24 +
10452  Documentation/power/devices.txt               |    8 +-
10453  Documentation/power/pm_qos_interface.txt      |   92 ++++-
10454  Documentation/power/runtime_pm.txt            |    2 +
10455  Documentation/usb/power-management.txt        |    8 +-
10456  arch/arm/mach-msm/clock.c                     |    2 +-
10457  arch/arm/mach-omap1/pm_bus.c                  |    1 +
10458  arch/arm/mach-shmobile/board-ap4evb.c         |    1 +
10459  arch/arm/mach-shmobile/board-mackerel.c       |    2 +-
10460  arch/arm/mach-shmobile/include/mach/common.h  |    4 +-
10461  arch/arm/mach-shmobile/include/mach/sh7372.h  |    3 +
10462  arch/arm/mach-shmobile/pm-sh7372.c            |  295 +++++++++---
10463  arch/arm/mach-shmobile/pm_runtime.c           |    1 +
10464  arch/arm/mach-shmobile/setup-sh7372.c         |    3 +
10465  arch/arm/mach-shmobile/sleep-sh7372.S         |  221 ++--------
10466  arch/s390/Kconfig                             |    1 +
10467  arch/s390/kernel/suspend.c                    |  118 +++++
10468  arch/s390/kernel/swsusp_asm64.S               |    3 +
10469  drivers/Kconfig                               |    2 +
10470  drivers/Makefile                              |    2 +
10471  drivers/acpi/processor_idle.c                 |    2 +-
10472  drivers/base/power/Makefile                   |    4 +-
10473  drivers/base/power/clock_ops.c                |  123 +++---
10474  drivers/base/power/common.c                   |   86 ++++
10475  drivers/base/power/domain.c                   |  348 ++++++++------
10476  drivers/base/power/main.c                     |   34 ++-
10477  drivers/base/power/opp.c                      |   30 ++
10478  drivers/base/power/power.h                    |   10 +-
10479  drivers/base/power/qos.c                      |  419 +++++++++++++++++
10480  drivers/base/power/runtime.c                  |   94 +++--
10481  drivers/base/power/wakeup.c                   |    4 +-
10482  drivers/bluetooth/btusb.c                     |    2 +-
10483  drivers/cpuidle/cpuidle.c                     |    2 +-
10484  drivers/cpuidle/governors/ladder.c            |    2 +-
10485  drivers/cpuidle/governors/menu.c              |    2 +-
10486  drivers/devfreq/Kconfig                       |   75 +++
10487  drivers/devfreq/Makefile                      |    5 +
10488  drivers/devfreq/devfreq.c                     |  601 +++++++++++++++++++++++
10489  drivers/devfreq/governor.h                    |   24 +
10490  drivers/devfreq/governor_performance.c        |   29 ++
10491  drivers/devfreq/governor_powersave.c          |   29 ++
10492  drivers/devfreq/governor_simpleondemand.c     |   88 ++++
10493  drivers/devfreq/governor_userspace.c          |  116 +++++
10494  drivers/hid/hid-picolcd.c                     |    2 +-
10495  drivers/hid/usbhid/hid-core.c                 |    7 +-
10496  drivers/media/video/via-camera.c              |    4 +-
10497  drivers/net/ethernet/intel/e1000e/netdev.c    |    2 +-
10498  drivers/net/usb/usbnet.c                      |    2 +-
10499  drivers/net/wimax/i2400m/usb.c                |    4 +-
10500  drivers/net/wireless/ipw2x00/ipw2100.c        |    4 +-
10501  drivers/tty/Kconfig                           |    4 +
10502  drivers/usb/class/cdc-acm.c                   |    2 +-
10503  drivers/usb/class/cdc-wdm.c                   |    6 +-
10504  drivers/usb/core/driver.c                     |    9 +-
10505  drivers/usb/core/hcd.c                        |    9 +-
10506  drivers/usb/core/hub.c                        |   15 +-
10507  drivers/usb/serial/sierra.c                   |    2 +-
10508  drivers/usb/serial/usb_wwan.c                 |    2 +-
10509  include/linux/devfreq.h                       |  238 ++++++++++
10510  include/linux/device.h                        |    5 +
10511  include/linux/freezer.h                       |    4 +-
10512  include/linux/netdevice.h                     |    4 +-
10513  include/linux/opp.h                           |   12 +
10514  include/linux/pm.h                            |   25 +-
10515  include/linux/pm_clock.h                      |   71 +++
10516  include/linux/pm_domain.h                     |   26 +-
10517  include/linux/pm_qos.h                        |  155 ++++++
10518  include/linux/pm_qos_params.h                 |   38 --
10519  include/linux/pm_runtime.h                    |   42 --
10520  include/linux/suspend.h                       |   95 ++++-
10521  include/sound/pcm.h                           |    4 +-
10522  include/trace/events/rpm.h                    |   99 ++++
10523  kernel/Makefile                               |    2 +-
10524  kernel/power/Kconfig                          |    3 +
10525  kernel/power/Makefile                         |    4 +-
10526  kernel/power/console.c                        |    4 +-
10527  kernel/power/hibernate.c                      |   14 +-
10528  kernel/power/main.c                           |  102 ++++
10529  kernel/power/power.h                          |    3 +-
10530  kernel/power/process.c                        |   30 +-
10531  kernel/{pm_qos_params.c => power/qos.c}       |  273 ++++++------
10532  kernel/power/snapshot.c                       |   18 +
10533  kernel/power/suspend.c                        |   17 +-
10534  kernel/power/swap.c                           |  628 ++++++++++++++++++-------
10535  kernel/trace/Makefile                         |    3 +
10536  kernel/trace/rpm-traces.c                     |   20 +
10537  net/mac80211/main.c                           |    2 +-
10538  net/mac80211/mlme.c                           |    2 +-
10539  net/mac80211/scan.c                           |    2 +-
10540  sound/core/pcm_native.c                       |    2 +-
10541  sound/usb/card.c                              |    2 +-
10542  92 files changed, 4008 insertions(+), 989 deletions(-)
10543  create mode 100644 Documentation/ABI/testing/sysfs-class-devfreq
10544  create mode 100644 drivers/base/power/common.c
10545  create mode 100644 drivers/base/power/qos.c
10546  create mode 100644 drivers/devfreq/Kconfig
10547  create mode 100644 drivers/devfreq/Makefile
10548  create mode 100644 drivers/devfreq/devfreq.c
10549  create mode 100644 drivers/devfreq/governor.h
10550  create mode 100644 drivers/devfreq/governor_performance.c
10551  create mode 100644 drivers/devfreq/governor_powersave.c
10552  create mode 100644 drivers/devfreq/governor_simpleondemand.c
10553  create mode 100644 drivers/devfreq/governor_userspace.c
10554  create mode 100644 include/linux/devfreq.h
10555  create mode 100644 include/linux/pm_clock.h
10556  create mode 100644 include/linux/pm_qos.h
10557  delete mode 100644 include/linux/pm_qos_params.h
10558  create mode 100644 include/trace/events/rpm.h
10559  rename kernel/{pm_qos_params.c => power/qos.c} (71%)
10560  create mode 100644 kernel/trace/rpm-traces.c
10561 Merging apm/for-next
10562 $ git merge apm/for-next
10563 Auto-merging drivers/char/apm-emulation.c
10564 Merge made by recursive.
10565  drivers/char/apm-emulation.c |   16 ++++++----------
10566  1 files changed, 6 insertions(+), 10 deletions(-)
10567 Merging fsnotify/for-next
10568 $ git merge fsnotify/for-next
10569 Auto-merging fs/cachefiles/namei.c
10570 Auto-merging fs/nfsd/vfs.c
10571 Auto-merging fs/notify/fanotify/fanotify_user.c
10572 Auto-merging fs/notify/group.c
10573 Auto-merging fs/notify/mark.c
10574 Auto-merging include/linux/fsnotify_backend.h
10575 Merge made by recursive.
10576  fs/cachefiles/namei.c              |    1 -
10577  fs/cachefiles/xattr.c              |    1 -
10578  fs/nfsd/vfs.c                      |    3 -
10579  fs/notify/dnotify/dnotify.c        |   15 +++---
10580  fs/notify/fanotify/fanotify.c      |   24 +++++----
10581  fs/notify/fanotify/fanotify_user.c |  101 +++++++++++++++++++++++++-----------
10582  fs/notify/group.c                  |    1 +
10583  fs/notify/mark.c                   |   36 +++++--------
10584  include/linux/fanotify.h           |    5 ++-
10585  include/linux/fsnotify_backend.h   |   14 ++++-
10586  10 files changed, 121 insertions(+), 80 deletions(-)
10587 Merging irda/for-next
10588 $ git merge irda/for-next
10589 Already up-to-date.
10590 Merging edac/linux_next
10591 $ git merge edac/linux_next
10592 Resolved 'arch/x86/kernel/cpu/mcheck/mce.c' using previous resolution.
10593 Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
10594 CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
10595 Removing drivers/edac/edac_mce.c
10596 Auto-merging drivers/edac/i7core_edac.c
10597 Auto-merging include/linux/edac.h
10598 Removing include/linux/edac_mce.h
10599 Automatic merge failed; fix conflicts and then commit the result.
10600 $ git commit -v -a
10601 [master e5da342] Merge remote-tracking branch 'edac/linux_next'
10602 $ git diff -M --stat --summary HEAD^..
10603  arch/x86/kernel/cpu/mcheck/mce.c |   18 +-
10604  drivers/edac/Kconfig             |    8 +-
10605  drivers/edac/Makefile            |    1 -
10606  drivers/edac/edac_core.h         |  350 +--------------------------------
10607  drivers/edac/edac_mce.c          |   61 ------
10608  drivers/edac/i7core_edac.c       |  415 ++++++++++++++++++++++++++++++++++----
10609  include/linux/edac.h             |  350 ++++++++++++++++++++++++++++++++
10610  include/linux/edac_mce.h         |   31 ---
10611  8 files changed, 736 insertions(+), 498 deletions(-)
10612  delete mode 100644 drivers/edac/edac_mce.c
10613  delete mode 100644 include/linux/edac_mce.h
10614 Merging edac-amd/for-next
10615 $ git merge edac-amd/for-next
10616 Merge made by recursive.
10617  drivers/edac/amd64_edac.c |   33 +++++++++++++++++++++++--------
10618  drivers/edac/mce_amd.c    |   46 ++++++++++++++------------------------------
10619  drivers/edac/mce_amd.h    |    6 ++--
10620  3 files changed, 42 insertions(+), 43 deletions(-)
10621 Merging devicetree/devicetree/next
10622 $ git merge devicetree/devicetree/next
10623 Auto-merging drivers/of/fdt.c
10624 Merge made by recursive.
10625  .../devicetree/bindings/vendor-prefixes.txt        |   40 +++++
10626  drivers/of/base.c                                  |  150 ++++++++++++++++++++
10627  drivers/of/fdt.c                                   |    6 +-
10628  drivers/of/pdt.c                                   |    8 +
10629  drivers/tty/serial/altera_jtaguart.c               |    4 +-
10630  drivers/tty/serial/altera_uart.c                   |    4 +-
10631  drivers/tty/serial/imx.c                           |   11 +-
10632  drivers/tty/serial/uartlite.c                      |    4 +-
10633  include/linux/of.h                                 |   27 ++++
10634  9 files changed, 237 insertions(+), 17 deletions(-)
10635  create mode 100644 Documentation/devicetree/bindings/vendor-prefixes.txt
10636 $ git reset --hard HEAD^
10637 HEAD is now at 11e4b5d Merge remote-tracking branch 'edac-amd/for-next'
10638 Merging refs/next/20111004/devicetree
10639 $ git merge refs/next/20111004/devicetree
10640 Auto-merging drivers/of/fdt.c
10641 Merge made by recursive.
10642  .../devicetree/bindings/vendor-prefixes.txt        |   40 +++++++
10643  drivers/of/base.c                                  |  121 ++++++++++++++++++++
10644  drivers/of/fdt.c                                   |    6 +-
10645  drivers/of/pdt.c                                   |    8 ++
10646  drivers/tty/serial/imx.c                           |   11 +-
10647  include/linux/of.h                                 |    7 +
10648  6 files changed, 185 insertions(+), 8 deletions(-)
10649  create mode 100644 Documentation/devicetree/bindings/vendor-prefixes.txt
10650 Merging spi/spi/next
10651 $ git merge spi/spi/next
10652 Auto-merging drivers/spi/spi-pl022.c
10653 Merge made by recursive.
10654  drivers/spi/spi-dw-mid.c |    9 ++-
10655  drivers/spi/spi-dw.c     |   62 ++++++++++----------
10656  drivers/spi/spi-dw.h     |   97 +++++++++++++++++--------------
10657  drivers/spi/spi-pl022.c  |  146 +++++++++++++++++++++------------------------
10658  4 files changed, 157 insertions(+), 157 deletions(-)
10659 Merging gpio/gpio/next
10660 $ git merge gpio/gpio/next
10661 Auto-merging arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
10662 Auto-merging drivers/gpio/gpio-nomadik.c
10663 Merge made by recursive.
10664  arch/arm/plat-nomadik/include/plat/gpio-nomadik.h |    3 +
10665  drivers/gpio/gpio-nomadik.c                       |  127 ++++++++++++++++++---
10666  2 files changed, 116 insertions(+), 14 deletions(-)
10667 Merging tip/auto-latest
10668 $ git merge tip/auto-latest
10669 Resolved 'drivers/iommu/Makefile' using previous resolution.
10670 Auto-merging Documentation/kernel-parameters.txt
10671 Auto-merging arch/arm/common/gic.c
10672 Auto-merging arch/arm/kernel/smp.c
10673 Auto-merging arch/arm/kernel/traps.c
10674 Auto-merging arch/arm/mach-footbridge/netwinder-hw.c
10675 Auto-merging arch/arm/mach-integrator/core.c
10676 Auto-merging arch/arm/mach-ixp4xx/common-pci.c
10677 Auto-merging arch/arm/mm/cache-l2x0.c
10678 Auto-merging arch/arm/mm/context.c
10679 Auto-merging arch/ia64/configs/generic_defconfig
10680 Auto-merging arch/x86/Kconfig
10681 Auto-merging arch/x86/include/asm/cpufeature.h
10682 Auto-merging drivers/acpi/processor_idle.c
10683 Auto-merging drivers/cpufreq/cpufreq_ondemand.c
10684 Auto-merging drivers/iommu/Kconfig
10685 Auto-merging drivers/iommu/Makefile
10686 CONFLICT (content): Merge conflict in drivers/iommu/Makefile
10687 Auto-merging drivers/iommu/intel-iommu.c
10688 Auto-merging drivers/leds/Kconfig
10689 Removing drivers/leds/leds-alix2.c
10690 Removing drivers/staging/hv/hv_timesource.c
10691 Auto-merging kernel/events/core.c
10692 Auto-merging kernel/sched.c
10693 Automatic merge failed; fix conflicts and then commit the result.
10694 $ git commit -v -a
10695 [master c9935de] Merge remote-tracking branch 'tip/auto-latest'
10696 $ git diff -M --stat --summary HEAD^..
10697  Documentation/kernel-parameters.txt                |   21 +-
10698  Documentation/scheduler/sched-bwc.txt              |  122 ++++
10699  Documentation/x86/entry_64.txt                     |    3 -
10700  arch/arm/common/gic.c                              |   26 +-
10701  arch/arm/include/asm/dma.h                         |    6 +-
10702  arch/arm/include/asm/mmu.h                         |    4 +-
10703  arch/arm/kernel/dma.c                              |    2 +-
10704  arch/arm/kernel/smp.c                              |    6 +-
10705  arch/arm/kernel/traps.c                            |   20 +-
10706  arch/arm/mach-footbridge/include/mach/hardware.h   |    2 +-
10707  arch/arm/mach-footbridge/netwinder-hw.c            |   14 +-
10708  arch/arm/mach-footbridge/netwinder-leds.c          |   10 +-
10709  arch/arm/mach-integrator/core.c                    |    6 +-
10710  arch/arm/mach-integrator/pci_v3.c                  |   14 +-
10711  arch/arm/mach-ixp4xx/common-pci.c                  |   22 +-
10712  arch/arm/mach-shark/leds.c                         |    6 +-
10713  arch/arm/mm/cache-l2x0.c                           |   46 +-
10714  arch/arm/mm/context.c                              |   14 +-
10715  arch/arm/mm/copypage-v4mc.c                        |    6 +-
10716  arch/arm/mm/copypage-v6.c                          |   10 +-
10717  arch/arm/mm/copypage-xscale.c                      |    6 +-
10718  arch/ia64/configs/generic_defconfig                |    2 +-
10719  arch/ia64/dig/Makefile                             |    2 +-
10720  arch/ia64/include/asm/device.h                     |    2 +-
10721  arch/ia64/include/asm/iommu.h                      |    6 +-
10722  arch/ia64/include/asm/pci.h                        |    2 +-
10723  arch/ia64/kernel/Makefile                          |    2 +-
10724  arch/ia64/kernel/acpi.c                            |    4 +-
10725  arch/ia64/kernel/msi_ia64.c                        |    4 +-
10726  arch/ia64/kernel/pci-dma.c                         |    2 +-
10727  arch/powerpc/sysdev/uic.c                          |   24 +-
10728  arch/s390/kernel/time.c                            |   13 +-
10729  arch/x86/Kconfig                                   |   30 +-
10730  arch/x86/configs/x86_64_defconfig                  |    4 +-
10731  arch/x86/include/asm/amd_nb.h                      |    6 +
10732  arch/x86/include/asm/apic.h                        |    2 +-
10733  arch/x86/include/asm/archrandom.h                  |   75 ++
10734  arch/x86/include/asm/atomic.h                      |    8 +-
10735  arch/x86/include/asm/atomic64_64.h                 |    6 +-
10736  arch/x86/include/asm/cmpxchg.h                     |  205 ++++++
10737  arch/x86/include/asm/cmpxchg_32.h                  |  114 ----
10738  arch/x86/include/asm/cmpxchg_64.h                  |  131 ----
10739  arch/x86/include/asm/cpufeature.h                  |    1 +
10740  arch/x86/include/asm/device.h                      |    2 +-
10741  arch/x86/include/asm/dwarf2.h                      |    2 +
10742  arch/x86/include/asm/elf.h                         |   31 +
10743  arch/x86/include/asm/hw_irq.h                      |    2 +-
10744  arch/x86/include/asm/irq_remapping.h               |    6 +-
10745  arch/x86/include/asm/pgtable_types.h               |    1 -
10746  arch/x86/include/asm/rwsem.h                       |    8 +-
10747  arch/x86/include/asm/spinlock.h                    |  114 +---
10748  arch/x86/include/asm/spinlock_types.h              |   22 +-
10749  arch/x86/include/asm/unistd_64.h                   |    1 -
10750  arch/x86/include/asm/uv/uv_bau.h                   |    7 +-
10751  arch/x86/include/asm/uv/uv_hub.h                   |   37 +-
10752  arch/x86/include/asm/x86_init.h                    |   12 -
10753  arch/x86/kernel/apic/apic.c                        |   33 +-
10754  arch/x86/kernel/apic/bigsmp_32.c                   |   20 +-
10755  arch/x86/kernel/apic/io_apic.c                     |  284 ++++----
10756  arch/x86/kernel/apic/probe_32.c                    |   10 +-
10757  arch/x86/kernel/apic/x2apic_uv_x.c                 |    7 +-
10758  arch/x86/kernel/cpu/Makefile                       |    6 +
10759  arch/x86/kernel/cpu/amd.c                          |   47 +-
10760  arch/x86/kernel/cpu/common.c                       |    5 +
10761  arch/x86/kernel/cpu/cpu.h                          |    1 +
10762  arch/x86/kernel/cpu/intel_cacheinfo.c              |  127 ++---
10763  arch/x86/kernel/cpu/mcheck/mce_intel.c             |   10 +-
10764  arch/x86/kernel/cpu/mshyperv.c                     |   23 +
10765  arch/x86/kernel/cpu/perf_event.c                   |  373 +----------
10766  arch/x86/kernel/cpu/perf_event.h                   |  493 ++++++++++++++
10767  arch/x86/kernel/cpu/perf_event_amd.c               |   21 +-
10768  arch/x86/kernel/cpu/perf_event_intel.c             |   55 +-
10769  arch/x86/kernel/cpu/perf_event_intel_ds.c          |   79 +--
10770  arch/x86/kernel/cpu/perf_event_intel_lbr.c         |   28 +-
10771  arch/x86/kernel/cpu/perf_event_p4.c                |   10 +-
10772  arch/x86/kernel/cpu/perf_event_p6.c                |    9 +-
10773  arch/x86/kernel/cpu/rdrand.c                       |   73 ++
10774  arch/x86/kernel/entry_64.S                         |   14 +-
10775  arch/x86/kernel/process.c                          |    2 +-
10776  arch/x86/kernel/sys_x86_64.c                       |   78 ++-
10777  arch/x86/kernel/x86_init.c                         |    4 -
10778  arch/x86/mm/fault.c                                |   10 +-
10779  arch/x86/mm/init.c                                 |  147 +++-
10780  arch/x86/mm/mmap.c                                 |   20 +-
10781  arch/x86/oprofile/nmi_int.c                        |    4 +-
10782  arch/x86/oprofile/op_model_ppro.c                  |   27 +-
10783  arch/x86/platform/Makefile                         |    1 +
10784  arch/x86/platform/geode/Makefile                   |    1 +
10785  arch/x86/platform/geode/alix.c                     |  142 ++++
10786  arch/x86/platform/uv/tlb_uv.c                      |   17 +-
10787  arch/x86/vdso/vma.c                                |    9 +
10788  arch/x86/xen/mmu.c                                 |   15 -
10789  drivers/acpi/apei/Kconfig                          |    1 -
10790  drivers/acpi/processor_idle.c                      |   10 +-
10791  drivers/char/agp/intel-gtt.c                       |    4 +-
10792  drivers/char/random.c                              |   23 +-
10793  drivers/cpufreq/cpufreq_conservative.c             |    4 +-
10794  drivers/cpufreq/cpufreq_ondemand.c                 |    4 +-
10795  drivers/dca/dca-core.c                             |   78 ++-
10796  drivers/dma/ipu/ipu_irq.c                          |   48 +-
10797  drivers/iommu/Kconfig                              |   25 +-
10798  drivers/iommu/Makefile                             |    5 +-
10799  drivers/iommu/dmar.c                               |  246 ++------
10800  drivers/iommu/intel-iommu.c                        |  203 +++++-
10801  drivers/iommu/intr_remapping.c                     |   93 ++-
10802  drivers/leds/Kconfig                               |    8 -
10803  drivers/leds/Makefile                              |    1 -
10804  drivers/leds/leds-alix2.c                          |  239 -------
10805  drivers/oprofile/event_buffer.c                    |    4 +-
10806  drivers/oprofile/oprofile_perf.c                   |    4 +-
10807  drivers/oprofile/oprofilefs.c                      |    6 +-
10808  drivers/pci/quirks.c                               |    2 +-
10809  drivers/staging/hv/Makefile                        |    2 +-
10810  drivers/staging/hv/hv_timesource.c                 |  101 ---
10811  drivers/video/console/vgacon.c                     |   42 +-
10812  fs/proc/stat.c                                     |   41 +-
10813  include/asm-generic/cputime.h                      |    4 +-
10814  include/linux/alarmtimer.h                         |   51 ++-
10815  include/linux/clockchips.h                         |   12 +-
10816  include/linux/dma_remapping.h                      |   10 +-
10817  include/linux/dmar.h                               |   43 +-
10818  include/linux/init_task.h                          |    2 +-
10819  include/linux/intel-iommu.h                        |   10 +-
10820  include/linux/interrupt.h                          |   38 +-
10821  include/linux/irq.h                                |   18 +-
10822  include/linux/irq_work.h                           |   15 +-
10823  include/linux/irqdesc.h                            |    1 +
10824  include/linux/jiffies.h                            |    2 +-
10825  include/linux/kprobes.h                            |    2 +-
10826  include/linux/llist.h                              |   71 ++-
10827  include/linux/oprofile.h                           |    2 +-
10828  include/linux/percpu_counter.h                     |    2 +-
10829  include/linux/posix-timers.h                       |    5 +-
10830  include/linux/proportions.h                        |    6 +-
10831  include/linux/random.h                             |   13 +
10832  include/linux/ratelimit.h                          |    6 +-
10833  include/linux/rwsem-spinlock.h                     |    2 +-
10834  include/linux/rwsem.h                              |   10 +-
10835  include/linux/sched.h                              |   11 +-
10836  include/linux/semaphore.h                          |    4 +-
10837  include/trace/events/sched.h                       |    9 +-
10838  include/trace/ftrace.h                             |    3 +
10839  init/Kconfig                                       |   12 +
10840  kernel/cgroup.c                                    |   18 +-
10841  kernel/events/core.c                               |   97 +++-
10842  kernel/irq/chip.c                                  |   64 ++-
10843  kernel/irq/internals.h                             |   19 +-
10844  kernel/irq/irqdesc.c                               |   32 +-
10845  kernel/irq/manage.c                                |  218 ++++++-
10846  kernel/irq/settings.h                              |    7 +
10847  kernel/irq_work.c                                  |   91 +--
10848  kernel/kprobes.c                                   |   34 +-
10849  kernel/latencytop.c                                |   14 +-
10850  kernel/lockdep.c                                   |  156 ++++-
10851  kernel/posix-cpu-timers.c                          |   12 +-
10852  kernel/printk.c                                    |   46 +-
10853  kernel/rtmutex-debug.c                             |   75 +--
10854  kernel/sched.c                                     |  622 ++++++++++++++---
10855  kernel/sched_cpupri.c                              |   89 ++-
10856  kernel/sched_cpupri.h                              |    7 +-
10857  kernel/sched_fair.c                                |  716 +++++++++++++++++++-
10858  kernel/sched_features.h                            |    5 -
10859  kernel/sched_rt.c                                  |   91 +--
10860  kernel/sched_stats.h                               |   12 +-
10861  kernel/sched_stoptask.c                            |    2 +
10862  kernel/semaphore.c                                 |   28 +-
10863  kernel/sysctl.c                                    |   10 +
10864  kernel/time.c                                      |    2 +-
10865  kernel/time/Kconfig                                |    2 +
10866  kernel/time/alarmtimer.c                           |  266 +++++---
10867  kernel/time/clockevents.c                          |  129 ++++-
10868  kernel/time/clocksource.c                          |   38 +-
10869  kernel/time/tick-broadcast.c                       |    4 +-
10870  kernel/time/tick-common.c                          |    4 +-
10871  kernel/time/tick-internal.h                        |    2 -
10872  kernel/time/tick-oneshot.c                         |   77 +--
10873  kernel/time/tick-sched.c                           |   55 ++-
10874  kernel/time/timer_stats.c                          |    6 +-
10875  kernel/trace/ring_buffer.c                         |   52 +-
10876  kernel/trace/trace.c                               |   10 +-
10877  kernel/trace/trace_irqsoff.c                       |    6 +-
10878  kernel/watchdog.c                                  |    7 +-
10879  lib/Kconfig                                        |    3 -
10880  lib/Makefile                                       |    4 +-
10881  lib/atomic64.c                                     |   66 +-
10882  lib/llist.c                                        |   74 +--
10883  lib/percpu_counter.c                               |   18 +-
10884  lib/proportions.c                                  |   12 +-
10885  lib/ratelimit.c                                    |    4 +-
10886  lib/rwsem-spinlock.c                               |   38 +-
10887  lib/rwsem.c                                        |   14 +-
10888  tools/perf/Documentation/perf-annotate.txt         |   14 +
10889  tools/perf/Documentation/perf-buildid-list.txt     |    6 +
10890  tools/perf/Documentation/perf-report.txt           |    3 +
10891  tools/perf/Documentation/perf-sched.txt            |    6 +-
10892  tools/perf/Documentation/perf-stat.txt             |   16 +
10893  tools/perf/builtin-annotate.c                      |    8 +
10894  tools/perf/builtin-buildid-list.c                  |   52 ++-
10895  tools/perf/builtin-record.c                        |   19 +-
10896  tools/perf/builtin-report.c                        |    7 +-
10897  tools/perf/builtin-stat.c                          |  190 ++++--
10898  tools/perf/builtin-top.c                           |   34 +-
10899  .../perf/scripts/python/bin/net_dropmonitor-record |    2 +
10900  .../perf/scripts/python/bin/net_dropmonitor-report |    4 +
10901  tools/perf/scripts/python/net_dropmonitor.py       |   72 ++
10902  tools/perf/util/annotate.c                         |   11 +-
10903  tools/perf/util/annotate.h                         |    2 +
10904  tools/perf/util/color.c                            |    2 +-
10905  tools/perf/util/map.c                              |   98 ++--
10906  tools/perf/util/map.h                              |   42 +-
10907  tools/perf/util/symbol.c                           |    2 +
10908  tools/perf/util/symbol.h                           |    4 +-
10909  tools/perf/util/top.h                              |    3 +
10910  tools/perf/util/ui/browsers/top.c                  |   28 +-
10911  214 files changed, 5794 insertions(+), 3208 deletions(-)
10912  create mode 100644 Documentation/scheduler/sched-bwc.txt
10913  create mode 100644 arch/x86/include/asm/archrandom.h
10914  create mode 100644 arch/x86/kernel/cpu/perf_event.h
10915  create mode 100644 arch/x86/kernel/cpu/rdrand.c
10916  create mode 100644 arch/x86/platform/geode/Makefile
10917  create mode 100644 arch/x86/platform/geode/alix.c
10918  delete mode 100644 drivers/leds/leds-alix2.c
10919  delete mode 100644 drivers/staging/hv/hv_timesource.c
10920  create mode 100755 tools/perf/scripts/python/bin/net_dropmonitor-record
10921  create mode 100755 tools/perf/scripts/python/bin/net_dropmonitor-report
10922  create mode 100755 tools/perf/scripts/python/net_dropmonitor.py
10923 $ git am -3 ../patches/0001-llist-add-back-llist_add_batch-and-llist_del_first.patch
10924 Applying: llist: add back llist_add_batch and llist_del_first
10925 $ git reset HEAD^
10926 Unstaged changes after reset:
10927 M       include/linux/llist.h
10928 $ git add .
10929 $ git commit -v -a --amend
10930 [master f480d73] Merge remote-tracking branch 'tip/auto-latest'
10931 Merging rcu/rcu/next
10932 $ git merge rcu/rcu/next
10933 Auto-merging include/linux/sched.h
10934 Auto-merging init/Kconfig
10935 Auto-merging kernel/lockdep.c
10936 Auto-merging kernel/sched.c
10937 Auto-merging kernel/time/tick-sched.c
10938 Merge made by recursive.
10939  Documentation/RCU/NMI-RCU.txt       |    2 +-
10940  Documentation/RCU/lockdep-splat.txt |  110 +++++++++
10941  Documentation/RCU/lockdep.txt       |   34 ++-
10942  Documentation/RCU/torture.txt       |  137 ++++++++---
10943  Documentation/RCU/trace.txt         |   38 ++--
10944  include/linux/lockdep.h             |    2 +-
10945  include/linux/rcupdate.h            |  300 +++++++++++-------------
10946  include/linux/rcutiny.h             |   20 ++-
10947  include/linux/rcutree.h             |    2 +
10948  include/linux/sched.h               |    4 -
10949  include/linux/types.h               |   10 +
10950  include/trace/events/rcu.h          |  459 +++++++++++++++++++++++++++++++++++
10951  init/Kconfig                        |    6 +-
10952  kernel/lockdep.c                    |   84 ++++---
10953  kernel/pid.c                        |    4 +-
10954  kernel/rcu.h                        |   85 +++++++
10955  kernel/rcupdate.c                   |   26 ++-
10956  kernel/rcutiny.c                    |  117 ++-------
10957  kernel/rcutiny_plugin.h             |  134 +++++++----
10958  kernel/rcutorture.c                 |   77 +++----
10959  kernel/rcutree.c                    |  290 ++++++++++++++--------
10960  kernel/rcutree.h                    |   17 +-
10961  kernel/rcutree_plugin.h             |  150 +++++++-----
10962  kernel/rcutree_trace.c              |   13 +-
10963  kernel/rtmutex.c                    |    8 +
10964  kernel/sched.c                      |   13 +-
10965  kernel/time/tick-sched.c            |    6 -
10966  27 files changed, 1489 insertions(+), 659 deletions(-)
10967  create mode 100644 Documentation/RCU/lockdep-splat.txt
10968  create mode 100644 include/trace/events/rcu.h
10969  create mode 100644 kernel/rcu.h
10970 Merging kvm/kvm-updates/3.2
10971 $ git merge kvm/kvm-updates/3.2
10972 Auto-merging Documentation/kernel-parameters.txt
10973 Auto-merging arch/powerpc/kernel/asm-offsets.c
10974 Auto-merging arch/powerpc/kernel/exceptions-64s.S
10975 Auto-merging arch/x86/include/asm/cpufeature.h
10976 Auto-merging arch/x86/kvm/x86.c
10977 Auto-merging virt/kvm/assigned-dev.c
10978 Merge made by recursive.
10979  Documentation/kernel-parameters.txt       |    4 +
10980  Documentation/virtual/kvm/api.txt         |   71 +++-
10981  arch/powerpc/include/asm/kvm.h            |   13 +
10982  arch/powerpc/include/asm/kvm_book3s.h     |   40 ++-
10983  arch/powerpc/include/asm/kvm_book3s_asm.h |    2 +
10984  arch/powerpc/include/asm/kvm_host.h       |   30 +-
10985  arch/powerpc/include/asm/kvm_ppc.h        |    1 +
10986  arch/powerpc/kernel/asm-offsets.c         |   13 +-
10987  arch/powerpc/kernel/exceptions-64s.S      |   10 -
10988  arch/powerpc/kvm/44x.c                    |    2 +
10989  arch/powerpc/kvm/Makefile                 |    4 +
10990  arch/powerpc/kvm/book3s_32_sr.S           |    2 +-
10991  arch/powerpc/kvm/book3s_64_mmu.c          |    8 +-
10992  arch/powerpc/kvm/book3s_64_slb.S          |    2 +-
10993  arch/powerpc/kvm/book3s_emulate.c         |   29 +
10994  arch/powerpc/kvm/book3s_exports.c         |    4 +-
10995  arch/powerpc/kvm/book3s_hv.c              |  343 +++++++-----
10996  arch/powerpc/kvm/book3s_hv_rm_mmu.c       |   33 --
10997  arch/powerpc/kvm/book3s_hv_rmhandlers.S   |  300 +++++++++--
10998  arch/powerpc/kvm/book3s_interrupts.S      |  129 +----
10999  arch/powerpc/kvm/book3s_pr.c              |   58 ++-
11000  arch/powerpc/kvm/book3s_pr_papr.c         |  158 ++++++
11001  arch/powerpc/kvm/book3s_rmhandlers.S      |   54 +--
11002  arch/powerpc/kvm/book3s_segment.S         |  117 ++++-
11003  arch/powerpc/kvm/booke.c                  |   10 +-
11004  arch/powerpc/kvm/e500.c                   |    2 +
11005  arch/powerpc/kvm/powerpc.c                |   55 ++-
11006  arch/x86/include/asm/apicdef.h            |    2 +
11007  arch/x86/include/asm/cpufeature.h         |    1 +
11008  arch/x86/include/asm/kvm_emulate.h        |    4 +-
11009  arch/x86/include/asm/kvm_host.h           |   14 +-
11010  arch/x86/include/asm/msr-index.h          |    2 +
11011  arch/x86/include/asm/vmx.h                |   12 +
11012  arch/x86/kvm/emulate.c                    |  867 ++++++++++++++---------------
11013  arch/x86/kvm/i8254.c                      |    6 +-
11014  arch/x86/kvm/i8259.c                      |  123 ++++-
11015  arch/x86/kvm/irq.h                        |    4 +-
11016  arch/x86/kvm/kvm_cache_regs.h             |    7 -
11017  arch/x86/kvm/kvm_timer.h                  |    2 +
11018  arch/x86/kvm/lapic.c                      |  163 +++++--
11019  arch/x86/kvm/lapic.h                      |    4 +
11020  arch/x86/kvm/mmu.c                        |    5 +-
11021  arch/x86/kvm/mmu_audit.c                  |    6 +-
11022  arch/x86/kvm/paging_tmpl.h                |   24 +-
11023  arch/x86/kvm/svm.c                        |   92 +--
11024  arch/x86/kvm/trace.h                      |  118 ++++-
11025  arch/x86/kvm/vmx.c                        |  131 +++---
11026  arch/x86/kvm/x86.c                        |  274 ++++++----
11027  include/linux/kvm.h                       |    5 +-
11028  include/linux/kvm_host.h                  |   32 +-
11029  virt/kvm/assigned-dev.c                   |   62 ++-
11030  virt/kvm/coalesced_mmio.c                 |  131 ++---
11031  virt/kvm/coalesced_mmio.h                 |    7 +-
11032  virt/kvm/eventfd.c                        |    3 +-
11033  virt/kvm/ioapic.c                         |    3 +-
11034  virt/kvm/kvm_main.c                       |  112 ++++-
11035  56 files changed, 2347 insertions(+), 1363 deletions(-)
11036  create mode 100644 arch/powerpc/kvm/book3s_pr_papr.c
11037 Merging oprofile/for-next
11038 $ git merge oprofile/for-next
11039 Already up-to-date.
11040 Merging ptrace/ptrace
11041 $ git merge ptrace/ptrace
11042 Auto-merging arch/mips/kernel/signal.c
11043 Auto-merging arch/openrisc/kernel/signal.c
11044 Auto-merging arch/s390/kernel/compat_signal.c
11045 Auto-merging arch/s390/kernel/signal.c
11046 Auto-merging arch/sparc/kernel/signal32.c
11047 Auto-merging arch/sparc/kernel/signal_32.c
11048 Auto-merging arch/sparc/kernel/signal_64.c
11049 Auto-merging include/linux/sched.h
11050 Merge made by recursive.
11051  arch/alpha/kernel/signal.c         |   31 ++++++------------
11052  arch/arm/kernel/signal.c           |   24 +++++---------
11053  arch/avr32/kernel/signal.c         |   26 +++++----------
11054  arch/blackfin/kernel/signal.c      |   17 ++--------
11055  arch/cris/arch-v10/kernel/signal.c |   34 +++++++-------------
11056  arch/cris/arch-v32/kernel/signal.c |   37 ++++++---------------
11057  arch/frv/kernel/signal.c           |   32 ++++++-------------
11058  arch/h8300/kernel/signal.c         |   33 +++++--------------
11059  arch/ia64/kernel/signal.c          |   15 +--------
11060  arch/m32r/kernel/signal.c          |   12 +------
11061  arch/m68k/kernel/signal_mm.c       |   22 +++++--------
11062  arch/m68k/kernel/signal_no.c       |   28 +++++-----------
11063  arch/microblaze/kernel/signal.c    |   42 ++++++++++---------------
11064  arch/mips/kernel/signal.c          |   27 +++-------------
11065  arch/mips/kernel/signal32.c        |   20 ++---------
11066  arch/mips/kernel/signal_n32.c      |   10 +-----
11067  arch/mn10300/kernel/signal.c       |   32 ++++++-------------
11068  arch/openrisc/kernel/signal.c      |   45 +++++++++++---------------
11069  arch/parisc/kernel/signal.c        |   12 +------
11070  arch/powerpc/kernel/signal.c       |   13 +------
11071  arch/powerpc/kernel/signal_32.c    |   11 +++---
11072  arch/s390/kernel/compat_signal.c   |    6 +---
11073  arch/s390/kernel/signal.c          |    6 +---
11074  arch/score/kernel/signal.c         |   13 ++------
11075  arch/sh/kernel/signal_32.c         |   35 ++++++---------------
11076  arch/sh/kernel/signal_64.c         |   40 ++++++-----------------
11077  arch/sparc/include/asm/signal.h    |    3 +-
11078  arch/sparc/kernel/signal32.c       |   17 ++--------
11079  arch/sparc/kernel/signal_32.c      |   28 +++++-----------
11080  arch/sparc/kernel/signal_64.c      |   29 ++++++-----------
11081  arch/tile/kernel/compat_signal.c   |    5 +--
11082  arch/tile/kernel/signal.c          |   13 +------
11083  arch/um/kernel/signal.c            |   28 +++++-----------
11084  arch/um/sys-i386/signal.c          |   12 +------
11085  arch/um/sys-x86_64/signal.c        |    6 +---
11086  arch/unicore32/kernel/signal.c     |   13 +------
11087  arch/x86/kernel/signal.c           |    6 +---
11088  arch/xtensa/kernel/signal.c        |   35 ++++++--------------
11089  fs/autofs4/waitq.c                 |   14 ++------
11090  fs/coda/upcall.c                   |   19 +++++------
11091  fs/dlm/user.c                      |    1 -
11092  fs/exec.c                          |   18 +---------
11093  fs/ncpfs/sock.c                    |   15 +++------
11094  include/linux/sched.h              |    3 +-
11095  include/linux/signal.h             |    1 +
11096  kernel/fork.c                      |   61 +++++++++++++++++++++++-------------
11097  kernel/signal.c                    |   22 +++++++++++++
11098  47 files changed, 321 insertions(+), 651 deletions(-)
11099 Merging xen/upstream/xen
11100 $ git merge xen/upstream/xen
11101 Auto-merging arch/x86/xen/time.c
11102 Merge made by recursive.
11103  arch/ia64/include/asm/xen/interface.h |    1 +
11104  arch/x86/include/asm/microcode.h      |    9 +
11105  arch/x86/include/asm/xen/hypercall.h  |    8 +
11106  arch/x86/include/asm/xen/interface.h  |    1 +
11107  arch/x86/kernel/Makefile              |    1 +
11108  arch/x86/kernel/microcode_core.c      |    5 +-
11109  arch/x86/kernel/microcode_xen.c       |  198 ++++++++++++++++++++
11110  arch/x86/xen/Kconfig                  |    4 +
11111  arch/x86/xen/time.c                   |   16 ++-
11112  include/xen/interface/platform.h      |  320 +++++++++++++++++++++++++++++++++
11113  include/xen/interface/xen.h           |    1 +
11114  11 files changed, 562 insertions(+), 2 deletions(-)
11115  create mode 100644 arch/x86/kernel/microcode_xen.c
11116  create mode 100644 include/xen/interface/platform.h
11117 Merging xen-two/linux-next
11118 $ git merge xen-two/linux-next
11119 Resolved 'arch/x86/xen/Kconfig' using previous resolution.
11120 Auto-merging arch/x86/xen/Kconfig
11121 CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
11122 Auto-merging arch/x86/xen/mmu.c
11123 Auto-merging drivers/block/xen-blkback/common.h
11124 Auto-merging drivers/xen/xen-pciback/xenbus.c
11125 Automatic merge failed; fix conflicts and then commit the result.
11126 $ git commit -v -a
11127 [master 369f546] Merge remote-tracking branch 'xen-two/linux-next'
11128 $ git diff -M --stat --summary HEAD^..
11129  arch/x86/include/asm/xen/page.h             |    6 +-
11130  arch/x86/pci/xen.c                          |   32 +++-
11131  arch/x86/xen/Kconfig                        |   11 +-
11132  arch/x86/xen/enlighten.c                    |    2 +-
11133  arch/x86/xen/mmu.c                          |   52 -----
11134  arch/x86/xen/p2m.c                          |  123 ++++++++++--
11135  arch/x86/xen/setup.c                        |  284 ++++++++++++---------------
11136  drivers/block/xen-blkback/blkback.c         |   94 +++++++--
11137  drivers/block/xen-blkback/common.h          |   93 +++++++--
11138  drivers/block/xen-blkback/xenbus.c          |   58 ++++++
11139  drivers/block/xen-blkfront.c                |  113 +++++++++---
11140  drivers/pci/xen-pcifront.c                  |    5 +-
11141  drivers/xen/Kconfig                         |   10 -
11142  drivers/xen/Makefile                        |    4 +-
11143  drivers/xen/balloon.c                       |   75 +++++---
11144  drivers/xen/events.c                        |   57 ++++--
11145  drivers/xen/gntdev.c                        |   37 +++-
11146  drivers/xen/grant-table.c                   |    8 +-
11147  drivers/xen/pci.c                           |  109 +++++++++--
11148  drivers/xen/swiotlb-xen.c                   |   70 +++++--
11149  drivers/xen/xen-balloon.c                   |   17 +-
11150  drivers/xen/xen-pciback/conf_space.c        |    1 -
11151  drivers/xen/xen-pciback/conf_space_header.c |    5 +-
11152  drivers/xen/xen-pciback/conf_space_quirks.c |    3 +-
11153  drivers/xen/xen-pciback/passthrough.c       |   34 ++--
11154  drivers/xen/xen-pciback/pci_stub.c          |   42 ++--
11155  drivers/xen/xen-pciback/pciback.h           |   32 ++--
11156  drivers/xen/xen-pciback/pciback_ops.c       |    1 -
11157  drivers/xen/xen-pciback/vpci.c              |   35 ++--
11158  drivers/xen/xen-pciback/xenbus.c            |   27 +--
11159  drivers/xen/xenbus/xenbus_comms.c           |    4 +-
11160  drivers/xen/xenbus/xenbus_probe.c           |    7 +-
11161  drivers/xen/xenbus/xenbus_probe.h           |    3 +-
11162  drivers/xen/xenbus/xenbus_probe_backend.c   |    3 +-
11163  drivers/xen/xenbus/xenbus_probe_frontend.c  |  121 ++++++++++++
11164  drivers/xen/xenbus/xenbus_xs.c              |   17 ++-
11165  include/xen/balloon.h                       |    5 +-
11166  include/xen/grant_table.h                   |    1 +
11167  include/xen/interface/io/blkif.h            |   36 ++++
11168  include/xen/interface/io/xs_wire.h          |    6 +-
11169  include/xen/interface/physdev.h             |   34 +++-
11170  include/xen/page.h                          |   12 +-
11171  42 files changed, 1156 insertions(+), 533 deletions(-)
11172 Merging xen-pvhvm/linux-next
11173 $ git merge xen-pvhvm/linux-next
11174 Already up-to-date.
11175 Merging percpu/for-next
11176 $ git merge percpu/for-next
11177 Merge made by recursive.
11178  mm/percpu-vm.c |    5 ++---
11179  mm/percpu.c    |   17 +++++++++--------
11180  2 files changed, 11 insertions(+), 11 deletions(-)
11181 Merging workqueues/for-next
11182 $ git merge workqueues/for-next
11183 Already up-to-date.
11184 Merging sfi/sfi-test
11185 $ git merge sfi/sfi-test
11186 Already up-to-date.
11187 Merging asm-generic/next
11188 $ git merge asm-generic/next
11189 Already up-to-date.
11190 Merging drivers-x86/linux-next
11191 $ git merge drivers-x86/linux-next
11192 Already up-to-date.
11193 Merging hwpoison/hwpoison
11194 $ git merge hwpoison/hwpoison
11195 Already up-to-date.
11196 Merging sysctl/master
11197 $ git merge sysctl/master
11198 Auto-merging fs/proc/proc_sysctl.c
11199 Merge made by recursive.
11200  fs/proc/proc_sysctl.c |   14 ++------------
11201  1 files changed, 2 insertions(+), 12 deletions(-)
11202 Merging namespace/master
11203 $ git merge namespace/master
11204 Auto-merging fs/proc/inode.c
11205 Merge made by recursive.
11206  fs/proc/inode.c      |    6 +-
11207  fs/proc/namespaces.c |  160 +++++++++++++++++++++++++++++++++++++++++++-------
11208  2 files changed, 142 insertions(+), 24 deletions(-)
11209 Merging regmap/for-next
11210 $ git merge regmap/for-next
11211 Resolved 'drivers/mfd/wm831x-spi.c' using previous resolution.
11212 Auto-merging drivers/base/regmap/regmap-spi.c
11213 Auto-merging drivers/mfd/Kconfig
11214 Auto-merging drivers/mfd/wm831x-core.c
11215 Auto-merging drivers/mfd/wm831x-i2c.c
11216 Auto-merging drivers/mfd/wm831x-spi.c
11217 CONFLICT (content): Merge conflict in drivers/mfd/wm831x-spi.c
11218 Auto-merging drivers/mfd/wm8994-core.c
11219 Auto-merging include/linux/mfd/wm831x/core.h
11220 Auto-merging include/linux/mfd/wm8994/core.h
11221 Automatic merge failed; fix conflicts and then commit the result.
11222 $ git commit -v -a
11223 [master 2a9610b] Merge remote-tracking branch 'regmap/for-next'
11224 $ git diff -M --stat --summary HEAD^..
11225  drivers/base/regmap/Kconfig            |    2 +
11226  drivers/base/regmap/Makefile           |    3 +-
11227  drivers/base/regmap/internal.h         |  128 ++++++++++
11228  drivers/base/regmap/regcache-indexed.c |   65 +++++
11229  drivers/base/regmap/regcache-lzo.c     |  361 +++++++++++++++++++++++++++
11230  drivers/base/regmap/regcache-rbtree.c  |  350 ++++++++++++++++++++++++++
11231  drivers/base/regmap/regcache.c         |  401 ++++++++++++++++++++++++++++++
11232  drivers/base/regmap/regmap-debugfs.c   |  209 ++++++++++++++++
11233  drivers/base/regmap/regmap-i2c.c       |    2 -
11234  drivers/base/regmap/regmap-spi.c       |    2 -
11235  drivers/base/regmap/regmap.c           |  190 +++++++++++----
11236  drivers/mfd/Kconfig                    |    3 +
11237  drivers/mfd/wm831x-core.c              |  424 ++++++++++++++++++++++++++++----
11238  drivers/mfd/wm831x-i2c.c               |   68 +-----
11239  drivers/mfd/wm831x-spi.c               |  196 +++-------------
11240  drivers/mfd/wm8400-core.c              |  106 +++------
11241  drivers/mfd/wm8994-core.c              |  178 +++-----------
11242  include/linux/mfd/wm831x/core.h        |    9 +-
11243  include/linux/mfd/wm8400-private.h     |    7 +-
11244  include/linux/mfd/wm8994/core.h        |    9 +-
11245  include/linux/regmap.h                 |   29 ++-
11246  include/trace/events/regmap.h          |  136 ++++++++++
11247  22 files changed, 2310 insertions(+), 568 deletions(-)
11248  create mode 100644 drivers/base/regmap/internal.h
11249  create mode 100644 drivers/base/regmap/regcache-indexed.c
11250  create mode 100644 drivers/base/regmap/regcache-lzo.c
11251  create mode 100644 drivers/base/regmap/regcache-rbtree.c
11252  create mode 100644 drivers/base/regmap/regcache.c
11253  create mode 100644 drivers/base/regmap/regmap-debugfs.c
11254  create mode 100644 include/trace/events/regmap.h
11255 Merging driver-core/driver-core-next
11256 $ git merge driver-core/driver-core-next
11257 Resolved 'arch/arm/plat-mxc/devices.c' using previous resolution.
11258 Removing Documentation/zh_CN/SubmitChecklist
11259 Auto-merging MAINTAINERS
11260 Auto-merging arch/arm/plat-mxc/devices.c
11261 CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices.c
11262 Auto-merging arch/arm/plat-mxc/include/mach/devices-common.h
11263 Auto-merging drivers/base/platform.c
11264 Auto-merging include/linux/device.h
11265 Auto-merging include/linux/netdevice.h
11266 Auto-merging lib/dynamic_debug.c
11267 Auto-merging net/core/dev.c
11268 Automatic merge failed; fix conflicts and then commit the result.
11269 $ git commit -v -a
11270 [master 07565a1] Merge remote-tracking branch 'driver-core/driver-core-next'
11271 $ git diff -M --stat --summary HEAD^..
11272  Documentation/driver-model/binding.txt          |    4 -
11273  Documentation/driver-model/device.txt           |   65 +++++-----
11274  Documentation/filesystems/sysfs.txt             |   10 ++-
11275  Documentation/zh_CN/SubmitChecklist             |  109 ---------------
11276  MAINTAINERS                                     |    6 +
11277  arch/arm/plat-mxc/devices.c                     |   53 -------
11278  arch/arm/plat-mxc/include/mach/devices-common.h |   16 ++-
11279  drivers/base/core.c                             |    5 +-
11280  drivers/base/dd.c                               |    3 +
11281  drivers/base/memory.c                           |   64 ++++++---
11282  drivers/base/platform.c                         |   54 +++++---
11283  drivers/misc/pch_phub.c                         |   10 +-
11284  drivers/uio/uio.c                               |    7 +-
11285  drivers/uio/uio_pci_generic.c                   |    5 -
11286  drivers/uio/uio_pdrv_genirq.c                   |    2 +-
11287  fs/debugfs/inode.c                              |    2 +-
11288  fs/sysfs/dir.c                                  |  168 +++++++++++++++--------
11289  fs/sysfs/inode.c                                |   14 +--
11290  fs/sysfs/sysfs.h                                |   17 ++-
11291  include/linux/device.h                          |    5 +
11292  include/linux/dynamic_debug.h                   |   34 ++++--
11293  include/linux/netdevice.h                       |   10 +-
11294  include/linux/platform_device.h                 |   48 ++++++-
11295  lib/dynamic_debug.c                             |  158 +++++++++++++++------
11296  lib/kobject_uevent.c                            |    2 +-
11297  net/core/dev.c                                  |    3 +-
11298  26 files changed, 477 insertions(+), 397 deletions(-)
11299  delete mode 100644 Documentation/zh_CN/SubmitChecklist
11300 Merging tty/tty-next
11301 $ git merge tty/tty-next
11302 Resolved 'arch/powerpc/include/asm/udbg.h' using previous resolution.
11303 Resolved 'arch/powerpc/kernel/udbg.c' using previous resolution.
11304 Resolved 'drivers/tty/serial/8250.c' using previous resolution.
11305 Auto-merging arch/arm/Kconfig
11306 Auto-merging arch/arm/plat-s5p/Kconfig
11307 Auto-merging arch/arm/plat-samsung/Kconfig
11308 Auto-merging arch/arm/plat-samsung/Makefile
11309 Auto-merging arch/arm/plat-samsung/include/plat/irqs.h
11310 Removing arch/arm/plat-samsung/irq-uart.c
11311 Auto-merging arch/powerpc/include/asm/udbg.h
11312 CONFLICT (content): Merge conflict in arch/powerpc/include/asm/udbg.h
11313 Auto-merging arch/powerpc/kernel/udbg.c
11314 CONFLICT (content): Merge conflict in arch/powerpc/kernel/udbg.c
11315 Auto-merging arch/x86/platform/mrst/mrst.c
11316 Auto-merging drivers/staging/Kconfig
11317 Auto-merging drivers/staging/Makefile
11318 Auto-merging drivers/tty/Kconfig
11319 Auto-merging drivers/tty/hvc/hvcs.c
11320 Auto-merging drivers/tty/serial/8250.c
11321 CONFLICT (content): Merge conflict in drivers/tty/serial/8250.c
11322 Auto-merging drivers/tty/serial/8250_pci.c
11323 Auto-merging drivers/tty/serial/atmel_serial.c
11324 Auto-merging drivers/tty/serial/bfin_uart.c
11325 Auto-merging drivers/tty/serial/crisv10.c
11326 Auto-merging drivers/tty/serial/imx.c
11327 Auto-merging drivers/tty/serial/lantiq.c
11328 Auto-merging drivers/tty/serial/max3107.c
11329 Auto-merging drivers/tty/serial/mrst_max3110.c
11330 Auto-merging drivers/tty/serial/msm_serial.c
11331 Auto-merging drivers/tty/serial/pch_uart.c
11332 Auto-merging drivers/tty/serial/samsung.c
11333 Auto-merging drivers/tty/serial/serial_core.c
11334 Auto-merging drivers/tty/serial/sh-sci.c
11335 Auto-merging drivers/tty/serial/ucc_uart.c
11336 Auto-merging include/linux/tty.h
11337 Automatic merge failed; fix conflicts and then commit the result.
11338 $ git commit -v -a
11339 [master dea382b] Merge remote-tracking branch 'tty/tty-next'
11340 $ git diff -M --stat --summary HEAD^..
11341  .../bindings/tty/serial/snps-dw-apb-uart.txt       |   25 +
11342  Documentation/serial/serial-rs485.txt              |    3 +
11343  arch/arm/Kconfig                                   |    1 -
11344  arch/arm/mach-s3c64xx/dev-uart.c                   |   60 +--
11345  arch/arm/mach-s3c64xx/include/mach/irqs.h          |   30 -
11346  arch/arm/mach-s3c64xx/irq.c                        |   25 -
11347  arch/arm/plat-s5p/Kconfig                          |    1 -
11348  arch/arm/plat-s5p/dev-uart.c                       |   84 +--
11349  arch/arm/plat-s5p/irq.c                            |   34 -
11350  arch/arm/plat-samsung/Kconfig                      |    5 -
11351  arch/arm/plat-samsung/Makefile                     |    1 -
11352  arch/arm/plat-samsung/include/plat/irqs.h          |   35 -
11353  arch/arm/plat-samsung/include/plat/regs-serial.h   |    5 +
11354  arch/arm/plat-samsung/irq-uart.c                   |   96 ---
11355  arch/mips/pmc-sierra/msp71xx/msp_serial.c          |   73 ++-
11356  arch/powerpc/include/asm/udbg.h                    |    1 +
11357  arch/powerpc/kernel/udbg.c                         |    2 +
11358  arch/x86/platform/mrst/mrst.c                      |    3 +
11359  drivers/isdn/i4l/isdn_tty.c                        |    2 +-
11360  drivers/staging/Kconfig                            |    2 +
11361  drivers/staging/Makefile                           |    1 +
11362  drivers/{tty => staging}/serial/68360serial.c      |    0
11363  drivers/staging/serial/Kconfig                     |   16 +
11364  drivers/staging/serial/Makefile                    |    1 +
11365  drivers/staging/serial/TODO                        |    6 +
11366  drivers/tty/Kconfig                                |   34 +
11367  drivers/tty/Makefile                               |    1 +
11368  drivers/tty/amiserial.c                            |   12 +-
11369  drivers/tty/cyclades.c                             |   14 +-
11370  drivers/tty/ehv_bytechan.c                         |  881 ++++++++++++++++++++
11371  drivers/tty/hvc/hvc_console.c                      |    2 +-
11372  drivers/tty/hvc/hvc_irq.c                          |    2 +-
11373  drivers/tty/hvc/hvcs.c                             |    4 +-
11374  drivers/tty/hvc/hvsi.c                             |    2 +-
11375  drivers/tty/isicom.c                               |    2 +-
11376  drivers/tty/mxser.c                                |   13 +-
11377  drivers/tty/n_gsm.c                                |   70 +-
11378  drivers/tty/serial/68328serial.c                   |   37 +-
11379  drivers/tty/serial/68328serial.h                   |    1 -
11380  drivers/tty/serial/8250.c                          |  132 ++--
11381  drivers/tty/serial/8250_dw.c                       |  194 +++++
11382  drivers/tty/serial/8250_pci.c                      |   33 +
11383  drivers/tty/serial/Kconfig                         |   30 +-
11384  drivers/tty/serial/Makefile                        |    4 +-
11385  drivers/tty/serial/altera_jtaguart.c               |    2 +-
11386  drivers/tty/serial/altera_uart.c                   |    2 +-
11387  drivers/tty/serial/apbuart.c                       |    1 +
11388  drivers/tty/serial/atmel_serial.c                  |    9 +-
11389  drivers/tty/serial/bfin_sport_uart.c               |    2 +-
11390  drivers/tty/serial/{bfin_5xx.c => bfin_uart.c}     |   65 +-
11391  drivers/tty/serial/cpm_uart/cpm_uart_core.c        |    1 +
11392  drivers/tty/serial/crisv10.c                       |   30 +-
11393  drivers/tty/serial/dz.c                            |    1 +
11394  drivers/tty/serial/icom.c                          |    2 +-
11395  drivers/tty/serial/imx.c                           |   10 +-
11396  drivers/tty/serial/ioc3_serial.c                   |    1 +
11397  drivers/tty/serial/ioc4_serial.c                   |    1 +
11398  drivers/tty/serial/jsm/jsm.h                       |   10 -
11399  drivers/tty/serial/jsm/jsm_driver.c                |   19 -
11400  drivers/tty/serial/jsm/jsm_neo.c                   |   29 +-
11401  drivers/tty/serial/jsm/jsm_tty.c                   |   94 +--
11402  drivers/tty/serial/lantiq.c                        |    6 +-
11403  drivers/tty/serial/m32r_sio.c                      |    1 +
11404  drivers/tty/serial/max3100.c                       |    2 +
11405  drivers/tty/serial/max3107.c                       |    2 +
11406  drivers/tty/serial/mcf.c                           |    2 +-
11407  drivers/tty/serial/mfd.c                           |   49 ++-
11408  drivers/tty/serial/mpc52xx_uart.c                  |    3 +-
11409  drivers/tty/serial/mrst_max3110.c                  |  115 ++--
11410  drivers/tty/serial/mrst_max3110.h                  |    1 +
11411  drivers/tty/serial/msm_serial.c                    |    2 -
11412  drivers/tty/serial/msm_serial_hs.c                 |    2 +
11413  drivers/tty/serial/mux.c                           |    2 +
11414  drivers/tty/serial/nwpserial.c                     |    1 +
11415  drivers/tty/serial/pch_uart.c                      |    2 +
11416  drivers/tty/serial/pxa.c                           |   20 +
11417  drivers/tty/serial/samsung.c                       |  107 +++-
11418  drivers/tty/serial/samsung.h                       |    1 +
11419  drivers/tty/serial/sb1250-duart.c                  |    1 +
11420  drivers/tty/serial/serial_core.c                   |   71 +--
11421  drivers/tty/serial/serial_ks8695.c                 |    9 +-
11422  drivers/tty/serial/serial_txx9.c                   |    2 +
11423  drivers/tty/serial/sh-sci.c                        |    2 +-
11424  drivers/tty/serial/sn_console.c                    |    3 +-
11425  drivers/tty/serial/timbuart.c                      |    2 +
11426  drivers/tty/serial/uartlite.c                      |    1 +
11427  drivers/tty/serial/ucc_uart.c                      |    4 +-
11428  drivers/tty/serial/xilinx_uartps.c                 |    4 +-
11429  drivers/tty/serial/zs.c                            |    1 +
11430  drivers/tty/synclink.c                             |    1 -
11431  drivers/tty/synclinkmp.c                           |    6 +-
11432  drivers/tty/tty_ldisc.c                            |    1 -
11433  drivers/tty/tty_mutex.c                            |   12 -
11434  drivers/tty/tty_port.c                             |    2 +-
11435  drivers/tty/vt/keyboard.c                          |    3 +-
11436  drivers/tty/vt/selection.c                         |    4 +-
11437  drivers/tty/vt/vt.c                                |    2 +-
11438  include/linux/serial.h                             |    1 +
11439  include/linux/serial_8250.h                        |    2 +
11440  include/linux/serial_core.h                        |   10 +-
11441  include/linux/serial_reg.h                         |    1 +
11442  include/linux/tty.h                                |   20 +-
11443  net/irda/ircomm/ircomm_tty.c                       |    2 +-
11444  103 files changed, 1834 insertions(+), 910 deletions(-)
11445  create mode 100644 Documentation/devicetree/bindings/tty/serial/snps-dw-apb-uart.txt
11446  delete mode 100644 arch/arm/plat-samsung/irq-uart.c
11447  rename drivers/{tty => staging}/serial/68360serial.c (100%)
11448  create mode 100644 drivers/staging/serial/Kconfig
11449  create mode 100644 drivers/staging/serial/Makefile
11450  create mode 100644 drivers/staging/serial/TODO
11451  create mode 100644 drivers/tty/ehv_bytechan.c
11452  create mode 100644 drivers/tty/serial/8250_dw.c
11453  rename drivers/tty/serial/{bfin_5xx.c => bfin_uart.c} (97%)
11454 Merging usb/usb-next
11455 $ git merge usb/usb-next
11456 Resolved 'arch/arm/mach-omap2/Makefile' using previous resolution.
11457 Auto-merging Documentation/usb/power-management.txt
11458 Auto-merging MAINTAINERS
11459 Auto-merging arch/arm/mach-mmp/pxa168.c
11460 Auto-merging arch/arm/mach-omap2/Makefile
11461 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Makefile
11462 Auto-merging drivers/usb/Kconfig
11463 Auto-merging drivers/usb/class/cdc-acm.c
11464 Auto-merging drivers/usb/class/cdc-wdm.c
11465 Auto-merging drivers/usb/core/driver.c
11466 Auto-merging drivers/usb/core/hcd.c
11467 Auto-merging drivers/usb/core/hub.c
11468 Auto-merging drivers/usb/gadget/at91_udc.c
11469 Auto-merging drivers/usb/gadget/langwell_udc.c
11470 Auto-merging drivers/usb/gadget/mv_udc_core.c
11471 Auto-merging drivers/usb/gadget/net2280.c
11472 Auto-merging drivers/usb/gadget/uvc.h
11473 Auto-merging drivers/usb/gadget/uvc_v4l2.c
11474 Auto-merging drivers/usb/host/Makefile
11475 Auto-merging drivers/usb/host/ehci-au1xxx.c
11476 Auto-merging drivers/usb/host/ehci-hcd.c
11477 Auto-merging drivers/usb/host/ohci-au1xxx.c
11478 Auto-merging drivers/usb/host/ohci-pnx4008.c
11479 Auto-merging drivers/usb/host/xhci-hub.c
11480 Auto-merging drivers/usb/host/xhci-ring.c
11481 Auto-merging drivers/usb/musb/musb_gadget.c
11482 Auto-merging drivers/usb/storage/realtek_cr.c
11483 Auto-merging include/linux/sched.h
11484 Auto-merging include/linux/usb/ch9.h
11485 Auto-merging kernel/signal.c
11486 Automatic merge failed; fix conflicts and then commit the result.
11487 $ git commit -v -a
11488 [master d0ca991] Merge remote-tracking branch 'usb/usb-next'
11489 $ git diff -M --stat --summary HEAD^..
11490  .../ABI/testing/sysfs-bus-pci-drivers-ehci_hcd     |   46 +
11491  Documentation/ABI/testing/sysfs-bus-usb            |   15 +
11492  Documentation/usb/dwc3.txt                         |   45 +
11493  Documentation/usb/power-management.txt             |   26 +
11494  MAINTAINERS                                        |    8 +
11495  arch/arm/mach-mmp/include/mach/pxa168.h            |    7 +
11496  arch/arm/mach-mmp/pxa168.c                         |   46 +
11497  arch/arm/mach-omap2/Makefile                       |   14 +-
11498  drivers/usb/Kconfig                                |   14 +
11499  drivers/usb/Makefile                               |    4 +
11500  drivers/usb/class/cdc-acm.c                        |    9 +-
11501  drivers/usb/class/cdc-wdm.c                        |    2 +-
11502  drivers/usb/class/usbtmc.c                         |    5 +-
11503  drivers/usb/core/config.c                          |  111 +-
11504  drivers/usb/core/devices.c                         |    4 +-
11505  drivers/usb/core/devio.c                           |   57 +-
11506  drivers/usb/core/driver.c                          |   16 +-
11507  drivers/usb/core/endpoint.c                        |    2 +-
11508  drivers/usb/core/hcd-pci.c                         |    2 +-
11509  drivers/usb/core/hcd.c                             |    9 +-
11510  drivers/usb/core/hub.c                             |  311 ++--
11511  drivers/usb/core/message.c                         |    2 +-
11512  drivers/usb/core/quirks.c                          |   24 +
11513  drivers/usb/core/sysfs.c                           |   59 +-
11514  drivers/usb/core/urb.c                             |    2 +-
11515  drivers/usb/core/usb.c                             |    1 +
11516  drivers/usb/core/usb.h                             |    7 +
11517  drivers/usb/dwc3/Kconfig                           |   25 +
11518  drivers/usb/dwc3/Makefile                          |   36 +
11519  drivers/usb/dwc3/core.c                            |  484 +++++
11520  drivers/usb/dwc3/core.h                            |  768 +++++++
11521  drivers/usb/dwc3/debug.h                           |   50 +
11522  drivers/usb/dwc3/debugfs.c                         |  441 ++++
11523  drivers/usb/dwc3/dwc3-omap.c                       |  401 ++++
11524  drivers/usb/dwc3/dwc3-pci.c                        |  219 ++
11525  drivers/usb/dwc3/ep0.c                             |  804 ++++++++
11526  drivers/usb/dwc3/gadget.c                          | 2104 ++++++++++++++++++++
11527  drivers/usb/dwc3/gadget.h                          |  211 ++
11528  drivers/usb/dwc3/io.h                              |   54 +
11529  drivers/usb/gadget/Kconfig                         |   37 +-
11530  drivers/usb/gadget/amd5536udc.c                    |   20 +-
11531  drivers/usb/gadget/amd5536udc.h                    |    9 -
11532  drivers/usb/gadget/at91_udc.c                      |   16 +-
11533  drivers/usb/gadget/at91_udc.h                      |   10 -
11534  drivers/usb/gadget/atmel_usba_udc.c                |   13 +-
11535  drivers/usb/gadget/cdc2.c                          |    9 -
11536  drivers/usb/gadget/ci13xxx_msm.c                   |   11 -
11537  drivers/usb/gadget/ci13xxx_udc.c                   |    2 +-
11538  drivers/usb/gadget/composite.c                     |   33 +-
11539  drivers/usb/gadget/config.c                        |    9 -
11540  drivers/usb/gadget/dbgp.c                          |    1 -
11541  drivers/usb/gadget/dummy_hcd.c                     |   13 +-
11542  drivers/usb/gadget/epautoconf.c                    |   12 +-
11543  drivers/usb/gadget/ether.c                         |    9 -
11544  drivers/usb/gadget/f_audio.c                       |   15 +-
11545  drivers/usb/gadget/f_ecm.c                         |    9 -
11546  drivers/usb/gadget/f_eem.c                         |    9 -
11547  drivers/usb/gadget/f_fs.c                          |    9 -
11548  drivers/usb/gadget/f_hid.c                         |    9 -
11549  drivers/usb/gadget/f_loopback.c                    |    9 -
11550  drivers/usb/gadget/f_mass_storage.c                |  156 +-
11551  drivers/usb/gadget/f_ncm.c                         |    9 -
11552  drivers/usb/gadget/f_obex.c                        |    9 -
11553  drivers/usb/gadget/f_phonet.c                      |   10 -
11554  drivers/usb/gadget/f_rndis.c                       |    9 -
11555  drivers/usb/gadget/f_sourcesink.c                  |    9 -
11556  drivers/usb/gadget/f_subset.c                      |    9 -
11557  drivers/usb/gadget/f_uvc.c                         |    1 -
11558  drivers/usb/gadget/f_uvc.h                         |    1 -
11559  drivers/usb/gadget/file_storage.c                  |  159 +-
11560  drivers/usb/gadget/fsl_qe_udc.c                    |    2 +-
11561  drivers/usb/gadget/fsl_udc_core.c                  |   55 +-
11562  drivers/usb/gadget/fusb300_udc.c                   |   16 +-
11563  drivers/usb/gadget/fusb300_udc.h                   |   10 -
11564  drivers/usb/gadget/g_ffs.c                         |    9 -
11565  drivers/usb/gadget/gadget_chips.h                  |    3 +
11566  drivers/usb/gadget/gmidi.c                         |   11 +-
11567  drivers/usb/gadget/hid.c                           |    9 -
11568  drivers/usb/gadget/imx_udc.c                       |    4 +-
11569  drivers/usb/gadget/imx_udc.h                       |    5 -
11570  drivers/usb/gadget/inode.c                         |    9 -
11571  drivers/usb/gadget/langwell_udc.c                  |   62 +-
11572  drivers/usb/gadget/langwell_udc.h                  |   10 -
11573  drivers/usb/gadget/m66592-udc.c                    |   16 +-
11574  drivers/usb/gadget/m66592-udc.h                    |   10 -
11575  drivers/usb/gadget/mass_storage.c                  |    9 -
11576  drivers/usb/gadget/multi.c                         |    9 -
11577  drivers/usb/gadget/mv_udc_core.c                   |    4 +-
11578  drivers/usb/gadget/ncm.c                           |    9 -
11579  drivers/usb/gadget/ndis.h                          |    6 -
11580  drivers/usb/gadget/net2272.c                       |    6 +-
11581  drivers/usb/gadget/net2280.c                       |   17 +-
11582  drivers/usb/gadget/net2280.h                       |    9 -
11583  drivers/usb/gadget/omap_udc.c                      |   18 +-
11584  drivers/usb/gadget/pch_udc.c                       |   15 +-
11585  drivers/usb/gadget/printer.c                       |   25 +-
11586  drivers/usb/gadget/pxa25x_udc.c                    |   30 +-
11587  drivers/usb/gadget/pxa25x_udc.h                    |    9 -
11588  drivers/usb/gadget/pxa27x_udc.c                    |   12 +-
11589  drivers/usb/gadget/pxa27x_udc.h                    |    9 -
11590  drivers/usb/gadget/r8a66597-udc.c                  |   16 +-
11591  drivers/usb/gadget/r8a66597-udc.h                  |   10 -
11592  drivers/usb/gadget/s3c-hsotg.c                     |   10 +-
11593  drivers/usb/gadget/s3c-hsudc.c                     |   69 +-
11594  drivers/usb/gadget/s3c2410_udc.c                   |   16 +-
11595  drivers/usb/gadget/s3c2410_udc.h                   |   10 -
11596  drivers/usb/gadget/storage_common.c                |   65 +-
11597  drivers/usb/gadget/u_ether.c                       |    9 -
11598  drivers/usb/gadget/u_ether.h                       |    9 -
11599  drivers/usb/gadget/u_serial.c                      |    3 +-
11600  drivers/usb/gadget/udc-core.c                      |   21 +-
11601  drivers/usb/gadget/uvc.h                           |    1 -
11602  drivers/usb/gadget/uvc_queue.c                     |    1 -
11603  drivers/usb/gadget/uvc_v4l2.c                      |    1 -
11604  drivers/usb/gadget/uvc_video.c                     |    1 -
11605  drivers/usb/gadget/webcam.c                        |    2 +-
11606  drivers/usb/gadget/zero.c                          |    9 -
11607  drivers/usb/host/Kconfig                           |   15 +-
11608  drivers/usb/host/Makefile                          |    3 +-
11609  drivers/usb/host/ehci-ath79.c                      |    2 +-
11610  drivers/usb/host/ehci-au1xxx.c                     |    4 +-
11611  drivers/usb/host/ehci-dbg.c                        |   17 +-
11612  drivers/usb/host/ehci-fsl.c                        |    6 +-
11613  drivers/usb/host/ehci-hcd.c                        |   61 +-
11614  drivers/usb/host/ehci-hub.c                        |   10 +-
11615  drivers/usb/host/ehci-mxc.c                        |    2 +-
11616  drivers/usb/host/ehci-octeon.c                     |    2 +-
11617  drivers/usb/host/ehci-omap.c                       |    2 +-
11618  drivers/usb/host/ehci-orion.c                      |    2 +-
11619  drivers/usb/host/ehci-pci.c                        |    2 +-
11620  drivers/usb/host/ehci-ps3.c                        |    2 +-
11621  drivers/usb/host/ehci-pxa168.c                     |  363 ++++
11622  drivers/usb/host/ehci-q.c                          |   31 +-
11623  drivers/usb/host/ehci-s5p.c                        |    4 +-
11624  drivers/usb/host/ehci-sched.c                      |   11 +-
11625  drivers/usb/host/ehci-sh.c                         |    2 +-
11626  drivers/usb/host/ehci-spear.c                      |    2 +-
11627  drivers/usb/host/ehci-tegra.c                      |    2 +-
11628  drivers/usb/host/ehci-vt8500.c                     |    2 +-
11629  drivers/usb/host/ehci-xls.c                        |  161 ++
11630  drivers/usb/host/ehci.h                            |    7 +
11631  drivers/usb/host/fhci-hcd.c                        |    9 +-
11632  drivers/usb/host/imx21-hcd.c                       |    2 +-
11633  drivers/usb/host/isp116x-hcd.c                     |    2 +-
11634  drivers/usb/host/isp1362-hcd.c                     |    8 +-
11635  drivers/usb/host/isp1760-hcd.c                     |  401 +++--
11636  drivers/usb/host/isp1760-hcd.h                     |    3 +-
11637  drivers/usb/host/isp1760-if.c                      |    6 +-
11638  drivers/usb/host/ohci-ath79.c                      |    2 +-
11639  drivers/usb/host/ohci-au1xxx.c                     |    2 +-
11640  drivers/usb/host/ohci-da8xx.c                      |    2 +-
11641  drivers/usb/host/ohci-ep93xx.c                     |    2 +-
11642  drivers/usb/host/ohci-hcd.c                        |    5 +
11643  drivers/usb/host/ohci-octeon.c                     |    2 +-
11644  drivers/usb/host/ohci-omap.c                       |    4 +-
11645  drivers/usb/host/ohci-omap3.c                      |    4 +-
11646  drivers/usb/host/ohci-pnx4008.c                    |    2 +-
11647  drivers/usb/host/ohci-pnx8550.c                    |    2 +-
11648  drivers/usb/host/ohci-ppc-of.c                     |    2 +-
11649  drivers/usb/host/ohci-ppc-soc.c                    |    2 +-
11650  drivers/usb/host/ohci-ps3.c                        |    2 +-
11651  drivers/usb/host/ohci-pxa27x.c                     |    2 +-
11652  drivers/usb/host/ohci-q.c                          |    4 +-
11653  drivers/usb/host/ohci-s3c2410.c                    |    2 +-
11654  drivers/usb/host/ohci-sa1111.c                     |    2 +-
11655  drivers/usb/host/ohci-sh.c                         |    2 +-
11656  drivers/usb/host/ohci-sm501.c                      |    2 +-
11657  drivers/usb/host/ohci-spear.c                      |    2 +-
11658  drivers/usb/host/ohci-ssb.c                        |    2 +-
11659  drivers/usb/host/ohci-tmio.c                       |    2 +-
11660  drivers/usb/host/ohci-xls.c                        |  151 ++
11661  drivers/usb/host/r8a66597-hcd.c                    |    4 +-
11662  drivers/usb/host/sl811-hcd.c                       |    2 +-
11663  drivers/usb/host/uhci-hcd.c                        |   66 +-
11664  drivers/usb/host/uhci-q.c                          |    6 +-
11665  drivers/usb/host/xhci-ext-caps.h                   |    6 +
11666  drivers/usb/host/xhci-hub.c                        |  105 +-
11667  drivers/usb/host/xhci-mem.c                        |  371 +++-
11668  drivers/usb/host/xhci-pci.c                        |  107 +-
11669  drivers/usb/host/xhci-ring.c                       |   80 +-
11670  drivers/usb/host/xhci.c                            | 1151 ++++++++++-
11671  drivers/usb/host/xhci.h                            |  187 ++-
11672  drivers/usb/misc/adutux.c                          |   14 +-
11673  drivers/usb/misc/ftdi-elan.c                       |    2 +-
11674  drivers/usb/misc/idmouse.c                         |    2 +-
11675  drivers/usb/misc/iowarrior.c                       |    2 +-
11676  drivers/usb/misc/ldusb.c                           |    4 +-
11677  drivers/usb/misc/legousbtower.c                    |    4 +-
11678  drivers/usb/misc/usblcd.c                          |  129 +-
11679  drivers/usb/misc/usbled.c                          |   25 +-
11680  drivers/usb/misc/usbtest.c                         |   31 +-
11681  drivers/usb/mon/mon_bin.c                          |    2 +-
11682  drivers/usb/musb/musb_gadget.c                     |   71 +-
11683  drivers/usb/musb/musb_gadget_ep0.c                 |    8 +
11684  drivers/usb/musb/musb_host.c                       |    2 +-
11685  drivers/usb/musb/musbhsdma.c                       |    2 +-
11686  drivers/usb/otg/isp1301_omap.c                     |    2 +-
11687  drivers/usb/otg/twl6030-usb.c                      |   16 -
11688  drivers/usb/renesas_usbhs/mod.c                    |    2 +-
11689  drivers/usb/renesas_usbhs/pipe.c                   |    2 +-
11690  drivers/usb/serial/Kconfig                         |    1 +
11691  drivers/usb/serial/ftdi_sio.c                      |    4 +-
11692  drivers/usb/serial/ftdi_sio_ids.h                  |    6 +-
11693  drivers/usb/serial/io_edgeport.c                   |    4 +-
11694  drivers/usb/serial/ipw.c                           |   33 +-
11695  drivers/usb/serial/opticon.c                       |    2 +-
11696  drivers/usb/serial/option.c                        |  170 +-
11697  drivers/usb/serial/pl2303.c                        |    4 +-
11698  drivers/usb/serial/pl2303.h                        |    5 +
11699  drivers/usb/serial/qcserial.c                      |    2 +
11700  drivers/usb/serial/symbolserial.c                  |    2 +-
11701  drivers/usb/serial/usb-serial.c                    |    8 +-
11702  drivers/usb/storage/Kconfig                        |    2 +-
11703  drivers/usb/storage/realtek_cr.c                   |  116 +-
11704  drivers/usb/storage/transport.c                    |   34 +-
11705  drivers/usb/storage/usb.c                          |   16 +-
11706  drivers/usb/usb-common.c                           |   35 +
11707  drivers/usb/usb-skeleton.c                         |    2 +-
11708  drivers/usb/wusbcore/wa-hc.c                       |    2 +-
11709  include/linux/platform_data/dwc3-omap.h            |   47 +
11710  include/linux/sched.h                              |    3 +-
11711  include/linux/usb.h                                |   20 +-
11712  include/linux/usb/ch9.h                            |   29 +
11713  include/linux/usb/hcd.h                            |    1 +
11714  kernel/signal.c                                    |   24 +-
11715  225 files changed, 10117 insertions(+), 1962 deletions(-)
11716  create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-drivers-ehci_hcd
11717  create mode 100644 Documentation/usb/dwc3.txt
11718  create mode 100644 drivers/usb/dwc3/Kconfig
11719  create mode 100644 drivers/usb/dwc3/Makefile
11720  create mode 100644 drivers/usb/dwc3/core.c
11721  create mode 100644 drivers/usb/dwc3/core.h
11722  create mode 100644 drivers/usb/dwc3/debug.h
11723  create mode 100644 drivers/usb/dwc3/debugfs.c
11724  create mode 100644 drivers/usb/dwc3/dwc3-omap.c
11725  create mode 100644 drivers/usb/dwc3/dwc3-pci.c
11726  create mode 100644 drivers/usb/dwc3/ep0.c
11727  create mode 100644 drivers/usb/dwc3/gadget.c
11728  create mode 100644 drivers/usb/dwc3/gadget.h
11729  create mode 100644 drivers/usb/dwc3/io.h
11730  create mode 100644 drivers/usb/host/ehci-pxa168.c
11731  create mode 100644 drivers/usb/host/ehci-xls.c
11732  create mode 100644 drivers/usb/host/ohci-xls.c
11733  create mode 100644 drivers/usb/usb-common.c
11734  create mode 100644 include/linux/platform_data/dwc3-omap.h
11735 Merging staging/staging-next
11736 $ git merge staging/staging-next
11737 Auto-merging MAINTAINERS
11738 Removing drivers/char/scc.h
11739 Auto-merging drivers/misc/altera-stapl/altera.c
11740 CONFLICT (content): Merge conflict in drivers/misc/altera-stapl/altera.c
11741 Auto-merging drivers/staging/Kconfig
11742 Auto-merging drivers/staging/Makefile
11743 Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_linux.c
11744 Removing drivers/staging/brcm80211/brcmsmac/alloc.c
11745 Removing drivers/staging/brcm80211/brcmsmac/alloc.h
11746 Removing drivers/staging/brcm80211/brcmsmac/bmac.c
11747 Removing drivers/staging/brcm80211/brcmsmac/bmac.h
11748 Auto-merging drivers/staging/brcm80211/brcmsmac/mac80211_if.c
11749 CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmsmac/mac80211_if.c
11750 Auto-merging drivers/staging/comedi/drivers/ni_labpc.c
11751 CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc.c
11752 Removing drivers/staging/cx25821/cx25821-gpio.h
11753 Auto-merging drivers/staging/dt3155v4l/dt3155v4l.c
11754 Auto-merging drivers/staging/et131x/et131x_netdev.c
11755 Auto-merging drivers/staging/hv/Makefile
11756 Removing drivers/staging/hv/blkvsc_drv.c
11757 Removing drivers/staging/hv/hyperv_storage.h
11758 Auto-merging drivers/staging/hv/netvsc_drv.c
11759 Removing drivers/staging/hv/storvsc.c
11760 Removing drivers/staging/iio/accel/accel.h
11761 Removing drivers/staging/iio/accel/inclinometer.h
11762 Removing drivers/staging/iio/adc/ad7745.c
11763 Removing drivers/staging/iio/adc/adc.h
11764 Auto-merging drivers/staging/iio/addac/adt7316-i2c.c
11765 Auto-merging drivers/staging/iio/dds/ad9832.c
11766 Removing drivers/staging/iio/gyro/gyro.h
11767 Removing drivers/staging/iio/industrialio-ring.c
11768 Removing drivers/staging/iio/magnetometer/magnet.h
11769 Removing drivers/staging/iio/ring_generic.h
11770 Removing drivers/staging/rtl8192e/ieee80211/dot11d.c
11771 Removing drivers/staging/rtl8192e/ieee80211/dot11d.h
11772 Removing drivers/staging/rtl8192e/ieee80211/ieee80211.h
11773 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
11774 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
11775 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
11776 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c
11777 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
11778 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h
11779 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c
11780 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h
11781 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c
11782 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h
11783 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h
11784 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c
11785 Removing drivers/staging/rtl8192e/r8180_93cx6.c
11786 Removing drivers/staging/rtl8192e/r8180_93cx6.h
11787 Removing drivers/staging/rtl8192e/r8190_rtl8256.c
11788 Removing drivers/staging/rtl8192e/r8190_rtl8256.h
11789 Removing drivers/staging/rtl8192e/r8192E.h
11790 CONFLICT (delete/modify): drivers/staging/rtl8192e/r8192E_core.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8192e/r8192E_core.c left in tree.
11791 Removing drivers/staging/rtl8192e/r8192E_dm.c
11792 Removing drivers/staging/rtl8192e/r8192E_dm.h
11793 Removing drivers/staging/rtl8192e/r8192E_wx.c
11794 Removing drivers/staging/rtl8192e/r8192E_wx.h
11795 Removing drivers/staging/rtl8192e/r8192_pm.c
11796 Removing drivers/staging/rtl8192e/r8192_pm.h
11797 Removing drivers/staging/rtl8192e/r819xE_cmdpkt.c
11798 Removing drivers/staging/rtl8192e/r819xE_cmdpkt.h
11799 Removing drivers/staging/rtl8192e/r819xE_firmware.c
11800 Removing drivers/staging/rtl8192e/r819xE_phy.c
11801 Removing drivers/staging/rtl8192e/r819xE_phy.h
11802 Auto-merging drivers/staging/rtl8192e/rtl_crypto.h
11803 Auto-merging drivers/staging/rtl8192e/rtllib_crypt.c
11804 Auto-merging drivers/staging/rtl8192e/rtllib_crypt.h
11805 Auto-merging drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
11806 Auto-merging drivers/staging/rtl8192e/rtllib_crypt_tkip.c
11807 Auto-merging drivers/staging/rtl8192e/rtllib_crypt_wep.c
11808 Auto-merging drivers/staging/rtl8192e/rtllib_softmac_wx.c
11809 Auto-merging drivers/staging/vt6655/device_main.c
11810 Auto-merging drivers/staging/vt6656/main_usb.c
11811 Auto-merging drivers/staging/wlags49_h2/wl_netdev.c
11812 Auto-merging drivers/staging/xgifb/XGI_main_26.c
11813 CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_maiRecorded preimage for 'drivers/staging/brcm80211/brcmsmac/mac80211_if.c'
11814 Resolved 'drivers/misc/altera-stapl/altera.c' using previous resolution.
11815 Resolved 'drivers/staging/comedi/drivers/ni_labpc.c' using previous resolution.
11816 Resolved 'drivers/staging/xgifb/XGI_main_26.c' using previous resolution.
11817 Resolved 'drivers/staging/zram/zram_drv.c' using previous resolution.
11818 n_26.c
11819 Auto-merging drivers/staging/zcache/zcache-main.c
11820 Auto-merging drivers/staging/zram/zram_drv.c
11821 CONFLICT (content): Merge conflict in drivers/staging/zram/zram_drv.c
11822 Automatic merge failed; fix conflicts and then commit the result.
11823 $ git rm -f drivers/staging/rtl8192e/r8192E_core.c
11824 drivers/misc/altera-stapl/altera.c: needs merge
11825 drivers/staging/brcm80211/brcmsmac/mac80211_if.c: needs merge
11826 drivers/staging/comedi/drivers/ni_labpc.c: needs merge
11827 drivers/staging/rtl8192e/r8192E_core.c: needs merge
11828 drivers/staging/xgifb/XGI_main_26.c: needs merge
11829 drivers/staging/zram/zram_drv.c: needs merge
11830 rm 'drivers/staging/rtl8192e/r8192E_core.c'
11831 $ git commit -v -a
11832 Recorded resolution for 'drivers/staging/brcm80211/brcmsmac/mac80211_if.c'.
11833 [master c1d7df1] Merge remote-tracking branch 'staging/staging-next'
11834 $ git diff -M --stat --summary HEAD^..
11835  MAINTAINERS                                        |   14 +-
11836  arch/x86/include/asm/hyperv.h                      |    1 +
11837  drivers/char/scc.h                                 |  613 -
11838  drivers/misc/altera-stapl/altera.c                 |    3 +-
11839  drivers/staging/Kconfig                            |    2 +
11840  drivers/staging/Makefile                           |    1 +
11841  drivers/staging/bcm/Bcmchar.c                      | 3181 ++--
11842  drivers/staging/bcm/InterfaceDld.c                 |   93 +-
11843  drivers/staging/bcm/Macros.h                       |  337 +-
11844  drivers/staging/bcm/Misc.c                         |    4 +
11845  drivers/staging/bcm/headers.h                      |    2 +
11846  drivers/staging/bcm/nvm.c                          |   13 +-
11847  drivers/staging/brcm80211/Kconfig                  |   11 +-
11848  drivers/staging/brcm80211/Makefile                 |    1 -
11849  drivers/staging/brcm80211/TODO                     |    4 -
11850  drivers/staging/brcm80211/brcmfmac/Makefile        |    8 +-
11851  drivers/staging/brcm80211/brcmfmac/bcmsdh.c        |  499 +-
11852  drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c  | 1211 +-
11853  drivers/staging/brcm80211/brcmfmac/dhd.h           |  505 +-
11854  drivers/staging/brcm80211/brcmfmac/dhd_bus.h       |   39 +-
11855  drivers/staging/brcm80211/brcmfmac/dhd_cdc.c       |  220 +-
11856  drivers/staging/brcm80211/brcmfmac/dhd_common.c    |  834 +-
11857  drivers/staging/brcm80211/brcmfmac/dhd_dbg.h       |   46 +-
11858  drivers/staging/brcm80211/brcmfmac/dhd_linux.c     | 1039 +-
11859  drivers/staging/brcm80211/brcmfmac/dhd_proto.h     |   25 +-
11860  drivers/staging/brcm80211/brcmfmac/dhd_sdio.c      | 7352 +++----
11861  drivers/staging/brcm80211/brcmfmac/sdio_host.h     |  291 +-
11862  drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c   | 3471 ++--
11863  drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h   |   85 +-
11864  drivers/staging/brcm80211/brcmsmac/Makefile        |   12 +-
11865  drivers/staging/brcm80211/brcmsmac/aiutils.c       | 1226 +-
11866  drivers/staging/brcm80211/brcmsmac/aiutils.h       |  308 +-
11867  drivers/staging/brcm80211/brcmsmac/alloc.c         |  275 -
11868  drivers/staging/brcm80211/brcmsmac/alloc.h         |   19 -
11869  drivers/staging/brcm80211/brcmsmac/ampdu.c         |  580 +-
11870  drivers/staging/brcm80211/brcmsmac/antsel.c        |  228 +-
11871  drivers/staging/brcm80211/brcmsmac/bmac.c          | 3593 ---
11872  drivers/staging/brcm80211/brcmsmac/bmac.h          |  174 -
11873  drivers/staging/brcm80211/brcmsmac/channel.c       | 1252 +-
11874  drivers/staging/brcm80211/brcmsmac/channel.h       |   87 +-
11875  drivers/staging/brcm80211/brcmsmac/d11.h           |  705 +-
11876  drivers/staging/brcm80211/brcmsmac/dma.c           | 1686 +-
11877  drivers/staging/brcm80211/brcmsmac/dma.h           |  200 +-
11878  drivers/staging/brcm80211/brcmsmac/mac80211_if.c   | 1484 +-
11879  drivers/staging/brcm80211/brcmsmac/mac80211_if.h   |   23 +-
11880  drivers/staging/brcm80211/brcmsmac/main.c          | 8902 +++++---
11881  drivers/staging/brcm80211/brcmsmac/main.h          |  913 +-
11882  drivers/staging/brcm80211/brcmsmac/nicpci.c        |  175 +-
11883  drivers/staging/brcm80211/brcmsmac/nicpci.h        |   41 +-
11884  drivers/staging/brcm80211/brcmsmac/otp.c           |  237 +-
11885  drivers/staging/brcm80211/brcmsmac/otp.h           |   15 +-
11886  drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c   | 1140 +-
11887  drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h   |   85 +-
11888  drivers/staging/brcm80211/brcmsmac/phy/phy_int.h   |  211 +-
11889  drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c   | 5814 +++---
11890  drivers/staging/brcm80211/brcmsmac/phy/phy_n.c     |23876 ++++++++++----------
11891  drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.c |  172 +-
11892  .../staging/brcm80211/brcmsmac/phy/phytbl_lcn.c    | 1236 +-
11893  drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.c  |  131 +-
11894  drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.h  |   24 +-
11895  drivers/staging/brcm80211/brcmsmac/phy_shim.c      |   31 +-
11896  drivers/staging/brcm80211/brcmsmac/phy_shim.h      |   69 +-
11897  drivers/staging/brcm80211/brcmsmac/pmu.c           |   76 +-
11898  drivers/staging/brcm80211/brcmsmac/pmu.h           |   14 -
11899  drivers/staging/brcm80211/brcmsmac/pub.h           |  505 +-
11900  drivers/staging/brcm80211/brcmsmac/rate.c          |  182 +-
11901  drivers/staging/brcm80211/brcmsmac/rate.h          |  299 +-
11902  drivers/staging/brcm80211/brcmsmac/scb.h           |   61 +-
11903  drivers/staging/brcm80211/brcmsmac/srom.c          |  442 +-
11904  drivers/staging/brcm80211/brcmsmac/srom.h          |    4 +-
11905  drivers/staging/brcm80211/brcmsmac/stf.c           |  247 +-
11906  drivers/staging/brcm80211/brcmsmac/stf.h           |    6 +-
11907  drivers/staging/brcm80211/brcmsmac/types.h         |  330 +-
11908  drivers/staging/brcm80211/brcmsmac/ucode_loader.c  |  120 +-
11909  drivers/staging/brcm80211/brcmsmac/ucode_loader.h  |   46 +-
11910  drivers/staging/brcm80211/brcmutil/utils.c         |  169 +-
11911  drivers/staging/brcm80211/brcmutil/wifi.c          |   41 +-
11912  drivers/staging/brcm80211/include/brcmu_utils.h    |  227 +-
11913  drivers/staging/brcm80211/include/brcmu_wifi.h     |  162 +-
11914  drivers/staging/brcm80211/include/chipcommon.h     |   13 +-
11915  drivers/staging/brcm80211/include/defs.h           |   32 +-
11916  drivers/staging/brcm80211/include/soc.h            |    9 +-
11917  drivers/staging/comedi/Kconfig                     |   18 +-
11918  drivers/staging/comedi/comedi_fops.c               |    2 +-
11919  drivers/staging/comedi/drivers/Makefile            |    1 +
11920  drivers/staging/comedi/drivers/adv_pci_dio.c       |    2 +-
11921  drivers/staging/comedi/drivers/cb_das16_cs.c       |    5 +-
11922  drivers/staging/comedi/drivers/ni_labpc.c          |   16 +-
11923  drivers/staging/comedi/drivers/ni_pcidio.c         |    2 +-
11924  drivers/staging/comedi/drivers/pcmmio.c            |   34 +-
11925  drivers/staging/comedi/drivers/usbduxsigma.c       | 2880 +++
11926  drivers/staging/crystalhd/bc_dts_defs.h            |    4 +-
11927  drivers/staging/crystalhd/bc_dts_glob_lnx.h        |    6 +-
11928  drivers/staging/crystalhd/bc_dts_types.h           |   57 -
11929  drivers/staging/crystalhd/crystalhd_cmds.h         |    2 +-
11930  drivers/staging/crystalhd/crystalhd_fw_if.h        |  532 +-
11931  drivers/staging/crystalhd/crystalhd_misc.h         |    6 +-
11932  drivers/staging/cx25821/cx25821-alsa.c             |    2 +-
11933  drivers/staging/cx25821/cx25821-audio-upstream.c   |   43 +-
11934  drivers/staging/cx25821/cx25821-audio-upstream.h   |    9 +-
11935  drivers/staging/cx25821/cx25821-audio.h            |    6 +-
11936  drivers/staging/cx25821/cx25821-cards.c            |   26 +-
11937  drivers/staging/cx25821/cx25821-core.c             |  505 +-
11938  drivers/staging/cx25821/cx25821-gpio.c             |    1 +
11939  drivers/staging/cx25821/cx25821-gpio.h             |    2 -
11940  drivers/staging/cx25821/cx25821-i2c.c              |   30 +-
11941  .../staging/cx25821/cx25821-video-upstream-ch2.c   |   81 +-
11942  .../staging/cx25821/cx25821-video-upstream-ch2.h   |   83 +-
11943  drivers/staging/cx25821/cx25821-video-upstream.c   |   18 +-
11944  drivers/staging/cx25821/cx25821-video-upstream.h   |   78 +-
11945  drivers/staging/cx25821/cx25821-video.c            | 1244 +-
11946  drivers/staging/cx25821/cx25821-video.h            |   79 +-
11947  drivers/staging/cx25821/cx25821.h                  |   10 +-
11948  drivers/staging/cxd2099/Makefile                   |    6 +-
11949  drivers/staging/cxt1e1/linux.c                     |    6 -
11950  drivers/staging/cxt1e1/sbecom_inline_linux.h       |   64 -
11951  drivers/staging/dt3155v4l/dt3155v4l.c              |  122 +-
11952  drivers/staging/dt3155v4l/dt3155v4l.h              |    4 +-
11953  drivers/staging/easycap/easycap_ioctl.c            |   30 +-
11954  drivers/staging/easycap/easycap_main.c             |    4 +-
11955  drivers/staging/et131x/Makefile                    |    1 +
11956  drivers/staging/et131x/README                      |    8 +-
11957  drivers/staging/et131x/et1310_address_map.h        |    8 +-
11958  drivers/staging/et131x/et1310_eeprom.c             |   34 +-
11959  drivers/staging/et131x/et1310_mac.c                |  391 +-
11960  drivers/staging/et131x/et1310_phy.c                |  863 +-
11961  drivers/staging/et131x/et1310_phy.h                |  300 +-
11962  drivers/staging/et131x/et1310_pm.c                 |   75 +-
11963  drivers/staging/et131x/et1310_rx.c                 |  635 +-
11964  drivers/staging/et131x/et1310_rx.h                 |   64 +-
11965  drivers/staging/et131x/et1310_tx.c                 |  469 +-
11966  drivers/staging/et131x/et131x.h                    |   88 +-
11967  drivers/staging/et131x/et131x_adapter.h            |  105 +-
11968  drivers/staging/et131x/et131x_defs.h               |    2 +
11969  drivers/staging/et131x/et131x_ethtool.c            |  201 +
11970  drivers/staging/et131x/et131x_initpci.c            |  552 +-
11971  drivers/staging/et131x/et131x_isr.c                |   87 +-
11972  drivers/staging/et131x/et131x_netdev.c             |  277 +-
11973  drivers/staging/et131x/et131x_version.h            |    1 +
11974  drivers/staging/ft1000/ft1000-pcmcia/ft1000.h      |   10 +
11975  drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c   |    8 +-
11976  drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c |    3 +-
11977  drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c   |   24 +-
11978  drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c |    4 +-
11979  drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      |    2 +-
11980  drivers/staging/gma500/accel_2d.c                  |   24 +-
11981  drivers/staging/gma500/cdv_device.c                |    1 -
11982  drivers/staging/gma500/framebuffer.c               |   92 +-
11983  drivers/staging/gma500/gem.c                       |    5 +-
11984  drivers/staging/gma500/gtt.c                       |   81 +-
11985  drivers/staging/gma500/gtt.h                       |    3 +
11986  drivers/staging/gma500/intel_opregion.c            |    1 +
11987  drivers/staging/gma500/mdfld_intel_display.c       |   12 +-
11988  drivers/staging/gma500/mrst_crtc.c                 |   16 +-
11989  drivers/staging/gma500/power.c                     |    8 +-
11990  drivers/staging/gma500/psb_device.c                |   32 -
11991  drivers/staging/gma500/psb_drv.c                   |   49 +-
11992  drivers/staging/gma500/psb_drv.h                   |    6 +-
11993  drivers/staging/gma500/psb_intel_display.c         |    4 -
11994  drivers/staging/gma500/psb_intel_lvds.c            |   61 +-
11995  drivers/staging/gma500/psb_irq.c                   |   71 +-
11996  drivers/staging/gma500/psb_lid.c                   |    2 -
11997  drivers/staging/go7007/Makefile                    |    8 +-
11998  drivers/staging/go7007/wis-tw2804.c                |    6 +-
11999  drivers/staging/hv/Kconfig                         |    9 +-
12000  drivers/staging/hv/Makefile                        |    4 +-
12001  drivers/staging/hv/TODO                            |   11 +-
12002  drivers/staging/hv/blkvsc_drv.c                    | 1026 -
12003  drivers/staging/hv/channel.c                       |  120 +-
12004  drivers/staging/hv/channel_mgmt.c                  |  177 +-
12005  drivers/staging/hv/connection.c                    |   54 +-
12006  drivers/staging/hv/hv.c                            |   21 +-
12007  drivers/staging/hv/hv_kvp.c                        |   14 +-
12008  drivers/staging/hv/hv_kvp.h                        |    2 +-
12009  drivers/staging/hv/hv_mouse.c                      |  711 +-
12010  drivers/staging/hv/hv_util.c                       |  202 +-
12011  drivers/staging/hv/hyperv.h                        |   85 +-
12012  drivers/staging/hv/hyperv_net.h                    |    5 +-
12013  drivers/staging/hv/hyperv_storage.h                |  334 -
12014  drivers/staging/hv/hyperv_vmbus.h                  |   12 +-
12015  drivers/staging/hv/netvsc.c                        |  329 +-
12016  drivers/staging/hv/netvsc_drv.c                    |  148 +-
12017  drivers/staging/hv/ring_buffer.c                   |    9 +-
12018  drivers/staging/hv/rndis_filter.c                  |  146 +-
12019  drivers/staging/hv/storvsc.c                       |  564 -
12020  drivers/staging/hv/storvsc_drv.c                   |  869 +-
12021  drivers/staging/hv/tools/hv_kvp_daemon.c           |   19 +-
12022  drivers/staging/hv/vmbus_drv.c                     |  444 +-
12023  drivers/staging/iio/Documentation/generic_buffer.c |   12 +-
12024  drivers/staging/iio/Documentation/iio_utils.h      |    2 +-
12025  drivers/staging/iio/Documentation/sysfs-bus-iio    |  738 +-
12026  .../iio/Documentation/sysfs-bus-iio-adc-ad7280a    |   21 +
12027  .../sysfs-bus-iio-impedance-analyzer-ad5933        |   30 +
12028  drivers/staging/iio/Kconfig                        |    7 +-
12029  drivers/staging/iio/Makefile                       |    3 +-
12030  drivers/staging/iio/accel/Kconfig                  |   32 +-
12031  drivers/staging/iio/accel/Makefile                 |   12 +-
12032  drivers/staging/iio/accel/accel.h                  |   87 -
12033  drivers/staging/iio/accel/adis16201.h              |    6 +-
12034  drivers/staging/iio/accel/adis16201_core.c         |   41 +-
12035  drivers/staging/iio/accel/adis16201_ring.c         |   48 +-
12036  drivers/staging/iio/accel/adis16201_trigger.c      |   13 +-
12037  drivers/staging/iio/accel/adis16203.h              |    6 +-
12038  drivers/staging/iio/accel/adis16203_core.c         |   41 +-
12039  drivers/staging/iio/accel/adis16203_ring.c         |   39 +-
12040  drivers/staging/iio/accel/adis16203_trigger.c      |   14 +-
12041  drivers/staging/iio/accel/adis16204.h              |    6 +-
12042  drivers/staging/iio/accel/adis16204_core.c         |   92 +-
12043  drivers/staging/iio/accel/adis16204_ring.c         |   39 +-
12044  drivers/staging/iio/accel/adis16204_trigger.c      |   14 +-
12045  drivers/staging/iio/accel/adis16209.h              |    6 +-
12046  drivers/staging/iio/accel/adis16209_core.c         |   44 +-
12047  drivers/staging/iio/accel/adis16209_ring.c         |   42 +-
12048  drivers/staging/iio/accel/adis16209_trigger.c      |   14 +-
12049  drivers/staging/iio/accel/adis16220_core.c         |  343 +-
12050  drivers/staging/iio/accel/adis16240.h              |    6 +-
12051  drivers/staging/iio/accel/adis16240_core.c         |   42 +-
12052  drivers/staging/iio/accel/adis16240_ring.c         |   40 +-
12053  drivers/staging/iio/accel/adis16240_trigger.c      |   14 +-
12054  drivers/staging/iio/accel/inclinometer.h           |   25 -
12055  drivers/staging/iio/accel/kxsd9.c                  |  269 +-
12056  drivers/staging/iio/accel/lis3l02dq.h              |   26 +-
12057  drivers/staging/iio/accel/lis3l02dq_core.c         |  109 +-
12058  drivers/staging/iio/accel/lis3l02dq_ring.c         |  124 +-
12059  drivers/staging/iio/accel/sca3000.h                |    4 +-
12060  drivers/staging/iio/accel/sca3000_core.c           |   70 +-
12061  drivers/staging/iio/accel/sca3000_ring.c           |  152 +-
12062  drivers/staging/iio/adc/Kconfig                    |   50 +-
12063  drivers/staging/iio/adc/Makefile                   |   12 +-
12064  drivers/staging/iio/adc/ad7150.c                   |  975 +-
12065  drivers/staging/iio/adc/ad7152.c                   |  784 +-
12066  drivers/staging/iio/adc/ad7192.c                   | 1185 +
12067  drivers/staging/iio/adc/ad7192.h                   |   47 +
12068  drivers/staging/iio/adc/ad7280a.c                  |  998 +
12069  drivers/staging/iio/adc/ad7280a.h                  |   38 +
12070  drivers/staging/iio/adc/ad7291.c                   | 1080 +-
12071  drivers/staging/iio/adc/ad7298.h                   |    6 +-
12072  drivers/staging/iio/adc/ad7298_core.c              |   48 +-
12073  drivers/staging/iio/adc/ad7298_ring.c              |   48 +-
12074  drivers/staging/iio/adc/ad7314.c                   |    2 +-
12075  drivers/staging/iio/adc/ad7476.h                   |    6 +-
12076  drivers/staging/iio/adc/ad7476_core.c              |   70 +-
12077  drivers/staging/iio/adc/ad7476_ring.c              |   50 +-
12078  drivers/staging/iio/adc/ad7606.h                   |   12 +-
12079  drivers/staging/iio/adc/ad7606_core.c              |  274 +-
12080  drivers/staging/iio/adc/ad7606_par.c               |    2 +-
12081  drivers/staging/iio/adc/ad7606_ring.c              |   86 +-
12082  drivers/staging/iio/adc/ad7606_spi.c               |    2 +-
12083  drivers/staging/iio/adc/ad7745.c                   |  674 -
12084  drivers/staging/iio/adc/ad7746.c                   |  806 +
12085  drivers/staging/iio/adc/ad7746.h                   |   29 +
12086  drivers/staging/iio/adc/ad7780.c                   |    7 +-
12087  drivers/staging/iio/adc/ad7793.c                   |  272 +-
12088  drivers/staging/iio/adc/ad7816.c                   |   25 +-
12089  drivers/staging/iio/adc/ad7887.h                   |   10 +-
12090  drivers/staging/iio/adc/ad7887_core.c              |   59 +-
12091  drivers/staging/iio/adc/ad7887_ring.c              |   59 +-
12092  drivers/staging/iio/adc/ad799x.h                   |    4 +-
12093  drivers/staging/iio/adc/ad799x_core.c              |  709 +-
12094  drivers/staging/iio/adc/ad799x_ring.c              |   69 +-
12095  drivers/staging/iio/adc/adc.h                      |   42 -
12096  drivers/staging/iio/adc/adt7310.c                  |   23 +-
12097  drivers/staging/iio/adc/adt7410.c                  |   21 +-
12098  drivers/staging/iio/adc/adt75.c                    |   20 +-
12099  drivers/staging/iio/adc/max1363.h                  |    8 +-
12100  drivers/staging/iio/adc/max1363_core.c             |  311 +-
12101  drivers/staging/iio/adc/max1363_ring.c             |   63 +-
12102  drivers/staging/iio/addac/Kconfig                  |    4 +-
12103  drivers/staging/iio/addac/adt7316-i2c.c            |    1 +
12104  drivers/staging/iio/addac/adt7316.c                |   45 +-
12105  drivers/staging/iio/buffer_generic.h               |  228 +
12106  drivers/staging/iio/chrdev.h                       |   54 +-
12107  drivers/staging/iio/dac/Kconfig                    |    4 +-
12108  drivers/staging/iio/dac/ad5446.c                   |   27 +-
12109  drivers/staging/iio/dac/ad5504.c                   |   93 +-
12110  drivers/staging/iio/dac/ad5624r_spi.c              |   83 +-
12111  drivers/staging/iio/dac/ad5686.c                   |  121 +-
12112  drivers/staging/iio/dac/ad5791.c                   |  236 +-
12113  drivers/staging/iio/dac/ad5791.h                   |    4 -
12114  drivers/staging/iio/dac/dac.h                      |    2 +-
12115  drivers/staging/iio/dac/max517.c                   |   26 +-
12116  drivers/staging/iio/dds/Kconfig                    |    4 +-
12117  drivers/staging/iio/dds/ad5930.c                   |    1 +
12118  drivers/staging/iio/dds/ad9832.c                   |    1 +
12119  drivers/staging/iio/dds/ad9834.c                   |    1 +
12120  drivers/staging/iio/dds/ad9850.c                   |    1 +
12121  drivers/staging/iio/dds/ad9852.c                   |    2 +-
12122  drivers/staging/iio/dds/ad9910.c                   |    2 +-
12123  drivers/staging/iio/dds/ad9951.c                   |    2 +-
12124  drivers/staging/iio/gyro/Kconfig                   |    8 +-
12125  drivers/staging/iio/gyro/Makefile                  |    2 +-
12126  drivers/staging/iio/gyro/adis16060_core.c          |  124 +-
12127  drivers/staging/iio/gyro/adis16080_core.c          |  102 +-
12128  drivers/staging/iio/gyro/adis16130_core.c          |  145 +-
12129  drivers/staging/iio/gyro/adis16260.h               |    6 +-
12130  drivers/staging/iio/gyro/adis16260_core.c          |   47 +-
12131  drivers/staging/iio/gyro/adis16260_ring.c          |   39 +-
12132  drivers/staging/iio/gyro/adis16260_trigger.c       |   14 +-
12133  drivers/staging/iio/gyro/adxrs450_core.c           |  253 +-
12134  drivers/staging/iio/gyro/gyro.h                    |   85 -
12135  drivers/staging/iio/iio.h                          |  220 +-
12136  drivers/staging/iio/iio_core.h                     |   63 +
12137  drivers/staging/iio/iio_core_trigger.h             |   46 +
12138  drivers/staging/iio/impedance-analyzer/Kconfig     |   18 +
12139  drivers/staging/iio/impedance-analyzer/Makefile    |    5 +
12140  drivers/staging/iio/impedance-analyzer/ad5933.c    |  813 +
12141  drivers/staging/iio/impedance-analyzer/ad5933.h    |   28 +
12142  drivers/staging/iio/imu/Kconfig                    |   16 +-
12143  drivers/staging/iio/imu/Makefile                   |    2 +-
12144  drivers/staging/iio/imu/adis16400.h                |    6 +-
12145  drivers/staging/iio/imu/adis16400_core.c           |  648 +-
12146  drivers/staging/iio/imu/adis16400_ring.c           |   49 +-
12147  drivers/staging/iio/imu/adis16400_trigger.c        |   16 +-
12148  drivers/staging/iio/industrialio-buffer.c          |  635 +
12149  drivers/staging/iio/industrialio-core.c            |  906 +-
12150  drivers/staging/iio/industrialio-ring.c            |  596 -
12151  drivers/staging/iio/industrialio-trigger.c         |  146 +-
12152  drivers/staging/iio/kfifo_buf.c                    |   78 +-
12153  drivers/staging/iio/kfifo_buf.h                    |   16 +-
12154  drivers/staging/iio/light/Kconfig                  |    4 +-
12155  drivers/staging/iio/light/isl29018.c               |   71 +-
12156  drivers/staging/iio/light/tsl2563.c                |   59 +-
12157  drivers/staging/iio/light/tsl2583.c                |  221 +-
12158  drivers/staging/iio/magnetometer/Kconfig           |    3 +-
12159  drivers/staging/iio/magnetometer/ak8975.c          |  235 +-
12160  drivers/staging/iio/magnetometer/hmc5843.c         |  100 +-
12161  drivers/staging/iio/magnetometer/magnet.h          |   31 -
12162  drivers/staging/iio/meter/Kconfig                  |    8 +-
12163  drivers/staging/iio/meter/Makefile                 |    2 +-
12164  drivers/staging/iio/meter/ade7753.c                |   26 +-
12165  drivers/staging/iio/meter/ade7754.c                |   27 +-
12166  drivers/staging/iio/meter/ade7758.h                |   13 +-
12167  drivers/staging/iio/meter/ade7758_core.c           |   51 +-
12168  drivers/staging/iio/meter/ade7758_ring.c           |   57 +-
12169  drivers/staging/iio/meter/ade7758_trigger.c        |   16 +-
12170  drivers/staging/iio/meter/ade7759.c                |   23 +-
12171  drivers/staging/iio/meter/ade7854-i2c.c            |    1 +
12172  drivers/staging/iio/meter/ade7854-spi.c            |    1 +
12173  drivers/staging/iio/meter/ade7854.c                |    3 +-
12174  drivers/staging/iio/resolver/Kconfig               |    3 +-
12175  drivers/staging/iio/resolver/ad2s120x.c            |    1 +
12176  drivers/staging/iio/resolver/ad2s1210.c            |    5 +-
12177  drivers/staging/iio/resolver/ad2s90.c              |    2 +-
12178  drivers/staging/iio/ring_generic.h                 |  288 -
12179  drivers/staging/iio/ring_hw.h                      |    6 +-
12180  drivers/staging/iio/ring_sw.c                      |   69 +-
12181  drivers/staging/iio/ring_sw.h                      |    8 +-
12182  drivers/staging/iio/sysfs.h                        |  136 +-
12183  drivers/staging/iio/trigger.h                      |  116 +-
12184  drivers/staging/iio/trigger/iio-trig-bfin-timer.c  |    6 +-
12185  drivers/staging/iio/trigger/iio-trig-gpio.c        |    6 +-
12186  .../staging/iio/trigger/iio-trig-periodic-rtc.c    |    7 +-
12187  drivers/staging/iio/trigger/iio-trig-sysfs.c       |   13 +-
12188  drivers/staging/iio/trigger_consumer.h             |   71 +-
12189  drivers/staging/intel_sst/intel_sst.c              |   10 +-
12190  drivers/staging/intel_sst/intel_sst_dsp.c          |    2 +-
12191  drivers/staging/intel_sst/intelmid.c               |    1 +
12192  drivers/staging/keucr/scsiglue.c                   |    5 +-
12193  drivers/staging/keucr/smil.h                       |    6 +-
12194  drivers/staging/keucr/smilsub.c                    | 1574 +-
12195  drivers/staging/keucr/smscsi.c                     |  117 +-
12196  drivers/staging/lirc/lirc_imon.c                   |    6 +-
12197  drivers/staging/lirc/lirc_sasem.c                  |   46 +-
12198  drivers/staging/lirc/lirc_serial.c                 |    2 +-
12199  drivers/staging/lirc/lirc_sir.c                    |    2 +-
12200  drivers/staging/mei/Kconfig                        |    2 +-
12201  drivers/staging/mei/init.c                         |   25 +-
12202  drivers/staging/mei/interface.c                    |    4 +-
12203  drivers/staging/mei/interface.h                    |    8 +-
12204  drivers/staging/mei/interrupt.c                    |   85 +-
12205  drivers/staging/mei/main.c                         |   51 +-
12206  drivers/staging/mei/mei_dev.h                      |   24 +-
12207  drivers/staging/mei/wd.c                           |  242 +-
12208  drivers/staging/nvec/Kconfig                       |   12 +-
12209  drivers/staging/nvec/Makefile                      |    1 +
12210  drivers/staging/nvec/TODO                          |   10 +-
12211  drivers/staging/nvec/nvec-keytable.h               |  225 +-
12212  drivers/staging/nvec/nvec.c                        |  957 +-
12213  drivers/staging/nvec/nvec.h                        |  217 +-
12214  drivers/staging/nvec/nvec_kbd.c                    |   95 +-
12215  drivers/staging/nvec/nvec_leds.c                   |  114 +
12216  drivers/staging/nvec/nvec_power.c                  |  352 +-
12217  drivers/staging/nvec/nvec_ps2.c                    |  114 +-
12218  drivers/staging/olpc_dcon/olpc_dcon.c              |   47 +-
12219  drivers/staging/panel/panel.c                      |   10 +-
12220  drivers/staging/pohmelfs/trans.c                   |    6 +-
12221  drivers/staging/quatech_usb2/quatech_usb2.c        |    9 +-
12222  drivers/staging/rtl8187se/Makefile                 |    6 +-
12223  drivers/staging/rtl8187se/ieee80211/ieee80211.h    |    4 +-
12224  .../rtl8187se/ieee80211/ieee80211_softmac.c        |   14 +-
12225  drivers/staging/rtl8187se/r8180_rtl8225z2.c        |    4 +-
12226  drivers/staging/rtl8192e/Makefile                  |   67 +-
12227  drivers/staging/rtl8192e/TODO                      |    2 +
12228  drivers/staging/rtl8192e/dot11d.c                  |  216 +
12229  drivers/staging/rtl8192e/dot11d.h                  |  113 +-
12230  drivers/staging/rtl8192e/ieee80211/dot11d.c        |  218 -
12231  drivers/staging/rtl8192e/ieee80211/dot11d.h        |  102 -
12232  drivers/staging/rtl8192e/ieee80211/ieee80211.h     | 2636 ---
12233  .../staging/rtl8192e/ieee80211/ieee80211_module.c  |  352 -
12234  drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c  | 2676 ---
12235  .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 3278 ---
12236  drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c  |  955 -
12237  drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c  |  872 -
12238  drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h    |   69 -
12239  .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c    |  676 -
12240  drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h    |  483 -
12241  .../staging/rtl8192e/ieee80211/rtl819x_HTProc.c    | 1732 --
12242  drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h   |  582 -
12243  drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h    |   56 -
12244  .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c    |  627 -
12245  drivers/staging/rtl8192e/license                   |  339 +
12246  drivers/staging/rtl8192e/r8180_93cx6.c             |  141 -
12247  drivers/staging/rtl8192e/r8180_93cx6.h             |   41 -
12248  drivers/staging/rtl8192e/r8190P_def.h              |  410 +
12249  drivers/staging/rtl8192e/r8190P_rtl8256.c          |  306 +
12250  drivers/staging/rtl8192e/r8190P_rtl8256.h          |   31 +
12251  drivers/staging/rtl8192e/r8190_rtl8256.c           |  677 -
12252  drivers/staging/rtl8192e/r8190_rtl8256.h           |   29 -
12253  drivers/staging/rtl8192e/r8192E.h                  | 1148 -
12254  drivers/staging/rtl8192e/r8192E_cmdpkt.c           |  418 +
12255  drivers/staging/rtl8192e/r8192E_cmdpkt.h           |  159 +
12256  drivers/staging/rtl8192e/r8192E_core.c             | 5039 -----
12257  drivers/staging/rtl8192e/r8192E_dev.c              | 2395 ++
12258  drivers/staging/rtl8192e/r8192E_dev.h              |   62 +
12259  drivers/staging/rtl8192e/r8192E_dm.c               | 2554 ---
12260  drivers/staging/rtl8192e/r8192E_dm.h               |  228 -
12261  drivers/staging/rtl8192e/r8192E_firmware.c         |  348 +
12262  drivers/staging/rtl8192e/r8192E_firmware.h         |   73 +
12263  drivers/staging/rtl8192e/r8192E_hw.h               |  552 +-
12264  drivers/staging/rtl8192e/r8192E_hwimg.c            | 3336 +++
12265  drivers/staging/rtl8192e/r8192E_hwimg.h            |   51 +
12266  drivers/staging/rtl8192e/r8192E_phy.c              | 1637 ++
12267  drivers/staging/rtl8192e/r8192E_phy.h              |  120 +
12268  drivers/staging/rtl8192e/r8192E_phyreg.h           |  852 +
12269  drivers/staging/rtl8192e/r8192E_wx.c               | 1163 -
12270  drivers/staging/rtl8192e/r8192E_wx.h               |   18 -
12271  drivers/staging/rtl8192e/r8192_pm.c                |  123 -
12272  drivers/staging/rtl8192e/r8192_pm.h                |   24 -
12273  drivers/staging/rtl8192e/r819xE_cmdpkt.c           |  444 -
12274  drivers/staging/rtl8192e/r819xE_cmdpkt.h           |  207 -
12275  drivers/staging/rtl8192e/r819xE_firmware.c         |  351 -
12276  drivers/staging/rtl8192e/r819xE_phy.c              | 2225 --
12277  drivers/staging/rtl8192e/r819xE_phy.h              |  131 -
12278  drivers/staging/rtl8192e/rtl819x_BA.h              |   77 +
12279  drivers/staging/rtl8192e/rtl819x_BAProc.c          |  566 +
12280  drivers/staging/rtl8192e/rtl819x_HT.h              |  475 +
12281  drivers/staging/rtl8192e/rtl819x_HTProc.c          | 1075 +
12282  drivers/staging/rtl8192e/rtl819x_Qos.h             |  444 +
12283  drivers/staging/rtl8192e/rtl819x_TS.h              |   73 +
12284  drivers/staging/rtl8192e/rtl819x_TSProc.c          |  548 +
12285  drivers/staging/rtl8192e/rtl_cam.c                 |  304 +
12286  drivers/staging/rtl8192e/rtl_cam.h                 |   46 +
12287  drivers/staging/rtl8192e/rtl_core.c                | 3198 +++
12288  drivers/staging/rtl8192e/rtl_core.h                | 1124 +
12289  .../staging/rtl8192e/{ieee80211 => }/rtl_crypto.h  |  105 +-
12290  drivers/staging/rtl8192e/rtl_debug.c               | 1108 +
12291  drivers/staging/rtl8192e/rtl_debug.h               |  299 +
12292  drivers/staging/rtl8192e/rtl_dm.c                  | 2995 +++
12293  drivers/staging/rtl8192e/rtl_dm.h                  |  324 +
12294  drivers/staging/rtl8192e/rtl_eeprom.c              |  139 +
12295  drivers/staging/rtl8192e/rtl_eeprom.h              |   29 +
12296  drivers/staging/rtl8192e/rtl_ethtool.c             |   53 +
12297  drivers/staging/rtl8192e/rtl_pci.c                 |   97 +
12298  drivers/staging/rtl8192e/rtl_pci.h                 |  104 +
12299  drivers/staging/rtl8192e/rtl_pm.c                  |  136 +
12300  drivers/staging/rtl8192e/rtl_pm.h                  |   35 +
12301  drivers/staging/rtl8192e/rtl_ps.c                  |  310 +
12302  drivers/staging/rtl8192e/rtl_ps.h                  |   47 +
12303  drivers/staging/rtl8192e/rtl_wx.c                  | 1333 ++
12304  drivers/staging/rtl8192e/rtl_wx.h                  |   31 +
12305  drivers/staging/rtl8192e/rtllib.h                  | 3144 +++
12306  .../ieee80211_crypt.c => rtllib_crypt.c}           |   91 +-
12307  .../ieee80211_crypt.h => rtllib_crypt.h}           |   32 +-
12308  .../ieee80211_crypt_ccmp.c => rtllib_crypt_ccmp.c} |  170 +-
12309  .../ieee80211_crypt_tkip.c => rtllib_crypt_tkip.c} |  310 +-
12310  .../ieee80211_crypt_wep.c => rtllib_crypt_wep.c}   |  116 +-
12311  drivers/staging/rtl8192e/rtllib_endianfree.h       |  160 +
12312  drivers/staging/rtl8192e/rtllib_module.c           |  289 +
12313  drivers/staging/rtl8192e/rtllib_rx.c               | 2720 +++
12314  drivers/staging/rtl8192e/rtllib_softmac.c          | 3741 +++
12315  .../ieee80211_softmac_wx.c => rtllib_softmac_wx.c} |  381 +-
12316  drivers/staging/rtl8192e/rtllib_tx.c               |  967 +
12317  drivers/staging/rtl8192e/rtllib_wx.c               |  876 +
12318  drivers/staging/rtl8192u/ieee80211/compress.c      |    4 +-
12319  drivers/staging/rtl8192u/ieee80211/ieee80211.h     |    4 +-
12320  .../staging/rtl8192u/ieee80211/ieee80211_softmac.c |   14 +-
12321  drivers/staging/rtl8712/Kconfig                    |    7 +
12322  drivers/staging/rtl8712/basic_types.h              |   25 +
12323  drivers/staging/rtl8712/big_endian.h               |   25 +
12324  drivers/staging/rtl8712/drv_types.h                |   33 +
12325  drivers/staging/rtl8712/ethernet.h                 |   25 +
12326  drivers/staging/rtl8712/generic.h                  |   25 +
12327  drivers/staging/rtl8712/hal_init.c                 |    6 +
12328  drivers/staging/rtl8712/ieee80211.c                |   35 +-
12329  drivers/staging/rtl8712/ieee80211.h                |   31 +-
12330  drivers/staging/rtl8712/if_ether.h                 |   25 +
12331  drivers/staging/rtl8712/little_endian.h            |   25 +
12332  drivers/staging/rtl8712/mlme_osdep.h               |   25 +
12333  drivers/staging/rtl8712/mp_custom_oid.h            |   25 +
12334  drivers/staging/rtl8712/os_intfs.c                 |   33 +-
12335  drivers/staging/rtl8712/osdep_intf.h               |   25 +
12336  drivers/staging/rtl8712/osdep_service.h            |   69 +-
12337  drivers/staging/rtl8712/recv_linux.c               |    6 +-
12338  drivers/staging/rtl8712/recv_osdep.h               |   25 +
12339  drivers/staging/rtl8712/rtl8712_bitdef.h           |   21 +
12340  drivers/staging/rtl8712/rtl8712_cmd.c              |   18 +
12341  drivers/staging/rtl8712/rtl8712_cmd.h              |   87 +
12342  drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h   |   19 +
12343  drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h   |   19 +
12344  drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h |   19 +
12345  drivers/staging/rtl8712/rtl8712_debugctrl_regdef.h |   19 +
12346  .../staging/rtl8712/rtl8712_edcasetting_bitdef.h   |   25 +
12347  .../staging/rtl8712/rtl8712_edcasetting_regdef.h   |   19 +
12348  drivers/staging/rtl8712/rtl8712_efuse.c            |   75 +-
12349  drivers/staging/rtl8712/rtl8712_event.h            |   25 +
12350  drivers/staging/rtl8712/rtl8712_fifoctrl_bitdef.h  |   19 +
12351  drivers/staging/rtl8712/rtl8712_fifoctrl_regdef.h  |   19 +
12352  drivers/staging/rtl8712/rtl8712_gp_bitdef.h        |   25 +
12353  drivers/staging/rtl8712/rtl8712_gp_regdef.h        |   25 +
12354  drivers/staging/rtl8712/rtl8712_hal.h              |   25 +
12355  drivers/staging/rtl8712/rtl8712_interrupt_bitdef.h |   19 +
12356  drivers/staging/rtl8712/rtl8712_led.c              |    2 +-
12357  .../staging/rtl8712/rtl8712_macsetting_bitdef.h    |   19 +
12358  .../staging/rtl8712/rtl8712_macsetting_regdef.h    |   19 +
12359  drivers/staging/rtl8712/rtl8712_powersave_bitdef.h |   19 +
12360  drivers/staging/rtl8712/rtl8712_powersave_regdef.h |   19 +
12361  drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h  |   19 +
12362  drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h  |   25 +
12363  drivers/staging/rtl8712/rtl8712_recv.c             |   24 +-
12364  drivers/staging/rtl8712/rtl8712_recv.h             |   31 +-
12365  drivers/staging/rtl8712/rtl8712_regdef.h           |   25 +
12366  drivers/staging/rtl8712/rtl8712_security_bitdef.h  |   19 +
12367  drivers/staging/rtl8712/rtl8712_spec.h             |   25 +
12368  drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h    |   25 +
12369  drivers/staging/rtl8712/rtl8712_syscfg_regdef.h    |   25 +
12370  drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h  |   19 +
12371  drivers/staging/rtl8712/rtl8712_timectrl_regdef.h  |   19 +
12372  drivers/staging/rtl8712/rtl8712_wmac_bitdef.h      |   25 +
12373  drivers/staging/rtl8712/rtl8712_wmac_regdef.h      |   25 +
12374  drivers/staging/rtl8712/rtl8712_xmit.c             |  303 +-
12375  drivers/staging/rtl8712/rtl8712_xmit.h             |   37 +
12376  drivers/staging/rtl8712/rtl871x_byteorder.h        |   19 +
12377  drivers/staging/rtl8712/rtl871x_cmd.c              |  172 +-
12378  drivers/staging/rtl8712/rtl871x_cmd.h              |   77 +-
12379  drivers/staging/rtl8712/rtl871x_debug.h            |   25 +
12380  drivers/staging/rtl8712/rtl871x_eeprom.h           |   19 +
12381  drivers/staging/rtl8712/rtl871x_event.h            |   25 +
12382  drivers/staging/rtl8712/rtl871x_ht.h               |   25 +
12383  drivers/staging/rtl8712/rtl871x_io.h               |   25 +
12384  drivers/staging/rtl8712/rtl871x_ioctl_linux.c      |  306 +-
12385  drivers/staging/rtl8712/rtl871x_ioctl_rtl.h        |   25 +
12386  drivers/staging/rtl8712/rtl871x_ioctl_set.c        |    3 +-
12387  drivers/staging/rtl8712/rtl871x_ioctl_set.h        |   27 +-
12388  drivers/staging/rtl8712/rtl871x_led.h              |   25 +
12389  drivers/staging/rtl8712/rtl871x_mlme.c             |   58 +-
12390  drivers/staging/rtl8712/rtl871x_mlme.h             |   28 +-
12391  drivers/staging/rtl8712/rtl871x_mp.c               |   26 +-
12392  drivers/staging/rtl8712/rtl871x_mp.h               |   26 +-
12393  drivers/staging/rtl8712/rtl871x_mp_ioctl.h         |   29 +-
12394  drivers/staging/rtl8712/rtl871x_pwrctrl.h          |   25 +
12395  drivers/staging/rtl8712/rtl871x_recv.c             |    4 +
12396  drivers/staging/rtl8712/rtl871x_rf.h               |   25 +
12397  drivers/staging/rtl8712/rtl871x_security.c         |   15 +
12398  drivers/staging/rtl8712/rtl871x_security.h         |   25 +
12399  drivers/staging/rtl8712/rtl871x_wlan_sme.h         |   25 +
12400  drivers/staging/rtl8712/rtl871x_xmit.c             |   31 +-
12401  drivers/staging/rtl8712/rtl871x_xmit.h             |   52 +-
12402  drivers/staging/rtl8712/sta_info.h                 |   29 +-
12403  drivers/staging/rtl8712/swab.h                     |   25 +
12404  drivers/staging/rtl8712/usb_intf.c                 |   19 +-
12405  drivers/staging/rtl8712/usb_ops.h                  |   25 +
12406  drivers/staging/rtl8712/usb_ops_linux.c            |   29 +-
12407  drivers/staging/rtl8712/usb_osintf.h               |   26 +
12408  drivers/staging/rtl8712/usb_vendor_req.h           |   25 +
12409  drivers/staging/rtl8712/wifi.h                     |   25 +
12410  drivers/staging/rtl8712/wlan_bssdef.h              |   25 +
12411  drivers/staging/rtl8712/xmit_linux.c               |   27 +-
12412  drivers/staging/rtl8712/xmit_osdep.h               |   26 +
12413  drivers/staging/rts5139/Kconfig                    |   16 +
12414  drivers/staging/rts5139/Makefile                   |   37 +
12415  drivers/staging/rts5139/TODO                       |    5 +
12416  drivers/staging/rts5139/debug.h                    |   46 +
12417  drivers/staging/rts5139/ms.c                       | 4191 ++++
12418  drivers/staging/rts5139/ms.h                       |  263 +
12419  drivers/staging/rts5139/ms_mg.c                    |  642 +
12420  drivers/staging/rts5139/ms_mg.h                    |   41 +
12421  drivers/staging/rts5139/rts51x.c                   |  967 +
12422  drivers/staging/rts5139/rts51x.h                   |  205 +
12423  drivers/staging/rts5139/rts51x_card.c              |  986 +
12424  drivers/staging/rts5139/rts51x_card.h              |  881 +
12425  drivers/staging/rts5139/rts51x_chip.c              | 1167 +
12426  drivers/staging/rts5139/rts51x_chip.h              |  904 +
12427  drivers/staging/rts5139/rts51x_fop.c               |  298 +
12428  drivers/staging/rts5139/rts51x_fop.h               |   62 +
12429  drivers/staging/rts5139/rts51x_scsi.c              | 2234 ++
12430  drivers/staging/rts5139/rts51x_scsi.h              |  162 +
12431  drivers/staging/rts5139/rts51x_sys.h               |   54 +
12432  drivers/staging/rts5139/rts51x_transport.c         | 1000 +
12433  drivers/staging/rts5139/rts51x_transport.h         |   80 +
12434  drivers/staging/rts5139/sd.c                       | 3400 +++
12435  drivers/staging/rts5139/sd.h                       |  304 +
12436  drivers/staging/rts5139/sd_cprm.c                  | 1215 +
12437  drivers/staging/rts5139/sd_cprm.h                  |   54 +
12438  drivers/staging/rts5139/trace.h                    |  137 +
12439  drivers/staging/rts5139/xd.c                       | 2255 ++
12440  drivers/staging/rts5139/xd.h                       |  193 +
12441  drivers/staging/rts_pstor/Makefile                 |    2 +-
12442  drivers/staging/rts_pstor/rtsx_scsi.c              |    2 +-
12443  drivers/staging/rts_pstor/sd.c                     |    4 +-
12444  drivers/staging/rts_pstor/spi.c                    |    2 +-
12445  drivers/staging/sep/sep_driver.c                   |    6 +-
12446  drivers/staging/serqt_usb2/serqt_usb2.c            |   37 +-
12447  drivers/staging/sm7xx/smtcfb.c                     |    2 +
12448  drivers/staging/spectra/ffsport.c                  |   15 +-
12449  drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c      |    1 +
12450  drivers/staging/tidspbridge/gen/gh.c               |    2 +-
12451  drivers/staging/usbip/stub.h                       |    5 +
12452  drivers/staging/usbip/stub_dev.c                   |    7 +-
12453  drivers/staging/usbip/stub_main.c                  |    1 +
12454  drivers/staging/usbip/stub_rx.c                    |    5 +-
12455  drivers/staging/usbip/usbip_common.h               |    8 +-
12456  drivers/staging/usbip/usbip_protocol.txt           |  358 +
12457  .../staging/usbip/userspace/libsrc/vhci_driver.c   |    2 +-
12458  drivers/staging/usbip/userspace/src/usbip_attach.c |    4 +-
12459  drivers/staging/usbip/userspace/src/utils.h        |    1 +
12460  drivers/staging/usbip/vhci.h                       |    5 +
12461  drivers/staging/vme/bridges/vme_ca91cx42.c         |   24 +
12462  drivers/staging/vme/bridges/vme_tsi148.c           |   24 +
12463  drivers/staging/vme/devices/vme_user.c             |    4 +-
12464  drivers/staging/vme/vme.c                          |   95 +-
12465  drivers/staging/vme/vme_bridge.h                   |   13 +-
12466  drivers/staging/vt6655/IEEE11h.c                   |  406 +-
12467  drivers/staging/vt6655/device_main.c               |   10 +-
12468  drivers/staging/vt6655/dpc.c                       |   30 +-
12469  drivers/staging/vt6655/ioctl.c                     |    1 +
12470  drivers/staging/vt6655/wmgr.c                      |   49 +-
12471  drivers/staging/vt6656/dpc.c                       |   30 +-
12472  drivers/staging/vt6656/ioctl.c                     |    1 +
12473  drivers/staging/vt6656/main_usb.c                  |   11 +-
12474  drivers/staging/vt6656/wmgr.c                      |   49 +-
12475  drivers/staging/vt6656/wpactl.c                    |   18 +-
12476  drivers/staging/winbond/phy_calibration.c          |   12 +-
12477  drivers/staging/wlags49_h2/debug.h                 |   61 +-
12478  drivers/staging/wlags49_h2/hcf.c                   | 6434 +++---
12479  drivers/staging/wlags49_h2/hcf.h                   |   10 -
12480  drivers/staging/wlags49_h2/hcfcfg.h                | 1567 --
12481  drivers/staging/wlags49_h2/hcfdef.h                |  857 +-
12482  drivers/staging/wlags49_h2/mdd.h                   |   34 +-
12483  drivers/staging/wlags49_h2/wl_cs.c                 |  114 -
12484  drivers/staging/wlags49_h2/wl_internal.h           |    7 -
12485  drivers/staging/wlags49_h2/wl_netdev.c             |    2 +-
12486  drivers/staging/wlags49_h2/wl_version.h            |    6 +-
12487  drivers/staging/wlags49_h2/wl_wext.c               |  269 +-
12488  drivers/staging/wlags49_h2/wl_wext.h               |    8 -
12489  drivers/staging/xgifb/TODO                         |    1 -
12490  drivers/staging/xgifb/XGI_main.h                   |  141 +-
12491  drivers/staging/xgifb/XGI_main_26.c                |  838 +-
12492  drivers/staging/xgifb/XGIfb.h                      |   16 +-
12493  drivers/staging/xgifb/vb_def.h                     |  605 +-
12494  drivers/staging/xgifb/vb_ext.h                     |   20 -
12495  drivers/staging/xgifb/vb_init.c                    |   22 +-
12496  drivers/staging/xgifb/vb_setmode.c                 | 1530 +-
12497  drivers/staging/xgifb/vb_struct.h                  |   93 +-
12498  drivers/staging/xgifb/vb_table.h                   | 1200 +-
12499  drivers/staging/xgifb/vb_util.c                    |    5 +-
12500  drivers/staging/xgifb/vgatypes.h                   |    7 +-
12501  drivers/staging/zcache/zcache-main.c               |    6 +-
12502  drivers/staging/zram/zram_drv.c                    |   97 +-
12503  drivers/staging/zram/zram_drv.h                    |   12 +-
12504  drivers/staging/zram/zram_sysfs.c                  |   22 +-
12505  include/linux/mod_devicetable.h                    |    9 +
12506  scripts/mod/file2alias.c                           |   25 +
12507  672 files changed, 124395 insertions(+), 102835 deletions(-)
12508  delete mode 100644 drivers/char/scc.h
12509  delete mode 100644 drivers/staging/brcm80211/brcmsmac/alloc.c
12510  delete mode 100644 drivers/staging/brcm80211/brcmsmac/alloc.h
12511  delete mode 100644 drivers/staging/brcm80211/brcmsmac/bmac.c
12512  delete mode 100644 drivers/staging/brcm80211/brcmsmac/bmac.h
12513  create mode 100644 drivers/staging/comedi/drivers/usbduxsigma.c
12514  delete mode 100644 drivers/staging/cx25821/cx25821-gpio.h
12515  create mode 100644 drivers/staging/et131x/et131x_ethtool.c
12516  delete mode 100644 drivers/staging/hv/blkvsc_drv.c
12517  delete mode 100644 drivers/staging/hv/hyperv_storage.h
12518  delete mode 100644 drivers/staging/hv/storvsc.c
12519  create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-adc-ad7280a
12520  create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-impedance-analyzer-ad5933
12521  delete mode 100644 drivers/staging/iio/accel/accel.h
12522  delete mode 100644 drivers/staging/iio/accel/inclinometer.h
12523  create mode 100644 drivers/staging/iio/adc/ad7192.c
12524  create mode 100644 drivers/staging/iio/adc/ad7192.h
12525  create mode 100644 drivers/staging/iio/adc/ad7280a.c
12526  create mode 100644 drivers/staging/iio/adc/ad7280a.h
12527  delete mode 100644 drivers/staging/iio/adc/ad7745.c
12528  create mode 100644 drivers/staging/iio/adc/ad7746.c
12529  create mode 100644 drivers/staging/iio/adc/ad7746.h
12530  delete mode 100644 drivers/staging/iio/adc/adc.h
12531  create mode 100644 drivers/staging/iio/buffer_generic.h
12532  delete mode 100644 drivers/staging/iio/gyro/gyro.h
12533  create mode 100644 drivers/staging/iio/iio_core.h
12534  create mode 100644 drivers/staging/iio/iio_core_trigger.h
12535  create mode 100644 drivers/staging/iio/impedance-analyzer/Kconfig
12536  create mode 100644 drivers/staging/iio/impedance-analyzer/Makefile
12537  create mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.c
12538  create mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.h
12539  create mode 100644 drivers/staging/iio/industrialio-buffer.c
12540  delete mode 100644 drivers/staging/iio/industrialio-ring.c
12541  delete mode 100644 drivers/staging/iio/magnetometer/magnet.h
12542  delete mode 100644 drivers/staging/iio/ring_generic.h
12543  create mode 100644 drivers/staging/nvec/nvec_leds.c
12544  create mode 100644 drivers/staging/rtl8192e/TODO
12545  create mode 100644 drivers/staging/rtl8192e/dot11d.c
12546  delete mode 100644 drivers/staging/rtl8192e/ieee80211/dot11d.c
12547  delete mode 100644 drivers/staging/rtl8192e/ieee80211/dot11d.h
12548  delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211.h
12549  delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
12550  delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
12551  delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
12552  delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c
12553  delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
12554  delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h
12555  delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c
12556  delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h
12557  delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c
12558  delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h
12559  delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h
12560  delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c
12561  create mode 100644 drivers/staging/rtl8192e/license
12562  delete mode 100644 drivers/staging/rtl8192e/r8180_93cx6.c
12563  delete mode 100644 drivers/staging/rtl8192e/r8180_93cx6.h
12564  create mode 100644 drivers/staging/rtl8192e/r8190P_def.h
12565  create mode 100644 drivers/staging/rtl8192e/r8190P_rtl8256.c
12566  create mode 100644 drivers/staging/rtl8192e/r8190P_rtl8256.h
12567  delete mode 100644 drivers/staging/rtl8192e/r8190_rtl8256.c
12568  delete mode 100644 drivers/staging/rtl8192e/r8190_rtl8256.h
12569  delete mode 100644 drivers/staging/rtl8192e/r8192E.h
12570  create mode 100644 drivers/staging/rtl8192e/r8192E_cmdpkt.c
12571  create mode 100644 drivers/staging/rtl8192e/r8192E_cmdpkt.h
12572  delete mode 100644 drivers/staging/rtl8192e/r8192E_core.c
12573  create mode 100644 drivers/staging/rtl8192e/r8192E_dev.c
12574  create mode 100644 drivers/staging/rtl8192e/r8192E_dev.h
12575  delete mode 100644 drivers/staging/rtl8192e/r8192E_dm.c
12576  delete mode 100644 drivers/staging/rtl8192e/r8192E_dm.h
12577  create mode 100644 drivers/staging/rtl8192e/r8192E_firmware.c
12578  create mode 100644 drivers/staging/rtl8192e/r8192E_firmware.h
12579  create mode 100644 drivers/staging/rtl8192e/r8192E_hwimg.c
12580  create mode 100644 drivers/staging/rtl8192e/r8192E_hwimg.h
12581  create mode 100644 drivers/staging/rtl8192e/r8192E_phy.c
12582  create mode 100644 drivers/staging/rtl8192e/r8192E_phy.h
12583  create mode 100644 drivers/staging/rtl8192e/r8192E_phyreg.h
12584  delete mode 100644 drivers/staging/rtl8192e/r8192E_wx.c
12585  delete mode 100644 drivers/staging/rtl8192e/r8192E_wx.h
12586  delete mode 100644 drivers/staging/rtl8192e/r8192_pm.c
12587  delete mode 100644 drivers/staging/rtl8192e/r8192_pm.h
12588  delete mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.c
12589  delete mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.h
12590  delete mode 100644 drivers/staging/rtl8192e/r819xE_firmware.c
12591  delete mode 100644 drivers/staging/rtl8192e/r819xE_phy.c
12592  delete mode 100644 drivers/staging/rtl8192e/r819xE_phy.h
12593  create mode 100644 drivers/staging/rtl8192e/rtl819x_BA.h
12594  create mode 100644 drivers/staging/rtl8192e/rtl819x_BAProc.c
12595  create mode 100644 drivers/staging/rtl8192e/rtl819x_HT.h
12596  create mode 100644 drivers/staging/rtl8192e/rtl819x_HTProc.c
12597  create mode 100644 drivers/staging/rtl8192e/rtl819x_Qos.h
12598  create mode 100644 drivers/staging/rtl8192e/rtl819x_TS.h
12599  create mode 100644 drivers/staging/rtl8192e/rtl819x_TSProc.c
12600  create mode 100644 drivers/staging/rtl8192e/rtl_cam.c
12601  create mode 100644 drivers/staging/rtl8192e/rtl_cam.h
12602  create mode 100644 drivers/staging/rtl8192e/rtl_core.c
12603  create mode 100644 drivers/staging/rtl8192e/rtl_core.h
12604  rename drivers/staging/rtl8192e/{ieee80211 => }/rtl_crypto.h (74%)
12605  create mode 100644 drivers/staging/rtl8192e/rtl_debug.c
12606  create mode 100644 drivers/staging/rtl8192e/rtl_debug.h
12607  create mode 100644 drivers/staging/rtl8192e/rtl_dm.c
12608  create mode 100644 drivers/staging/rtl8192e/rtl_dm.h
12609  create mode 100644 drivers/staging/rtl8192e/rtl_eeprom.c
12610  create mode 100644 drivers/staging/rtl8192e/rtl_eeprom.h
12611  create mode 100644 drivers/staging/rtl8192e/rtl_ethtool.c
12612  create mode 100644 drivers/staging/rtl8192e/rtl_pci.c
12613  create mode 100644 drivers/staging/rtl8192e/rtl_pci.h
12614  create mode 100644 drivers/staging/rtl8192e/rtl_pm.c
12615  create mode 100644 drivers/staging/rtl8192e/rtl_pm.h
12616  create mode 100644 drivers/staging/rtl8192e/rtl_ps.c
12617  create mode 100644 drivers/staging/rtl8192e/rtl_ps.h
12618  create mode 100644 drivers/staging/rtl8192e/rtl_wx.c
12619  create mode 100644 drivers/staging/rtl8192e/rtl_wx.h
12620  create mode 100644 drivers/staging/rtl8192e/rtllib.h
12621  rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt.c => rtllib_crypt.c} (63%)
12622  rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt.h => rtllib_crypt.h} (74%)
12623  rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt_ccmp.c => rtllib_crypt_ccmp.c} (67%)
12624  rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt_tkip.c => rtllib_crypt_tkip.c} (71%)
12625  rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt_wep.c => rtllib_crypt_wep.c} (71%)
12626  create mode 100644 drivers/staging/rtl8192e/rtllib_endianfree.h
12627  create mode 100644 drivers/staging/rtl8192e/rtllib_module.c
12628  create mode 100644 drivers/staging/rtl8192e/rtllib_rx.c
12629  create mode 100644 drivers/staging/rtl8192e/rtllib_softmac.c
12630  rename drivers/staging/rtl8192e/{ieee80211/ieee80211_softmac_wx.c => rtllib_softmac_wx.c} (50%)
12631  create mode 100644 drivers/staging/rtl8192e/rtllib_tx.c
12632  create mode 100644 drivers/staging/rtl8192e/rtllib_wx.c
12633  create mode 100644 drivers/staging/rts5139/Kconfig
12634  create mode 100644 drivers/staging/rts5139/Makefile
12635  create mode 100644 drivers/staging/rts5139/TODO
12636  create mode 100644 drivers/staging/rts5139/debug.h
12637  create mode 100644 drivers/staging/rts5139/ms.c
12638  create mode 100644 drivers/staging/rts5139/ms.h
12639  create mode 100644 drivers/staging/rts5139/ms_mg.c
12640  create mode 100644 drivers/staging/rts5139/ms_mg.h
12641  create mode 100644 drivers/staging/rts5139/rts51x.c
12642  create mode 100644 drivers/staging/rts5139/rts51x.h
12643  create mode 100644 drivers/staging/rts5139/rts51x_card.c
12644  create mode 100644 drivers/staging/rts5139/rts51x_card.h
12645  create mode 100644 drivers/staging/rts5139/rts51x_chip.c
12646  create mode 100644 drivers/staging/rts5139/rts51x_chip.h
12647  create mode 100644 drivers/staging/rts5139/rts51x_fop.c
12648  create mode 100644 drivers/staging/rts5139/rts51x_fop.h
12649  create mode 100644 drivers/staging/rts5139/rts51x_scsi.c
12650  create mode 100644 drivers/staging/rts5139/rts51x_scsi.h
12651  create mode 100644 drivers/staging/rts5139/rts51x_sys.h
12652  create mode 100644 drivers/staging/rts5139/rts51x_transport.c
12653  create mode 100644 drivers/staging/rts5139/rts51x_transport.h
12654  create mode 100644 drivers/staging/rts5139/sd.c
12655  create mode 100644 drivers/staging/rts5139/sd.h
12656  create mode 100644 drivers/staging/rts5139/sd_cprm.c
12657  create mode 100644 drivers/staging/rts5139/sd_cprm.h
12658  create mode 100644 drivers/staging/rts5139/trace.h
12659  create mode 100644 drivers/staging/rts5139/xd.c
12660  create mode 100644 drivers/staging/rts5139/xd.h
12661  create mode 100644 drivers/staging/usbip/usbip_protocol.txt
12662 Merging bkl-config/config
12663 $ git merge bkl-config/config
12664 Already up-to-date.
12665 Merging tmem/tmem
12666 $ git merge tmem/tmem
12667 Removing Documentation/ABI/testing/sysfs-kernel-mm-cleancache
12668 Auto-merging drivers/staging/zcache/zcache-main.c
12669 Auto-merging include/linux/swap.h
12670 Auto-merging mm/filemap.c
12671 Merge made by recursive.
12672  .../ABI/testing/sysfs-kernel-mm-cleancache         |   11 -
12673  Documentation/vm/cleancache.txt                    |   41 ++--
12674  Documentation/vm/frontswap.txt                     |  210 +++++++++++++++
12675  drivers/staging/zcache/zcache-main.c               |   10 +-
12676  drivers/xen/tmem.c                                 |   10 +-
12677  fs/buffer.c                                        |    2 +-
12678  fs/super.c                                         |    2 +-
12679  include/linux/cleancache.h                         |   24 +-
12680  include/linux/frontswap.h                          |  126 +++++++++
12681  include/linux/swap.h                               |    4 +
12682  include/linux/swapfile.h                           |   13 +
12683  mm/Kconfig                                         |   17 ++
12684  mm/Makefile                                        |    1 +
12685  mm/cleancache.c                                    |   98 +++-----
12686  mm/filemap.c                                       |    2 +-
12687  mm/frontswap.c                                     |  273 ++++++++++++++++++++
12688  mm/page_io.c                                       |   12 +
12689  mm/swapfile.c                                      |   64 ++++-
12690  mm/truncate.c                                      |   10 +-
12691  19 files changed, 796 insertions(+), 134 deletions(-)
12692  delete mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache
12693  create mode 100644 Documentation/vm/frontswap.txt
12694  create mode 100644 include/linux/frontswap.h
12695  create mode 100644 include/linux/swapfile.h
12696  create mode 100644 mm/frontswap.c
12697 Merging writeback/next
12698 $ git merge writeback/next
12699 Already up-to-date.
12700 Merging arm-dt/devicetree/arm-next
12701 $ git merge arm-dt/devicetree/arm-next
12702 Already up-to-date.
12703 Merging hwspinlock/linux-next
12704 $ git merge hwspinlock/linux-next
12705 Auto-merging MAINTAINERS
12706 Merge made by recursive.
12707  Documentation/hwspinlock.txt             |   74 +++++++-----
12708  MAINTAINERS                              |   14 ++
12709  arch/arm/mach-omap2/hwspinlock.c         |    8 +-
12710  drivers/hwspinlock/Kconfig               |   27 +++--
12711  drivers/hwspinlock/Makefile              |    1 +
12712  drivers/hwspinlock/hwspinlock_core.c     |  204 +++++++++++++++++++-----------
12713  drivers/hwspinlock/hwspinlock_internal.h |   40 ++++--
12714  drivers/hwspinlock/omap_hwspinlock.c     |  127 +++++++------------
12715  drivers/hwspinlock/u8500_hsem.c          |  198 +++++++++++++++++++++++++++++
12716  include/linux/hwspinlock.h               |   46 +++++--
12717  10 files changed, 514 insertions(+), 225 deletions(-)
12718  create mode 100644 drivers/hwspinlock/u8500_hsem.c
12719 Merging pinctrl/for-next
12720 $ git merge pinctrl/for-next
12721 Resolved 'arch/arm/mach-u300/Kconfig' using previous resolution.
12722 Resolved 'arch/arm/mach-u300/core.c' using previous resolution.
12723 Auto-merging MAINTAINERS
12724 Auto-merging arch/arm/mach-u300/Kconfig
12725 CONFLICT (content): Merge conflict in arch/arm/mach-u300/Kconfig
12726 Auto-merging arch/arm/mach-u300/core.c
12727 CONFLICT (content): Merge conflict in arch/arm/mach-u300/core.c
12728 Auto-merging arch/arm/mach-u300/mmc.c
12729 Removing arch/arm/mach-u300/padmux.c
12730 Removing arch/arm/mach-u300/padmux.h
12731 Auto-merging drivers/Kconfig
12732 Auto-merging drivers/Makefile
12733 Automatic merge failed; fix conflicts and then commit the result.
12734 $ git commit -v -a
12735 [master 8b7ea53] Merge remote-tracking branch 'pinctrl/for-next'
12736 $ git diff -M --stat --summary HEAD^..
12737  Documentation/pinctrl.txt                |  951 ++++++++++++++++++++++++
12738  MAINTAINERS                              |    5 +
12739  arch/arm/mach-u300/Kconfig               |    2 +
12740  arch/arm/mach-u300/Makefile              |    2 +-
12741  arch/arm/mach-u300/core.c                |   81 ++
12742  arch/arm/mach-u300/include/mach/syscon.h |  136 ----
12743  arch/arm/mach-u300/mmc.c                 |   16 -
12744  arch/arm/mach-u300/padmux.c              |  367 ----------
12745  arch/arm/mach-u300/padmux.h              |   39 -
12746  arch/arm/mach-u300/spi.c                 |   20 -
12747  drivers/Kconfig                          |    4 +
12748  drivers/Makefile                         |    2 +
12749  drivers/pinctrl/Kconfig                  |   36 +
12750  drivers/pinctrl/Makefile                 |    7 +
12751  drivers/pinctrl/core.c                   |  601 +++++++++++++++
12752  drivers/pinctrl/core.h                   |   73 ++
12753  drivers/pinctrl/pinmux-u300.c            | 1148 +++++++++++++++++++++++++++++
12754  drivers/pinctrl/pinmux.c                 | 1180 ++++++++++++++++++++++++++++++
12755  drivers/pinctrl/pinmux.h                 |   47 ++
12756  include/linux/pinctrl/machine.h          |  107 +++
12757  include/linux/pinctrl/pinctrl.h          |  133 ++++
12758  include/linux/pinctrl/pinmux.h           |  117 +++
12759  22 files changed, 4495 insertions(+), 579 deletions(-)
12760  create mode 100644 Documentation/pinctrl.txt
12761  delete mode 100644 arch/arm/mach-u300/padmux.c
12762  delete mode 100644 arch/arm/mach-u300/padmux.h
12763  create mode 100644 drivers/pinctrl/Kconfig
12764  create mode 100644 drivers/pinctrl/Makefile
12765  create mode 100644 drivers/pinctrl/core.c
12766  create mode 100644 drivers/pinctrl/core.h
12767  create mode 100644 drivers/pinctrl/pinmux-u300.c
12768  create mode 100644 drivers/pinctrl/pinmux.c
12769  create mode 100644 drivers/pinctrl/pinmux.h
12770  create mode 100644 include/linux/pinctrl/machine.h
12771  create mode 100644 include/linux/pinctrl/pinctrl.h
12772  create mode 100644 include/linux/pinctrl/pinmux.h
12773 Merging moduleh/for-sfr
12774 $ git merge moduleh/for-sfr
12775 Auto-merging arch/arm/common/scoop.c
12776 Auto-merging arch/arm/kernel/armksyms.c
12777 Auto-merging arch/arm/kernel/perf_event.c
12778 Auto-merging arch/arm/kernel/process.c
12779 Auto-merging arch/arm/kernel/setup.c
12780 Auto-merging arch/arm/mach-bcmring/mm.c
12781 CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c
12782 Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
12783 Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c
12784 Auto-merging arch/arm/mach-imx/mach-mx31lilly.c
12785 Auto-merging arch/arm/mach-imx/mach-mx31lite.c
12786 Auto-merging arch/arm/mach-imx/mach-mx31moboard.c
12787 Auto-merging arch/arm/mach-ixp2000/core.c
12788 Auto-merging arch/arm/mach-ixp4xx/common-pci.c
12789 Auto-merging arch/arm/mach-omap1/board-ams-delta.c
12790 Auto-merging arch/arm/mach-omap1/board-sx1.c
12791 Auto-merging arch/arm/mach-omap1/board-voiceblue.c
12792 Auto-merging arch/arm/mach-omap2/board-omap3evm.c
12793 Auto-merging arch/arm/mach-omap2/clockdomain.c
12794 Auto-merging arch/arm/mach-omap2/display.c
12795 Auto-merging arch/arm/mach-omap2/pm.c
12796 Auto-merging arch/arm/mach-omap2/voltage.c
12797 Auto-merging arch/arm/mach-pxa/colibri-pxa270.c
12798 Auto-merging arch/arm/mach-pxa/corgi.c
12799 Auto-merging arch/arm/mach-pxa/poodle.c
12800 Auto-merging arch/arm/mach-pxa/spitz.c
12801 Auto-merging arch/arm/mach-pxa/trizeps4.c
12802 Auto-merging arch/arm/mach-s3c2410/mach-h1940.c
12803 Auto-merging arch/arm/mach-sa1100/jornada720.c
12804 Auto-merging arch/arm/mm/init.c
12805 Auto-merging arch/arm/plat-samsung/dev-ts.c
12806 Auto-merging arch/arm/plat-samsung/platformdata.c
12807 Auto-merging arch/arm/vfp/vfpmodule.c
12808 Auto-merging arch/blackfin/mach-bf518/boards/ezbrd.c
12809 Auto-merging arch/blackfin/mach-bf527/boards/ad7160eval.c
12810 Auto-merging arch/blackfin/mach-bf527/boards/cm_bf527.c
12811 Auto-merging arch/blackfin/mach-bf527/boards/ezbrd.c
12812 Auto-merging arch/blackfin/mach-bf527/boards/ezkit.c
12813 Auto-merging arch/blackfin/mach-bf527/boards/tll6527m.c
12814 Auto-merging arch/blackfin/mach-bf537/boards/cm_bf537e.c
12815 Auto-merging arch/blackfin/mach-bf537/boards/cm_bf537u.c
12816 Auto-merging arch/blackfin/mach-bf537/boards/dnp5370.c
12817 Auto-merging arch/blackfin/mach-bf537/boards/pnav10.c
12818 Auto-merging arch/blackfin/mach-bf537/boards/stamp.c
12819 Auto-merging arch/blackfin/mach-bf537/boards/tcm_bf537.c
12820 Auto-merging arch/mips/bcm47xx/gpio.c
12821 Auto-merging arch/mips/bcm47xx/setup.c
12822 Auto-merging arch/mips/kernel/cpu-probe.c
12823 Auto-merging arch/mips/kernel/traps.c
12824 Auto-merging arch/mips/kernel/vpe.c
12825 Auto-merging arch/parisc/kernel/pci-dma.c
12826 Auto-merging arch/powerpc/include/asm/machdep.h
12827 Auto-merging arch/powerpc/kernel/dma-iommu.c
12828 Auto-merging arch/powerpc/kernel/dma.c
12829 Auto-merging arch/powerpc/kernel/ibmebus.c
12830 Auto-merging arch/powerpc/kernel/pci-common.c
12831 Auto-merging arch/powerpc/kernel/prom.c
12832 Auto-merging arch/powerpc/kernel/ptrace.c
12833 Auto-merging arch/powerpc/kernel/setup_64.c
12834 Auto-merging arch/powerpc/kernel/smp.c
12835 Auto-merging arch/powerpc/kernel/vio.c
12836 Auto-merging arch/powerpc/kvm/44x.c
12837 Auto-merging arch/powerpc/kvm/book3s_exports.c
12838 Auto-merging arch/powerpc/kvm/book3s_hv.c
12839 Auto-merging arch/powerpc/kvm/book3s_pr.c
12840 Auto-merging arch/powerpc/kvm/powerpc.c
12841 Auto-merging arch/powerpc/mm/hash_utils_64.c
12842 Auto-merging arch/powerpc/mm/mem.c
12843 Auto-merging arch/powerpc/mm/mmu_context_hash64.c
12844 Auto-merging arch/powerpc/mm/numa.c
12845 Auto-merging arch/powerpc/mm/tlb_nohash.c
12846 Auto-merging arch/powerpc/platforms/ps3/system-bus.c
12847 Auto-merging arch/powerpc/platforms/pseries/eeh.c
12848 Auto-merging arch/powerpc/platforms/pseries/iommu.c
12849 Auto-merging arch/powerpc/xmon/xmon.c
12850 Auto-merging arch/sparc/kernel/cpu.c
12851 Auto-merging arch/sparc/kernel/cpumap.c
12852 Auto-merging arch/sparc/kernel/process_64.c
12853 Auto-merging arch/sparc/kernel/setup_32.c
12854 Auto-merging arch/sparc/kernel/setup_64.c
12855 Auto-merging arch/x86/crypto/aes_glue.c
12856 Auto-merging arch/x86/kernel/cpu/amd.c
12857 Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
12858 Auto-merging arch/x86/kernel/pci-dma.c
12859 Auto-merging arch/x86/kernel/rtc.c
12860 Auto-merging arch/x86/lguest/boot.c
12861 Auto-merging arch/x86/platform/mrst/vrtc.c
12862 Auto-merging block/ioctl.c
12863 Auto-merging drivers/ata/libata-eh.c
12864 Auto-merging drivers/ata/libata-scsi.c
12865 Auto-merging drivers/base/power/main.c
12866 Auto-merging drivers/base/power/runtime.c
12867 Auto-merging drivers/base/power/wakeup.c
12868 Auto-merging drivers/bcma/core.c
12869 Auto-merging drivers/bcma/driver_chipcommon.c
12870 Auto-merging drivers/bcma/driver_pci.c
12871 Auto-merging drivers/bcma/main.c
12872 Auto-merging drivers/block/aoe/aoeblk.c
12873 Auto-merging drivers/block/ps3vram.c
12874 Auto-merging drivers/bluetooth/btwilink.c
12875 Auto-merging drivers/char/virtio_console.c
12876 Auto-merging drivers/cpuidle/cpuidle.c
12877 Auto-merging drivers/cpuidle/governors/ladder.c
12878 Auto-merging drivers/cpuidle/governors/menu.c
12879 Auto-merging drivers/dca/dca-core.c
12880 Auto-merging drivers/dma/imx-dma.c
12881 Auto-merging drivers/dma/imx-sdma.c
12882 Auto-merging drivers/dma/intel_mid_dma.c
12883 Auto-merging drivers/gpio/gpio-ep93xx.c
12884 Auto-merging drivers/gpio/gpio-mxc.c
12885 Auto-merging drivers/gpio/gpio-mxs.c
12886 Auto-merging drivers/gpu/drm/i915/i915_drv.c
12887 Auto-merging drivers/gpu/drm/i915/intel_sdvo.c
12888 Auto-merging drivers/gpu/drm/radeon/ni.c
12889 Auto-merging drivers/gpu/drm/radeon/r100.c
12890 Auto-merging drivers/gpu/drm/radeon/r600.c
12891 Auto-merging drivers/hid/hid-axff.c
12892 Auto-merging drivers/hid/hid-debug.c
12893 Auto-merging drivers/hid/hid-picolcd.c
12894 Auto-merging drivers/hid/hid-sjoy.c
12895 Auto-merging drivers/hid/usbhid/hid-quirks.c
12896 Auto-merging drivers/infiniband/core/cma.c
12897 Auto-merging drivers/infiniband/core/mad.c
12898 Auto-merging drivers/infiniband/core/ucma.c
12899 Auto-merging drivers/infiniband/hw/qib/qib_file_ops.c
12900 Auto-merging drivers/infiniband/hw/qib/qib_init.c
12901 Auto-merging drivers/infiniband/ulp/ipoib/ipoib_cm.c
12902 Auto-merging drivers/infiniband/ulp/ipoib/ipoib_ib.c
12903 Auto-merging drivers/infiniband/ulp/iser/iscsi_iser.c
12904 Auto-merging drivers/input/input-mt.c
12905 Auto-merging drivers/input/input-polldev.c
12906 Auto-merging drivers/isdn/i4l/isdn_tty.c
12907 Auto-merging drivers/leds/leds-asic3.c
12908 Auto-merging drivers/md/dm-raid.c
12909 Auto-merging drivers/md/faulty.c
12910 Auto-merging drivers/md/linear.c
12911 Auto-merging drivers/md/md.c
12912 Auto-merging drivers/md/multipath.c
12913 Auto-merging drivers/md/raid0.c
12914 Auto-merging drivers/md/raid1.c
12915 Auto-merging drivers/md/raid10.c
12916 Auto-merging drivers/md/raid5.c
12917 Auto-merging drivers/media/common/saa7146_core.c
12918 Auto-merging drivers/media/common/saa7146_fops.c
12919 Auto-merging drivers/media/common/saa7146_hlp.c
12920 Auto-merging drivers/media/common/saa7146_video.c
12921 Auto-merging drivers/media/dvb/frontends/dibx000_common.c
12922 CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/dibx000_common.c
12923 Auto-merging drivers/media/radio/radio-wl1273.c
12924 Auto-merging drivers/media/radio/wl128x/fmdrv_v4l2.c
12925 Auto-merging drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c
12926 Auto-merging drivers/media/rc/rc-main.c
12927 Auto-merging drivers/media/video/adp1653.c
12928 Auto-merging drivers/media/video/cx25840/cx25840-ir.c
12929 Auto-merging drivers/media/video/hexium_gemini.c
12930 Auto-merging drivers/media/video/hexium_orion.c
12931 Auto-merging drivers/media/video/m5mols/m5mols_core.c
12932 Auto-merging drivers/media/video/mt9m111.c
12933 Auto-merging drivers/media/video/mxb.c
12934 Auto-merging drivers/media/video/noon010pc30.c
12935 Auto-merging drivers/media/video/sr030pc30.c
12936 Auto-merging drivers/media/video/tvp7002.c
12937 Auto-merging drivers/media/video/v4l2-ctrls.c
12938 Auto-merging drivers/media/video/v4l2-device.c
12939 Auto-merging drivers/media/video/v4l2-subdev.c
12940 Auto-merging drivers/mfd/ab3100-core.c
12941 Auto-merging drivers/mfd/asic3.c
12942 Auto-merging drivers/mfd/max8997.c
12943 Auto-merging drivers/mfd/twl-core.c
12944 Auto-merging drivers/mfd/twl6030-irq.c
12945 CONFLICT (content): Merge conflict in drivers/mfd/twl6030-irq.c
12946 Auto-merging drivers/mfd/wm8400-core.c
12947 Auto-merging drivers/misc/altera-stapl/altera.c
12948 CONFLICT (content): Merge conflict in drivers/misc/altera-stapl/altera.c
12949 Auto-merging drivers/mmc/card/mmc_test.c
12950 Auto-merging drivers/mmc/core/debugfs.c
12951 Auto-merging drivers/mmc/core/host.c
12952 Auto-merging drivers/mmc/core/mmc.c
12953 Auto-merging drivers/mmc/core/mmc_ops.c
12954 Auto-merging drivers/mmc/core/quirks.c
12955 Auto-merging drivers/mmc/core/sd.c
12956 Auto-merging drivers/mmc/core/sd_ops.c
12957 Auto-merging drivers/mmc/host/sdhci-of-esdhc.c
12958 Auto-merging drivers/mmc/host/sdhci-pci.c
12959 Auto-merging drivers/mmc/host/sdhci-pxav2.c
12960 Auto-merging drivers/mmc/host/sdhci-spear.c
12961 Auto-merging drivers/mmc/host/sdhci-tegra.c
12962 Auto-merging drivers/mmc/host/sdhci.c
12963 Auto-merging drivers/mmc/host/sh_mmcif.c
12964 Auto-merging drivers/mmc/host/sh_mobile_sdhi.c
12965 Auto-merging drivers/mtd/ar7part.c
12966 Auto-merging drivers/mtd/cmdlinepart.c
12967 Auto-merging drivers/mtd/mtdsuper.c
12968 Auto-merging drivers/mtd/nand/cafe_nand.c
12969 Auto-merging drivers/mtd/nand/cmx270_nand.c
12970 Auto-merging drivers/mtd/nand/diskonchip.c
12971 Auto-merging drivers/mtd/nand/nand_bbt.c
12972 Auto-merging drivers/mtd/nand/omap2.c
12973 Auto-merging drivers/mtd/nand/sm_common.c
12974 Auto-merging drivers/mtd/onenand/onenand_bbt.c
12975 Auto-merging drivers/mtd/redboot.c
12976 Auto-merging drivers/net/ethernet/brocade/bna/bnad.c
12977 Auto-merging drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
12978 Auto-merging drivers/net/ethernet/chelsio/cxgb3/l2t.c
12979 Auto-merging drivers/net/ethernet/chelsio/cxgb4/l2t.c
12980 Auto-merging drivers/net/ethernet/chelsio/cxgb4/sge.c
12981 Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
12982 Auto-merging drivers/net/ethernet/ethoc.c
12983 Auto-merging drivers/net/ethernet/freescale/ucc_geth.c
12984 Auto-merging drivers/net/ethernet/intel/e1000e/param.c
12985 Auto-merging drivers/net/ethernet/mellanox/mlx4/alloc.c
12986 Auto-merging drivers/net/ethernet/mellanox/mlx4/catas.c
12987 Auto-merging drivers/net/ethernet/mellanox/mlx4/cmd.c
12988 Auto-merging drivers/net/ethernet/mellanox/mlx4/cq.c
12989 Auto-merging drivers/net/ethernet/mellanox/mlx4/en_tx.c
12990 Auto-merging drivers/net/ethernet/mellanox/mlx4/eq.c
12991 Auto-merging drivers/net/ethernet/mellanox/mlx4/fw.c
12992 Auto-merging drivers/net/ethernet/mellanox/mlx4/intf.c
12993 Auto-merging drivers/net/ethernet/mellanox/mlx4/mcg.c
12994 Auto-merging drivers/net/ethernet/mellanox/mlx4/mr.c
12995 Auto-merging drivers/net/ethernet/mellanox/mlx4/pd.c
12996 Auto-merging drivers/net/ethernet/mellanox/mlx4/port.c
12997 Auto-merging drivers/net/ethernet/mellanox/mlx4/qp.c
12998 Auto-merging drivers/net/ethernet/mellanox/mlx4/srq.c
12999 Auto-merging drivers/net/ethernet/neterion/vxge/vxge-main.c
13000 Auto-merging drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
13001 CONFLICT (content): Merge conflict in drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
13002 Auto-merging drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
13003 Auto-merging drivers/net/ethernet/sfc/rx.c
13004 Auto-merging drivers/net/ethernet/smsc/smsc9420.c
13005 Auto-merging drivers/net/ethernet/xscale/ixp4xx_eth.c
13006 Auto-merging drivers/net/usb/lg-vl600.c
13007 Auto-merging drivers/net/vmxnet3/vmxnet3_drv.c
13008 Auto-merging drivers/net/wimax/i2400m/usb.c
13009 Auto-merging drivers/net/wireless/adm8211.c
13010 Auto-merging drivers/net/wireless/ath/ath5k/debug.c
13011 Auto-merging drivers/net/wireless/ath/ath5k/pci.c
13012 Auto-merging drivers/net/wireless/ath/ath9k/ahb.c
13013 Auto-merging drivers/net/wireless/ath/ath9k/ani.c
13014 Auto-merging drivers/net/wireless/ath/ath9k/ar9002_hw.c
13015 Auto-merging drivers/net/wireless/ath/ath9k/ar9002_mac.c
13016 Auto-merging drivers/net/wireless/ath/ath9k/ar9003_mac.c
13017 Auto-merging drivers/net/wireless/ath/ath9k/ar9003_paprd.c
13018 Auto-merging drivers/net/wireless/ath/ath9k/ar9003_phy.c
13019 Auto-merging drivers/net/wireless/ath/ath9k/calib.c
13020 Auto-merging drivers/net/wireless/ath/ath9k/debug.c
13021 Auto-merging drivers/net/wireless/ath/ath9k/hw.c
13022 Auto-merging drivers/net/wireless/ath/ath9k/init.c
13023 Auto-merging drivers/net/wireless/ath/ath9k/mac.c
13024 Auto-merging drivers/net/wireless/ath/ath9k/pci.c
13025 Auto-merging drivers/net/wireless/ath/ath9k/rc.c
13026 Auto-merging drivers/net/wireless/ath/carl9170/fw.c
13027 Auto-merging drivers/net/wireless/b43/main.c
13028 Auto-merging drivers/net/wireless/b43legacy/main.c
13029 Auto-merging drivers/net/wireless/iwlegacy/iwl-tx.c
13030 Auto-merging drivers/net/wireless/iwlwifi/iwl-pci.c
13031 Auto-merging drivers/net/wireless/libertas/cmd.c
13032 Auto-merging drivers/net/wireless/libertas/if_sdio.c
13033 Auto-merging drivers/net/wireless/libertas/if_spi.c
13034 Auto-merging drivers/net/wireless/libertas/if_usb.c
13035 Auto-merging drivers/net/wireless/libertas/main.c
13036 Auto-merging drivers/net/wireless/libertas/rx.c
13037 Auto-merging drivers/net/wireless/libertas/tx.c
13038 Auto-merging drivers/net/wireless/mac80211_hwsim.c
13039 Auto-merging drivers/net/wireless/p54/eeprom.c
13040 Auto-merging drivers/net/wireless/p54/fwio.c
13041 Auto-merging drivers/net/wireless/p54/main.c
13042 Auto-merging drivers/net/wireless/p54/txrx.c
13043 Auto-merging drivers/net/wireless/rtl818x/rtl8180/dev.c
13044 Auto-merging drivers/net/wireless/rtl818x/rtl8187/dev.c
13045 Auto-merging drivers/net/wireless/rtlwifi/base.c
13046 Auto-merging drivers/net/wireless/rtlwifi/pci.c
13047 Auto-merging drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
13048 Auto-merging drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
13049 Auto-merging drivers/net/wireless/rtlwifi/rtl8192de/sw.c
13050 Auto-merging drivers/net/wireless/rtlwifi/rtl8192se/sw.c
13051 Auto-merging drivers/net/wireless/rtlwifi/usb.c
13052 Auto-merging drivers/net/wireless/wl12xx/boot.c
13053 Auto-merging drivers/parisc/sba_iommu.c
13054 Auto-merging drivers/pci/quirks.c
13055 Auto-merging drivers/power/max17042_battery.c
13056 Auto-merging drivers/power/max8903_charger.c
13057 Auto-merging drivers/power/max8997_charger.c
13058 Auto-merging drivers/power/max8998_charger.c
13059 Auto-merging drivers/power/power_supply_sysfs.c
13060 Auto-merging drivers/regulator/88pm8607.c
13061 Auto-merging drivers/regulator/core.c
13062 Auto-merging drivers/regulator/mc13783-regulator.c
13063 Auto-merging drivers/regulator/tps6586x-regulator.c
13064 Auto-merging drivers/s390/char/vmur.c
13065 Auto-merging drivers/s390/cio/qdio_debug.c
13066 Auto-merging drivers/s390/cio/qdio_setup.c
13067 Auto-merging drivers/s390/scsi/zfcp_dbf.c
13068 Auto-merging drivers/s390/scsi/zfcp_qdio.c
13069 Auto-merging drivers/s390/scsi/zfcp_scsi.c
13070 Auto-merging drivers/scsi/be2iscsi/be_main.c
13071 Auto-merging drivers/scsi/cxgbi/libcxgbi.c
13072 Auto-merging drivers/scsi/device_handler/scsi_dh.c
13073 Auto-merging drivers/scsi/device_handler/scsi_dh_alua.c
13074 Auto-merging drivers/scsi/device_handler/scsi_dh_rdac.c
13075 Auto-merging drivers/scsi/iscsi_tcp.c
13076 Auto-merging drivers/scsi/libfc/fc_exch.c
13077 Auto-merging drivers/scsi/libfc/fc_lport.c
13078 CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
13079 Auto-merging drivers/scsi/libiscsi.c
13080 Auto-merging drivers/scsi/libsas/sas_scsi_host.c
13081 Auto-merging drivers/scsi/lpfc/lpfc_attr.c
13082 Auto-merging drivers/scsi/lpfc/lpfc_init.c
13083 Auto-merging drivers/scsi/lpfc/lpfc_scsi.c
13084 Auto-merging drivers/scsi/megaraid/megaraid_mbox.c
13085 Auto-merging drivers/spi/spi-dw.c
13086 Auto-merging drivers/ssb/main.c
13087 Auto-merging drivers/staging/brcm80211/brcmfmac/bcmsdh.c
13088 Auto-merging drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
13089 Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_linux.c
13090 Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
13091 Auto-merging drivers/staging/brcm80211/brcmsmac/mac80211_if.c
13092 Auto-merging drivers/staging/brcm80211/brcmutil/utils.c
13093 Auto-merging drivers/staging/brcm80211/brcmutil/wifi.c
13094 Auto-merging drivers/staging/cxt1e1/linux.c
13095 Auto-merging drivers/staging/dt3155v4l/dt3155v4l.c
13096 Auto-merging drivers/staging/gma500/psb_drv.c
13097 Auto-merging drivers/staging/iio/accel/adis16201_ring.c
13098 Auto-merging drivers/staging/iio/accel/adis16201_trigger.c
13099 Auto-merging drivers/staging/iio/accel/adis16203_ring.c
13100 Auto-merging drivers/staging/iio/accel/adis16203_trigger.c
13101 Auto-merging drivers/staging/iio/accel/adis16204_ring.c
13102 Auto-merging drivers/staging/iio/accel/adis16204_trigger.c
13103 Auto-merging drivers/staging/iio/accel/adis16209_ring.c
13104 Auto-merging drivers/staging/iio/accel/adis16209_trigger.c
13105 Auto-merging drivers/staging/iio/accel/adis16240_ring.c
13106 Auto-merging drivers/staging/iio/accel/adis16240_trigger.c
13107 Auto-merging drivers/staging/iio/accel/lis3l02dq_ring.c
13108 Auto-merging drivers/staging/iio/adc/ad7152.c
13109 CONFLICT (content): Merge conflict in drivers/staging/iio/adc/ad7152.c
13110 Auto-merging drivers/staging/iio/adc/ad7291.c
13111 CONFLICT (content): Merge conflict in drivers/staging/iio/adc/ad7291.c
13112 CONFLICT (delete/modify): drivers/staging/iio/adc/ad7745.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/staging/iio/adc/ad7745.c left in tree.
13113 Auto-merging drivers/staging/iio/adc/ad7793.c
13114 Auto-merging drivers/staging/iio/dac/ad5686.c
13115 Auto-merging drivers/staging/iio/gyro/adis16060_core.c
13116 Auto-merging drivers/staging/iio/gyro/adis16260_ring.c
13117 Auto-merging drivers/staging/iio/gyro/adis16260_trigger.c
13118 Auto-merging drivers/staging/iio/imu/adis16400_ring.c
13119 Auto-merging drivers/staging/iio/imu/adis16400_trigger.c
13120 CONFLICT (delete/modify): drivers/staging/iio/industrialio-ring.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/staging/iio/industrialio-ring.c left in tree.
13121 Auto-merging drivers/staging/iio/meter/ade7758_ring.c
13122 Auto-merging drivers/staging/iio/meter/ade7758_trigger.c
13123 Auto-merging drivers/staging/intel_sst/intel_sst.c
13124 Auto-merging drivers/staging/winbond/wbusb.c
13125 Auto-merging drivers/staging/wlags49_h2/wl_cs.c
13126 Auto-merging drivers/target/target_core_alua.c
13127 Auto-merging drivers/target/target_core_fabric_lib.c
13128 Auto-merging drivers/target/target_core_file.c
13129 Auto-merging drivers/target/target_core_iblock.c
13130 Auto-merging drivers/target/target_core_pscsi.c
13131 Auto-merging drivers/target/target_core_tmr.c
13132 Auto-merging drivers/target/target_core_tpg.c
13133 Auto-merging drivers/target/target_core_transport.c
13134 Auto-merging drivers/tty/serial/jsm/jsm_driver.c
13135 Auto-merging drivers/tty/serial/max3100.c
13136 Auto-merging drivers/tty/serial/max3107.c
13137 Auto-merging drivers/tty/serial/nwpserial.c
13138 Auto-merging drivers/tty/serial/timbuart.c
13139 Auto-merging drivers/tty/serial/xilinx_uartps.c
13140 Auto-merging drivers/uio/uio_pdrv_genirq.c
13141 Auto-merging drivers/usb/core/driver.c
13142 Auto-merging drivers/usb/gadget/cdc2.c
13143 Auto-merging drivers/usb/gadget/composite.c
13144 Auto-merging drivers/usb/gadget/dbgp.c
13145 Auto-merging drivers/usb/gadget/f_fs.c
13146 Auto-merging drivers/usb/gadget/f_obex.c
13147 Auto-merging drivers/usb/gadget/f_sourcesink.c
13148 Auto-merging drivers/usb/gadget/file_storage.c
13149 Auto-merging drivers/usb/gadget/fusb300_udc.c
13150 Auto-merging drivers/usb/gadget/gmidi.c
13151 Auto-merging drivers/usb/gadget/u_serial.c
13152 Auto-merging drivers/usb/host/isp1760-if.c
13153 Auto-merging drivers/usb/host/xhci-hub.c
13154 Auto-merging drivers/usb/host/xhci-pci.c
13155 Auto-merging drivers/usb/mon/mon_bin.c
13156 Auto-merging drivers/usb/serial/qcserial.c
13157 Auto-merging drivers/usb/storage/transport.c
13158 Auto-merging drivers/usb/wusbcore/wa-hc.c
13159 Auto-merging drivers/video/atmel_lcdfb.c
13160 Auto-merging drivers/video/carminefb.c
13161 Auto-merging drivers/video/mb862xx/mb862xx-i2c.c
13162 Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
13163 Auto-merging drivers/video/msm/mdp.c
13164 Auto-merging drivers/video/omap2/dss/dispc.c
13165 Auto-merging drivers/video/omap2/dss/dpi.c
13166 Auto-merging drivers/video/omap2/dss/dsi.c
13167 Auto-merging drivers/video/omap2/dss/dss.c
13168 Auto-merging drivers/video/omap2/dss/rfbi.c
13169 Auto-merging drivers/video/omap2/dss/sdi.c
13170 Auto-merging drivers/video/sh_mobile_lcdcfb.c
13171 Auto-merging drivers/xen/balloon.c
13172 Auto-merging drivers/xen/swiotlb-xen.c
13173 Auto-merging drivers/xen/xen-pciback/conf_space.c
13174 Auto-merging drivers/xen/xenbus/xenbus_probe.c
13175 Auto-merging drivers/xen/xenbus/xenbus_probe_backend.c
13176 Auto-merging drivers/xen/xenbus/xenbus_probe_frontend.c
13177 Auto-merging fs/cifs/connect.c
13178 Auto-merging fs/exofs/ore.c
13179 Auto-merging fs/exofs/super.c
13180 Auto-merging fs/gfs2/ops_fstype.c
13181 Auto-merging fs/logfs/super.c
13182 Auto-merging fs/nfs/nfs4filelayout.c
13183 Auto-merging fs/nfs/write.c
13184 Auto-merging fs/nfsd/nfsctl.c
13185 Auto-merging fs/ocfs2/cluster/tcp.c
13186 Auto-merging include/linux/bcma/bcma.h
13187 Auto-merging include/linux/blkdev.h
13188 Auto-merging include/linux/device.h
13189 Auto-merging include/linux/dmaengine.h
13190 CONFLICT (content): Merge conflict in include/linux/dmaengine.h
13191 Auto-merging include/linux/hid.h
13192 Auto-merging include/linux/irq.h
13193 Auto-merging include/linux/irqdesc.h
13194 Auto-merging include/linux/mtd/mtd.h
13195 Auto-merging include/linux/pm_runtime.h
13196 Auto-merging include/linux/regmap.h
13197 Auto-merging include/linux/regulator/driver.h
13198 Auto-merging include/linux/serio.h
13199 Auto-merging include/linux/ssb/ssb.h
13200 Auto-merging include/linux/usb.h
13201 Auto-merging include/media/saa7146.h
13202 Auto-merging include/net/bluetooth/hci_core.h
13203 Auto-merging include/net/lib80211.h
13204 Auto-merging include/net/sock.h
13205 Auto-merging kernel/async.c
13206 Auto-merging kernel/crash_dump.c
13207 Auto-merging kernel/cred.c
13208 Auto-merging kernel/events/core.c
13209 Auto-merging kernel/fork.c
13210 Auto-merging kernel/futex.c
13211 Auto-merging kernel/irq/irqdesc.c
13212 Auto-merging kernel/irq_work.c
13213 Auto-merging kernel/kprobes.c
13214 Auto-merging kernel/latencytop.c
13215 Auto-merging kernel/lockdep.c
13216 Auto-merging kernel/pid.c
13217 Auto-merging kernel/power/hibernate.c
13218 Auto-merging kernel/power/main.c
13219 Auto-merging kernel/power/qos.c
13220 Auto-merging kernel/power/suspend.c
13221 Auto-merging kernel/ptrace.c
13222 Auto-merging kernel/rcupdate.c
13223 Auto-merging kernel/rcutiny.c
13224 Auto-merging kernel/rcutorture.c
13225 Auto-merging kernel/rcutree.c
13226 Auto-merging kernel/rcutree_trace.c
13227 Auto-merging kernel/resource.c
13228 Auto-merging kernel/rtmutex-debug.c
13229 Auto-merging kernel/rtmutex.c
13230 Auto-merging kernel/sched.c
13231 Auto-merging kernel/semaphore.c
13232 Auto-merging kernel/signal.c
13233 Auto-merging kernel/sys.c
13234 Auto-merging kernel/time.c
13235 Auto-merging kernel/watchdog.c
13236 Auto-merging kernel/workqueue.c
13237 Auto-merging lib/dma-debug.c
13238 Auto-merging mm/memcontrol.c
13239 Auto-merging mm/swapfile.c
13240 Auto-merging net/802/garp.c
13241 Auto-merging net/802/stp.c
13242 Auto-merging net/bluetooth/hci_sysfs.c
13243 Auto-merging net/bluetooth/mgmt.c
13244 Auto-merging net/caif/caif_dev.c
13245 Auto-merging net/ceph/messenger.c
13246 Auto-merging net/core/dev_addr_lists.c
13247 Auto-merging net/core/fib_rules.c
13248 Auto-merging net/core/net-sysfs.c
13249 Auto-merging net/core/netpoll.c
13250 Auto-merging net/core/user_dma.c
13251 Auto-merging net/ipv4/fib_trie.c
13252 Auto-merging net/ipv4/ipmr.c
13253 Auto-merging net/ipv4/proc.c
13254 Auto-merging net/ipv6/addrconf.c
13255 Auto-merging net/ipv6/exthdrs.c
13256 Auto-merging net/ipv6/ip6_flowlabel.c
13257 Auto-merging net/ipv6/ip6mr.c
13258 Auto-merging net/ipv6/raw.c
13259 Auto-merging net/ipv6/route.c
13260 Auto-merging net/irda/qos.c
13261 Auto-merging net/mac80211/agg-rx.c
13262 Auto-merging net/mac80211/agg-tx.c
13263 Auto-merging net/mac80211/ht.c
13264 Auto-merging net/mac80211/key.c
13265 Auto-merging net/mac80211/mlme.c
13266 Auto-merging net/mac80211/rate.c
13267 Auto-merging net/mac80211/rx.c
13268 Auto-merging net/mac80211/scan.c
13269 Auto-merging net/mac80211/status.c
13270 Auto-merging net/mac80211/tx.c
13271 Auto-merging net/mac80211/util.c
13272 Auto-merging net/netfilter/nf_conntrack_ecache.c
13273 Auto-merging net/netfilter/x_tables.c
13274 Auto-merging net/nfc/rawsock.c
13275 Auto-merging net/phonet/socket.c
13276 Auto-merging net/sunrpc/svc_xprt.c
13277 Auto-merging net/sunrpc/svcsock.c
13278 Auto-merging net/tipc/socket.c
13279 Auto-merging net/wireless/mesh.c
13280 Auto-merging net/wireless/reg.c
13281 Auto-merging net/wireless/sme.c
13282 Auto-merging net/wireless/util.c
13283 Auto-merging net/wireless/wext-compat.c
13284 Auto-merging net/wireless/wext-sme.c
13285 Auto-merging security/selinux/hooks.c
13286 Auto-merging security/selinux/netlink.c
13287 Auto-merging sound/arm/pxa2xx-ac97-lib.c
13288 Auto-merging sound/core/control.c
13289 Auto-merging sound/core/oss/mixer_oss.c
13290 Auto-merging sound/core/pcm_lib.c
13291 Auto-merging sound/core/pcm_native.c
13292 Auto-merging sound/drivers/aloop.c
13293 Auto-merging sound/drivers/ml403-ac97cr.c
13294 Auto-merging sound/drivers/mpu401/mpu401.c
13295 Auto-merging sound/drivers/mpu401/mpu401_uart.c
13296 Auto-merging sound/drivers/mtpav.c
13297 Auto-merging sound/drivers/serial-u16550.c
13298 Auto-merging sound/isa/ad1816a/ad1816a.c
13299 Auto-merging sound/isa/als100.c
13300 Auto-merging sound/isa/azt2320.c
13301 Auto-merging sound/isa/cmi8330.c
13302 Auto-merging sound/isa/cs423x/cs4231.c
13303 Auto-merging sound/isa/cs423x/cs4236.c
13304 Auto-merging sound/isa/es1688/es1688.c
13305 Auto-merging sound/isa/es1688/es1688_lib.c
13306 Auto-merging sound/isa/es18xx.c
13307 Auto-merging sound/isa/gus/gus_main.c
13308 Auto-merging sound/isa/gus/gusextreme.c
13309 Auto-merging sound/isa/gus/gusmax.c
13310 Auto-merging sound/isa/gus/interwave.c
13311 Auto-merging sound/isa/opl3sa2.c
13312 Auto-merging sound/isa/opti9xx/miro.c
13313 Auto-merging sound/isa/opti9xx/opti92x-ad1848.c
13314 Auto-merging sound/isa/sb/sb16.c
13315 Auto-merging sound/isa/sb/sb_common.c
13316 Auto-merging sound/isa/sscape.c
13317 Auto-merging sound/isa/wavefront/wavefront.c
13318 Auto-merging sound/isa/wss/wss_lib.c
13319 Auto-merging sound/mips/au1x00.c
13320 Auto-merging sound/pci/als4000.c
13321 Auto-merging sound/pci/azt3328.c
13322 Auto-merging sound/pci/cmipci.c
13323 Auto-merging sound/pci/es1938.c
13324 Auto-merging sound/pci/es1968.c
13325 Auto-merging sound/pci/fm801.c
13326 Auto-merging sound/pci/hda/hda_codec.c
13327 Auto-merging sound/pci/hda/hda_hwdep.c
13328 Auto-merging sound/pci/hda/patch_analog.c
13329 Auto-merging sound/pci/hda/patch_cirrus.c
13330 Auto-merging sound/pci/hda/patch_conexant.c
13331 Auto-merging sound/pci/hda/patch_hdmi.c
13332 Auto-merging sound/pci/hda/patch_realtek.c
13333 Auto-merging sound/pci/hda/patch_sigmatel.c
13334 Auto-merging sound/pci/hda/patch_via.c
13335 Auto-merging sound/pci/ice1712/ice1712.c
13336 Auto-merging sound/pci/maestro3.c
13337 Auto-merging sound/pci/oxygeRecorded preimage for 'drivers/mfd/twl6030-irq.c'
13338 Resolved 'arch/arm/mach-bcmring/mm.c' using previous resolution.
13339 Resolved 'drivers/media/dvb/frontends/dibx000_common.c' using previous resolution.
13340 Resolved 'drivers/misc/altera-stapl/altera.c' using previous resolution.
13341 Resolved 'drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c' using previous resolution.
13342 Resolved 'drivers/scsi/libfc/fc_lport.c' using previous resolution.
13343 Resolved 'drivers/staging/iio/adc/ad7152.c' using previous resolution.
13344 Resolved 'drivers/staging/iio/adc/ad7291.c' using previous resolution.
13345 Resolved 'include/linux/dmaengine.h' using previous resolution.
13346 Resolved 'sound/soc/soc-io.c' using previous resolution.
13347 n/oxygen_lib.c
13348 Auto-merging sound/pci/riptide/riptide.c
13349 Auto-merging sound/pci/rme9652/hdspm.c
13350 Auto-merging sound/pci/sis7019.c
13351 Auto-merging sound/pci/sonicvibes.c
13352 Auto-merging sound/pci/trident/trident.c
13353 Auto-merging sound/pci/via82xx.c
13354 Auto-merging sound/pci/ymfpci/ymfpci.c
13355 Auto-merging sound/pci/ymfpci/ymfpci_main.c
13356 Auto-merging sound/ppc/snd_ps3.c
13357 Auto-merging sound/soc/codecs/sn95031.c
13358 Auto-merging sound/soc/codecs/wl1273.c
13359 Auto-merging sound/soc/ep93xx/edb93xx.c
13360 Auto-merging sound/soc/ep93xx/snappercl15.c
13361 Auto-merging sound/soc/mid-x86/mfld_machine.c
13362 Auto-merging sound/soc/mid-x86/sst_platform.c
13363 Auto-merging sound/soc/omap/am3517evm.c
13364 Auto-merging sound/soc/omap/igep0020.c
13365 Auto-merging sound/soc/omap/n810.c
13366 Auto-merging sound/soc/omap/omap-pcm.c
13367 Auto-merging sound/soc/omap/omap3evm.c
13368 Auto-merging sound/soc/omap/omap3pandora.c
13369 Auto-merging sound/soc/omap/osk5912.c
13370 Auto-merging sound/soc/omap/overo.c
13371 Auto-merging sound/soc/omap/rx51.c
13372 Auto-merging sound/soc/omap/sdp3430.c
13373 Auto-merging sound/soc/omap/sdp4430.c
13374 Auto-merging sound/soc/omap/zoom2.c
13375 Auto-merging sound/soc/samsung/ac97.c
13376 Auto-merging sound/soc/samsung/dma.c
13377 Auto-merging sound/soc/samsung/i2s.c
13378 Auto-merging sound/soc/samsung/jive_wm8750.c
13379 Auto-merging sound/soc/samsung/pcm.c
13380 Auto-merging sound/soc/samsung/s3c2412-i2s.c
13381 Auto-merging sound/soc/samsung/s3c24xx-i2s.c
13382 Auto-merging sound/soc/samsung/s3c24xx_simtec.c
13383 Auto-merging sound/soc/samsung/s3c24xx_uda134x.c
13384 Auto-merging sound/soc/samsung/smartq_wm8987.c
13385 Auto-merging sound/soc/samsung/smdk_wm8580.c
13386 Auto-merging sound/soc/samsung/smdk_wm8580pcm.c
13387 Auto-merging sound/soc/samsung/spdif.c
13388 Auto-merging sound/soc/samsung/speyside.c
13389 Auto-merging sound/soc/samsung/speyside_wm8962.c
13390 Auto-merging sound/soc/sh/fsi.c
13391 Auto-merging sound/soc/soc-cache.c
13392 Auto-merging sound/soc/soc-io.c
13393 CONFLICT (content): Merge conflict in sound/soc/soc-io.c
13394 Auto-merging sound/soc/soc-jack.c
13395 Auto-merging sound/usb/6fire/firmware.c
13396 Auto-merging sound/usb/card.c
13397 Auto-merging sound/usb/midi.c
13398 Auto-merging virt/kvm/iommu.c
13399 Automatic merge failed; fix conflicts and then commit the result.
13400 $ git rm -f drivers/staging/iio/adc/ad7745.c drivers/staging/iio/industrialio-ring.c
13401 arch/arm/mach-bcmring/mm.c: needs merge
13402 drivers/media/dvb/frontends/dibx000_common.c: needs merge
13403 drivers/mfd/twl6030-irq.c: needs merge
13404 drivers/misc/altera-stapl/altera.c: needs merge
13405 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c: needs merge
13406 drivers/scsi/libfc/fc_lport.c: needs merge
13407 drivers/staging/iio/adc/ad7152.c: needs merge
13408 drivers/staging/iio/adc/ad7291.c: needs merge
13409 drivers/staging/iio/adc/ad7745.c: needs merge
13410 drivers/staging/iio/industrialio-ring.c: needs merge
13411 include/linux/dmaengine.h: needs merge
13412 sound/soc/soc-io.c: needs merge
13413 rm 'drivers/staging/iio/adc/ad7745.c'
13414 rm 'drivers/staging/iio/industrialio-ring.c'
13415 $ git commit -v -a
13416 Recorded resolution for 'drivers/mfd/twl6030-irq.c'.
13417 [master 2f83ca8] Merge remote-tracking branch 'moduleh/for-sfr'
13418 $ git diff -M --stat --summary HEAD^..
13419  arch/alpha/kernel/core_irongate.c                  |    1 +
13420  arch/alpha/kernel/pci-sysfs.c                      |    1 +
13421  arch/alpha/kernel/pci_iommu.c                      |    1 +
13422  arch/alpha/kernel/setup.c                          |    1 +
13423  arch/arm/common/it8152.c                           |    1 +
13424  arch/arm/common/scoop.c                            |    1 +
13425  arch/arm/kernel/armksyms.c                         |    2 +-
13426  arch/arm/kernel/bios32.c                           |    2 +-
13427  arch/arm/kernel/devtree.c                          |    2 +-
13428  arch/arm/kernel/elf.c                              |    2 +-
13429  arch/arm/kernel/etm.c                              |    1 +
13430  arch/arm/kernel/io.c                               |    2 +-
13431  arch/arm/kernel/irq.c                              |    1 -
13432  arch/arm/kernel/leds.c                             |    3 +-
13433  arch/arm/kernel/perf_event.c                       |    2 +-
13434  arch/arm/kernel/pj4-cp0.c                          |    1 -
13435  arch/arm/kernel/process.c                          |    2 +-
13436  arch/arm/kernel/ptrace.c                           |    1 +
13437  arch/arm/kernel/return_address.c                   |    2 +-
13438  arch/arm/kernel/setup.c                            |    2 +-
13439  arch/arm/kernel/stacktrace.c                       |    2 +-
13440  arch/arm/kernel/sys_arm.c                          |    2 +-
13441  arch/arm/kernel/time.c                             |    2 +-
13442  arch/arm/kernel/unwind.c                           |    2 +-
13443  arch/arm/kernel/xscale-cp0.c                       |    1 -
13444  arch/arm/mach-at91/cpuidle.c                       |    1 +
13445  arch/arm/mach-bcmring/dma.c                        |    1 +
13446  arch/arm/mach-bcmring/mm.c                         |    1 +
13447  arch/arm/mach-davinci/board-dm644x-evm.c           |    1 +
13448  arch/arm/mach-davinci/board-dm646x-evm.c           |    1 +
13449  arch/arm/mach-davinci/cdce949.c                    |    1 +
13450  arch/arm/mach-davinci/cpufreq.c                    |    1 +
13451  arch/arm/mach-davinci/cpuidle.c                    |    1 +
13452  arch/arm/mach-ep93xx/core.c                        |    1 +
13453  arch/arm/mach-exynos4/dev-sysmmu.c                 |    1 +
13454  arch/arm/mach-imx/mach-mx31lilly.c                 |    1 +
13455  arch/arm/mach-imx/mach-mx31lite.c                  |    1 +
13456  arch/arm/mach-imx/mach-mx31moboard.c               |    1 +
13457  arch/arm/mach-iop13xx/pci.c                        |    1 +
13458  arch/arm/mach-ixp2000/core.c                       |    1 +
13459  arch/arm/mach-ixp4xx/common-pci.c                  |    1 +
13460  arch/arm/mach-ixp4xx/common.c                      |    1 +
13461  arch/arm/mach-kirkwood/cpuidle.c                   |    1 +
13462  arch/arm/mach-msm/io.c                             |    1 +
13463  arch/arm/mach-netx/xc.c                            |    1 +
13464  arch/arm/mach-omap1/board-ams-delta.c              |    1 +
13465  arch/arm/mach-omap1/board-sx1.c                    |    1 +
13466  arch/arm/mach-omap1/board-voiceblue.c              |    1 +
13467  arch/arm/mach-omap1/mailbox.c                      |    1 +
13468  arch/arm/mach-omap2/board-omap3evm.c               |    1 +
13469  arch/arm/mach-omap2/clockdomain.c                  |    1 +
13470  arch/arm/mach-omap2/display.c                      |    1 +
13471  arch/arm/mach-omap2/gpmc-onenand.c                 |    1 +
13472  arch/arm/mach-omap2/pm.c                           |    1 +
13473  arch/arm/mach-omap2/prcm.c                         |    1 +
13474  arch/arm/mach-omap2/usb-tusb6010.c                 |    2 +
13475  arch/arm/mach-omap2/voltage.c                      |    1 +
13476  arch/arm/mach-pxa/colibri-pxa270.c                 |    1 +
13477  arch/arm/mach-pxa/corgi.c                          |    1 +
13478  arch/arm/mach-pxa/poodle.c                         |    1 +
13479  arch/arm/mach-pxa/spitz.c                          |    1 +
13480  arch/arm/mach-pxa/trizeps4.c                       |    1 +
13481  arch/arm/mach-s3c2410/mach-h1940.c                 |    1 +
13482  arch/arm/mach-s3c64xx/dev-audio.c                  |    1 +
13483  arch/arm/mach-sa1100/collie.c                      |    1 +
13484  arch/arm/mach-sa1100/jornada720.c                  |    1 +
13485  arch/arm/mach-shmobile/clock.c                     |    1 +
13486  arch/arm/mach-tegra/pcie.c                         |    1 +
13487  arch/arm/mm/fault-armv.c                           |    1 -
13488  arch/arm/mm/init.c                                 |    1 +
13489  arch/arm/plat-iop/gpio.c                           |    1 +
13490  arch/arm/plat-iop/time.c                           |    1 +
13491  arch/arm/plat-omap/clock.c                         |    1 +
13492  arch/arm/plat-omap/mailbox.c                       |    1 +
13493  arch/arm/plat-s3c24xx/devs.c                       |    1 +
13494  arch/arm/plat-s5p/dev-ehci.c                       |    1 +
13495  arch/arm/plat-s5p/dev-onenand.c                    |    2 +
13496  arch/arm/plat-samsung/dev-adc.c                    |    2 +
13497  arch/arm/plat-samsung/dev-asocdma.c                |    1 +
13498  arch/arm/plat-samsung/dev-backlight.c              |    1 +
13499  arch/arm/plat-samsung/dev-ide.c                    |    2 +
13500  arch/arm/plat-samsung/dev-nand.c                   |    1 +
13501  arch/arm/plat-samsung/dev-pwm.c                    |    1 +
13502  arch/arm/plat-samsung/dev-rtc.c                    |    1 +
13503  arch/arm/plat-samsung/dev-ts.c                     |    2 +
13504  arch/arm/plat-samsung/dev-usb.c                    |    1 +
13505  arch/arm/plat-samsung/dev-wdt.c                    |    3 +
13506  arch/arm/plat-samsung/platformdata.c               |    1 +
13507  arch/arm/vfp/vfpmodule.c                           |    1 -
13508  arch/avr32/mach-at32ap/clock.c                     |    1 +
13509  arch/avr32/mach-at32ap/cpufreq.c                   |    1 +
13510  arch/avr32/mach-at32ap/intc.c                      |    1 +
13511  arch/avr32/mach-at32ap/pio.c                       |    1 +
13512  arch/avr32/mm/dma-coherent.c                       |    1 +
13513  arch/blackfin/kernel/dma-mapping.c                 |    1 +
13514  arch/blackfin/kernel/perf_event.c                  |    1 +
13515  arch/blackfin/kernel/sys_bfin.c                    |    1 +
13516  arch/blackfin/mach-bf518/boards/ezbrd.c            |    1 +
13517  arch/blackfin/mach-bf527/boards/ad7160eval.c       |    1 +
13518  arch/blackfin/mach-bf527/boards/cm_bf527.c         |    1 +
13519  arch/blackfin/mach-bf527/boards/ezbrd.c            |    1 +
13520  arch/blackfin/mach-bf527/boards/ezkit.c            |    1 +
13521  arch/blackfin/mach-bf527/boards/tll6527m.c         |    1 +
13522  arch/blackfin/mach-bf537/boards/cm_bf537e.c        |    1 +
13523  arch/blackfin/mach-bf537/boards/cm_bf537u.c        |    1 +
13524  arch/blackfin/mach-bf537/boards/dnp5370.c          |    1 +
13525  arch/blackfin/mach-bf537/boards/pnav10.c           |    1 +
13526  arch/blackfin/mach-bf537/boards/stamp.c            |    1 +
13527  arch/blackfin/mach-bf537/boards/tcm_bf537.c        |    1 +
13528  arch/blackfin/mach-common/cpufreq.c                |    1 +
13529  arch/blackfin/mm/init.c                            |    1 +
13530  arch/ia64/hp/common/hwsw_iommu.c                   |    1 +
13531  arch/ia64/kernel/dma-mapping.c                     |    1 +
13532  arch/ia64/kernel/topology.c                        |    1 +
13533  arch/ia64/pci/pci.c                                |    1 +
13534  arch/ia64/sn/kernel/io_acpi_init.c                 |    1 +
13535  arch/ia64/sn/kernel/io_init.c                      |    1 +
13536  arch/ia64/sn/pci/pcibr/pcibr_dma.c                 |    1 +
13537  arch/ia64/sn/pci/pcibr/pcibr_provider.c            |    1 +
13538  arch/ia64/sn/pci/tioca_provider.c                  |    1 +
13539  arch/ia64/xen/hypervisor.c                         |    1 +
13540  arch/m68k/atari/time.c                             |    1 +
13541  arch/m68k/kernel/dma_mm.c                          |    1 +
13542  arch/m68k/kernel/dma_no.c                          |    1 +
13543  arch/microblaze/kernel/dma.c                       |    1 +
13544  arch/microblaze/kernel/irq.c                       |    1 +
13545  arch/microblaze/mm/init.c                          |    1 +
13546  arch/microblaze/pci/iomap.c                        |    1 +
13547  arch/microblaze/pci/pci-common.c                   |    1 +
13548  arch/mips/bcm47xx/gpio.c                           |    1 +
13549  arch/mips/bcm47xx/setup.c                          |    1 +
13550  arch/mips/cavium-octeon/csrc-octeon.c              |    1 +
13551  arch/mips/cavium-octeon/dma-octeon.c               |    1 +
13552  arch/mips/cavium-octeon/flash_setup.c              |    1 +
13553  arch/mips/kernel/8250-platform.c                   |    1 -
13554  arch/mips/kernel/cpu-probe.c                       |    3 +-
13555  arch/mips/kernel/i8253.c                           |    2 +-
13556  arch/mips/kernel/init_task.c                       |    2 +-
13557  arch/mips/kernel/irq-msc01.c                       |    1 -
13558  arch/mips/kernel/irq.c                             |    1 -
13559  arch/mips/kernel/mips-mt.c                         |    2 +-
13560  arch/mips/kernel/mips_ksyms.c                      |    2 +-
13561  arch/mips/kernel/module.c                          |    1 -
13562  arch/mips/kernel/process.c                         |    2 +-
13563  arch/mips/kernel/prom.c                            |    2 +-
13564  arch/mips/kernel/reset.c                           |    2 +-
13565  arch/mips/kernel/rtlx.c                            |    1 -
13566  arch/mips/kernel/setup.c                           |    2 +-
13567  arch/mips/kernel/spinlock_test.c                   |    2 +-
13568  arch/mips/kernel/stacktrace.c                      |    2 +-
13569  arch/mips/kernel/time.c                            |    2 +-
13570  arch/mips/kernel/traps.c                           |    1 -
13571  arch/mips/kernel/unaligned.c                       |    1 -
13572  arch/mips/kernel/vpe.c                             |    1 -
13573  arch/mips/loongson/common/platform.c               |    1 +
13574  arch/mips/pci/pci-ip27.c                           |    1 +
13575  arch/mips/pci/pci.c                                |    1 +
13576  arch/mips/powertv/pci/fixup-powertv.c              |    1 +
13577  arch/mips/powertv/powertv-usb.c                    |    1 +
13578  arch/mips/rb532/gpio.c                             |    1 +
13579  arch/mips/rb532/setup.c                            |    1 +
13580  arch/mips/txx9/generic/spi_eeprom.c                |    1 +
13581  arch/mips/txx9/rbtx4939/setup.c                    |    1 +
13582  arch/mips/vr41xx/common/giu.c                      |    1 +
13583  arch/mips/vr41xx/common/rtc.c                      |    1 +
13584  arch/parisc/kernel/drivers.c                       |    1 +
13585  arch/parisc/kernel/pci-dma.c                       |    1 +
13586  arch/parisc/kernel/setup.c                         |    1 +
13587  arch/parisc/lib/iomap.c                            |    1 +
13588  arch/powerpc/include/asm/lv1call.h                 |    1 +
13589  arch/powerpc/include/asm/machdep.h                 |    1 +
13590  arch/powerpc/include/asm/spu.h                     |    1 +
13591  arch/powerpc/kernel/btext.c                        |    2 +-
13592  arch/powerpc/kernel/clock.c                        |    2 +-
13593  arch/powerpc/kernel/cputable.c                     |    2 +-
13594  arch/powerpc/kernel/crash.c                        |    1 +
13595  arch/powerpc/kernel/dma-iommu.c                    |    1 +
13596  arch/powerpc/kernel/dma.c                          |    1 +
13597  arch/powerpc/kernel/firmware.c                     |    3 +-
13598  arch/powerpc/kernel/hw_breakpoint.c                |    1 -
13599  arch/powerpc/kernel/ibmebus.c                      |    2 +
13600  arch/powerpc/kernel/init_task.c                    |    2 +-
13601  arch/powerpc/kernel/io-workarounds.c               |    1 +
13602  arch/powerpc/kernel/io.c                           |    2 +-
13603  arch/powerpc/kernel/iomap.c                        |    1 +
13604  arch/powerpc/kernel/irq.c                          |    2 +-
13605  arch/powerpc/kernel/isa-bridge.c                   |    1 +
13606  arch/powerpc/kernel/kvm.c                          |    1 +
13607  arch/powerpc/kernel/module.c                       |    1 -
13608  arch/powerpc/kernel/of_platform.c                  |    2 +-
13609  arch/powerpc/kernel/paca.c                         |    2 +-
13610  arch/powerpc/kernel/pci-common.c                   |    1 +
13611  arch/powerpc/kernel/pci_32.c                       |    1 +
13612  arch/powerpc/kernel/pci_64.c                       |    1 +
13613  arch/powerpc/kernel/pci_dn.c                       |    1 +
13614  arch/powerpc/kernel/pci_of_scan.c                  |    1 +
13615  arch/powerpc/kernel/pmc.c                          |    2 +-
13616  arch/powerpc/kernel/ppc_ksyms.c                    |    2 +-
13617  arch/powerpc/kernel/process.c                      |    2 +-
13618  arch/powerpc/kernel/prom.c                         |    2 +-
13619  arch/powerpc/kernel/prom_parse.c                   |    1 -
13620  arch/powerpc/kernel/ptrace.c                       |    1 -
13621  arch/powerpc/kernel/rtas.c                         |    2 +-
13622  arch/powerpc/kernel/setup-common.c                 |    2 +-
13623  arch/powerpc/kernel/setup_64.c                     |    2 +-
13624  arch/powerpc/kernel/signal_64.c                    |    1 -
13625  arch/powerpc/kernel/smp.c                          |    2 +-
13626  arch/powerpc/kernel/stacktrace.c                   |    2 +-
13627  arch/powerpc/kernel/swsusp_64.c                    |    1 +
13628  arch/powerpc/kernel/sysfs.c                        |    2 +-
13629  arch/powerpc/kernel/time.c                         |    2 +-
13630  arch/powerpc/kernel/vdso.c                         |    1 -
13631  arch/powerpc/kernel/vio.c                          |    3 +-
13632  arch/powerpc/kvm/44x.c                             |    1 +
13633  arch/powerpc/kvm/book3s.c                          |    1 +
13634  arch/powerpc/kvm/book3s_exports.c                  |    2 +-
13635  arch/powerpc/kvm/book3s_hv.c                       |    1 +
13636  arch/powerpc/kvm/book3s_hv_builtin.c               |    1 +
13637  arch/powerpc/kvm/book3s_pr.c                       |    1 +
13638  arch/powerpc/kvm/powerpc.c                         |    1 -
13639  arch/powerpc/lib/checksum_wrappers_64.c            |    2 +-
13640  arch/powerpc/lib/devres.c                          |    2 +-
13641  arch/powerpc/lib/locks.c                           |    2 +-
13642  arch/powerpc/lib/rheap.c                           |    2 +-
13643  arch/powerpc/mm/dma-noncoherent.c                  |    1 +
13644  arch/powerpc/mm/hash_utils_64.c                    |    1 +
13645  arch/powerpc/mm/mem.c                              |    2 +-
13646  arch/powerpc/mm/mmu_context_hash32.c               |    1 +
13647  arch/powerpc/mm/mmu_context_hash64.c               |    2 +-
13648  arch/powerpc/mm/numa.c                             |    2 +-
13649  arch/powerpc/mm/pgtable_64.c                       |    1 +
13650  arch/powerpc/mm/slice.c                            |    2 +-
13651  arch/powerpc/mm/tlb_hash32.c                       |    1 +
13652  arch/powerpc/mm/tlb_nohash.c                       |    1 +
13653  arch/powerpc/platforms/44x/warp.c                  |    1 +
13654  arch/powerpc/platforms/512x/clock.c                |    1 +
13655  arch/powerpc/platforms/52xx/mpc52xx_common.c       |    1 +
13656  arch/powerpc/platforms/52xx/mpc52xx_gpt.c          |    1 +
13657  arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c      |    1 +
13658  arch/powerpc/platforms/83xx/suspend.c              |    1 +
13659  arch/powerpc/platforms/85xx/mpc85xx_cds.c          |    1 -
13660  arch/powerpc/platforms/85xx/mpc85xx_mds.c          |    1 -
13661  arch/powerpc/platforms/85xx/sbc8548.c              |    1 -
13662  arch/powerpc/platforms/86xx/gef_gpio.c             |    1 +
13663  arch/powerpc/platforms/8xx/tqm8xx_setup.c          |    1 -
13664  arch/powerpc/platforms/cell/axon_msi.c             |    1 +
13665  arch/powerpc/platforms/cell/beat.c                 |    2 +-
13666  arch/powerpc/platforms/cell/beat_spu_priv1.c       |    2 -
13667  arch/powerpc/platforms/cell/beat_wrapper.h         |    1 +
13668  arch/powerpc/platforms/cell/cbe_cpufreq.c          |    1 +
13669  arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c      |    1 +
13670  arch/powerpc/platforms/cell/cbe_powerbutton.c      |    1 +
13671  arch/powerpc/platforms/cell/cbe_regs.c             |    2 +-
13672  arch/powerpc/platforms/cell/celleb_setup.c         |    1 +
13673  arch/powerpc/platforms/cell/cpufreq_spudemand.c    |    1 +
13674  arch/powerpc/platforms/cell/interrupt.c            |    2 +-
13675  arch/powerpc/platforms/cell/pmu.c                  |    1 +
13676  arch/powerpc/platforms/cell/qpace_setup.c          |    1 +
13677  arch/powerpc/platforms/cell/setup.c                |    1 +
13678  arch/powerpc/platforms/cell/smp.c                  |    1 -
13679  arch/powerpc/platforms/cell/spu_callbacks.c        |    2 +-
13680  arch/powerpc/platforms/cell/spu_fault.c            |    2 +-
13681  arch/powerpc/platforms/cell/spu_manage.c           |    2 +-
13682  arch/powerpc/platforms/cell/spu_notify.c           |    3 +-
13683  arch/powerpc/platforms/cell/spu_priv1_mmio.c       |    1 -
13684  arch/powerpc/platforms/cell/spufs/backing_ops.c    |    1 -
13685  arch/powerpc/platforms/cell/spufs/context.c        |    2 +-
13686  arch/powerpc/platforms/cell/spufs/coredump.c       |    1 -
13687  arch/powerpc/platforms/cell/spufs/fault.c          |    1 -
13688  arch/powerpc/platforms/cell/spufs/file.c           |    2 +-
13689  arch/powerpc/platforms/cell/spufs/hw_ops.c         |    1 -
13690  arch/powerpc/platforms/cell/spufs/sched.c          |    1 -
13691  arch/powerpc/platforms/cell/spufs/switch.c         |    2 +-
13692  arch/powerpc/platforms/cell/spufs/syscalls.c       |    2 +-
13693  arch/powerpc/platforms/embedded6xx/holly.c         |    1 +
13694  arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c  |    1 +
13695  arch/powerpc/platforms/iseries/hvlpconfig.c        |    2 +-
13696  arch/powerpc/platforms/iseries/iommu.c             |    2 +-
13697  arch/powerpc/platforms/iseries/ksyms.c             |    2 +-
13698  arch/powerpc/platforms/iseries/lpardata.c          |    1 -
13699  arch/powerpc/platforms/iseries/lpevents.c          |    2 +-
13700  arch/powerpc/platforms/iseries/mf.c                |    1 +
13701  arch/powerpc/platforms/iseries/pci.c               |    1 -
13702  arch/powerpc/platforms/iseries/setup.c             |    1 +
13703  arch/powerpc/platforms/iseries/smp.c               |    1 -
13704  arch/powerpc/platforms/iseries/vio.c               |    2 +-
13705  arch/powerpc/platforms/iseries/viopath.c           |    2 +-
13706  arch/powerpc/platforms/maple/setup.c               |    1 +
13707  arch/powerpc/platforms/pasemi/cpufreq.c            |    1 +
13708  arch/powerpc/platforms/pasemi/dma_lib.c            |    3 +-
13709  arch/powerpc/platforms/pasemi/setup.c              |    1 +
13710  arch/powerpc/platforms/powermac/backlight.c        |    1 +
13711  arch/powerpc/platforms/powermac/feature.c          |    1 +
13712  arch/powerpc/platforms/powermac/low_i2c.c          |    2 +-
13713  arch/powerpc/platforms/powermac/nvram.c            |    2 +-
13714  arch/powerpc/platforms/powermac/pic.c              |    1 -
13715  arch/powerpc/platforms/powermac/setup.c            |    1 +
13716  arch/powerpc/platforms/ps3/exports.c               |    2 -
13717  arch/powerpc/platforms/ps3/interrupt.c             |    2 +-
13718  arch/powerpc/platforms/ps3/mm.c                    |    2 +-
13719  arch/powerpc/platforms/ps3/os-area.c               |    1 +
13720  arch/powerpc/platforms/ps3/setup.c                 |    1 +
13721  arch/powerpc/platforms/ps3/spu.c                   |    1 +
13722  arch/powerpc/platforms/ps3/system-bus.c            |    2 +-
13723  arch/powerpc/platforms/pseries/eeh.c               |    2 +
13724  arch/powerpc/platforms/pseries/eeh_event.c         |    1 +
13725  arch/powerpc/platforms/pseries/eeh_sysfs.c         |    1 +
13726  arch/powerpc/platforms/pseries/hotplug-cpu.c       |    1 +
13727  arch/powerpc/platforms/pseries/hvconsole.c         |    3 +-
13728  arch/powerpc/platforms/pseries/io_event_irq.c      |    2 +-
13729  arch/powerpc/platforms/pseries/iommu.c             |    1 +
13730  arch/powerpc/platforms/pseries/lpar.c              |    1 +
13731  arch/powerpc/platforms/pseries/mobility.c          |    1 +
13732  arch/powerpc/platforms/pseries/pci_dlpar.c         |    1 +
13733  arch/powerpc/platforms/pseries/plpar_wrappers.h    |    3 +
13734  arch/powerpc/platforms/pseries/setup.c             |    2 +-
13735  arch/powerpc/platforms/pseries/smp.c               |    1 -
13736  arch/powerpc/platforms/pseries/suspend.c           |    1 +
13737  arch/powerpc/sysdev/bestcomm/sram.c                |    2 +-
13738  arch/powerpc/sysdev/cpm_common.c                   |    1 +
13739  arch/powerpc/sysdev/dcr.c                          |    1 +
13740  arch/powerpc/sysdev/fsl_gtm.c                      |    1 +
13741  arch/powerpc/sysdev/fsl_lbc.c                      |    3 +-
13742  arch/powerpc/sysdev/fsl_pmc.c                      |    1 +
13743  arch/powerpc/sysdev/fsl_rio.c                      |    2 +-
13744  arch/powerpc/sysdev/fsl_soc.c                      |    2 +-
13745  arch/powerpc/sysdev/mpc5xxx_clocks.c               |    1 +
13746  arch/powerpc/sysdev/mpc8xx_pic.c                   |    1 -
13747  arch/powerpc/sysdev/mv64x60_pci.c                  |    1 +
13748  arch/powerpc/sysdev/pmi.c                          |    1 +
13749  arch/powerpc/sysdev/ppc4xx_msi.c                   |    1 +
13750  arch/powerpc/sysdev/qe_lib/gpio.c                  |    1 +
13751  arch/powerpc/sysdev/qe_lib/ucc.c                   |    2 +-
13752  arch/powerpc/sysdev/qe_lib/ucc_fast.c              |    2 +-
13753  arch/powerpc/sysdev/qe_lib/ucc_slow.c              |    2 +-
13754  arch/powerpc/sysdev/qe_lib/usb.c                   |    1 +
13755  arch/powerpc/sysdev/rtc_cmos_setup.c               |    1 +
13756  arch/powerpc/sysdev/scom.c                         |    1 +
13757  arch/powerpc/sysdev/simple_gpio.c                  |    1 -
13758  arch/powerpc/sysdev/tsi108_dev.c                   |    2 +-
13759  arch/powerpc/xmon/xmon.c                           |    2 +-
13760  arch/s390/crypto/sha_common.c                      |    1 +
13761  arch/s390/mm/init.c                                |    1 +
13762  arch/sh/drivers/dma/dma-sysfs.c                    |    1 +
13763  arch/sh/drivers/pci/pci.c                          |    1 +
13764  arch/sh/kernel/cpu/shmobile/cpuidle.c              |    1 +
13765  arch/sh/kernel/perf_event.c                        |    1 +
13766  arch/sh/kernel/topology.c                          |    1 +
13767  arch/sh/mm/init.c                                  |    1 +
13768  arch/sparc/include/asm/termios.h                   |    1 -
13769  arch/sparc/kernel/apc.c                            |    1 +
13770  arch/sparc/kernel/auxio_32.c                       |    1 +
13771  arch/sparc/kernel/btext.c                          |    1 -
13772  arch/sparc/kernel/central.c                        |    1 +
13773  arch/sparc/kernel/cpu.c                            |    2 +-
13774  arch/sparc/kernel/cpumap.c                         |    2 +-
13775  arch/sparc/kernel/dma.c                            |    1 -
13776  arch/sparc/kernel/ebus.c                           |    2 +-
13777  arch/sparc/kernel/hvapi.c                          |    2 +-
13778  arch/sparc/kernel/idprom.c                         |    2 +-
13779  arch/sparc/kernel/iommu.c                          |    2 +-
13780  arch/sparc/kernel/irq_32.c                         |    1 +
13781  arch/sparc/kernel/irq_64.c                         |    1 -
13782  arch/sparc/kernel/ldc.c                            |    2 +-
13783  arch/sparc/kernel/leon_kernel.c                    |    1 -
13784  arch/sparc/kernel/leon_pci.c                       |    1 +
13785  arch/sparc/kernel/leon_pci_grpci2.c                |    2 +-
13786  arch/sparc/kernel/mdesc.c                          |    2 +
13787  arch/sparc/kernel/nmi.c                            |    2 +-
13788  arch/sparc/kernel/of_device_32.c                   |    1 -
13789  arch/sparc/kernel/of_device_64.c                   |    3 +-
13790  arch/sparc/kernel/of_device_common.c               |    2 +-
13791  arch/sparc/kernel/pci.c                            |    2 +-
13792  arch/sparc/kernel/pci_fire.c                       |    1 +
13793  arch/sparc/kernel/pci_psycho.c                     |    1 +
13794  arch/sparc/kernel/pci_sabre.c                      |    1 +
13795  arch/sparc/kernel/pci_schizo.c                     |    1 +
13796  arch/sparc/kernel/pci_sun4v.c                      |    1 +
13797  arch/sparc/kernel/pcic.c                           |    1 +
13798  arch/sparc/kernel/pcr.c                            |    3 +-
13799  arch/sparc/kernel/pmc.c                            |    1 +
13800  arch/sparc/kernel/power.c                          |    2 +-
13801  arch/sparc/kernel/process_64.c                     |    2 +-
13802  arch/sparc/kernel/prom_32.c                        |    1 -
13803  arch/sparc/kernel/prom_64.c                        |    1 -
13804  arch/sparc/kernel/prom_common.c                    |    2 +-
13805  arch/sparc/kernel/reboot.c                         |    2 +-
13806  arch/sparc/kernel/sbus.c                           |    1 +
13807  arch/sparc/kernel/setup_32.c                       |    1 +
13808  arch/sparc/kernel/setup_64.c                       |    1 +
13809  arch/sparc/kernel/smp_64.c                         |    2 +-
13810  arch/sparc/kernel/sparc_ksyms_64.c                 |    2 +-
13811  arch/sparc/kernel/stacktrace.c                     |    2 +-
13812  arch/sparc/kernel/sys_sparc32.c                    |    1 -
13813  arch/sparc/kernel/sys_sparc_64.c                   |    2 +-
13814  arch/sparc/kernel/time_64.c                        |    2 +-
13815  arch/sparc/kernel/traps_32.c                       |    1 +
13816  arch/sparc/kernel/unaligned_32.c                   |    1 -
13817  arch/sparc/kernel/vio.c                            |    1 +
13818  arch/sparc/kernel/viohs.c                          |    2 +-
13819  arch/sparc/mm/fault_32.c                           |    1 -
13820  arch/sparc/mm/generic_32.c                         |    1 +
13821  arch/sparc/mm/generic_64.c                         |    1 +
13822  arch/sparc/mm/highmem.c                            |    1 +
13823  arch/sparc/mm/hugetlbpage.c                        |    1 -
13824  arch/x86/crypto/aes_glue.c                         |    1 +
13825  arch/x86/crypto/aesni-intel_glue.c                 |    1 +
13826  arch/x86/kernel/cpu/amd.c                          |    1 +
13827  arch/x86/kernel/cpu/mcheck/mce.c                   |    1 +
13828  arch/x86/kernel/cpu/mcheck/therm_throt.c           |    1 +
13829  arch/x86/kernel/devicetree.c                       |    1 +
13830  arch/x86/kernel/e820.c                             |    1 +
13831  arch/x86/kernel/hpet.c                             |    1 +
13832  arch/x86/kernel/irq.c                              |    1 +
13833  arch/x86/kernel/pci-dma.c                          |    1 +
13834  arch/x86/kernel/probe_roms.c                       |    4 +-
13835  arch/x86/kernel/rtc.c                              |    1 +
13836  arch/x86/kernel/smp.c                              |    1 +
13837  arch/x86/kernel/time.c                             |    1 +
13838  arch/x86/kernel/topology.c                         |    1 +
13839  arch/x86/kernel/vsyscall_64.c                      |    1 +
13840  arch/x86/lguest/boot.c                             |    1 +
13841  arch/x86/pci/i386.c                                |    1 +
13842  arch/x86/pci/legacy.c                              |    1 +
13843  arch/x86/platform/efi/efi.c                        |    1 +
13844  arch/x86/platform/efi/efi_32.c                     |    1 +
13845  arch/x86/platform/mrst/vrtc.c                      |    1 +
13846  arch/x86/platform/olpc/olpc-xo1-pm.c               |    1 +
13847  arch/x86/platform/uv/bios_uv.c                     |    1 +
13848  arch/x86/power/cpu.c                               |    1 +
13849  arch/x86/video/fbdev.c                             |    1 +
13850  block/blk-integrity.c                              |    1 +
13851  block/ioctl.c                                      |    1 +
13852  crypto/async_tx/async_memcpy.c                     |    1 +
13853  crypto/async_tx/async_pq.c                         |    1 +
13854  crypto/async_tx/async_raid6_recov.c                |    1 +
13855  crypto/async_tx/async_tx.c                         |    1 +
13856  crypto/async_tx/async_xor.c                        |    1 +
13857  crypto/async_tx/raid6test.c                        |    1 +
13858  crypto/crypto_wq.c                                 |    1 +
13859  crypto/md4.c                                       |    1 +
13860  crypto/proc.c                                      |    1 +
13861  crypto/vmac.c                                      |    1 +
13862  crypto/xcbc.c                                      |    1 +
13863  drivers/acpi/acpica/hwsleep.c                      |    1 +
13864  drivers/acpi/ec_sys.c                              |    1 +
13865  drivers/acpi/sbshc.c                               |    1 +
13866  drivers/acpi/sysfs.c                               |    2 +-
13867  drivers/ata/libata-eh.c                            |    1 +
13868  drivers/ata/libata-pmp.c                           |    1 +
13869  drivers/ata/libata-scsi.c                          |    1 +
13870  drivers/ata/libata-sff.c                           |    1 +
13871  drivers/base/base.h                                |    1 +
13872  drivers/base/dma-coherent.c                        |    1 +
13873  drivers/base/dma-mapping.c                         |    1 +
13874  drivers/base/hypervisor.c                          |    1 +
13875  drivers/base/power/generic_ops.c                   |    1 +
13876  drivers/base/power/main.c                          |    1 +
13877  drivers/base/power/runtime.c                       |    1 +
13878  drivers/base/power/sysfs.c                         |    1 +
13879  drivers/base/power/trace.c                         |    1 +
13880  drivers/base/power/wakeup.c                        |    1 +
13881  drivers/base/transport_class.c                     |    1 +
13882  drivers/bcma/core.c                                |    1 +
13883  drivers/bcma/driver_chipcommon.c                   |    1 +
13884  drivers/bcma/driver_pci.c                          |    1 +
13885  drivers/bcma/host_pci.c                            |    1 +
13886  drivers/bcma/main.c                                |    1 +
13887  drivers/block/aoe/aoeblk.c                         |    1 +
13888  drivers/block/aoe/aoechr.c                         |    1 +
13889  drivers/block/aoe/aoecmd.c                         |    2 +-
13890  drivers/block/aoe/aoenet.c                         |    2 +-
13891  drivers/block/ps3disk.c                            |    1 +
13892  drivers/block/ps3vram.c                            |    1 +
13893  drivers/block/virtio_blk.c                         |    1 +
13894  drivers/bluetooth/btmrvl_main.c                    |    2 +
13895  drivers/bluetooth/btmrvl_sdio.c                    |    1 +
13896  drivers/bluetooth/btwilink.c                       |    1 +
13897  drivers/char/hw_random/virtio-rng.c                |    1 +
13898  drivers/char/mem.c                                 |    1 +
13899  drivers/char/ps3flash.c                            |    1 +
13900  drivers/char/ramoops.c                             |    1 +
13901  drivers/char/ttyprintk.c                           |    1 +
13902  drivers/char/virtio_console.c                      |    1 +
13903  drivers/clocksource/sh_cmt.c                       |    1 +
13904  drivers/clocksource/sh_mtu2.c                      |    1 +
13905  drivers/clocksource/sh_tmu.c                       |    1 +
13906  drivers/cpufreq/cpufreq_stats.c                    |    1 +
13907  drivers/cpufreq/s3c64xx-cpufreq.c                  |    1 +
13908  drivers/cpuidle/cpuidle.c                          |    1 +
13909  drivers/cpuidle/governors/ladder.c                 |    1 +
13910  drivers/cpuidle/governors/menu.c                   |    1 +
13911  drivers/crypto/mv_cesa.c                           |    1 +
13912  drivers/dca/dca-core.c                             |    1 +
13913  drivers/dca/dca-sysfs.c                            |    1 +
13914  drivers/dma/imx-dma.c                              |    1 +
13915  drivers/dma/imx-sdma.c                             |    1 +
13916  drivers/dma/intel_mid_dma.c                        |    1 +
13917  drivers/dma/ipu/ipu_idmac.c                        |    1 +
13918  drivers/dma/ste_dma40.c                            |    1 +
13919  drivers/edac/mce_amd_inj.c                         |    1 +
13920  drivers/firewire/core-iso.c                        |    1 +
13921  drivers/firmware/google/gsmi.c                     |    1 +
13922  drivers/firmware/sigma.c                           |    1 +
13923  drivers/gpio/gpio-74x164.c                         |    1 +
13924  drivers/gpio/gpio-ep93xx.c                         |    1 +
13925  drivers/gpio/gpio-mc33880.c                        |    1 +
13926  drivers/gpio/gpio-mcp23s08.c                       |    1 +
13927  drivers/gpio/gpio-ml-ioh.c                         |    1 +
13928  drivers/gpio/gpio-mpc5200.c                        |    1 +
13929  drivers/gpio/gpio-mxc.c                            |    1 +
13930  drivers/gpio/gpio-mxs.c                            |    1 +
13931  drivers/gpio/gpio-pcf857x.c                        |    1 +
13932  drivers/gpio/gpio-pch.c                            |    1 +
13933  drivers/gpio/gpio-xilinx.c                         |    1 +
13934  drivers/gpu/drm/ati_pcigart.c                      |    1 +
13935  drivers/gpu/drm/drm_buffer.c                       |    1 +
13936  drivers/gpu/drm/drm_bufs.c                         |    1 +
13937  drivers/gpu/drm/drm_cache.c                        |    1 +
13938  drivers/gpu/drm/drm_crtc.c                         |    1 +
13939  drivers/gpu/drm/drm_crtc_helper.c                  |    3 +
13940  drivers/gpu/drm/drm_debugfs.c                      |    1 +
13941  drivers/gpu/drm/drm_dma.c                          |    1 +
13942  drivers/gpu/drm/drm_drv.c                          |    1 +
13943  drivers/gpu/drm/drm_edid.c                         |    1 +
13944  drivers/gpu/drm/drm_encoder_slave.c                |    2 +
13945  drivers/gpu/drm/drm_fb_helper.c                    |    2 +
13946  drivers/gpu/drm/drm_fops.c                         |    1 +
13947  drivers/gpu/drm/drm_hashtab.c                      |    1 +
13948  drivers/gpu/drm/drm_ioc32.c                        |    1 +
13949  drivers/gpu/drm/drm_irq.c                          |    1 +
13950  drivers/gpu/drm/drm_memory.c                       |    1 +
13951  drivers/gpu/drm/drm_mm.c                           |    1 +
13952  drivers/gpu/drm/drm_modes.c                        |    1 +
13953  drivers/gpu/drm/drm_pci.c                          |    1 +
13954  drivers/gpu/drm/drm_platform.c                     |    1 +
13955  drivers/gpu/drm/drm_proc.c                         |    1 +
13956  drivers/gpu/drm/drm_sman.c                         |    1 +
13957  drivers/gpu/drm/drm_sysfs.c                        |    1 +
13958  drivers/gpu/drm/drm_usb.c                          |    1 +
13959  drivers/gpu/drm/drm_vm.c                           |    1 +
13960  drivers/gpu/drm/i2c/ch7006_drv.c                   |    2 +
13961  drivers/gpu/drm/i2c/sil164_drv.c                   |    2 +
13962  drivers/gpu/drm/i810/i810_drv.c                    |    2 +
13963  drivers/gpu/drm/i915/i915_debugfs.c                |    1 +
13964  drivers/gpu/drm/i915/i915_dma.c                    |    1 +
13965  drivers/gpu/drm/i915/i915_drv.c                    |    1 +
13966  drivers/gpu/drm/i915/intel_dp.c                    |    1 +
13967  drivers/gpu/drm/i915/intel_i2c.c                   |    1 +
13968  drivers/gpu/drm/i915/intel_sdvo.c                  |    1 +
13969  drivers/gpu/drm/mga/mga_drv.c                      |    2 +
13970  drivers/gpu/drm/mga/mga_warp.c                     |    1 +
13971  drivers/gpu/drm/nouveau/nouveau_drv.c              |    1 +
13972  drivers/gpu/drm/nouveau/nouveau_i2c.c              |    2 +
13973  drivers/gpu/drm/nouveau/nouveau_temp.c             |    2 +
13974  drivers/gpu/drm/nouveau/nvc0_graph.c               |    1 +
13975  drivers/gpu/drm/r128/r128_cce.c                    |    1 +
13976  drivers/gpu/drm/r128/r128_drv.c                    |    2 +
13977  drivers/gpu/drm/radeon/ni.c                        |    1 +
13978  drivers/gpu/drm/radeon/r100.c                      |    1 +
13979  drivers/gpu/drm/radeon/r600.c                      |    1 +
13980  drivers/gpu/drm/radeon/r600_cp.c                   |    2 +
13981  drivers/gpu/drm/radeon/radeon_cp.c                 |    2 +
13982  drivers/gpu/drm/radeon/radeon_drv.c                |    1 +
13983  drivers/gpu/drm/radeon/radeon_i2c.c                |    2 +
13984  drivers/gpu/drm/savage/savage_drv.c                |    2 +
13985  drivers/gpu/drm/sis/sis_drv.c                      |    2 +
13986  drivers/gpu/drm/tdfx/tdfx_drv.c                    |    2 +
13987  drivers/gpu/drm/ttm/ttm_tt.c                       |    1 +
13988  drivers/gpu/drm/via/via_drv.c                      |    2 +
13989  drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |    1 +
13990  drivers/gpu/drm/vmwgfx/vmwgfx_fb.c                 |    2 +
13991  drivers/hid/hid-axff.c                             |    1 +
13992  drivers/hid/hid-debug.c                            |    1 +
13993  drivers/hid/hid-dr.c                               |    1 +
13994  drivers/hid/hid-emsff.c                            |    1 +
13995  drivers/hid/hid-gaff.c                             |    1 +
13996  drivers/hid/hid-holtekff.c                         |    1 +
13997  drivers/hid/hid-picolcd.c                          |    1 +
13998  drivers/hid/hid-pl.c                               |    1 +
13999  drivers/hid/hid-roccat-common.c                    |    1 +
14000  drivers/hid/hid-roccat.c                           |    1 +
14001  drivers/hid/hid-sjoy.c                             |    1 +
14002  drivers/hid/hid-tmff.c                             |    1 +
14003  drivers/hid/hid-zpff.c                             |    1 +
14004  drivers/hid/usbhid/hid-quirks.c                    |    1 +
14005  drivers/hwmon/ultra45_env.c                        |    1 +
14006  drivers/i2c/busses/i2c-pxa-pci.c                   |    1 +
14007  drivers/i2c/busses/i2c-sh7760.c                    |    1 +
14008  drivers/i2c/busses/i2c-tegra.c                     |    1 +
14009  drivers/i2c/i2c-boardinfo.c                        |    1 +
14010  drivers/ide/buddha.c                               |    1 +
14011  drivers/ide/cmd640.c                               |    1 +
14012  drivers/ide/ide-acpi.c                             |    1 +
14013  drivers/ide/ide-atapi.c                            |    1 +
14014  drivers/ide/ide-disk_proc.c                        |    1 +
14015  drivers/ide/ide-dma-sff.c                          |    1 +
14016  drivers/ide/ide-dma.c                              |    1 +
14017  drivers/ide/ide-eh.c                               |    1 +
14018  drivers/ide/ide-floppy_proc.c                      |    1 +
14019  drivers/ide/ide-io-std.c                           |    1 +
14020  drivers/ide/ide-ioctls.c                           |    1 +
14021  drivers/ide/ide-legacy.c                           |    1 +
14022  drivers/ide/ide-lib.c                              |    1 +
14023  drivers/ide/ide-pnp.c                              |    1 +
14024  drivers/ide/ide-taskfile.c                         |    1 +
14025  drivers/ide/ide-xfer-mode.c                        |    1 +
14026  drivers/ide/macide.c                               |    1 +
14027  drivers/ide/pmac.c                                 |    1 +
14028  drivers/ide/q40ide.c                               |    1 +
14029  drivers/ide/setup-pci.c                            |    1 +
14030  drivers/ide/tc86c001.c                             |    1 +
14031  drivers/idle/intel_idle.c                          |    1 +
14032  drivers/infiniband/core/addr.c                     |    1 +
14033  drivers/infiniband/core/cm.c                       |    1 +
14034  drivers/infiniband/core/cma.c                      |    1 +
14035  drivers/infiniband/core/fmr_pool.c                 |    1 +
14036  drivers/infiniband/core/iwcm.c                     |    1 +
14037  drivers/infiniband/core/mad.c                      |    1 +
14038  drivers/infiniband/core/multicast.c                |    1 +
14039  drivers/infiniband/core/netlink.c                  |    1 +
14040  drivers/infiniband/core/packer.c                   |    1 +
14041  drivers/infiniband/core/sysfs.c                    |    1 +
14042  drivers/infiniband/core/ucma.c                     |    1 +
14043  drivers/infiniband/core/ud_header.c                |    1 +
14044  drivers/infiniband/core/umem.c                     |    1 +
14045  drivers/infiniband/core/uverbs_marshall.c          |    1 +
14046  drivers/infiniband/core/verbs.c                    |    1 +
14047  drivers/infiniband/hw/cxgb4/qp.c                   |    3 +
14048  drivers/infiniband/hw/ipath/ipath_diag.c           |    1 +
14049  drivers/infiniband/hw/ipath/ipath_driver.c         |    1 +
14050  drivers/infiniband/hw/ipath/ipath_file_ops.c       |    1 +
14051  drivers/infiniband/hw/ipath/ipath_init_chip.c      |    1 +
14052  drivers/infiniband/hw/ipath/ipath_sysfs.c          |    1 +
14053  drivers/infiniband/hw/ipath/ipath_verbs.c          |    1 +
14054  drivers/infiniband/hw/mthca/mthca_catas.c          |    1 +
14055  drivers/infiniband/hw/mthca/mthca_cmd.c            |    1 +
14056  drivers/infiniband/hw/mthca/mthca_provider.c       |    2 +
14057  drivers/infiniband/hw/qib/qib_diag.c               |    1 +
14058  drivers/infiniband/hw/qib/qib_driver.c             |    1 +
14059  drivers/infiniband/hw/qib/qib_file_ops.c           |    1 +
14060  drivers/infiniband/hw/qib/qib_iba7220.c            |    1 +
14061  drivers/infiniband/hw/qib/qib_iba7322.c            |    1 +
14062  drivers/infiniband/hw/qib/qib_init.c               |    1 +
14063  drivers/infiniband/hw/qib/qib_pcie.c               |    1 +
14064  drivers/infiniband/hw/qib/qib_sd7220.c             |    1 +
14065  drivers/infiniband/hw/qib/qib_sdma.c               |    1 +
14066  drivers/infiniband/hw/qib/qib_tx.c                 |    1 +
14067  drivers/infiniband/hw/qib/qib_verbs.c              |    1 +
14068  drivers/infiniband/ulp/ipoib/ipoib_cm.c            |    1 +
14069  drivers/infiniband/ulp/ipoib/ipoib_fs.c            |    1 +
14070  drivers/infiniband/ulp/ipoib/ipoib_ib.c            |    1 +
14071  drivers/infiniband/ulp/ipoib/ipoib_multicast.c     |    1 +
14072  drivers/infiniband/ulp/iser/iscsi_iser.c           |    1 +
14073  drivers/input/input-compat.c                       |    1 +
14074  drivers/input/input-mt.c                           |    1 +
14075  drivers/input/input-polldev.c                      |    1 +
14076  drivers/input/joystick/as5011.c                    |    1 +
14077  drivers/input/keyboard/nomadik-ske-keypad.c        |    1 +
14078  drivers/input/keyboard/tnetv107x-keypad.c          |    1 +
14079  drivers/input/misc/ad714x.c                        |    1 +
14080  drivers/input/misc/adxl34x.c                       |    1 +
14081  drivers/input/misc/ati_remote2.c                   |    1 +
14082  drivers/input/misc/cma3000_d0x.c                   |    1 +
14083  drivers/input/misc/dm355evm_keys.c                 |    1 +
14084  drivers/input/sparse-keymap.c                      |    1 +
14085  drivers/input/touchscreen/ad7877.c                 |    1 +
14086  drivers/input/touchscreen/ad7879-spi.c             |    1 +
14087  drivers/input/touchscreen/ad7879.c                 |    1 +
14088  drivers/input/touchscreen/ads7846.c                |    1 +
14089  drivers/input/touchscreen/bu21013_ts.c             |    1 +
14090  drivers/isdn/capi/kcapi_proc.c                     |    1 +
14091  drivers/isdn/gigaset/asyncdata.c                   |    1 +
14092  drivers/isdn/gigaset/capi.c                        |    1 +
14093  drivers/isdn/gigaset/dummyll.c                     |    1 +
14094  drivers/isdn/gigaset/ev-layer.c                    |    1 +
14095  drivers/isdn/gigaset/i4l.c                         |    1 +
14096  drivers/isdn/gigaset/interface.c                   |    1 +
14097  drivers/isdn/hardware/mISDN/mISDNisar.c            |    1 +
14098  drivers/isdn/i4l/isdn_tty.c                        |    1 +
14099  drivers/isdn/mISDN/clock.c                         |    1 +
14100  drivers/isdn/mISDN/dsp_audio.c                     |    1 +
14101  drivers/isdn/mISDN/dsp_pipeline.c                  |    1 +
14102  drivers/isdn/mISDN/socket.c                        |    1 +
14103  drivers/leds/dell-led.c                            |    1 +
14104  drivers/leds/leds-88pm860x.c                       |    1 +
14105  drivers/leds/leds-asic3.c                          |    1 +
14106  drivers/leds/leds-atmel-pwm.c                      |    1 +
14107  drivers/leds/leds-cobalt-raq.c                     |    1 +
14108  drivers/leds/leds-fsg.c                            |    1 +
14109  drivers/leds/leds-gpio.c                           |    1 +
14110  drivers/leds/leds-lm3530.c                         |    1 +
14111  drivers/leds/leds-locomo.c                         |    1 +
14112  drivers/leds/leds-lt3593.c                         |    1 +
14113  drivers/leds/leds-net48xx.c                        |    1 +
14114  drivers/leds/leds-net5501.c                        |    1 +
14115  drivers/leds/leds-ns2.c                            |    1 +
14116  drivers/leds/leds-s3c24xx.c                        |    1 +
14117  drivers/leds/leds-wm831x-status.c                  |    1 +
14118  drivers/leds/leds-wm8350.c                         |    1 +
14119  drivers/leds/leds-wrap.c                           |    1 +
14120  drivers/lguest/lguest_device.c                     |    1 +
14121  drivers/lguest/lguest_user.c                       |    1 +
14122  drivers/md/dm-exception-store.c                    |    1 +
14123  drivers/md/dm-log-userspace-base.c                 |    1 +
14124  drivers/md/dm-path-selector.c                      |    1 +
14125  drivers/md/dm-raid.c                               |    1 +
14126  drivers/md/dm-round-robin.c                        |    1 +
14127  drivers/md/dm-service-time.c                       |    1 +
14128  drivers/md/dm-snap-persistent.c                    |    1 +
14129  drivers/md/dm-snap-transient.c                     |    1 +
14130  drivers/md/dm-uevent.c                             |    1 +
14131  drivers/md/faulty.c                                |    1 +
14132  drivers/md/linear.c                                |    1 +
14133  drivers/md/md.c                                    |    1 +
14134  drivers/md/multipath.c                             |    1 +
14135  drivers/md/raid0.c                                 |    1 +
14136  drivers/md/raid1.c                                 |    1 +
14137  drivers/md/raid10.c                                |    1 +
14138  drivers/md/raid5.c                                 |    1 +
14139  drivers/media/common/saa7146_core.c                |    1 +
14140  drivers/media/common/saa7146_fops.c                |    1 +
14141  drivers/media/common/saa7146_hlp.c                 |    1 +
14142  drivers/media/common/saa7146_video.c               |    1 +
14143  drivers/media/common/tuners/tuner-types.c          |    1 +
14144  drivers/media/dvb/frontends/dibx000_common.c       |    1 +
14145  drivers/media/dvb/siano/sms-cards.c                |    1 +
14146  drivers/media/dvb/siano/smsendian.c                |    1 +
14147  drivers/media/dvb/siano/smssdio.c                  |    1 +
14148  drivers/media/dvb/siano/smsusb.c                   |    1 +
14149  drivers/media/media-device.c                       |    1 +
14150  drivers/media/radio/radio-timb.c                   |    1 +
14151  drivers/media/radio/radio-wl1273.c                 |    1 +
14152  drivers/media/radio/si4713-i2c.c                   |    1 +
14153  drivers/media/radio/wl128x/fmdrv_v4l2.c            |    2 +
14154  drivers/media/rc/ir-jvc-decoder.c                  |    1 +
14155  drivers/media/rc/ir-lirc-codec.c                   |    1 +
14156  drivers/media/rc/ir-nec-decoder.c                  |    1 +
14157  drivers/media/rc/ir-raw.c                          |    2 +
14158  drivers/media/rc/ir-rc5-decoder.c                  |    1 +
14159  drivers/media/rc/ir-rc5-sz-decoder.c               |    1 +
14160  drivers/media/rc/ir-rc6-decoder.c                  |    1 +
14161  drivers/media/rc/ir-sony-decoder.c                 |    1 +
14162  drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c    |    1 +
14163  drivers/media/rc/keymaps/rc-alink-dtu-m.c          |    1 +
14164  drivers/media/rc/keymaps/rc-anysee.c               |    1 +
14165  drivers/media/rc/keymaps/rc-apac-viewcomp.c        |    1 +
14166  drivers/media/rc/keymaps/rc-asus-pc39.c            |    1 +
14167  drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c |    1 +
14168  drivers/media/rc/keymaps/rc-avermedia-a16d.c       |    1 +
14169  drivers/media/rc/keymaps/rc-avermedia-cardbus.c    |    1 +
14170  drivers/media/rc/keymaps/rc-avermedia-dvbt.c       |    1 +
14171  drivers/media/rc/keymaps/rc-avermedia-m135a.c      |    1 +
14172  .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c    |    1 +
14173  drivers/media/rc/keymaps/rc-avermedia-rm-ks.c      |    1 +
14174  drivers/media/rc/keymaps/rc-avermedia.c            |    1 +
14175  drivers/media/rc/keymaps/rc-avertv-303.c           |    1 +
14176  drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c   |    1 +
14177  drivers/media/rc/keymaps/rc-behold-columbus.c      |    1 +
14178  drivers/media/rc/keymaps/rc-behold.c               |    1 +
14179  drivers/media/rc/keymaps/rc-budget-ci-old.c        |    1 +
14180  drivers/media/rc/keymaps/rc-cinergy-1400.c         |    1 +
14181  drivers/media/rc/keymaps/rc-cinergy.c              |    1 +
14182  drivers/media/rc/keymaps/rc-dib0700-nec.c          |    1 +
14183  drivers/media/rc/keymaps/rc-dib0700-rc5.c          |    1 +
14184  drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c  |    1 +
14185  drivers/media/rc/keymaps/rc-digittrade.c           |    1 +
14186  drivers/media/rc/keymaps/rc-dm1105-nec.c           |    1 +
14187  drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c      |    1 +
14188  drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c   |    1 +
14189  drivers/media/rc/keymaps/rc-em-terratec.c          |    1 +
14190  drivers/media/rc/keymaps/rc-encore-enltv-fm53.c    |    1 +
14191  drivers/media/rc/keymaps/rc-encore-enltv.c         |    1 +
14192  drivers/media/rc/keymaps/rc-encore-enltv2.c        |    1 +
14193  drivers/media/rc/keymaps/rc-evga-indtube.c         |    1 +
14194  drivers/media/rc/keymaps/rc-eztv.c                 |    1 +
14195  drivers/media/rc/keymaps/rc-flydvb.c               |    1 +
14196  drivers/media/rc/keymaps/rc-flyvideo.c             |    1 +
14197  drivers/media/rc/keymaps/rc-fusionhdtv-mce.c       |    1 +
14198  drivers/media/rc/keymaps/rc-gadmei-rm008z.c        |    1 +
14199  drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c   |    1 +
14200  drivers/media/rc/keymaps/rc-gotview7135.c          |    1 +
14201  drivers/media/rc/keymaps/rc-hauppauge.c            |    1 +
14202  drivers/media/rc/keymaps/rc-imon-mce.c             |    1 +
14203  drivers/media/rc/keymaps/rc-imon-pad.c             |    1 +
14204  drivers/media/rc/keymaps/rc-iodata-bctv7e.c        |    1 +
14205  drivers/media/rc/keymaps/rc-kaiomy.c               |    1 +
14206  drivers/media/rc/keymaps/rc-kworld-315u.c          |    1 +
14207  .../media/rc/keymaps/rc-kworld-plus-tv-analog.c    |    1 +
14208  drivers/media/rc/keymaps/rc-leadtek-y04g0051.c     |    1 +
14209  drivers/media/rc/keymaps/rc-lirc.c                 |    1 +
14210  drivers/media/rc/keymaps/rc-lme2510.c              |    1 +
14211  drivers/media/rc/keymaps/rc-manli.c                |    1 +
14212  drivers/media/rc/keymaps/rc-msi-digivox-ii.c       |    1 +
14213  drivers/media/rc/keymaps/rc-msi-digivox-iii.c      |    1 +
14214  drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c  |    1 +
14215  drivers/media/rc/keymaps/rc-msi-tvanywhere.c       |    1 +
14216  drivers/media/rc/keymaps/rc-nebula.c               |    1 +
14217  .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c  |    1 +
14218  drivers/media/rc/keymaps/rc-norwood.c              |    1 +
14219  drivers/media/rc/keymaps/rc-npgtech.c              |    1 +
14220  drivers/media/rc/keymaps/rc-pctv-sedna.c           |    1 +
14221  drivers/media/rc/keymaps/rc-pinnacle-color.c       |    1 +
14222  drivers/media/rc/keymaps/rc-pinnacle-grey.c        |    1 +
14223  drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c     |    1 +
14224  drivers/media/rc/keymaps/rc-pixelview-002t.c       |    1 +
14225  drivers/media/rc/keymaps/rc-pixelview-mk12.c       |    1 +
14226  drivers/media/rc/keymaps/rc-pixelview-new.c        |    1 +
14227  drivers/media/rc/keymaps/rc-pixelview.c            |    1 +
14228  .../media/rc/keymaps/rc-powercolor-real-angel.c    |    1 +
14229  drivers/media/rc/keymaps/rc-proteus-2309.c         |    1 +
14230  drivers/media/rc/keymaps/rc-purpletv.c             |    1 +
14231  drivers/media/rc/keymaps/rc-pv951.c                |    1 +
14232  drivers/media/rc/keymaps/rc-rc6-mce.c              |    1 +
14233  .../media/rc/keymaps/rc-real-audio-220-32-keys.c   |    1 +
14234  drivers/media/rc/keymaps/rc-streamzap.c            |    1 +
14235  drivers/media/rc/keymaps/rc-tbs-nec.c              |    1 +
14236  drivers/media/rc/keymaps/rc-technisat-usb2.c       |    1 +
14237  drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c  |    1 +
14238  drivers/media/rc/keymaps/rc-terratec-slim-2.c      |    1 +
14239  drivers/media/rc/keymaps/rc-terratec-slim.c        |    1 +
14240  drivers/media/rc/keymaps/rc-tevii-nec.c            |    1 +
14241  drivers/media/rc/keymaps/rc-tivo.c                 |    1 +
14242  drivers/media/rc/keymaps/rc-total-media-in-hand.c  |    1 +
14243  drivers/media/rc/keymaps/rc-trekstor.c             |    1 +
14244  drivers/media/rc/keymaps/rc-tt-1500.c              |    1 +
14245  drivers/media/rc/keymaps/rc-twinhan1027.c          |    1 +
14246  drivers/media/rc/keymaps/rc-videomate-m1f.c        |    1 +
14247  drivers/media/rc/keymaps/rc-videomate-s350.c       |    1 +
14248  drivers/media/rc/keymaps/rc-videomate-tv-pvr.c     |    1 +
14249  drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c |    1 +
14250  drivers/media/rc/keymaps/rc-winfast.c              |    1 +
14251  drivers/media/rc/rc-main.c                         |    1 +
14252  drivers/media/video/adp1653.c                      |    1 +
14253  drivers/media/video/ak881x.c                       |    1 +
14254  drivers/media/video/cpia2/cpia2_usb.c              |    1 +
14255  drivers/media/video/cx25840/cx25840-ir.c           |    1 +
14256  drivers/media/video/davinci/dm355_ccdc.c           |    1 +
14257  drivers/media/video/davinci/dm644x_ccdc.c          |    1 +
14258  drivers/media/video/hdpvr/hdpvr-i2c.c              |    1 +
14259  drivers/media/video/hexium_gemini.c                |    1 +
14260  drivers/media/video/hexium_orion.c                 |    1 +
14261  drivers/media/video/imx074.c                       |    1 +
14262  drivers/media/video/m5mols/m5mols_core.c           |    1 +
14263  drivers/media/video/mt9m001.c                      |    1 +
14264  drivers/media/video/mt9m111.c                      |    1 +
14265  drivers/media/video/mt9t031.c                      |    1 +
14266  drivers/media/video/mt9v011.c                      |    1 +
14267  drivers/media/video/mt9v022.c                      |    1 +
14268  drivers/media/video/mt9v032.c                      |    1 +
14269  drivers/media/video/mxb.c                          |    1 +
14270  drivers/media/video/noon010pc30.c                  |    1 +
14271  drivers/media/video/omap24xxcam.c                  |    1 +
14272  drivers/media/video/ov6650.c                       |    1 +
14273  drivers/media/video/pvrusb2/pvrusb2-devattr.c      |    1 +
14274  drivers/media/video/pvrusb2/pvrusb2-hdw.c          |    1 +
14275  drivers/media/video/pvrusb2/pvrusb2-i2c-core.c     |    1 +
14276  drivers/media/video/pvrusb2/pvrusb2-v4l2.c         |    1 +
14277  drivers/media/video/rj54n1cb0c.c                   |    1 +
14278  drivers/media/video/sh_mobile_csi2.c               |    1 +
14279  drivers/media/video/sh_vou.c                       |    1 +
14280  drivers/media/video/sr030pc30.c                    |    1 +
14281  drivers/media/video/tcm825x.c                      |    1 +
14282  drivers/media/video/timblogiw.c                    |    1 +
14283  drivers/media/video/tvp514x.c                      |    1 +
14284  drivers/media/video/tvp5150.c                      |    1 +
14285  drivers/media/video/tvp7002.c                      |    1 +
14286  drivers/media/video/usbvision/usbvision-cards.c    |    1 +
14287  drivers/media/video/v4l2-ctrls.c                   |    1 +
14288  drivers/media/video/v4l2-device.c                  |    1 +
14289  drivers/media/video/v4l2-event.c                   |    1 +
14290  drivers/media/video/v4l2-fh.c                      |    1 +
14291  drivers/media/video/v4l2-int-device.c              |    1 +
14292  drivers/media/video/v4l2-subdev.c                  |    1 +
14293  drivers/memstick/core/memstick.c                   |    1 +
14294  drivers/memstick/core/mspro_block.c                |    1 +
14295  drivers/memstick/host/jmb38x_ms.c                  |    1 +
14296  drivers/memstick/host/tifm_ms.c                    |    1 +
14297  drivers/message/i2o/pci.c                          |    1 +
14298  drivers/mfd/ab3100-core.c                          |    1 +
14299  drivers/mfd/ab8500-debugfs.c                       |    1 +
14300  drivers/mfd/ab8500-sysctrl.c                       |    1 +
14301  drivers/mfd/abx500-core.c                          |    1 +
14302  drivers/mfd/asic3.c                                |    1 +
14303  drivers/mfd/dm355evm_msp.c                         |    1 +
14304  drivers/mfd/max8997.c                              |    1 +
14305  drivers/mfd/mfd-core.c                             |    1 +
14306  drivers/mfd/pcf50633-irq.c                         |    1 +
14307  drivers/mfd/tmio_core.c                            |    1 +
14308  drivers/mfd/twl-core.c                             |    1 +
14309  drivers/mfd/twl6030-irq.c                          |    1 +
14310  drivers/mfd/wl1273-core.c                          |    1 +
14311  drivers/mfd/wm8400-core.c                          |    1 +
14312  drivers/misc/ab8500-pwm.c                          |    1 +
14313  drivers/misc/atmel-ssc.c                           |    1 +
14314  drivers/misc/atmel_tclib.c                         |    1 +
14315  drivers/misc/bh1780gli.c                           |    1 +
14316  drivers/misc/kgdbts.c                              |    1 +
14317  drivers/misc/sgi-gru/grukservices.c                |    1 +
14318  drivers/misc/ti-st/st_kim.c                        |    1 +
14319  drivers/misc/tifm_7xx1.c                           |    1 +
14320  drivers/misc/tifm_core.c                           |    1 +
14321  drivers/mmc/card/mmc_test.c                        |    1 +
14322  drivers/mmc/core/bus.c                             |    2 +
14323  drivers/mmc/core/debugfs.c                         |    1 +
14324  drivers/mmc/core/host.c                            |    1 +
14325  drivers/mmc/core/mmc.c                             |    1 +
14326  drivers/mmc/core/mmc_ops.c                         |    1 +
14327  drivers/mmc/core/quirks.c                          |    1 +
14328  drivers/mmc/core/sd.c                              |    1 +
14329  drivers/mmc/core/sd_ops.c                          |    1 +
14330  drivers/mmc/core/sdio_bus.c                        |    1 +
14331  drivers/mmc/core/sdio_io.c                         |    1 +
14332  drivers/mmc/core/sdio_irq.c                        |    1 +
14333  drivers/mmc/host/mmc_spi.c                         |    1 +
14334  drivers/mmc/host/mxs-mmc.c                         |    1 +
14335  drivers/mmc/host/sdhci-of-esdhc.c                  |    1 +
14336  drivers/mmc/host/sdhci-of-hlwd.c                   |    1 +
14337  drivers/mmc/host/sdhci-pci.c                       |    1 +
14338  drivers/mmc/host/sdhci-pltfm.c                     |    1 +
14339  drivers/mmc/host/sdhci-pxav2.c                     |    1 +
14340  drivers/mmc/host/sdhci-pxav3.c                     |    1 +
14341  drivers/mmc/host/sdhci-spear.c                     |    1 +
14342  drivers/mmc/host/sdhci-tegra.c                     |    1 +
14343  drivers/mmc/host/sdhci.c                           |    1 +
14344  drivers/mmc/host/sdricoh_cs.c                      |    1 +
14345  drivers/mmc/host/sh_mmcif.c                        |    1 +
14346  drivers/mmc/host/sh_mobile_sdhi.c                  |    1 +
14347  drivers/mmc/host/tifm_sd.c                         |    1 +
14348  drivers/mmc/host/via-sdmmc.c                       |    1 +
14349  drivers/mtd/ar7part.c                              |    1 +
14350  drivers/mtd/cmdlinepart.c                          |    1 +
14351  drivers/mtd/lpddr/lpddr_cmds.c                     |    1 +
14352  drivers/mtd/mtdblock_ro.c                          |    1 +
14353  drivers/mtd/mtdsuper.c                             |    1 +
14354  drivers/mtd/nand/cafe_nand.c                       |    1 +
14355  drivers/mtd/nand/cmx270_nand.c                     |    1 +
14356  drivers/mtd/nand/diskonchip.c                      |    1 +
14357  drivers/mtd/nand/nand_bbt.c                        |    1 +
14358  drivers/mtd/nand/omap2.c                           |    1 +
14359  drivers/mtd/nand/sm_common.c                       |    1 +
14360  drivers/mtd/onenand/onenand_bbt.c                  |    1 +
14361  drivers/mtd/redboot.c                              |    1 +
14362  drivers/mtd/rfd_ftl.c                              |    1 +
14363  drivers/mtd/ubi/vmt.c                              |    1 +
14364  drivers/net/bonding/bond_procfs.c                  |    1 +
14365  drivers/net/ethernet/brocade/bna/bnad.c            |    1 +
14366  drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c |    1 +
14367  drivers/net/ethernet/chelsio/cxgb3/l2t.c           |    1 +
14368  drivers/net/ethernet/chelsio/cxgb4/l2t.c           |    7 +-
14369  drivers/net/ethernet/chelsio/cxgb4/sge.c           |    1 +
14370  drivers/net/ethernet/emulex/benet/be_main.c        |    1 +
14371  drivers/net/ethernet/ethoc.c                       |    1 +
14372  drivers/net/ethernet/freescale/ucc_geth.c          |    1 +
14373  drivers/net/ethernet/intel/e1000e/param.c          |    1 +
14374  drivers/net/ethernet/mellanox/mlx4/alloc.c         |    1 +
14375  drivers/net/ethernet/mellanox/mlx4/catas.c         |    1 +
14376  drivers/net/ethernet/mellanox/mlx4/cmd.c           |    1 +
14377  drivers/net/ethernet/mellanox/mlx4/cq.c            |    1 +
14378  drivers/net/ethernet/mellanox/mlx4/en_tx.c         |    1 +
14379  drivers/net/ethernet/mellanox/mlx4/eq.c            |    1 +
14380  drivers/net/ethernet/mellanox/mlx4/fw.c            |    1 +
14381  drivers/net/ethernet/mellanox/mlx4/intf.c          |    1 +
14382  drivers/net/ethernet/mellanox/mlx4/mcg.c           |    1 +
14383  drivers/net/ethernet/mellanox/mlx4/mr.c            |    1 +
14384  drivers/net/ethernet/mellanox/mlx4/pd.c            |    1 +
14385  drivers/net/ethernet/mellanox/mlx4/port.c          |    1 +
14386  drivers/net/ethernet/mellanox/mlx4/qp.c            |    1 +
14387  drivers/net/ethernet/mellanox/mlx4/srq.c           |    1 +
14388  drivers/net/ethernet/neterion/vxge/vxge-main.c     |    1 +
14389  .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c   |    1 +
14390  .../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c  |    1 +
14391  drivers/net/ethernet/sfc/rx.c                      |    1 +
14392  drivers/net/ethernet/smsc/smsc9420.c               |    1 +
14393  drivers/net/ethernet/xscale/ixp4xx_eth.c           |    1 +
14394  drivers/net/phy/realtek.c                          |    1 +
14395  drivers/net/usb/lg-vl600.c                         |    1 +
14396  drivers/net/veth.c                                 |    1 +
14397  drivers/net/vmxnet3/vmxnet3_drv.c                  |    1 +
14398  drivers/net/wimax/i2400m/control.c                 |    2 +
14399  drivers/net/wimax/i2400m/debugfs.c                 |    1 +
14400  drivers/net/wimax/i2400m/fw.c                      |    1 +
14401  drivers/net/wimax/i2400m/netdev.c                  |    1 +
14402  drivers/net/wimax/i2400m/rx.c                      |    2 +
14403  drivers/net/wimax/i2400m/sdio.c                    |    1 +
14404  drivers/net/wimax/i2400m/tx.c                      |    1 +
14405  drivers/net/wimax/i2400m/usb.c                     |    1 +
14406  drivers/net/wireless/adm8211.c                     |    1 +
14407  drivers/net/wireless/ath/ath5k/debug.c             |    2 +
14408  drivers/net/wireless/ath/ath5k/pci.c               |    1 +
14409  drivers/net/wireless/ath/ath9k/ahb.c               |    1 +
14410  drivers/net/wireless/ath/ath9k/ani.c               |    1 +
14411  drivers/net/wireless/ath/ath9k/ar9002_hw.c         |    1 +
14412  drivers/net/wireless/ath/ath9k/ar9002_mac.c        |    1 +
14413  drivers/net/wireless/ath/ath9k/ar9003_mac.c        |    1 +
14414  drivers/net/wireless/ath/ath9k/ar9003_paprd.c      |    1 +
14415  drivers/net/wireless/ath/ath9k/ar9003_phy.c        |    1 +
14416  drivers/net/wireless/ath/ath9k/btcoex.c            |    1 +
14417  drivers/net/wireless/ath/ath9k/calib.c             |    1 +
14418  drivers/net/wireless/ath/ath9k/debug.c             |    1 +
14419  drivers/net/wireless/ath/ath9k/hw.c                |    1 +
14420  drivers/net/wireless/ath/ath9k/init.c              |    1 +
14421  drivers/net/wireless/ath/ath9k/mac.c               |    1 +
14422  drivers/net/wireless/ath/ath9k/pci.c               |    1 +
14423  drivers/net/wireless/ath/ath9k/rc.c                |    1 +
14424  drivers/net/wireless/ath/carl9170/fw.c             |    1 +
14425  drivers/net/wireless/ath/debug.c                   |    1 +
14426  drivers/net/wireless/ath/hw.c                      |    1 +
14427  drivers/net/wireless/ath/key.c                     |    1 +
14428  drivers/net/wireless/ath/regd.c                    |    1 +
14429  drivers/net/wireless/b43/main.c                    |    2 +-
14430  drivers/net/wireless/b43/pcmcia.c                  |    1 +
14431  drivers/net/wireless/b43legacy/main.c              |    2 +-
14432  drivers/net/wireless/hostap/hostap_80211_rx.c      |    1 +
14433  drivers/net/wireless/hostap/hostap_80211_tx.c      |    1 +
14434  drivers/net/wireless/hostap/hostap_ap.c            |    2 +
14435  drivers/net/wireless/hostap/hostap_info.c          |    1 +
14436  drivers/net/wireless/hostap/hostap_ioctl.c         |    1 +
14437  drivers/net/wireless/hostap/hostap_proc.c          |    1 +
14438  drivers/net/wireless/iwlegacy/iwl-debugfs.c        |    1 +
14439  drivers/net/wireless/iwlegacy/iwl-rx.c             |    1 +
14440  drivers/net/wireless/iwlegacy/iwl-scan.c           |    1 +
14441  drivers/net/wireless/iwlegacy/iwl-sta.c            |    1 +
14442  drivers/net/wireless/iwlegacy/iwl-tx.c             |    1 +
14443  drivers/net/wireless/iwlwifi/iwl-pci.c             |    1 +
14444  drivers/net/wireless/iwmc3200wifi/commands.c       |    1 +
14445  drivers/net/wireless/iwmc3200wifi/debugfs.c        |    1 +
14446  drivers/net/wireless/iwmc3200wifi/main.c           |    1 +
14447  drivers/net/wireless/iwmc3200wifi/sdio.c           |    1 +
14448  drivers/net/wireless/libertas/cmd.c                |    1 +
14449  drivers/net/wireless/libertas/debugfs.c            |    1 +
14450  drivers/net/wireless/libertas/if_sdio.c            |    2 +-
14451  drivers/net/wireless/libertas/if_spi.c             |    2 +-
14452  drivers/net/wireless/libertas/if_usb.c             |    2 +-
14453  drivers/net/wireless/libertas/main.c               |    2 +-
14454  drivers/net/wireless/libertas/rx.c                 |    1 +
14455  drivers/net/wireless/libertas/tx.c                 |    1 +
14456  drivers/net/wireless/libertas_tf/cmd.c             |    1 +
14457  drivers/net/wireless/libertas_tf/if_usb.c          |    2 +-
14458  drivers/net/wireless/libertas_tf/main.c            |    1 +
14459  drivers/net/wireless/mac80211_hwsim.c              |    1 +
14460  drivers/net/wireless/orinoco/fw.c                  |    1 +
14461  drivers/net/wireless/p54/eeprom.c                  |    1 +
14462  drivers/net/wireless/p54/fwio.c                    |    1 +
14463  drivers/net/wireless/p54/main.c                    |    1 +
14464  drivers/net/wireless/p54/p54pci.c                  |    1 +
14465  drivers/net/wireless/p54/p54usb.c                  |    1 +
14466  drivers/net/wireless/p54/txrx.c                    |    1 +
14467  drivers/net/wireless/rtl818x/rtl8180/dev.c         |    1 +
14468  drivers/net/wireless/rtl818x/rtl8187/dev.c         |    1 +
14469  drivers/net/wireless/rtlwifi/base.c                |    1 +
14470  drivers/net/wireless/rtlwifi/cam.c                 |    1 +
14471  drivers/net/wireless/rtlwifi/efuse.c               |    1 +
14472  drivers/net/wireless/rtlwifi/pci.c                 |    1 +
14473  drivers/net/wireless/rtlwifi/ps.c                  |    1 +
14474  drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c  |    1 +
14475  drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c  |    1 +
14476  drivers/net/wireless/rtlwifi/rtl8192c/main.c       |    1 +
14477  drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c |    1 +
14478  drivers/net/wireless/rtlwifi/rtl8192ce/sw.c        |    1 +
14479  drivers/net/wireless/rtlwifi/rtl8192cu/sw.c        |    1 +
14480  drivers/net/wireless/rtlwifi/rtl8192de/sw.c        |    1 +
14481  drivers/net/wireless/rtlwifi/rtl8192se/sw.c        |    1 +
14482  drivers/net/wireless/rtlwifi/usb.c                 |    1 +
14483  drivers/net/wireless/wl12xx/boot.c                 |    1 +
14484  drivers/net/wireless/zd1211rw/zd_usb.c             |    1 +
14485  drivers/of/of_net.c                                |    1 +
14486  drivers/of/of_pci.c                                |    1 +
14487  drivers/of/of_pci_irq.c                            |    1 +
14488  drivers/of/of_spi.c                                |    1 +
14489  drivers/parisc/ccio-dma.c                          |    1 +
14490  drivers/parisc/sba_iommu.c                         |    1 +
14491  drivers/pci/hotplug-pci.c                          |    1 +
14492  drivers/pci/hotplug/pciehp_acpi.c                  |    1 +
14493  drivers/pci/hotplug/pcihp_slot.c                   |    1 +
14494  drivers/pci/hotplug/rpadlpar_core.c                |    1 +
14495  drivers/pci/htirq.c                                |    1 +
14496  drivers/pci/iov.c                                  |    1 +
14497  drivers/pci/irq.c                                  |    1 +
14498  drivers/pci/msi.c                                  |    1 +
14499  drivers/pci/pci-sysfs.c                            |    1 +
14500  drivers/pci/quirks.c                               |    1 +
14501  drivers/pci/rom.c                                  |    1 +
14502  drivers/pci/setup-res.c                            |    1 +
14503  drivers/pci/slot.c                                 |    1 +
14504  drivers/pci/vpd.c                                  |    1 +
14505  drivers/pcmcia/db1xxx_ss.c                         |    1 +
14506  drivers/pcmcia/pxa2xx_cm_x255.c                    |    1 +
14507  drivers/pcmcia/pxa2xx_cm_x270.c                    |    1 +
14508  drivers/platform/x86/intel_scu_ipc.c               |    1 +
14509  drivers/platform/x86/msi-wmi.c                     |    1 +
14510  drivers/platform/x86/wmi.c                         |    1 +
14511  drivers/power/max17042_battery.c                   |    1 +
14512  drivers/power/max8903_charger.c                    |    1 +
14513  drivers/power/max8997_charger.c                    |    1 +
14514  drivers/power/max8998_charger.c                    |    1 +
14515  drivers/power/power_supply_sysfs.c                 |    1 +
14516  drivers/ps3/ps3stor_lib.c                          |    1 +
14517  drivers/ps3/sys-manager-core.c                     |    1 +
14518  drivers/rapidio/switches/idt_gen2.c                |    1 +
14519  drivers/regulator/88pm8607.c                       |    1 +
14520  drivers/regulator/ab8500.c                         |    1 +
14521  drivers/regulator/bq24022.c                        |    1 +
14522  drivers/regulator/core.c                           |    1 +
14523  drivers/regulator/da903x.c                         |    1 +
14524  drivers/regulator/db8500-prcmu.c                   |    1 +
14525  drivers/regulator/dummy.c                          |    1 +
14526  drivers/regulator/fixed.c                          |    1 +
14527  drivers/regulator/lp3971.c                         |    1 +
14528  drivers/regulator/lp3972.c                         |    1 +
14529  drivers/regulator/max8925-regulator.c              |    1 +
14530  drivers/regulator/max8997.c                        |    1 +
14531  drivers/regulator/mc13783-regulator.c              |    1 +
14532  drivers/regulator/mc13892-regulator.c              |    1 +
14533  drivers/regulator/mc13xxx-regulator-core.c         |    1 +
14534  drivers/regulator/tps6586x-regulator.c             |    1 +
14535  drivers/regulator/userspace-consumer.c             |    1 +
14536  drivers/regulator/virtual.c                        |    1 +
14537  drivers/regulator/wm8400-regulator.c               |    1 +
14538  drivers/rtc/interface.c                            |    1 +
14539  drivers/rtc/rtc-dm355evm.c                         |    1 +
14540  drivers/rtc/rtc-ds1305.c                           |    1 +
14541  drivers/rtc/rtc-ds1511.c                           |    1 +
14542  drivers/rtc/rtc-ds1553.c                           |    1 +
14543  drivers/rtc/rtc-ds1672.c                           |    1 +
14544  drivers/rtc/rtc-ds1742.c                           |    1 +
14545  drivers/rtc/rtc-em3027.c                           |    1 +
14546  drivers/rtc/rtc-isl12022.c                         |    1 +
14547  drivers/rtc/rtc-mv.c                               |    1 +
14548  drivers/rtc/rtc-pcf2123.c                          |    1 +
14549  drivers/rtc/rtc-pcf8563.c                          |    1 +
14550  drivers/rtc/rtc-rs5c348.c                          |    1 +
14551  drivers/rtc/rtc-rs5c372.c                          |    1 +
14552  drivers/rtc/rtc-stk17ta8.c                         |    1 +
14553  drivers/rtc/rtc-tx4939.c                           |    1 +
14554  drivers/rtc/rtc-x1205.c                            |    1 +
14555  drivers/s390/char/fs3270.c                         |    1 +
14556  drivers/s390/char/sclp_cpi_sys.c                   |    1 +
14557  drivers/s390/char/vmcp.c                           |    1 +
14558  drivers/s390/char/vmur.c                           |    1 +
14559  drivers/s390/cio/chp.c                             |    2 +
14560  drivers/s390/cio/qdio_debug.c                      |    2 +
14561  drivers/s390/cio/qdio_setup.c                      |    1 +
14562  drivers/s390/kvm/kvm_virtio.c                      |    1 +
14563  drivers/s390/scsi/zfcp_aux.c                       |    1 +
14564  drivers/s390/scsi/zfcp_ccw.c                       |    1 +
14565  drivers/s390/scsi/zfcp_dbf.c                       |    1 +
14566  drivers/s390/scsi/zfcp_qdio.c                      |    1 +
14567  drivers/s390/scsi/zfcp_scsi.c                      |    1 +
14568  drivers/scsi/a2091.c                               |    1 +
14569  drivers/scsi/a3000.c                               |    1 +
14570  drivers/scsi/aacraid/aachba.c                      |    1 +
14571  drivers/scsi/be2iscsi/be_main.c                    |    1 +
14572  drivers/scsi/bfa/bfad_debugfs.c                    |    1 +
14573  drivers/scsi/bfa/bfad_im.c                         |    2 +
14574  drivers/scsi/cxgbi/libcxgbi.c                      |    1 +
14575  drivers/scsi/device_handler/scsi_dh.c              |    1 +
14576  drivers/scsi/device_handler/scsi_dh_alua.c         |    1 +
14577  drivers/scsi/device_handler/scsi_dh_emc.c          |    1 +
14578  drivers/scsi/device_handler/scsi_dh_hp_sw.c        |    1 +
14579  drivers/scsi/device_handler/scsi_dh_rdac.c         |    1 +
14580  drivers/scsi/gvp11.c                               |    1 +
14581  drivers/scsi/iscsi_tcp.c                           |    1 +
14582  drivers/scsi/libfc/fc_disc.c                       |    1 +
14583  drivers/scsi/libfc/fc_elsct.c                      |    1 +
14584  drivers/scsi/libfc/fc_exch.c                       |    1 +
14585  drivers/scsi/libfc/fc_libfc.c                      |    1 +
14586  drivers/scsi/libfc/fc_lport.c                      |    1 +
14587  drivers/scsi/libfc/fc_npiv.c                       |    1 +
14588  drivers/scsi/libfc/fc_rport.c                      |    1 +
14589  drivers/scsi/libiscsi.c                            |    1 +
14590  drivers/scsi/libiscsi_tcp.c                        |    1 +
14591  drivers/scsi/libsas/sas_scsi_host.c                |    1 +
14592  drivers/scsi/libsas/sas_task.c                     |    1 +
14593  drivers/scsi/libsrp.c                              |    1 +
14594  drivers/scsi/lpfc/lpfc_attr.c                      |    1 +
14595  drivers/scsi/lpfc/lpfc_debugfs.c                   |    1 +
14596  drivers/scsi/lpfc/lpfc_init.c                      |    1 +
14597  drivers/scsi/lpfc/lpfc_scsi.c                      |    1 +
14598  drivers/scsi/mac53c94.c                            |    1 +
14599  drivers/scsi/megaraid/megaraid_mbox.c              |    1 +
14600  drivers/scsi/osd/osd_initiator.c                   |    1 +
14601  drivers/scsi/ps3rom.c                              |    1 +
14602  drivers/scsi/scsi_lib.c                            |    1 +
14603  drivers/scsi/scsi_lib_dma.c                        |    1 +
14604  drivers/scsi/scsi_netlink.c                        |    1 +
14605  drivers/scsi/scsi_pm.c                             |    1 +
14606  drivers/scsi/scsi_tgt_if.c                         |    1 +
14607  drivers/scsi/sr_ioctl.c                            |    1 +
14608  drivers/sfi/sfi_core.h                             |    3 +
14609  drivers/sh/intc/core.c                             |    2 +
14610  drivers/sh/intc/dynamic.c                          |    1 +
14611  drivers/sh/intc/virq.c                             |    1 +
14612  drivers/sh/maple/maple.c                           |    1 +
14613  drivers/spi/spi-altera.c                           |    1 +
14614  drivers/spi/spi-au1550.c                           |    1 +
14615  drivers/spi/spi-bitbang.c                          |    1 +
14616  drivers/spi/spi-butterfly.c                        |    1 +
14617  drivers/spi/spi-dw-mmio.c                          |    1 +
14618  drivers/spi/spi-dw-pci.c                           |    1 +
14619  drivers/spi/spi-dw.c                               |    1 +
14620  drivers/spi/spi-gpio.c                             |    1 +
14621  drivers/spi/spi-oc-tiny.c                          |    1 +
14622  drivers/spi/spi-omap-uwire.c                       |    1 +
14623  drivers/spi/spi-orion.c                            |    1 +
14624  drivers/spi/spi-pxa2xx-pci.c                       |    1 +
14625  drivers/spi/spi-s3c24xx.c                          |    1 +
14626  drivers/spi/spi-sh-msiof.c                         |    1 +
14627  drivers/spi/spi-sh-sci.c                           |    1 +
14628  drivers/spi/spi-ti-ssp.c                           |    1 +
14629  drivers/spi/spi-tle62x0.c                          |    1 +
14630  drivers/spi/spi-txx9.c                             |    1 +
14631  drivers/spi/spi.c                                  |    1 +
14632  drivers/ssb/b43_pci_bridge.c                       |    1 +
14633  drivers/ssb/driver_chipcommon.c                    |    1 +
14634  drivers/ssb/driver_chipcommon_pmu.c                |    1 +
14635  drivers/ssb/driver_gige.c                          |    1 +
14636  drivers/ssb/driver_pcicore.c                       |    1 +
14637  drivers/ssb/embedded.c                             |    1 +
14638  drivers/ssb/main.c                                 |    1 +
14639  drivers/ssb/pcihost_wrapper.c                      |    1 +
14640  drivers/staging/brcm80211/brcmfmac/bcmsdh.c        |    2 +
14641  drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c  |    1 +
14642  drivers/staging/brcm80211/brcmfmac/dhd_linux.c     |    1 +
14643  drivers/staging/brcm80211/brcmfmac/dhd_sdio.c      |    1 +
14644  drivers/staging/brcm80211/brcmsmac/mac80211_if.c   |    1 +
14645  drivers/staging/brcm80211/brcmutil/utils.c         |    1 +
14646  drivers/staging/brcm80211/brcmutil/wifi.c          |    1 +
14647  drivers/staging/cxt1e1/linux.c                     |    1 +
14648  drivers/staging/dt3155v4l/dt3155v4l.c              |    1 +
14649  drivers/staging/gma500/intel_i2c.c                 |    1 +
14650  drivers/staging/gma500/mdfld_dsi_output.c          |    1 +
14651  drivers/staging/gma500/mdfld_output.c              |    3 +-
14652  drivers/staging/gma500/mid_bios.c                  |    1 +
14653  drivers/staging/gma500/mrst_hdmi_i2c.c             |    1 +
14654  drivers/staging/gma500/psb_drv.c                   |    1 +
14655  drivers/staging/iio/accel/adis16201_ring.c         |    1 +
14656  drivers/staging/iio/accel/adis16201_trigger.c      |    1 +
14657  drivers/staging/iio/accel/adis16203_ring.c         |    1 +
14658  drivers/staging/iio/accel/adis16203_trigger.c      |    1 +
14659  drivers/staging/iio/accel/adis16204_ring.c         |    1 +
14660  drivers/staging/iio/accel/adis16204_trigger.c      |    1 +
14661  drivers/staging/iio/accel/adis16209_ring.c         |    1 +
14662  drivers/staging/iio/accel/adis16209_trigger.c      |    1 +
14663  drivers/staging/iio/accel/adis16240_ring.c         |    1 +
14664  drivers/staging/iio/accel/adis16240_trigger.c      |    1 +
14665  drivers/staging/iio/accel/lis3l02dq_ring.c         |    1 +
14666  drivers/staging/iio/adc/ad7793.c                   |    1 +
14667  drivers/staging/iio/dac/ad5686.c                   |    1 +
14668  drivers/staging/iio/gyro/adis16060_core.c          |    1 +
14669  drivers/staging/iio/gyro/adis16260_ring.c          |    1 +
14670  drivers/staging/iio/gyro/adis16260_trigger.c       |    1 +
14671  drivers/staging/iio/imu/adis16400_ring.c           |    1 +
14672  drivers/staging/iio/imu/adis16400_trigger.c        |    1 +
14673  drivers/staging/iio/meter/ade7758_ring.c           |    1 +
14674  drivers/staging/iio/meter/ade7758_trigger.c        |    1 +
14675  drivers/staging/intel_sst/intel_sst.c              |    1 +
14676  .../staging/intel_sst/intel_sst_drv_interface.c    |    1 +
14677  drivers/staging/line6/audio.c                      |    1 +
14678  drivers/staging/solo6x10/g723.c                    |    1 +
14679  drivers/staging/usbip/usbip_common.c               |    1 +
14680  drivers/staging/usbip/usbip_event.c                |    1 +
14681  drivers/staging/winbond/wbusb.c                    |    1 +
14682  drivers/staging/wlags49_h2/wl_cs.c                 |    1 +
14683  drivers/target/iscsi/iscsi_target.c                |    1 +
14684  drivers/target/iscsi/iscsi_target_configfs.c       |    1 +
14685  drivers/target/iscsi/iscsi_target_stat.c           |    1 +
14686  drivers/target/target_core_alua.c                  |    1 +
14687  drivers/target/target_core_device.c                |    1 +
14688  drivers/target/target_core_fabric_lib.c            |    1 +
14689  drivers/target/target_core_file.c                  |    1 +
14690  drivers/target/target_core_hba.c                   |    1 +
14691  drivers/target/target_core_iblock.c                |    1 +
14692  drivers/target/target_core_pscsi.c                 |    1 +
14693  drivers/target/target_core_tmr.c                   |    1 +
14694  drivers/target/target_core_tpg.c                   |    1 +
14695  drivers/target/target_core_transport.c             |    1 +
14696  drivers/tty/hvc/hvc_iseries.c                      |    1 +
14697  drivers/tty/hvc/hvc_vio.c                          |    1 +
14698  drivers/tty/serial/jsm/jsm_driver.c                |    2 +-
14699  drivers/tty/serial/kgdboc.c                        |    1 +
14700  drivers/tty/serial/max3100.c                       |    1 +
14701  drivers/tty/serial/max3107-aava.c                  |    1 +
14702  drivers/tty/serial/max3107.c                       |    1 +
14703  drivers/tty/serial/nwpserial.c                     |    1 +
14704  drivers/tty/serial/timbuart.c                      |    1 +
14705  drivers/tty/serial/xilinx_uartps.c                 |    1 +
14706  drivers/tty/vt/vc_screen.c                         |    1 +
14707  drivers/uio/uio_pdrv.c                             |    1 +
14708  drivers/uio/uio_pdrv_genirq.c                      |    1 +
14709  drivers/usb/c67x00/c67x00-drv.c                    |    1 +
14710  drivers/usb/core/driver.c                          |    1 +
14711  drivers/usb/core/notify.c                          |    1 +
14712  drivers/usb/gadget/cdc2.c                          |    1 +
14713  drivers/usb/gadget/composite.c                     |    1 +
14714  drivers/usb/gadget/dbgp.c                          |    1 +
14715  drivers/usb/gadget/f_fs.c                          |    1 +
14716  drivers/usb/gadget/f_obex.c                        |    1 +
14717  drivers/usb/gadget/f_sourcesink.c                  |    1 +
14718  drivers/usb/gadget/file_storage.c                  |    1 +
14719  drivers/usb/gadget/fusb300_udc.c                   |    1 +
14720  drivers/usb/gadget/gmidi.c                         |    1 +
14721  drivers/usb/gadget/u_serial.c                      |    1 +
14722  drivers/usb/host/fsl-mph-dr-of.c                   |    1 +
14723  drivers/usb/host/isp1760-if.c                      |    1 +
14724  drivers/usb/host/pci-quirks.c                      |    1 +
14725  drivers/usb/host/whci/debug.c                      |    1 +
14726  drivers/usb/host/whci/hcd.c                        |    1 +
14727  drivers/usb/host/xhci-hub.c                        |    1 +
14728  drivers/usb/host/xhci-pci.c                        |    1 +
14729  drivers/usb/mon/mon_bin.c                          |    1 +
14730  drivers/usb/mon/mon_stat.c                         |    1 +
14731  drivers/usb/mon/mon_text.c                         |    1 +
14732  drivers/usb/otg/gpio_vbus.c                        |    1 +
14733  drivers/usb/otg/otg.c                              |    1 +
14734  drivers/usb/otg/ulpi.c                             |    1 +
14735  drivers/usb/serial/aircable.c                      |    1 +
14736  drivers/usb/serial/qcserial.c                      |    1 +
14737  drivers/usb/storage/option_ms.c                    |    1 +
14738  drivers/usb/storage/protocol.c                     |    1 +
14739  drivers/usb/storage/sierra_ms.c                    |    1 +
14740  drivers/usb/storage/transport.c                    |    1 +
14741  drivers/usb/storage/uas.c                          |    1 +
14742  drivers/usb/wusbcore/devconnect.c                  |    1 +
14743  drivers/usb/wusbcore/mmc.c                         |    1 +
14744  drivers/usb/wusbcore/rh.c                          |    1 +
14745  drivers/usb/wusbcore/security.c                    |    1 +
14746  drivers/usb/wusbcore/wa-hc.c                       |    1 +
14747  drivers/usb/wusbcore/wa-rpipe.c                    |    1 +
14748  drivers/usb/wusbcore/wa-xfer.c                     |    1 +
14749  drivers/uwb/est.c                                  |    1 +
14750  drivers/uwb/i1480/dfu/dfu.c                        |    1 +
14751  drivers/uwb/ie.c                                   |    1 +
14752  drivers/uwb/lc-dev.c                               |    2 +
14753  drivers/uwb/lc-rc.c                                |    1 +
14754  drivers/uwb/neh.c                                  |    1 +
14755  drivers/uwb/pal.c                                  |    1 +
14756  drivers/uwb/radio.c                                |    1 +
14757  drivers/uwb/reset.c                                |    1 +
14758  drivers/uwb/rsv.c                                  |    1 +
14759  drivers/uwb/scan.c                                 |    1 +
14760  drivers/uwb/umc-bus.c                              |    1 +
14761  drivers/uwb/umc-dev.c                              |    1 +
14762  drivers/uwb/umc-drv.c                              |    1 +
14763  drivers/uwb/whci.c                                 |    1 +
14764  drivers/video/atmel_lcdfb.c                        |    1 +
14765  drivers/video/backlight/88pm860x_bl.c              |    1 +
14766  drivers/video/backlight/adp5520_bl.c               |    1 +
14767  drivers/video/backlight/ams369fg06.c               |    1 +
14768  drivers/video/backlight/da903x_bl.c                |    1 +
14769  drivers/video/backlight/ep93xx_bl.c                |    1 +
14770  drivers/video/backlight/l4f00242t03.c              |    1 +
14771  drivers/video/backlight/ld9040.c                   |    1 +
14772  drivers/video/backlight/lms283gf05.c               |    1 +
14773  drivers/video/backlight/max8925_bl.c               |    1 +
14774  drivers/video/backlight/s6e63m0.c                  |    1 +
14775  drivers/video/backlight/wm831x_bl.c                |    1 +
14776  drivers/video/carminefb.c                          |    1 +
14777  drivers/video/cobalt_lcdfb.c                       |    1 +
14778  drivers/video/ep93xx-fb.c                          |    1 +
14779  drivers/video/fb_ddc.c                             |    3 +-
14780  drivers/video/fb_notify.c                          |    1 +
14781  drivers/video/mb862xx/mb862xx-i2c.c                |    1 +
14782  drivers/video/mb862xx/mb862xxfbdrv.c               |    1 +
14783  drivers/video/msm/mdp.c                            |    1 +
14784  drivers/video/omap/lcd_mipid.c                     |    1 +
14785  drivers/video/omap/omapfb_main.c                   |    1 +
14786  drivers/video/omap2/dss/dispc.c                    |    1 +
14787  drivers/video/omap2/dss/dpi.c                      |    1 +
14788  drivers/video/omap2/dss/dsi.c                      |    1 +
14789  drivers/video/omap2/dss/dss.c                      |    1 +
14790  drivers/video/omap2/dss/rfbi.c                     |    1 +
14791  drivers/video/omap2/dss/sdi.c                      |    1 +
14792  drivers/video/omap2/omapfb/omapfb-ioctl.c          |    1 +
14793  drivers/video/savage/savagefb_accel.c              |    1 +
14794  drivers/video/sh_mipi_dsi.c                        |    1 +
14795  drivers/video/sh_mobile_lcdcfb.c                   |    1 +
14796  drivers/video/via/via-gpio.c                       |    1 +
14797  drivers/video/w100fb.c                             |    1 +
14798  drivers/virtio/virtio.c                            |    1 +
14799  drivers/virtio/virtio_balloon.c                    |    1 +
14800  drivers/virtio/virtio_ring.c                       |    1 +
14801  drivers/w1/w1_family.c                             |    1 +
14802  drivers/w1/w1_int.c                                |    2 +
14803  drivers/watchdog/stmp3xxx_wdt.c                    |    1 +
14804  drivers/xen/balloon.c                              |    1 +
14805  drivers/xen/manage.c                               |    1 +
14806  drivers/xen/swiotlb-xen.c                          |    1 +
14807  drivers/xen/xen-pciback/conf_space.c               |    1 +
14808  drivers/xen/xen-selfballoon.c                      |    2 +
14809  drivers/xen/xenbus/xenbus_client.c                 |    1 +
14810  drivers/xen/xenbus/xenbus_probe.c                  |    1 +
14811  drivers/xen/xenbus/xenbus_probe_backend.c          |    1 +
14812  drivers/xen/xenbus/xenbus_probe_frontend.c         |    1 +
14813  drivers/zorro/proc.c                               |    1 +
14814  fs/bio-integrity.c                                 |    1 +
14815  fs/cifs/connect.c                                  |    1 +
14816  fs/exofs/ore.c                                     |    1 +
14817  fs/exofs/super.c                                   |    1 +
14818  fs/fuse/cuse.c                                     |    1 +
14819  fs/gfs2/ops_fstype.c                               |    1 +
14820  fs/ioprio.c                                        |    1 +
14821  fs/jfs/jfs_logmgr.c                                |    1 +
14822  fs/logfs/super.c                                   |    1 +
14823  fs/nfs/nfs4filelayout.c                            |    1 +
14824  fs/nfs/pagelist.c                                  |    1 +
14825  fs/nfs/pnfs.c                                      |    1 +
14826  fs/nfs/pnfs_dev.c                                  |    1 +
14827  fs/nfs/write.c                                     |    1 +
14828  fs/nfsd/nfs4acl.c                                  |    1 +
14829  fs/nfsd/nfsctl.c                                   |    1 +
14830  fs/nfsd/nfssvc.c                                   |    1 +
14831  fs/ocfs2/cluster/tcp.c                             |    1 +
14832  fs/ocfs2/dlm/dlmdebug.c                            |    1 +
14833  fs/proc/vmcore.c                                   |    1 +
14834  include/acpi/platform/aclinux.h                    |    2 +-
14835  include/drm/drmP.h                                 |    3 +-
14836  include/linux/bcma/bcma.h                          |    7 +-
14837  include/linux/blkdev.h                             |    2 +-
14838  include/linux/cpuidle.h                            |    3 +-
14839  include/linux/crypto.h                             |    6 --
14840  include/linux/device.h                             |   15 ++-
14841  include/linux/device_cgroup.h                      |    1 -
14842  include/linux/dmaengine.h                          |    2 +
14843  include/linux/export.h                             |   89 ++++++++++++++++++++
14844  include/linux/firmware.h                           |    2 +-
14845  include/linux/ftrace.h                             |    2 +-
14846  include/linux/gameport.h                           |   17 ++--
14847  include/linux/hid.h                                |    9 +-
14848  include/linux/i2c.h                                |   10 +-
14849  include/linux/ipmi.h                               |    3 +-
14850  include/linux/ipmi_smi.h                           |    1 -
14851  include/linux/irq.h                                |   32 +++-----
14852  include/linux/irqdesc.h                            |    1 +
14853  include/linux/mdio-bitbang.h                       |    3 +-
14854  include/linux/miscdevice.h                         |    3 +-
14855  include/linux/module.h                             |   73 +----------------
14856  include/linux/moduleparam.h                        |    5 +
14857  include/linux/mtd/mtd.h                            |    3 +-
14858  include/linux/of_platform.h                        |    1 -
14859  include/linux/pci_hotplug.h                        |   10 +--
14860  include/linux/pm_runtime.h                         |    1 +
14861  include/linux/regmap.h                             |    2 +-
14862  include/linux/regulator/driver.h                   |    1 +
14863  include/linux/serio.h                              |   20 +++--
14864  include/linux/ssb/ssb.h                            |    7 +-
14865  include/linux/stop_machine.h                       |    1 +
14866  include/linux/sunrpc/svc_xprt.h                    |    3 +-
14867  include/linux/sysdev.h                             |    1 -
14868  include/linux/textsearch.h                         |    3 +-
14869  include/linux/uio_driver.h                         |   12 ++--
14870  include/linux/usb.h                                |    9 +-
14871  include/linux/uwb.h                                |    1 +
14872  include/linux/uwb/umc.h                            |    7 +-
14873  include/linux/vermagic.h                           |    1 -
14874  include/linux/vlynq.h                              |    3 +-
14875  include/media/saa7146.h                            |    3 +-
14876  include/media/v4l2-int-device.h                    |    3 +-
14877  include/net/bluetooth/hci_core.h                   |   24 +++---
14878  include/net/inet_timewait_sock.h                   |    1 -
14879  include/net/ip_vs.h                                |   15 ++--
14880  include/net/lib80211.h                             |    3 +-
14881  include/net/netfilter/nf_conntrack.h               |    2 +
14882  include/net/sch_generic.h                          |    1 -
14883  include/net/sock.h                                 |    2 +-
14884  include/sound/core.h                               |    2 +-
14885  include/trace/define_trace.h                       |   10 --
14886  include/trace/events/module.h                      |    2 +-
14887  include/xen/xenbus.h                               |    1 +
14888  kernel/async.c                                     |    2 +-
14889  kernel/audit.c                                     |    2 +-
14890  kernel/auditsc.c                                   |    2 +-
14891  kernel/capability.c                                |    2 +-
14892  kernel/cgroup_freezer.c                            |    2 +-
14893  kernel/compat.c                                    |    1 +
14894  kernel/cpu.c                                       |    2 +-
14895  kernel/cpuset.c                                    |    2 +-
14896  kernel/crash_dump.c                                |    2 +-
14897  kernel/cred.c                                      |    2 +-
14898  kernel/debug/kdb/kdb_debugger.c                    |    1 +
14899  kernel/dma.c                                       |    2 +-
14900  kernel/events/core.c                               |    1 +
14901  kernel/exit.c                                      |    3 +-
14902  kernel/fork.c                                      |    3 +-
14903  kernel/freezer.c                                   |    2 +-
14904  kernel/futex.c                                     |    2 +-
14905  kernel/groups.c                                    |    2 +-
14906  kernel/hrtimer.c                                   |    2 +-
14907  kernel/hung_task.c                                 |    2 +-
14908  kernel/irq/irqdesc.c                               |    2 +-
14909  kernel/irq_work.c                                  |    4 +-
14910  kernel/kfifo.c                                     |    2 +-
14911  kernel/kprobes.c                                   |    2 +-
14912  kernel/ksysfs.c                                    |    3 +-
14913  kernel/kthread.c                                   |    2 +-
14914  kernel/latencytop.c                                |    2 +-
14915  kernel/lockdep.c                                   |    2 +-
14916  kernel/lockdep_proc.c                              |    2 +-
14917  kernel/module.c                                    |    2 +-
14918  kernel/mutex-debug.c                               |    2 +-
14919  kernel/mutex.c                                     |    2 +-
14920  kernel/notifier.c                                  |    2 +-
14921  kernel/nsproxy.c                                   |    2 +-
14922  kernel/padata.c                                    |    2 +-
14923  kernel/params.c                                    |    4 +-
14924  kernel/pid.c                                       |    2 +-
14925  kernel/posix-timers.c                              |    2 +-
14926  kernel/power/hibernate.c                           |    1 +
14927  kernel/power/main.c                                |    1 +
14928  kernel/power/qos.c                                 |    1 +
14929  kernel/power/suspend.c                             |    2 +
14930  kernel/power/user.c                                |    1 +
14931  kernel/profile.c                                   |    2 +-
14932  kernel/ptrace.c                                    |    2 +-
14933  kernel/range.c                                     |    2 +-
14934  kernel/rcupdate.c                                  |    2 +-
14935  kernel/rcutiny.c                                   |    4 +-
14936  kernel/rcutorture.c                                |    3 +-
14937  kernel/rcutree.c                                   |    2 +-
14938  kernel/rcutree_trace.c                             |    3 +-
14939  kernel/relay.c                                     |    2 +-
14940  kernel/resource.c                                  |    2 +-
14941  kernel/rtmutex-debug.c                             |    2 +-
14942  kernel/rtmutex-tester.c                            |    2 +-
14943  kernel/rtmutex.c                                   |    2 +-
14944  kernel/rwsem.c                                     |    2 +-
14945  kernel/sched.c                                     |    2 +-
14946  kernel/sched_clock.c                               |    2 +-
14947  kernel/semaphore.c                                 |    2 +-
14948  kernel/signal.c                                    |    2 +-
14949  kernel/smp.c                                       |    2 +-
14950  kernel/softirq.c                                   |    2 +-
14951  kernel/spinlock.c                                  |    2 +-
14952  kernel/srcu.c                                      |    2 +-
14953  kernel/stacktrace.c                                |    2 +-
14954  kernel/stop_machine.c                              |    2 +-
14955  kernel/sys.c                                       |    3 +-
14956  kernel/time.c                                      |    2 +-
14957  kernel/time/posix-clock.c                          |    1 +
14958  kernel/timer.c                                     |    2 +-
14959  kernel/trace/blktrace.c                            |    1 +
14960  kernel/trace/ftrace.c                              |    1 +
14961  kernel/trace/trace_syscalls.c                      |    1 +
14962  kernel/up.c                                        |    2 +-
14963  kernel/user-return-notifier.c                      |    2 +-
14964  kernel/user.c                                      |    2 +-
14965  kernel/user_namespace.c                            |    2 +-
14966  kernel/utsname.c                                   |    2 +-
14967  kernel/utsname_sysctl.c                            |    2 +-
14968  kernel/wait.c                                      |    2 +-
14969  kernel/watchdog.c                                  |    3 +-
14970  kernel/workqueue.c                                 |    2 +-
14971  lib/dma-debug.c                                    |    1 +
14972  lib/raid6/algos.c                                  |    1 +
14973  lib/raid6/mktables.c                               |    1 +
14974  lib/raid6/recov.c                                  |    1 +
14975  mm/fremap.c                                        |    1 -
14976  mm/memcontrol.c                                    |    1 +
14977  mm/memory-failure.c                                |    1 +
14978  mm/mmzone.c                                        |    1 -
14979  mm/quicklist.c                                     |    1 -
14980  mm/sparse-vmemmap.c                                |    1 -
14981  mm/swap_state.c                                    |    1 -
14982  mm/swapfile.c                                      |    1 -
14983  net/802/fc.c                                       |    1 +
14984  net/802/garp.c                                     |    1 +
14985  net/802/stp.c                                      |    1 +
14986  net/8021q/vlan_core.c                              |    1 +
14987  net/8021q/vlan_netlink.c                           |    1 +
14988  net/appletalk/aarp.c                               |    1 +
14989  net/appletalk/atalk_proc.c                         |    1 +
14990  net/atm/pvc.c                                      |    1 +
14991  net/atm/svc.c                                      |    1 +
14992  net/ax25/ax25_route.c                              |    1 +
14993  net/ax25/ax25_uid.c                                |    1 +
14994  net/bluetooth/hci_sysfs.c                          |    1 +
14995  net/bluetooth/l2cap_sock.c                         |    2 +
14996  net/bluetooth/mgmt.c                               |    1 +
14997  net/bridge/br_input.c                              |    1 +
14998  net/bridge/br_stp_if.c                             |    1 +
14999  net/caif/caif_dev.c                                |    1 +
15000  net/caif/cfpkt_skbuff.c                            |    1 +
15001  net/ceph/messenger.c                               |    1 +
15002  net/compat.c                                       |    1 +
15003  net/core/dev_addr_lists.c                          |    1 +
15004  net/core/fib_rules.c                               |    1 +
15005  net/core/net-sysfs.c                               |    1 +
15006  net/core/net-traces.c                              |    1 +
15007  net/core/net_namespace.c                           |    1 +
15008  net/core/netevent.c                                |    1 +
15009  net/core/netpoll.c                                 |    1 +
15010  net/core/timestamping.c                            |    1 +
15011  net/core/user_dma.c                                |    1 +
15012  net/dcb/dcbevent.c                                 |    1 +
15013  net/dcb/dcbnl.c                                    |    1 +
15014  net/dccp/ackvec.c                                  |    1 +
15015  net/dccp/ccids/lib/tfrc.c                          |    1 +
15016  net/dccp/timer.c                                   |    1 +
15017  net/decnet/dn_route.c                              |    1 +
15018  net/decnet/dn_rules.c                              |    1 +
15019  net/dsa/dsa.c                                      |    1 +
15020  net/ieee802154/nl-mac.c                            |    1 +
15021  net/ipv4/fib_rules.c                               |    1 +
15022  net/ipv4/fib_trie.c                                |    1 +
15023  net/ipv4/inet_timewait_sock.c                      |    1 +
15024  net/ipv4/ipconfig.c                                |    1 +
15025  net/ipv4/ipmr.c                                    |    1 +
15026  net/ipv4/netfilter.c                               |    1 +
15027  .../netfilter/nf_conntrack_l3proto_ipv4_compat.c   |    1 +
15028  net/ipv4/netfilter/nf_nat_proto_common.c           |    1 +
15029  net/ipv4/netfilter/nf_nat_proto_icmp.c             |    1 +
15030  net/ipv4/netfilter/nf_nat_proto_sctp.c             |    1 +
15031  net/ipv4/netfilter/nf_nat_proto_tcp.c              |    1 +
15032  net/ipv4/netfilter/nf_nat_proto_udp.c              |    1 +
15033  net/ipv4/netfilter/nf_nat_proto_udplite.c          |    1 +
15034  net/ipv4/ping.c                                    |    1 +
15035  net/ipv4/proc.c                                    |    1 +
15036  net/ipv4/raw.c                                     |    1 +
15037  net/ipv4/syncookies.c                              |    1 +
15038  net/ipv4/udplite.c                                 |    1 +
15039  net/ipv4/xfrm4_state.c                             |    1 +
15040  net/ipv6/addrconf.c                                |    1 +
15041  net/ipv6/addrconf_core.c                           |    1 +
15042  net/ipv6/exthdrs.c                                 |    1 +
15043  net/ipv6/exthdrs_core.c                            |    1 +
15044  net/ipv6/fib6_rules.c                              |    1 +
15045  net/ipv6/ip6_flowlabel.c                           |    1 +
15046  net/ipv6/ip6mr.c                                   |    1 +
15047  net/ipv6/netfilter.c                               |    1 +
15048  net/ipv6/proc.c                                    |    1 +
15049  net/ipv6/raw.c                                     |    1 +
15050  net/ipv6/reassembly.c                              |    1 +
15051  net/ipv6/route.c                                   |    1 +
15052  net/ipv6/sysctl_net_ipv6.c                         |    1 +
15053  net/ipv6/udplite.c                                 |    1 +
15054  net/ipv6/xfrm6_state.c                             |    1 +
15055  net/ipx/ipx_proc.c                                 |    1 +
15056  net/irda/discovery.c                               |    1 +
15057  net/irda/irda_device.c                             |    1 +
15058  net/irda/irttp.c                                   |    1 +
15059  net/irda/qos.c                                     |    2 +
15060  net/llc/llc_input.c                                |    1 +
15061  net/llc/llc_output.c                               |    1 +
15062  net/llc/llc_proc.c                                 |    1 +
15063  net/mac80211/agg-rx.c                              |    1 +
15064  net/mac80211/agg-tx.c                              |    1 +
15065  net/mac80211/ht.c                                  |    1 +
15066  net/mac80211/key.c                                 |    1 +
15067  net/mac80211/led.c                                 |    1 +
15068  net/mac80211/mlme.c                                |    2 +
15069  net/mac80211/offchannel.c                          |    1 +
15070  net/mac80211/rate.c                                |    1 +
15071  net/mac80211/rc80211_minstrel_debugfs.c            |    1 +
15072  net/mac80211/rc80211_minstrel_ht_debugfs.c         |    1 +
15073  net/mac80211/rc80211_pid_debugfs.c                 |    1 +
15074  net/mac80211/rx.c                                  |    1 +
15075  net/mac80211/scan.c                                |    1 +
15076  net/mac80211/status.c                              |    1 +
15077  net/mac80211/tkip.c                                |    1 +
15078  net/mac80211/tx.c                                  |    1 +
15079  net/mac80211/util.c                                |    1 +
15080  net/netfilter/ipset/ip_set_getport.c               |    1 +
15081  net/netfilter/ipset/pfxlen.c                       |    1 +
15082  net/netfilter/nf_conntrack_acct.c                  |    1 +
15083  net/netfilter/nf_conntrack_ecache.c                |    1 +
15084  net/netfilter/nf_conntrack_expect.c                |    2 +
15085  net/netfilter/x_tables.c                           |    1 +
15086  net/netfilter/xt_quota.c                           |    1 +
15087  net/netfilter/xt_statistic.c                       |    1 +
15088  net/netrom/nr_route.c                              |    1 +
15089  net/nfc/af_nfc.c                                   |    1 +
15090  net/nfc/rawsock.c                                  |    1 +
15091  net/phonet/datagram.c                              |    1 +
15092  net/phonet/pep.c                                   |    1 +
15093  net/phonet/socket.c                                |    1 +
15094  net/rds/cong.c                                     |    1 +
15095  net/rds/connection.c                               |    1 +
15096  net/rds/ib.c                                       |    1 +
15097  net/rds/info.c                                     |    1 +
15098  net/rds/iw.c                                       |    1 +
15099  net/rds/message.c                                  |    1 +
15100  net/rds/page.c                                     |    1 +
15101  net/rds/rdma_transport.c                           |    1 +
15102  net/rds/recv.c                                     |    1 +
15103  net/rds/send.c                                     |    2 +
15104  net/rds/stats.c                                    |    1 +
15105  net/rds/tcp.c                                      |    1 +
15106  net/rds/threads.c                                  |    1 +
15107  net/rfkill/input.c                                 |    1 +
15108  net/rose/rose_route.c                              |    1 +
15109  net/rxrpc/ar-output.c                              |    1 +
15110  net/rxrpc/ar-recvmsg.c                             |    1 +
15111  net/sched/act_api.c                                |    1 +
15112  net/sched/cls_flow.c                               |    1 +
15113  net/sched/sch_mq.c                                 |    1 +
15114  net/sched/sch_mqprio.c                             |    1 +
15115  net/sctp/proc.c                                    |    1 +
15116  net/sctp/socket.c                                  |    1 +
15117  net/sunrpc/addr.c                                  |    1 +
15118  net/sunrpc/backchannel_rqst.c                      |    1 +
15119  net/sunrpc/socklib.c                               |    1 +
15120  net/sunrpc/svc_xprt.c                              |    1 +
15121  net/sunrpc/svcsock.c                               |    1 +
15122  net/sunrpc/xprtrdma/svc_rdma_transport.c           |    1 +
15123  net/sysctl_net.c                                   |    1 +
15124  net/tipc/core.c                                    |    2 +
15125  net/tipc/socket.c                                  |    1 +
15126  net/wimax/op-msg.c                                 |    1 +
15127  net/wimax/op-reset.c                               |    1 +
15128  net/wimax/op-rfkill.c                              |    1 +
15129  net/wimax/stack.c                                  |    1 +
15130  net/wireless/ibss.c                                |    1 +
15131  net/wireless/mesh.c                                |    1 +
15132  net/wireless/radiotap.c                            |    1 +
15133  net/wireless/reg.c                                 |    2 +
15134  net/wireless/sme.c                                 |    1 +
15135  net/wireless/util.c                                |    1 +
15136  net/wireless/wext-compat.c                         |    1 +
15137  net/wireless/wext-core.c                           |    1 +
15138  net/wireless/wext-sme.c                            |    1 +
15139  net/wireless/wext-spy.c                            |    1 +
15140  net/x25/x25_proc.c                                 |    1 +
15141  net/xfrm/xfrm_proc.c                               |    1 +
15142  net/xfrm/xfrm_replay.c                             |    1 +
15143  security/selinux/hooks.c                           |    1 +
15144  security/selinux/netlink.c                         |    1 +
15145  sound/aoa/soundbus/i2sbus/pcm.c                    |    1 +
15146  sound/arm/pxa2xx-ac97-lib.c                        |    1 +
15147  sound/arm/pxa2xx-pcm.c                             |    1 +
15148  sound/core/control.c                               |    1 +
15149  sound/core/device.c                                |    1 +
15150  sound/core/hwdep.c                                 |    1 +
15151  sound/core/info.c                                  |    1 +
15152  sound/core/info_oss.c                              |    1 +
15153  sound/core/init.c                                  |    1 +
15154  sound/core/isadma.c                                |    1 +
15155  sound/core/jack.c                                  |    1 +
15156  sound/core/memory.c                                |    1 +
15157  sound/core/misc.c                                  |    1 +
15158  sound/core/oss/mixer_oss.c                         |    1 +
15159  sound/core/oss/pcm_oss.c                           |    2 +-
15160  sound/core/pcm.c                                   |    1 +
15161  sound/core/pcm_lib.c                               |    1 +
15162  sound/core/pcm_memory.c                            |    1 +
15163  sound/core/pcm_misc.c                              |    1 +
15164  sound/core/pcm_native.c                            |    1 +
15165  sound/core/rawmidi.c                               |    1 +
15166  sound/core/seq/oss/seq_oss.c                       |    2 +-
15167  sound/core/seq/oss/seq_oss_init.c                  |    2 +-
15168  sound/core/seq/oss/seq_oss_synth.c                 |    1 +
15169  sound/core/seq/seq.c                               |    2 +-
15170  sound/core/seq/seq_clientmgr.c                     |    1 +
15171  sound/core/seq/seq_device.c                        |    1 +
15172  sound/core/seq/seq_dummy.c                         |    2 +-
15173  sound/core/seq/seq_info.c                          |    1 +
15174  sound/core/seq/seq_lock.c                          |    1 +
15175  sound/core/seq/seq_memory.c                        |    1 +
15176  sound/core/seq/seq_midi.c                          |    2 +-
15177  sound/core/seq/seq_midi_emul.c                     |    1 +
15178  sound/core/seq/seq_midi_event.c                    |    1 +
15179  sound/core/seq/seq_ports.c                         |    1 +
15180  sound/core/seq/seq_system.c                        |    1 +
15181  sound/core/seq/seq_virmidi.c                       |    1 +
15182  sound/core/sound.c                                 |    2 +-
15183  sound/core/sound_oss.c                             |    1 +
15184  sound/core/timer.c                                 |    2 +-
15185  sound/core/vmaster.c                               |    1 +
15186  sound/drivers/aloop.c                              |    2 +-
15187  sound/drivers/dummy.c                              |    2 +-
15188  sound/drivers/ml403-ac97cr.c                       |    2 +-
15189  sound/drivers/mpu401/mpu401.c                      |    2 +-
15190  sound/drivers/mpu401/mpu401_uart.c                 |    1 +
15191  sound/drivers/mtpav.c                              |    1 +
15192  sound/drivers/mts64.c                              |    1 +
15193  sound/drivers/opl3/opl3_lib.c                      |    1 +
15194  sound/drivers/opl3/opl3_oss.c                      |    1 +
15195  sound/drivers/opl3/opl3_seq.c                      |    1 +
15196  sound/drivers/opl3/opl3_synth.c                    |    1 +
15197  sound/drivers/opl4/opl4_lib.c                      |    1 +
15198  sound/drivers/opl4/opl4_proc.c                     |    1 +
15199  sound/drivers/opl4/opl4_seq.c                      |    1 +
15200  sound/drivers/pcsp/pcsp.c                          |    2 +-
15201  sound/drivers/portman2x4.c                         |    1 +
15202  sound/drivers/serial-u16550.c                      |    2 +-
15203  sound/drivers/virmidi.c                            |    2 +-
15204  sound/drivers/vx/vx_core.c                         |    1 +
15205  sound/drivers/vx/vx_hwdep.c                        |    1 +
15206  sound/firewire/iso-resources.c                     |    1 +
15207  sound/firewire/packets-buffer.c                    |    1 +
15208  sound/i2c/cs8427.c                                 |    1 +
15209  sound/i2c/i2c.c                                    |    1 +
15210  sound/i2c/other/ak4113.c                           |    1 +
15211  sound/i2c/other/ak4114.c                           |    1 +
15212  sound/i2c/other/ak4117.c                           |    1 +
15213  sound/i2c/other/ak4xxx-adda.c                      |    1 +
15214  sound/i2c/other/pt2258.c                           |    1 +
15215  sound/i2c/other/tea575x-tuner.c                    |    1 +
15216  sound/i2c/tea6330t.c                               |    1 +
15217  sound/isa/ad1816a/ad1816a.c                        |    2 +-
15218  sound/isa/ad1848/ad1848.c                          |    2 +-
15219  sound/isa/als100.c                                 |    2 +-
15220  sound/isa/azt2320.c                                |    2 +-
15221  sound/isa/cmi8330.c                                |    2 +-
15222  sound/isa/cs423x/cs4231.c                          |    2 +-
15223  sound/isa/cs423x/cs4236.c                          |    2 +-
15224  sound/isa/es1688/es1688.c                          |    2 +-
15225  sound/isa/es1688/es1688_lib.c                      |    1 +
15226  sound/isa/es18xx.c                                 |    2 +-
15227  sound/isa/gus/gus_main.c                           |    1 +
15228  sound/isa/gus/gus_volume.c                         |    1 +
15229  sound/isa/gus/gusclassic.c                         |    2 +-
15230  sound/isa/gus/gusextreme.c                         |    2 +-
15231  sound/isa/gus/gusmax.c                             |    2 +-
15232  sound/isa/gus/interwave.c                          |    2 +-
15233  sound/isa/msnd/msnd.c                              |    1 +
15234  sound/isa/msnd/msnd_midi.c                         |    1 +
15235  sound/isa/msnd/msnd_pinnacle_mixer.c               |    1 +
15236  sound/isa/opl3sa2.c                                |    2 +-
15237  sound/isa/opti9xx/miro.c                           |    2 +-
15238  sound/isa/opti9xx/opti92x-ad1848.c                 |    2 +-
15239  sound/isa/sb/emu8000.c                             |    1 +
15240  sound/isa/sb/emu8000_callback.c                    |    1 +
15241  sound/isa/sb/emu8000_patch.c                       |    1 +
15242  sound/isa/sb/emu8000_synth.c                       |    1 +
15243  sound/isa/sb/sb16.c                                |    2 +-
15244  sound/isa/sb/sb16_csp.c                            |    1 +
15245  sound/isa/sb/sb16_main.c                           |    1 +
15246  sound/isa/sb/sb8.c                                 |    2 +-
15247  sound/isa/sb/sb8_main.c                            |    1 +
15248  sound/isa/sb/sb_common.c                           |    1 +
15249  sound/isa/sscape.c                                 |    2 +-
15250  sound/isa/wavefront/wavefront.c                    |    2 +-
15251  sound/isa/wavefront/wavefront_fx.c                 |    1 +
15252  sound/isa/wavefront/wavefront_synth.c              |    1 +
15253  sound/isa/wss/wss_lib.c                            |    1 +
15254  sound/mips/au1x00.c                                |    1 +
15255  sound/mips/hal2.c                                  |    1 +
15256  sound/mips/sgio2audio.c                            |    1 +
15257  sound/pci/ac97/ac97_codec.c                        |    2 +-
15258  sound/pci/ac97/ac97_pcm.c                          |    1 +
15259  sound/pci/ad1889.c                                 |    1 +
15260  sound/pci/ak4531_codec.c                           |    1 +
15261  sound/pci/ali5451/ali5451.c                        |    2 +-
15262  sound/pci/als300.c                                 |    2 +-
15263  sound/pci/als4000.c                                |    2 +-
15264  sound/pci/asihpi/asihpi.c                          |    1 +
15265  sound/pci/asihpi/hpioctl.c                         |    1 +
15266  sound/pci/atiixp.c                                 |    2 +-
15267  sound/pci/atiixp_modem.c                           |    2 +-
15268  sound/pci/au88x0/au88x0.c                          |    2 +-
15269  sound/pci/au88x0/au88x0_game.c                     |    1 +
15270  sound/pci/aw2/aw2-alsa.c                           |    1 +
15271  sound/pci/azt3328.c                                |    2 +-
15272  sound/pci/bt87x.c                                  |    2 +-
15273  sound/pci/ca0106/ca0106_main.c                     |    2 +-
15274  sound/pci/cmipci.c                                 |    2 +-
15275  sound/pci/cs4281.c                                 |    2 +-
15276  sound/pci/cs46xx/cs46xx.c                          |    2 +-
15277  sound/pci/cs46xx/cs46xx_lib.c                      |    1 +
15278  sound/pci/cs5530.c                                 |    2 +-
15279  sound/pci/cs5535audio/cs5535audio.c                |    2 +-
15280  sound/pci/ctxfi/xfi.c                              |    1 +
15281  sound/pci/echoaudio/darla20.c                      |    2 +-
15282  sound/pci/echoaudio/darla24.c                      |    2 +-
15283  sound/pci/echoaudio/echo3g.c                       |    2 +-
15284  sound/pci/echoaudio/echoaudio.c                    |    2 +
15285  sound/pci/echoaudio/gina20.c                       |    2 +-
15286  sound/pci/echoaudio/gina24.c                       |    2 +-
15287  sound/pci/echoaudio/indigo.c                       |    2 +-
15288  sound/pci/echoaudio/indigodj.c                     |    2 +-
15289  sound/pci/echoaudio/indigodjx.c                    |    2 +-
15290  sound/pci/echoaudio/indigoio.c                     |    2 +-
15291  sound/pci/echoaudio/indigoiox.c                    |    2 +-
15292  sound/pci/echoaudio/layla20.c                      |    2 +-
15293  sound/pci/echoaudio/layla24.c                      |    2 +-
15294  sound/pci/echoaudio/mia.c                          |    2 +-
15295  sound/pci/echoaudio/mona.c                         |    2 +-
15296  sound/pci/emu10k1/emu10k1.c                        |    2 +-
15297  sound/pci/emu10k1/emu10k1_callback.c               |    1 +
15298  sound/pci/emu10k1/emu10k1_main.c                   |    1 +
15299  sound/pci/emu10k1/emu10k1_synth.c                  |    1 +
15300  sound/pci/emu10k1/emu10k1x.c                       |    2 +-
15301  sound/pci/emu10k1/io.c                             |    1 +
15302  sound/pci/emu10k1/memory.c                         |    1 +
15303  sound/pci/emu10k1/voice.c                          |    1 +
15304  sound/pci/ens1370.c                                |    2 +-
15305  sound/pci/es1938.c                                 |    2 +-
15306  sound/pci/es1968.c                                 |    2 +-
15307  sound/pci/fm801.c                                  |    2 +-
15308  sound/pci/hda/hda_beep.c                           |    1 +
15309  sound/pci/hda/hda_codec.c                          |    1 +
15310  sound/pci/hda/hda_generic.c                        |    1 +
15311  sound/pci/hda/hda_hwdep.c                          |    1 +
15312  sound/pci/hda/patch_analog.c                       |    1 +
15313  sound/pci/hda/patch_ca0110.c                       |    1 +
15314  sound/pci/hda/patch_ca0132.c                       |    1 +
15315  sound/pci/hda/patch_cirrus.c                       |    1 +
15316  sound/pci/hda/patch_cmedia.c                       |    1 +
15317  sound/pci/hda/patch_conexant.c                     |    1 +
15318  sound/pci/hda/patch_hdmi.c                         |    2 +-
15319  sound/pci/hda/patch_realtek.c                      |    1 +
15320  sound/pci/hda/patch_si3054.c                       |    1 +
15321  sound/pci/hda/patch_sigmatel.c                     |    1 +
15322  sound/pci/hda/patch_via.c                          |    1 +
15323  sound/pci/ice1712/ak4xxx.c                         |    1 +
15324  sound/pci/ice1712/ice1712.c                        |    2 +-
15325  sound/pci/ice1712/ice1724.c                        |    2 +-
15326  sound/pci/intel8x0.c                               |    2 +-
15327  sound/pci/intel8x0m.c                              |    2 +-
15328  sound/pci/korg1212/korg1212.c                      |    2 +-
15329  sound/pci/lola/lola.c                              |    2 +-
15330  sound/pci/maestro3.c                               |    2 +-
15331  sound/pci/mixart/mixart.c                          |    2 +-
15332  sound/pci/mixart/mixart_hwdep.c                    |    1 +
15333  sound/pci/nm256/nm256.c                            |    2 +-
15334  sound/pci/oxygen/oxygen.c                          |    1 +
15335  sound/pci/oxygen/oxygen_io.c                       |    1 +
15336  sound/pci/oxygen/oxygen_lib.c                      |    1 +
15337  sound/pci/oxygen/virtuoso.c                        |    1 +
15338  sound/pci/pcxhr/pcxhr.c                            |    2 +-
15339  sound/pci/pcxhr/pcxhr_hwdep.c                      |    1 +
15340  sound/pci/riptide/riptide.c                        |    1 +
15341  sound/pci/rme32.c                                  |    2 +-
15342  sound/pci/rme96.c                                  |    2 +-
15343  sound/pci/rme9652/hdsp.c                           |    2 +-
15344  sound/pci/rme9652/hdspm.c                          |    2 +-
15345  sound/pci/rme9652/rme9652.c                        |    2 +-
15346  sound/pci/sis7019.c                                |    2 +-
15347  sound/pci/sonicvibes.c                             |    2 +-
15348  sound/pci/trident/trident.c                        |    2 +-
15349  sound/pci/trident/trident_main.c                   |    1 +
15350  sound/pci/via82xx.c                                |    2 +-
15351  sound/pci/via82xx_modem.c                          |    2 +-
15352  sound/pci/vx222/vx222.c                            |    2 +-
15353  sound/pci/ymfpci/ymfpci.c                          |    2 +-
15354  sound/pci/ymfpci/ymfpci_main.c                     |    1 +
15355  sound/pcmcia/pdaudiocf/pdaudiocf.c                 |    2 +-
15356  sound/pcmcia/vx/vxpocket.c                         |    2 +-
15357  sound/ppc/powermac.c                               |    2 +-
15358  sound/ppc/snd_ps3.c                                |    1 +
15359  sound/sh/aica.c                                    |    2 +-
15360  sound/sh/sh_dac_audio.c                            |    1 +
15361  sound/soc/blackfin/bf5xx-sport.c                   |    1 +
15362  sound/soc/blackfin/bfin-eval-adav80x.c             |    1 +
15363  sound/soc/codecs/ac97.c                            |    1 +
15364  sound/soc/codecs/ads117x.c                         |    1 +
15365  sound/soc/codecs/ak4642.c                          |    1 +
15366  sound/soc/codecs/cx20442.c                         |    1 +
15367  sound/soc/codecs/da7210.c                          |    1 +
15368  sound/soc/codecs/dmic.c                            |    1 +
15369  sound/soc/codecs/pcm3008.c                         |    1 +
15370  sound/soc/codecs/sn95031.c                         |    1 +
15371  sound/soc/codecs/wl1273.c                          |    1 +
15372  sound/soc/ep93xx/edb93xx.c                         |    1 +
15373  sound/soc/ep93xx/snappercl15.c                     |    1 +
15374  sound/soc/imx/wm1133-ev1.c                         |    1 +
15375  sound/soc/mid-x86/mfld_machine.c                   |    1 +
15376  sound/soc/mid-x86/sst_platform.c                   |    1 +
15377  sound/soc/omap/am3517evm.c                         |    1 +
15378  sound/soc/omap/ams-delta.c                         |    1 +
15379  sound/soc/omap/igep0020.c                          |    1 +
15380  sound/soc/omap/n810.c                              |    1 +
15381  sound/soc/omap/omap-pcm.c                          |    1 +
15382  sound/soc/omap/omap3beagle.c                       |    1 +
15383  sound/soc/omap/omap3evm.c                          |    1 +
15384  sound/soc/omap/omap3pandora.c                      |    1 +
15385  sound/soc/omap/omap4-hdmi-card.c                   |    1 +
15386  sound/soc/omap/osk5912.c                           |    1 +
15387  sound/soc/omap/overo.c                             |    1 +
15388  sound/soc/omap/rx51.c                              |    1 +
15389  sound/soc/omap/sdp3430.c                           |    1 +
15390  sound/soc/omap/sdp4430.c                           |    1 +
15391  sound/soc/omap/zoom2.c                             |    1 +
15392  sound/soc/pxa/pxa2xx-pcm.c                         |    1 +
15393  sound/soc/samsung/ac97.c                           |    1 +
15394  sound/soc/samsung/dma.c                            |    1 +
15395  sound/soc/samsung/goni_wm8994.c                    |    1 +
15396  sound/soc/samsung/h1940_uda1380.c                  |    1 +
15397  sound/soc/samsung/i2s.c                            |    1 +
15398  sound/soc/samsung/idma.c                           |    1 +
15399  sound/soc/samsung/jive_wm8750.c                    |    1 +
15400  sound/soc/samsung/ln2440sbc_alc650.c               |    1 +
15401  sound/soc/samsung/pcm.c                            |    1 +
15402  sound/soc/samsung/rx1950_uda1380.c                 |    1 +
15403  sound/soc/samsung/s3c2412-i2s.c                    |    1 +
15404  sound/soc/samsung/s3c24xx-i2s.c                    |    1 +
15405  sound/soc/samsung/s3c24xx_simtec.c                 |    1 +
15406  sound/soc/samsung/s3c24xx_simtec_hermes.c          |    1 +
15407  sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c     |    1 +
15408  sound/soc/samsung/s3c24xx_uda134x.c                |    1 +
15409  sound/soc/samsung/smartq_wm8987.c                  |    1 +
15410  sound/soc/samsung/smdk_spdif.c                     |    1 +
15411  sound/soc/samsung/smdk_wm8580.c                    |    1 +
15412  sound/soc/samsung/smdk_wm8580pcm.c                 |    1 +
15413  sound/soc/samsung/smdk_wm8994pcm.c                 |    1 +
15414  sound/soc/samsung/smdk_wm9713.c                    |    1 +
15415  sound/soc/samsung/spdif.c                          |    1 +
15416  sound/soc/samsung/speyside.c                       |    1 +
15417  sound/soc/samsung/speyside_wm8962.c                |    1 +
15418  sound/soc/sh/fsi-ak4642.c                          |    1 +
15419  sound/soc/sh/fsi-da7210.c                          |    1 +
15420  sound/soc/sh/fsi-hdmi.c                            |    1 +
15421  sound/soc/sh/fsi.c                                 |    1 +
15422  sound/soc/sh/siu_dai.c                             |    1 +
15423  sound/soc/soc-cache.c                              |    1 +
15424  sound/soc/soc-io.c                                 |    1 +
15425  sound/soc/soc-jack.c                               |    1 +
15426  sound/soc/soc-utils.c                              |    1 +
15427  sound/soc/tegra/tegra_asoc_utils.c                 |    1 +
15428  sound/sparc/dbri.c                                 |    1 +
15429  sound/synth/emux/emux.c                            |    1 +
15430  sound/synth/emux/emux_oss.c                        |    1 +
15431  sound/synth/emux/emux_seq.c                        |    2 +-
15432  sound/synth/emux/emux_synth.c                      |    1 +
15433  sound/synth/emux/soundfont.c                       |    1 +
15434  sound/synth/util_mem.c                             |    1 +
15435  sound/usb/6fire/firmware.c                         |    1 +
15436  sound/usb/card.c                                   |    1 +
15437  sound/usb/midi.c                                   |    1 +
15438  sound/usb/usx2y/us122l.c                           |    1 +
15439  sound/usb/usx2y/usbusx2yaudio.c                    |    1 +
15440  virt/kvm/iommu.c                                   |    2 +
15441  2022 files changed, 2229 insertions(+), 579 deletions(-)
15442  create mode 100644 include/linux/export.h
15443 $ git am -3 ../modsplit/drivers-md-change-module.h-export.h-in-persistent-da.patch
15444 Applying: drivers/md: change module.h -> export.h in persistent-data/dm-*
15445 $ git reset HEAD^
15446 Unstaged changes after reset:
15447 M       drivers/md/persistent-data/dm-btree-remove.c
15448 M       drivers/md/persistent-data/dm-btree.c
15449 M       drivers/md/persistent-data/dm-space-map-disk.c
15450 M       drivers/md/persistent-data/dm-transaction-manager.c
15451 $ git add .
15452 $ git commit -v -a --amend
15453 [master 38984d8] Merge remote-tracking branch 'moduleh/for-sfr'
15454 $ git am -3 ../modsplit/block-bsg-lib.c-change-module.h-export.h-in-power-co.patch
15455 Applying: block/bsg-lib.c: change module.h -> export.h in power/common.c
15456 $ git reset HEAD^
15457 Unstaged changes after reset:
15458 M       block/bsg-lib.c
15459 $ git add .
15460 $ git commit -v -a --amend
15461 [master 9585115] Merge remote-tracking branch 'moduleh/for-sfr'
15462 $ git am -3 ../modsplit/drivers-base-change-module.h-export.h-in-power-commo.patch
15463 Applying: drivers/base: change module.h -> export.h in power/common.c
15464 $ git reset HEAD^
15465 Unstaged changes after reset:
15466 M       drivers/base/power/common.c
15467 $ git add .
15468 $ git commit -v -a --amend
15469 [master 4f14823] Merge remote-tracking branch 'moduleh/for-sfr'
15470 $ git am -3 ../modsplit/rtlwifi-use-of-module_param-requires-the-inclusion-o.patch
15471 Applying: rtlwifi: use of module_param requires the inclusion of moduleparam.h
15472 $ git reset HEAD^
15473 Unstaged changes after reset:
15474 M       drivers/net/wireless/rtlwifi/debug.c
15475 $ git add .
15476 $ git commit -v -a --amend
15477 [master e1d6929] Merge remote-tracking branch 'moduleh/for-sfr'
15478 $ git am -3 ../modsplit/mmc-using-module_param-requires-the-inclusion-of-mod.patch
15479 Applying: mmc: using module_param requires the inclusion of moduleparam.h
15480 $ git reset HEAD^
15481 Unstaged changes after reset:
15482 M       drivers/mmc/core/debugfs.c
15483 $ git add .
15484 $ git commit -v -a --amend
15485 [master bfe0481] Merge remote-tracking branch 'moduleh/for-sfr'
15486 $ git am -3 ../modsplit/NFC-use-of-module-facilities-requires-the-inclusion-.patch
15487 Applying: NFC: use of module facilities requires the inclusion of module.h
15488 $ git reset HEAD^
15489 Unstaged changes after reset:
15490 M       drivers/nfc/nfcwilink.c
15491 $ git add .
15492 $ git commit -v -a --amend
15493 [master 0503fa4] Merge remote-tracking branch 'moduleh/for-sfr'
15494 $ git am -3 ../modsplit/block-mtip32xx-include-module.h-for-its-utilities.patch
15495 Applying: block/mtip32xx: include module.h for its utilities
15496 $ git reset HEAD^
15497 Unstaged changes after reset:
15498 M       drivers/block/mtip32xx/mtip32xx.c
15499 $ git add .
15500 $ git commit -v -a --amend
15501 [master 49d1924] Merge remote-tracking branch 'moduleh/for-sfr'
15502 $ git am -3 ../modsplit/powerpc-powernv-include-export.h-in-hvc_opal.h-for-T.patch
15503 Applying: powerpc/powernv: include export.h in hvc_opal.h for THIS_MODULE
15504 $ git reset HEAD^
15505 Unstaged changes after reset:
15506 M       drivers/tty/hvc/hvc_opal.c
15507 $ git add .
15508 $ git commit -v -a --amend
15509 [master 114565c] Merge remote-tracking branch 'moduleh/for-sfr'
15510 $ git am -3 ../modsplit/PM-QoS-include-export.h-in-qos.c-for-EXPORT_SYMBOL.patch
15511 Applying: PM QoS: include export.h in qos.c for EXPORT_SYMBOL
15512 $ git reset HEAD^
15513 Unstaged changes after reset:
15514 M       drivers/base/power/qos.c
15515 $ git add .
15516 $ git commit -v -a --amend
15517 [master 35f3417] Merge remote-tracking branch 'moduleh/for-sfr'
15518 $ git am -3 ../modsplit/net-Add-export.h-to-nfc-nci-core.c.patch
15519 Applying: net: Add export.h to nfc/nci/core.c
15520 $ git reset HEAD^
15521 Unstaged changes after reset:
15522 M       net/nfc/nci/core.c
15523 $ git add .
15524 $ git commit -v -a --amend
15525 [master 8c8bc5f] Merge remote-tracking branch 'moduleh/for-sfr'
15526 $ git am -3 ../modsplit/scsi-Add-export.h-to-drivers-scsi-libsas-sas_host_sm.patch
15527 Applying: scsi: Add export.h to drivers/scsi/libsas/sas_host_smp.c
15528 $ git reset HEAD^
15529 Unstaged changes after reset:
15530 M       drivers/scsi/libsas/sas_host_smp.c
15531 $ git add .
15532 $ git commit -v -a --amend
15533 [master 6f41ca4] Merge remote-tracking branch 'moduleh/for-sfr'
15534 $ git am -3 ../modsplit/drivers-net-Add-module.h-to-wireless-ath-ath6kl-sdio.patch
15535 Applying: drivers/net: Add module.h to wireless/ath/ath6kl/sdio.c
15536 $ git reset HEAD^
15537 Unstaged changes after reset:
15538 M       drivers/net/wireless/ath/ath6kl/sdio.c
15539 $ git add .
15540 $ git commit -v -a --amend
15541 [master fa3bb8e] Merge remote-tracking branch 'moduleh/for-sfr'
15542 $ git am -3 ../modsplit/drivers-net-wireless-ath-ath5k-debug.c-does-not-need.patch
15543 Applying: drivers/net: wireless/ath/ath5k/debug.c does not need module.h
15544 $ git reset HEAD^
15545 Unstaged changes after reset:
15546 M       drivers/net/wireless/ath/ath5k/debug.c
15547 $ git add .
15548 $ git commit -v -a --amend
15549 [master 70fe4d9] Merge remote-tracking branch 'moduleh/for-sfr'
15550 $ git am -3 ../modsplit/drivers-bcma-driver_chipcommon_pmu.c-needs-export.h-.patch
15551 Applying: drivers/bcma: driver_chipcommon_pmu.c needs export.h for EXPORT_SYMBOL
15552 $ git reset HEAD^
15553 Unstaged changes after reset:
15554 M       drivers/bcma/driver_chipcommon_pmu.c
15555 $ git add .
15556 $ git commit -v -a --amend
15557 [master 266a8d6] Merge remote-tracking branch 'moduleh/for-sfr'
15558 $ git am -3 ../modsplit/drivers-base-Add-export.h-to-regmap-regcache.c.patch
15559 Applying: drivers/base: Add export.h to regmap/regcache.c
15560 Using index info to reconstruct a base tree...
15561 Falling back to patching base and 3-way merge...
15562 Auto-merging drivers/base/regmap/regcache.c
15563 $ git reset HEAD^
15564 Unstaged changes after reset:
15565 M       drivers/base/regmap/regcache.c
15566 $ git add .
15567 $ git commit -v -a --amend
15568 [master 90d8fcb] Merge remote-tracking branch 'moduleh/for-sfr'
15569 $ git am -3 ../modsplit/staging-Add-export.h-to-rts5139-rts51x_scsi.c.patch
15570 Applying: staging: Add export.h to rts5139/rts51x_scsi.c
15571 $ git reset HEAD^
15572 Unstaged changes after reset:
15573 M       drivers/staging/rts5139/rts51x_scsi.c
15574 $ git add .
15575 $ git commit -v -a --amend
15576 [master f9c1334] Merge remote-tracking branch 'moduleh/for-sfr'
15577 $ git am -3 ../modsplit/pinctrl-EXPORT_SYMBOL-needs-export.h.patch
15578 Applying: pinctrl: EXPORT_SYMBOL needs export.h
15579 $ git reset HEAD^
15580 Unstaged changes after reset:
15581 M       drivers/pinctrl/core.c
15582 $ git add .
15583 $ git commit -v -a --amend
15584 [master 9a0b1e3] Merge remote-tracking branch 'moduleh/for-sfr'
15585 $ git am -3 ../modsplit/staging-Add-export.h-for-EXPORT_SYMBOL-to-drivers-st.patch
15586 Applying: staging: Add export.h for EXPORT_SYMBOL to drivers/staging/iio/industrialio-buffer.c
15587 $ git reset HEAD^
15588 Unstaged changes after reset:
15589 M       drivers/staging/iio/industrialio-buffer.c
15590 $ git add .
15591 $ git commit -v -a --amend
15592 [master a045eba] Merge remote-tracking branch 'moduleh/for-sfr'
15593 $ git am -3 ../modsplit/ath6kl-THIS_MODULES-needs-export.h.patch
15594 Applying: ath6kl: THIS_MODULES needs export.h
15595 $ git reset HEAD^
15596 Unstaged changes after reset:
15597 M       drivers/net/wireless/ath/ath6kl/debug.c
15598 $ git add .
15599 $ git commit -v -a --amend
15600 [master b68bf24] Merge remote-tracking branch 'moduleh/for-sfr'
15601 $ git am -3 ../modsplit/ath6kl-module_param-needs-the-inclusion-of-modulepar.patch
15602 Applying: ath6kl: module_param needs the inclusion of moduleparam.h
15603 $ git reset HEAD^
15604 Unstaged changes after reset:
15605 M       drivers/net/wireless/ath/ath6kl/cfg80211.c
15606 $ git add .
15607 $ git commit -v -a --amend
15608 [master da6e338] Merge remote-tracking branch 'moduleh/for-sfr'
15609 Merging kvmtool/master
15610 $ git merge kvmtool/master
15611 Resolved 'include/net/9p/9p.h' using previous resolution.
15612 Auto-merging MAINTAINERS
15613 Auto-merging include/net/9p/9p.h
15614 CONFLICT (content): Merge conflict in include/net/9p/9p.h
15615 Automatic merge failed; fix conflicts and then commit the result.
15616 $ git commit -v -a
15617 [master a2851f2] Merge remote-tracking branch 'kvmtool/master'
15618 $ git diff -M --stat --summary HEAD^..
15619  MAINTAINERS                                  |    8 +
15620  tools/kvm/.gitignore                         |   10 +
15621  tools/kvm/CREDITS-Git                        |   30 +
15622  tools/kvm/Documentation/kernel-debugging.txt |   15 +
15623  tools/kvm/Documentation/kvm-balloon.txt      |   24 +
15624  tools/kvm/Documentation/kvm-debug.txt        |   16 +
15625  tools/kvm/Documentation/kvm-list.txt         |   16 +
15626  tools/kvm/Documentation/kvm-pause.txt        |   16 +
15627  tools/kvm/Documentation/kvm-resume.txt       |   16 +
15628  tools/kvm/Documentation/kvm-run.txt          |   62 ++
15629  tools/kvm/Documentation/kvm-setup.txt        |   15 +
15630  tools/kvm/Documentation/kvm-stat.txt         |   19 +
15631  tools/kvm/Documentation/kvm-stop.txt         |   16 +
15632  tools/kvm/Documentation/kvm-version.txt      |   21 +
15633  tools/kvm/Makefile                           |  286 ++++++
15634  tools/kvm/README                             |  109 +++
15635  tools/kvm/bios.c                             |  157 ++++
15636  tools/kvm/bios/.gitignore                    |    3 +
15637  tools/kvm/bios/bios-rom.S                    |   12 +
15638  tools/kvm/bios/e820.c                        |   73 ++
15639  tools/kvm/bios/entry.S                       |   90 ++
15640  tools/kvm/bios/gen-offsets.sh                |   14 +
15641  tools/kvm/bios/int10.c                       |  151 +++
15642  tools/kvm/bios/int15.c                       |   18 +
15643  tools/kvm/bios/local.S                       |    7 +
15644  tools/kvm/bios/macro.S                       |   25 +
15645  tools/kvm/bios/rom.ld.S                      |   17 +
15646  tools/kvm/builtin-balloon.c                  |   75 ++
15647  tools/kvm/builtin-debug.c                    |   66 ++
15648  tools/kvm/builtin-help.c                     |   61 ++
15649  tools/kvm/builtin-list.c                     |   66 ++
15650  tools/kvm/builtin-pause.c                    |   66 ++
15651  tools/kvm/builtin-resume.c                   |   66 ++
15652  tools/kvm/builtin-run.c                      |  991 ++++++++++++++++++++
15653  tools/kvm/builtin-setup.c                    |  214 +++++
15654  tools/kvm/builtin-stat.c                     |   79 ++
15655  tools/kvm/builtin-stop.c                     |   66 ++
15656  tools/kvm/builtin-version.c                  |   15 +
15657  tools/kvm/code16gcc.h                        |   15 +
15658  tools/kvm/command-list.txt                   |   14 +
15659  tools/kvm/config/feature-tests.mak           |  148 +++
15660  tools/kvm/config/utilities.mak               |  188 ++++
15661  tools/kvm/cpuid.c                            |   55 ++
15662  tools/kvm/disk/blk.c                         |   39 +
15663  tools/kvm/disk/core.c                        |  222 +++++
15664  tools/kvm/disk/qcow.c                        | 1099 ++++++++++++++++++++++
15665  tools/kvm/disk/raw.c                         |   82 ++
15666  tools/kvm/framebuffer.c                      |   68 ++
15667  tools/kvm/guest/init.c                       |   46 +
15668  tools/kvm/guest_compat.c                     |  104 +++
15669  tools/kvm/hw/i8042.c                         |  348 +++++++
15670  tools/kvm/hw/pci-shmem.c                     |  264 ++++++
15671  tools/kvm/hw/rtc.c                           |   87 ++
15672  tools/kvm/hw/serial.c                        |  364 ++++++++
15673  tools/kvm/hw/vesa.c                          |   77 ++
15674  tools/kvm/include/asm/hweight.h              |    8 +
15675  tools/kvm/include/kvm/8250-serial.h          |   10 +
15676  tools/kvm/include/kvm/apic.h                 |   17 +
15677  tools/kvm/include/kvm/assembly.h             |   24 +
15678  tools/kvm/include/kvm/barrier.h              |   15 +
15679  tools/kvm/include/kvm/bios-export.h          |   13 +
15680  tools/kvm/include/kvm/bios.h                 |   83 ++
15681  tools/kvm/include/kvm/boot-protocol.h        |   16 +
15682  tools/kvm/include/kvm/brlock.h               |   41 +
15683  tools/kvm/include/kvm/builtin-balloon.h      |    7 +
15684  tools/kvm/include/kvm/builtin-debug.h        |    7 +
15685  tools/kvm/include/kvm/builtin-help.h         |    6 +
15686  tools/kvm/include/kvm/builtin-list.h         |    7 +
15687  tools/kvm/include/kvm/builtin-pause.h        |    7 +
15688  tools/kvm/include/kvm/builtin-resume.h       |    7 +
15689  tools/kvm/include/kvm/builtin-run.h          |    7 +
15690  tools/kvm/include/kvm/builtin-setup.h        |    9 +
15691  tools/kvm/include/kvm/builtin-stat.h         |    7 +
15692  tools/kvm/include/kvm/builtin-stop.h         |    7 +
15693  tools/kvm/include/kvm/builtin-version.h      |    6 +
15694  tools/kvm/include/kvm/compiler.h             |    6 +
15695  tools/kvm/include/kvm/cpufeature.h           |   41 +
15696  tools/kvm/include/kvm/disk-image.h           |   73 ++
15697  tools/kvm/include/kvm/e820.h                 |   12 +
15698  tools/kvm/include/kvm/framebuffer.h          |   34 +
15699  tools/kvm/include/kvm/guest_compat.h         |    9 +
15700  tools/kvm/include/kvm/i8042.h                |   12 +
15701  tools/kvm/include/kvm/interrupt.h            |   26 +
15702  tools/kvm/include/kvm/ioeventfd.h            |   27 +
15703  tools/kvm/include/kvm/ioport.h               |   65 ++
15704  tools/kvm/include/kvm/irq.h                  |   29 +
15705  tools/kvm/include/kvm/kvm-cmd.h              |   17 +
15706  tools/kvm/include/kvm/kvm-cpu.h              |   44 +
15707  tools/kvm/include/kvm/kvm.h                  |  108 +++
15708  tools/kvm/include/kvm/mptable.h              |    8 +
15709  tools/kvm/include/kvm/mutex.h                |   33 +
15710  tools/kvm/include/kvm/parse-options.h        |  213 +++++
15711  tools/kvm/include/kvm/pci-shmem.h            |   28 +
15712  tools/kvm/include/kvm/pci.h                  |   75 ++
15713  tools/kvm/include/kvm/qcow.h                 |  122 +++
15714  tools/kvm/include/kvm/rbtree-interval.h      |   27 +
15715  tools/kvm/include/kvm/read-write.h           |   32 +
15716  tools/kvm/include/kvm/rtc.h                  |    6 +
15717  tools/kvm/include/kvm/rwsem.h                |   39 +
15718  tools/kvm/include/kvm/sdl.h                  |   17 +
15719  tools/kvm/include/kvm/segment.h              |   21 +
15720  tools/kvm/include/kvm/strbuf.h               |    6 +
15721  tools/kvm/include/kvm/symbol.h               |   22 +
15722  tools/kvm/include/kvm/term.h                 |   18 +
15723  tools/kvm/include/kvm/threadpool.h           |   37 +
15724  tools/kvm/include/kvm/types.h                |    7 +
15725  tools/kvm/include/kvm/uip.h                  |  358 ++++++++
15726  tools/kvm/include/kvm/util.h                 |   78 ++
15727  tools/kvm/include/kvm/vesa.h                 |   18 +
15728  tools/kvm/include/kvm/virtio-9p.h            |   75 ++
15729  tools/kvm/include/kvm/virtio-balloon.h       |    8 +
15730  tools/kvm/include/kvm/virtio-blk.h           |   12 +
15731  tools/kvm/include/kvm/virtio-console.h       |    9 +
15732  tools/kvm/include/kvm/virtio-net.h           |   21 +
15733  tools/kvm/include/kvm/virtio-pci-dev.h       |   27 +
15734  tools/kvm/include/kvm/virtio-pci.h           |   59 ++
15735  tools/kvm/include/kvm/virtio-rng.h           |    9 +
15736  tools/kvm/include/kvm/virtio.h               |   65 ++
15737  tools/kvm/include/kvm/vnc.h                  |   14 +
15738  tools/kvm/include/linux/bitops.h             |   33 +
15739  tools/kvm/include/linux/byteorder.h          |    7 +
15740  tools/kvm/include/linux/kernel.h             |   39 +
15741  tools/kvm/include/linux/module.h             |    6 +
15742  tools/kvm/include/linux/prefetch.h           |    6 +
15743  tools/kvm/include/linux/types.h              |   50 +
15744  tools/kvm/interrupt.c                        |   27 +
15745  tools/kvm/ioeventfd.c                        |  128 +++
15746  tools/kvm/ioport.c                           |  192 ++++
15747  tools/kvm/irq.c                              |  193 ++++
15748  tools/kvm/kvm-cmd.c                          |   91 ++
15749  tools/kvm/kvm-cpu.c                          |  509 +++++++++++
15750  tools/kvm/kvm.c                              |  749 +++++++++++++++
15751  tools/kvm/main.c                             |   14 +
15752  tools/kvm/mmio.c                             |  132 +++
15753  tools/kvm/mptable.c                          |  284 ++++++
15754  tools/kvm/net/uip/arp.c                      |   30 +
15755  tools/kvm/net/uip/buf.c                      |  114 +++
15756  tools/kvm/net/uip/core.c                     |  190 ++++
15757  tools/kvm/net/uip/csum.c                     |   92 ++
15758  tools/kvm/net/uip/dhcp.c                     |  203 +++++
15759  tools/kvm/net/uip/icmp.c                     |   29 +
15760  tools/kvm/net/uip/ipv4.c                     |   29 +
15761  tools/kvm/net/uip/tcp.c                      |  317 +++++++
15762  tools/kvm/net/uip/udp.c                      |  236 +++++
15763  tools/kvm/pci.c                              |  169 ++++
15764  tools/kvm/read-write.c                       |  318 +++++++
15765  tools/kvm/symbol.c                           |   98 ++
15766  tools/kvm/term.c                             |  170 ++++
15767  tools/kvm/tests/Makefile                     |   19 +
15768  tools/kvm/tests/boot/Makefile                |   13 +
15769  tools/kvm/tests/boot/init.c                  |   11 +
15770  tools/kvm/tests/kernel/.gitignore            |    2 +
15771  tools/kvm/tests/kernel/Makefile              |   20 +
15772  tools/kvm/tests/kernel/README                |   16 +
15773  tools/kvm/tests/kernel/kernel.S              |    8 +
15774  tools/kvm/tests/pit/.gitignore               |    2 +
15775  tools/kvm/tests/pit/Makefile                 |   20 +
15776  tools/kvm/tests/pit/README                   |   16 +
15777  tools/kvm/tests/pit/tick.S                   |  109 +++
15778  tools/kvm/threadpool.c                       |  146 +++
15779  tools/kvm/ui/sdl.c                           |  279 ++++++
15780  tools/kvm/ui/vnc.c                           |  218 +++++
15781  tools/kvm/util.c                             |  101 ++
15782  tools/kvm/util/KVMTOOLS-VERSION-GEN          |   40 +
15783  tools/kvm/util/generate-cmdlist.sh           |   23 +
15784  tools/kvm/util/kvm-ifup-vbr0                 |    6 +
15785  tools/kvm/util/parse-options.c               |  577 ++++++++++++
15786  tools/kvm/util/rbtree-interval.c             |   90 ++
15787  tools/kvm/util/set_private_br.sh             |   51 +
15788  tools/kvm/util/strbuf.c                      |   13 +
15789  tools/kvm/virtio/9p-pdu.c                    |  287 ++++++
15790  tools/kvm/virtio/9p.c                        | 1263 ++++++++++++++++++++++++++
15791  tools/kvm/virtio/balloon.c                   |  288 ++++++
15792  tools/kvm/virtio/blk.c                       |  247 +++++
15793  tools/kvm/virtio/console.c                   |  196 ++++
15794  tools/kvm/virtio/core.c                      |  123 +++
15795  tools/kvm/virtio/net.c                       |  421 +++++++++
15796  tools/kvm/virtio/pci.c                       |  314 +++++++
15797  tools/kvm/virtio/rng.c                       |  183 ++++
15798  179 files changed, 18059 insertions(+), 0 deletions(-)
15799  create mode 100644 tools/kvm/.gitignore
15800  create mode 100644 tools/kvm/CREDITS-Git
15801  create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
15802  create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
15803  create mode 100644 tools/kvm/Documentation/kvm-debug.txt
15804  create mode 100644 tools/kvm/Documentation/kvm-list.txt
15805  create mode 100644 tools/kvm/Documentation/kvm-pause.txt
15806  create mode 100644 tools/kvm/Documentation/kvm-resume.txt
15807  create mode 100644 tools/kvm/Documentation/kvm-run.txt
15808  create mode 100644 tools/kvm/Documentation/kvm-setup.txt
15809  create mode 100644 tools/kvm/Documentation/kvm-stat.txt
15810  create mode 100644 tools/kvm/Documentation/kvm-stop.txt
15811  create mode 100644 tools/kvm/Documentation/kvm-version.txt
15812  create mode 100644 tools/kvm/Makefile
15813  create mode 100644 tools/kvm/README
15814  create mode 100644 tools/kvm/bios.c
15815  create mode 100644 tools/kvm/bios/.gitignore
15816  create mode 100644 tools/kvm/bios/bios-rom.S
15817  create mode 100644 tools/kvm/bios/e820.c
15818  create mode 100644 tools/kvm/bios/entry.S
15819  create mode 100644 tools/kvm/bios/gen-offsets.sh
15820  create mode 100644 tools/kvm/bios/int10.c
15821  create mode 100644 tools/kvm/bios/int15.c
15822  create mode 100644 tools/kvm/bios/local.S
15823  create mode 100644 tools/kvm/bios/macro.S
15824  create mode 100644 tools/kvm/bios/rom.ld.S
15825  create mode 100644 tools/kvm/builtin-balloon.c
15826  create mode 100644 tools/kvm/builtin-debug.c
15827  create mode 100644 tools/kvm/builtin-help.c
15828  create mode 100644 tools/kvm/builtin-list.c
15829  create mode 100644 tools/kvm/builtin-pause.c
15830  create mode 100644 tools/kvm/builtin-resume.c
15831  create mode 100644 tools/kvm/builtin-run.c
15832  create mode 100644 tools/kvm/builtin-setup.c
15833  create mode 100644 tools/kvm/builtin-stat.c
15834  create mode 100644 tools/kvm/builtin-stop.c
15835  create mode 100644 tools/kvm/builtin-version.c
15836  create mode 100644 tools/kvm/code16gcc.h
15837  create mode 100644 tools/kvm/command-list.txt
15838  create mode 100644 tools/kvm/config/feature-tests.mak
15839  create mode 100644 tools/kvm/config/utilities.mak
15840  create mode 100644 tools/kvm/cpuid.c
15841  create mode 100644 tools/kvm/disk/blk.c
15842  create mode 100644 tools/kvm/disk/core.c
15843  create mode 100644 tools/kvm/disk/qcow.c
15844  create mode 100644 tools/kvm/disk/raw.c
15845  create mode 100644 tools/kvm/framebuffer.c
15846  create mode 100644 tools/kvm/guest/init.c
15847  create mode 100644 tools/kvm/guest_compat.c
15848  create mode 100644 tools/kvm/hw/i8042.c
15849  create mode 100644 tools/kvm/hw/pci-shmem.c
15850  create mode 100644 tools/kvm/hw/rtc.c
15851  create mode 100644 tools/kvm/hw/serial.c
15852  create mode 100644 tools/kvm/hw/vesa.c
15853  create mode 100644 tools/kvm/include/asm/hweight.h
15854  create mode 100644 tools/kvm/include/kvm/8250-serial.h
15855  create mode 100644 tools/kvm/include/kvm/apic.h
15856  create mode 100644 tools/kvm/include/kvm/assembly.h
15857  create mode 100644 tools/kvm/include/kvm/barrier.h
15858  create mode 100644 tools/kvm/include/kvm/bios-export.h
15859  create mode 100644 tools/kvm/include/kvm/bios.h
15860  create mode 100644 tools/kvm/include/kvm/boot-protocol.h
15861  create mode 100644 tools/kvm/include/kvm/brlock.h
15862  create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
15863  create mode 100644 tools/kvm/include/kvm/builtin-debug.h
15864  create mode 100644 tools/kvm/include/kvm/builtin-help.h
15865  create mode 100644 tools/kvm/include/kvm/builtin-list.h
15866  create mode 100644 tools/kvm/include/kvm/builtin-pause.h
15867  create mode 100644 tools/kvm/include/kvm/builtin-resume.h
15868  create mode 100644 tools/kvm/include/kvm/builtin-run.h
15869  create mode 100644 tools/kvm/include/kvm/builtin-setup.h
15870  create mode 100644 tools/kvm/include/kvm/builtin-stat.h
15871  create mode 100644 tools/kvm/include/kvm/builtin-stop.h
15872  create mode 100644 tools/kvm/include/kvm/builtin-version.h
15873  create mode 100644 tools/kvm/include/kvm/compiler.h
15874  create mode 100644 tools/kvm/include/kvm/cpufeature.h
15875  create mode 100644 tools/kvm/include/kvm/disk-image.h
15876  create mode 100644 tools/kvm/include/kvm/e820.h
15877  create mode 100644 tools/kvm/include/kvm/framebuffer.h
15878  create mode 100644 tools/kvm/include/kvm/guest_compat.h
15879  create mode 100644 tools/kvm/include/kvm/i8042.h
15880  create mode 100644 tools/kvm/include/kvm/interrupt.h
15881  create mode 100644 tools/kvm/include/kvm/ioeventfd.h
15882  create mode 100644 tools/kvm/include/kvm/ioport.h
15883  create mode 100644 tools/kvm/include/kvm/irq.h
15884  create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
15885  create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
15886  create mode 100644 tools/kvm/include/kvm/kvm.h
15887  create mode 100644 tools/kvm/include/kvm/mptable.h
15888  create mode 100644 tools/kvm/include/kvm/mutex.h
15889  create mode 100644 tools/kvm/include/kvm/parse-options.h
15890  create mode 100644 tools/kvm/include/kvm/pci-shmem.h
15891  create mode 100644 tools/kvm/include/kvm/pci.h
15892  create mode 100644 tools/kvm/include/kvm/qcow.h
15893  create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
15894  create mode 100644 tools/kvm/include/kvm/read-write.h
15895  create mode 100644 tools/kvm/include/kvm/rtc.h
15896  create mode 100644 tools/kvm/include/kvm/rwsem.h
15897  create mode 100644 tools/kvm/include/kvm/sdl.h
15898  create mode 100644 tools/kvm/include/kvm/segment.h
15899  create mode 100644 tools/kvm/include/kvm/strbuf.h
15900  create mode 100644 tools/kvm/include/kvm/symbol.h
15901  create mode 100644 tools/kvm/include/kvm/term.h
15902  create mode 100644 tools/kvm/include/kvm/threadpool.h
15903  create mode 100644 tools/kvm/include/kvm/types.h
15904  create mode 100644 tools/kvm/include/kvm/uip.h
15905  create mode 100644 tools/kvm/include/kvm/util.h
15906  create mode 100644 tools/kvm/include/kvm/vesa.h
15907  create mode 100644 tools/kvm/include/kvm/virtio-9p.h
15908  create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
15909  create mode 100644 tools/kvm/include/kvm/virtio-blk.h
15910  create mode 100644 tools/kvm/include/kvm/virtio-console.h
15911  create mode 100644 tools/kvm/include/kvm/virtio-net.h
15912  create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
15913  create mode 100644 tools/kvm/include/kvm/virtio-pci.h
15914  create mode 100644 tools/kvm/include/kvm/virtio-rng.h
15915  create mode 100644 tools/kvm/include/kvm/virtio.h
15916  create mode 100644 tools/kvm/include/kvm/vnc.h
15917  create mode 100644 tools/kvm/include/linux/bitops.h
15918  create mode 100644 tools/kvm/include/linux/byteorder.h
15919  create mode 100644 tools/kvm/include/linux/kernel.h
15920  create mode 100644 tools/kvm/include/linux/module.h
15921  create mode 100644 tools/kvm/include/linux/prefetch.h
15922  create mode 100644 tools/kvm/include/linux/types.h
15923  create mode 100644 tools/kvm/interrupt.c
15924  create mode 100644 tools/kvm/ioeventfd.c
15925  create mode 100644 tools/kvm/ioport.c
15926  create mode 100644 tools/kvm/irq.c
15927  create mode 100644 tools/kvm/kvm-cmd.c
15928  create mode 100644 tools/kvm/kvm-cpu.c
15929  create mode 100644 tools/kvm/kvm.c
15930  create mode 100644 tools/kvm/main.c
15931  create mode 100644 tools/kvm/mmio.c
15932  create mode 100644 tools/kvm/mptable.c
15933  create mode 100644 tools/kvm/net/uip/arp.c
15934  create mode 100644 tools/kvm/net/uip/buf.c
15935  create mode 100644 tools/kvm/net/uip/core.c
15936  create mode 100644 tools/kvm/net/uip/csum.c
15937  create mode 100644 tools/kvm/net/uip/dhcp.c
15938  create mode 100644 tools/kvm/net/uip/icmp.c
15939  create mode 100644 tools/kvm/net/uip/ipv4.c
15940  create mode 100644 tools/kvm/net/uip/tcp.c
15941  create mode 100644 tools/kvm/net/uip/udp.c
15942  create mode 100644 tools/kvm/pci.c
15943  create mode 100644 tools/kvm/read-write.c
15944  create mode 100644 tools/kvm/symbol.c
15945  create mode 100644 tools/kvm/term.c
15946  create mode 100644 tools/kvm/tests/Makefile
15947  create mode 100644 tools/kvm/tests/boot/Makefile
15948  create mode 100644 tools/kvm/tests/boot/init.c
15949  create mode 100644 tools/kvm/tests/kernel/.gitignore
15950  create mode 100644 tools/kvm/tests/kernel/Makefile
15951  create mode 100644 tools/kvm/tests/kernel/README
15952  create mode 100644 tools/kvm/tests/kernel/kernel.S
15953  create mode 100644 tools/kvm/tests/pit/.gitignore
15954  create mode 100644 tools/kvm/tests/pit/Makefile
15955  create mode 100644 tools/kvm/tests/pit/README
15956  create mode 100644 tools/kvm/tests/pit/tick.S
15957  create mode 100644 tools/kvm/threadpool.c
15958  create mode 100644 tools/kvm/ui/sdl.c
15959  create mode 100644 tools/kvm/ui/vnc.c
15960  create mode 100644 tools/kvm/util.c
15961  create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
15962  create mode 100755 tools/kvm/util/generate-cmdlist.sh
15963  create mode 100755 tools/kvm/util/kvm-ifup-vbr0
15964  create mode 100644 tools/kvm/util/parse-options.c
15965  create mode 100644 tools/kvm/util/rbtree-interval.c
15966  create mode 100755 tools/kvm/util/set_private_br.sh
15967  create mode 100644 tools/kvm/util/strbuf.c
15968  create mode 100644 tools/kvm/virtio/9p-pdu.c
15969  create mode 100644 tools/kvm/virtio/9p.c
15970  create mode 100644 tools/kvm/virtio/balloon.c
15971  create mode 100644 tools/kvm/virtio/blk.c
15972  create mode 100644 tools/kvm/virtio/console.c
15973  create mode 100644 tools/kvm/virtio/core.c
15974  create mode 100644 tools/kvm/virtio/net.c
15975  create mode 100644 tools/kvm/virtio/pci.c
15976  create mode 100644 tools/kvm/virtio/rng.c
15977 Merging scsi-post-merge/merge-base:master
15978 $ git clone -s -l -n -q . ../rebase-tmp
15979 $ cd ../rebase-tmp
15980 $ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm
15981 From ../next
15982  * [new branch]      quilt/akpm -> akpm
15983 $ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base
15984 From ../next
15985  * [new branch]      quilt/akpm-base -> akpm-base
15986 $ git checkout akpm
15987 Switched to branch 'akpm'
15988 $ git rebase --onto master akpm-base
15989 First, rewinding head to replay your work on top of it...
15990 Applying: include/linux/dmar.h: forward-declare struct acpi_dmar_header
15991 Applying: drivers/net/ethernet/i825xx/3c505.c: fix build with dynamic debug
15992 Applying: drm: fix kconfig unmet dependency warning
15993 Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
15994 Applying: readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
15995 Applying: x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode
15996 Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
15997 Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
15998 Applying: hp_accel: Add a new PNP id
15999 Applying: hp_accel: Add axis-mapping for HP ProBook / EliteBook
16000 Applying: x86: fix mmap random address range
16001 Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map
16002 Applying: vrtc: change its year offset from 1960 to 1972
16003 Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms
16004 Applying: mrst: battery fixes
16005 Applying: drivers/power/intel_mid_battery.c: fix build
16006 Applying: x86,mrst: add mapping for bma023
16007 Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
16008 Applying: arch/x86/kernel/ptrace.c: quiet sparse noise
16009 Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static
16010 Applying: x86: tlb flush avoid superflous leave_mm()
16011 Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
16012 Applying: arm, exec: remove redundant set_fs(USER_DS)
16013 Applying: audit: always follow va_copy() with va_end()
16014 Applying: btrfs: don't dereference extent_mapping if NULL
16015 Applying: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
16016 Applying: drivers/gpu/vga/vgaarb.c: add missing kfree
16017 Applying: ia64, exec: remove redundant set_fs(USER_DS)
16018 Applying: brlocks/lglocks: clean up code
16019 Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes
16020 Applying: ipc/mqueue: cleanup definition names and locations
16021 Applying: ipc/mqueue: switch back to using non-max values on create
16022 Applying: ipc/mqueue: enforce hard limits
16023 Applying: ipc/mqueue: update maximums for the mqueue subsystem
16024 Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes
16025 Applying: unicore32, exec: remove redundant set_fs(USER_DS)
16026 Applying: drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
16027 Applying: debugobjects: extend debugobjects to assert that an object is initialized
16028 Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers
16029 Applying: ext4: use proper little-endian bitops
16030 Applying: ocfs2: avoid unaligned access to dqc_bitmap
16031 Applying: parisc, exec: remove redundant set_fs(USER_DS)
16032 Applying: drivers/firmware/dmi_scan.c: make dmi_name_in_vendors more focused
16033 Applying: scsi: fix a header to include linux/types.h
16034 Applying: drivers/scsi/megaraid.c: fix sparse warnings
16035 Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()
16036 Applying: drivers/scsi/sd.c: use ida_simple_get() and ida_simple_remove() in place of boilerplate code
16037 Applying: drivers/scsi/osd/osd_uld.c: use ida_simple_get() to handle id
16038 Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user()
16039 Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
16040 Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements
16041 Applying: loop: prevent information leak after failed read
16042 Applying: loop: cleanup set_status interface
16043 Applying: loop-cleanup-set_status-interface-checkpatch-fixes
16044 Applying: cciss: add half second delay to PCI PM reset code
16045 Applying: cciss: auto engage SCSI mid layer at driver load time
16046 Applying: kmod: prevent kmod_loop_msg overflow in __request_module()
16047 Using index info to reconstruct a base tree...
16048 Falling back to patching base and 3-way merge...
16049 No changes -- Patch already applied.
16050 Applying: slab: add taint flag outputting to debug paths.
16051 Applying: slub: add taint flag outputting to debug paths
16052 Applying: drivers/tty/serial/pch_uart.c: add console support
16053 Applying: Cross Memory Attach
16054 Applying: cross-memory-attach-update
16055 Applying: cross-memory-attach-v4
16056 Applying: mm: compaction: trivial clean up in acct_isolated()
16057 Applying: mm: change isolate mode from #define to bitwise type
16058 Applying: mm-change-isolate-mode-from-define-to-bitwise-type-fix
16059 Applying: mm: compaction: make isolate_lru_page() filter-aware
16060 Applying: mm-compaction-make-isolate_lru_page-filter-aware-fix
16061 Applying: mm: zone_reclaim: make isolate_lru_page() filter-aware
16062 Applying: mm-zone_reclaim-make-isolate_lru_page-filter-aware-fix
16063 Applying: mm: migration: clean up unmap_and_move()
16064 Applying: radix_tree: clean away saw_unset_tag leftovers
16065 Applying: vmscan: add block plug for page reclaim
16066 Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
16067 Applying: mm/page-writeback.c: document bdi_min_ratio
16068 Applying: oom: avoid killing kthreads if they assume the oom killed thread's mm
16069 Applying: oom: remove oom_disable_count
16070 Applying: oom: fix race while temporarily setting current's oom_score_adj
16071 Applying: tmpfs: add "tmpfs" to the Kconfig prompt to make it obvious.
16072 Applying: mm: output a list of loaded modules when we hit bad_page()
16073 Applying: mm: vmscan: drop nr_force_scan[] from get_scan_count
16074 Applying: mm: distinguish between mlocked and pinned pages
16075 Applying: mm: add comments to explain mm_struct fields
16076 Applying: mm-add-comments-to-explain-mm_struct-fields-fix
16077 Applying: mm: vmscan: do not writeback filesystem pages in direct reclaim
16078 Applying: mm: vmscan: remove dead code related to lumpy reclaim waiting on pages under writeback
16079 Applying: xfs: warn if direct reclaim tries to writeback pages
16080 Applying: ext4: warn if direct reclaim tries to writeback pages
16081 Applying: mm: vmscan: do not writeback filesystem pages in kswapd except in high priority
16082 Applying: mm: vmscan: throttle reclaim if encountering too many dirty pages under writeback
16083 Applying: mm-vmscan-throttle-reclaim-if-encountering-too-many-dirty-pages-under-writeback-update
16084 Applying: mm: vmscan: immediately reclaim end-of-LRU dirty pages when writeback completes
16085 Applying: vmscan: count pages into balanced for zone with good watermark
16086 Applying: mm/debug-pagealloc.c: use plain __ratelimit() instead of printk_ratelimit()
16087 Applying: lib/string.c: introduce memchr_inv()
16088 Applying: lib-stringc-introduce-memchr_inv-fix-kernel-doc-for-memchr_inv
16089 Applying: mm/debug-pagealloc.c: use memchr_inv
16090 Applying: vmscan: fix initial shrinker size handling
16091 Applying: vmscan: use atomic-long for shrinker batching
16092 Applying: vmscan-use-atomic-long-for-shrinker-batching-fix
16093 Applying: mm: avoid null pointer access in vm_struct via /proc/vmallocinfo
16094 Applying: vmscan: promote shared file mapped pages
16095 Applying: vmscan: activate executable pages after first usage
16096 Applying: memblock: add memblock_start_of_DRAM()
16097 Applying: memblock: add NO_BOOTMEM config symbol
16098 Applying: mremap: check for overflow using deltas
16099 Applying: mremap: avoid sending one IPI per page
16100 Applying: thp: mremap support and TLB optimization
16101 Applying: thp-mremap-support-and-tlb-optimization-fix
16102 Applying: thp-mremap-support-and-tlb-optimization-fix-fix
16103 Applying: thp-mremap-support-and-tlb-optimization-fix-fix-fix
16104 Applying: include/asm-generic/page.h: calculate virt_to_page and page_to_virt via predefined macro
16105 Applying: mm: iov_iter: have iov_iter_advance() decrement nr_segs appropriately
16106 Applying: mm: neaten warn_alloc_failed
16107 Applying: mm-neaten-warn_alloc_failed-fix
16108 Applying: debug-pagealloc: add support for highmem pages
16109 Applying: debug-pagealloc-add-support-for-highmem-pages-fix
16110 Applying: kswapd: avoid unnecessary rebalance after an unsuccessful balancing
16111 Applying: mm: add free_hot_cold_page_list() helper
16112 Applying: mm/memblock.c: small function definition fixes
16113 Applying: mm: compaction: compact unevictable pages
16114 Applying: mm-compaction-compact-unevictable-pages-checkpatch-fixes
16115 Applying: mm: compaction: accounting fix
16116 Applying: kswapd: assign new_order and new_classzone_idx after wakeup in sleeping
16117 Applying: mm: fix page-faults detection in swap-token logic
16118 Applying: mm/vmalloc.c: report more vmalloc failures
16119 Applying: mm: add extra free kbytes tunable
16120 Applying: mm-add-extra-free-kbytes-tunable-update
16121 Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
16122 Applying: mm: thp: tail page refcounting fix
16123 Applying: thp-tail-page-refcounting-fix-6
16124 Applying: ksm: fix the comment of try_to_unmap_one()
16125 Applying: mm-add-comment-explaining-task-state-setting-in-bdi_forker_thread-fix
16126 Applying: vmscan: fix shrinker callback bug in fs/super.c
16127 Applying: mm/mmap.c: eliminate the ret variable from mm_take_all_locks()
16128 Applying: mm-mmapc-eliminate-the-ret-variable-from-mm_take_all_locks-fix
16129 Applying: fs/buffer.c: add device information for error output in __find_get_block_slow()
16130 Applying: HWPOISON: convert pr_debug()s to pr_info()s
16131 Applying: mm: compaction: make compact_zone_order() static
16132 Applying: mm: fix kunmap_high() comment
16133 Applying: vmscan.c: fix invalid strict_strtoul() check in write_scan_unevictable_node()
16134 Applying: mm: disable user interface to manually rescue unevictable pages
16135 Applying: mm/memblock.c: quiet sparse noise
16136 Applying: mm/thrash.c: quiet sparse noise
16137 Applying: mm/mempolicy.c: quiet sparse noise
16138 Applying: mm/huge_memory.c: quiet sparse noise
16139 Applying: vmscan: add barrier to prevent evictable page in unevictable list
16140 Applying: selinuxfs: remove custom hex_to_bin()
16141 Applying: include/linux/security.h: fix security_inode_init_security() arg
16142 Applying: hpet: factor timer allocate from open
16143 Applying: alpha: wire up accept4 syscall
16144 Applying: alpha: wire up sendmmsg syscall
16145 Applying: intel_idle: fix API misuse
16146 Applying: intel_idle: disable auto_demotion for hotplugged CPUs
16147 Applying: fs/pipe.c: add ->statfs callback for pipefs
16148 Applying: lib/Kconfig.debug: fix help message for DEFAULT_HUNG_TASK_TIMEOUT
16149 Applying: hwmon: convert idr to ida and use ida_simple interface
16150 Applying: drivers/hwmon/hwmon.c: convert idr to ida and use ida_simple_get()
16151 Applying: lis3lv02d: avoid divide by zero due to unchecked
16152 Applying: lis3: update maintainer information
16153 Applying: lis3: add support for HP EliteBook 2730p
16154 Applying: lis3: add support for HP EliteBook 8540w
16155 Applying: hp_accel: add HP ProBook 655x
16156 Applying: lis3: free regulators if probe() fails
16157 Applying: lis3: use consistent naming of variables
16158 Applying: lis3: change exported function to use passed parameter
16159 Applying: lis3: remove the references to the global variable in core driver
16160 Applying: lis3-remove-the-references-to-the-global-variable-in-core-driver-fix
16161 Applying: lis3lv02d: make regulator API usage unconditional
16162 Applying: driver/misc/fsa9480.c fix potential null-pointer dereference
16163 Applying: stop_machine: make stop_machine safe and efficient to call early
16164 Applying: stop_machine-make-stop_machine-safe-and-efficient-to-call-early-v3.
16165 Applying: watchdog: move watchdog_*_all_cpus under CONFIG_SYSCTL
16166 Applying: dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions
16167 Applying: dynamic_debug: remove num_enabled accounting
16168 Applying: dynamic_debug: use a single printk() to emit messages
16169 Applying: dynamic_debug: fix undefined reference to `__netdev_printk'
16170 Applying: printk: add module parameter ignore_loglevel to control ignore_loglevel
16171 Applying: printk: add ignore_loglevel as module parameter
16172 Applying: printk: add console_suspend module parameter
16173 Applying: printk: fix bounds checking for log_prefix
16174 Applying: printk: remove bounds checking for log_prefix
16175 Applying: treewide: use __printf not __attribute__((format(printf,...)))
16176 Applying: treewide-use-__printf-not-__attribute__formatprintf-fix
16177 Applying: treewide-use-__printf-not-__attribute__formatprintf-checkpatch-fixes
16178 Applying: fs/namei.c: remove unused getname_flags()
16179 Applying: poll: add poll_requested_events() function
16180 Applying: MAINTAINERS: add new entry for ideapad-laptop
16181 Applying: video/backlight: remove obsolete cleanup for clientdata
16182 Applying: backlight: fix broken regulator API usage in l4f00242t03
16183 Applying: drivers/video/backlight/l4f00242t03.c: use gpio_request_one() to simplify error handling
16184 Applying: backlight: rename corgibl_limit_intensity() to genericbl_limit_intensity()
16185 Applying: leds: Renesas TPU LED driver
16186 Applying: leds-renesas-tpu-led-driver-v2-fix
16187 Applying: drivers/leds/led-triggers.c: fix memory leak
16188 Applying: drivers/leds/leds-lm3530.c: remove obsolete cleanup for clientdata
16189 Applying: drivers/leds/leds-renesas-tpu.c: update driver to use workqueue
16190 Applying: drivers/leds/leds-renesas-tpu.c: move Renesas TPU LED driver platform data
16191 Applying: drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing
16192 Applying: lib/kstrtox: common code between kstrto*() and simple_strto*() functions
16193 Applying: lib/spinlock_debug.c: print owner on spinlock lockup
16194 Applying: lib/bitmap.c: quiet sparse noise about address space
16195 Applying: lib-bitmapc-quiet-sparse-noise-about-address-space-fix
16196 Applying: lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef
16197 Applying: lib/idr.c: fix comment for ida_get_new_above()
16198 Applying: llist: using in_nmi requires including hardirq.h
16199 Applying: llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
16200 Applying: kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as obsolete
16201 Applying: lib/crc: add slice by 8 algorithm to crc32.c
16202 Applying: lib-crc-add-slice-by-8-algorithm-to-crc32c-fix
16203 Applying: epoll: fix spurious lockdep warnings
16204 Applying: epoll: limit paths
16205 Applying: binfmt_elf: fix PIE execution with randomization disabled
16206 Applying: init/do_mounts_rd.c: fix ramdisk identification for padded cramfs
16207 Applying: oprofilefs: handle zero-length writes
16208 Applying: drivers/rtc/class.c: convert idr to ida and use ida_simple_get()
16209 Applying: rtc: add initial support for mcp7941x parts
16210 Applying: drivers/rtc/rtc-mc13xxx.c: move probe and remove callbacks to .init.text and .exit.text
16211 Applying: minix: describe usage of different magic numbers
16212 Applying: cgroups: more safe tasklist locking in cgroup_attach_proc
16213 Applying: cgroups: don't attach task to subsystem if migration failed
16214 Applying: cgroup/kmemleak: Annotate alloc_page() for cgroup allocations
16215 Applying: cgroups: add res_counter_write_u64() API
16216 Applying: cgroups: new resource counter inheritance API
16217 Applying: cgroups: add previous cgroup in can_attach_task/attach_task callbacks
16218 Applying: cgroups: new cancel_attach_task() subsystem callback
16219 Applying: cgroups: ability to stop res charge propagation on bounded ancestor
16220 Applying: cgroups: add res counter common ancestor searching
16221 Applying: res_counter: allow charge failure pointer to be null
16222 Applying: cgroups: pull up res counter charge failure interpretation to caller
16223 Applying: cgroups: allow subsystems to cancel a fork
16224 Applying: cgroups: add a task counter subsystem
16225 Applying: memcg: rename mem variable to memcg
16226 Applying: memcg: fix oom schedule_timeout()
16227 Applying: memcg: replace ss->id_lock with a rwlock
16228 Applying: memcg: do not expose uninitialized mem_cgroup_per_node to world
16229 Applying: memcg: skip scanning active lists based on individual size
16230 Applying: memcg-skip-scanning-active-lists-based-on-individual-size-fix
16231 Applying: memcg: close race between charge and putback
16232 Applying: memcg: Fix race condition in memcg_check_events() with this_cpu usage
16233 Applying: cpusets: avoid looping when storing to mems_allowed if one node remains set
16234 Applying: procfs: report EISDIR when reading sysctl dirs in proc
16235 Applying: proc: fix races against execve() of /proc/PID/fd**
16236 Applying: proc-fix-races-against-execve-of-proc-pid-fd-fix
16237 Applying: proc: force dcache drop on unauthorized access
16238 Applying: ipc-introduce-shm_rmid_forced-sysctl-testing
16239 Applying: init: add root=PARTUUID=UUID/PARTNROFF=%d support
16240 Applying: init-add-root=partuuid=uuid-partnroff=%d-support-fix
16241 Applying: drivers/rapidio/rio-scan.c: use discovered bit to test if enumeration is complete
16242 Applying: arch/powerpc/sysdev/fsl_rio.c: release rapidio port I/O region resource if port failed to initialize
16243 Applying: RapidIO: add mport driver for Tsi721 bridge
16244 Applying: RapidIO: Tsi721 driver - fixes for the initial release
16245 Applying: RapidIO: fix potential null deref in rio_setup_device()
16246 Applying: drivers/net/rionet.c: fix ethernet address macros for LE platforms
16247 Applying: sysctl: add support for poll()
16248 Applying: sysctl-add-support-for-poll-fix
16249 Applying: sysctl: make CONFIG_SYSCTL_SYSCALL default to n
16250 Applying: pps: default echo function
16251 Applying: pps: new client driver using GPIO
16252 Applying: pps-new-client-driver-using-gpio-fix
16253 Applying: pps gpio client: add missing dependency
16254 Applying: w1: ds2760 and ds2780, use ida for id and ida_simple_get() to get it
16255 Applying: drivers/power/ds2780_battery.c: create central point for calling w1 interface
16256 Applying: drivers/power/ds2780_battery.c: add a nolock function to w1 interface
16257 Applying: drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal
16258 Applying: drivers/w1/w1_int.c: multiple masters used same init_name
16259 Applying: aio: allocate kiocbs in batches
16260 Applying: fs/direct-io.c: salcuate fs_count correctly in get_more_blocks()
16261 Applying: dio: separate fields only used in the submission path from struct dio
16262 Applying: dio-separate-fields-only-used-in-the-submission-path-from-struct-dio-checkpatch-fixes
16263 Applying: dio: fix a wrong comment
16264 Applying: dio: rearrange fields in dio/dio_submit to avoid holes
16265 Applying: dio: use a slab cache for struct dio
16266 Applying: dio: separate map_bh from dio
16267 Applying: dio: inline the complete submission path
16268 Applying: dio-inline-the-complete-submission-path-v2-checkpatch-fixes
16269 Applying: dio: merge direct_io_walker() into __blockdev_direct_IO()
16270 Applying: dio-merge-direct_io_walker-into-__blockdev_direct_io-checkpatch-fixes
16271 Applying: dio: remove unnecessary dio argument from dio_pages_present()
16272 Applying: dio: remove unused dio parameter from dio_bio_add_page()
16273 Applying: vfs: cache request_queue in struct block_device
16274 Applying: dio: optimize cache misses in the submission path
16275 Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes
16276 Applying: dio: using prefetch requires including prefetch.h
16277 $ cd ../next
16278 $ git fetch -f ../rebase-tmp akpm:akpm
16279 From ../rebase-tmp
16280  + 55d42cf...c772145 akpm       -> akpm  (forced update)
16281 $ rm -rf ../rebase-tmp
16282 Merging akpm
16283 $ git merge --no-ff akpm
16284 Merge made by recursive.
16285  Documentation/DocBook/debugobjects.tmpl            |   50 +
16286  Documentation/blockdev/cciss.txt                   |   14 +-
16287  Documentation/cgroups/cgroups.txt                  |   13 +-
16288  Documentation/cgroups/memory.txt                   |    1 -
16289  Documentation/cgroups/resource_counter.txt         |   20 +-
16290  Documentation/cgroups/task_counter.txt             |  153 ++
16291  Documentation/feature-removal-schedule.txt         |   35 -
16292  Documentation/kernel-parameters.txt                |    8 +
16293  Documentation/rapidio/tsi721.txt                   |   49 +
16294  Documentation/sysctl/vm.txt                        |   16 +
16295  .../trace/postprocess/trace-vmscan-postprocess.pl  |    8 +-
16296  MAINTAINERS                                        |    8 +
16297  arch/alpha/boot/misc.c                             |    3 +-
16298  arch/alpha/include/asm/console.h                   |    3 +-
16299  arch/alpha/include/asm/unistd.h                    |    4 +-
16300  arch/alpha/kernel/systbls.S                        |    2 +
16301  arch/arm/include/asm/processor.h                   |    1 -
16302  arch/arm/mach-imx/mach-mx27_3ds.c                  |    6 +-
16303  arch/arm/mach-imx/mach-mx31_3ds.c                  |    6 +-
16304  arch/arm/mach-ux500/mbox-db5500.c                  |    2 +-
16305  arch/frv/include/asm/system.h                      |    2 +-
16306  arch/ia64/include/asm/mca.h                        |    3 +-
16307  arch/ia64/include/asm/processor.h                  |    1 -
16308  arch/m68k/include/asm/natfeat.h                    |    3 +-
16309  arch/mn10300/include/asm/gdb-stub.h                |    5 +-
16310  arch/parisc/include/asm/processor.h                |    2 -
16311  arch/parisc/kernel/process.c                       |    1 -
16312  arch/powerpc/include/asm/systbl.h                  |    2 +
16313  arch/powerpc/include/asm/udbg.h                    |    3 +-
16314  arch/powerpc/include/asm/unistd.h                  |    4 +-
16315  arch/powerpc/mm/gup.c                              |    5 +-
16316  arch/powerpc/sysdev/fsl_rio.c                      |    1 +
16317  arch/s390/include/asm/debug.h                      |   11 +-
16318  arch/um/include/shared/user.h                      |    8 +-
16319  arch/unicore32/include/asm/processor.h             |    1 -
16320  arch/x86/ia32/ia32entry.S                          |    2 +
16321  arch/x86/include/asm/mrst.h                        |    9 +
16322  arch/x86/include/asm/unistd_32.h                   |    4 +-
16323  arch/x86/include/asm/unistd_64.h                   |    4 +
16324  arch/x86/kernel/e820.c                             |   59 +-
16325  arch/x86/kernel/ptrace.c                           |    3 +-
16326  arch/x86/kernel/rtc.c                              |    5 +
16327  arch/x86/kernel/syscall_table_32.S                 |    2 +
16328  arch/x86/mm/gup.c                                  |    5 +-
16329  arch/x86/mm/highmem_32.c                           |    2 +
16330  arch/x86/mm/mmap.c                                 |    4 +-
16331  arch/x86/mm/pageattr.c                             |    2 +-
16332  arch/x86/mm/tlb.c                                  |   16 +-
16333  arch/x86/platform/iris/iris.c                      |   67 +-
16334  arch/x86/platform/mrst/mrst.c                      |    1 +
16335  arch/x86/platform/mrst/vrtc.c                      |    4 +-
16336  block/blk-cgroup.c                                 |   12 +-
16337  drivers/block/cciss.c                              |    3 +-
16338  drivers/block/cciss_scsi.c                         |    1 +
16339  drivers/block/loop.c                               |   47 +-
16340  drivers/char/hpet.c                                |   56 +-
16341  drivers/edac/mpc85xx_edac.c                        |    2 +-
16342  drivers/firmware/dmi_scan.c                        |    6 +-
16343  drivers/gpu/drm/Kconfig                            |    1 +
16344  drivers/gpu/vga/vgaarb.c                           |   18 +-
16345  drivers/hwmon/hwmon.c                              |   32 +-
16346  drivers/hwmon/ibmaem.c                             |   47 +-
16347  drivers/idle/intel_idle.c                          |   59 +-
16348  drivers/infiniband/core/umem.c                     |    6 +-
16349  drivers/infiniband/hw/ipath/ipath_user_pages.c     |    6 +-
16350  drivers/infiniband/hw/qib/qib_user_pages.c         |    4 +-
16351  drivers/isdn/hisax/callc.c                         |    4 +-
16352  drivers/isdn/hisax/hisax.h                         |    4 +-
16353  drivers/isdn/hisax/isdnl1.h                        |    2 +-
16354  drivers/isdn/hisax/isdnl3.c                        |    2 +-
16355  drivers/isdn/hisax/st5481_d.c                      |    4 +-
16356  drivers/leds/Kconfig                               |   12 +
16357  drivers/leds/Makefile                              |    1 +
16358  drivers/leds/led-triggers.c                        |    5 +-
16359  drivers/leds/leds-gpio.c                           |    2 +-
16360  drivers/leds/leds-lm3530.c                         |    1 -
16361  drivers/leds/leds-renesas-tpu.c                    |  357 +++
16362  drivers/message/fusion/mptbase.c                   |    7 +-
16363  drivers/message/fusion/mptbase.h                   |    1 +
16364  drivers/misc/fsa9480.c                             |    3 +-
16365  drivers/misc/lis3lv02d/lis3lv02d.c                 |  389 ++--
16366  drivers/misc/lis3lv02d/lis3lv02d.h                 |    9 +-
16367  drivers/misc/lis3lv02d/lis3lv02d_i2c.c             |   45 +-
16368  drivers/misc/lis3lv02d/lis3lv02d_spi.c             |    2 +-
16369  drivers/net/ethernet/i825xx/3c505.c                |    6 +-
16370  drivers/net/ethernet/mellanox/mlx4/mlx4_en.h       |    3 +-
16371  drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h    |    2 -
16372  drivers/net/rionet.c                               |    4 +-
16373  drivers/net/wireless/ath/ath.h                     |    5 +-
16374  drivers/net/wireless/ath/ath5k/debug.h             |    4 +-
16375  drivers/net/wireless/ath/ath6kl/debug.h            |    4 +-
16376  drivers/net/wireless/b43/b43.h                     |   12 +-
16377  drivers/net/wireless/b43legacy/b43legacy.h         |   16 +-
16378  drivers/oprofile/oprofilefs.c                      |    5 +-
16379  drivers/platform/x86/acerhdf.c                     |    1 +
16380  drivers/platform/x86/hp_accel.c                    |   15 +-
16381  drivers/power/ds2780_battery.c                     |   86 +-
16382  drivers/power/intel_mid_battery.c                  |   12 +-
16383  drivers/pps/clients/Kconfig                        |    9 +
16384  drivers/pps/clients/Makefile                       |    1 +
16385  drivers/pps/clients/pps-gpio.c                     |  227 ++
16386  drivers/pps/clients/pps-ktimer.c                   |   12 -
16387  drivers/pps/clients/pps_parport.c                  |    9 -
16388  drivers/pps/kapi.c                                 |   20 +-
16389  drivers/rapidio/Kconfig                            |    6 +-
16390  drivers/rapidio/Makefile                           |    1 +
16391  drivers/rapidio/devices/Kconfig                    |   10 +
16392  drivers/rapidio/devices/Makefile                   |    5 +
16393  drivers/rapidio/devices/tsi721.c                   | 2360 ++++++++++++++++++++
16394  drivers/rapidio/devices/tsi721.h                   |  766 +++++++
16395  drivers/rapidio/rio-scan.c                         |    6 +-
16396  drivers/rtc/class.c                                |   32 +-
16397  drivers/rtc/rtc-ds1307.c                           |   27 +
16398  drivers/rtc/rtc-mc13xxx.c                          |    6 +-
16399  drivers/rtc/rtc-mrst.c                             |   19 +-
16400  drivers/scsi/aacraid/commctrl.c                    |    1 +
16401  drivers/scsi/megaraid.c                            |    8 +-
16402  drivers/scsi/mpt2sas/mpt2sas_base.c                |    3 +-
16403  drivers/scsi/osd/osd_uld.c                         |   22 +-
16404  drivers/scsi/sd.c                                  |   32 +-
16405  drivers/scsi/sg.c                                  |   25 +-
16406  drivers/staging/iio/trigger.h                      |    3 +-
16407  drivers/tty/serial/Kconfig                         |    9 +
16408  drivers/tty/serial/pch_uart.c                      |  160 ++-
16409  drivers/video/backlight/adp8870_bl.c               |    2 -
16410  drivers/video/backlight/generic_bl.c               |    4 +-
16411  drivers/video/backlight/l4f00242t03.c              |   70 +-
16412  drivers/w1/slaves/w1_ds2760.c                      |   48 +-
16413  drivers/w1/slaves/w1_ds2780.c                      |   96 +-
16414  drivers/w1/slaves/w1_ds2780.h                      |    2 +
16415  drivers/w1/w1_int.c                                |    1 +
16416  fs/Kconfig                                         |    2 +-
16417  fs/aio.c                                           |  140 +-
16418  fs/binfmt_elf.c                                    |   11 +-
16419  fs/block_dev.c                                     |    3 +
16420  fs/btrfs/inode.c                                   |    3 +-
16421  fs/buffer.c                                        |    5 +-
16422  fs/compat.c                                        |    7 +-
16423  fs/dcache.c                                        |   10 +-
16424  fs/direct-io.c                                     |  690 +++---
16425  fs/ecryptfs/ecryptfs_kernel.h                      |    2 +-
16426  fs/eventpoll.c                                     |  270 ++-
16427  fs/exec.c                                          |    4 -
16428  fs/ext2/ext2.h                                     |    8 +-
16429  fs/ext4/ext4.h                                     |   51 +-
16430  fs/ext4/ialloc.c                                   |    4 +-
16431  fs/ext4/inode.c                                    |    6 +-
16432  fs/fat/fat.h                                       |    9 +-
16433  fs/file_table.c                                    |   23 +-
16434  fs/gfs2/glock.h                                    |    2 +-
16435  fs/hpfs/hpfs_fn.h                                  |    4 +-
16436  fs/internal.h                                      |    3 +-
16437  fs/logfs/logfs.h                                   |    1 -
16438  fs/logfs/super.c                                   |   22 -
16439  fs/namei.c                                         |   45 +-
16440  fs/namespace.c                                     |  124 +-
16441  fs/nilfs2/nilfs.h                                  |    8 +-
16442  fs/ntfs/debug.h                                    |   15 +-
16443  fs/ocfs2/ocfs2.h                                   |   47 +
16444  fs/ocfs2/quota_local.c                             |   10 +-
16445  fs/ocfs2/super.h                                   |   14 +-
16446  fs/partitions/ldm.c                                |   16 +-
16447  fs/pipe.c                                          |    1 +
16448  fs/pnode.c                                         |    4 +-
16449  fs/proc/base.c                                     |  127 +-
16450  fs/proc/proc_sysctl.c                              |   46 +
16451  fs/proc/task_mmu.c                                 |    2 +
16452  fs/read_write.c                                    |    8 +-
16453  fs/select.c                                        |   38 +-
16454  fs/stat.c                                          |    5 +-
16455  fs/super.c                                         |    2 +-
16456  fs/udf/udfdecl.h                                   |    4 +-
16457  fs/ufs/ufs.h                                       |    9 +-
16458  fs/xfs/xfs_aops.c                                  |    8 +-
16459  fs/xfs/xfs_message.h                               |   42 +-
16460  include/asm-generic/bug.h                          |   11 +-
16461  include/asm-generic/page.h                         |    4 +-
16462  include/drm/drmP.h                                 |   10 +-
16463  include/linux/aio.h                                |    1 +
16464  include/linux/audit.h                              |   11 +-
16465  include/linux/blktrace_api.h                       |    2 +-
16466  include/linux/cgroup.h                             |   30 +-
16467  include/linux/cgroup_subsys.h                      |    8 +
16468  include/linux/compaction.h                         |    8 -
16469  include/linux/compat.h                             |    3 +-
16470  include/linux/debugobjects.h                       |    6 +
16471  include/linux/device.h                             |  110 +-
16472  include/linux/dmar.h                               |    2 +
16473  include/linux/dynamic_debug.h                      |   85 +-
16474  include/linux/eventpoll.h                          |    1 +
16475  include/linux/ext3_fs.h                            |   16 +-
16476  include/linux/fs.h                                 |   16 +-
16477  include/linux/fscache-cache.h                      |    8 +-
16478  include/linux/gameport.h                           |    8 +-
16479  include/linux/gfp.h                                |    1 +
16480  include/linux/hpet.h                               |    1 +
16481  include/linux/huge_mm.h                            |    5 +
16482  include/linux/ipc_namespace.h                      |   40 +-
16483  include/linux/kallsyms.h                           |    5 +-
16484  include/linux/kdb.h                                |    9 +-
16485  include/linux/kernel.h                             |   48 +-
16486  include/linux/kexec.h                              |    4 +-
16487  include/linux/kmod.h                               |    4 +-
16488  include/linux/kobject.h                            |   26 +-
16489  include/linux/kthread.h                            |    4 +-
16490  include/linux/lglock.h                             |  152 +--
16491  include/linux/libata.h                             |   18 +-
16492  include/linux/lis3lv02d.h                          |    1 -
16493  include/linux/llist.h                              |    4 +-
16494  include/linux/magic.h                              |   10 +-
16495  include/linux/memblock.h                           |    1 +
16496  include/linux/memcontrol.h                         |   47 +-
16497  include/linux/mm.h                                 |   60 +-
16498  include/linux/mm_types.h                           |   36 +-
16499  include/linux/mmiotrace.h                          |    8 +-
16500  include/linux/mmzone.h                             |   17 +-
16501  include/linux/namei.h                              |    1 +
16502  include/linux/netdevice.h                          |   34 +-
16503  include/linux/oom.h                                |    1 +
16504  include/linux/platform_data/leds-renesas-tpu.h     |   14 +
16505  include/linux/poll.h                               |    7 +-
16506  include/linux/pps-gpio.h                           |   32 +
16507  include/linux/printk.h                             |   12 +-
16508  include/linux/quotaops.h                           |    2 +-
16509  include/linux/res_counter.h                        |   27 +-
16510  include/linux/rio_ids.h                            |    1 +
16511  include/linux/security.h                           |    2 +-
16512  include/linux/seq_file.h                           |    3 +-
16513  include/linux/shrinker.h                           |    3 +-
16514  include/linux/spi/l4f00242t03.h                    |    2 -
16515  include/linux/string.h                             |    1 +
16516  include/linux/swap.h                               |   43 +-
16517  include/linux/syscalls.h                           |   13 +
16518  include/linux/sysctl.h                             |   22 +
16519  include/linux/trace_seq.h                          |    8 +-
16520  include/linux/utsname.h                            |   16 +
16521  include/linux/vmalloc.h                            |    1 +
16522  include/linux/writeback.h                          |    2 -
16523  include/net/bluetooth/bluetooth.h                  |    2 +-
16524  include/net/netfilter/nf_log.h                     |    3 +-
16525  include/net/sock.h                                 |    4 +-
16526  include/scsi/scsi_netlink.h                        |    2 +-
16527  include/sound/core.h                               |    4 +-
16528  include/sound/info.h                               |    4 +-
16529  include/sound/seq_kernel.h                         |    4 +-
16530  include/trace/events/vmscan.h                      |    8 +-
16531  include/xen/hvc-console.h                          |    4 +-
16532  include/xen/xenbus.h                               |   12 +-
16533  init/Kconfig                                       |   13 +-
16534  init/do_mounts.c                                   |   48 +-
16535  init/do_mounts_rd.c                                |   14 +
16536  ipc/mq_sysctl.c                                    |   31 +-
16537  ipc/mqueue.c                                       |   23 +-
16538  ipc/shm.c                                          |    2 +-
16539  kernel/Makefile                                    |    3 +-
16540  kernel/audit.c                                     |    5 +-
16541  kernel/cgroup.c                                    |   93 +-
16542  kernel/cgroup_freezer.c                            |    9 +-
16543  kernel/cgroup_task_counter.c                       |  239 ++
16544  kernel/cpuset.c                                    |   15 +-
16545  kernel/events/core.c                               |   11 +-
16546  kernel/exit.c                                      |    4 +-
16547  kernel/fork.c                                      |   18 +-
16548  kernel/lglock.c                                    |  101 +
16549  kernel/printk.c                                    |   10 +-
16550  kernel/res_counter.c                               |   97 +-
16551  kernel/sched.c                                     |    6 +-
16552  kernel/stop_machine.c                              |   22 +
16553  kernel/sys.c                                       |    2 +
16554  kernel/sys_ni.c                                    |    4 +
16555  kernel/sysctl.c                                    |   11 +-
16556  kernel/timer.c                                     |   54 +-
16557  kernel/utsname_sysctl.c                            |   23 +
16558  kernel/watchdog.c                                  |    4 +-
16559  lib/Kconfig.debug                                  |    5 +-
16560  lib/bitmap.c                                       |   10 +-
16561  lib/crc32.c                                        |  370 +++-
16562  lib/crc32defs.h                                    |   16 +-
16563  lib/debugobjects.c                                 |   33 +
16564  lib/dynamic_debug.c                                |   91 +-
16565  lib/gen_crc32table.c                               |   59 +-
16566  lib/idr.c                                          |    4 +-
16567  lib/kstrtox.c                                      |   75 +-
16568  lib/kstrtox.h                                      |    8 +
16569  lib/percpu_counter.c                               |    2 +
16570  lib/radix-tree.c                                   |   10 +-
16571  lib/spinlock_debug.c                               |   19 +-
16572  lib/string.c                                       |   54 +
16573  lib/vsprintf.c                                     |   33 +-
16574  mm/Kconfig                                         |    3 +
16575  mm/Makefile                                        |    3 +-
16576  mm/backing-dev.c                                   |    5 +-
16577  mm/compaction.c                                    |   37 +-
16578  mm/debug-pagealloc.c                               |   56 +-
16579  mm/filemap.c                                       |    3 +
16580  mm/highmem.c                                       |    2 +-
16581  mm/huge_memory.c                                   |   87 +-
16582  mm/internal.h                                      |   46 +
16583  mm/ksm.c                                           |    3 +-
16584  mm/memblock.c                                      |   11 +-
16585  mm/memcontrol.c                                    | 1009 +++++-----
16586  mm/memory-failure.c                                |   12 +-
16587  mm/memory.c                                        |   15 +-
16588  mm/mempolicy.c                                     |    2 +-
16589  mm/migrate.c                                       |   75 +-
16590  mm/mmap.c                                          |    9 +-
16591  mm/mremap.c                                        |   42 +-
16592  mm/oom_kill.c                                      |   47 +-
16593  mm/page-writeback.c                                |  126 +-
16594  mm/page_alloc.c                                    |   66 +-
16595  mm/page_cgroup.c                                   |    7 +-
16596  mm/process_vm_access.c                             |  496 ++++
16597  mm/rmap.c                                          |    5 +-
16598  mm/shmem.c                                         |    6 +
16599  mm/slab.c                                          |    9 +-
16600  mm/slub.c                                          |   49 +-
16601  mm/swap.c                                          |   97 +-
16602  mm/swapfile.c                                      |    2 +-
16603  mm/thrash.c                                        |    2 +-
16604  mm/vmalloc.c                                       |   80 +-
16605  mm/vmscan.c                                        |  360 ++--
16606  mm/vmstat.c                                        |    1 +
16607  net/netfilter/nf_conntrack_netlink.c               |    5 +
16608  net/nfc/nfc.h                                      |    2 +-
16609  net/rds/rds.h                                      |    8 +-
16610  net/sunrpc/svc.c                                   |    5 +-
16611  scripts/checkpatch.pl                              |    6 +-
16612  security/keys/compat.c                             |    2 +-
16613  security/keys/keyctl.c                             |    2 +-
16614  security/selinux/selinuxfs.c                       |   14 +-
16615  sound/firewire/cmp.c                               |    2 +-
16616  331 files changed, 9918 insertions(+), 3512 deletions(-)
16617  create mode 100644 Documentation/cgroups/task_counter.txt
16618  create mode 100644 Documentation/rapidio/tsi721.txt
16619  create mode 100644 drivers/leds/leds-renesas-tpu.c
16620  create mode 100644 drivers/pps/clients/pps-gpio.c
16621  create mode 100644 drivers/rapidio/devices/Kconfig
16622  create mode 100644 drivers/rapidio/devices/Makefile
16623  create mode 100644 drivers/rapidio/devices/tsi721.c
16624  create mode 100644 drivers/rapidio/devices/tsi721.h
16625  create mode 100644 include/linux/platform_data/leds-renesas-tpu.h
16626  create mode 100644 include/linux/pps-gpio.h
16627  create mode 100644 kernel/cgroup_task_counter.c
16628  create mode 100644 kernel/lglock.c
16629  create mode 100644 lib/kstrtox.h
16630  create mode 100644 mm/process_vm_access.c
16631 $ git am -3 ../patches/0001-ipc-mqueue-vlammoc-requires-vmalloc.h.patch
16632 Applying: ipc/mqueue: vlammoc requires vmalloc.h
16633 $ git reset HEAD^
16634 Unstaged changes after reset:
16635 M       ipc/mqueue.c
16636 $ git add .
16637 $ git commit -v -a --amend
16638 [master 91044dd] Merge branch 'akpm'
16639 $ git am -3 ../patches/0001-cgroups-ERR_PTR-needs-err.h.patch
16640 Applying: cgroups: ERR_PTR needs err.h
16641 $ git reset HEAD^
16642 Unstaged changes after reset:
16643 M       kernel/cgroup_task_counter.c
16644 $ git add .
16645 $ git commit -v -a --amend
16646 [master 4bb2430] Merge branch 'akpm'
16647 $ git am -3 ../patches/bna__Multiple_Definition_and_Interface_Setup_Fix.patch
16648 Applying: bna: Multiple Definition and Interface Setup Fix