Next/merge.log

   1 $ date
   2 Fri Aug 19 09:55:04 EST 2011
   3 $ git checkout master
   4 Already on 'master'
   5 $ git reset --hard stable
   6 HEAD is now at 338d0f0 befs: Validate length of long symbolic links.
   7 Merging origin/master
   8 $ git merge origin/master
   9 Updating 338d0f0..5c80c71
  10 Fast-forward
  11  drivers/edac/i7core_edac.c                   |    2 +-
  12  drivers/infiniband/ulp/ipoib/ipoib_main.c    |    8 ++-
  13  drivers/infiniband/ulp/iser/iscsi_iser.c     |   10 +++-
  14  drivers/infiniband/ulp/iser/iscsi_iser.h     |    2 +-
  15  drivers/infiniband/ulp/iser/iser_initiator.c |    2 +-
  16  fs/btrfs/ctree.h                             |   10 ++--
  17  fs/btrfs/extent-tree.c                       |   75 ++++++++++++++++++++------
  18  fs/btrfs/file.c                              |   28 ++++++++--
  19  fs/btrfs/free-space-cache.c                  |   16 ++++--
  20  fs/btrfs/inode.c                             |   12 +++--
  21  fs/btrfs/ioctl.c                             |    4 ++
  22  fs/btrfs/tree-log.c                          |   28 ++++++++--
  23  fs/btrfs/volumes.c                           |   51 ++++++++++++++++--
  24  fs/btrfs/volumes.h                           |    2 +
  25  fs/cifs/cifsfs.h                             |    2 +-
  26  fs/cifs/connect.c                            |    3 +-
  27  fs/cifs/dir.c                                |    4 +-
  28  fs/fat/dir.c                                 |    2 +-
  29  fs/fat/inode.c                               |    7 +--
  30  kernel/irq/irqdesc.c                         |    1 +
  31  20 files changed, 208 insertions(+), 61 deletions(-)
  32 Merging fixes/fixes
  33 $ git merge fixes/fixes
  34 Already up-to-date.
  35 Merging kbuild-current/rc-fixes
  36 $ git merge kbuild-current/rc-fixes
  37 Already up-to-date.
  38 Merging arm-current/master
  39 $ git merge arm-current/master
  40 Already up-to-date.
  41 Merging m68k-current/for-linus
  42 $ git merge m68k-current/for-linus
  43 Already up-to-date.
  44 Merging powerpc-merge/merge
  45 $ git merge powerpc-merge/merge
  46 Already up-to-date.
  47 Merging 52xx-and-virtex-current/powerpc/merge
  48 $ git merge 52xx-and-virtex-current/powerpc/merge
  49 Already up-to-date.
  50 Merging sparc-current/master
  51 $ git merge sparc-current/master
  52 Already up-to-date.
  53 Merging scsi-rc-fixes/master
  54 $ git merge scsi-rc-fixes/master
  55 Already up-to-date.
  56 Merging net-current/master
  57 $ git merge net-current/master
  58 Merge made by recursive.
  59  Documentation/networking/00-INDEX    |  116 ++++++++++++++++++++++++++++++++++
  60  Documentation/networking/scaling.txt |   23 +++++---
  61  drivers/net/bonding/bond_main.c      |   18 +++++
  62  drivers/net/can/sja1000/plx_pci.c    |    4 +-
  63  drivers/net/e1000e/e1000.h           |    4 +
  64  drivers/net/e1000e/ich8lan.c         |   65 +++++++++++++++----
  65  drivers/net/e1000e/netdev.c          |   80 ++++++++++++++++++++++-
  66  drivers/net/forcedeth.c              |    3 +-
  67  drivers/net/gianfar.c                |    9 ++-
  68  drivers/net/gianfar_ethtool.c        |   26 ++++++--
  69  drivers/net/ixgbe/ixgbe_main.c       |    4 +-
  70  drivers/net/sh_eth.c                 |    1 +
  71  drivers/net/usb/cdc_ncm.c            |   47 +++++++++++---
  72  drivers/net/via-velocity.c           |    4 -
  73  drivers/net/vmxnet3/vmxnet3_drv.c    |   34 ++++++----
  74  net/ipv6/sit.c                       |    3 +
  75  net/sched/act_mirred.c               |    3 +-
  76  17 files changed, 379 insertions(+), 65 deletions(-)
  77 Merging sound-current/for-linus
  78 $ git merge sound-current/for-linus
  79 Already up-to-date.
  80 Merging pci-current/for-linus
  81 $ git merge pci-current/for-linus
  82 Merge made by recursive.
  83  arch/x86/pci/acpi.c              |    9 ++
  84  drivers/pci/hotplug/pcihp_slot.c |   45 +----------
  85  drivers/pci/pci.c                |   67 +++++++++++++++
  86  drivers/pci/pci.h                |    4 +
  87  drivers/pci/probe.c              |  146 +++++++++++++++++++++++++++++++++
  88  drivers/pci/setup-bus.c          |  166 ++++++++++++++++++++++++++-----------
  89  drivers/pci/setup-res.c          |  152 ++++++++++++++++++++++-------------
  90  include/linux/pci.h              |   16 ++++-
  91  8 files changed, 453 insertions(+), 152 deletions(-)
  92 Merging wireless-current/master
  93 $ git merge wireless-current/master
  94 Merge made by recursive.
  95  drivers/net/wireless/iwlwifi/iwl-pci.c  |   25 ++++++++++---------------
  96  drivers/net/wireless/rt2x00/rt2800usb.c |   20 +++++++++++++++-----
  97  drivers/net/wireless/rt2x00/rt2x00usb.c |   17 +++++++----------
  98  drivers/net/wireless/wl12xx/acx.c       |    6 +-----
  99  drivers/net/wireless/wl12xx/testmode.c  |    5 ++++-
 100  5 files changed, 37 insertions(+), 36 deletions(-)
 101 Merging driver-core.current/driver-core-linus
 102 $ git merge driver-core.current/driver-core-linus
 103 Merge made by recursive.
 104  drivers/base/devtmpfs.c        |    2 +-
 105  drivers/base/platform.c        |    2 +-
 106  drivers/firmware/google/gsmi.c |    2 +-
 107  3 files changed, 3 insertions(+), 3 deletions(-)
 108 Merging tty.current/tty-linus
 109 $ git merge tty.current/tty-linus
 110 Merge made by recursive.
 111  drivers/tty/serial/samsung.c |    8 ++++++--
 112  1 files changed, 6 insertions(+), 2 deletions(-)
 113 Merging usb.current/usb-linus
 114 $ git merge usb.current/usb-linus
 115 Already up-to-date.
 116 Merging staging.current/staging-linus
 117 $ git merge staging.current/staging-linus
 118 Already up-to-date.
 119 Merging cpufreq-current/fixes
 120 $ git merge cpufreq-current/fixes
 121 Already up-to-date.
 122 Merging input-current/for-linus
 123 $ git merge input-current/for-linus
 124 Auto-merging drivers/input/joystick/analog.c
 125 Merge made by recursive.
 126  drivers/input/joystick/analog.c          |    2 +-
 127  drivers/input/keyboard/tegra-kbc.c       |    2 +-
 128  drivers/input/misc/mma8450.c             |    2 +-
 129  drivers/input/misc/mpu3050.c             |    2 +-
 130  drivers/input/mouse/bcm5974.c            |   40 ++++++++++++++++++++++++++++++
 131  drivers/input/tablet/wacom_sys.c         |   17 +++++++-----
 132  drivers/input/tablet/wacom_wac.c         |    4 +++
 133  drivers/input/touchscreen/atmel_mxt_ts.c |   12 +++++++++
 134  8 files changed, 70 insertions(+), 11 deletions(-)
 135 Merging md-current/for-linus
 136 $ git merge md-current/for-linus
 137 Already up-to-date.
 138 Merging audit-current/for-linus
 139 $ git merge audit-current/for-linus
 140 Already up-to-date.
 141 Merging crypto-current/master
 142 $ git merge crypto-current/master
 143 Already up-to-date.
 144 Merging ide-curent/master
 145 $ git merge ide-curent/master
 146 Already up-to-date.
 147 Merging dwmw2/master
 148 $ git merge dwmw2/master
 149 Already up-to-date.
 150 Merging sh-current/sh-fixes-for-linus
 151 $ git merge sh-current/sh-fixes-for-linus
 152 Merge made by recursive.
 153  arch/sh/include/asm/ptrace.h |    2 +-
 154  arch/sh/kernel/idle.c        |    2 +-
 155  drivers/clocksource/sh_cmt.c |   34 +++++++++++++++++++-
 156  drivers/sh/intc/chip.c       |    3 ++
 157  drivers/tty/serial/sh-sci.c  |   69 +++++++++++++++++++++++++++++++++++------
 158  5 files changed, 96 insertions(+), 14 deletions(-)
 159 Merging rmobile-current/rmobile-fixes-for-linus
 160 $ git merge rmobile-current/rmobile-fixes-for-linus
 161 Merge made by recursive.
 162  arch/arm/boot/compressed/mmcif-sh7372.c |    2 +-
 163  arch/arm/boot/compressed/sdhi-sh7372.c  |    2 +-
 164  arch/arm/mach-shmobile/board-ag5evm.c   |    3 ++-
 165  arch/arm/mach-shmobile/board-mackerel.c |    4 ++++
 166  arch/arm/mach-shmobile/clock-sh7372.c   |    8 ++++----
 167  arch/arm/mach-shmobile/setup-sh7372.c   |   30 +++++++++++++++---------------
 168  6 files changed, 27 insertions(+), 22 deletions(-)
 169 Merging fbdev-current/fbdev-fixes-for-linus
 170 $ git merge fbdev-current/fbdev-fixes-for-linus
 171 Auto-merging drivers/video/msm/mdp.c
 172 Auto-merging drivers/video/udlfb.c
 173 Merge made by recursive.
 174  drivers/video/carminefb.c |    6 +++---
 175  drivers/video/msm/mdp.c   |    4 +++-
 176  drivers/video/s3c2410fb.c |    1 -
 177  drivers/video/udlfb.c     |   21 +++++++++++++++------
 178  4 files changed, 21 insertions(+), 11 deletions(-)
 179 Merging devicetree-current/devicetree/merge
 180 $ git merge devicetree-current/devicetree/merge
 181 Already up-to-date.
 182 Merging spi-current/spi/merge
 183 $ git merge spi-current/spi/merge
 184 Already up-to-date.
 185 Merging arm/for-next
 186 $ git merge arm/for-next
 187 Removing arch/arm/include/asm/auxvec.h
 188 Removing arch/arm/include/asm/bitsperlong.h
 189 Removing arch/arm/include/asm/cputime.h
 190 Removing arch/arm/include/asm/emergency-restart.h
 191 Removing arch/arm/include/asm/errno.h
 192 Removing arch/arm/include/asm/ioctl.h
 193 Removing arch/arm/include/asm/irq_regs.h
 194 Removing arch/arm/include/asm/kdebug.h
 195 Removing arch/arm/include/asm/local.h
 196 Removing arch/arm/include/asm/local64.h
 197 Removing arch/arm/include/asm/percpu.h
 198 Removing arch/arm/include/asm/poll.h
 199 Removing arch/arm/include/asm/resource.h
 200 Removing arch/arm/include/asm/sections.h
 201 Removing arch/arm/include/asm/siginfo.h
 202 Removing arch/arm/include/asm/sizes.h
 203 Merge made by recursive.
 204  Documentation/devicetree/bindings/arm/l2cc.txt   |   42 +++
 205  arch/arm/Kconfig                                 |   55 +++-
 206  arch/arm/Makefile                                |    3 +
 207  arch/arm/common/scoop.c                          |    2 +-
 208  arch/arm/include/asm/Kbuild                      |   17 +
 209  arch/arm/include/asm/auxvec.h                    |    4 -
 210  arch/arm/include/asm/bitsperlong.h               |    1 -
 211  arch/arm/include/asm/cputime.h                   |    6 -
 212  arch/arm/include/asm/cputype.h                   |    6 +
 213  arch/arm/include/asm/ecard.h                     |    1 -
 214  arch/arm/include/asm/emergency-restart.h         |    6 -
 215  arch/arm/include/asm/errno.h                     |    6 -
 216  arch/arm/include/asm/gpio.h                      |   19 ++
 217  arch/arm/include/asm/hardware/cache-l2x0.h       |   19 ++-
 218  arch/arm/include/asm/hardware/iop3xx-gpio.h      |    2 +
 219  arch/arm/include/asm/io.h                        |   21 ++
 220  arch/arm/include/asm/ioctl.h                     |    1 -
 221  arch/arm/include/asm/irq_regs.h                  |    1 -
 222  arch/arm/include/asm/kdebug.h                    |    1 -
 223  arch/arm/include/asm/local.h                     |    1 -
 224  arch/arm/include/asm/local64.h                   |    1 -
 225  arch/arm/include/asm/memory.h                    |    7 -
 226  arch/arm/include/asm/module.h                    |    4 -
 227  arch/arm/include/asm/percpu.h                    |    6 -
 228  arch/arm/include/asm/pgalloc.h                   |    2 +-
 229  arch/arm/include/asm/pgtable.h                   |   23 +-
 230  arch/arm/include/asm/pmu.h                       |   10 +-
 231  arch/arm/include/asm/poll.h                      |    1 -
 232  arch/arm/include/asm/resource.h                  |    6 -
 233  arch/arm/include/asm/sections.h                  |    1 -
 234  arch/arm/include/asm/siginfo.h                   |    6 -
 235  arch/arm/include/asm/sizes.h                     |   21 --
 236  arch/arm/include/asm/tlb.h                       |    1 +
 237  arch/arm/include/asm/topology.h                  |   33 ++
 238  arch/arm/kernel/Makefile                         |    1 +
 239  arch/arm/kernel/ecard.c                          |   36 +--
 240  arch/arm/kernel/head.S                           |   61 +---
 241  arch/arm/kernel/pmu.c                            |   26 +-
 242  arch/arm/kernel/setup.c                          |   15 +-
 243  arch/arm/kernel/smp.c                            |    5 +
 244  arch/arm/kernel/smp_twd.c                        |    4 +-
 245  arch/arm/kernel/topology.c                       |  148 +++++++++
 246  arch/arm/mach-at91/at91cap9_devices.c            |    2 +-
 247  arch/arm/mach-at91/at91rm9200_devices.c          |    2 +-
 248  arch/arm/mach-at91/at91sam9260_devices.c         |    2 +-
 249  arch/arm/mach-at91/at91sam9261_devices.c         |    2 +-
 250  arch/arm/mach-at91/at91sam9263_devices.c         |    2 +-
 251  arch/arm/mach-at91/at91sam9g45_devices.c         |    2 +-
 252  arch/arm/mach-at91/at91sam9rl_devices.c          |    2 +-
 253  arch/arm/mach-at91/board-1arm.c                  |    2 +-
 254  arch/arm/mach-at91/board-afeb-9260v1.c           |    2 +-
 255  arch/arm/mach-at91/board-cam60.c                 |    2 +-
 256  arch/arm/mach-at91/board-cap9adk.c               |    2 +-
 257  arch/arm/mach-at91/board-carmeva.c               |    2 +-
 258  arch/arm/mach-at91/board-cpu9krea.c              |    2 +-
 259  arch/arm/mach-at91/board-cpuat91.c               |    2 +-
 260  arch/arm/mach-at91/board-csb337.c                |    2 +-
 261  arch/arm/mach-at91/board-csb637.c                |    2 +-
 262  arch/arm/mach-at91/board-eb9200.c                |    2 +-
 263  arch/arm/mach-at91/board-ecbat91.c               |    2 +-
 264  arch/arm/mach-at91/board-kafa.c                  |    2 +-
 265  arch/arm/mach-at91/board-kb9202.c                |    2 +-
 266  arch/arm/mach-at91/board-neocore926.c            |    2 +-
 267  arch/arm/mach-at91/board-picotux200.c            |    2 +-
 268  arch/arm/mach-at91/board-qil-a9260.c             |    2 +-
 269  arch/arm/mach-at91/board-rm9200dk.c              |    2 +-
 270  arch/arm/mach-at91/board-rm9200ek.c              |    2 +-
 271  arch/arm/mach-at91/board-sam9-l9260.c            |    2 +-
 272  arch/arm/mach-at91/board-sam9260ek.c             |    2 +-
 273  arch/arm/mach-at91/board-sam9261ek.c             |    2 +-
 274  arch/arm/mach-at91/board-sam9263ek.c             |    2 +-
 275  arch/arm/mach-at91/board-sam9g20ek.c             |    2 +-
 276  arch/arm/mach-at91/board-sam9m10g45ek.c          |    2 +-
 277  arch/arm/mach-at91/board-sam9rlek.c              |    2 +-
 278  arch/arm/mach-at91/board-usb-a9260.c             |    2 +-
 279  arch/arm/mach-at91/board-usb-a9263.c             |    2 +-
 280  arch/arm/mach-at91/board-yl-9200.c               |    2 +-
 281  arch/arm/mach-at91/gpio.c                        |    4 +-
 282  arch/arm/mach-at91/include/mach/gpio.h           |    5 -
 283  arch/arm/mach-at91/leds.c                        |    2 +-
 284  arch/arm/mach-at91/pm.c                          |    2 +-
 285  arch/arm/mach-davinci/da830.c                    |    2 +-
 286  arch/arm/mach-davinci/da850.c                    |    2 +-
 287  arch/arm/mach-davinci/gpio.c                     |    4 +-
 288  arch/arm/mach-davinci/include/mach/gpio.h        |    7 +-
 289  arch/arm/mach-davinci/tnetv107x.c                |    2 +-
 290  arch/arm/mach-ebsa110/include/mach/io.h          |    2 -
 291  arch/arm/mach-ep93xx/include/mach/gpio.h         |    8 -
 292  arch/arm/mach-ep93xx/include/mach/ts72xx.h       |   26 ++-
 293  arch/arm/mach-exynos4/include/mach/gpio.h        |    7 -
 294  arch/arm/mach-footbridge/include/mach/io.h       |    2 -
 295  arch/arm/mach-gemini/include/mach/gpio.h         |    5 -
 296  arch/arm/mach-imx/iomux-imx31.c                  |    3 +-
 297  arch/arm/mach-imx/mach-mx27ads.c                 |    3 +-
 298  arch/arm/mach-integrator/include/mach/io.h       |    2 -
 299  arch/arm/mach-ixp2000/core.c                     |    4 +-
 300  arch/arm/mach-ixp2000/ixdp2x00.c                 |    3 +-
 301  arch/arm/mach-ixp4xx/common-pci.c                |    3 +-
 302  arch/arm/mach-ixp4xx/dsmg600-setup.c             |    3 +-
 303  arch/arm/mach-ixp4xx/fsg-setup.c                 |    3 +-
 304  arch/arm/mach-ixp4xx/include/mach/gpio.h         |    3 +
 305  arch/arm/mach-ixp4xx/include/mach/io.h           |    2 -
 306  arch/arm/mach-ixp4xx/nas100d-setup.c             |    3 +-
 307  arch/arm/mach-ixp4xx/nslu2-setup.c               |    3 +-
 308  arch/arm/mach-kirkwood/irq.c                     |    3 +-
 309  arch/arm/mach-kirkwood/mpp.c                     |    3 +-
 310  arch/arm/mach-ks8695/board-acs5k.c               |    3 +-
 311  arch/arm/mach-ks8695/board-dsm320.c              |    3 +-
 312  arch/arm/mach-ks8695/board-micrel.c              |    3 +-
 313  arch/arm/mach-ks8695/gpio.c                      |    3 +-
 314  arch/arm/mach-ks8695/include/mach/gpio.h         |   11 -
 315  arch/arm/mach-ks8695/leds.c                      |    3 +-
 316  arch/arm/mach-lpc32xx/include/mach/gpio.h        |   22 --
 317  arch/arm/mach-mmp/aspenite.c                     |    5 +-
 318  arch/arm/mach-mmp/mmp2.c                         |    3 +-
 319  arch/arm/mach-mmp/pxa168.c                       |    3 +-
 320  arch/arm/mach-mmp/pxa910.c                       |    3 +-
 321  arch/arm/mach-mmp/tavorevb.c                     |    3 +-
 322  arch/arm/mach-mmp/ttc_dkb.c                      |    2 +-
 323  arch/arm/mach-msm/board-msm7x27.c                |    3 +-
 324  arch/arm/mach-msm/board-msm7x30.c                |   25 ++-
 325  arch/arm/mach-msm/board-msm8960.c                |   22 ++
 326  arch/arm/mach-msm/board-msm8x60.c                |   25 ++
 327  arch/arm/mach-msm/board-qsd8x50.c                |    3 +-
 328  arch/arm/mach-msm/board-sapphire.c               |    3 +-
 329  arch/arm/mach-msm/board-trout-mmc.c              |    3 +-
 330  arch/arm/mach-msm/board-trout-panel.c            |    3 +-
 331  arch/arm/mach-msm/include/mach/gpio.h            |   27 +--
 332  arch/arm/mach-msm/include/mach/memory.h          |    6 +-
 333  arch/arm/mach-mv78xx0/irq.c                      |    3 +-
 334  arch/arm/mach-mv78xx0/mpp.c                      |    3 +-
 335  arch/arm/mach-mxs/include/mach/gpio.h            |    8 -
 336  arch/arm/mach-omap1/board-ams-delta.c            |    3 +-
 337  arch/arm/mach-omap1/board-fsample.c              |    3 +-
 338  arch/arm/mach-omap1/board-generic.c              |    3 +-
 339  arch/arm/mach-omap1/board-h2-mmc.c               |    3 +-
 340  arch/arm/mach-omap1/board-h2.c                   |    3 +-
 341  arch/arm/mach-omap1/board-h3-mmc.c               |    3 +-
 342  arch/arm/mach-omap1/board-h3.c                   |    3 +-
 343  arch/arm/mach-omap1/board-htcherald.c            |    1 -
 344  arch/arm/mach-omap1/board-innovator.c            |    3 +-
 345  arch/arm/mach-omap1/board-nokia770.c             |    3 +-
 346  arch/arm/mach-omap1/board-osk.c                  |    3 +-
 347  arch/arm/mach-omap1/board-palmte.c               |    3 +-
 348  arch/arm/mach-omap1/board-palmtt.c               |    2 +-
 349  arch/arm/mach-omap1/board-palmz71.c              |    2 +-
 350  arch/arm/mach-omap1/board-perseus2.c             |    3 +-
 351  arch/arm/mach-omap1/board-sx1-mmc.c              |    2 +-
 352  arch/arm/mach-omap1/board-sx1.c                  |    3 +-
 353  arch/arm/mach-omap1/board-voiceblue.c            |    2 +-
 354  arch/arm/mach-omap1/devices.c                    |    2 +-
 355  arch/arm/mach-omap1/fpga.c                       |    2 +-
 356  arch/arm/mach-omap1/irq.c                        |    3 +-
 357  arch/arm/mach-omap1/leds-h2p2-debug.c            |    2 +-
 358  arch/arm/mach-omap1/leds-osk.c                   |    3 +-
 359  arch/arm/mach-omap1/leds.c                       |    2 +-
 360  arch/arm/mach-omap1/serial.c                     |    3 +-
 361  arch/arm/mach-omap2/board-generic.c              |    3 +-
 362  arch/arm/mach-omap2/board-h4.c                   |    3 +-
 363  arch/arm/mach-omap2/board-ldp.c                  |    3 +-
 364  arch/arm/mach-omap2/devices.c                    |    3 +-
 365  arch/arm/mach-orion5x/db88f5281-setup.c          |    3 +-
 366  arch/arm/mach-orion5x/dns323-setup.c             |    3 +-
 367  arch/arm/mach-orion5x/irq.c                      |    3 +-
 368  arch/arm/mach-orion5x/kurobox_pro-setup.c        |    3 +-
 369  arch/arm/mach-orion5x/mv2120-setup.c             |    3 +-
 370  arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c     |    3 +-
 371  arch/arm/mach-orion5x/rd88f5181l-ge-setup.c      |    3 +-
 372  arch/arm/mach-orion5x/rd88f5182-setup.c          |    3 +-
 373  arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c     |    3 +-
 374  arch/arm/mach-orion5x/terastation_pro2-setup.c   |    3 +-
 375  arch/arm/mach-orion5x/ts209-setup.c              |    3 +-
 376  arch/arm/mach-orion5x/ts409-setup.c              |    3 +-
 377  arch/arm/mach-orion5x/wnr854t-setup.c            |    3 +-
 378  arch/arm/mach-orion5x/wrt350n-v2-setup.c         |    3 +-
 379  arch/arm/mach-pnx4008/gpio.c                     |    3 +-
 380  arch/arm/mach-pnx4008/serial.c                   |    3 +-
 381  arch/arm/mach-pxa/generic.c                      |    2 +-
 382  arch/arm/mach-pxa/include/mach/littleton.h       |    2 +-
 383  arch/arm/mach-pxa/irq.c                          |    3 +-
 384  arch/arm/mach-pxa/lpd270.c                       |    3 +-
 385  arch/arm/mach-pxa/lubbock.c                      |    2 +-
 386  arch/arm/mach-pxa/mainstone.c                    |    3 +-
 387  arch/arm/mach-pxa/mfp-pxa2xx.c                   |    3 +-
 388  arch/arm/mach-pxa/pcm990-baseboard.c             |    3 +-
 389  arch/arm/mach-pxa/pxa25x.c                       |    2 +-
 390  arch/arm/mach-pxa/pxa27x.c                       |    2 +-
 391  arch/arm/mach-pxa/pxa3xx.c                       |    3 +-
 392  arch/arm/mach-pxa/pxa95x.c                       |    3 +-
 393  arch/arm/mach-pxa/saar.c                         |    2 +-
 394  arch/arm/mach-pxa/saarb.c                        |    3 +-
 395  arch/arm/mach-realview/include/mach/gpio.h       |    7 +-
 396  arch/arm/mach-realview/include/mach/system.h     |    1 +
 397  arch/arm/mach-rpc/include/mach/hardware.h        |   25 +-
 398  arch/arm/mach-rpc/include/mach/io.h              |  193 +------------
 399  arch/arm/mach-rpc/riscpc.c                       |    2 +-
 400  arch/arm/mach-s3c2410/include/mach/gpio.h        |    6 -
 401  arch/arm/mach-s3c2410/include/mach/h1940-latch.h |    2 +-
 402  arch/arm/mach-s3c2410/include/mach/io.h          |    2 -
 403  arch/arm/mach-s3c64xx/include/mach/gpio.h        |    7 -
 404  arch/arm/mach-s5p64x0/include/mach/gpio.h        |    7 -
 405  arch/arm/mach-s5pc100/include/mach/gpio.h        |    7 -
 406  arch/arm/mach-s5pv210/include/mach/gpio.h        |    7 -
 407  arch/arm/mach-sa1100/generic.c                   |    2 +-
 408  arch/arm/mach-sa1100/gpio.c                      |    3 +-
 409  arch/arm/mach-sa1100/include/mach/gpio.h         |    2 +
 410  arch/arm/mach-sa1100/include/mach/io.h           |    6 +-
 411  arch/arm/mach-shmobile/include/mach/gpio.h       |   24 +--
 412  arch/arm/mach-tegra/board-trimslice-pinmux.c     |    3 +-
 413  arch/arm/mach-tegra/include/mach/gpio.h          |    7 +-
 414  arch/arm/mach-u300/include/mach/gpio.h           |    3 +
 415  arch/arm/mach-ux500/board-mop500-u8500uib.c      |    3 +-
 416  arch/arm/mach-versatile/include/mach/gpio.h      |    7 +-
 417  arch/arm/mach-vexpress/include/mach/io.h         |    2 -
 418  arch/arm/mach-vt8500/include/mach/gpio.h         |    7 +-
 419  arch/arm/mach-vt8500/include/mach/io.h           |    2 -
 420  arch/arm/mach-w90x900/include/mach/gpio.h        |    6 +-
 421  arch/arm/mm/cache-l2x0.c                         |  103 +++++++
 422  arch/arm/mm/proc-v6.S                            |   16 +
 423  arch/arm/plat-mxc/include/mach/gpio.h            |    6 -
 424  arch/arm/plat-nomadik/include/plat/gpio.h        |   12 +-
 425  arch/arm/plat-omap/debug-devices.c               |    3 +-
 426  arch/arm/plat-omap/debug-leds.c                  |    3 +-
 427  arch/arm/plat-omap/devices.c                     |    3 +-
 428  arch/arm/plat-omap/include/plat/gpio.h           |   20 --
 429  arch/arm/plat-orion/include/plat/gpio.h          |    9 -
 430  arch/arm/plat-pxa/gpio.c                         |    4 +-
 431  arch/arm/plat-pxa/include/plat/gpio.h            |    2 +
 432  arch/arm/plat-spear/include/plat/gpio.h          |   25 +--
 433  arch/arm/tools/mach-types                        |  348 ++++++++++++----------
 434  drivers/ata/pata_at91.c                          |    2 +-
 435  drivers/gpio/gpio-nomadik.c                      |    2 +-
 436  drivers/gpio/gpio-omap.c                         |    2 +-
 437  drivers/i2c/busses/i2c-ixp2000.c                 |    2 +-
 438  drivers/ide/at91_ide.c                           |    2 +-
 439  drivers/input/keyboard/omap-keypad.c             |    2 +-
 440  drivers/mfd/menelaus.c                           |    2 +-
 441  drivers/mmc/host/omap.c                          |    2 +-
 442  drivers/mmc/host/sdhci-tegra.c                   |    2 +-
 443  drivers/mtd/nand/ams-delta.c                     |    2 +-
 444  drivers/mtd/onenand/omap2.c                      |    2 +-
 445  drivers/net/arm/at91_ether.c                     |    2 +-
 446  drivers/pcmcia/pxa2xx_vpac270.c                  |    2 +-
 447  drivers/spi/spi-atmel.c                          |    2 +-
 448  drivers/tty/serial/atmel_serial.c                |    2 +-
 449  drivers/usb/host/ohci-pnx4008.c                  |    2 +-
 450  drivers/usb/musb/davinci.c                       |    2 +-
 451  drivers/video/atmel_lcdfb.c                      |    2 +-
 452  drivers/video/omap/lcd_apollon.c                 |    2 +-
 453  drivers/video/omap/lcd_h3.c                      |    2 +-
 454  drivers/video/omap/lcd_inn1610.c                 |    2 +-
 455  drivers/video/omap/lcd_ldp.c                     |    2 +-
 456  drivers/video/omap/lcd_osk.c                     |    2 +-
 457  drivers/video/omap/lcd_overo.c                   |    2 +-
 458  drivers/video/omap/lcd_palmtt.c                  |    2 +-
 459  drivers/video/pnx4008/sdum.c                     |    2 +-
 460  tools/perf/arch/arm/util/dwarf-regs.c            |    3 +
 461  257 files changed, 1045 insertions(+), 1092 deletions(-)
 462  create mode 100644 Documentation/devicetree/bindings/arm/l2cc.txt
 463  delete mode 100644 arch/arm/include/asm/auxvec.h
 464  delete mode 100644 arch/arm/include/asm/bitsperlong.h
 465  delete mode 100644 arch/arm/include/asm/cputime.h
 466  delete mode 100644 arch/arm/include/asm/emergency-restart.h
 467  delete mode 100644 arch/arm/include/asm/errno.h
 468  delete mode 100644 arch/arm/include/asm/ioctl.h
 469  delete mode 100644 arch/arm/include/asm/irq_regs.h
 470  delete mode 100644 arch/arm/include/asm/kdebug.h
 471  delete mode 100644 arch/arm/include/asm/local.h
 472  delete mode 100644 arch/arm/include/asm/local64.h
 473  delete mode 100644 arch/arm/include/asm/percpu.h
 474  delete mode 100644 arch/arm/include/asm/poll.h
 475  delete mode 100644 arch/arm/include/asm/resource.h
 476  delete mode 100644 arch/arm/include/asm/sections.h
 477  delete mode 100644 arch/arm/include/asm/siginfo.h
 478  delete mode 100644 arch/arm/include/asm/sizes.h
 479  create mode 100644 arch/arm/kernel/topology.c
 480 Merging arm-lpae/for-next
 481 $ git merge arm-lpae/for-next
 482 Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution.
 483 Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution.
 484 Resolved 'arch/arm/include/asm/tlb.h' using previous resolution.
 485 Auto-merging arch/arm/Kconfig
 486 Auto-merging arch/arm/include/asm/pgalloc.h
 487 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
 488 Auto-merging arch/arm/include/asm/pgtable.h
 489 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
 490 Auto-merging arch/arm/include/asm/tlb.h
 491 CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
 492 Auto-merging arch/arm/kernel/head.S
 493 Auto-merging arch/arm/kernel/module.c
 494 Auto-merging arch/arm/kernel/setup.c
 495 Auto-merging arch/arm/mm/alignment.c
 496 Automatic merge failed; fix conflicts and then commit the result.
 497 $ git commit -v -a
 498 [master 7923085] Merge remote-tracking branch 'arm-lpae/for-next'
 499 $ git diff -M --stat --summary HEAD^..
 500  arch/arm/Kconfig                            |    2 +-
 501  arch/arm/boot/compressed/head.S             |    1 +
 502  arch/arm/include/asm/assembler.h            |   11 +
 503  arch/arm/include/asm/dma-mapping.h          |    2 +-
 504  arch/arm/include/asm/page.h                 |   44 +---
 505  arch/arm/include/asm/pgalloc.h              |   28 ++-
 506  arch/arm/include/asm/pgtable-2level-hwdef.h |   93 ++++++
 507  arch/arm/include/asm/pgtable-2level-types.h |   67 +++++
 508  arch/arm/include/asm/pgtable-2level.h       |  143 +++++++++
 509  arch/arm/include/asm/pgtable-3level-hwdef.h |   82 ++++++
 510  arch/arm/include/asm/pgtable-3level-types.h |   70 +++++
 511  arch/arm/include/asm/pgtable-3level.h       |  107 +++++++
 512  arch/arm/include/asm/pgtable-hwdef.h        |   81 +-----
 513  arch/arm/include/asm/pgtable.h              |  211 +++++---------
 514  arch/arm/include/asm/proc-fns.h             |   21 ++
 515  arch/arm/include/asm/setup.h                |    8 +
 516  arch/arm/include/asm/tlb.h                  |   11 +-
 517  arch/arm/include/asm/tlbflush.h             |    4 +-
 518  arch/arm/kernel/head.S                      |  119 ++++++---
 519  arch/arm/kernel/module.c                    |    2 +-
 520  arch/arm/kernel/setup.c                     |   10 +
 521  arch/arm/kernel/sleep.S                     |    2 +
 522  arch/arm/mm/Kconfig                         |   13 +
 523  arch/arm/mm/Makefile                        |    4 +
 524  arch/arm/mm/alignment.c                     |    8 +-
 525  arch/arm/mm/context.c                       |   19 +-
 526  arch/arm/mm/dma-mapping.c                   |    6 +-
 527  arch/arm/mm/fault.c                         |   87 ++++++
 528  arch/arm/mm/idmap.c                         |   36 +++-
 529  arch/arm/mm/ioremap.c                       |   39 ++-
 530  arch/arm/mm/mm.h                            |    4 +-
 531  arch/arm/mm/mmu.c                           |   53 +++-
 532  arch/arm/mm/pgd.c                           |   51 +++-
 533  arch/arm/mm/proc-macros.S                   |    5 +-
 534  arch/arm/mm/proc-v7lpae.S                   |  422 +++++++++++++++++++++++++++
 535  35 files changed, 1523 insertions(+), 343 deletions(-)
 536  create mode 100644 arch/arm/include/asm/pgtable-2level-hwdef.h
 537  create mode 100644 arch/arm/include/asm/pgtable-2level-types.h
 538  create mode 100644 arch/arm/include/asm/pgtable-2level.h
 539  create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h
 540  create mode 100644 arch/arm/include/asm/pgtable-3level-types.h
 541  create mode 100644 arch/arm/include/asm/pgtable-3level.h
 542  create mode 100644 arch/arm/mm/proc-v7lpae.S
 543 Merging arm-soc/for-next
 544 $ git merge arm-soc/for-next
 545 Already up-to-date.
 546 Merging at91/at91-next
 547 $ git merge at91/at91-next
 548 Already up-to-date.
 549 Merging davinci/davinci-next
 550 $ git merge davinci/davinci-next
 551 Already up-to-date.
 552 Merging i.MX/for-next
 553 $ git merge i.MX/for-next
 554 Already up-to-date.
 555 Merging linux-spec/for-next
 556 $ git merge linux-spec/for-next
 557 Already up-to-date.
 558 Merging msm/for-next
 559 $ git merge msm/for-next
 560 Resolved 'arch/arm/mach-msm/io.c' using previous resolution.
 561 Auto-merging arch/arm/mach-msm/Makefile
 562 Auto-merging arch/arm/mach-msm/acpuclock-arm11.c
 563 Auto-merging arch/arm/mach-msm/board-msm7x30.c
 564 Auto-merging arch/arm/mach-msm/board-msm8960.c
 565 Auto-merging arch/arm/mach-msm/board-msm8x60.c
 566 Auto-merging arch/arm/mach-msm/board-qsd8x50.c
 567 Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
 568 Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
 569 Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
 570 Auto-merging arch/arm/mach-msm/io.c
 571 CONFLICT (content): Merge conflict in arch/arm/mach-msm/io.c
 572 Automatic merge failed; fix conflicts and then commit the result.
 573 $ git commit -v -a
 574 [master e05f169] Merge remote-tracking branch 'msm/for-next'
 575 $ git diff -M --stat --summary HEAD^..
 576  arch/arm/mach-msm/Makefile                      |    5 +-
 577  arch/arm/mach-msm/acpuclock-arm11.c             |    2 +-
 578  arch/arm/mach-msm/board-halibut.c               |    1 +
 579  arch/arm/mach-msm/board-mahimahi.c              |    1 +
 580  arch/arm/mach-msm/board-msm7x30.c               |    1 +
 581  arch/arm/mach-msm/board-msm8960.c               |   18 +
 582  arch/arm/mach-msm/board-msm8x60.c               |    9 +-
 583  arch/arm/mach-msm/board-qsd8x50.c               |    1 +
 584  arch/arm/mach-msm/board-trout.c                 |    1 +
 585  arch/arm/mach-msm/clock-dummy.c                 |   81 +++++
 586  arch/arm/mach-msm/clock.h                       |   11 +
 587  arch/arm/mach-msm/devices-msm7x00.c             |   21 ++-
 588  arch/arm/mach-msm/devices-msm7x30.c             |   21 ++-
 589  arch/arm/mach-msm/devices-msm8960.c             |  181 +++++++++++
 590  arch/arm/mach-msm/devices-msm8x60.c             |   56 ++++
 591  arch/arm/mach-msm/devices-qsd8x50.c             |   21 ++-
 592  arch/arm/mach-msm/devices.h                     |    8 +
 593  arch/arm/mach-msm/dma.c                         |  391 ++++++++++++++++++-----
 594  arch/arm/mach-msm/include/mach/dma.h            |   84 +++---
 595  arch/arm/mach-msm/include/mach/msm_iomap-7x00.h |    5 +-
 596  arch/arm/mach-msm/include/mach/msm_iomap-7x30.h |    5 +-
 597  arch/arm/mach-msm/include/mach/msm_iomap-8960.h |    3 +
 598  arch/arm/mach-msm/include/mach/msm_iomap-8x50.h |    5 +-
 599  arch/arm/mach-msm/include/mach/msm_iomap-8x60.h |    6 +
 600  arch/arm/mach-msm/io.c                          |    3 -
 601  25 files changed, 808 insertions(+), 133 deletions(-)
 602  create mode 100644 arch/arm/mach-msm/clock-dummy.c
 603  create mode 100644 arch/arm/mach-msm/devices-msm8x60.c
 604 Merging omap/for-next
 605 $ git merge omap/for-next
 606 Already up-to-date.
 607 Merging pxa/for-next
 608 $ git merge pxa/for-next
 609 Already up-to-date.
 610 Merging samsung/next-samsung
 611 $ git merge samsung/next-samsung
 612 Already up-to-date.
 613 Merging s5p/for-next
 614 $ git merge s5p/for-next
 615 Merge made by recursive.
 616  arch/arm/mach-exynos4/Kconfig                    |    6 +++
 617  arch/arm/mach-exynos4/clock.c                    |    2 +-
 618  arch/arm/mach-exynos4/cpu.c                      |    1 -
 619  arch/arm/mach-exynos4/include/mach/irqs.h        |    5 +--
 620  arch/arm/mach-exynos4/irq-eint.c                 |    7 ++++
 621  arch/arm/mach-exynos4/mach-nuri.c                |   34 +++++++++++++++++++
 622  arch/arm/mach-exynos4/mach-smdkv310.c            |   11 ++++++
 623  arch/arm/mach-exynos4/mach-universal_c210.c      |   38 ++++++++++++++++++++-
 624  arch/arm/mach-exynos4/setup-usb-phy.c            |    2 +-
 625  arch/arm/mach-s3c2410/dma.c                      |   14 --------
 626  arch/arm/mach-s3c2412/dma.c                      |   18 ----------
 627  arch/arm/mach-s3c2440/dma.c                      |   17 ---------
 628  arch/arm/mach-s3c2443/dma.c                      |   27 ---------------
 629  arch/arm/mach-s3c64xx/mach-crag6410.c            |   12 +++++--
 630  arch/arm/mach-s3c64xx/mach-smdk6410.c            |   39 ----------------------
 631  arch/arm/mach-s3c64xx/pm.c                       |    1 +
 632  arch/arm/mach-s5p64x0/irq-eint.c                 |    2 +-
 633  arch/arm/mach-s5pv210/Kconfig                    |    6 ---
 634  arch/arm/mach-s5pv210/Makefile                   |    2 +-
 635  arch/arm/mach-s5pv210/pm.c                       |    2 +-
 636  arch/arm/plat-s5p/irq-gpioint.c                  |    6 +++
 637  arch/arm/plat-samsung/dev-hsmmc.c                |   19 +----------
 638  arch/arm/plat-samsung/dev-hsmmc1.c               |   19 +----------
 639  arch/arm/plat-samsung/dev-hsmmc2.c               |   19 +----------
 640  arch/arm/plat-samsung/dev-hsmmc3.c               |   19 +----------
 641  arch/arm/plat-samsung/include/plat/backlight.h   |    2 +-
 642  arch/arm/plat-samsung/include/plat/dma-s3c24xx.h |    6 ---
 643  arch/arm/plat-samsung/include/plat/sdhci.h       |    7 ++++
 644  arch/arm/plat-samsung/irq-vic-timer.c            |    5 +++
 645  arch/arm/plat-samsung/platformdata.c             |   22 ++++++++++++
 646  30 files changed, 156 insertions(+), 214 deletions(-)
 647 Merging tegra/for-next
 648 $ git merge tegra/for-next
 649 Already up-to-date.
 650 Merging ux500-core/ux500-core
 651 $ git merge ux500-core/ux500-core
 652 Already up-to-date.
 653 Merging xilinx/arm-next
 654 $ git merge xilinx/arm-next
 655 Already up-to-date.
 656 Merging blackfin/for-linus
 657 $ git merge blackfin/for-linus
 658 Merge made by recursive.
 659  arch/blackfin/include/asm/uaccess.h     |    6 +++---
 660  arch/blackfin/mach-bf533/boards/H8606.c |    3 ++-
 661  2 files changed, 5 insertions(+), 4 deletions(-)
 662 Merging cris/for-next
 663 $ git merge cris/for-next
 664 Auto-merging arch/cris/arch-v32/drivers/cryptocop.c
 665 Auto-merging drivers/net/cris/eth_v10.c
 666 Merge made by recursive.
 667  Documentation/cris/README               |   62 +++++++++++++++---------------
 668  arch/cris/arch-v32/drivers/cryptocop.c  |    6 +--
 669  arch/cris/arch-v32/kernel/ptrace.c      |    2 -
 670  arch/cris/include/arch-v32/arch/cache.h |    2 +-
 671  drivers/net/cris/eth_v10.c              |    1 -
 672  5 files changed, 34 insertions(+), 39 deletions(-)
 673 Merging ia64/test
 674 $ git merge ia64/test
 675 Merge made by recursive.
 676  arch/ia64/sn/kernel/sn2/sn_hwperf.c |   12 +++--
 677  drivers/acpi/apei/erst.c            |    2 +-
 678  drivers/firmware/efivars.c          |    2 +-
 679  fs/pstore/inode.c                   |   40 +++++++++++++++--
 680  fs/pstore/internal.h                |    2 +-
 681  fs/pstore/platform.c                |   82 ++++++++++++++++++++++++++++-------
 682  include/linux/pstore.h              |    2 +-
 683  7 files changed, 114 insertions(+), 28 deletions(-)
 684 Merging m68k/for-next
 685 $ git merge m68k/for-next
 686 Merge made by recursive.
 687  arch/m68k/mac/macints.c      |    2 +-
 688  arch/m68k/mac/misc.c         |   40 +++++++++++++++++++++++-----------------
 689  drivers/zorro/zorro-driver.c |    8 ++++----
 690  3 files changed, 28 insertions(+), 22 deletions(-)
 691 Merging m68knommu/for-next
 692 $ git merge m68knommu/for-next
 693 Merge made by recursive.
 694  arch/m68k/include/asm/m520xsim.h |   26 +++++++++----------
 695  arch/m68k/include/asm/mcfqspi.h  |    8 ++++--
 696  arch/m68k/lib/memcpy.c           |    9 +++++++
 697  arch/m68k/platform/520x/config.c |    6 ++--
 698  arch/m68k/platform/520x/gpio.c   |   50 +++++--------------------------------
 699  5 files changed, 36 insertions(+), 63 deletions(-)
 700 Merging microblaze/next
 701 $ git merge microblaze/next
 702 Already up-to-date.
 703 Merging mips/mips-for-linux-next
 704 $ git merge mips/mips-for-linux-next
 705 Removing arch/mips/nxp/pnx8550/common/pci.c
 706 Removing arch/mips/nxp/pnx8550/common/setup.c
 707 Merge made by recursive.
 708  arch/mips/Kconfig                                  |    1 +
 709  arch/mips/Makefile                                 |    2 +
 710  arch/mips/alchemy/common/platform.c                |    2 +-
 711  arch/mips/alchemy/common/power.c                   |   22 ++-
 712  arch/mips/ar7/irq.c                                |    3 +-
 713  arch/mips/bcm63xx/irq.c                            |    1 +
 714  arch/mips/cobalt/irq.c                             |    1 +
 715  arch/mips/dec/setup.c                              |    4 +
 716  arch/mips/emma/markeins/irq.c                      |    2 +-
 717  arch/mips/include/asm/cacheflush.h                 |   24 ++++
 718  arch/mips/include/asm/io.h                         |   12 +--
 719  .../asm/mach-cavium-octeon/cpu-feature-overrides.h |    1 -
 720  arch/mips/include/asm/mipsprom.h                   |    6 +-
 721  arch/mips/include/asm/prom.h                       |    6 +-
 722  arch/mips/kernel/ftrace.c                          |   39 +++---
 723  arch/mips/kernel/scall32-o32.S                     |    2 +-
 724  arch/mips/kernel/signal.c                          |    3 +
 725  arch/mips/kernel/traps.c                           |    6 +-
 726  arch/mips/lantiq/irq.c                             |    6 +-
 727  arch/mips/lasat/interrupt.c                        |    1 +
 728  arch/mips/loongson/fuloong-2e/irq.c                |    1 +
 729  arch/mips/loongson/lemote-2f/irq.c                 |    3 +-
 730  arch/mips/mm/c-octeon.c                            |    6 +
 731  arch/mips/mm/c-r3k.c                               |    7 +
 732  arch/mips/mm/c-r4k.c                               |   35 +++++
 733  arch/mips/mm/c-tx39.c                              |    7 +
 734  arch/mips/mm/cache.c                               |    5 +
 735  arch/mips/mm/tlbex.c                               |    3 +-
 736  arch/mips/mti-malta/malta-int.c                    |    6 +-
 737  arch/mips/netlogic/Platform                        |    5 +
 738  arch/mips/netlogic/xlr/setup.c                     |    4 +-
 739  arch/mips/netlogic/xlr/smp.c                       |    2 +-
 740  arch/mips/netlogic/xlr/smpboot.S                   |   16 ++-
 741  arch/mips/nxp/pnx8550/common/pci.c                 |  134 ------------------
 742  arch/mips/nxp/pnx8550/common/setup.c               |  143 --------------------
 743  arch/mips/pci/pci-lantiq.c                         |    9 +-
 744  arch/mips/pci/pci-rc32434.c                        |    2 +-
 745  arch/mips/pmc-sierra/msp71xx/msp_irq.c             |    6 +-
 746  arch/mips/pmc-sierra/msp71xx/msp_setup.c           |    1 +
 747  arch/mips/pmc-sierra/yosemite/py-console.c         |   12 +--
 748  arch/mips/pnx8550/common/int.c                     |    2 +-
 749  arch/mips/pnx8550/common/prom.c                    |    2 +-
 750  arch/mips/sgi-ip22/ip22-int.c                      |   10 +-
 751  arch/mips/sgi-ip27/ip27-irq.c                      |    4 +-
 752  arch/mips/sni/rm200.c                              |    1 +
 753  arch/mips/vr41xx/common/irq.c                      |    1 +
 754  drivers/mtd/maps/lantiq-flash.c                    |    4 +-
 755  47 files changed, 204 insertions(+), 371 deletions(-)
 756  delete mode 100644 arch/mips/nxp/pnx8550/common/pci.c
 757  delete mode 100644 arch/mips/nxp/pnx8550/common/setup.c
 758 Merging openrisc/for-upstream
 759 $ git merge openrisc/for-upstream
 760 Already up-to-date.
 761 Merging parisc/for-next
 762 $ git merge parisc/for-next
 763 Already up-to-date.
 764 Merging powerpc/next
 765 $ git merge powerpc/next
 766 Already up-to-date.
 767 Merging 4xx/next
 768 $ git merge 4xx/next
 769 Removing arch/powerpc/boot/dts/hcu4.dts
 770 Removing arch/powerpc/configs/40x/hcu4_defconfig
 771 Removing arch/powerpc/platforms/40x/hcu4.c
 772 Auto-merging arch/powerpc/sysdev/ppc4xx_pci.c
 773 Merge made by recursive.
 774  arch/powerpc/Kconfig                    |    2 +-
 775  arch/powerpc/boot/dts/hcu4.dts          |  168 ------------------------------
 776  arch/powerpc/boot/dts/yosemite.dts      |   36 +++++++
 777  arch/powerpc/configs/40x/hcu4_defconfig |   80 --------------
 778  arch/powerpc/configs/ppc40x_defconfig   |    1 -
 779  arch/powerpc/include/asm/kexec.h        |    2 +-
 780  arch/powerpc/kernel/misc_32.S           |  171 +++++++++++++++++++++++++++++++
 781  arch/powerpc/platforms/40x/Kconfig      |    8 --
 782  arch/powerpc/platforms/40x/Makefile     |    1 -
 783  arch/powerpc/platforms/40x/hcu4.c       |   61 -----------
 784  arch/powerpc/sysdev/ppc4xx_pci.c        |   89 +++++++++++++---
 785  arch/powerpc/sysdev/ppc4xx_pci.h        |   12 ++
 786  drivers/edac/ppc4xx_edac.c              |    2 +-
 787  13 files changed, 294 insertions(+), 339 deletions(-)
 788  delete mode 100644 arch/powerpc/boot/dts/hcu4.dts
 789  delete mode 100644 arch/powerpc/configs/40x/hcu4_defconfig
 790  delete mode 100644 arch/powerpc/platforms/40x/hcu4.c
 791 Merging 52xx-and-virtex/powerpc/next
 792 $ git merge 52xx-and-virtex/powerpc/next
 793 Merge made by recursive.
 794  arch/powerpc/boot/dts/charon.dts             |  236 ++++++++++++++++++++++++++
 795  arch/powerpc/configs/52xx/tqm5200_defconfig  |   20 ++-
 796  arch/powerpc/platforms/52xx/mpc5200_simple.c |    1 +
 797  3 files changed, 249 insertions(+), 8 deletions(-)
 798  create mode 100644 arch/powerpc/boot/dts/charon.dts
 799 Merging galak/next
 800 $ git merge galak/next
 801 Already up-to-date.
 802 Merging s390/features
 803 $ git merge s390/features
 804 Merge made by recursive.
 805  arch/s390/kernel/early.c        |   14 ++++++++------
 806  drivers/s390/block/dasd_ioctl.c |   10 +++++++---
 807  drivers/s390/cio/ccwreq.c       |   23 ++++++++++++++++++++---
 808  3 files changed, 35 insertions(+), 12 deletions(-)
 809 Merging sh/sh-latest
 810 $ git merge sh/sh-latest
 811 Merge made by recursive.
 812  arch/sh/boards/mach-ecovec24/setup.c |    4 ++++
 813  1 files changed, 4 insertions(+), 0 deletions(-)
 814 Merging rmobile/rmobile-latest
 815 $ git merge rmobile/rmobile-latest
 816 Already up-to-date.
 817 Merging sparc/master
 818 $ git merge sparc/master
 819 Already up-to-date.
 820 Merging tile/master
 821 $ git merge tile/master
 822 Merge made by recursive.
 823  arch/tile/kernel/intvec_32.S     |    2 +-
 824  arch/tile/lib/atomic_asm_32.S    |    2 +-
 825  fs/nfs/blocklayout/blocklayout.c |    1 +
 826  fs/nfs/nfs4filelayout.c          |    6 +++---
 827  4 files changed, 6 insertions(+), 5 deletions(-)
 828 Merging unicore32/unicore32
 829 $ git merge unicore32/unicore32
 830 Merge made by recursive.
 831  arch/unicore32/include/asm/bitops.h |   12 ++++++------
 832  arch/unicore32/kernel/ksyms.c       |    4 ++--
 833  arch/unicore32/lib/findbit.S        |   14 ++++++++------
 834  3 files changed, 16 insertions(+), 14 deletions(-)
 835 Merging xtensa/master
 836 $ git merge xtensa/master
 837 Already up-to-date.
 838 Merging ceph/for-next
 839 $ git merge ceph/for-next
 840 Auto-merging fs/ceph/caps.c
 841 Auto-merging fs/ceph/super.h
 842 Auto-merging include/linux/ceph/libceph.h
 843 Merge made by recursive.
 844  drivers/block/rbd.c            |    2 +-
 845  fs/ceph/addr.c                 |  192 +++++++++++++++++++++++++---------------
 846  fs/ceph/caps.c                 |    2 +-
 847  fs/ceph/ioctl.h                |   55 +++++++++++-
 848  fs/ceph/mds_client.c           |   11 ++-
 849  fs/ceph/super.c                |   23 ++++--
 850  fs/ceph/super.h                |    8 +-
 851  include/linux/ceph/libceph.h   |    4 +-
 852  include/linux/ceph/messenger.h |    3 +-
 853  net/ceph/ceph_common.c         |   47 +++++-----
 854  net/ceph/messenger.c           |   16 +++-
 855  net/ceph/mon_client.c          |   71 ++++++++-------
 856  net/ceph/msgpool.c             |   42 ++++++---
 857  net/ceph/osd_client.c          |    8 +-
 858  14 files changed, 318 insertions(+), 166 deletions(-)
 859 Merging cifs/master
 860 $ git merge cifs/master
 861 Already up-to-date.
 862 Merging configfs/linux-next
 863 $ git merge configfs/linux-next
 864 Already up-to-date.
 865 Merging ecryptfs/next
 866 $ git merge ecryptfs/next
 867 Already up-to-date.
 868 Merging ext3/for_next
 869 $ git merge ext3/for_next
 870 Already up-to-date.
 871 Merging ext4/dev
 872 $ git merge ext4/dev
 873 Merge made by recursive.
 874  fs/ext4/ext4.h          |    5 +++--
 875  fs/ext4/ext4_jbd2.h     |    4 ++--
 876  fs/ext4/file.c          |   10 ++++++++++
 877  fs/ext4/inode.c         |   11 +++++++++++
 878  fs/ext4/super.c         |    7 ++++---
 879  fs/jbd2/transaction.c   |   42 +++++++++++++++++++++++++++++++++++++-----
 880  include/linux/ext2_fs.h |    4 ++--
 881  include/linux/ext3_fs.h |    4 ++--
 882  8 files changed, 71 insertions(+), 16 deletions(-)
 883 Merging fatfs/master
 884 $ git merge fatfs/master
 885 Already up-to-date.
 886 Merging fuse/for-next
 887 $ git merge fuse/for-next
 888 Auto-merging fs/fuse/file.c
 889 Auto-merging fs/fuse/fuse_i.h
 890 Auto-merging fs/fuse/inode.c
 891 Merge made by recursive.
 892  fs/fuse/file.c       |   84 ++++++++------------------------------------------
 893  fs/fuse/fuse_i.h     |    8 ++++-
 894  fs/fuse/inode.c      |   10 +++++-
 895  include/linux/fuse.h |    9 +++++-
 896  4 files changed, 36 insertions(+), 75 deletions(-)
 897 Merging gfs2/master
 898 $ git merge gfs2/master
 899 Auto-merging fs/gfs2/acl.c
 900 Merge made by recursive.
 901  fs/gfs2/acl.c    |    5 +-
 902  fs/gfs2/aops.c   |    6 ---
 903  fs/gfs2/dir.c    |   42 +++++---------------
 904  fs/gfs2/file.c   |   37 +++++++++++++-----
 905  fs/gfs2/glops.c  |   29 +++++++++++---
 906  fs/gfs2/incore.h |    1 +
 907  fs/gfs2/inode.c  |   49 ++++++++---------------
 908  fs/gfs2/inode.h  |    2 +-
 909  fs/gfs2/quota.c  |   13 +-----
 910  fs/gfs2/super.c  |  111 +++++++++++++++++++++++++++++++++++-------------------
 911  fs/gfs2/xattr.c  |    5 +-
 912  11 files changed, 157 insertions(+), 143 deletions(-)
 913 Merging hfsplus/for-next
 914 $ git merge hfsplus/for-next
 915 Already up-to-date.
 916 Merging jfs/next
 917 $ git merge jfs/next
 918 Already up-to-date.
 919 Merging logfs/master
 920 $ git merge logfs/master
 921 Auto-merging fs/logfs/logfs.h
 922 Merge made by recursive.
 923  fs/logfs/dev_mtd.c   |   26 ++++++++++++--------------
 924  fs/logfs/logfs.h     |    1 +
 925  fs/logfs/readwrite.c |    4 ++++
 926  fs/logfs/segment.c   |   14 ++++++++++----
 927  fs/logfs/super.c     |    1 +
 928  5 files changed, 28 insertions(+), 18 deletions(-)
 929 Merging nfs/linux-next
 930 $ git merge nfs/linux-next
 931 Merge made by recursive.
 932  fs/nfs/callback.h                   |    2 +-
 933  fs/nfs/callback_proc.c              |   25 +++++++++++++++++++------
 934  fs/nfs/callback_xdr.c               |   24 +++++++-----------------
 935  fs/nfs/objlayout/objio_osd.c        |   28 ++++++++++++----------------
 936  fs/nfs/objlayout/pnfs_osd_xdr_cli.c |    3 +++
 937  5 files changed, 42 insertions(+), 40 deletions(-)
 938 Merging nfsd/nfsd-next
 939 $ git merge nfsd/nfsd-next
 940 Already up-to-date.
 941 Merging nilfs2/for-next
 942 $ git merge nilfs2/for-next
 943 Already up-to-date.
 944 Merging ocfs2/linux-next
 945 $ git merge ocfs2/linux-next
 946 Auto-merging fs/ocfs2/move_extents.c
 947 Auto-merging fs/ocfs2/super.c
 948 Merge made by recursive.
 949  fs/ocfs2/dlmglue.c      |   21 +++++++++++++++------
 950  fs/ocfs2/ioctl.c        |    8 ++++----
 951  fs/ocfs2/move_extents.c |    2 +-
 952  fs/ocfs2/ocfs2.h        |    4 ++--
 953  fs/ocfs2/super.c        |    3 ++-
 954  5 files changed, 24 insertions(+), 14 deletions(-)
 955 Merging omfs/for-next
 956 $ git merge omfs/for-next
 957 Already up-to-date.
 958 Merging squashfs/master
 959 $ git merge squashfs/master
 960 Already up-to-date.
 961 Merging udf/for_next
 962 $ git merge udf/for_next
 963 Already up-to-date.
 964 Merging v9fs/for-next
 965 $ git merge v9fs/for-next
 966 Merge made by recursive.
 967  fs/9p/v9fs.c           |    2 -
 968  fs/9p/v9fs_vfs.h       |    4 +-
 969  fs/9p/vfs_inode.c      |   95 ++++++++++++++++++++++++++----------------------
 970  fs/9p/vfs_inode_dotl.c |   31 ++++++++++------
 971  fs/9p/vfs_super.c      |    2 +-
 972  include/net/9p/9p.h    |    6 ---
 973  net/9p/Kconfig         |    5 ---
 974  net/9p/mod.c           |    2 -
 975  net/9p/protocol.c      |    7 ----
 976  net/9p/trans_virtio.c  |   12 +++++--
 977  10 files changed, 82 insertions(+), 84 deletions(-)
 978 Merging ubifs/linux-next
 979 $ git merge ubifs/linux-next
 980 Already up-to-date.
 981 Merging xfs/master
 982 $ git merge xfs/master
 983 Auto-merging fs/xfs/xfs_linux.h
 984 Auto-merging fs/xfs/xfs_quotaops.c
 985 Auto-merging fs/xfs/xfs_trace.c
 986 Merge made by recursive.
 987  fs/xfs/Makefile                       |  117 ++++++++++++++++-----------------
 988  fs/xfs/{linux-2.6 => }/kmem.c         |    0
 989  fs/xfs/{linux-2.6 => }/kmem.h         |    0
 990  fs/xfs/{linux-2.6 => }/mrlock.h       |    0
 991  fs/xfs/{linux-2.6 => }/time.h         |    0
 992  fs/xfs/{support => }/uuid.c           |    0
 993  fs/xfs/{support => }/uuid.h           |    0
 994  fs/xfs/xfs.h                          |    3 +-
 995  fs/xfs/{linux-2.6 => }/xfs_acl.c      |    0
 996  fs/xfs/{linux-2.6 => }/xfs_aops.c     |    0
 997  fs/xfs/{linux-2.6 => }/xfs_aops.h     |    0
 998  fs/xfs/{linux-2.6 => }/xfs_buf.c      |    0
 999  fs/xfs/{linux-2.6 => }/xfs_buf.h      |    0
1000  fs/xfs/{linux-2.6 => }/xfs_discard.c  |    0
1001  fs/xfs/{linux-2.6 => }/xfs_discard.h  |    0
1002  fs/xfs/{quota => }/xfs_dquot.c        |    0
1003  fs/xfs/{quota => }/xfs_dquot.h        |    0
1004  fs/xfs/{quota => }/xfs_dquot_item.c   |    0
1005  fs/xfs/{quota => }/xfs_dquot_item.h   |    0
1006  fs/xfs/{linux-2.6 => }/xfs_export.c   |    0
1007  fs/xfs/{linux-2.6 => }/xfs_export.h   |    0
1008  fs/xfs/{linux-2.6 => }/xfs_file.c     |    0
1009  fs/xfs/{linux-2.6 => }/xfs_fs_subr.c  |    0
1010  fs/xfs/{linux-2.6 => }/xfs_globals.c  |    0
1011  fs/xfs/{linux-2.6 => }/xfs_ioctl.c    |    0
1012  fs/xfs/{linux-2.6 => }/xfs_ioctl.h    |    0
1013  fs/xfs/{linux-2.6 => }/xfs_ioctl32.c  |    0
1014  fs/xfs/{linux-2.6 => }/xfs_ioctl32.h  |    0
1015  fs/xfs/{linux-2.6 => }/xfs_iops.c     |    0
1016  fs/xfs/{linux-2.6 => }/xfs_iops.h     |    0
1017  fs/xfs/{linux-2.6 => }/xfs_linux.h    |   27 ++++----
1018  fs/xfs/{linux-2.6 => }/xfs_message.c  |    0
1019  fs/xfs/{linux-2.6 => }/xfs_message.h  |    0
1020  fs/xfs/{quota => }/xfs_qm.c           |    0
1021  fs/xfs/{quota => }/xfs_qm.h           |    0
1022  fs/xfs/{quota => }/xfs_qm_bhv.c       |    0
1023  fs/xfs/{quota => }/xfs_qm_stats.c     |    0
1024  fs/xfs/{quota => }/xfs_qm_stats.h     |    0
1025  fs/xfs/{quota => }/xfs_qm_syscalls.c  |    0
1026  fs/xfs/{quota => }/xfs_quota_priv.h   |    0
1027  fs/xfs/{linux-2.6 => }/xfs_quotaops.c |    2 +-
1028  fs/xfs/{linux-2.6 => }/xfs_stats.c    |    0
1029  fs/xfs/{linux-2.6 => }/xfs_stats.h    |    0
1030  fs/xfs/{linux-2.6 => }/xfs_super.c    |    0
1031  fs/xfs/{linux-2.6 => }/xfs_super.h    |    0
1032  fs/xfs/{linux-2.6 => }/xfs_sync.c     |    0
1033  fs/xfs/{linux-2.6 => }/xfs_sync.h     |    0
1034  fs/xfs/{linux-2.6 => }/xfs_sysctl.c   |    0
1035  fs/xfs/{linux-2.6 => }/xfs_sysctl.h   |    0
1036  fs/xfs/{linux-2.6 => }/xfs_trace.c    |    4 +-
1037  fs/xfs/{linux-2.6 => }/xfs_trace.h    |    0
1038  fs/xfs/{quota => }/xfs_trans_dquot.c  |    0
1039  fs/xfs/{linux-2.6 => }/xfs_vnode.h    |    0
1040  fs/xfs/{linux-2.6 => }/xfs_xattr.c    |    0
1041  kernel/sysctl_binary.c                |    2 +-
1042  kernel/sysctl_check.c                 |    2 +-
1043  56 files changed, 76 insertions(+), 81 deletions(-)
1044  rename fs/xfs/{linux-2.6 => }/kmem.c (100%)
1045  rename fs/xfs/{linux-2.6 => }/kmem.h (100%)
1046  rename fs/xfs/{linux-2.6 => }/mrlock.h (100%)
1047  rename fs/xfs/{linux-2.6 => }/time.h (100%)
1048  rename fs/xfs/{support => }/uuid.c (100%)
1049  rename fs/xfs/{support => }/uuid.h (100%)
1050  rename fs/xfs/{linux-2.6 => }/xfs_acl.c (100%)
1051  rename fs/xfs/{linux-2.6 => }/xfs_aops.c (100%)
1052  rename fs/xfs/{linux-2.6 => }/xfs_aops.h (100%)
1053  rename fs/xfs/{linux-2.6 => }/xfs_buf.c (100%)
1054  rename fs/xfs/{linux-2.6 => }/xfs_buf.h (100%)
1055  rename fs/xfs/{linux-2.6 => }/xfs_discard.c (100%)
1056  rename fs/xfs/{linux-2.6 => }/xfs_discard.h (100%)
1057  rename fs/xfs/{quota => }/xfs_dquot.c (100%)
1058  rename fs/xfs/{quota => }/xfs_dquot.h (100%)
1059  rename fs/xfs/{quota => }/xfs_dquot_item.c (100%)
1060  rename fs/xfs/{quota => }/xfs_dquot_item.h (100%)
1061  rename fs/xfs/{linux-2.6 => }/xfs_export.c (100%)
1062  rename fs/xfs/{linux-2.6 => }/xfs_export.h (100%)
1063  rename fs/xfs/{linux-2.6 => }/xfs_file.c (100%)
1064  rename fs/xfs/{linux-2.6 => }/xfs_fs_subr.c (100%)
1065  rename fs/xfs/{linux-2.6 => }/xfs_globals.c (100%)
1066  rename fs/xfs/{linux-2.6 => }/xfs_ioctl.c (100%)
1067  rename fs/xfs/{linux-2.6 => }/xfs_ioctl.h (100%)
1068  rename fs/xfs/{linux-2.6 => }/xfs_ioctl32.c (100%)
1069  rename fs/xfs/{linux-2.6 => }/xfs_ioctl32.h (100%)
1070  rename fs/xfs/{linux-2.6 => }/xfs_iops.c (100%)
1071  rename fs/xfs/{linux-2.6 => }/xfs_iops.h (100%)
1072  rename fs/xfs/{linux-2.6 => }/xfs_linux.h (96%)
1073  rename fs/xfs/{linux-2.6 => }/xfs_message.c (100%)
1074  rename fs/xfs/{linux-2.6 => }/xfs_message.h (100%)
1075  rename fs/xfs/{quota => }/xfs_qm.c (100%)
1076  rename fs/xfs/{quota => }/xfs_qm.h (100%)
1077  rename fs/xfs/{quota => }/xfs_qm_bhv.c (100%)
1078  rename fs/xfs/{quota => }/xfs_qm_stats.c (100%)
1079  rename fs/xfs/{quota => }/xfs_qm_stats.h (100%)
1080  rename fs/xfs/{quota => }/xfs_qm_syscalls.c (100%)
1081  rename fs/xfs/{quota => }/xfs_quota_priv.h (100%)
1082  rename fs/xfs/{linux-2.6 => }/xfs_quotaops.c (99%)
1083  rename fs/xfs/{linux-2.6 => }/xfs_stats.c (100%)
1084  rename fs/xfs/{linux-2.6 => }/xfs_stats.h (100%)
1085  rename fs/xfs/{linux-2.6 => }/xfs_super.c (100%)
1086  rename fs/xfs/{linux-2.6 => }/xfs_super.h (100%)
1087  rename fs/xfs/{linux-2.6 => }/xfs_sync.c (100%)
1088  rename fs/xfs/{linux-2.6 => }/xfs_sync.h (100%)
1089  rename fs/xfs/{linux-2.6 => }/xfs_sysctl.c (100%)
1090  rename fs/xfs/{linux-2.6 => }/xfs_sysctl.h (100%)
1091  rename fs/xfs/{linux-2.6 => }/xfs_trace.c (96%)
1092  rename fs/xfs/{linux-2.6 => }/xfs_trace.h (100%)
1093  rename fs/xfs/{quota => }/xfs_trans_dquot.c (100%)
1094  rename fs/xfs/{linux-2.6 => }/xfs_vnode.h (100%)
1095  rename fs/xfs/{linux-2.6 => }/xfs_xattr.c (100%)
1096 $ git am -3 ../patches/xfs_fix_tracing_build.patch
1097 Applying: xfs: fix tracing builds inside the source tree
1098 $ git reset HEAD^
1099 Unstaged changes after reset:
1100 M       fs/xfs/Makefile
1101 $ git add .
1102 $ git commit -v -a --amend
1103 [master 1abf495] Merge remote-tracking branch 'xfs/master'
1104 Merging vfs/for-next
1105 $ git merge vfs/for-next
1106 Already up-to-date.
1107 Merging vfs-scale/vfs-scale-working
1108 $ git merge vfs-scale/vfs-scale-working
1109 Already up-to-date.
1110 Merging pci/linux-next
1111 $ git merge pci/linux-next
1112 Already up-to-date.
1113 Merging hid/for-next
1114 $ git merge hid/for-next
1115 Merge made by recursive.
1116  .../ABI/testing/sysfs-driver-hid-logitech-lg4ff    |    7 +
1117  drivers/hid/Kconfig                                |   19 +-
1118  drivers/hid/Makefile                               |    2 +-
1119  drivers/hid/hid-apple.c                            |    9 +
1120  drivers/hid/hid-axff.c                             |   36 ++-
1121  drivers/hid/hid-core.c                             |   50 ++-
1122  drivers/hid/hid-debug.c                            |    5 +
1123  drivers/hid/hid-ids.h                              |    7 +
1124  drivers/hid/hid-lg.c                               |   29 +-
1125  drivers/hid/hid-lg.h                               |    4 +-
1126  drivers/hid/hid-lg4ff.c                            |  403 ++++++++++++++++++--
1127  drivers/hid/hid-lgff.c                             |   13 -
1128  drivers/hid/hid-magicmouse.c                       |   56 +++-
1129  drivers/hid/hid-multitouch.c                       |   15 +
1130  drivers/hid/hid-prodikeys.c                        |    8 +-
1131  drivers/hid/hid-sjoy.c                             |   68 ++--
1132  drivers/hid/hid-zydacron.c                         |    4 +-
1133  drivers/hid/usbhid/hid-quirks.c                    |    1 -
1134  include/linux/hid.h                                |    2 +
1135  19 files changed, 615 insertions(+), 123 deletions(-)
1136  create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
1137 Merging quilt/i2c
1138 $ git merge quilt/i2c
1139 Merge made by recursive.
1140  drivers/i2c/busses/Kconfig |    2 +-
1141  1 files changed, 1 insertions(+), 1 deletions(-)
1142 Merging bjdooks-i2c/next-i2c
1143 $ git merge bjdooks-i2c/next-i2c
1144 Already up-to-date.
1145 Merging quilt/jdelvare-hwmon
1146 $ git merge quilt/jdelvare-hwmon
1147 Already up-to-date.
1148 Merging hwmon-staging/hwmon-next
1149 $ git merge hwmon-staging/hwmon-next
1150 Already up-to-date.
1151 Merging quilt/kernel-doc
1152 $ git merge quilt/kernel-doc
1153 Already up-to-date.
1154 Merging docs/docs-move
1155 $ git merge docs/docs-move
1156 Already up-to-date.
1157 Merging v4l-dvb/master
1158 $ git merge v4l-dvb/master
1159 Already up-to-date.
1160 Merging kbuild/for-next
1161 $ git merge kbuild/for-next
1162 Merge made by recursive.
1163  scripts/kconfig/menu.c  |   13 +++++--------
1164  scripts/kconfig/nconf.c |    2 --
1165  2 files changed, 5 insertions(+), 10 deletions(-)
1166 Merging kconfig/for-next
1167 $ git merge kconfig/for-next
1168 Already up-to-date!
1169 Merge made by recursive.
1170 Merging ide/master
1171 $ git merge ide/master
1172 Already up-to-date.
1173 Merging libata/NEXT
1174 $ git merge libata/NEXT
1175 Already up-to-date.
1176 Merging infiniband/for-next
1177 $ git merge infiniband/for-next
1178 Already up-to-date.
1179 Merging acpi/test
1180 $ git merge acpi/test
1181 Auto-merging Documentation/kernel-parameters.txt
1182 Merge made by recursive.
1183  Documentation/kernel-parameters.txt |    9 ++++++---
1184  drivers/acpi/acpica/hwxface.c       |    3 +--
1185  drivers/acpi/apei/Kconfig           |    1 +
1186  drivers/acpi/apei/apei-base.c       |    2 +-
1187  drivers/acpi/reboot.c               |    3 +--
1188  drivers/acpi/scan.c                 |    3 +--
1189  6 files changed, 11 insertions(+), 10 deletions(-)
1190 Merging idle-test/idle-test
1191 $ git merge idle-test/idle-test
1192 Already up-to-date.
1193 Merging powertools/tools-test
1194 $ git merge powertools/tools-test
1195 Already up-to-date.
1196 Merging cpupowerutils/master
1197 $ git merge cpupowerutils/master
1198 Removing tools/power/cpupower/debug/x86_64/centrino-decode.c
1199 Removing tools/power/cpupower/debug/x86_64/powernow-k8-decode.c
1200 Merge made by recursive.
1201  tools/power/cpupower/Makefile                      |    2 +-
1202  tools/power/cpupower/debug/x86_64/Makefile         |    8 +-
1203  .../power/cpupower/debug/x86_64/centrino-decode.c  |    1 -
1204  .../cpupower/debug/x86_64/powernow-k8-decode.c     |    1 -
1205  tools/power/cpupower/utils/helpers/helpers.h       |    3 +
1206  tools/power/cpupower/utils/helpers/sysfs.c         |   50 ++++++
1207  tools/power/cpupower/utils/helpers/sysfs.h         |    2 +
1208  tools/power/cpupower/utils/helpers/topology.c      |    5 +-
1209  .../cpupower/utils/idle_monitor/cpuidle_sysfs.c    |    2 +-
1210  .../cpupower/utils/idle_monitor/cpupower-monitor.c |   18 ++-
1211  .../cpupower/utils/idle_monitor/mperf_monitor.c    |  177 ++++++++++++++-----
1212  11 files changed, 210 insertions(+), 59 deletions(-)
1213  delete mode 120000 tools/power/cpupower/debug/x86_64/centrino-decode.c
1214  delete mode 120000 tools/power/cpupower/debug/x86_64/powernow-k8-decode.c
1215 Merging ieee1394/for-next
1216 $ git merge ieee1394/for-next
1217 Auto-merging drivers/firewire/core-device.c
1218 Merge made by recursive.
1219  drivers/firewire/core-device.c |   15 ++++++++++-----
1220  1 files changed, 10 insertions(+), 5 deletions(-)
1221 Merging ubi/linux-next
1222 $ git merge ubi/linux-next
1223 Already up-to-date.
1224 Merging dlm/next
1225 $ git merge dlm/next
1226 Already up-to-date.
1227 Merging swiotlb/master
1228 $ git merge swiotlb/master
1229 Merge made by recursive.
1230 Merging ibft/master
1231 $ git merge ibft/master
1232 Merge made by recursive.
1233 Merging scsi/master
1234 $ git merge scsi/master
1235 Already up-to-date.
1236 Merging iscsi-target/for-next
1237 $ git merge iscsi-target/for-next
1238 Already up-to-date.
1239 Merging slave-dma/next
1240 $ git merge slave-dma/next
1241 Merge made by recursive.
1242  drivers/dma/dmatest.c     |    6 ++++++
1243  drivers/dma/mxs-dma.c     |   45 ++++++++++++++++++++++++---------------------
1244  include/linux/dmaengine.h |   13 +++++++++++--
1245  3 files changed, 41 insertions(+), 23 deletions(-)
1246 Merging async_tx/next
1247 $ git merge async_tx/next
1248 Already up-to-date.
1249 Merging net/master
1250 $ git merge net/master
1251 Auto-merging MAINTAINERS
1252 Auto-merging arch/powerpc/Kconfig
1253 Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c
1254 Removing drivers/net/arm/Kconfig
1255 Removing drivers/net/arm/Makefile
1256 Removing drivers/net/benet/Kconfig
1257 Removing drivers/net/bna/bfi_ctreg.h
1258 Removing drivers/net/bna/bfi_ll.h
1259 Removing drivers/net/bna/bna_ctrl.c
1260 Removing drivers/net/bna/bna_hw.h
1261 Removing drivers/net/bna/bna_txrx.c
1262 Auto-merging drivers/net/bonding/bond_main.c
1263 Auto-merging drivers/net/cris/eth_v10.c
1264 Auto-merging drivers/net/ethernet/3com/3c501.c
1265 Auto-merging drivers/net/ethernet/3com/3c509.c
1266 Auto-merging drivers/net/ethernet/3com/3c515.c
1267 Auto-merging drivers/net/ethernet/3com/3c574_cs.c
1268 Auto-merging drivers/net/ethernet/3com/3c589_cs.c
1269 Auto-merging drivers/net/ethernet/3com/3c59x.c
1270 Auto-merging drivers/net/ethernet/3com/typhoon.c
1271 Auto-merging drivers/net/ethernet/8390/3c503.c
1272 Auto-merging drivers/net/ethernet/8390/8390.c
1273 Auto-merging drivers/net/ethernet/8390/8390p.c
1274 Auto-merging drivers/net/ethernet/8390/ac3200.c
1275 Auto-merging drivers/net/ethernet/8390/ax88796.c
1276 Auto-merging drivers/net/ethernet/8390/axnet_cs.c
1277 Auto-merging drivers/net/ethernet/8390/e2100.c
1278 Auto-merging drivers/net/ethernet/8390/etherh.c
1279 Auto-merging drivers/net/ethernet/8390/hp-plus.c
1280 Auto-merging drivers/net/ethernet/8390/hydra.c
1281 Auto-merging drivers/net/ethernet/8390/mac8390.c
1282 Auto-merging drivers/net/ethernet/8390/ne-h8300.c
1283 Auto-merging drivers/net/ethernet/8390/ne2k-pci.c
1284 Auto-merging drivers/net/ethernet/8390/pcnet_cs.c
1285 Auto-merging drivers/net/ethernet/8390/smc-mca.c
1286 Auto-merging drivers/net/ethernet/8390/smc-ultra.c
1287 Auto-merging drivers/net/ethernet/8390/smc-ultra32.c
1288 Auto-merging drivers/net/ethernet/8390/wd.c
1289 Auto-merging drivers/net/ethernet/8390/zorro8390.c
1290 Auto-merging drivers/net/ethernet/adaptec/starfire.c
1291 Auto-merging drivers/net/ethernet/adi/bfin_mac.c
1292 Auto-merging drivers/net/ethernet/aeroflex/greth.c
1293 Auto-merging drivers/net/ethernet/alteon/acenic.c
1294 Auto-merging drivers/net/ethernet/amd/a2065.c
1295 Auto-merging drivers/net/ethernet/amd/am79c961a.c
1296 Auto-merging drivers/net/ethernet/amd/amd8111e.c
1297 Auto-merging drivers/net/ethernet/amd/ariadne.c
1298 Auto-merging drivers/net/ethernet/amd/atarilance.c
1299 Auto-merging drivers/net/ethernet/amd/au1000_eth.c
1300 Auto-merging drivers/net/ethernet/amd/declance.c
1301 Auto-merging drivers/net/ethernet/amd/depca.c
1302 Auto-merging drivers/net/ethernet/amd/hplance.c
1303 Auto-merging drivers/net/ethernet/amd/lance.c
1304 Auto-merging drivers/net/ethernet/amd/mvme147.c
1305 Auto-merging drivers/net/ethernet/amd/ni65.c
1306 Auto-merging drivers/net/ethernet/amd/nmclan_cs.c
1307 Auto-merging drivers/net/ethernet/amd/pcnet32.c
1308 Auto-merging drivers/net/ethernet/amd/sun3lance.c
1309 Auto-merging drivers/net/ethernet/amd/sunlance.c
1310 Auto-merging drivers/net/ethernet/apple/bmac.c
1311 Auto-merging drivers/net/ethernet/apple/cs89x0.c
1312 Auto-merging drivers/net/ethernet/apple/mac89x0.c
1313 Auto-merging drivers/net/ethernet/apple/mace.c
1314 Auto-merging drivers/net/ethernet/apple/macmace.c
1315 Auto-merging drivers/net/ethernet/atheros/atl1c/atl1c_main.c
1316 Auto-merging drivers/net/ethernet/atheros/atl1e/atl1e_main.c
1317 Auto-merging drivers/net/ethernet/atheros/atlx/atl1.c
1318 Auto-merging drivers/net/ethernet/atheros/atlx/atl2.c
1319 Auto-merging drivers/net/ethernet/broadcom/b44.c
1320 Auto-merging drivers/net/ethernet/broadcom/bcm63xx_enet.c
1321 Auto-merging drivers/net/ethernet/broadcom/bnx2.c
1322 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
1323 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
1324 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
1325 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
1326 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
1327 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
1328 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
1329 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
1330 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
1331 Auto-merging drivers/net/ethernet/broadcom/cnic.c
1332 Auto-merging drivers/net/ethernet/broadcom/sb1250-mac.c
1333 Auto-merging drivers/net/ethernet/broadcom/tg3.c
1334 Auto-merging drivers/net/ethernet/brocade/bna/Makefile
1335 Auto-merging drivers/net/ethernet/brocade/bna/bfa_cee.c
1336 Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs.h
1337 Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
1338 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.c
1339 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.h
1340 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
1341 Auto-merging drivers/net/ethernet/brocade/bna/bfi.h
1342 Auto-merging drivers/net/ethernet/brocade/bna/bna.h
1343 Auto-merging drivers/net/ethernet/brocade/bna/bna_types.h
1344 Auto-merging drivers/net/ethernet/brocade/bna/bnad.c
1345 Auto-merging drivers/net/ethernet/brocade/bna/bnad.h
1346 Auto-merging drivers/net/ethernet/brocade/bna/bnad_ethtool.c
1347 Auto-merging drivers/net/ethernet/brocade/bna/cna.h
1348 Auto-merging drivers/net/ethernet/cadence/at91_ether.c
1349 Auto-merging drivers/net/ethernet/cadence/macb.c
1350 Auto-merging drivers/net/ethernet/chelsio/cxgb/cxgb2.c
1351 Auto-merging drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
1352 Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
1353 Auto-merging drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
1354 Auto-merging drivers/net/ethernet/cisco/enic/enic_main.c
1355 Auto-merging drivers/net/ethernet/davicom/dm9000.c
1356 Auto-merging drivers/net/ethernet/dec/ewrk3.c
1357 Auto-merging drivers/net/ethernet/dec/tulip/Kconfig
1358 Auto-merging drivers/net/ethernet/dec/tulip/de2104x.c
1359 Auto-merging drivers/net/ethernet/dec/tulip/de4x5.c
1360 Auto-merging drivers/net/ethernet/dec/tulip/dmfe.c
1361 Auto-merging drivers/net/ethernet/dec/tulip/tulip_core.c
1362 Auto-merging drivers/net/ethernet/dec/tulip/uli526x.c
1363 Auto-merging drivers/net/ethernet/dec/tulip/winbond-840.c
1364 Auto-merging drivers/net/ethernet/dlink/de620.c
1365 Auto-merging drivers/net/ethernet/dlink/dl2k.c
1366 Auto-merging drivers/net/ethernet/dlink/sundance.c
1367 Auto-merging drivers/net/ethernet/emulex/benet/be.h
1368 Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.c
1369 Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.h
1370 Auto-merging drivers/net/ethernet/emulex/benet/be_ethtool.c
1371 Auto-merging drivers/net/ethernet/emulex/benet/be_hw.h
1372 Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
1373 Auto-merging drivers/net/ethernet/ethoc.c
1374 Auto-merging drivers/net/ethernet/fealnx.c
1375 Auto-merging drivers/net/ethernet/freescale/fec.c
1376 Auto-merging drivers/net/ethernet/freescale/fec_mpc52xx.c
1377 Auto-merging drivers/net/ethernet/freescale/fs_enet/Kconfig
1378 Auto-merging drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
1379 Auto-merging drivers/net/ethernet/freescale/gianfar.c
1380 Auto-merging drivers/net/ethernet/freescale/ucc_geth.c
1381 Auto-merging drivers/net/ethernet/fujitsu/at1700.c
1382 Auto-merging drivers/net/ethernet/fujitsu/eth16i.c
1383 Auto-merging drivers/net/ethernet/fujitsu/fmvj18x_cs.c
1384 Auto-merging drivers/net/ethernet/hp/hp100.c
1385 Auto-merging drivers/net/ethernet/i825xx/3c505.c
1386 Auto-merging drivers/net/ethernet/i825xx/3c523.c
1387 Auto-merging drivers/net/ethernet/i825xx/3c527.c
1388 Auto-merging drivers/net/ethernet/i825xx/82596.c
1389 Auto-merging drivers/net/ethernet/i825xx/eepro.c
1390 Auto-merging drivers/net/ethernet/i825xx/eexpress.c
1391 Auto-merging drivers/net/ethernet/i825xx/ether1.c
1392 Auto-merging drivers/net/ethernet/i825xx/lib82596.c
1393 Auto-merging drivers/net/ethernet/i825xx/lp486e.c
1394 Auto-merging drivers/net/ethernet/i825xx/ni52.c
1395 Auto-merging drivers/net/ethernet/i825xx/sun3_82586.c
1396 Auto-merging drivers/net/ethernet/i825xx/znet.c
1397 Auto-merging drivers/net/ethernet/ibm/ehea/ehea_main.c
1398 Auto-merging drivers/net/ethernet/ibm/emac/Kconfig
1399 Auto-merging drivers/net/ethernet/ibm/emac/core.c
1400 Auto-merging drivers/net/ethernet/ibm/ibmveth.c
1401 Auto-merging drivers/net/ethernet/ibm/iseries_veth.c
1402 Auto-merging drivers/net/ethernet/icplus/ipg.c
1403 Auto-merging drivers/net/ethernet/intel/e100.c
1404 Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c
1405 Auto-merging drivers/net/ethernet/intel/e1000e/Makefile
1406 Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
1407 Auto-merging drivers/net/ethernet/intel/igb/igb_main.c
1408 Auto-merging drivers/net/ethernet/intel/igbvf/netdev.c
1409 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_main.c
1410 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
1411 Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
1412 Auto-merging drivers/net/ethernet/jme.c
1413 Auto-merging drivers/net/ethernet/korina.c
1414 Auto-merging drivers/net/ethernet/lantiq_etop.c
1415 Auto-merging drivers/net/ethernet/marvell/mv643xx_eth.c
1416 Auto-merging drivers/net/ethernet/marvell/skge.c
1417 Auto-merging drivers/net/ethernet/marvell/sky2.c
1418 Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c
1419 Auto-merging drivers/net/ethernet/micrel/ks8695net.c
1420 Auto-merging drivers/net/ethernet/microchip/enc28j60.c
1421 Auto-merging drivers/net/ethernet/mipsnet.c
1422 Auto-merging drivers/net/ethernet/myricom/myri10ge/myri10ge.c
1423 Auto-merging drivers/net/ethernet/natsemi/ibmlana.c
1424 Auto-merging drivers/net/ethernet/natsemi/jazzsonic.c
1425 Auto-merging drivers/net/ethernet/natsemi/macsonic.c
1426 Auto-merging drivers/net/ethernet/natsemi/natsemi.c
1427 Auto-merging drivers/net/ethernet/natsemi/ns83820.c
1428 Auto-merging drivers/net/ethernet/natsemi/xtsonic.c
1429 Auto-merging drivers/net/ethernet/neterion/s2io.c
1430 Auto-merging drivers/net/ethernet/neterion/vxge/vxge-main.c
1431 Auto-merging drivers/net/ethernet/netx-eth.c
1432 Auto-merging drivers/net/ethernet/nuvoton/w90p910_ether.c
1433 Auto-merging drivers/net/ethernet/nvidia/forcedeth.c
1434 Auto-merging drivers/net/ethernet/octeon/Kconfig
1435 Auto-merging drivers/net/ethernet/octeon/octeon_mgmt.c
1436 Auto-merging drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
1437 Auto-merging drivers/net/ethernet/packetengines/hamachi.c
1438 Auto-merging drivers/net/ethernet/packetengines/yellowfin.c
1439 Auto-merging drivers/net/ethernet/pasemi/pasemi_mac.c
1440 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic.h
1441 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
1442 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
1443 Auto-merging drivers/net/ethernet/qlogic/qla3xxx.c
1444 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
1445 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
1446 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
1447 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
1448 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
1449 Auto-merging drivers/net/ethernet/qlogic/qlge/qlge_main.c
1450 Auto-merging drivers/net/ethernet/racal/ni5010.c
1451 Auto-merging drivers/net/ethernet/rdc/r6040.c
1452 Auto-merging drivers/net/ethernet/realtek/8139cp.c
1453 Auto-merging drivers/net/ethernet/realtek/8139too.c
1454 Auto-merging drivers/net/ethernet/realtek/atp.c
1455 Auto-merging drivers/net/ethernet/realtek/r8169.c
1456 Auto-merging drivers/net/ethernet/realtek/sc92031.c
1457 Auto-merging drivers/net/ethernet/renesas/sh_eth.c
1458 Auto-merging drivers/net/ethernet/seeq/ether3.c
1459 Auto-merging drivers/net/ethernet/seeq/seeq8005.c
1460 Auto-merging drivers/net/ethernet/seeq/sgiseeq.c
1461 Auto-merging drivers/net/ethernet/sfc/Kconfig
1462 Auto-merging drivers/net/ethernet/sfc/efx.c
1463 Auto-merging drivers/net/ethernet/sgi/ioc3-eth.c
1464 Auto-merging drivers/net/ethernet/sis/sis190.c
1465 Auto-merging drivers/net/ethernet/sis/sis900.c
1466 Auto-merging drivers/net/ethernet/smsc/epic100.c
1467 Auto-merging drivers/net/ethernet/smsc/smc911x.c
1468 Auto-merging drivers/net/ethernet/smsc/smc9194.c
1469 Auto-merging drivers/net/ethernet/smsc/smc91c92_cs.c
1470 Auto-merging drivers/net/ethernet/smsc/smc91x.c
1471 Auto-merging drivers/net/ethernet/smsc/smsc911x.c
1472 Auto-merging drivers/net/ethernet/smsc/smsc9420.c
1473 Auto-merging drivers/net/ethernet/stmicro/stmmac/Kconfig
1474 Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
1475 Auto-merging drivers/net/ethernet/sun/cassini.c
1476 Auto-merging drivers/net/ethernet/sun/niu.c
1477 Auto-merging drivers/net/ethernet/sun/sunbmac.c
1478 Auto-merging drivers/net/ethernet/sun/sungem.c
1479 Auto-merging drivers/net/ethernet/sun/sunhme.c
1480 Auto-merging drivers/net/ethernet/sun/sunqe.c
1481 Auto-merging drivers/net/ethernet/sun/sunvnet.c
1482 Auto-merging drivers/net/ethernet/tehuti/tehuti.c
1483 Auto-merging drivers/net/ethernet/ti/cpmac.c
1484 Auto-merging drivers/net/ethernet/ti/davinci_emac.c
1485 Auto-merging drivers/net/ethernet/ti/tlan.c
1486 Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_net.c
1487 Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
1488 Auto-merging drivers/net/ethernet/toshiba/spider_net.c
1489 Auto-merging drivers/net/ethernet/toshiba/spider_net.h
1490 Auto-merging drivers/net/ethernet/toshiba/tc35815.c
1491 Auto-merging drivers/net/ethernet/tundra/tsi108_eth.c
1492 Auto-merging drivers/net/ethernet/via/via-rhine.c
1493 Auto-merging drivers/net/ethernet/via/via-velocity.c
1494 Auto-merging drivers/net/ethernet/xilinx/ll_temac_main.c
1495 Auto-merging drivers/net/ethernet/xircom/xirc2ps_cs.c
1496 Auto-merging drivers/net/ethernet/xscale/ixp2000/Kconfig
1497 Auto-merging drivers/net/ethernet/xscale/ixp4xx_eth.c
1498 Removing drivers/net/octeon/Makefile
1499 Removing drivers/net/pci-skeleton.c
1500 Auto-merging drivers/net/vmxnet3/vmxnet3_drv.c
1501 Auto-merging include/linux/sungem_phy.h
1502 Auto-merging net/ipv4/route.c
1503 Auto-merging net/ipv6/sit.c
1504 Merge made by recursive.
1505  .../devicetree/bindings/net/can/fsl-flexcan.txt    |   63 +-
1506  Documentation/devicetree/bindings/net/smsc911x.txt |   38 +
1507  Documentation/networking/netdevices.txt            |    4 +-
1508  MAINTAINERS                                        |  158 +-
1509  arch/ia64/hp/sim/simeth.c                          |    2 +-
1510  arch/powerpc/Kconfig                               |    2 +
1511  arch/powerpc/boot/dts/p1010rdb.dts                 |   10 +-
1512  arch/powerpc/boot/dts/p1010si.dtsi                 |   10 +-
1513  arch/s390/include/asm/qdio.h                       |   78 +-
1514  arch/um/drivers/net_kern.c                         |    2 +-
1515  arch/xtensa/platforms/iss/network.c                |    2 +-
1516  drivers/infiniband/hw/cxgb3/Makefile               |    2 +-
1517  drivers/infiniband/hw/cxgb4/Makefile               |    2 +-
1518  drivers/infiniband/hw/mlx4/Kconfig                 |    3 +-
1519  drivers/infiniband/hw/nes/nes_nic.c                |    2 +-
1520  drivers/infiniband/ulp/ipoib/ipoib_main.c          |    2 +-
1521  drivers/media/dvb/dvb-core/dvb_net.c               |    2 +-
1522  drivers/net/Kconfig                                | 2829 +-------------
1523  drivers/net/Makefile                               |  235 +--
1524  drivers/net/appletalk/cops.c                       |    2 +-
1525  drivers/net/appletalk/ltpc.c                       |    2 +-
1526  drivers/net/arcnet/com20020.c                      |    2 +-
1527  drivers/net/arm/Kconfig                            |   74 -
1528  drivers/net/arm/Makefile                           |   14 -
1529  drivers/net/benet/Kconfig                          |    6 -
1530  drivers/net/bna/bfi_ctreg.h                        |  646 ---
1531  drivers/net/bna/bfi_ll.h                           |  438 --
1532  drivers/net/bna/bna_ctrl.c                         | 3076 --------------
1533  drivers/net/bna/bna_hw.h                           | 1490 -------
1534  drivers/net/bna/bna_txrx.c                         | 4185 --------------------
1535  drivers/net/bonding/bond_main.c                    |   55 +-
1536  drivers/net/bonding/bonding.h                      |    1 -
1537  drivers/net/can/flexcan.c                          |  189 +-
1538  drivers/net/can/mscan/mscan.c                      |   26 +-
1539  drivers/net/cris/eth_v10.c                         |    2 +-
1540  drivers/net/defxx.c                                |    2 +-
1541  drivers/net/dummy.c                                |    2 +-
1542  drivers/net/{ => ethernet/3com}/3c501.c            |    2 +-
1543  drivers/net/{ => ethernet/3com}/3c501.h            |    0
1544  drivers/net/{ => ethernet/3com}/3c509.c            |    2 +-
1545  drivers/net/{ => ethernet/3com}/3c515.c            |    2 +-
1546  drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c   |    2 +-
1547  drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c   |    2 +-
1548  drivers/net/{ => ethernet/3com}/3c59x.c            |    4 +-
1549  drivers/net/ethernet/3com/Kconfig                  |  120 +
1550  drivers/net/ethernet/3com/Makefile                 |   11 +
1551  drivers/net/{ => ethernet/3com}/typhoon.c          |    2 +-
1552  drivers/net/{ => ethernet/3com}/typhoon.h          |    0
1553  drivers/net/{ => ethernet/8390}/3c503.c            |    2 +-
1554  drivers/net/{ => ethernet/8390}/3c503.h            |    0
1555  drivers/net/{ => ethernet/8390}/8390.c             |    2 +-
1556  drivers/net/{ => ethernet/8390}/8390.h             |    0
1557  drivers/net/{ => ethernet/8390}/8390p.c            |    2 +-
1558  drivers/net/ethernet/8390/Kconfig                  |  336 ++
1559  drivers/net/ethernet/8390/Makefile                 |   29 +
1560  drivers/net/{ => ethernet/8390}/ac3200.c           |    2 +-
1561  drivers/net/{ => ethernet/8390}/apne.c             |    0
1562  drivers/net/{ => ethernet/8390}/ax88796.c          |    2 +-
1563  drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c   |    4 +-
1564  drivers/net/{ => ethernet/8390}/e2100.c            |    2 +-
1565  drivers/net/{ => ethernet/8390}/es3210.c           |    0
1566  drivers/net/{arm => ethernet/8390}/etherh.c        |    4 +-
1567  drivers/net/{ => ethernet/8390}/hp-plus.c          |    2 +-
1568  drivers/net/{ => ethernet/8390}/hp.c               |    0
1569  drivers/net/{ => ethernet/8390}/hydra.c            |    2 +-
1570  drivers/net/{ => ethernet/8390}/lib8390.c          |    0
1571  drivers/net/{ => ethernet/8390}/lne390.c           |    0
1572  drivers/net/{ => ethernet/8390}/mac8390.c          |    2 +-
1573  drivers/net/{ => ethernet/8390}/ne-h8300.c         |    2 +-
1574  drivers/net/{ => ethernet/8390}/ne.c               |    0
1575  drivers/net/{ => ethernet/8390}/ne2.c              |    0
1576  drivers/net/{ => ethernet/8390}/ne2k-pci.c         |    2 +-
1577  drivers/net/{ => ethernet/8390}/ne3210.c           |    0
1578  drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c   |    4 +-
1579  drivers/net/{ => ethernet/8390}/smc-mca.c          |    2 +-
1580  drivers/net/{ => ethernet/8390}/smc-ultra.c        |    2 +-
1581  drivers/net/{ => ethernet/8390}/smc-ultra32.c      |    2 +-
1582  drivers/net/{ => ethernet/8390}/stnic.c            |    0
1583  drivers/net/{ => ethernet/8390}/wd.c               |    2 +-
1584  drivers/net/{ => ethernet/8390}/zorro8390.c        |    2 +-
1585  drivers/net/ethernet/Kconfig                       |  173 +
1586  drivers/net/ethernet/Makefile                      |   74 +
1587  drivers/net/ethernet/adaptec/Kconfig               |   34 +
1588  drivers/net/ethernet/adaptec/Makefile              |    5 +
1589  drivers/net/{ => ethernet/adaptec}/starfire.c      |    2 +-
1590  drivers/net/ethernet/adi/Kconfig                   |   68 +
1591  drivers/net/ethernet/adi/Makefile                  |    5 +
1592  drivers/net/{ => ethernet/adi}/bfin_mac.c          |    2 +-
1593  drivers/net/{ => ethernet/adi}/bfin_mac.h          |    0
1594  drivers/net/ethernet/aeroflex/Kconfig              |   11 +
1595  drivers/net/ethernet/aeroflex/Makefile             |    5 +
1596  drivers/net/{ => ethernet/aeroflex}/greth.c        |    2 +-
1597  drivers/net/{ => ethernet/aeroflex}/greth.h        |    0
1598  drivers/net/ethernet/alteon/Kconfig                |   47 +
1599  drivers/net/ethernet/alteon/Makefile               |    5 +
1600  drivers/net/{ => ethernet/alteon}/acenic.c         |    2 +-
1601  drivers/net/{ => ethernet/alteon}/acenic.h         |    0
1602  drivers/net/{ => ethernet/amd}/7990.c              |    0
1603  drivers/net/{ => ethernet/amd}/7990.h              |    0
1604  drivers/net/ethernet/amd/Kconfig                   |  192 +
1605  drivers/net/ethernet/amd/Makefile                  |   20 +
1606  drivers/net/{ => ethernet/amd}/a2065.c             |    2 +-
1607  drivers/net/{ => ethernet/amd}/a2065.h             |    0
1608  drivers/net/{arm => ethernet/amd}/am79c961a.c      |    2 +-
1609  drivers/net/{arm => ethernet/amd}/am79c961a.h      |    0
1610  drivers/net/{ => ethernet/amd}/amd8111e.c          |    2 +-
1611  drivers/net/{ => ethernet/amd}/amd8111e.h          |    0
1612  drivers/net/{ => ethernet/amd}/ariadne.c           |    2 +-
1613  drivers/net/{ => ethernet/amd}/ariadne.h           |    0
1614  drivers/net/{ => ethernet/amd}/atarilance.c        |    2 +-
1615  drivers/net/{ => ethernet/amd}/au1000_eth.c        |    2 +-
1616  drivers/net/{ => ethernet/amd}/au1000_eth.h        |    0
1617  drivers/net/{ => ethernet/amd}/declance.c          |    2 +-
1618  drivers/net/{ => ethernet/amd}/depca.c             |    2 +-
1619  drivers/net/{ => ethernet/amd}/depca.h             |    0
1620  drivers/net/{ => ethernet/amd}/hplance.c           |    2 +-
1621  drivers/net/{ => ethernet/amd}/hplance.h           |    0
1622  drivers/net/{ => ethernet/amd}/lance.c             |    2 +-
1623  drivers/net/{ => ethernet/amd}/mvme147.c           |    2 +-
1624  drivers/net/{ => ethernet/amd}/ni65.c              |    2 +-
1625  drivers/net/{ => ethernet/amd}/ni65.h              |    0
1626  drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c   |    2 +-
1627  drivers/net/{ => ethernet/amd}/pcnet32.c           |    2 +-
1628  drivers/net/{ => ethernet/amd}/sun3lance.c         |    2 +-
1629  drivers/net/{ => ethernet/amd}/sunlance.c          |    2 +-
1630  drivers/net/ethernet/apple/Kconfig                 |   96 +
1631  drivers/net/ethernet/apple/Makefile                |    9 +
1632  drivers/net/{ => ethernet/apple}/bmac.c            |    2 +-
1633  drivers/net/{ => ethernet/apple}/bmac.h            |    0
1634  drivers/net/{ => ethernet/apple}/cs89x0.c          |    2 +-
1635  drivers/net/{ => ethernet/apple}/cs89x0.h          |    0
1636  drivers/net/{ => ethernet/apple}/mac89x0.c         |    2 +-
1637  drivers/net/{ => ethernet/apple}/mace.c            |    2 +-
1638  drivers/net/{ => ethernet/apple}/mace.h            |    0
1639  drivers/net/{ => ethernet/apple}/macmace.c         |    2 +-
1640  drivers/net/ethernet/atheros/Kconfig               |   65 +
1641  drivers/net/ethernet/atheros/Makefile              |    8 +
1642  drivers/net/{ => ethernet/atheros}/atl1c/Makefile  |    0
1643  drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h   |    0
1644  .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c   |    0
1645  .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c    |    0
1646  .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h    |    0
1647  .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c  |    2 +-
1648  drivers/net/{ => ethernet/atheros}/atl1e/Makefile  |    0
1649  drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h   |    0
1650  .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c   |    0
1651  .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c    |    0
1652  .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h    |    0
1653  .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c  |    2 +-
1654  .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c |    0
1655  drivers/net/{ => ethernet/atheros}/atlx/Makefile   |    0
1656  drivers/net/{ => ethernet/atheros}/atlx/atl1.c     |    2 +-
1657  drivers/net/{ => ethernet/atheros}/atlx/atl1.h     |    0
1658  drivers/net/{ => ethernet/atheros}/atlx/atl2.c     |    2 +-
1659  drivers/net/{ => ethernet/atheros}/atlx/atl2.h     |    0
1660  drivers/net/{ => ethernet/atheros}/atlx/atlx.c     |    0
1661  drivers/net/{ => ethernet/atheros}/atlx/atlx.h     |    0
1662  drivers/net/ethernet/broadcom/Kconfig              |  119 +
1663  drivers/net/ethernet/broadcom/Makefile             |   11 +
1664  drivers/net/{ => ethernet/broadcom}/b44.c          |    2 +-
1665  drivers/net/{ => ethernet/broadcom}/b44.h          |    0
1666  drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c |    2 +-
1667  drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h |    0
1668  drivers/net/{ => ethernet/broadcom}/bnx2.c         |    2 +
1669  drivers/net/{ => ethernet/broadcom}/bnx2.h         |    0
1670  drivers/net/{ => ethernet/broadcom}/bnx2_fw.h      |    0
1671  drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile |    0
1672  drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h  |   67 +-
1673  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c  |   48 +-
1674  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h  |    4 +-
1675  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c  |    5 +-
1676  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h  |    0
1677  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h |    0
1678  .../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c  |   23 +-
1679  .../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h  |    0
1680  .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h            |    0
1681  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h  |    0
1682  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h |    0
1683  .../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h |    0
1684  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c |  153 +-
1685  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h |    0
1686  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c |   75 +-
1687  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h  |    0
1688  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c   |   67 +-
1689  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h   |    0
1690  .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c    |   46 +-
1691  .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h    |    0
1692  drivers/net/{ => ethernet/broadcom}/cnic.c         |    4 +-
1693  drivers/net/{ => ethernet/broadcom}/cnic.h         |    0
1694  drivers/net/{ => ethernet/broadcom}/cnic_defs.h    |    0
1695  drivers/net/{ => ethernet/broadcom}/cnic_if.h      |    0
1696  drivers/net/{ => ethernet/broadcom}/sb1250-mac.c   |    2 +-
1697  drivers/net/{ => ethernet/broadcom}/tg3.c          |    2 +-
1698  drivers/net/{ => ethernet/broadcom}/tg3.h          |    0
1699  drivers/net/ethernet/brocade/Kconfig               |   22 +
1700  drivers/net/ethernet/brocade/Makefile              |    5 +
1701  drivers/net/ethernet/brocade/bna/Kconfig           |   17 +
1702  drivers/net/{ => ethernet/brocade}/bna/Makefile    |    5 +-
1703  drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c   |    3 -
1704  drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h   |    0
1705  drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h    |    0
1706  drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h  |   25 +-
1707  .../net/{ => ethernet/brocade}/bna/bfa_defs_cna.h  |    0
1708  .../{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h |   28 +-
1709  .../{ => ethernet/brocade}/bna/bfa_defs_status.h   |    0
1710  drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c   |  405 ++-
1711  drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h   |   45 +-
1712  .../net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c    |  157 +-
1713  drivers/net/ethernet/brocade/bna/bfa_msgq.c        |  669 ++++
1714  drivers/net/ethernet/brocade/bna/bfa_msgq.h        |  130 +
1715  drivers/net/{ => ethernet/brocade}/bna/bfi.h       |  195 +-
1716  drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h   |    0
1717  drivers/net/ethernet/brocade/bna/bfi_enet.h        |  901 +++++
1718  drivers/net/ethernet/brocade/bna/bfi_reg.h         |  452 +++
1719  drivers/net/{ => ethernet/brocade}/bna/bna.h       |  337 +-
1720  drivers/net/ethernet/brocade/bna/bna_enet.c        | 2129 ++++++++++
1721  drivers/net/ethernet/brocade/bna/bna_hw_defs.h     |  413 ++
1722  drivers/net/ethernet/brocade/bna/bna_tx_rx.c       | 3787 ++++++++++++++++++
1723  drivers/net/{ => ethernet/brocade}/bna/bna_types.h |  654 ++--
1724  drivers/net/{ => ethernet/brocade}/bna/bnad.c      |  644 ++--
1725  drivers/net/{ => ethernet/brocade}/bna/bnad.h      |   38 +-
1726  .../net/{ => ethernet/brocade}/bna/bnad_ethtool.c  |  384 +--
1727  drivers/net/{ => ethernet/brocade}/bna/cna.h       |   31 +-
1728  drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c |    0
1729  drivers/net/ethernet/cadence/Kconfig               |   44 +
1730  drivers/net/ethernet/cadence/Makefile              |    6 +
1731  drivers/net/{arm => ethernet/cadence}/at91_ether.c |    2 +-
1732  drivers/net/{arm => ethernet/cadence}/at91_ether.h |    0
1733  drivers/net/{ => ethernet/cadence}/macb.c          |    2 +-
1734  drivers/net/{ => ethernet/cadence}/macb.h          |    0
1735  drivers/net/ethernet/chelsio/Kconfig               |  106 +
1736  drivers/net/ethernet/chelsio/Makefile              |    8 +
1737  .../{chelsio => ethernet/chelsio/cxgb}/Makefile    |    0
1738  .../{chelsio => ethernet/chelsio/cxgb}/common.h    |    0
1739  .../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h  |    0
1740  .../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h  |    0
1741  .../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c |    2 +-
1742  .../{chelsio => ethernet/chelsio/cxgb}/elmer0.h    |    0
1743  .../net/{chelsio => ethernet/chelsio/cxgb}/espi.c  |    0
1744  .../net/{chelsio => ethernet/chelsio/cxgb}/espi.h  |    0
1745  .../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h |    0
1746  .../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h  |    0
1747  .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c |    0
1748  .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h |    0
1749  .../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c |    0
1750  .../{chelsio => ethernet/chelsio/cxgb}/my3126.c    |    0
1751  .../{chelsio => ethernet/chelsio/cxgb}/pm3393.c    |    0
1752  .../net/{chelsio => ethernet/chelsio/cxgb}/regs.h  |    0
1753  .../net/{chelsio => ethernet/chelsio/cxgb}/sge.c   |    0
1754  .../net/{chelsio => ethernet/chelsio/cxgb}/sge.h   |    0
1755  .../net/{chelsio => ethernet/chelsio/cxgb}/subr.c  |    0
1756  .../chelsio/cxgb}/suni1x10gexp_regs.h              |    0
1757  .../net/{chelsio => ethernet/chelsio/cxgb}/tp.c    |    0
1758  .../net/{chelsio => ethernet/chelsio/cxgb}/tp.h    |    0
1759  .../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c   |    0
1760  .../chelsio/cxgb}/vsc7326_reg.h                    |    0
1761  drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile  |    0
1762  drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h |    0
1763  drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c |    0
1764  drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c  |    0
1765  drivers/net/{ => ethernet/chelsio}/cxgb3/common.h  |    0
1766  .../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h  |    0
1767  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h  |    0
1768  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h |    0
1769  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c  |    2 +-
1770  .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c   |    0
1771  .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h   |    0
1772  .../chelsio}/cxgb3/firmware_exports.h              |    0
1773  drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c     |    0
1774  drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h     |    0
1775  drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c     |    0
1776  drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h    |    0
1777  drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c     |    0
1778  .../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h    |    0
1779  drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h  |    0
1780  drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c   |    0
1781  drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h  |    0
1782  drivers/net/{ => ethernet/chelsio}/cxgb3/version.h |    0
1783  drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c |    0
1784  drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c   |    0
1785  drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile  |    0
1786  drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h   |    0
1787  .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c  |    3 +
1788  .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h   |    0
1789  drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c     |    0
1790  drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h     |    0
1791  drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c     |    0
1792  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c   |    0
1793  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h   |    0
1794  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h  |    0
1795  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h |    0
1796  .../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h    |    0
1797  .../net/{ => ethernet/chelsio}/cxgb4vf/Makefile    |    0
1798  .../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h   |    0
1799  .../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c  |    2 +
1800  drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c   |    0
1801  .../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h   |    0
1802  .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h |    0
1803  .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c   |    0
1804  drivers/net/ethernet/cirrus/Kconfig                |   28 +
1805  drivers/net/ethernet/cirrus/Makefile               |    5 +
1806  drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c  |    0
1807  drivers/net/ethernet/cisco/Kconfig                 |   22 +
1808  drivers/net/ethernet/cisco/Makefile                |    5 +
1809  drivers/net/ethernet/cisco/enic/Kconfig            |    9 +
1810  drivers/net/{ => ethernet/cisco}/enic/Makefile     |    0
1811  drivers/net/{ => ethernet/cisco}/enic/cq_desc.h    |    0
1812  .../net/{ => ethernet/cisco}/enic/cq_enet_desc.h   |    0
1813  drivers/net/{ => ethernet/cisco}/enic/enic.h       |    0
1814  drivers/net/{ => ethernet/cisco}/enic/enic_dev.c   |    0
1815  drivers/net/{ => ethernet/cisco}/enic/enic_dev.h   |    0
1816  drivers/net/{ => ethernet/cisco}/enic/enic_main.c  |    5 +-
1817  drivers/net/{ => ethernet/cisco}/enic/enic_pp.c    |    0
1818  drivers/net/{ => ethernet/cisco}/enic/enic_pp.h    |    0
1819  drivers/net/{ => ethernet/cisco}/enic/enic_res.c   |    0
1820  drivers/net/{ => ethernet/cisco}/enic/enic_res.h   |    0
1821  .../net/{ => ethernet/cisco}/enic/rq_enet_desc.h   |    0
1822  drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c    |    0
1823  drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h    |    0
1824  drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c   |    0
1825  drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h   |    0
1826  .../net/{ => ethernet/cisco}/enic/vnic_devcmd.h    |    0
1827  drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h  |    0
1828  drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c  |    0
1829  drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h  |    0
1830  drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h   |    0
1831  .../net/{ => ethernet/cisco}/enic/vnic_resource.h  |    0
1832  drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c    |    0
1833  drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h    |    0
1834  drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h   |    0
1835  drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h |    0
1836  drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c   |    0
1837  drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h   |    0
1838  drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c    |    0
1839  drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h    |    0
1840  .../net/{ => ethernet/cisco}/enic/wq_enet_desc.h   |    0
1841  drivers/net/ethernet/davicom/Kconfig               |   31 +
1842  drivers/net/ethernet/davicom/Makefile              |    5 +
1843  drivers/net/{ => ethernet/davicom}/dm9000.c        |    2 +-
1844  drivers/net/{ => ethernet/davicom}/dm9000.h        |    0
1845  drivers/net/ethernet/dec/Kconfig                   |   36 +
1846  drivers/net/ethernet/dec/Makefile                  |    6 +
1847  drivers/net/{ => ethernet/dec}/ewrk3.c             |    2 +-
1848  drivers/net/{ => ethernet/dec}/ewrk3.h             |    0
1849  drivers/net/{ => ethernet/dec}/tulip/21142.c       |    0
1850  drivers/net/{ => ethernet/dec}/tulip/Kconfig       |   20 +-
1851  drivers/net/{ => ethernet/dec}/tulip/Makefile      |    0
1852  drivers/net/{ => ethernet/dec}/tulip/de2104x.c     |    2 +-
1853  drivers/net/{ => ethernet/dec}/tulip/de4x5.c       |    2 +-
1854  drivers/net/{ => ethernet/dec}/tulip/de4x5.h       |    0
1855  drivers/net/{ => ethernet/dec}/tulip/dmfe.c        |    2 +-
1856  drivers/net/{ => ethernet/dec}/tulip/eeprom.c      |    0
1857  drivers/net/{ => ethernet/dec}/tulip/interrupt.c   |    0
1858  drivers/net/{ => ethernet/dec}/tulip/media.c       |    0
1859  drivers/net/{ => ethernet/dec}/tulip/pnic.c        |    0
1860  drivers/net/{ => ethernet/dec}/tulip/pnic2.c       |    0
1861  drivers/net/{ => ethernet/dec}/tulip/timer.c       |    0
1862  drivers/net/{ => ethernet/dec}/tulip/tulip.h       |    0
1863  drivers/net/{ => ethernet/dec}/tulip/tulip_core.c  |    2 +-
1864  drivers/net/{ => ethernet/dec}/tulip/uli526x.c     |    2 +-
1865  drivers/net/{ => ethernet/dec}/tulip/winbond-840.c |    2 +-
1866  drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c   |    0
1867  drivers/net/ethernet/dlink/Kconfig                 |   84 +
1868  drivers/net/ethernet/dlink/Makefile                |    8 +
1869  drivers/net/{ => ethernet/dlink}/de600.c           |    0
1870  drivers/net/{ => ethernet/dlink}/de600.h           |    0
1871  drivers/net/{ => ethernet/dlink}/de620.c           |    2 +-
1872  drivers/net/{ => ethernet/dlink}/de620.h           |    0
1873  drivers/net/{ => ethernet/dlink}/dl2k.c            |    2 +-
1874  drivers/net/{ => ethernet/dlink}/dl2k.h            |    0
1875  drivers/net/{ => ethernet/dlink}/sundance.c        |    2 +-
1876  drivers/net/{ => ethernet}/dnet.c                  |    0
1877  drivers/net/{ => ethernet}/dnet.h                  |    0
1878  drivers/net/ethernet/emulex/Kconfig                |   22 +
1879  drivers/net/ethernet/emulex/Makefile               |    5 +
1880  drivers/net/ethernet/emulex/benet/Kconfig          |    6 +
1881  drivers/net/{ => ethernet/emulex}/benet/Makefile   |    0
1882  drivers/net/{ => ethernet/emulex}/benet/be.h       |  123 +-
1883  drivers/net/{ => ethernet/emulex}/benet/be_cmds.c  |  160 +-
1884  drivers/net/{ => ethernet/emulex}/benet/be_cmds.h  |   91 +-
1885  .../net/{ => ethernet/emulex}/benet/be_ethtool.c   |  154 +-
1886  drivers/net/{ => ethernet/emulex}/benet/be_hw.h    |   21 +-
1887  drivers/net/{ => ethernet/emulex}/benet/be_main.c  |  481 +--
1888  drivers/net/{ => ethernet}/ethoc.c                 |    2 +-
1889  drivers/net/ethernet/faraday/Kconfig               |   38 +
1890  drivers/net/ethernet/faraday/Makefile              |    6 +
1891  drivers/net/{ => ethernet/faraday}/ftgmac100.c     |    0
1892  drivers/net/{ => ethernet/faraday}/ftgmac100.h     |    0
1893  drivers/net/{ => ethernet/faraday}/ftmac100.c      |    0
1894  drivers/net/{ => ethernet/faraday}/ftmac100.h      |    0
1895  drivers/net/{ => ethernet}/fealnx.c                |    2 +-
1896  drivers/net/ethernet/freescale/Kconfig             |   88 +
1897  drivers/net/ethernet/freescale/Makefile            |   18 +
1898  drivers/net/{ => ethernet/freescale}/fec.c         |    2 +-
1899  drivers/net/{ => ethernet/freescale}/fec.h         |    0
1900  drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c |    2 +-
1901  drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h |    0
1902  .../net/{ => ethernet/freescale}/fec_mpc52xx_phy.c |    0
1903  .../net/{ => ethernet/freescale}/fs_enet/Kconfig   |    2 +-
1904  .../net/{ => ethernet/freescale}/fs_enet/Makefile  |    0
1905  drivers/net/{ => ethernet/freescale}/fs_enet/fec.h |    0
1906  .../freescale}/fs_enet/fs_enet-main.c              |    2 +-
1907  .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h |    0
1908  .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c |    0
1909  .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c |    0
1910  .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c |    0
1911  .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c |    0
1912  .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c |    0
1913  drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c |    0
1914  drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h |    0
1915  drivers/net/{ => ethernet/freescale}/gianfar.c     |    2 +-
1916  drivers/net/{ => ethernet/freescale}/gianfar.h     |    0
1917  .../net/{ => ethernet/freescale}/gianfar_ethtool.c |    0
1918  drivers/net/{ => ethernet/freescale}/gianfar_ptp.c |    0
1919  .../net/{ => ethernet/freescale}/gianfar_sysfs.c   |    0
1920  drivers/net/{ => ethernet/freescale}/ucc_geth.c    |   12 +-
1921  drivers/net/{ => ethernet/freescale}/ucc_geth.h    |    0
1922  .../{ => ethernet/freescale}/ucc_geth_ethtool.c    |    0
1923  drivers/net/ethernet/fujitsu/Kconfig               |   53 +
1924  drivers/net/ethernet/fujitsu/Makefile              |    7 +
1925  drivers/net/{ => ethernet/fujitsu}/at1700.c        |    2 +-
1926  drivers/net/{ => ethernet/fujitsu}/eth16i.c        |    2 +-
1927  .../net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c  |    2 +-
1928  drivers/net/ethernet/hp/Kconfig                    |   31 +
1929  drivers/net/ethernet/hp/Makefile                   |    5 +
1930  drivers/net/{ => ethernet/hp}/hp100.c              |    4 +-
1931  drivers/net/{ => ethernet/hp}/hp100.h              |    0
1932  drivers/net/{ => ethernet/i825xx}/3c505.c          |    2 +-
1933  drivers/net/{ => ethernet/i825xx}/3c505.h          |    0
1934  drivers/net/{ => ethernet/i825xx}/3c507.c          |    0
1935  drivers/net/{ => ethernet/i825xx}/3c523.c          |    2 +-
1936  drivers/net/{ => ethernet/i825xx}/3c523.h          |    0
1937  drivers/net/{ => ethernet/i825xx}/3c527.c          |    2 +-
1938  drivers/net/{ => ethernet/i825xx}/3c527.h          |    0
1939  drivers/net/{ => ethernet/i825xx}/82596.c          |    2 +-
1940  drivers/net/ethernet/i825xx/Kconfig                |  182 +
1941  drivers/net/ethernet/i825xx/Makefile               |   20 +
1942  drivers/net/{ => ethernet/i825xx}/eepro.c          |    2 +-
1943  drivers/net/{ => ethernet/i825xx}/eexpress.c       |    2 +-
1944  drivers/net/{ => ethernet/i825xx}/eexpress.h       |    0
1945  drivers/net/{arm => ethernet/i825xx}/ether1.c      |    2 +-
1946  drivers/net/{arm => ethernet/i825xx}/ether1.h      |    0
1947  drivers/net/{ => ethernet/i825xx}/lasi_82596.c     |    0
1948  drivers/net/{ => ethernet/i825xx}/lib82596.c       |    2 +-
1949  drivers/net/{ => ethernet/i825xx}/lp486e.c         |    2 +-
1950  drivers/net/{ => ethernet/i825xx}/ni52.c           |    2 +-
1951  drivers/net/{ => ethernet/i825xx}/ni52.h           |    0
1952  drivers/net/{ => ethernet/i825xx}/sni_82596.c      |    0
1953  drivers/net/{ => ethernet/i825xx}/sun3_82586.c     |    2 +-
1954  drivers/net/{ => ethernet/i825xx}/sun3_82586.h     |    0
1955  drivers/net/{ => ethernet/i825xx}/znet.c           |    2 +-
1956  drivers/net/ethernet/ibm/Kconfig                   |   47 +
1957  drivers/net/ethernet/ibm/Makefile                  |    8 +
1958  drivers/net/{ => ethernet/ibm}/ehea/Makefile       |    0
1959  drivers/net/{ => ethernet/ibm}/ehea/ehea.h         |    0
1960  drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c |    0
1961  drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h      |    0
1962  drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c    |    2 +-
1963  drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c    |    0
1964  drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h    |    0
1965  drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c     |    0
1966  drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h     |    0
1967  .../net/{ibm_newemac => ethernet/ibm/emac}/Kconfig |   40 +-
1968  .../{ibm_newemac => ethernet/ibm/emac}/Makefile    |    0
1969  .../net/{ibm_newemac => ethernet/ibm/emac}/core.c  |    4 +-
1970  .../net/{ibm_newemac => ethernet/ibm/emac}/core.h  |    0
1971  .../net/{ibm_newemac => ethernet/ibm/emac}/debug.c |    0
1972  .../net/{ibm_newemac => ethernet/ibm/emac}/debug.h |    0
1973  .../net/{ibm_newemac => ethernet/ibm/emac}/emac.h  |    0
1974  .../net/{ibm_newemac => ethernet/ibm/emac}/mal.c   |    0
1975  .../net/{ibm_newemac => ethernet/ibm/emac}/mal.h   |    0
1976  .../net/{ibm_newemac => ethernet/ibm/emac}/phy.c   |    0
1977  .../net/{ibm_newemac => ethernet/ibm/emac}/phy.h   |    0
1978  .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c |    0
1979  .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h |    0
1980  .../net/{ibm_newemac => ethernet/ibm/emac}/tah.c   |    0
1981  .../net/{ibm_newemac => ethernet/ibm/emac}/tah.h   |    0
1982  .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.c  |    0
1983  .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.h  |    0
1984  drivers/net/{ => ethernet/ibm}/ibmveth.c           |    2 +-
1985  drivers/net/{ => ethernet/ibm}/ibmveth.h           |    0
1986  drivers/net/{ => ethernet/ibm}/iseries_veth.c      |    2 +-
1987  drivers/net/ethernet/icplus/Kconfig                |   13 +
1988  drivers/net/ethernet/icplus/Makefile               |    5 +
1989  drivers/net/{ => ethernet/icplus}/ipg.c            |  199 +-
1990  drivers/net/{ => ethernet/icplus}/ipg.h            |    0
1991  drivers/net/ethernet/intel/Kconfig                 |  220 +
1992  drivers/net/ethernet/intel/Makefile                |   12 +
1993  drivers/net/{ => ethernet/intel}/e100.c            |    2 +-
1994  drivers/net/{ => ethernet/intel}/e1000/Makefile    |    0
1995  drivers/net/{ => ethernet/intel}/e1000/e1000.h     |    0
1996  .../net/{ => ethernet/intel}/e1000/e1000_ethtool.c |    0
1997  drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c  |    0
1998  drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h  |    0
1999  .../net/{ => ethernet/intel}/e1000/e1000_main.c    |    2 +
2000  .../net/{ => ethernet/intel}/e1000/e1000_osdep.h   |    0
2001  .../net/{ => ethernet/intel}/e1000/e1000_param.c   |    0
2002  .../intel/e1000e/80003es2lan.c}                    |    0
2003  drivers/net/{ => ethernet/intel}/e1000e/82571.c    |    0
2004  drivers/net/{ => ethernet/intel}/e1000e/Makefile   |    2 +-
2005  drivers/net/{ => ethernet/intel}/e1000e/defines.h  |    0
2006  drivers/net/{ => ethernet/intel}/e1000e/e1000.h    |    0
2007  drivers/net/{ => ethernet/intel}/e1000e/ethtool.c  |    0
2008  drivers/net/{ => ethernet/intel}/e1000e/hw.h       |    0
2009  drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c  |    0
2010  drivers/net/{ => ethernet/intel}/e1000e/lib.c      |    0
2011  drivers/net/{ => ethernet/intel}/e1000e/netdev.c   |    2 +-
2012  drivers/net/{ => ethernet/intel}/e1000e/param.c    |    0
2013  drivers/net/{ => ethernet/intel}/e1000e/phy.c      |    0
2014  drivers/net/{ => ethernet/intel}/igb/Makefile      |    0
2015  drivers/net/{ => ethernet/intel}/igb/e1000_82575.c |    0
2016  drivers/net/{ => ethernet/intel}/igb/e1000_82575.h |    0
2017  .../net/{ => ethernet/intel}/igb/e1000_defines.h   |    0
2018  drivers/net/{ => ethernet/intel}/igb/e1000_hw.h    |    0
2019  drivers/net/{ => ethernet/intel}/igb/e1000_mac.c   |    0
2020  drivers/net/{ => ethernet/intel}/igb/e1000_mac.h   |    0
2021  drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c   |    0
2022  drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h   |    0
2023  drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c   |    0
2024  drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h   |    0
2025  drivers/net/{ => ethernet/intel}/igb/e1000_phy.c   |    0
2026  drivers/net/{ => ethernet/intel}/igb/e1000_phy.h   |    0
2027  drivers/net/{ => ethernet/intel}/igb/e1000_regs.h  |    0
2028  drivers/net/{ => ethernet/intel}/igb/igb.h         |    0
2029  drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c |    0
2030  drivers/net/{ => ethernet/intel}/igb/igb_main.c    |    4 +-
2031  drivers/net/{ => ethernet/intel}/igbvf/Makefile    |    0
2032  drivers/net/{ => ethernet/intel}/igbvf/defines.h   |    0
2033  drivers/net/{ => ethernet/intel}/igbvf/ethtool.c   |    0
2034  drivers/net/{ => ethernet/intel}/igbvf/igbvf.h     |    0
2035  drivers/net/{ => ethernet/intel}/igbvf/mbx.c       |    0
2036  drivers/net/{ => ethernet/intel}/igbvf/mbx.h       |    0
2037  drivers/net/{ => ethernet/intel}/igbvf/netdev.c    |    2 +-
2038  drivers/net/{ => ethernet/intel}/igbvf/regs.h      |    0
2039  drivers/net/{ => ethernet/intel}/igbvf/vf.c        |    0
2040  drivers/net/{ => ethernet/intel}/igbvf/vf.h        |    0
2041  drivers/net/{ => ethernet/intel}/ixgb/Makefile     |    0
2042  drivers/net/{ => ethernet/intel}/ixgb/ixgb.h       |    0
2043  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c    |    0
2044  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h    |    0
2045  .../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c   |    0
2046  drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c    |    0
2047  drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h    |    0
2048  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h   |    0
2049  drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c  |    2 +-
2050  drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h |    0
2051  drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c |    0
2052  drivers/net/{ => ethernet/intel}/ixgbe/Makefile    |    0
2053  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h     |    0
2054  .../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c   |    0
2055  .../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c   |    0
2056  .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c  |    0
2057  .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h  |    0
2058  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c |    0
2059  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h |    0
2060  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c   |    0
2061  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h   |    0
2062  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c   |    0
2063  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h   |    0
2064  .../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c  |    0
2065  .../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c |    0
2066  .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c    |    0
2067  .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h    |    0
2068  .../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c    |    4 +-
2069  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c |    0
2070  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h |    0
2071  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c |    0
2072  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h |    0
2073  .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c   |    0
2074  .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h   |    0
2075  .../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h    |    0
2076  .../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c    |    0
2077  drivers/net/{ => ethernet/intel}/ixgbevf/Makefile  |    0
2078  drivers/net/{ => ethernet/intel}/ixgbevf/defines.h |    0
2079  drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c |    0
2080  drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h |    0
2081  .../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c    |    4 +-
2082  drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c     |    0
2083  drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h     |    0
2084  drivers/net/{ => ethernet/intel}/ixgbevf/regs.h    |    0
2085  drivers/net/{ => ethernet/intel}/ixgbevf/vf.c      |    0
2086  drivers/net/{ => ethernet/intel}/ixgbevf/vf.h      |    0
2087  drivers/net/{ => ethernet}/jme.c                   |    2 +-
2088  drivers/net/{ => ethernet}/jme.h                   |    0
2089  drivers/net/{ => ethernet}/korina.c                |    2 +-
2090  drivers/net/{ => ethernet}/lantiq_etop.c           |    2 +-
2091  drivers/net/ethernet/marvell/Kconfig               |  110 +
2092  drivers/net/ethernet/marvell/Makefile              |    8 +
2093  drivers/net/{ => ethernet/marvell}/mv643xx_eth.c   |    2 +
2094  drivers/net/{ => ethernet/marvell}/pxa168_eth.c    |    0
2095  drivers/net/{ => ethernet/marvell}/skge.c          |    2 +-
2096  drivers/net/{ => ethernet/marvell}/skge.h          |    0
2097  drivers/net/{ => ethernet/marvell}/sky2.c          |    4 +-
2098  drivers/net/{ => ethernet/marvell}/sky2.h          |    0
2099  drivers/net/ethernet/mellanox/Kconfig              |   22 +
2100  drivers/net/ethernet/mellanox/Makefile             |    5 +
2101  drivers/net/ethernet/mellanox/mlx4/Kconfig         |   27 +
2102  drivers/net/{ => ethernet/mellanox}/mlx4/Makefile  |    0
2103  drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c   |    0
2104  drivers/net/{ => ethernet/mellanox}/mlx4/catas.c   |    0
2105  drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c     |    0
2106  drivers/net/{ => ethernet/mellanox}/mlx4/cq.c      |    0
2107  drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c   |    0
2108  .../net/{ => ethernet/mellanox}/mlx4/en_ethtool.c  |    0
2109  drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c |    0
2110  .../net/{ => ethernet/mellanox}/mlx4/en_netdev.c   |    2 +-
2111  drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c |    0
2112  drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h |    0
2113  .../{ => ethernet/mellanox}/mlx4/en_resources.c    |    0
2114  drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c   |    0
2115  .../net/{ => ethernet/mellanox}/mlx4/en_selftest.c |    0
2116  drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c   |    0
2117  drivers/net/{ => ethernet/mellanox}/mlx4/eq.c      |    0
2118  drivers/net/{ => ethernet/mellanox}/mlx4/fw.c      |    0
2119  drivers/net/{ => ethernet/mellanox}/mlx4/fw.h      |    0
2120  drivers/net/{ => ethernet/mellanox}/mlx4/icm.c     |    0
2121  drivers/net/{ => ethernet/mellanox}/mlx4/icm.h     |    0
2122  drivers/net/{ => ethernet/mellanox}/mlx4/intf.c    |    0
2123  drivers/net/{ => ethernet/mellanox}/mlx4/main.c    |    0
2124  drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c     |    0
2125  drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h    |    0
2126  drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h |    0
2127  drivers/net/{ => ethernet/mellanox}/mlx4/mr.c      |    0
2128  drivers/net/{ => ethernet/mellanox}/mlx4/pd.c      |    0
2129  drivers/net/{ => ethernet/mellanox}/mlx4/port.c    |    0
2130  drivers/net/{ => ethernet/mellanox}/mlx4/profile.c |    0
2131  drivers/net/{ => ethernet/mellanox}/mlx4/qp.c      |    0
2132  drivers/net/{ => ethernet/mellanox}/mlx4/reset.c   |    0
2133  drivers/net/{ => ethernet/mellanox}/mlx4/sense.c   |    0
2134  drivers/net/{ => ethernet/mellanox}/mlx4/srq.c     |    0
2135  drivers/net/ethernet/micrel/Kconfig                |   64 +
2136  drivers/net/ethernet/micrel/Makefile               |    9 +
2137  drivers/net/{arm => ethernet/micrel}/ks8695net.c   |    2 +-
2138  drivers/net/{arm => ethernet/micrel}/ks8695net.h   |    0
2139  drivers/net/{ => ethernet/micrel}/ks8842.c         |    0
2140  drivers/net/{ => ethernet/micrel}/ks8851.c         |    0
2141  drivers/net/{ => ethernet/micrel}/ks8851.h         |    0
2142  drivers/net/{ => ethernet/micrel}/ks8851_mll.c     |    0
2143  drivers/net/{ => ethernet/micrel}/ksz884x.c        |    0
2144  drivers/net/ethernet/microchip/Kconfig             |   37 +
2145  drivers/net/ethernet/microchip/Makefile            |    5 +
2146  drivers/net/{ => ethernet/microchip}/enc28j60.c    |    2 +-
2147  drivers/net/{ => ethernet/microchip}/enc28j60_hw.h |    0
2148  drivers/net/{ => ethernet}/mipsnet.c               |    2 +-
2149  drivers/net/ethernet/myricom/Kconfig               |   46 +
2150  drivers/net/ethernet/myricom/Makefile              |    5 +
2151  .../net/{ => ethernet/myricom}/myri10ge/Makefile   |    0
2152  .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c |    2 +-
2153  .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h |    0
2154  .../myricom}/myri10ge/myri10ge_mcp_gen_header.h    |    0
2155  drivers/net/ethernet/natsemi/Kconfig               |   82 +
2156  drivers/net/ethernet/natsemi/Makefile              |   10 +
2157  drivers/net/{ => ethernet/natsemi}/ibmlana.c       |    2 +-
2158  drivers/net/{ => ethernet/natsemi}/ibmlana.h       |    0
2159  drivers/net/{ => ethernet/natsemi}/jazzsonic.c     |    2 +-
2160  drivers/net/{ => ethernet/natsemi}/macsonic.c      |    2 +-
2161  drivers/net/{ => ethernet/natsemi}/natsemi.c       |    2 +-
2162  drivers/net/{ => ethernet/natsemi}/ns83820.c       |    2 +-
2163  drivers/net/{ => ethernet/natsemi}/sonic.c         |    0
2164  drivers/net/{ => ethernet/natsemi}/sonic.h         |    0
2165  drivers/net/{ => ethernet/natsemi}/xtsonic.c       |    2 +-
2166  drivers/net/ethernet/neterion/Kconfig              |   54 +
2167  drivers/net/ethernet/neterion/Makefile             |    6 +
2168  drivers/net/{ => ethernet/neterion}/s2io-regs.h    |    0
2169  drivers/net/{ => ethernet/neterion}/s2io.c         |    2 +-
2170  drivers/net/{ => ethernet/neterion}/s2io.h         |    0
2171  drivers/net/{ => ethernet/neterion}/vxge/Makefile  |    0
2172  .../net/{ => ethernet/neterion}/vxge/vxge-config.c |    0
2173  .../net/{ => ethernet/neterion}/vxge/vxge-config.h |    0
2174  .../{ => ethernet/neterion}/vxge/vxge-ethtool.c    |    0
2175  .../{ => ethernet/neterion}/vxge/vxge-ethtool.h    |    0
2176  .../net/{ => ethernet/neterion}/vxge/vxge-main.c   |    2 +-
2177  .../net/{ => ethernet/neterion}/vxge/vxge-main.h   |    0
2178  .../net/{ => ethernet/neterion}/vxge/vxge-reg.h    |    0
2179  .../{ => ethernet/neterion}/vxge/vxge-traffic.c    |    0
2180  .../{ => ethernet/neterion}/vxge/vxge-traffic.h    |    0
2181  .../{ => ethernet/neterion}/vxge/vxge-version.h    |    0
2182  drivers/net/{ => ethernet}/netx-eth.c              |    2 +-
2183  drivers/net/ethernet/nuvoton/Kconfig               |   29 +
2184  drivers/net/ethernet/nuvoton/Makefile              |    5 +
2185  .../net/{arm => ethernet/nuvoton}/w90p910_ether.c  |    2 +-
2186  drivers/net/ethernet/nvidia/Kconfig                |   31 +
2187  drivers/net/ethernet/nvidia/Makefile               |    5 +
2188  drivers/net/{ => ethernet/nvidia}/forcedeth.c      |    4 +-
2189  drivers/net/{ => ethernet}/octeon/Kconfig          |    6 +-
2190  drivers/net/ethernet/octeon/Makefile               |    5 +
2191  drivers/net/{ => ethernet}/octeon/octeon_mgmt.c    |    4 +-
2192  drivers/net/ethernet/oki-semi/Kconfig              |   22 +
2193  drivers/net/ethernet/oki-semi/Makefile             |    5 +
2194  drivers/net/ethernet/oki-semi/pch_gbe/Kconfig      |   20 +
2195  .../net/{ => ethernet/oki-semi}/pch_gbe/Makefile   |    0
2196  .../net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h  |    0
2197  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c  |    0
2198  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h  |    0
2199  .../oki-semi}/pch_gbe/pch_gbe_ethtool.c            |    0
2200  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c |    2 +-
2201  .../oki-semi}/pch_gbe/pch_gbe_param.c              |    0
2202  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c  |    0
2203  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h  |    0
2204  drivers/net/ethernet/packetengines/Kconfig         |   46 +
2205  drivers/net/ethernet/packetengines/Makefile        |    6 +
2206  drivers/net/{ => ethernet/packetengines}/hamachi.c |    2 +-
2207  .../net/{ => ethernet/packetengines}/yellowfin.c   |    2 +-
2208  drivers/net/ethernet/pasemi/Kconfig                |   29 +
2209  drivers/net/ethernet/pasemi/Makefile               |    5 +
2210  drivers/net/{ => ethernet/pasemi}/pasemi_mac.c     |    2 +-
2211  drivers/net/{ => ethernet/pasemi}/pasemi_mac.h     |    0
2212  .../net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c |    0
2213  drivers/net/ethernet/qlogic/Kconfig                |   53 +
2214  drivers/net/ethernet/qlogic/Makefile               |    8 +
2215  drivers/net/{ => ethernet/qlogic}/netxen/Makefile  |    0
2216  .../net/{ => ethernet/qlogic}/netxen/netxen_nic.h  |    6 +
2217  .../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c  |    0
2218  .../qlogic}/netxen/netxen_nic_ethtool.c            |    0
2219  .../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h  |    0
2220  .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c   |    0
2221  .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h   |    0
2222  .../{ => ethernet/qlogic}/netxen/netxen_nic_init.c |    8 +-
2223  .../{ => ethernet/qlogic}/netxen/netxen_nic_main.c |  105 +-
2224  drivers/net/{ => ethernet/qlogic}/qla3xxx.c        |    3 +-
2225  drivers/net/{ => ethernet/qlogic}/qla3xxx.h        |    0
2226  drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile  |    0
2227  drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h  |    6 +-
2228  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c  |    0
2229  .../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c  |   22 +-
2230  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h  |    0
2231  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c   |    4 +-
2232  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c |    3 +-
2233  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c |   42 +-
2234  drivers/net/{ => ethernet/qlogic}/qlge/Makefile    |    0
2235  drivers/net/{ => ethernet/qlogic}/qlge/qlge.h      |    0
2236  drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c  |    0
2237  .../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c  |    0
2238  drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c |    2 +-
2239  drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c  |    0
2240  drivers/net/ethernet/racal/Kconfig                 |   32 +
2241  drivers/net/ethernet/racal/Makefile                |    5 +
2242  drivers/net/{ => ethernet/racal}/ni5010.c          |    2 +-
2243  drivers/net/{ => ethernet/racal}/ni5010.h          |    0
2244  drivers/net/ethernet/rdc/Kconfig                   |   33 +
2245  drivers/net/ethernet/rdc/Makefile                  |    5 +
2246  drivers/net/{ => ethernet/rdc}/r6040.c             |    2 +-
2247  drivers/net/{ => ethernet/realtek}/8139cp.c        |    2 +-
2248  drivers/net/{ => ethernet/realtek}/8139too.c       |    2 +-
2249  drivers/net/ethernet/realtek/Kconfig               |  126 +
2250  drivers/net/ethernet/realtek/Makefile              |    9 +
2251  drivers/net/{ => ethernet/realtek}/atp.c           |    2 +-
2252  drivers/net/{ => ethernet/realtek}/atp.h           |    0
2253  drivers/net/{ => ethernet/realtek}/r8169.c         |    2 +-
2254  drivers/net/{ => ethernet/realtek}/sc92031.c       |    2 +-
2255  drivers/net/ethernet/renesas/Kconfig               |   18 +
2256  drivers/net/ethernet/renesas/Makefile              |    5 +
2257  drivers/net/{ => ethernet/renesas}/sh_eth.c        |    2 +-
2258  drivers/net/{ => ethernet/renesas}/sh_eth.h        |    0
2259  drivers/net/{ => ethernet}/s6gmac.c                |    0
2260  drivers/net/ethernet/seeq/Kconfig                  |   45 +
2261  drivers/net/ethernet/seeq/Makefile                 |    7 +
2262  drivers/net/{arm => ethernet/seeq}/ether3.c        |    2 +-
2263  drivers/net/{arm => ethernet/seeq}/ether3.h        |    0
2264  drivers/net/{ => ethernet/seeq}/seeq8005.c         |    2 +-
2265  drivers/net/{ => ethernet/seeq}/seeq8005.h         |    0
2266  drivers/net/{ => ethernet/seeq}/sgiseeq.c          |    2 +-
2267  drivers/net/{ => ethernet/seeq}/sgiseeq.h          |    0
2268  drivers/net/{ => ethernet}/sfc/Kconfig             |    4 +-
2269  drivers/net/{ => ethernet}/sfc/Makefile            |    0
2270  drivers/net/{ => ethernet}/sfc/bitfield.h          |    0
2271  drivers/net/{ => ethernet}/sfc/efx.c               |    2 +-
2272  drivers/net/{ => ethernet}/sfc/efx.h               |    0
2273  drivers/net/{ => ethernet}/sfc/enum.h              |    0
2274  drivers/net/{ => ethernet}/sfc/ethtool.c           |    0
2275  drivers/net/{ => ethernet}/sfc/falcon.c            |    0
2276  drivers/net/{ => ethernet}/sfc/falcon_boards.c     |    0
2277  drivers/net/{ => ethernet}/sfc/falcon_xmac.c       |    0
2278  drivers/net/{ => ethernet}/sfc/filter.c            |    0
2279  drivers/net/{ => ethernet}/sfc/filter.h            |    0
2280  drivers/net/{ => ethernet}/sfc/io.h                |    0
2281  drivers/net/{ => ethernet}/sfc/mac.h               |    0
2282  drivers/net/{ => ethernet}/sfc/mcdi.c              |    0
2283  drivers/net/{ => ethernet}/sfc/mcdi.h              |    0
2284  drivers/net/{ => ethernet}/sfc/mcdi_mac.c          |    0
2285  drivers/net/{ => ethernet}/sfc/mcdi_pcol.h         |    0
2286  drivers/net/{ => ethernet}/sfc/mcdi_phy.c          |    0
2287  drivers/net/{ => ethernet}/sfc/mdio_10g.c          |    0
2288  drivers/net/{ => ethernet}/sfc/mdio_10g.h          |    0
2289  drivers/net/{ => ethernet}/sfc/mtd.c               |    0
2290  drivers/net/{ => ethernet}/sfc/net_driver.h        |    0
2291  drivers/net/{ => ethernet}/sfc/nic.c               |    0
2292  drivers/net/{ => ethernet}/sfc/nic.h               |    0
2293  drivers/net/{ => ethernet}/sfc/phy.h               |    0
2294  drivers/net/{ => ethernet}/sfc/qt202x_phy.c        |    0
2295  drivers/net/{ => ethernet}/sfc/regs.h              |    0
2296  drivers/net/{ => ethernet}/sfc/rx.c                |    0
2297  drivers/net/{ => ethernet}/sfc/selftest.c          |    0
2298  drivers/net/{ => ethernet}/sfc/selftest.h          |    0
2299  drivers/net/{ => ethernet}/sfc/siena.c             |    0
2300  drivers/net/{ => ethernet}/sfc/spi.h               |    0
2301  drivers/net/{ => ethernet}/sfc/tenxpress.c         |    0
2302  drivers/net/{ => ethernet}/sfc/tx.c                |    0
2303  drivers/net/{ => ethernet}/sfc/txc43128_phy.c      |    0
2304  drivers/net/{ => ethernet}/sfc/workarounds.h       |    0
2305  drivers/net/ethernet/sgi/Kconfig                   |   34 +
2306  drivers/net/ethernet/sgi/Makefile                  |    6 +
2307  drivers/net/{ => ethernet/sgi}/ioc3-eth.c          |    2 +-
2308  drivers/net/{ => ethernet/sgi}/meth.c              |    0
2309  drivers/net/{ => ethernet/sgi}/meth.h              |    0
2310  drivers/net/ethernet/sis/Kconfig                   |   50 +
2311  drivers/net/ethernet/sis/Makefile                  |    6 +
2312  drivers/net/{ => ethernet/sis}/sis190.c            |    2 +-
2313  drivers/net/{ => ethernet/sis}/sis900.c            |    2 +-
2314  drivers/net/{ => ethernet/sis}/sis900.h            |    0
2315  drivers/net/ethernet/smsc/Kconfig                  |  131 +
2316  drivers/net/ethernet/smsc/Makefile                 |   11 +
2317  drivers/net/{ => ethernet/smsc}/epic100.c          |    2 +-
2318  drivers/net/{ => ethernet/smsc}/smc911x.c          |    2 +-
2319  drivers/net/{ => ethernet/smsc}/smc911x.h          |    0
2320  drivers/net/{ => ethernet/smsc}/smc9194.c          |    2 +-
2321  drivers/net/{ => ethernet/smsc}/smc9194.h          |    0
2322  .../net/{pcmcia => ethernet/smsc}/smc91c92_cs.c    |    2 +-
2323  drivers/net/{ => ethernet/smsc}/smc91x.c           |    2 +-
2324  drivers/net/{ => ethernet/smsc}/smc91x.h           |    0
2325  drivers/net/{ => ethernet/smsc}/smsc911x.c         |   87 +-
2326  drivers/net/{ => ethernet/smsc}/smsc911x.h         |    0
2327  drivers/net/{ => ethernet/smsc}/smsc9420.c         |    2 +-
2328  drivers/net/{ => ethernet/smsc}/smsc9420.h         |    0
2329  drivers/net/ethernet/stmicro/Kconfig               |   22 +
2330  drivers/net/ethernet/stmicro/Makefile              |    5 +
2331  drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig  |   14 +-
2332  drivers/net/{ => ethernet/stmicro}/stmmac/Makefile |    0
2333  drivers/net/{ => ethernet/stmicro}/stmmac/common.h |    0
2334  drivers/net/{ => ethernet/stmicro}/stmmac/descs.h  |    0
2335  .../net/{ => ethernet/stmicro}/stmmac/dwmac100.h   |    0
2336  .../net/{ => ethernet/stmicro}/stmmac/dwmac1000.h  |    0
2337  .../{ => ethernet/stmicro}/stmmac/dwmac1000_core.c |    0
2338  .../{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c  |    0
2339  .../{ => ethernet/stmicro}/stmmac/dwmac100_core.c  |    0
2340  .../{ => ethernet/stmicro}/stmmac/dwmac100_dma.c   |    0
2341  .../net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h  |    0
2342  .../net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c  |    0
2343  .../net/{ => ethernet/stmicro}/stmmac/enh_desc.c   |    0
2344  .../net/{ => ethernet/stmicro}/stmmac/norm_desc.c  |    0
2345  drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h |    0
2346  .../{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c |    0
2347  .../{ => ethernet/stmicro}/stmmac/stmmac_main.c    |   13 +-
2348  .../{ => ethernet/stmicro}/stmmac/stmmac_mdio.c    |    0
2349  .../{ => ethernet/stmicro}/stmmac/stmmac_timer.c   |    0
2350  .../{ => ethernet/stmicro}/stmmac/stmmac_timer.h   |    0
2351  drivers/net/ethernet/sun/Kconfig                   |   87 +
2352  drivers/net/ethernet/sun/Makefile                  |   11 +
2353  drivers/net/{ => ethernet/sun}/cassini.c           |    2 +-
2354  drivers/net/{ => ethernet/sun}/cassini.h           |    0
2355  drivers/net/{ => ethernet/sun}/niu.c               |    5 +-
2356  drivers/net/{ => ethernet/sun}/niu.h               |    0
2357  drivers/net/{ => ethernet/sun}/sunbmac.c           |    2 +-
2358  drivers/net/{ => ethernet/sun}/sunbmac.h           |    0
2359  drivers/net/{ => ethernet/sun}/sungem.c            |    6 +-
2360  drivers/net/{ => ethernet/sun}/sungem.h            |    0
2361  drivers/net/{ => ethernet/sun}/sunhme.c            |    2 +-
2362  drivers/net/{ => ethernet/sun}/sunhme.h            |    0
2363  drivers/net/{ => ethernet/sun}/sunqe.c             |    2 +-
2364  drivers/net/{ => ethernet/sun}/sunqe.h             |    0
2365  drivers/net/{ => ethernet/sun}/sunvnet.c           |    2 +-
2366  drivers/net/{ => ethernet/sun}/sunvnet.h           |    0
2367  drivers/net/ethernet/tehuti/Kconfig                |   26 +
2368  drivers/net/ethernet/tehuti/Makefile               |    5 +
2369  drivers/net/{ => ethernet/tehuti}/tehuti.c         |    2 +-
2370  drivers/net/{ => ethernet/tehuti}/tehuti.h         |    0
2371  drivers/net/ethernet/ti/Kconfig                    |   76 +
2372  drivers/net/ethernet/ti/Makefile                   |    9 +
2373  drivers/net/{ => ethernet/ti}/cpmac.c              |    2 +-
2374  drivers/net/{ => ethernet/ti}/davinci_cpdma.c      |    0
2375  drivers/net/{ => ethernet/ti}/davinci_cpdma.h      |    0
2376  drivers/net/{ => ethernet/ti}/davinci_emac.c       |    2 +-
2377  drivers/net/{ => ethernet/ti}/davinci_mdio.c       |    0
2378  drivers/net/{ => ethernet/ti}/tlan.c               |    2 +-
2379  drivers/net/{ => ethernet/ti}/tlan.h               |    0
2380  drivers/net/ethernet/tile/Kconfig                  |   15 +
2381  drivers/net/{ => ethernet}/tile/Makefile           |    0
2382  drivers/net/{ => ethernet}/tile/tilepro.c          |    0
2383  drivers/net/ethernet/toshiba/Kconfig               |   56 +
2384  drivers/net/ethernet/toshiba/Makefile              |   10 +
2385  drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c |    2 +-
2386  drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h |    0
2387  .../{ => ethernet/toshiba}/ps3_gelic_wireless.c    |    2 +-
2388  .../{ => ethernet/toshiba}/ps3_gelic_wireless.h    |    0
2389  drivers/net/{ => ethernet/toshiba}/spider_net.c    |    6 +-
2390  drivers/net/{ => ethernet/toshiba}/spider_net.h    |    2 +-
2391  .../{ => ethernet/toshiba}/spider_net_ethtool.c    |    0
2392  drivers/net/{ => ethernet/toshiba}/tc35815.c       |    2 +-
2393  drivers/net/ethernet/tundra/Kconfig                |   28 +
2394  drivers/net/ethernet/tundra/Makefile               |    5 +
2395  drivers/net/{ => ethernet/tundra}/tsi108_eth.c     |    2 +-
2396  drivers/net/{ => ethernet/tundra}/tsi108_eth.h     |    0
2397  drivers/net/ethernet/via/Kconfig                   |   56 +
2398  drivers/net/ethernet/via/Makefile                  |    6 +
2399  drivers/net/{ => ethernet/via}/via-rhine.c         |    2 +-
2400  drivers/net/{ => ethernet/via}/via-velocity.c      |  148 +-
2401  drivers/net/{ => ethernet/via}/via-velocity.h      |    0
2402  drivers/net/ethernet/xilinx/Kconfig                |   35 +
2403  drivers/net/ethernet/xilinx/Makefile               |    7 +
2404  drivers/net/{ => ethernet/xilinx}/ll_temac.h       |    0
2405  drivers/net/{ => ethernet/xilinx}/ll_temac_main.c  |    1 -
2406  drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c  |    0
2407  .../net/{ => ethernet/xilinx}/xilinx_emaclite.c    |    0
2408  drivers/net/ethernet/xircom/Kconfig                |   30 +
2409  drivers/net/ethernet/xircom/Makefile               |    5 +
2410  .../net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c   |    2 +-
2411  drivers/net/ethernet/xscale/Kconfig                |   31 +
2412  drivers/net/ethernet/xscale/Makefile               |    6 +
2413  drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig  |    2 +-
2414  drivers/net/{ => ethernet/xscale}/ixp2000/Makefile |    0
2415  drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c  |    0
2416  drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h  |    0
2417  .../net/{ => ethernet/xscale}/ixp2000/enp2611.c    |    0
2418  .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.c    |    0
2419  .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.h    |    0
2420  .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc    |    0
2421  .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode |    0
2422  .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc    |    0
2423  .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode |    0
2424  drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c |    0
2425  drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h |    0
2426  .../{ => ethernet/xscale}/ixp2000/ixpdev_priv.h    |    0
2427  drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c |    0
2428  drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h |    0
2429  drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c  |    2 +-
2430  drivers/net/macvlan.c                              |    2 +-
2431  drivers/net/octeon/Makefile                        |    2 -
2432  drivers/net/pci-skeleton.c                         | 1923 ---------
2433  drivers/net/pcmcia/Kconfig                         |   78 -
2434  drivers/net/pcmcia/Makefile                        |    8 -
2435  drivers/net/skfp/skfddi.c                          |    2 +-
2436  drivers/net/slip.c                                 |   29 +-
2437  drivers/net/slip.h                                 |    9 -
2438  drivers/net/sungem_phy.c                           |    7 +-
2439  drivers/net/tokenring/3c359.c                      |    2 +-
2440  drivers/net/tokenring/ibmtr.c                      |    2 +-
2441  drivers/net/tokenring/lanstreamer.c                |    2 +-
2442  drivers/net/tokenring/olympic.c                    |    2 +-
2443  drivers/net/tokenring/smctr.c                      |    2 +-
2444  drivers/net/tokenring/tms380tr.c                   |    2 +-
2445  drivers/net/tun.c                                  |    2 +-
2446  drivers/net/usb/asix.c                             |    6 +-
2447  drivers/net/usb/catc.c                             |    2 +-
2448  drivers/net/usb/dm9601.c                           |    2 +-
2449  drivers/net/usb/int51x1.c                          |    2 +-
2450  drivers/net/usb/kaweth.c                           |    2 +-
2451  drivers/net/usb/lg-vl600.c                         |   19 +
2452  drivers/net/usb/mcs7830.c                          |    2 +-
2453  drivers/net/usb/pegasus.c                          |    2 +-
2454  drivers/net/usb/rtl8150.c                          |    2 +-
2455  drivers/net/usb/smsc75xx.c                         |    2 +-
2456  drivers/net/usb/smsc95xx.c                         |    2 +-
2457  drivers/net/virtio_net.c                           |    1 +
2458  drivers/net/vmxnet3/vmxnet3_drv.c                  |    2 +-
2459  drivers/net/wan/sbni.c                             |    2 +-
2460  drivers/net/wireless/airo.c                        |    4 +-
2461  drivers/net/wireless/hostap/hostap_main.c          |    6 +-
2462  drivers/net/wireless/ipw2x00/ipw2200.c             |    2 +-
2463  drivers/net/wireless/libertas/main.c               |    2 +-
2464  drivers/net/wireless/libertas/mesh.c               |    2 +-
2465  drivers/net/wireless/mwifiex/main.c                |    2 +-
2466  drivers/net/wireless/orinoco/main.c                |    2 +-
2467  drivers/net/wireless/orinoco/orinoco_usb.c         |    2 +-
2468  drivers/net/wireless/ray_cs.c                      |    2 +-
2469  drivers/net/wireless/rndis_wlan.c                  |    2 +-
2470  drivers/net/wireless/zd1201.c                      |    2 +-
2471  drivers/s390/cio/qdio.h                            |   38 +-
2472  drivers/s390/cio/qdio_debug.c                      |    3 +
2473  drivers/s390/cio/qdio_main.c                       |  208 +-
2474  drivers/s390/cio/qdio_setup.c                      |   83 +-
2475  drivers/s390/cio/qdio_thinint.c                    |   88 +-
2476  drivers/s390/net/lcs.c                             |    2 +-
2477  drivers/s390/net/qeth_core.h                       |   50 +-
2478  drivers/s390/net/qeth_core_main.c                  |  777 ++++-
2479  drivers/s390/net/qeth_l2_main.c                    |    4 +-
2480  drivers/s390/net/qeth_l3.h                         |    4 +
2481  drivers/s390/net/qeth_l3_main.c                    |   92 +-
2482  drivers/s390/net/qeth_l3_sys.c                     |  110 +-
2483  drivers/scsi/bnx2fc/Kconfig                        |    3 +-
2484  drivers/scsi/bnx2fc/bnx2fc.h                       |    2 +-
2485  drivers/scsi/bnx2i/Kconfig                         |    3 +-
2486  drivers/scsi/bnx2i/bnx2i.h                         |    2 +-
2487  drivers/scsi/cxgbi/cxgb3i/Kbuild                   |    2 +-
2488  drivers/scsi/cxgbi/cxgb3i/Kconfig                  |    3 +-
2489  drivers/scsi/cxgbi/cxgb4i/Kbuild                   |    2 +-
2490  drivers/scsi/cxgbi/cxgb4i/Kconfig                  |    3 +-
2491  drivers/staging/ath6kl/os/linux/ar6000_drv.c       |    2 +-
2492  drivers/staging/brcm80211/brcmfmac/dhd_linux.c     |    2 +-
2493  drivers/staging/et131x/et131x_netdev.c             |    2 +-
2494  drivers/staging/hv/netvsc_drv.c                    |    2 +-
2495  drivers/staging/octeon/ethernet.c                  |   12 +-
2496  drivers/staging/rtl8187se/r8180_core.c             |    2 +-
2497  drivers/staging/rtl8192e/r8192E_core.c             |    2 +-
2498  drivers/staging/rtl8192u/r8192U_core.c             |    2 +-
2499  drivers/staging/slicoss/slicoss.c                  |    2 +-
2500  drivers/staging/vt6655/device_main.c               |    2 +-
2501  drivers/staging/vt6656/main_usb.c                  |    2 +-
2502  drivers/staging/wlags49_h2/wl_netdev.c             |    2 +-
2503  drivers/staging/wlan-ng/p80211netdev.c             |    2 +-
2504  include/linux/ethtool.h                            |  144 +-
2505  include/linux/if.h                                 |    1 +
2506  include/linux/if_ether.h                           |    1 +
2507  include/linux/netdevice.h                          |    6 +-
2508  include/linux/skbuff.h                             |    5 +-
2509  {drivers/net => include/linux}/sungem_phy.h        |    2 +-
2510  include/net/addrconf.h                             |    2 +-
2511  include/net/dst.h                                  |    9 +-
2512  include/net/if_inet6.h                             |    1 +
2513  include/net/iucv/af_iucv.h                         |   52 +
2514  include/net/iucv/iucv.h                            |   36 +-
2515  include/net/sock.h                                 |   15 +-
2516  net/802/garp.c                                     |    4 +-
2517  net/802/stp.c                                      |    4 +-
2518  net/8021q/vlan.c                                   |    2 +-
2519  net/8021q/vlan_dev.c                               |    1 -
2520  net/atm/lec.c                                      |    2 +-
2521  net/bluetooth/bnep/netdev.c                        |    2 +-
2522  net/bridge/br_device.c                             |    2 +-
2523  net/bridge/netfilter/ebtable_broute.c              |    4 +-
2524  net/caif/cfmuxl.c                                  |    6 +-
2525  net/can/af_can.c                                   |    4 +-
2526  net/core/dev.c                                     |   79 +-
2527  net/core/dev_addr_lists.c                          |    4 +-
2528  net/core/dst.c                                     |   15 +-
2529  net/core/fib_rules.c                               |    4 +-
2530  net/core/filter.c                                  |    2 +-
2531  net/core/neighbour.c                               |   40 +-
2532  net/core/net-sysfs.c                               |    8 +-
2533  net/core/netpoll.c                                 |    4 +-
2534  net/core/rtnetlink.c                               |    1 -
2535  net/core/skbuff.c                                  |    1 +
2536  net/core/sock.c                                    |    4 +-
2537  net/dccp/ccids/ccid2.c                             |   84 +-
2538  net/dccp/ccids/ccid2.h                             |    6 +
2539  net/dccp/dccp.h                                    |    1 +
2540  net/dccp/feat.c                                    |  202 +-
2541  net/dccp/feat.h                                    |    1 +
2542  net/dccp/proto.c                                   |    1 -
2543  net/decnet/dn_dev.c                                |    6 +-
2544  net/dsa/slave.c                                    |    3 -
2545  net/ipv4/devinet.c                                 |    6 +-
2546  net/ipv4/fib_trie.c                                |   12 +-
2547  net/ipv4/gre.c                                     |    4 +-
2548  net/ipv4/igmp.c                                    |   12 +-
2549  net/ipv4/ipip.c                                    |   10 +-
2550  net/ipv4/ipmr.c                                    |    8 +-
2551  net/ipv4/netfilter/nf_nat_amanda.c                 |    4 +-
2552  net/ipv4/netfilter/nf_nat_core.c                   |   24 +-
2553  net/ipv4/netfilter/nf_nat_ftp.c                    |    4 +-
2554  net/ipv4/netfilter/nf_nat_h323.c                   |   36 +-
2555  net/ipv4/netfilter/nf_nat_irc.c                    |    4 +-
2556  net/ipv4/netfilter/nf_nat_pptp.c                   |   16 +-
2557  net/ipv4/netfilter/nf_nat_sip.c                    |   28 +-
2558  net/ipv4/netfilter/nf_nat_snmp_basic.c             |    4 +-
2559  net/ipv4/netfilter/nf_nat_standalone.c             |    6 +-
2560  net/ipv4/netfilter/nf_nat_tftp.c                   |    4 +-
2561  net/ipv4/route.c                                   |    6 +-
2562  net/ipv4/tcp_ipv4.c                                |    6 +-
2563  net/ipv4/udp.c                                     |   11 +-
2564  net/ipv6/addrconf.c                                |   73 +-
2565  net/ipv6/exthdrs.c                                 |    7 +-
2566  net/ipv6/icmp.c                                    |   25 +-
2567  net/ipv6/inet6_connection_sock.c                   |    9 +-
2568  net/ipv6/ip6_tunnel.c                              |   37 +-
2569  net/ipv6/ndisc.c                                   |   31 +-
2570  net/ipv6/raw.c                                     |    8 +-
2571  net/ipv6/sit.c                                     |   12 +-
2572  net/ipv6/tcp_ipv6.c                                |    6 +-
2573  net/ipv6/udp.c                                     |    4 +-
2574  net/irda/irlan/irlan_eth.c                         |    2 +-
2575  net/iucv/Kconfig                                   |   14 +-
2576  net/iucv/af_iucv.c                                 |  868 ++++-
2577  net/iucv/iucv.c                                    |   23 +
2578  net/mac80211/agg-rx.c                              |    4 +-
2579  net/mac80211/cfg.c                                 |    8 +-
2580  net/mac80211/ibss.c                                |    6 +-
2581  net/mac80211/iface.c                               |    6 +-
2582  net/mac80211/mesh_pathtbl.c                        |    4 +-
2583  net/mac80211/sta_info.c                            |    8 +-
2584  net/netfilter/core.c                               |    4 +-
2585  net/netfilter/nf_conntrack_core.c                  |   12 +-
2586  net/netfilter/nf_conntrack_ecache.c                |    8 +-
2587  net/netfilter/nf_conntrack_extend.c                |    4 +-
2588  net/netfilter/nf_conntrack_helper.c                |    6 +-
2589  net/netfilter/nf_conntrack_netlink.c               |    6 +-
2590  net/netfilter/nf_log.c                             |   10 +-
2591  net/netfilter/nf_queue.c                           |    6 +-
2592  net/netfilter/nfnetlink.c                          |    6 +-
2593  net/netlabel/netlabel_domainhash.c                 |    6 +-
2594  net/netlabel/netlabel_unlabeled.c                  |    6 +-
2595  net/netlink/af_netlink.c                           |    2 +-
2596  net/phonet/af_phonet.c                             |    4 +-
2597  net/phonet/pn_dev.c                                |    6 +-
2598  net/phonet/socket.c                                |    6 +-
2599  net/socket.c                                       |    4 +-
2600  net/sunrpc/auth_gss/auth_gss.c                     |    4 +-
2601  net/xfrm/xfrm_user.c                               |    4 +-
2602  1097 files changed, 19262 insertions(+), 18889 deletions(-)
2603  create mode 100644 Documentation/devicetree/bindings/net/smsc911x.txt
2604  delete mode 100644 drivers/net/arm/Kconfig
2605  delete mode 100644 drivers/net/arm/Makefile
2606  delete mode 100644 drivers/net/benet/Kconfig
2607  delete mode 100644 drivers/net/bna/bfi_ctreg.h
2608  delete mode 100644 drivers/net/bna/bfi_ll.h
2609  delete mode 100644 drivers/net/bna/bna_ctrl.c
2610  delete mode 100644 drivers/net/bna/bna_hw.h
2611  delete mode 100644 drivers/net/bna/bna_txrx.c
2612  rename drivers/net/{ => ethernet/3com}/3c501.c (99%)
2613  rename drivers/net/{ => ethernet/3com}/3c501.h (100%)
2614  rename drivers/net/{ => ethernet/3com}/3c509.c (99%)
2615  rename drivers/net/{ => ethernet/3com}/3c515.c (99%)
2616  rename drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c (99%)
2617  rename drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c (99%)
2618  rename drivers/net/{ => ethernet/3com}/3c59x.c (99%)
2619  create mode 100644 drivers/net/ethernet/3com/Kconfig
2620  create mode 100644 drivers/net/ethernet/3com/Makefile
2621  rename drivers/net/{ => ethernet/3com}/typhoon.c (99%)
2622  rename drivers/net/{ => ethernet/3com}/typhoon.h (100%)
2623  rename drivers/net/{ => ethernet/8390}/3c503.c (99%)
2624  rename drivers/net/{ => ethernet/8390}/3c503.h (100%)
2625  rename drivers/net/{ => ethernet/8390}/8390.c (97%)
2626  rename drivers/net/{ => ethernet/8390}/8390.h (100%)
2627  rename drivers/net/{ => ethernet/8390}/8390p.c (97%)
2628  create mode 100644 drivers/net/ethernet/8390/Kconfig
2629  create mode 100644 drivers/net/ethernet/8390/Makefile
2630  rename drivers/net/{ => ethernet/8390}/ac3200.c (99%)
2631  rename drivers/net/{ => ethernet/8390}/apne.c (100%)
2632  rename drivers/net/{ => ethernet/8390}/ax88796.c (99%)
2633  rename drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c (99%)
2634  rename drivers/net/{ => ethernet/8390}/e2100.c (99%)
2635  rename drivers/net/{ => ethernet/8390}/es3210.c (100%)
2636  rename drivers/net/{arm => ethernet/8390}/etherh.c (99%)
2637  rename drivers/net/{ => ethernet/8390}/hp-plus.c (99%)
2638  rename drivers/net/{ => ethernet/8390}/hp.c (100%)
2639  rename drivers/net/{ => ethernet/8390}/hydra.c (99%)
2640  rename drivers/net/{ => ethernet/8390}/lib8390.c (100%)
2641  rename drivers/net/{ => ethernet/8390}/lne390.c (100%)
2642  rename drivers/net/{ => ethernet/8390}/mac8390.c (99%)
2643  rename drivers/net/{ => ethernet/8390}/ne-h8300.c (99%)
2644  rename drivers/net/{ => ethernet/8390}/ne.c (100%)
2645  rename drivers/net/{ => ethernet/8390}/ne2.c (100%)
2646  rename drivers/net/{ => ethernet/8390}/ne2k-pci.c (99%)
2647  rename drivers/net/{ => ethernet/8390}/ne3210.c (100%)
2648  rename drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c (99%)
2649  rename drivers/net/{ => ethernet/8390}/smc-mca.c (99%)
2650  rename drivers/net/{ => ethernet/8390}/smc-ultra.c (99%)
2651  rename drivers/net/{ => ethernet/8390}/smc-ultra32.c (99%)
2652  rename drivers/net/{ => ethernet/8390}/stnic.c (100%)
2653  rename drivers/net/{ => ethernet/8390}/wd.c (99%)
2654  rename drivers/net/{ => ethernet/8390}/zorro8390.c (99%)
2655  create mode 100644 drivers/net/ethernet/Kconfig
2656  create mode 100644 drivers/net/ethernet/Makefile
2657  create mode 100644 drivers/net/ethernet/adaptec/Kconfig
2658  create mode 100644 drivers/net/ethernet/adaptec/Makefile
2659  rename drivers/net/{ => ethernet/adaptec}/starfire.c (99%)
2660  create mode 100644 drivers/net/ethernet/adi/Kconfig
2661  create mode 100644 drivers/net/ethernet/adi/Makefile
2662  rename drivers/net/{ => ethernet/adi}/bfin_mac.c (99%)
2663  rename drivers/net/{ => ethernet/adi}/bfin_mac.h (100%)
2664  create mode 100644 drivers/net/ethernet/aeroflex/Kconfig
2665  create mode 100644 drivers/net/ethernet/aeroflex/Makefile
2666  rename drivers/net/{ => ethernet/aeroflex}/greth.c (99%)
2667  rename drivers/net/{ => ethernet/aeroflex}/greth.h (100%)
2668  create mode 100644 drivers/net/ethernet/alteon/Kconfig
2669  create mode 100644 drivers/net/ethernet/alteon/Makefile
2670  rename drivers/net/{ => ethernet/alteon}/acenic.c (99%)
2671  rename drivers/net/{ => ethernet/alteon}/acenic.h (100%)
2672  rename drivers/net/{ => ethernet/amd}/7990.c (100%)
2673  rename drivers/net/{ => ethernet/amd}/7990.h (100%)
2674  create mode 100644 drivers/net/ethernet/amd/Kconfig
2675  create mode 100644 drivers/net/ethernet/amd/Makefile
2676  rename drivers/net/{ => ethernet/amd}/a2065.c (99%)
2677  rename drivers/net/{ => ethernet/amd}/a2065.h (100%)
2678  rename drivers/net/{arm => ethernet/amd}/am79c961a.c (99%)
2679  rename drivers/net/{arm => ethernet/amd}/am79c961a.h (100%)
2680  rename drivers/net/{ => ethernet/amd}/amd8111e.c (99%)
2681  rename drivers/net/{ => ethernet/amd}/amd8111e.h (100%)
2682  rename drivers/net/{ => ethernet/amd}/ariadne.c (99%)
2683  rename drivers/net/{ => ethernet/amd}/ariadne.h (100%)
2684  rename drivers/net/{ => ethernet/amd}/atarilance.c (99%)
2685  rename drivers/net/{ => ethernet/amd}/au1000_eth.c (99%)
2686  rename drivers/net/{ => ethernet/amd}/au1000_eth.h (100%)
2687  rename drivers/net/{ => ethernet/amd}/declance.c (99%)
2688  rename drivers/net/{ => ethernet/amd}/depca.c (99%)
2689  rename drivers/net/{ => ethernet/amd}/depca.h (100%)
2690  rename drivers/net/{ => ethernet/amd}/hplance.c (99%)
2691  rename drivers/net/{ => ethernet/amd}/hplance.h (100%)
2692  rename drivers/net/{ => ethernet/amd}/lance.c (99%)
2693  rename drivers/net/{ => ethernet/amd}/mvme147.c (99%)
2694  rename drivers/net/{ => ethernet/amd}/ni65.c (99%)
2695  rename drivers/net/{ => ethernet/amd}/ni65.h (100%)
2696  rename drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c (99%)
2697  rename drivers/net/{ => ethernet/amd}/pcnet32.c (99%)
2698  rename drivers/net/{ => ethernet/amd}/sun3lance.c (99%)
2699  rename drivers/net/{ => ethernet/amd}/sunlance.c (99%)
2700  create mode 100644 drivers/net/ethernet/apple/Kconfig
2701  create mode 100644 drivers/net/ethernet/apple/Makefile
2702  rename drivers/net/{ => ethernet/apple}/bmac.c (99%)
2703  rename drivers/net/{ => ethernet/apple}/bmac.h (100%)
2704  rename drivers/net/{ => ethernet/apple}/cs89x0.c (99%)
2705  rename drivers/net/{ => ethernet/apple}/cs89x0.h (100%)
2706  rename drivers/net/{ => ethernet/apple}/mac89x0.c (99%)
2707  rename drivers/net/{ => ethernet/apple}/mace.c (99%)
2708  rename drivers/net/{ => ethernet/apple}/mace.h (100%)
2709  rename drivers/net/{ => ethernet/apple}/macmace.c (99%)
2710  create mode 100644 drivers/net/ethernet/atheros/Kconfig
2711  create mode 100644 drivers/net/ethernet/atheros/Makefile
2712  rename drivers/net/{ => ethernet/atheros}/atl1c/Makefile (100%)
2713  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h (100%)
2714  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_ethtool.c (100%)
2715  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.c (100%)
2716  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.h (100%)
2717  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_main.c (99%)
2718  rename drivers/net/{ => ethernet/atheros}/atl1e/Makefile (100%)
2719  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h (100%)
2720  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_ethtool.c (100%)
2721  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.c (100%)
2722  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.h (100%)
2723  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_main.c (99%)
2724  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_param.c (100%)
2725  rename drivers/net/{ => ethernet/atheros}/atlx/Makefile (100%)
2726  rename drivers/net/{ => ethernet/atheros}/atlx/atl1.c (99%)
2727  rename drivers/net/{ => ethernet/atheros}/atlx/atl1.h (100%)
2728  rename drivers/net/{ => ethernet/atheros}/atlx/atl2.c (99%)
2729  rename drivers/net/{ => ethernet/atheros}/atlx/atl2.h (100%)
2730  rename drivers/net/{ => ethernet/atheros}/atlx/atlx.c (100%)
2731  rename drivers/net/{ => ethernet/atheros}/atlx/atlx.h (100%)
2732  create mode 100644 drivers/net/ethernet/broadcom/Kconfig
2733  create mode 100644 drivers/net/ethernet/broadcom/Makefile
2734  rename drivers/net/{ => ethernet/broadcom}/b44.c (99%)
2735  rename drivers/net/{ => ethernet/broadcom}/b44.h (100%)
2736  rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c (99%)
2737  rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h (100%)
2738  rename drivers/net/{ => ethernet/broadcom}/bnx2.c (99%)
2739  rename drivers/net/{ => ethernet/broadcom}/bnx2.h (100%)
2740  rename drivers/net/{ => ethernet/broadcom}/bnx2_fw.h (100%)
2741  rename drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile (100%)
2742  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h (98%)
2743  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c (98%)
2744  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h (99%)
2745  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c (99%)
2746  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h (100%)
2747  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h (100%)
2748  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c (99%)
2749  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h (100%)
2750  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_file_hdr.h (100%)
2751  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h (100%)
2752  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h (100%)
2753  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h (100%)
2754  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c (99%)
2755  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h (100%)
2756  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c (99%)
2757  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h (100%)
2758  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c (98%)
2759  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h (100%)
2760  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c (98%)
2761  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h (100%)
2762  rename drivers/net/{ => ethernet/broadcom}/cnic.c (99%)
2763  rename drivers/net/{ => ethernet/broadcom}/cnic.h (100%)
2764  rename drivers/net/{ => ethernet/broadcom}/cnic_defs.h (100%)
2765  rename drivers/net/{ => ethernet/broadcom}/cnic_if.h (100%)
2766  rename drivers/net/{ => ethernet/broadcom}/sb1250-mac.c (99%)
2767  rename drivers/net/{ => ethernet/broadcom}/tg3.c (99%)
2768  rename drivers/net/{ => ethernet/broadcom}/tg3.h (100%)
2769  create mode 100644 drivers/net/ethernet/brocade/Kconfig
2770  create mode 100644 drivers/net/ethernet/brocade/Makefile
2771  create mode 100644 drivers/net/ethernet/brocade/bna/Kconfig
2772  rename drivers/net/{ => ethernet/brocade}/bna/Makefile (52%)
2773  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c (98%)
2774  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h (100%)
2775  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h (100%)
2776  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h (92%)
2777  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_cna.h (100%)
2778  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h (89%)
2779  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_status.h (100%)
2780  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c (87%)
2781  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h (88%)
2782  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c (76%)
2783  create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.c
2784  create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.h
2785  rename drivers/net/{ => ethernet/brocade}/bna/bfi.h (70%)
2786  rename drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h (100%)
2787  create mode 100644 drivers/net/ethernet/brocade/bna/bfi_enet.h
2788  create mode 100644 drivers/net/ethernet/brocade/bna/bfi_reg.h
2789  rename drivers/net/{ => ethernet/brocade}/bna/bna.h (67%)
2790  create mode 100644 drivers/net/ethernet/brocade/bna/bna_enet.c
2791  create mode 100644 drivers/net/ethernet/brocade/bna/bna_hw_defs.h
2792  create mode 100644 drivers/net/ethernet/brocade/bna/bna_tx_rx.c
2793  rename drivers/net/{ => ethernet/brocade}/bna/bna_types.h (58%)
2794  rename drivers/net/{ => ethernet/brocade}/bna/bnad.c (85%)
2795  rename drivers/net/{ => ethernet/brocade}/bna/bnad.h (89%)
2796  rename drivers/net/{ => ethernet/brocade}/bna/bnad_ethtool.c (67%)
2797  rename drivers/net/{ => ethernet/brocade}/bna/cna.h (68%)
2798  rename drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c (100%)
2799  create mode 100644 drivers/net/ethernet/cadence/Kconfig
2800  create mode 100644 drivers/net/ethernet/cadence/Makefile
2801  rename drivers/net/{arm => ethernet/cadence}/at91_ether.c (99%)
2802  rename drivers/net/{arm => ethernet/cadence}/at91_ether.h (100%)
2803  rename drivers/net/{ => ethernet/cadence}/macb.c (99%)
2804  rename drivers/net/{ => ethernet/cadence}/macb.h (100%)
2805  create mode 100644 drivers/net/ethernet/chelsio/Kconfig
2806  create mode 100644 drivers/net/ethernet/chelsio/Makefile
2807  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/Makefile (100%)
2808  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/common.h (100%)
2809  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cphy.h (100%)
2810  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h (100%)
2811  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c (99%)
2812  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/elmer0.h (100%)
2813  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.c (100%)
2814  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.h (100%)
2815  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h (100%)
2816  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/gmac.h (100%)
2817  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c (100%)
2818  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h (100%)
2819  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c (100%)
2820  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/my3126.c (100%)
2821  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/pm3393.c (100%)
2822  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/regs.h (100%)
2823  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.c (100%)
2824  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.h (100%)
2825  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/subr.c (100%)
2826  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/suni1x10gexp_regs.h (100%)
2827  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.c (100%)
2828  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.h (100%)
2829  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326.c (100%)
2830  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326_reg.h (100%)
2831  rename drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile (100%)
2832  rename drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h (100%)
2833  rename drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c (100%)
2834  rename drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c (100%)
2835  rename drivers/net/{ => ethernet/chelsio}/cxgb3/common.h (100%)
2836  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h (100%)
2837  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h (100%)
2838  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h (100%)
2839  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c (99%)
2840  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c (100%)
2841  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h (100%)
2842  rename drivers/net/{ => ethernet/chelsio}/cxgb3/firmware_exports.h (100%)
2843  rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c (100%)
2844  rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h (100%)
2845  rename drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c (100%)
2846  rename drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h (100%)
2847  rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c (100%)
2848  rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge_defs.h (100%)
2849  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h (100%)
2850  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c (100%)
2851  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h (100%)
2852  rename drivers/net/{ => ethernet/chelsio}/cxgb3/version.h (100%)
2853  rename drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c (100%)
2854  rename drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c (100%)
2855  rename drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile (100%)
2856  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h (100%)
2857  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c (99%)
2858  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h (100%)
2859  rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c (100%)
2860  rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h (100%)
2861  rename drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c (100%)
2862  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c (100%)
2863  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h (100%)
2864  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h (100%)
2865  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h (100%)
2866  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h (100%)
2867  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/Makefile (100%)
2868  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/adapter.h (100%)
2869  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c (99%)
2870  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c (100%)
2871  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h (100%)
2872  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h (100%)
2873  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c (100%)
2874  create mode 100644 drivers/net/ethernet/cirrus/Kconfig
2875  create mode 100644 drivers/net/ethernet/cirrus/Makefile
2876  rename drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c (100%)
2877  create mode 100644 drivers/net/ethernet/cisco/Kconfig
2878  create mode 100644 drivers/net/ethernet/cisco/Makefile
2879  create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig
2880  rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%)
2881  rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%)
2882  rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%)
2883  rename drivers/net/{ => ethernet/cisco}/enic/enic.h (100%)
2884  rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%)
2885  rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (100%)
2886  rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (99%)
2887  rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (100%)
2888  rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (100%)
2889  rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%)
2890  rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%)
2891  rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%)
2892  rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%)
2893  rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%)
2894  rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (100%)
2895  rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (100%)
2896  rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%)
2897  rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%)
2898  rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%)
2899  rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%)
2900  rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%)
2901  rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%)
2902  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%)
2903  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%)
2904  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%)
2905  rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%)
2906  rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%)
2907  rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%)
2908  rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%)
2909  rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%)
2910  rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%)
2911  create mode 100644 drivers/net/ethernet/davicom/Kconfig
2912  create mode 100644 drivers/net/ethernet/davicom/Makefile
2913  rename drivers/net/{ => ethernet/davicom}/dm9000.c (99%)
2914  rename drivers/net/{ => ethernet/davicom}/dm9000.h (100%)
2915  create mode 100644 drivers/net/ethernet/dec/Kconfig
2916  create mode 100644 drivers/net/ethernet/dec/Makefile
2917  rename drivers/net/{ => ethernet/dec}/ewrk3.c (99%)
2918  rename drivers/net/{ => ethernet/dec}/ewrk3.h (100%)
2919  rename drivers/net/{ => ethernet/dec}/tulip/21142.c (100%)
2920  rename drivers/net/{ => ethernet/dec}/tulip/Kconfig (96%)
2921  rename drivers/net/{ => ethernet/dec}/tulip/Makefile (100%)
2922  rename drivers/net/{ => ethernet/dec}/tulip/de2104x.c (99%)
2923  rename drivers/net/{ => ethernet/dec}/tulip/de4x5.c (99%)
2924  rename drivers/net/{ => ethernet/dec}/tulip/de4x5.h (100%)
2925  rename drivers/net/{ => ethernet/dec}/tulip/dmfe.c (99%)
2926  rename drivers/net/{ => ethernet/dec}/tulip/eeprom.c (100%)
2927  rename drivers/net/{ => ethernet/dec}/tulip/interrupt.c (100%)
2928  rename drivers/net/{ => ethernet/dec}/tulip/media.c (100%)
2929  rename drivers/net/{ => ethernet/dec}/tulip/pnic.c (100%)
2930  rename drivers/net/{ => ethernet/dec}/tulip/pnic2.c (100%)
2931  rename drivers/net/{ => ethernet/dec}/tulip/timer.c (100%)
2932  rename drivers/net/{ => ethernet/dec}/tulip/tulip.h (100%)
2933  rename drivers/net/{ => ethernet/dec}/tulip/tulip_core.c (99%)
2934  rename drivers/net/{ => ethernet/dec}/tulip/uli526x.c (99%)
2935  rename drivers/net/{ => ethernet/dec}/tulip/winbond-840.c (99%)
2936  rename drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c (100%)
2937  create mode 100644 drivers/net/ethernet/dlink/Kconfig
2938  create mode 100644 drivers/net/ethernet/dlink/Makefile
2939  rename drivers/net/{ => ethernet/dlink}/de600.c (100%)
2940  rename drivers/net/{ => ethernet/dlink}/de600.h (100%)
2941  rename drivers/net/{ => ethernet/dlink}/de620.c (99%)
2942  rename drivers/net/{ => ethernet/dlink}/de620.h (100%)
2943  rename drivers/net/{ => ethernet/dlink}/dl2k.c (99%)
2944  rename drivers/net/{ => ethernet/dlink}/dl2k.h (100%)
2945  rename drivers/net/{ => ethernet/dlink}/sundance.c (99%)
2946  rename drivers/net/{ => ethernet}/dnet.c (100%)
2947  rename drivers/net/{ => ethernet}/dnet.h (100%)
2948  create mode 100644 drivers/net/ethernet/emulex/Kconfig
2949  create mode 100644 drivers/net/ethernet/emulex/Makefile
2950  create mode 100644 drivers/net/ethernet/emulex/benet/Kconfig
2951  rename drivers/net/{ => ethernet/emulex}/benet/Makefile (100%)
2952  rename drivers/net/{ => ethernet/emulex}/benet/be.h (85%)
2953  rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.c (94%)
2954  rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.h (95%)
2955  rename drivers/net/{ => ethernet/emulex}/benet/be_ethtool.c (85%)
2956  rename drivers/net/{ => ethernet/emulex}/benet/be_hw.h (94%)
2957  rename drivers/net/{ => ethernet/emulex}/benet/be_main.c (91%)
2958  rename drivers/net/{ => ethernet}/ethoc.c (99%)
2959  create mode 100644 drivers/net/ethernet/faraday/Kconfig
2960  create mode 100644 drivers/net/ethernet/faraday/Makefile
2961  rename drivers/net/{ => ethernet/faraday}/ftgmac100.c (100%)
2962  rename drivers/net/{ => ethernet/faraday}/ftgmac100.h (100%)
2963  rename drivers/net/{ => ethernet/faraday}/ftmac100.c (100%)
2964  rename drivers/net/{ => ethernet/faraday}/ftmac100.h (100%)
2965  rename drivers/net/{ => ethernet}/fealnx.c (99%)
2966  create mode 100644 drivers/net/ethernet/freescale/Kconfig
2967  create mode 100644 drivers/net/ethernet/freescale/Makefile
2968  rename drivers/net/{ => ethernet/freescale}/fec.c (99%)
2969  rename drivers/net/{ => ethernet/freescale}/fec.h (100%)
2970  rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c (99%)
2971  rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h (100%)
2972  rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx_phy.c (100%)
2973  rename drivers/net/{ => ethernet/freescale}/fs_enet/Kconfig (91%)
2974  rename drivers/net/{ => ethernet/freescale}/fs_enet/Makefile (100%)
2975  rename drivers/net/{ => ethernet/freescale}/fs_enet/fec.h (100%)
2976  rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet-main.c (99%)
2977  rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet.h (100%)
2978  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fcc.c (100%)
2979  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fec.c (100%)
2980  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-scc.c (100%)
2981  rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-bitbang.c (100%)
2982  rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-fec.c (100%)
2983  rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c (100%)
2984  rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h (100%)
2985  rename drivers/net/{ => ethernet/freescale}/gianfar.c (99%)
2986  rename drivers/net/{ => ethernet/freescale}/gianfar.h (100%)
2987  rename drivers/net/{ => ethernet/freescale}/gianfar_ethtool.c (100%)
2988  rename drivers/net/{ => ethernet/freescale}/gianfar_ptp.c (100%)
2989  rename drivers/net/{ => ethernet/freescale}/gianfar_sysfs.c (100%)
2990  rename drivers/net/{ => ethernet/freescale}/ucc_geth.c (99%)
2991  rename drivers/net/{ => ethernet/freescale}/ucc_geth.h (100%)
2992  rename drivers/net/{ => ethernet/freescale}/ucc_geth_ethtool.c (100%)
2993  create mode 100644 drivers/net/ethernet/fujitsu/Kconfig
2994  create mode 100644 drivers/net/ethernet/fujitsu/Makefile
2995  rename drivers/net/{ => ethernet/fujitsu}/at1700.c (99%)
2996  rename drivers/net/{ => ethernet/fujitsu}/eth16i.c (99%)
2997  rename drivers/net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c (99%)
2998  create mode 100644 drivers/net/ethernet/hp/Kconfig
2999  create mode 100644 drivers/net/ethernet/hp/Makefile
3000  rename drivers/net/{ => ethernet/hp}/hp100.c (99%)
3001  rename drivers/net/{ => ethernet/hp}/hp100.h (100%)
3002  rename drivers/net/{ => ethernet/i825xx}/3c505.c (99%)
3003  rename drivers/net/{ => ethernet/i825xx}/3c505.h (100%)
3004  rename drivers/net/{ => ethernet/i825xx}/3c507.c (100%)
3005  rename drivers/net/{ => ethernet/i825xx}/3c523.c (99%)
3006  rename drivers/net/{ => ethernet/i825xx}/3c523.h (100%)
3007  rename drivers/net/{ => ethernet/i825xx}/3c527.c (99%)
3008  rename drivers/net/{ => ethernet/i825xx}/3c527.h (100%)
3009  rename drivers/net/{ => ethernet/i825xx}/82596.c (99%)
3010  create mode 100644 drivers/net/ethernet/i825xx/Kconfig
3011  create mode 100644 drivers/net/ethernet/i825xx/Makefile
3012  rename drivers/net/{ => ethernet/i825xx}/eepro.c (99%)
3013  rename drivers/net/{ => ethernet/i825xx}/eexpress.c (99%)
3014  rename drivers/net/{ => ethernet/i825xx}/eexpress.h (100%)
3015  rename drivers/net/{arm => ethernet/i825xx}/ether1.c (99%)
3016  rename drivers/net/{arm => ethernet/i825xx}/ether1.h (100%)
3017  rename drivers/net/{ => ethernet/i825xx}/lasi_82596.c (100%)
3018  rename drivers/net/{ => ethernet/i825xx}/lib82596.c (99%)
3019  rename drivers/net/{ => ethernet/i825xx}/lp486e.c (99%)
3020  rename drivers/net/{ => ethernet/i825xx}/ni52.c (99%)
3021  rename drivers/net/{ => ethernet/i825xx}/ni52.h (100%)
3022  rename drivers/net/{ => ethernet/i825xx}/sni_82596.c (100%)
3023  rename drivers/net/{ => ethernet/i825xx}/sun3_82586.c (99%)
3024  rename drivers/net/{ => ethernet/i825xx}/sun3_82586.h (100%)
3025  rename drivers/net/{ => ethernet/i825xx}/znet.c (99%)
3026  create mode 100644 drivers/net/ethernet/ibm/Kconfig
3027  create mode 100644 drivers/net/ethernet/ibm/Makefile
3028  rename drivers/net/{ => ethernet/ibm}/ehea/Makefile (100%)
3029  rename drivers/net/{ => ethernet/ibm}/ehea/ehea.h (100%)
3030  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c (100%)
3031  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h (100%)
3032  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c (99%)
3033  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c (100%)
3034  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h (100%)
3035  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c (100%)
3036  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h (100%)
3037  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Kconfig (63%)
3038  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Makefile (100%)
3039  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.c (99%)
3040  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.h (100%)
3041  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.c (100%)
3042  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.h (100%)
3043  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/emac.h (100%)
3044  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.c (100%)
3045  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.h (100%)
3046  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.c (100%)
3047  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.h (100%)
3048  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c (100%)
3049  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h (100%)
3050  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.c (100%)
3051  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.h (100%)
3052  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.c (100%)
3053  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.h (100%)
3054  rename drivers/net/{ => ethernet/ibm}/ibmveth.c (99%)
3055  rename drivers/net/{ => ethernet/ibm}/ibmveth.h (100%)
3056  rename drivers/net/{ => ethernet/ibm}/iseries_veth.c (99%)
3057  create mode 100644 drivers/net/ethernet/icplus/Kconfig
3058  create mode 100644 drivers/net/ethernet/icplus/Makefile
3059  rename drivers/net/{ => ethernet/icplus}/ipg.c (92%)
3060  rename drivers/net/{ => ethernet/icplus}/ipg.h (100%)
3061  create mode 100644 drivers/net/ethernet/intel/Kconfig
3062  create mode 100644 drivers/net/ethernet/intel/Makefile
3063  rename drivers/net/{ => ethernet/intel}/e100.c (99%)
3064  rename drivers/net/{ => ethernet/intel}/e1000/Makefile (100%)
3065  rename drivers/net/{ => ethernet/intel}/e1000/e1000.h (100%)
3066  rename drivers/net/{ => ethernet/intel}/e1000/e1000_ethtool.c (100%)
3067  rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c (100%)
3068  rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h (100%)
3069  rename drivers/net/{ => ethernet/intel}/e1000/e1000_main.c (99%)
3070  rename drivers/net/{ => ethernet/intel}/e1000/e1000_osdep.h (100%)
3071  rename drivers/net/{ => ethernet/intel}/e1000/e1000_param.c (100%)
3072  rename drivers/net/{e1000e/es2lan.c => ethernet/intel/e1000e/80003es2lan.c} (100%)
3073  rename drivers/net/{ => ethernet/intel}/e1000e/82571.c (100%)
3074  rename drivers/net/{ => ethernet/intel}/e1000e/Makefile (96%)
3075  rename drivers/net/{ => ethernet/intel}/e1000e/defines.h (100%)
3076  rename drivers/net/{ => ethernet/intel}/e1000e/e1000.h (100%)
3077  rename drivers/net/{ => ethernet/intel}/e1000e/ethtool.c (100%)
3078  rename drivers/net/{ => ethernet/intel}/e1000e/hw.h (100%)
3079  rename drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c (100%)
3080  rename drivers/net/{ => ethernet/intel}/e1000e/lib.c (100%)
3081  rename drivers/net/{ => ethernet/intel}/e1000e/netdev.c (99%)
3082  rename drivers/net/{ => ethernet/intel}/e1000e/param.c (100%)
3083  rename drivers/net/{ => ethernet/intel}/e1000e/phy.c (100%)
3084  rename drivers/net/{ => ethernet/intel}/igb/Makefile (100%)
3085  rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.c (100%)
3086  rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.h (100%)
3087  rename drivers/net/{ => ethernet/intel}/igb/e1000_defines.h (100%)
3088  rename drivers/net/{ => ethernet/intel}/igb/e1000_hw.h (100%)
3089  rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.c (100%)
3090  rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.h (100%)
3091  rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c (100%)
3092  rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h (100%)
3093  rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c (100%)
3094  rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h (100%)
3095  rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.c (100%)
3096  rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.h (100%)
3097  rename drivers/net/{ => ethernet/intel}/igb/e1000_regs.h (100%)
3098  rename drivers/net/{ => ethernet/intel}/igb/igb.h (100%)
3099  rename drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c (100%)
3100  rename drivers/net/{ => ethernet/intel}/igb/igb_main.c (99%)
3101  rename drivers/net/{ => ethernet/intel}/igbvf/Makefile (100%)
3102  rename drivers/net/{ => ethernet/intel}/igbvf/defines.h (100%)
3103  rename drivers/net/{ => ethernet/intel}/igbvf/ethtool.c (100%)
3104  rename drivers/net/{ => ethernet/intel}/igbvf/igbvf.h (100%)
3105  rename drivers/net/{ => ethernet/intel}/igbvf/mbx.c (100%)
3106  rename drivers/net/{ => ethernet/intel}/igbvf/mbx.h (100%)
3107  rename drivers/net/{ => ethernet/intel}/igbvf/netdev.c (99%)
3108  rename drivers/net/{ => ethernet/intel}/igbvf/regs.h (100%)
3109  rename drivers/net/{ => ethernet/intel}/igbvf/vf.c (100%)
3110  rename drivers/net/{ => ethernet/intel}/igbvf/vf.h (100%)
3111  rename drivers/net/{ => ethernet/intel}/ixgb/Makefile (100%)
3112  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb.h (100%)
3113  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c (100%)
3114  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h (100%)
3115  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c (100%)
3116  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c (100%)
3117  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h (100%)
3118  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h (100%)
3119  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c (99%)
3120  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h (100%)
3121  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c (100%)
3122  rename drivers/net/{ => ethernet/intel}/ixgbe/Makefile (100%)
3123  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h (100%)
3124  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c (100%)
3125  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c (100%)
3126  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.c (100%)
3127  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.h (100%)
3128  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c (100%)
3129  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h (100%)
3130  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c (100%)
3131  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h (100%)
3132  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c (100%)
3133  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h (100%)
3134  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c (100%)
3135  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c (100%)
3136  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c (100%)
3137  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h (100%)
3138  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_main.c (99%)
3139  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c (100%)
3140  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h (100%)
3141  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c (100%)
3142  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h (100%)
3143  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c (100%)
3144  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h (100%)
3145  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_type.h (100%)
3146  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c (100%)
3147  rename drivers/net/{ => ethernet/intel}/ixgbevf/Makefile (100%)
3148  rename drivers/net/{ => ethernet/intel}/ixgbevf/defines.h (100%)
3149  rename drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c (100%)
3150  rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h (100%)
3151  rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf_main.c (99%)
3152  rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c (100%)
3153  rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h (100%)
3154  rename drivers/net/{ => ethernet/intel}/ixgbevf/regs.h (100%)
3155  rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.c (100%)
3156  rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.h (100%)
3157  rename drivers/net/{ => ethernet}/jme.c (99%)
3158  rename drivers/net/{ => ethernet}/jme.h (100%)
3159  rename drivers/net/{ => ethernet}/korina.c (99%)
3160  rename drivers/net/{ => ethernet}/lantiq_etop.c (99%)
3161  create mode 100644 drivers/net/ethernet/marvell/Kconfig
3162  create mode 100644 drivers/net/ethernet/marvell/Makefile
3163  rename drivers/net/{ => ethernet/marvell}/mv643xx_eth.c (99%)
3164  rename drivers/net/{ => ethernet/marvell}/pxa168_eth.c (100%)
3165  rename drivers/net/{ => ethernet/marvell}/skge.c (99%)
3166  rename drivers/net/{ => ethernet/marvell}/skge.h (100%)
3167  rename drivers/net/{ => ethernet/marvell}/sky2.c (99%)
3168  rename drivers/net/{ => ethernet/marvell}/sky2.h (100%)
3169  create mode 100644 drivers/net/ethernet/mellanox/Kconfig
3170  create mode 100644 drivers/net/ethernet/mellanox/Makefile
3171  create mode 100644 drivers/net/ethernet/mellanox/mlx4/Kconfig
3172  rename drivers/net/{ => ethernet/mellanox}/mlx4/Makefile (100%)
3173  rename drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c (100%)
3174  rename drivers/net/{ => ethernet/mellanox}/mlx4/catas.c (100%)
3175  rename drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c (100%)
3176  rename drivers/net/{ => ethernet/mellanox}/mlx4/cq.c (100%)
3177  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c (100%)
3178  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_ethtool.c (100%)
3179  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c (100%)
3180  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_netdev.c (99%)
3181  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c (100%)
3182  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h (100%)
3183  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_resources.c (100%)
3184  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c (100%)
3185  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_selftest.c (100%)
3186  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c (100%)
3187  rename drivers/net/{ => ethernet/mellanox}/mlx4/eq.c (100%)
3188  rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.c (100%)
3189  rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.h (100%)
3190  rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.c (100%)
3191  rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.h (100%)
3192  rename drivers/net/{ => ethernet/mellanox}/mlx4/intf.c (100%)
3193  rename drivers/net/{ => ethernet/mellanox}/mlx4/main.c (100%)
3194  rename drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c (100%)
3195  rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h (100%)
3196  rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h (100%)
3197  rename drivers/net/{ => ethernet/mellanox}/mlx4/mr.c (100%)
3198  rename drivers/net/{ => ethernet/mellanox}/mlx4/pd.c (100%)
3199  rename drivers/net/{ => ethernet/mellanox}/mlx4/port.c (100%)
3200  rename drivers/net/{ => ethernet/mellanox}/mlx4/profile.c (100%)
3201  rename drivers/net/{ => ethernet/mellanox}/mlx4/qp.c (100%)
3202  rename drivers/net/{ => ethernet/mellanox}/mlx4/reset.c (100%)
3203  rename drivers/net/{ => ethernet/mellanox}/mlx4/sense.c (100%)
3204  rename drivers/net/{ => ethernet/mellanox}/mlx4/srq.c (100%)
3205  create mode 100644 drivers/net/ethernet/micrel/Kconfig
3206  create mode 100644 drivers/net/ethernet/micrel/Makefile
3207  rename drivers/net/{arm => ethernet/micrel}/ks8695net.c (99%)
3208  rename drivers/net/{arm => ethernet/micrel}/ks8695net.h (100%)
3209  rename drivers/net/{ => ethernet/micrel}/ks8842.c (100%)
3210  rename drivers/net/{ => ethernet/micrel}/ks8851.c (100%)
3211  rename drivers/net/{ => ethernet/micrel}/ks8851.h (100%)
3212  rename drivers/net/{ => ethernet/micrel}/ks8851_mll.c (100%)
3213  rename drivers/net/{ => ethernet/micrel}/ksz884x.c (100%)
3214  create mode 100644 drivers/net/ethernet/microchip/Kconfig
3215  create mode 100644 drivers/net/ethernet/microchip/Makefile
3216  rename drivers/net/{ => ethernet/microchip}/enc28j60.c (99%)
3217  rename drivers/net/{ => ethernet/microchip}/enc28j60_hw.h (100%)
3218  rename drivers/net/{ => ethernet}/mipsnet.c (99%)
3219  create mode 100644 drivers/net/ethernet/myricom/Kconfig
3220  create mode 100644 drivers/net/ethernet/myricom/Makefile
3221  rename drivers/net/{ => ethernet/myricom}/myri10ge/Makefile (100%)
3222  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge.c (99%)
3223  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h (100%)
3224  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp_gen_header.h (100%)
3225  create mode 100644 drivers/net/ethernet/natsemi/Kconfig
3226  create mode 100644 drivers/net/ethernet/natsemi/Makefile
3227  rename drivers/net/{ => ethernet/natsemi}/ibmlana.c (99%)
3228  rename drivers/net/{ => ethernet/natsemi}/ibmlana.h (100%)
3229  rename drivers/net/{ => ethernet/natsemi}/jazzsonic.c (99%)
3230  rename drivers/net/{ => ethernet/natsemi}/macsonic.c (99%)
3231  rename drivers/net/{ => ethernet/natsemi}/natsemi.c (99%)
3232  rename drivers/net/{ => ethernet/natsemi}/ns83820.c (99%)
3233  rename drivers/net/{ => ethernet/natsemi}/sonic.c (100%)
3234  rename drivers/net/{ => ethernet/natsemi}/sonic.h (100%)
3235  rename drivers/net/{ => ethernet/natsemi}/xtsonic.c (99%)
3236  create mode 100644 drivers/net/ethernet/neterion/Kconfig
3237  create mode 100644 drivers/net/ethernet/neterion/Makefile
3238  rename drivers/net/{ => ethernet/neterion}/s2io-regs.h (100%)
3239  rename drivers/net/{ => ethernet/neterion}/s2io.c (99%)
3240  rename drivers/net/{ => ethernet/neterion}/s2io.h (100%)
3241  rename drivers/net/{ => ethernet/neterion}/vxge/Makefile (100%)
3242  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.c (100%)
3243  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.h (100%)
3244  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.c (100%)
3245  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.h (100%)
3246  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.c (99%)
3247  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.h (100%)
3248  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-reg.h (100%)
3249  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.c (100%)
3250  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.h (100%)
3251  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-version.h (100%)
3252  rename drivers/net/{ => ethernet}/netx-eth.c (99%)
3253  create mode 100644 drivers/net/ethernet/nuvoton/Kconfig
3254  create mode 100644 drivers/net/ethernet/nuvoton/Makefile
3255  rename drivers/net/{arm => ethernet/nuvoton}/w90p910_ether.c (99%)
3256  create mode 100644 drivers/net/ethernet/nvidia/Kconfig
3257  create mode 100644 drivers/net/ethernet/nvidia/Makefile
3258  rename drivers/net/{ => ethernet/nvidia}/forcedeth.c (99%)
3259  rename drivers/net/{ => ethernet}/octeon/Kconfig (85%)
3260  create mode 100644 drivers/net/ethernet/octeon/Makefile
3261  rename drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (99%)
3262  create mode 100644 drivers/net/ethernet/oki-semi/Kconfig
3263  create mode 100644 drivers/net/ethernet/oki-semi/Makefile
3264  create mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
3265  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/Makefile (100%)
3266  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h (100%)
3267  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c (100%)
3268  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h (100%)
3269  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_ethtool.c (100%)
3270  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c (99%)
3271  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_param.c (100%)
3272  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c (100%)
3273  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h (100%)
3274  create mode 100644 drivers/net/ethernet/packetengines/Kconfig
3275  create mode 100644 drivers/net/ethernet/packetengines/Makefile
3276  rename drivers/net/{ => ethernet/packetengines}/hamachi.c (99%)
3277  rename drivers/net/{ => ethernet/packetengines}/yellowfin.c (99%)
3278  create mode 100644 drivers/net/ethernet/pasemi/Kconfig
3279  create mode 100644 drivers/net/ethernet/pasemi/Makefile
3280  rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.c (99%)
3281  rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.h (100%)
3282  rename drivers/net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c (100%)
3283  create mode 100644 drivers/net/ethernet/qlogic/Kconfig
3284  create mode 100644 drivers/net/ethernet/qlogic/Makefile
3285  rename drivers/net/{ => ethernet/qlogic}/netxen/Makefile (100%)
3286  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic.h (99%)
3287  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c (100%)
3288  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ethtool.c (100%)
3289  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h (100%)
3290  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.c (100%)
3291  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.h (100%)
3292  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_init.c (99%)
3293  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_main.c (96%)
3294  rename drivers/net/{ => ethernet/qlogic}/qla3xxx.c (99%)
3295  rename drivers/net/{ => ethernet/qlogic}/qla3xxx.h (100%)
3296  rename drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile (100%)
3297  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h (99%)
3298  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c (100%)
3299  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c (98%)
3300  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h (100%)
3301  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c (99%)
3302  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c (99%)
3303  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c (98%)
3304  rename drivers/net/{ => ethernet/qlogic}/qlge/Makefile (100%)
3305  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge.h (100%)
3306  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c (100%)
3307  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c (100%)
3308  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c (99%)
3309  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c (100%)
3310  create mode 100644 drivers/net/ethernet/racal/Kconfig
3311  create mode 100644 drivers/net/ethernet/racal/Makefile
3312  rename drivers/net/{ => ethernet/racal}/ni5010.c (99%)
3313  rename drivers/net/{ => ethernet/racal}/ni5010.h (100%)
3314  create mode 100644 drivers/net/ethernet/rdc/Kconfig
3315  create mode 100644 drivers/net/ethernet/rdc/Makefile
3316  rename drivers/net/{ => ethernet/rdc}/r6040.c (99%)
3317  rename drivers/net/{ => ethernet/realtek}/8139cp.c (99%)
3318  rename drivers/net/{ => ethernet/realtek}/8139too.c (99%)
3319  create mode 100644 drivers/net/ethernet/realtek/Kconfig
3320  create mode 100644 drivers/net/ethernet/realtek/Makefile
3321  rename drivers/net/{ => ethernet/realtek}/atp.c (99%)
3322  rename drivers/net/{ => ethernet/realtek}/atp.h (100%)
3323  rename drivers/net/{ => ethernet/realtek}/r8169.c (99%)
3324  rename drivers/net/{ => ethernet/realtek}/sc92031.c (99%)
3325  create mode 100644 drivers/net/ethernet/renesas/Kconfig
3326  create mode 100644 drivers/net/ethernet/renesas/Makefile
3327  rename drivers/net/{ => ethernet/renesas}/sh_eth.c (99%)
3328  rename drivers/net/{ => ethernet/renesas}/sh_eth.h (100%)
3329  rename drivers/net/{ => ethernet}/s6gmac.c (100%)
3330  create mode 100644 drivers/net/ethernet/seeq/Kconfig
3331  create mode 100644 drivers/net/ethernet/seeq/Makefile
3332  rename drivers/net/{arm => ethernet/seeq}/ether3.c (99%)
3333  rename drivers/net/{arm => ethernet/seeq}/ether3.h (100%)
3334  rename drivers/net/{ => ethernet/seeq}/seeq8005.c (99%)
3335  rename drivers/net/{ => ethernet/seeq}/seeq8005.h (100%)
3336  rename drivers/net/{ => ethernet/seeq}/sgiseeq.c (99%)
3337  rename drivers/net/{ => ethernet/seeq}/sgiseeq.h (100%)
3338  rename drivers/net/{ => ethernet}/sfc/Kconfig (96%)
3339  rename drivers/net/{ => ethernet}/sfc/Makefile (100%)
3340  rename drivers/net/{ => ethernet}/sfc/bitfield.h (100%)
3341  rename drivers/net/{ => ethernet}/sfc/efx.c (99%)
3342  rename drivers/net/{ => ethernet}/sfc/efx.h (100%)
3343  rename drivers/net/{ => ethernet}/sfc/enum.h (100%)
3344  rename drivers/net/{ => ethernet}/sfc/ethtool.c (100%)
3345  rename drivers/net/{ => ethernet}/sfc/falcon.c (100%)
3346  rename drivers/net/{ => ethernet}/sfc/falcon_boards.c (100%)
3347  rename drivers/net/{ => ethernet}/sfc/falcon_xmac.c (100%)
3348  rename drivers/net/{ => ethernet}/sfc/filter.c (100%)
3349  rename drivers/net/{ => ethernet}/sfc/filter.h (100%)
3350  rename drivers/net/{ => ethernet}/sfc/io.h (100%)
3351  rename drivers/net/{ => ethernet}/sfc/mac.h (100%)
3352  rename drivers/net/{ => ethernet}/sfc/mcdi.c (100%)
3353  rename drivers/net/{ => ethernet}/sfc/mcdi.h (100%)
3354  rename drivers/net/{ => ethernet}/sfc/mcdi_mac.c (100%)
3355  rename drivers/net/{ => ethernet}/sfc/mcdi_pcol.h (100%)
3356  rename drivers/net/{ => ethernet}/sfc/mcdi_phy.c (100%)
3357  rename drivers/net/{ => ethernet}/sfc/mdio_10g.c (100%)
3358  rename drivers/net/{ => ethernet}/sfc/mdio_10g.h (100%)
3359  rename drivers/net/{ => ethernet}/sfc/mtd.c (100%)
3360  rename drivers/net/{ => ethernet}/sfc/net_driver.h (100%)
3361  rename drivers/net/{ => ethernet}/sfc/nic.c (100%)
3362  rename drivers/net/{ => ethernet}/sfc/nic.h (100%)
3363  rename drivers/net/{ => ethernet}/sfc/phy.h (100%)
3364  rename drivers/net/{ => ethernet}/sfc/qt202x_phy.c (100%)
3365  rename drivers/net/{ => ethernet}/sfc/regs.h (100%)
3366  rename drivers/net/{ => ethernet}/sfc/rx.c (100%)
3367  rename drivers/net/{ => ethernet}/sfc/selftest.c (100%)
3368  rename drivers/net/{ => ethernet}/sfc/selftest.h (100%)
3369  rename drivers/net/{ => ethernet}/sfc/siena.c (100%)
3370  rename drivers/net/{ => ethernet}/sfc/spi.h (100%)
3371  rename drivers/net/{ => ethernet}/sfc/tenxpress.c (100%)
3372  rename drivers/net/{ => ethernet}/sfc/tx.c (100%)
3373  rename drivers/net/{ => ethernet}/sfc/txc43128_phy.c (100%)
3374  rename drivers/net/{ => ethernet}/sfc/workarounds.h (100%)
3375  create mode 100644 drivers/net/ethernet/sgi/Kconfig
3376  create mode 100644 drivers/net/ethernet/sgi/Makefile
3377  rename drivers/net/{ => ethernet/sgi}/ioc3-eth.c (99%)
3378  rename drivers/net/{ => ethernet/sgi}/meth.c (100%)
3379  rename drivers/net/{ => ethernet/sgi}/meth.h (100%)
3380  create mode 100644 drivers/net/ethernet/sis/Kconfig
3381  create mode 100644 drivers/net/ethernet/sis/Makefile
3382  rename drivers/net/{ => ethernet/sis}/sis190.c (99%)
3383  rename drivers/net/{ => ethernet/sis}/sis900.c (99%)
3384  rename drivers/net/{ => ethernet/sis}/sis900.h (100%)
3385  create mode 100644 drivers/net/ethernet/smsc/Kconfig
3386  create mode 100644 drivers/net/ethernet/smsc/Makefile
3387  rename drivers/net/{ => ethernet/smsc}/epic100.c (99%)
3388  rename drivers/net/{ => ethernet/smsc}/smc911x.c (99%)
3389  rename drivers/net/{ => ethernet/smsc}/smc911x.h (100%)
3390  rename drivers/net/{ => ethernet/smsc}/smc9194.c (99%)
3391  rename drivers/net/{ => ethernet/smsc}/smc9194.h (100%)
3392  rename drivers/net/{pcmcia => ethernet/smsc}/smc91c92_cs.c (99%)
3393  rename drivers/net/{ => ethernet/smsc}/smc91x.c (99%)
3394  rename drivers/net/{ => ethernet/smsc}/smc91x.h (100%)
3395  rename drivers/net/{ => ethernet/smsc}/smsc911x.c (97%)
3396  rename drivers/net/{ => ethernet/smsc}/smsc911x.h (100%)
3397  rename drivers/net/{ => ethernet/smsc}/smsc9420.c (99%)
3398  rename drivers/net/{ => ethernet/smsc}/smsc9420.h (100%)
3399  create mode 100644 drivers/net/ethernet/stmicro/Kconfig
3400  create mode 100644 drivers/net/ethernet/stmicro/Makefile
3401  rename drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig (93%)
3402  rename drivers/net/{ => ethernet/stmicro}/stmmac/Makefile (100%)
3403  rename drivers/net/{ => ethernet/stmicro}/stmmac/common.h (100%)
3404  rename drivers/net/{ => ethernet/stmicro}/stmmac/descs.h (100%)
3405  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100.h (100%)
3406  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000.h (100%)
3407  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_core.c (100%)
3408  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c (100%)
3409  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_core.c (100%)
3410  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_dma.c (100%)
3411  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h (100%)
3412  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c (100%)
3413  rename drivers/net/{ => ethernet/stmicro}/stmmac/enh_desc.c (100%)
3414  rename drivers/net/{ => ethernet/stmicro}/stmmac/norm_desc.c (100%)
3415  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h (100%)
3416  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c (100%)
3417  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_main.c (99%)
3418  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_mdio.c (100%)
3419  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.c (100%)
3420  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.h (100%)
3421  create mode 100644 drivers/net/ethernet/sun/Kconfig
3422  create mode 100644 drivers/net/ethernet/sun/Makefile
3423  rename drivers/net/{ => ethernet/sun}/cassini.c (99%)
3424  rename drivers/net/{ => ethernet/sun}/cassini.h (100%)
3425  rename drivers/net/{ => ethernet/sun}/niu.c (99%)
3426  rename drivers/net/{ => ethernet/sun}/niu.h (100%)
3427  rename drivers/net/{ => ethernet/sun}/sunbmac.c (99%)
3428  rename drivers/net/{ => ethernet/sun}/sunbmac.h (100%)
3429  rename drivers/net/{ => ethernet/sun}/sungem.c (99%)
3430  rename drivers/net/{ => ethernet/sun}/sungem.h (100%)
3431  rename drivers/net/{ => ethernet/sun}/sunhme.c (99%)
3432  rename drivers/net/{ => ethernet/sun}/sunhme.h (100%)
3433  rename drivers/net/{ => ethernet/sun}/sunqe.c (99%)
3434  rename drivers/net/{ => ethernet/sun}/sunqe.h (100%)
3435  rename drivers/net/{ => ethernet/sun}/sunvnet.c (99%)
3436  rename drivers/net/{ => ethernet/sun}/sunvnet.h (100%)
3437  create mode 100644 drivers/net/ethernet/tehuti/Kconfig
3438  create mode 100644 drivers/net/ethernet/tehuti/Makefile
3439  rename drivers/net/{ => ethernet/tehuti}/tehuti.c (99%)
3440  rename drivers/net/{ => ethernet/tehuti}/tehuti.h (100%)
3441  create mode 100644 drivers/net/ethernet/ti/Kconfig
3442  create mode 100644 drivers/net/ethernet/ti/Makefile
3443  rename drivers/net/{ => ethernet/ti}/cpmac.c (99%)
3444  rename drivers/net/{ => ethernet/ti}/davinci_cpdma.c (100%)
3445  rename drivers/net/{ => ethernet/ti}/davinci_cpdma.h (100%)
3446  rename drivers/net/{ => ethernet/ti}/davinci_emac.c (99%)
3447  rename drivers/net/{ => ethernet/ti}/davinci_mdio.c (100%)
3448  rename drivers/net/{ => ethernet/ti}/tlan.c (99%)
3449  rename drivers/net/{ => ethernet/ti}/tlan.h (100%)
3450  create mode 100644 drivers/net/ethernet/tile/Kconfig
3451  rename drivers/net/{ => ethernet}/tile/Makefile (100%)
3452  rename drivers/net/{ => ethernet}/tile/tilepro.c (100%)
3453  create mode 100644 drivers/net/ethernet/toshiba/Kconfig
3454  create mode 100644 drivers/net/ethernet/toshiba/Makefile
3455  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c (99%)
3456  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h (100%)
3457  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.c (99%)
3458  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.h (100%)
3459  rename drivers/net/{ => ethernet/toshiba}/spider_net.c (99%)
3460  rename drivers/net/{ => ethernet/toshiba}/spider_net.h (99%)
3461  rename drivers/net/{ => ethernet/toshiba}/spider_net_ethtool.c (100%)
3462  rename drivers/net/{ => ethernet/toshiba}/tc35815.c (99%)
3463  create mode 100644 drivers/net/ethernet/tundra/Kconfig
3464  create mode 100644 drivers/net/ethernet/tundra/Makefile
3465  rename drivers/net/{ => ethernet/tundra}/tsi108_eth.c (99%)
3466  rename drivers/net/{ => ethernet/tundra}/tsi108_eth.h (100%)
3467  create mode 100644 drivers/net/ethernet/via/Kconfig
3468  create mode 100644 drivers/net/ethernet/via/Makefile
3469  rename drivers/net/{ => ethernet/via}/via-rhine.c (99%)
3470  rename drivers/net/{ => ethernet/via}/via-velocity.c (97%)
3471  rename drivers/net/{ => ethernet/via}/via-velocity.h (100%)
3472  create mode 100644 drivers/net/ethernet/xilinx/Kconfig
3473  create mode 100644 drivers/net/ethernet/xilinx/Makefile
3474  rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%)
3475  rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (99%)
3476  rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%)
3477  rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%)
3478  create mode 100644 drivers/net/ethernet/xircom/Kconfig
3479  create mode 100644 drivers/net/ethernet/xircom/Makefile
3480  rename drivers/net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c (99%)
3481  create mode 100644 drivers/net/ethernet/xscale/Kconfig
3482  create mode 100644 drivers/net/ethernet/xscale/Makefile
3483  rename drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig (94%)
3484  rename drivers/net/{ => ethernet/xscale}/ixp2000/Makefile (100%)
3485  rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c (100%)
3486  rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h (100%)
3487  rename drivers/net/{ => ethernet/xscale}/ixp2000/enp2611.c (100%)
3488  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.c (100%)
3489  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.h (100%)
3490  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc (100%)
3491  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode (100%)
3492  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc (100%)
3493  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode (100%)
3494  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c (100%)
3495  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h (100%)
3496  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev_priv.h (100%)
3497  rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c (100%)
3498  rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h (100%)
3499  rename drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c (99%)
3500  delete mode 100644 drivers/net/octeon/Makefile
3501  delete mode 100644 drivers/net/pci-skeleton.c
3502  rename {drivers/net => include/linux}/sungem_phy.h (98%)
3503 Merging wireless/master
3504 $ git merge wireless/master
3505 Auto-merging arch/mips/Kconfig
3506 Auto-merging drivers/net/wireless/ath/ath5k/base.c
3507 Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
3508 Auto-merging drivers/net/wireless/ipw2x00/ipw2200.c
3509 Auto-merging drivers/net/wireless/libertas/main.c
3510 Auto-merging drivers/net/wireless/libertas/mesh.c
3511 Auto-merging drivers/net/wireless/mwifiex/main.c
3512 Auto-merging drivers/net/wireless/rndis_wlan.c
3513 Removing drivers/staging/ath6kl/Kconfig
3514 Removing drivers/staging/ath6kl/Makefile
3515 Removing drivers/staging/ath6kl/TODO
3516 Removing drivers/staging/ath6kl/bmi/include/bmi_internal.h
3517 Removing drivers/staging/ath6kl/bmi/src/bmi.c
3518 Removing drivers/staging/ath6kl/hif/common/hif_sdio_common.h
3519 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
3520 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
3521 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
3522 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.c
3523 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.h
3524 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
3525 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
3526 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
3527 Removing drivers/staging/ath6kl/htc2/htc.c
3528 Removing drivers/staging/ath6kl/htc2/htc_debug.h
3529 Removing drivers/staging/ath6kl/htc2/htc_internal.h
3530 Removing drivers/staging/ath6kl/htc2/htc_recv.c
3531 Removing drivers/staging/ath6kl/htc2/htc_send.c
3532 Removing drivers/staging/ath6kl/htc2/htc_services.c
3533 Removing drivers/staging/ath6kl/include/a_config.h
3534 Removing drivers/staging/ath6kl/include/a_debug.h
3535 Removing drivers/staging/ath6kl/include/a_drv.h
3536 Removing drivers/staging/ath6kl/include/a_drv_api.h
3537 Removing drivers/staging/ath6kl/include/a_osapi.h
3538 Removing drivers/staging/ath6kl/include/aggr_recv_api.h
3539 Removing drivers/staging/ath6kl/include/ar3kconfig.h
3540 Removing drivers/staging/ath6kl/include/ar6000_api.h
3541 Removing drivers/staging/ath6kl/include/ar6000_diag.h
3542 Removing drivers/staging/ath6kl/include/ar6kap_common.h
3543 Removing drivers/staging/ath6kl/include/athbtfilter.h
3544 Removing drivers/staging/ath6kl/include/bmi.h
3545 Removing drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
3546 Removing drivers/staging/ath6kl/include/common/AR6002/addrs.h
3547 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
3548 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
3549 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
3550 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
3551 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
3552 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
3553 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
3554 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
3555 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
3556 Removing drivers/staging/ath6kl/include/common/athdefs.h
3557 Removing drivers/staging/ath6kl/include/common/bmi_msg.h
3558 Removing drivers/staging/ath6kl/include/common/cnxmgmt.h
3559 Removing drivers/staging/ath6kl/include/common/dbglog.h
3560 Removing drivers/staging/ath6kl/include/common/dbglog_id.h
3561 Removing drivers/staging/ath6kl/include/common/discovery.h
3562 Removing drivers/staging/ath6kl/include/common/epping_test.h
3563 Removing drivers/staging/ath6kl/include/common/gmboxif.h
3564 Removing drivers/staging/ath6kl/include/common/gpio_reg.h
3565 Removing drivers/staging/ath6kl/include/common/htc.h
3566 Removing drivers/staging/ath6kl/include/common/htc_services.h
3567 Removing drivers/staging/ath6kl/include/common/pkt_log.h
3568 Removing drivers/staging/ath6kl/include/common/roaming.h
3569 Removing drivers/staging/ath6kl/include/common/targaddrs.h
3570 Removing drivers/staging/ath6kl/include/common/testcmd.h
3571 Removing drivers/staging/ath6kl/include/common/tlpm.h
3572 Removing drivers/staging/ath6kl/include/common/wlan_defs.h
3573 Removing drivers/staging/ath6kl/include/common/wmi.h
3574 Removing drivers/staging/ath6kl/include/common/wmix.h
3575 Removing drivers/staging/ath6kl/include/common_drv.h
3576 Removing drivers/staging/ath6kl/include/dbglog_api.h
3577 Removing drivers/staging/ath6kl/include/dl_list.h
3578 Removing drivers/staging/ath6kl/include/dset_api.h
3579 Removing drivers/staging/ath6kl/include/hci_transport_api.h
3580 Removing drivers/staging/ath6kl/include/hif.h
3581 Removing drivers/staging/ath6kl/include/host_version.h
3582 Removing drivers/staging/ath6kl/include/htc_api.h
3583 Removing drivers/staging/ath6kl/include/htc_packet.h
3584 Removing drivers/staging/ath6kl/include/wlan_api.h
3585 Removing drivers/staging/ath6kl/include/wmi_api.h
3586 Removing drivers/staging/ath6kl/miscdrv/ar3kconfig.c
3587 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
3588 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
3589 CONFLICT (delete/modify): drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c deleted in wireless/master and modified in HEAD. Version HEAD of drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c left in tree.
3590 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
3591 Removing drivers/staging/ath6kl/miscdrv/common_drv.c
3592 Removing drivers/staging/ath6kl/miscdrv/credit_dist.c
3593 Removing drivers/staging/ath6kl/miscdrv/miscdrv.h
3594 CONFLICT (delete/modify): drivers/staging/ath6kl/os/linux/ar6000_drv.c deleted in wireless/master and modified in HEAD. Version HEAD of drivers/staging/ath6kl/os/linux/ar6000_drv.c left in tree.
3595 Removing drivers/staging/ath6kl/os/linux/ar6000_pm.c
3596 Removing drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
3597 Removing drivers/staging/ath6kl/os/linux/cfg80211.c
3598 Removing drivers/staging/ath6kl/os/linux/export_hci_transport.c
3599 Removing drivers/staging/ath6kl/os/linux/hci_bridge.c
3600 Removing drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
3601 Removing drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
3602 Removing drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
3603 Removing drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
3604 Removing drivers/staging/ath6kl/os/linux/include/cfg80211.h
3605 Removing drivers/staging/ath6kl/os/linux/include/config_linux.h
3606 Removing drivers/staging/ath6kl/os/linux/include/debug_linux.h
3607 Removing drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
3608 Removing drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
3609 Removing drivers/staging/ath6kl/os/linux/include/osapi_linux.h
3610 Removing drivers/staging/ath6kl/os/linux/include/wlan_config.h
3611 Removing drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
3612 Removing drivers/staging/ath6kl/os/linux/netbuf.c
3613 Removing drivers/staging/ath6kl/reorder/aggr_rx_internal.h
3614 Removing drivers/staging/ath6kl/reorder/rcv_aggr.c
3615 Removing drivers/staging/ath6kl/wlan/include/ieee80211.h
3616 Removing drivers/staging/ath6kl/wlan/include/ieee80211_node.h
3617 Removing drivers/staging/ath6kl/wlan/src/wlan_node.c
3618 Removing drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
3619 Removing drivers/staging/ath6kl/wlan/src/wlan_utils.c
3620 Removing drivers/staging/ath6kl/wmi/wmi.c
3621 Removing drivers/staging/ath6kl/wmi/wmi_host.h
3622 Auto-merging net/mac80211/cfg.c
3623 Auto-merging net/mac80211/sta_info.c
3624 Automatic merge failed; fix conflicts and then commit the result.
3625 $ git rm -f drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
3626 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c: needs merge
3627 drivers/staging/ath6kl/os/linux/ar6000_drv.c: needs merge
3628 rm 'drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c'
3629 $ git rm -f drivers/staging/ath6kl/os/linux/ar6000_drv.c
3630 drivers/staging/ath6kl/os/linux/ar6000_drv.c: needs merge
3631 rm 'drivers/staging/ath6kl/os/linux/ar6000_drv.c'
3632 $ git commit -v -a
3633 [master e9f2803] Merge remote-tracking branch 'wireless/master'
3634 $ git diff -M --stat --summary HEAD^..
3635  arch/mips/Kconfig                                  |    8 +-
3636  arch/mips/bcm47xx/Kconfig                          |   31 +
3637  arch/mips/bcm47xx/Makefile                         |    3 +-
3638  arch/mips/bcm47xx/gpio.c                           |   82 +-
3639  arch/mips/bcm47xx/irq.c                            |   12 +
3640  arch/mips/bcm47xx/nvram.c                          |   29 +-
3641  arch/mips/bcm47xx/serial.c                         |   46 +-
3642  arch/mips/bcm47xx/setup.c                          |   90 +-
3643  arch/mips/bcm47xx/time.c                           |   16 +-
3644  arch/mips/bcm47xx/wgt634u.c                        |   14 +-
3645  arch/mips/include/asm/mach-bcm47xx/bcm47xx.h       |   26 +-
3646  arch/mips/include/asm/mach-bcm47xx/gpio.h          |  108 +-
3647  arch/mips/pci/pci-bcm47xx.c                        |    6 +
3648  drivers/bcma/Kconfig                               |   13 +
3649  drivers/bcma/Makefile                              |    2 +
3650  drivers/bcma/bcma_private.h                        |   16 +
3651  drivers/bcma/core.c                                |    2 +
3652  drivers/bcma/driver_chipcommon.c                   |   53 +
3653  drivers/bcma/driver_chipcommon_pmu.c               |  133 +
3654  drivers/bcma/driver_mips.c                         |  256 +
3655  drivers/bcma/driver_pci.c                          |   16 +-
3656  drivers/bcma/host_soc.c                            |  183 +
3657  drivers/bcma/main.c                                |   70 +-
3658  drivers/bcma/scan.c                                |  348 +-
3659  drivers/net/wireless/ath/Kconfig                   |    1 +
3660  drivers/net/wireless/ath/Makefile                  |    1 +
3661  drivers/net/wireless/ath/ath5k/ahb.c               |    4 +-
3662  drivers/net/wireless/ath/ath5k/ani.c               |    1 -
3663  drivers/net/wireless/ath/ath5k/ani.h               |    4 +
3664  drivers/net/wireless/ath/ath5k/ath5k.h             |   98 +-
3665  drivers/net/wireless/ath/ath5k/attach.c            |   18 +-
3666  drivers/net/wireless/ath/ath5k/base.c              |   31 +-
3667  drivers/net/wireless/ath/ath5k/base.h              |   55 +-
3668  drivers/net/wireless/ath/ath5k/caps.c              |    2 +-
3669  drivers/net/wireless/ath/ath5k/debug.c             |   15 +-
3670  drivers/net/wireless/ath/ath5k/desc.c              |    1 -
3671  drivers/net/wireless/ath/ath5k/dma.c               |    1 -
3672  drivers/net/wireless/ath/ath5k/eeprom.c            |   10 +-
3673  drivers/net/wireless/ath/ath5k/gpio.c              |    1 -
3674  drivers/net/wireless/ath/ath5k/initvals.c          |    1 -
3675  drivers/net/wireless/ath/ath5k/led.c               |    1 -
3676  drivers/net/wireless/ath/ath5k/mac80211-ops.c      |    5 +-
3677  drivers/net/wireless/ath/ath5k/pci.c               |    4 +-
3678  drivers/net/wireless/ath/ath5k/pcu.c               |    5 +-
3679  drivers/net/wireless/ath/ath5k/phy.c               |   91 +-
3680  drivers/net/wireless/ath/ath5k/qcu.c               |   10 +-
3681  drivers/net/wireless/ath/ath5k/reset.c             |   79 +-
3682  drivers/net/wireless/ath/ath5k/rfkill.c            |    2 +-
3683  drivers/net/wireless/ath/ath5k/sysfs.c             |    1 -
3684  drivers/net/wireless/ath/ath5k/trace.h             |    3 +-
3685  drivers/net/wireless/ath/ath6kl/Kconfig            |   15 +
3686  drivers/net/wireless/ath/ath6kl/Makefile           |   35 +
3687  drivers/net/wireless/ath/ath6kl/bmi.c              |  692 +++
3688  drivers/net/wireless/ath/ath6kl/bmi.h              |  250 +
3689  drivers/net/wireless/ath/ath6kl/cfg80211.c         | 1538 +++++
3690  drivers/net/wireless/ath/ath6kl/cfg80211.h         |   39 +
3691  drivers/net/wireless/ath/ath6kl/common.h           |  180 +
3692  drivers/net/wireless/ath/ath6kl/core.h             |  544 ++
3693  drivers/net/wireless/ath/ath6kl/debug.c            |  150 +
3694  drivers/net/wireless/ath/ath6kl/debug.h            |  105 +
3695  drivers/net/wireless/ath/ath6kl/hif-ops.h          |   72 +
3696  drivers/net/wireless/ath/ath6kl/hif.h              |  207 +
3697  drivers/net/wireless/ath/ath6kl/htc.c              | 2457 ++++++++
3698  drivers/net/wireless/ath/ath6kl/htc.h              |  607 ++
3699  drivers/net/wireless/ath/ath6kl/htc_hif.c          |  641 ++
3700  drivers/net/wireless/ath/ath6kl/htc_hif.h          |   92 +
3701  drivers/net/wireless/ath/ath6kl/init.c             | 1303 ++++
3702  drivers/net/wireless/ath/ath6kl/main.c             | 1337 ++++
3703  drivers/net/wireless/ath/ath6kl/node.c             |  234 +
3704  drivers/net/wireless/ath/ath6kl/sdio.c             |  912 +++
3705  drivers/net/wireless/ath/ath6kl/target.h           |  331 +
3706  drivers/net/wireless/ath/ath6kl/txrx.c             | 1457 +++++
3707  drivers/net/wireless/ath/ath6kl/wmi.c              | 2743 +++++++++
3708  drivers/net/wireless/ath/ath6kl/wmi.h              | 2018 ++++++
3709  drivers/net/wireless/ath/ath9k/ahb.c               |    2 +-
3710  .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h   |  190 +-
3711  drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |  150 +-
3712  drivers/net/wireless/ath/ath9k/ar9003_mac.c        |   15 +-
3713  drivers/net/wireless/ath/ath9k/ar9003_phy.c        |    4 +-
3714  drivers/net/wireless/ath/ath9k/ath9k.h             |    6 +-
3715  drivers/net/wireless/ath/ath9k/beacon.c            |   18 +-
3716  drivers/net/wireless/ath/ath9k/calib.c             |   15 +
3717  drivers/net/wireless/ath/ath9k/calib.h             |    1 +
3718  drivers/net/wireless/ath/ath9k/debug.c             |   60 +
3719  drivers/net/wireless/ath/ath9k/eeprom.h            |    2 +
3720  drivers/net/wireless/ath/ath9k/eeprom_4k.c         |  135 +-
3721  drivers/net/wireless/ath/ath9k/eeprom_9287.c       |  122 +-
3722  drivers/net/wireless/ath/ath9k/eeprom_def.c        |  150 +-
3723  drivers/net/wireless/ath/ath9k/gpio.c              |    2 +
3724  drivers/net/wireless/ath/ath9k/htc.h               |    3 -
3725  drivers/net/wireless/ath/ath9k/htc_drv_init.c      |    1 -
3726  drivers/net/wireless/ath/ath9k/hw.c                |   10 +-
3727  drivers/net/wireless/ath/ath9k/hw.h                |    9 +-
3728  drivers/net/wireless/ath/ath9k/init.c              |    8 +-
3729  drivers/net/wireless/ath/ath9k/mac.c               |   16 +-
3730  drivers/net/wireless/ath/ath9k/main.c              |   10 +-
3731  drivers/net/wireless/ath/ath9k/pci.c               |    4 +-
3732  drivers/net/wireless/ath/ath9k/rc.c                |    4 +-
3733  drivers/net/wireless/ath/ath9k/rc.h                |    6 -
3734  drivers/net/wireless/ath/ath9k/recv.c              |   10 +-
3735  drivers/net/wireless/ath/ath9k/xmit.c              |   12 +-
3736  drivers/net/wireless/ath/regd.h                    |    2 +-
3737  drivers/net/wireless/ath/regd_common.h             |    2 +-
3738  drivers/net/wireless/b43/Kconfig                   |    6 +-
3739  drivers/net/wireless/b43/main.c                    |    2 +-
3740  drivers/net/wireless/b43legacy/b43legacy.h         |    1 -
3741  drivers/net/wireless/b43legacy/dma.c               |  374 +-
3742  drivers/net/wireless/b43legacy/dma.h               |  107 -
3743  drivers/net/wireless/b43legacy/main.c              |    4 +-
3744  drivers/net/wireless/ipw2x00/ipw2200.c             |    1 +
3745  drivers/net/wireless/iwlegacy/iwl-3945-led.c       |    1 -
3746  drivers/net/wireless/iwlegacy/iwl-3945-rs.c        |    1 -
3747  drivers/net/wireless/iwlegacy/iwl-3945.c           |    1 -
3748  drivers/net/wireless/iwlegacy/iwl-4965-led.c       |    1 -
3749  drivers/net/wireless/iwlegacy/iwl-4965-rs.c        |    1 -
3750  drivers/net/wireless/iwlegacy/iwl-4965.c           |    1 -
3751  drivers/net/wireless/iwlegacy/iwl-led.c            |    1 -
3752  drivers/net/wireless/iwlegacy/iwl3945-base.c       |    1 -
3753  drivers/net/wireless/iwlegacy/iwl4965-base.c       |    1 -
3754  drivers/net/wireless/iwlwifi/Kconfig               |   17 -
3755  drivers/net/wireless/iwlwifi/iwl-1000.c            |   16 +-
3756  drivers/net/wireless/iwlwifi/iwl-2000.c            |   24 +-
3757  drivers/net/wireless/iwlwifi/iwl-5000.c            |   13 +-
3758  drivers/net/wireless/iwlwifi/iwl-6000.c            |   20 +-
3759  drivers/net/wireless/iwlwifi/iwl-agn-calib.c       |   69 +-
3760  drivers/net/wireless/iwlwifi/iwl-agn-hw.h          |    4 +-
3761  drivers/net/wireless/iwlwifi/iwl-agn-lib.c         |   47 +-
3762  drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |    1 -
3763  drivers/net/wireless/iwlwifi/iwl-agn-rxon.c        |   23 +-
3764  drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |   30 +-
3765  drivers/net/wireless/iwlwifi/iwl-agn.c             |  388 +-
3766  drivers/net/wireless/iwlwifi/iwl-agn.h             |    1 +
3767  drivers/net/wireless/iwlwifi/iwl-commands.h        |   34 +-
3768  drivers/net/wireless/iwlwifi/iwl-core.c            |    5 +
3769  drivers/net/wireless/iwlwifi/iwl-core.h            |    5 +
3770  drivers/net/wireless/iwlwifi/iwl-dev.h             |   29 +-
3771  drivers/net/wireless/iwlwifi/iwl-led.c             |    1 -
3772  drivers/net/wireless/iwlwifi/iwl-scan.c            |   19 +-
3773  drivers/net/wireless/iwlwifi/iwl-trans.c           |   10 +-
3774  drivers/net/wireless/libertas/cfg.c                |   69 +-
3775  drivers/net/wireless/libertas/cfg.h                |    1 +
3776  drivers/net/wireless/libertas/cmd.c                |    6 +-
3777  drivers/net/wireless/libertas/decl.h               |    4 +
3778  drivers/net/wireless/libertas/dev.h                |   28 +-
3779  drivers/net/wireless/libertas/ethtool.c            |    1 +
3780  drivers/net/wireless/libertas/if_sdio.c            |  277 +-
3781  drivers/net/wireless/libertas/if_spi.c             |    4 -
3782  drivers/net/wireless/libertas/if_usb.c             |   13 +-
3783  drivers/net/wireless/libertas/main.c               |  180 +-
3784  drivers/net/wireless/libertas/mesh.c               |   77 +-
3785  drivers/net/wireless/libertas/mesh.h               |   27 +-
3786  drivers/net/wireless/libertas/rx.c                 |    1 +
3787  drivers/net/wireless/libertas/tx.c                 |    1 +
3788  drivers/net/wireless/mac80211_hwsim.c              |    6 +
3789  drivers/net/wireless/mwifiex/cfg80211.c            |  209 +-
3790  drivers/net/wireless/mwifiex/fw.h                  |   15 +-
3791  drivers/net/wireless/mwifiex/init.c                |   21 -
3792  drivers/net/wireless/mwifiex/ioctl.h               |    5 +-
3793  drivers/net/wireless/mwifiex/join.c                |   32 -
3794  drivers/net/wireless/mwifiex/main.c                |    4 +
3795  drivers/net/wireless/mwifiex/main.h                |   55 +-
3796  drivers/net/wireless/mwifiex/scan.c                | 1578 +----
3797  drivers/net/wireless/mwifiex/sta_event.c           |    9 +-
3798  drivers/net/wireless/mwifiex/sta_ioctl.c           |  230 +-
3799  drivers/net/wireless/orinoco/wext.c                |    1 +
3800  drivers/net/wireless/rndis_wlan.c                  |    2 -
3801  drivers/net/wireless/rt2x00/rt2400pci.c            |   39 +-
3802  drivers/net/wireless/rt2x00/rt2500pci.c            |   39 +-
3803  drivers/net/wireless/rt2x00/rt2800pci.c            |   46 +-
3804  drivers/net/wireless/rt2x00/rt2x00dev.c            |    1 -
3805  drivers/net/wireless/rt2x00/rt61pci.c              |   34 +-
3806  drivers/net/wireless/rtlwifi/pci.c                 |   37 +-
3807  drivers/net/wireless/rtlwifi/pci.h                 |   26 -
3808  drivers/net/wireless/wl1251/cmd.h                  |    2 +-
3809  drivers/net/wireless/wl1251/wl12xx_80211.h         |    2 +-
3810  drivers/net/wireless/wl12xx/cmd.h                  |    4 +-
3811  drivers/net/wireless/wl12xx/main.c                 |    2 +-
3812  drivers/net/wireless/wl12xx/scan.h                 |    6 +-
3813  drivers/net/wireless/wl12xx/wl12xx.h               |    4 +-
3814  drivers/net/wireless/wl12xx/wl12xx_80211.h         |    2 +-
3815  drivers/staging/Kconfig                            |    2 -
3816  drivers/staging/Makefile                           |    1 -
3817  drivers/staging/ath6kl/Kconfig                     |  158 -
3818  drivers/staging/ath6kl/Makefile                    |  122 -
3819  drivers/staging/ath6kl/TODO                        |   25 -
3820  drivers/staging/ath6kl/bmi/include/bmi_internal.h  |   54 -
3821  drivers/staging/ath6kl/bmi/src/bmi.c               | 1010 ---
3822  .../staging/ath6kl/hif/common/hif_sdio_common.h    |   87 -
3823  .../hif/sdio/linux_sdio/include/hif_internal.h     |  131 -
3824  .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c   | 1273 ----
3825  .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c   |  393 --
3826  drivers/staging/ath6kl/htc2/AR6000/ar6k.c          | 1479 -----
3827  drivers/staging/ath6kl/htc2/AR6000/ar6k.h          |  401 --
3828  drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c   |  783 ---
3829  drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c    |  755 ---
3830  .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c        | 1284 ----
3831  drivers/staging/ath6kl/htc2/htc.c                  |  575 --
3832  drivers/staging/ath6kl/htc2/htc_debug.h            |   38 -
3833  drivers/staging/ath6kl/htc2/htc_internal.h         |  211 -
3834  drivers/staging/ath6kl/htc2/htc_recv.c             | 1572 -----
3835  drivers/staging/ath6kl/htc2/htc_send.c             | 1018 ---
3836  drivers/staging/ath6kl/htc2/htc_services.c         |  450 --
3837  drivers/staging/ath6kl/include/a_config.h          |   31 -
3838  drivers/staging/ath6kl/include/a_debug.h           |  195 -
3839  drivers/staging/ath6kl/include/a_drv.h             |   32 -
3840  drivers/staging/ath6kl/include/a_drv_api.h         |  204 -
3841  drivers/staging/ath6kl/include/a_osapi.h           |   32 -
3842  drivers/staging/ath6kl/include/aggr_recv_api.h     |  140 -
3843  drivers/staging/ath6kl/include/ar3kconfig.h        |   65 -
3844  drivers/staging/ath6kl/include/ar6000_api.h        |   32 -
3845  drivers/staging/ath6kl/include/ar6000_diag.h       |   48 -
3846  drivers/staging/ath6kl/include/ar6kap_common.h     |   44 -
3847  drivers/staging/ath6kl/include/athbtfilter.h       |  135 -
3848  drivers/staging/ath6kl/include/bmi.h               |  134 -
3849  .../ath6kl/include/common/AR6002/AR6K_version.h    |   52 -
3850  .../staging/ath6kl/include/common/AR6002/addrs.h   |   90 -
3851  .../common/AR6002/hw4.0/hw/apb_athr_wlan_map.h     |   40 -
3852  .../include/common/AR6002/hw4.0/hw/apb_map.h       |   40 -
3853  .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h |   24 -
3854  .../include/common/AR6002/hw4.0/hw/mbox_reg.h      |  552 --
3855  .../common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h    |  471 --
3856  .../include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h |  589 --
3857  .../include/common/AR6002/hw4.0/hw/rtc_reg.h       |  187 -
3858  .../include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h  |  162 -
3859  .../include/common/AR6002/hw4.0/hw/uart_reg.h      |   40 -
3860  drivers/staging/ath6kl/include/common/athdefs.h    |   75 -
3861  drivers/staging/ath6kl/include/common/bmi_msg.h    |  233 -
3862  drivers/staging/ath6kl/include/common/cnxmgmt.h    |   36 -
3863  drivers/staging/ath6kl/include/common/dbglog.h     |  126 -
3864  drivers/staging/ath6kl/include/common/dbglog_id.h  |  558 --
3865  drivers/staging/ath6kl/include/common/discovery.h  |   75 -
3866  .../staging/ath6kl/include/common/epping_test.h    |  111 -
3867  drivers/staging/ath6kl/include/common/gmboxif.h    |   70 -
3868  drivers/staging/ath6kl/include/common/gpio_reg.h   |    9 -
3869  drivers/staging/ath6kl/include/common/htc.h        |  227 -
3870  .../staging/ath6kl/include/common/htc_services.h   |   52 -
3871  drivers/staging/ath6kl/include/common/pkt_log.h    |   45 -
3872  drivers/staging/ath6kl/include/common/roaming.h    |   41 -
3873  drivers/staging/ath6kl/include/common/targaddrs.h  |  395 --
3874  drivers/staging/ath6kl/include/common/testcmd.h    |  185 -
3875  drivers/staging/ath6kl/include/common/tlpm.h       |   38 -
3876  drivers/staging/ath6kl/include/common/wlan_defs.h  |   79 -
3877  drivers/staging/ath6kl/include/common/wmi.h        | 3220 ----------
3878  drivers/staging/ath6kl/include/common/wmix.h       |  271 -
3879  drivers/staging/ath6kl/include/common_drv.h        |  104 -
3880  drivers/staging/ath6kl/include/dbglog_api.h        |   52 -
3881  drivers/staging/ath6kl/include/dl_list.h           |  153 -
3882  drivers/staging/ath6kl/include/dset_api.h          |   65 -
3883  drivers/staging/ath6kl/include/hci_transport_api.h |  259 -
3884  drivers/staging/ath6kl/include/hif.h               |  456 --
3885  drivers/staging/ath6kl/include/host_version.h      |   52 -
3886  drivers/staging/ath6kl/include/htc_api.h           |  575 --
3887  drivers/staging/ath6kl/include/htc_packet.h        |  227 -
3888  drivers/staging/ath6kl/include/wlan_api.h          |  128 -
3889  drivers/staging/ath6kl/include/wmi_api.h           |  441 --
3890  drivers/staging/ath6kl/miscdrv/ar3kconfig.c        |  565 --
3891  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c   |  572 --
3892  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h   |   75 -
3893  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c   |  969 ---
3894  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h   |  113 -
3895  drivers/staging/ath6kl/miscdrv/common_drv.c        |  910 ---
3896  drivers/staging/ath6kl/miscdrv/credit_dist.c       |  417 --
3897  drivers/staging/ath6kl/miscdrv/miscdrv.h           |   42 -
3898  drivers/staging/ath6kl/os/linux/ar6000_drv.c       | 6267 -------------------
3899  drivers/staging/ath6kl/os/linux/ar6000_pm.c        |  626 --
3900  drivers/staging/ath6kl/os/linux/ar6000_raw_if.c    |  455 --
3901  drivers/staging/ath6kl/os/linux/cfg80211.c         | 1892 ------
3902  .../staging/ath6kl/os/linux/export_hci_transport.c |  124 -
3903  drivers/staging/ath6kl/os/linux/hci_bridge.c       | 1141 ----
3904  .../staging/ath6kl/os/linux/include/ar6000_drv.h   |  776 ---
3905  drivers/staging/ath6kl/os/linux/include/ar6k_pal.h |   36 -
3906  .../ath6kl/os/linux/include/ar6xapi_linux.h        |  190 -
3907  .../staging/ath6kl/os/linux/include/athdrv_linux.h | 1217 ----
3908  drivers/staging/ath6kl/os/linux/include/cfg80211.h |   61 -
3909  .../staging/ath6kl/os/linux/include/config_linux.h |   51 -
3910  .../staging/ath6kl/os/linux/include/debug_linux.h  |   50 -
3911  .../ath6kl/os/linux/include/export_hci_transport.h |   76 -
3912  .../ath6kl/os/linux/include/ieee80211_ioctl.h      |  177 -
3913  .../staging/ath6kl/os/linux/include/osapi_linux.h  |  339 -
3914  .../staging/ath6kl/os/linux/include/wlan_config.h  |  108 -
3915  .../ath6kl/os/linux/include/wmi_filter_linux.h     |  300 -
3916  drivers/staging/ath6kl/os/linux/netbuf.c           |  231 -
3917  drivers/staging/ath6kl/reorder/aggr_rx_internal.h  |  117 -
3918  drivers/staging/ath6kl/reorder/rcv_aggr.c          |  661 --
3919  drivers/staging/ath6kl/wlan/include/ieee80211.h    |  397 --
3920  .../staging/ath6kl/wlan/include/ieee80211_node.h   |   93 -
3921  drivers/staging/ath6kl/wlan/src/wlan_node.c        |  636 --
3922  drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c |  199 -
3923  drivers/staging/ath6kl/wlan/src/wlan_utils.c       |   58 -
3924  drivers/staging/ath6kl/wmi/wmi.c                   | 6444 --------------------
3925  drivers/staging/ath6kl/wmi/wmi_host.h              |  102 -
3926  drivers/watchdog/bcm47xx_wdt.c                     |   27 +-
3927  include/linux/bcma/bcma.h                          |    9 +-
3928  include/linux/bcma/bcma_driver_chipcommon.h        |   67 +
3929  include/linux/bcma/bcma_driver_mips.h              |   51 +
3930  include/linux/bcma/bcma_soc.h                      |   16 +
3931  include/linux/nl80211.h                            |   61 +-
3932  include/linux/ssb/ssb_regs.h                       |   40 +
3933  include/net/cfg80211-wext.h                        |   55 +
3934  include/net/cfg80211.h                             |  279 +-
3935  include/net/lib80211.h                             |    3 -
3936  include/net/mac80211.h                             |   11 -
3937  net/mac80211/agg-tx.c                              |   18 +-
3938  net/mac80211/cfg.c                                 |   39 -
3939  net/mac80211/driver-ops.h                          |   31 -
3940  net/mac80211/ieee80211_i.h                         |   64 -
3941  net/mac80211/main.c                                |    1 +
3942  net/mac80211/mesh_hwmp.c                           |    7 +-
3943  net/mac80211/rc80211_minstrel_ht.c                 |    8 +-
3944  net/mac80211/sta_info.c                            |    1 +
3945  net/mac80211/status.c                              |    3 -
3946  net/mac80211/tx.c                                  |   20 +
3947  net/mac80211/util.c                                |  168 +-
3948  net/wireless/lib80211.c                            |   15 +-
3949  net/wireless/nl80211.c                             |   86 +-
3950  net/wireless/reg.c                                 |   14 +-
3951  net/wireless/scan.c                                |    1 +
3952  net/wireless/util.c                                |  168 +
3953  net/wireless/wext-compat.c                         |  137 +-
3954  net/wireless/wext-compat.h                         |    8 +
3955  net/wireless/wext-sme.c                            |    3 +-
3956  321 files changed, 22561 insertions(+), 54152 deletions(-)
3957  create mode 100644 arch/mips/bcm47xx/Kconfig
3958  create mode 100644 drivers/bcma/driver_mips.c
3959  create mode 100644 drivers/bcma/host_soc.c
3960  create mode 100644 drivers/net/wireless/ath/ath6kl/Kconfig
3961  create mode 100644 drivers/net/wireless/ath/ath6kl/Makefile
3962  create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.c
3963  create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.h
3964  create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.c
3965  create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.h
3966  create mode 100644 drivers/net/wireless/ath/ath6kl/common.h
3967  create mode 100644 drivers/net/wireless/ath/ath6kl/core.h
3968  create mode 100644 drivers/net/wireless/ath/ath6kl/debug.c
3969  create mode 100644 drivers/net/wireless/ath/ath6kl/debug.h
3970  create mode 100644 drivers/net/wireless/ath/ath6kl/hif-ops.h
3971  create mode 100644 drivers/net/wireless/ath/ath6kl/hif.h
3972  create mode 100644 drivers/net/wireless/ath/ath6kl/htc.c
3973  create mode 100644 drivers/net/wireless/ath/ath6kl/htc.h
3974  create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.c
3975  create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.h
3976  create mode 100644 drivers/net/wireless/ath/ath6kl/init.c
3977  create mode 100644 drivers/net/wireless/ath/ath6kl/main.c
3978  create mode 100644 drivers/net/wireless/ath/ath6kl/node.c
3979  create mode 100644 drivers/net/wireless/ath/ath6kl/sdio.c
3980  create mode 100644 drivers/net/wireless/ath/ath6kl/target.h
3981  create mode 100644 drivers/net/wireless/ath/ath6kl/txrx.c
3982  create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.c
3983  create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.h
3984  delete mode 100644 drivers/staging/ath6kl/Kconfig
3985  delete mode 100644 drivers/staging/ath6kl/Makefile
3986  delete mode 100644 drivers/staging/ath6kl/TODO
3987  delete mode 100644 drivers/staging/ath6kl/bmi/include/bmi_internal.h
3988  delete mode 100644 drivers/staging/ath6kl/bmi/src/bmi.c
3989  delete mode 100644 drivers/staging/ath6kl/hif/common/hif_sdio_common.h
3990  delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
3991  delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
3992  delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
3993  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.c
3994  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.h
3995  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
3996  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
3997  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
3998  delete mode 100644 drivers/staging/ath6kl/htc2/htc.c
3999  delete mode 100644 drivers/staging/ath6kl/htc2/htc_debug.h
4000  delete mode 100644 drivers/staging/ath6kl/htc2/htc_internal.h
4001  delete mode 100644 drivers/staging/ath6kl/htc2/htc_recv.c
4002  delete mode 100644 drivers/staging/ath6kl/htc2/htc_send.c
4003  delete mode 100644 drivers/staging/ath6kl/htc2/htc_services.c
4004  delete mode 100644 drivers/staging/ath6kl/include/a_config.h
4005  delete mode 100644 drivers/staging/ath6kl/include/a_debug.h
4006  delete mode 100644 drivers/staging/ath6kl/include/a_drv.h
4007  delete mode 100644 drivers/staging/ath6kl/include/a_drv_api.h
4008  delete mode 100644 drivers/staging/ath6kl/include/a_osapi.h
4009  delete mode 100644 drivers/staging/ath6kl/include/aggr_recv_api.h
4010  delete mode 100644 drivers/staging/ath6kl/include/ar3kconfig.h
4011  delete mode 100644 drivers/staging/ath6kl/include/ar6000_api.h
4012  delete mode 100644 drivers/staging/ath6kl/include/ar6000_diag.h
4013  delete mode 100644 drivers/staging/ath6kl/include/ar6kap_common.h
4014  delete mode 100644 drivers/staging/ath6kl/include/athbtfilter.h
4015  delete mode 100644 drivers/staging/ath6kl/include/bmi.h
4016  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
4017  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/addrs.h
4018  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
4019  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
4020  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
4021  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
4022  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
4023  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
4024  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
4025  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
4026  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
4027  delete mode 100644 drivers/staging/ath6kl/include/common/athdefs.h
4028  delete mode 100644 drivers/staging/ath6kl/include/common/bmi_msg.h
4029  delete mode 100644 drivers/staging/ath6kl/include/common/cnxmgmt.h
4030  delete mode 100644 drivers/staging/ath6kl/include/common/dbglog.h
4031  delete mode 100644 drivers/staging/ath6kl/include/common/dbglog_id.h
4032  delete mode 100644 drivers/staging/ath6kl/include/common/discovery.h
4033  delete mode 100644 drivers/staging/ath6kl/include/common/epping_test.h
4034  delete mode 100644 drivers/staging/ath6kl/include/common/gmboxif.h
4035  delete mode 100644 drivers/staging/ath6kl/include/common/gpio_reg.h
4036  delete mode 100644 drivers/staging/ath6kl/include/common/htc.h
4037  delete mode 100644 drivers/staging/ath6kl/include/common/htc_services.h
4038  delete mode 100644 drivers/staging/ath6kl/include/common/pkt_log.h
4039  delete mode 100644 drivers/staging/ath6kl/include/common/roaming.h
4040  delete mode 100644 drivers/staging/ath6kl/include/common/targaddrs.h
4041  delete mode 100644 drivers/staging/ath6kl/include/common/testcmd.h
4042  delete mode 100644 drivers/staging/ath6kl/include/common/tlpm.h
4043  delete mode 100644 drivers/staging/ath6kl/include/common/wlan_defs.h
4044  delete mode 100644 drivers/staging/ath6kl/include/common/wmi.h
4045  delete mode 100644 drivers/staging/ath6kl/include/common/wmix.h
4046  delete mode 100644 drivers/staging/ath6kl/include/common_drv.h
4047  delete mode 100644 drivers/staging/ath6kl/include/dbglog_api.h
4048  delete mode 100644 drivers/staging/ath6kl/include/dl_list.h
4049  delete mode 100644 drivers/staging/ath6kl/include/dset_api.h
4050  delete mode 100644 drivers/staging/ath6kl/include/hci_transport_api.h
4051  delete mode 100644 drivers/staging/ath6kl/include/hif.h
4052  delete mode 100644 drivers/staging/ath6kl/include/host_version.h
4053  delete mode 100644 drivers/staging/ath6kl/include/htc_api.h
4054  delete mode 100644 drivers/staging/ath6kl/include/htc_packet.h
4055  delete mode 100644 drivers/staging/ath6kl/include/wlan_api.h
4056  delete mode 100644 drivers/staging/ath6kl/include/wmi_api.h
4057  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kconfig.c
4058  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
4059  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
4060  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
4061  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
4062  delete mode 100644 drivers/staging/ath6kl/miscdrv/common_drv.c
4063  delete mode 100644 drivers/staging/ath6kl/miscdrv/credit_dist.c
4064  delete mode 100644 drivers/staging/ath6kl/miscdrv/miscdrv.h
4065  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_drv.c
4066  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_pm.c
4067  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
4068  delete mode 100644 drivers/staging/ath6kl/os/linux/cfg80211.c
4069  delete mode 100644 drivers/staging/ath6kl/os/linux/export_hci_transport.c
4070  delete mode 100644 drivers/staging/ath6kl/os/linux/hci_bridge.c
4071  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
4072  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
4073  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
4074  delete mode 100644 drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
4075  delete mode 100644 drivers/staging/ath6kl/os/linux/include/cfg80211.h
4076  delete mode 100644 drivers/staging/ath6kl/os/linux/include/config_linux.h
4077  delete mode 100644 drivers/staging/ath6kl/os/linux/include/debug_linux.h
4078  delete mode 100644 drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
4079  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
4080  delete mode 100644 drivers/staging/ath6kl/os/linux/include/osapi_linux.h
4081  delete mode 100644 drivers/staging/ath6kl/os/linux/include/wlan_config.h
4082  delete mode 100644 drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
4083  delete mode 100644 drivers/staging/ath6kl/os/linux/netbuf.c
4084  delete mode 100644 drivers/staging/ath6kl/reorder/aggr_rx_internal.h
4085  delete mode 100644 drivers/staging/ath6kl/reorder/rcv_aggr.c
4086  delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211.h
4087  delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211_node.h
4088  delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_node.c
4089  delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
4090  delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_utils.c
4091  delete mode 100644 drivers/staging/ath6kl/wmi/wmi.c
4092  delete mode 100644 drivers/staging/ath6kl/wmi/wmi_host.h
4093  create mode 100644 include/linux/bcma/bcma_driver_mips.h
4094  create mode 100644 include/linux/bcma/bcma_soc.h
4095  create mode 100644 include/net/cfg80211-wext.h
4096 Merging bluetooth/master
4097 $ git merge bluetooth/master
4098 Merge made by recursive.
4099  drivers/bluetooth/ath3k.c     |    1 +
4100  drivers/bluetooth/btusb.c     |   16 ++-
4101  include/net/bluetooth/l2cap.h |    3 +-
4102  net/bluetooth/af_bluetooth.c  |   36 +++++-
4103  net/bluetooth/bnep/bnep.h     |    1 +
4104  net/bluetooth/bnep/core.c     |   18 ++-
4105  net/bluetooth/cmtp/capi.c     |    3 +-
4106  net/bluetooth/cmtp/cmtp.h     |    1 +
4107  net/bluetooth/cmtp/core.c     |   25 +++--
4108  net/bluetooth/hci_conn.c      |   14 +-
4109  net/bluetooth/hci_core.c      |    8 +-
4110  net/bluetooth/hidp/core.c     |   29 +++--
4111  net/bluetooth/l2cap_core.c    |  263 ++++++++++++++---------------------------
4112  net/bluetooth/l2cap_sock.c    |   30 +++---
4113  net/bluetooth/rfcomm/core.c   |   22 ++--
4114  net/bluetooth/rfcomm/sock.c   |   28 ++--
4115  net/bluetooth/sco.c           |   28 ++--
4116  17 files changed, 249 insertions(+), 277 deletions(-)
4117 Merging mtd/master
4118 $ git merge mtd/master
4119 Already up-to-date.
4120 Merging l2-mtd/master
4121 $ git merge l2-mtd/master
4122 Resolved 'drivers/mtd/maps/lantiq-flash.c' using previous resolution.
4123 Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
4124 Auto-merging arch/arm/mach-at91/board-cam60.c
4125 Auto-merging arch/arm/mach-at91/board-cap9adk.c
4126 Auto-merging arch/arm/mach-at91/board-kb9202.c
4127 Auto-merging arch/arm/mach-at91/board-neocore926.c
4128 Auto-merging arch/arm/mach-at91/board-qil-a9260.c
4129 Auto-merging arch/arm/mach-at91/board-rm9200dk.c
4130 Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
4131 Auto-merging arch/arm/mach-at91/board-sam9260ek.c
4132 Auto-merging arch/arm/mach-at91/board-sam9261ek.c
4133 Auto-merging arch/arm/mach-at91/board-sam9263ek.c
4134 Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
4135 Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
4136 Auto-merging arch/arm/mach-at91/board-sam9rlek.c
4137 Auto-merging arch/arm/mach-at91/board-usb-a9260.c
4138 Auto-merging arch/arm/mach-at91/board-usb-a9263.c
4139 Auto-merging arch/arm/mach-at91/board-yl-9200.c
4140 Auto-merging arch/arm/mach-mmp/aspenite.c
4141 Removing drivers/mtd/maps/ceiva.c
4142 Removing drivers/mtd/maps/edb7312.c
4143 Auto-merging drivers/mtd/maps/lantiq-flash.c
4144 CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
4145 Removing drivers/mtd/nand/edb7312.c
4146 Auto-merging drivers/mtd/onenand/omap2.c
4147 Automatic merge failed; fix conflicts and then commit the result.
4148 $ git commit -v -a
4149 [master bafbf22] Merge remote-tracking branch 'l2-mtd/master'
4150 $ git diff -M --stat --summary HEAD^..
4151  Documentation/DocBook/mtdnand.tmpl                 |    5 +-
4152  .../devicetree/bindings/mtd/atmel-dataflash.txt    |   14 +
4153  arch/arm/mach-at91/board-afeb-9260v1.c             |    9 +-
4154  arch/arm/mach-at91/board-cam60.c                   |    9 +-
4155  arch/arm/mach-at91/board-cap9adk.c                 |    9 +-
4156  arch/arm/mach-at91/board-kb9202.c                  |    9 +-
4157  arch/arm/mach-at91/board-neocore926.c              |    9 +-
4158  arch/arm/mach-at91/board-qil-a9260.c               |    9 +-
4159  arch/arm/mach-at91/board-rm9200dk.c                |    9 +-
4160  arch/arm/mach-at91/board-sam9-l9260.c              |    9 +-
4161  arch/arm/mach-at91/board-sam9260ek.c               |    9 +-
4162  arch/arm/mach-at91/board-sam9261ek.c               |    9 +-
4163  arch/arm/mach-at91/board-sam9263ek.c               |    9 +-
4164  arch/arm/mach-at91/board-sam9g20ek.c               |    9 +-
4165  arch/arm/mach-at91/board-sam9m10g45ek.c            |    9 +-
4166  arch/arm/mach-at91/board-sam9rlek.c                |    9 +-
4167  arch/arm/mach-at91/board-snapper9260.c             |   10 +-
4168  arch/arm/mach-at91/board-usb-a9260.c               |    9 +-
4169  arch/arm/mach-at91/board-usb-a9263.c               |    9 +-
4170  arch/arm/mach-at91/board-yl-9200.c                 |    9 +-
4171  arch/arm/mach-at91/include/mach/board.h            |    3 +-
4172  arch/arm/mach-davinci/board-da830-evm.c            |    2 +-
4173  arch/arm/mach-davinci/board-da850-evm.c            |    2 +-
4174  arch/arm/mach-davinci/board-dm355-evm.c            |    2 +-
4175  arch/arm/mach-davinci/board-dm355-leopard.c        |    2 +-
4176  arch/arm/mach-davinci/board-dm365-evm.c            |    2 +-
4177  arch/arm/mach-davinci/board-dm644x-evm.c           |    2 +-
4178  arch/arm/mach-davinci/board-mityomapl138.c         |    3 +-
4179  arch/arm/mach-davinci/board-neuros-osd2.c          |    2 +-
4180  arch/arm/mach-davinci/board-tnetv107x-evm.c        |    2 +-
4181  arch/arm/mach-davinci/include/mach/nand.h          |    4 +-
4182  arch/arm/mach-ep93xx/ts72xx.c                      |   23 +-
4183  arch/arm/mach-mmp/aspenite.c                       |    5 +-
4184  arch/arm/mach-orion5x/ts78xx-setup.c               |    2 +-
4185  arch/arm/mach-pxa/cm-x300.c                        |    5 +-
4186  arch/arm/mach-pxa/colibri-pxa3xx.c                 |    5 +-
4187  arch/arm/mach-pxa/littleton.c                      |    5 +-
4188  arch/arm/mach-pxa/mxm8x10.c                        |    9 +-
4189  arch/arm/mach-pxa/raumfeld.c                       |    5 +-
4190  arch/arm/mach-pxa/zylonite.c                       |    5 +-
4191  arch/arm/plat-pxa/include/plat/pxa3xx_nand.h       |   20 +-
4192  arch/avr32/boards/atngw100/setup.c                 |    8 +-
4193  arch/avr32/boards/atstk1000/atstk1002.c            |    9 +-
4194  arch/avr32/mach-at32ap/include/mach/board.h        |    3 +-
4195  arch/cris/arch-v32/drivers/mach-a3/nandflash.c     |    2 +-
4196  arch/cris/arch-v32/drivers/mach-fs/nandflash.c     |    2 +-
4197  drivers/mtd/Kconfig                                |   16 +-
4198  drivers/mtd/Makefile                               |    2 +-
4199  drivers/mtd/afs.c                                  |    4 +-
4200  drivers/mtd/ar7part.c                              |    2 +-
4201  drivers/mtd/chips/cfi_cmdset_0002.c                |   31 +-
4202  drivers/mtd/chips/fwh_lock.h                       |    3 +-
4203  drivers/mtd/chips/jedec_probe.c                    |   34 +-
4204  drivers/mtd/cmdlinepart.c                          |    7 +-
4205  drivers/mtd/devices/doc2000.c                      |   13 +-
4206  drivers/mtd/devices/doc2001.c                      |    7 +-
4207  drivers/mtd/devices/doc2001plus.c                  |    7 +-
4208  drivers/mtd/devices/docecc.c                       |    2 +-
4209  drivers/mtd/devices/lart.c                         |   18 +-
4210  drivers/mtd/devices/m25p80.c                       |   84 +--
4211  drivers/mtd/devices/mtd_dataflash.c                |   91 +-
4212  drivers/mtd/devices/sst25l.c                       |   42 +-
4213  drivers/mtd/ftl.c                                  |   40 +-
4214  drivers/mtd/inftlcore.c                            |   59 +-
4215  drivers/mtd/inftlmount.c                           |  116 +--
4216  drivers/mtd/maps/Kconfig                           |   22 -
4217  drivers/mtd/maps/Makefile                          |    2 -
4218  drivers/mtd/maps/bfin-async-flash.c                |   16 +-
4219  drivers/mtd/maps/ceiva.c                           |  341 -------
4220  drivers/mtd/maps/dc21285.c                         |    9 +-
4221  drivers/mtd/maps/edb7312.c                         |  134 ---
4222  drivers/mtd/maps/gpio-addr-flash.c                 |   16 +-
4223  drivers/mtd/maps/h720x-flash.c                     |   23 +-
4224  drivers/mtd/maps/impa7.c                           |   28 +-
4225  drivers/mtd/maps/intel_vr_nor.c                    |    7 +-
4226  drivers/mtd/maps/ixp2000.c                         |   11 +-
4227  drivers/mtd/maps/ixp4xx.c                          |   29 +-
4228  drivers/mtd/maps/lantiq-flash.c                    |   17 +-
4229  drivers/mtd/maps/latch-addr-flash.c                |   24 +-
4230  drivers/mtd/maps/pcmciamtd.c                       |  124 +--
4231  drivers/mtd/maps/physmap.c                         |   38 +-
4232  drivers/mtd/maps/physmap_of.c                      |   80 +--
4233  drivers/mtd/maps/plat-ram.c                        |   23 +-
4234  drivers/mtd/maps/pxa2xx-flash.c                    |   20 +-
4235  drivers/mtd/maps/rbtx4939-flash.c                  |   24 +-
4236  drivers/mtd/maps/sa1100-flash.c                    |   30 +-
4237  drivers/mtd/maps/solutionengine.c                  |   30 +-
4238  drivers/mtd/maps/wr_sbc82xx_flash.c                |   33 +-
4239  drivers/mtd/mtdblock.c                             |   18 +-
4240  drivers/mtd/mtdchar.c                              |   37 +-
4241  drivers/mtd/mtdconcat.c                            |    2 +-
4242  drivers/mtd/mtdcore.c                              |   69 +-
4243  drivers/mtd/mtdcore.h                              |    3 +
4244  drivers/mtd/mtdpart.c                              |   52 +-
4245  drivers/mtd/mtdsuper.c                             |   20 +-
4246  drivers/mtd/mtdswap.c                              |    5 +-
4247  drivers/mtd/nand/Kconfig                           |   14 +-
4248  drivers/mtd/nand/Makefile                          |    1 -
4249  drivers/mtd/nand/atmel_nand.c                      |   74 +--
4250  drivers/mtd/nand/au1550nd.c                        |   29 +-
4251  drivers/mtd/nand/autcpu12.c                        |    4 +-
4252  drivers/mtd/nand/bcm_umi_nand.c                    |   24 +-
4253  drivers/mtd/nand/cafe_nand.c                       |   21 +-
4254  drivers/mtd/nand/cmx270_nand.c                     |   23 +-
4255  drivers/mtd/nand/cs553x_nand.c                     |   15 +-
4256  drivers/mtd/nand/davinci_nand.c                    |   39 +-
4257  drivers/mtd/nand/denali.c                          |    6 +-
4258  drivers/mtd/nand/diskonchip.c                      |    6 +-
4259  drivers/mtd/nand/edb7312.c                         |  203 ----
4260  drivers/mtd/nand/fsl_elbc_nand.c                   |   75 +-
4261  drivers/mtd/nand/fsl_upm.c                         |   16 +-
4262  drivers/mtd/nand/fsmc_nand.c                       |   77 +--
4263  drivers/mtd/nand/h1910.c                           |   19 +-
4264  drivers/mtd/nand/jz4740_nand.c                     |   18 +-
4265  drivers/mtd/nand/mpc5121_nfc.c                     |   22 +-
4266  drivers/mtd/nand/mxc_nand.c                        |   33 +-
4267  drivers/mtd/nand/nand_base.c                       |  996 ++++++++++----------
4268  drivers/mtd/nand/nand_bbt.c                        |  516 +++++------
4269  drivers/mtd/nand/nand_bch.c                        |    4 +-
4270  drivers/mtd/nand/nand_ecc.c                        |   10 +-
4271  drivers/mtd/nand/nandsim.c                         |    4 +-
4272  drivers/mtd/nand/ndfc.c                            |   22 +-
4273  drivers/mtd/nand/nomadik_nand.c                    |    1 +
4274  drivers/mtd/nand/nuc900_nand.c                     |    1 +
4275  drivers/mtd/nand/omap2.c                           |   22 +-
4276  drivers/mtd/nand/orion_nand.c                      |   16 +-
4277  drivers/mtd/nand/pasemi_nand.c                     |    3 +-
4278  drivers/mtd/nand/plat_nand.c                       |   25 +-
4279  drivers/mtd/nand/ppchameleonevb.c                  |   47 +-
4280  drivers/mtd/nand/pxa3xx_nand.c                     |  471 ++++++----
4281  drivers/mtd/nand/rtc_from4.c                       |    5 +-
4282  drivers/mtd/nand/s3c2410.c                         |   27 +-
4283  drivers/mtd/nand/sharpsl.c                         |   13 +-
4284  drivers/mtd/nand/socrates_nand.c                   |   28 +-
4285  drivers/mtd/nand/tmio_nand.c                       |   17 +-
4286  drivers/mtd/nand/txx9ndfmc.c                       |    8 +-
4287  drivers/mtd/nftlcore.c                             |   27 +-
4288  drivers/mtd/nftlmount.c                            |   26 +-
4289  drivers/mtd/ofpart.c                               |  112 +++-
4290  drivers/mtd/onenand/generic.c                      |   14 +-
4291  drivers/mtd/onenand/omap2.c                        |   16 +-
4292  drivers/mtd/onenand/onenand_base.c                 |   62 +-
4293  drivers/mtd/onenand/onenand_bbt.c                  |    6 +-
4294  drivers/mtd/onenand/samsung.c                      |   13 +-
4295  drivers/mtd/redboot.c                              |   13 +-
4296  drivers/mtd/sm_ftl.c                               |   18 +-
4297  drivers/mtd/ssfdc.c                                |   44 +-
4298  drivers/mtd/tests/mtd_readtest.c                   |    3 +-
4299  fs/jffs2/scan.c                                    |    4 +-
4300  fs/jffs2/wbuf.c                                    |    3 +-
4301  include/linux/mtd/bbm.h                            |   39 +-
4302  include/linux/mtd/mtd.h                            |   38 +-
4303  include/linux/mtd/nand.h                           |   78 +-
4304  include/linux/mtd/onenand.h                        |    4 +
4305  include/linux/mtd/partitions.h                     |   46 +-
4306  include/linux/mtd/physmap.h                        |   17 -
4307  156 files changed, 2093 insertions(+), 3626 deletions(-)
4308  create mode 100644 Documentation/devicetree/bindings/mtd/atmel-dataflash.txt
4309  delete mode 100644 drivers/mtd/maps/ceiva.c
4310  delete mode 100644 drivers/mtd/maps/edb7312.c
4311  delete mode 100644 drivers/mtd/nand/edb7312.c
4312 Merging crypto/master
4313 $ git merge crypto/master
4314 Merge made by recursive.
4315  .../devicetree/bindings/crypto/picochip-spacc.txt  |   23 +
4316  arch/x86/crypto/Makefile                           |    8 +
4317  arch/x86/crypto/sha1_ssse3_asm.S                   |  558 ++++++++++++++++++++
4318  arch/x86/crypto/sha1_ssse3_glue.c                  |  240 +++++++++
4319  arch/x86/include/asm/cpufeature.h                  |    3 +
4320  crypto/Kconfig                                     |   10 +
4321  crypto/sha1_generic.c                              |    9 +-
4322  drivers/crypto/n2_core.c                           |    4 +-
4323  drivers/crypto/padlock-aes.c                       |    4 +-
4324  drivers/crypto/picoxcell_crypto.c                  |  121 ++---
4325  include/crypto/sha.h                               |    5 +
4326  11 files changed, 914 insertions(+), 71 deletions(-)
4327  create mode 100644 Documentation/devicetree/bindings/crypto/picochip-spacc.txt
4328  create mode 100644 arch/x86/crypto/sha1_ssse3_asm.S
4329  create mode 100644 arch/x86/crypto/sha1_ssse3_glue.c
4330 Merging sound/for-next
4331 $ git merge sound/for-next
4332 Removing sound/pci/hda/alc268_quirks.c
4333 Removing sound/pci/hda/alc680_quirks.c
4334 Merge made by recursive.
4335  .../bindings/sound/soc/codecs/fsl-sgtl5000.txt     |   11 +
4336  Documentation/devicetree/bindings/sound/wm8731.txt |   18 +
4337  Documentation/sound/alsa/ALSA-Configuration.txt    |    5 +
4338  Documentation/sound/alsa/HD-Audio-Models.txt       |   27 +-
4339  Documentation/sound/alsa/HD-Audio.txt              |   48 ++
4340  arch/mips/alchemy/devboards/db1200/platform.c      |   16 +
4341  arch/mips/alchemy/devboards/db1x00/platform.c      |   48 ++
4342  include/linux/mfd/wm8994/registers.h               |   39 ++
4343  include/sound/soc-dapm.h                           |    2 +
4344  include/sound/soc.h                                |    9 +
4345  sound/firewire/isight.c                            |    1 -
4346  sound/mips/Kconfig                                 |    5 +-
4347  sound/pci/ac97/ac97_patch.c                        |    1 +
4348  sound/pci/hda/Makefile                             |    3 +
4349  sound/pci/hda/alc260_quirks.c                      |  304 ---------
4350  sound/pci/hda/alc262_quirks.c                      |  508 +--------------
4351  sound/pci/hda/alc268_quirks.c                      |  636 ------------------
4352  sound/pci/hda/alc269_quirks.c                      |  250 -------
4353  sound/pci/hda/alc662_quirks.c                      |  131 ----
4354  sound/pci/hda/alc680_quirks.c                      |  222 -------
4355  sound/pci/hda/alc861vd_quirks.c                    |  217 -------
4356  sound/pci/hda/hda_codec.c                          |   35 +-
4357  sound/pci/hda/hda_intel.c                          |   68 ++-
4358  sound/pci/hda/hda_local.h                          |    2 +
4359  sound/pci/hda/hda_trace.h                          |  117 ++++
4360  sound/pci/hda/patch_realtek.c                      |  154 ++---
4361  sound/pci/oxygen/xonar_pcm179x.c                   |    1 +
4362  sound/pci/rme9652/hdspm.c                          |  139 +++--
4363  sound/soc/Kconfig                                  |    3 +
4364  sound/soc/Makefile                                 |    1 +
4365  sound/soc/au1x/Kconfig                             |   28 +
4366  sound/soc/au1x/Makefile                            |   10 +
4367  sound/soc/au1x/ac97c.c                             |  365 +++++++++++
4368  sound/soc/au1x/db1000.c                            |   75 +++
4369  sound/soc/au1x/db1200.c                            |   64 ++-
4370  sound/soc/au1x/dbdma2.c                            |   91 +---
4371  sound/soc/au1x/dma.c                               |  377 +++++++++++
4372  sound/soc/au1x/i2sc.c                              |  347 ++++++++++
4373  sound/soc/au1x/psc-ac97.c                          |   48 +-
4374  sound/soc/au1x/psc-i2s.c                           |   42 +-
4375  sound/soc/au1x/psc.h                               |   16 +-
4376  sound/soc/codecs/sgtl5000.c                        |    8 +
4377  sound/soc/codecs/wm1250-ev1.c                      |   20 +-
4378  sound/soc/codecs/wm8523.c                          |    2 +-
4379  sound/soc/codecs/wm8580.c                          |    2 +-
4380  sound/soc/codecs/wm8711.c                          |    4 +-
4381  sound/soc/codecs/wm8728.c                          |    4 +-
4382  sound/soc/codecs/wm8731.c                          |   10 +
4383  sound/soc/codecs/wm8741.c                          |  126 +++-
4384  sound/soc/codecs/wm8753.c                          |    4 +-
4385  sound/soc/codecs/wm8993.c                          |    3 +-
4386  sound/soc/codecs/wm8994-tables.c                   |    4 +-
4387  sound/soc/codecs/wm8994.c                          |    6 +-
4388  sound/soc/codecs/wm_hubs.c                         |   32 +-
4389  sound/soc/codecs/wm_hubs.h                         |    3 +-
4390  sound/soc/mxs/Kconfig                              |   20 +
4391  sound/soc/mxs/Makefile                             |   10 +
4392  sound/soc/mxs/mxs-pcm.c                            |  359 +++++++++++
4393  sound/soc/mxs/mxs-pcm.h                            |   43 ++
4394  sound/soc/mxs/mxs-saif.c                           |  677 ++++++++++++++++++++
4395  sound/soc/mxs/mxs-saif.h                           |  130 ++++
4396  sound/soc/mxs/mxs-sgtl5000.c                       |  165 +++++
4397  sound/soc/samsung/smdk_wm8580.c                    |    6 +-
4398  sound/soc/samsung/smdk_wm8580pcm.c                 |    4 +-
4399  sound/soc/samsung/speyside.c                       |    5 +-
4400  sound/soc/soc-core.c                               |    4 +-
4401  sound/soc/soc-dapm.c                               |    6 +-
4402  sound/soc/soc-io.c                                 |  323 ++--------
4403  sound/usb/caiaq/audio.c                            |   31 +-
4404  sound/usb/caiaq/device.h                           |    1 +
4405  70 files changed, 3557 insertions(+), 2939 deletions(-)
4406  create mode 100644 Documentation/devicetree/bindings/sound/soc/codecs/fsl-sgtl5000.txt
4407  create mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt
4408  delete mode 100644 sound/pci/hda/alc268_quirks.c
4409  delete mode 100644 sound/pci/hda/alc680_quirks.c
4410  create mode 100644 sound/pci/hda/hda_trace.h
4411  create mode 100644 sound/soc/au1x/ac97c.c
4412  create mode 100644 sound/soc/au1x/db1000.c
4413  create mode 100644 sound/soc/au1x/dma.c
4414  create mode 100644 sound/soc/au1x/i2sc.c
4415  create mode 100644 sound/soc/mxs/Kconfig
4416  create mode 100644 sound/soc/mxs/Makefile
4417  create mode 100644 sound/soc/mxs/mxs-pcm.c
4418  create mode 100644 sound/soc/mxs/mxs-pcm.h
4419  create mode 100644 sound/soc/mxs/mxs-saif.c
4420  create mode 100644 sound/soc/mxs/mxs-saif.h
4421  create mode 100644 sound/soc/mxs/mxs-sgtl5000.c
4422 Merging sound-asoc/for-next
4423 $ git merge sound-asoc/for-next
4424 Merge made by recursive.
4425  Documentation/devicetree/bindings/sound/wm8510.txt |   18 +
4426  Documentation/devicetree/bindings/sound/wm8523.txt |   16 +
4427  Documentation/devicetree/bindings/sound/wm8580.txt |   16 +
4428  Documentation/devicetree/bindings/sound/wm8711.txt |   18 +
4429  Documentation/devicetree/bindings/sound/wm8728.txt |   18 +
4430  Documentation/devicetree/bindings/sound/wm8737.txt |   18 +
4431  Documentation/devicetree/bindings/sound/wm8741.txt |   18 +
4432  Documentation/devicetree/bindings/sound/wm8750.txt |   18 +
4433  Documentation/devicetree/bindings/sound/wm8753.txt |   18 +
4434  include/linux/mfd/wm8994/registers.h               |   45 +
4435  include/sound/adau1373.h                           |   34 +
4436  sound/soc/au1x/ac97c.c                             |    2 -
4437  sound/soc/au1x/i2sc.c                              |    1 -
4438  sound/soc/blackfin/Kconfig                         |   13 +
4439  sound/soc/blackfin/Makefile                        |    2 +
4440  sound/soc/blackfin/bf5xx-ad193x.c                  |    2 +-
4441  sound/soc/blackfin/bfin-eval-adau1373.c            |  202 +++
4442  sound/soc/codecs/Kconfig                           |    4 +
4443  sound/soc/codecs/Makefile                          |    2 +
4444  sound/soc/codecs/ad193x.c                          |   11 +-
4445  sound/soc/codecs/ad193x.h                          |    5 +-
4446  sound/soc/codecs/adau1373.c                        | 1414 ++++++++++++++++++++
4447  sound/soc/codecs/adau1373.h                        |   29 +
4448  sound/soc/codecs/sta32x.c                          |   22 +-
4449  sound/soc/codecs/wm1250-ev1.c                      |    2 +-
4450  sound/soc/codecs/wm8510.c                          |    8 +
4451  sound/soc/codecs/wm8523.c                          |    7 +
4452  sound/soc/codecs/wm8580.c                          |    7 +
4453  sound/soc/codecs/wm8711.c                          |    9 +
4454  sound/soc/codecs/wm8728.c                          |    9 +
4455  sound/soc/codecs/wm8737.c                          |   10 +
4456  sound/soc/codecs/wm8741.c                          |    9 +
4457  sound/soc/codecs/wm8750.c                          |   14 +-
4458  sound/soc/codecs/wm8753.c                          |    9 +
4459  sound/soc/codecs/wm8962.c                          |    8 +-
4460  sound/soc/codecs/wm8993.c                          |    4 +
4461  sound/soc/codecs/wm8994-tables.c                   |   12 +-
4462  sound/soc/codecs/wm8994.c                          |  264 +++-
4463  sound/soc/codecs/wm8994.h                          |    2 +
4464  sound/soc/codecs/wm_hubs.c                         |   16 +
4465  sound/soc/fsl/fsl_dma.c                            |    1 -
4466  sound/soc/fsl/fsl_ssi.c                            |   61 +-
4467  sound/soc/nuc900/nuc900-pcm.c                      |    1 -
4468  sound/soc/omap/ams-delta.c                         |    6 +-
4469  sound/soc/pxa/spitz.c                              |    2 +-
4470  sound/soc/pxa/z2.c                                 |    2 +-
4471  sound/soc/s6000/s6000-pcm.c                        |    1 -
4472  sound/soc/samsung/h1940_uda1380.c                  |    1 +
4473  sound/soc/samsung/jive_wm8750.c                    |    2 +-
4474  sound/soc/samsung/rx1950_uda1380.c                 |    1 +
4475  sound/soc/samsung/smartq_wm8987.c                  |    2 +-
4476  sound/soc/samsung/speyside_wm8962.c                |    4 +-
4477  sound/soc/soc-cache.c                              |    7 -
4478  sound/soc/soc-dapm.c                               |    6 +-
4479  sound/soc/soc-io.c                                 |   11 +-
4480  sound/soc/soc-jack.c                               |    2 +-
4481  sound/soc/soc-pcm.c                                |    5 +-
4482  57 files changed, 2308 insertions(+), 143 deletions(-)
4483  create mode 100644 Documentation/devicetree/bindings/sound/wm8510.txt
4484  create mode 100644 Documentation/devicetree/bindings/sound/wm8523.txt
4485  create mode 100644 Documentation/devicetree/bindings/sound/wm8580.txt
4486  create mode 100644 Documentation/devicetree/bindings/sound/wm8711.txt
4487  create mode 100644 Documentation/devicetree/bindings/sound/wm8728.txt
4488  create mode 100644 Documentation/devicetree/bindings/sound/wm8737.txt
4489  create mode 100644 Documentation/devicetree/bindings/sound/wm8741.txt
4490  create mode 100644 Documentation/devicetree/bindings/sound/wm8750.txt
4491  create mode 100644 Documentation/devicetree/bindings/sound/wm8753.txt
4492  create mode 100644 include/sound/adau1373.h
4493  create mode 100644 sound/soc/blackfin/bfin-eval-adau1373.c
4494  create mode 100644 sound/soc/codecs/adau1373.c
4495  create mode 100644 sound/soc/codecs/adau1373.h
4496 Merging cpufreq/next
4497 $ git merge cpufreq/next
4498 Merge made by recursive.
4499  Documentation/cpu-freq/governors.txt |    2 +-
4500  drivers/cpufreq/cpufreq_ondemand.c   |    2 +-
4501  drivers/cpufreq/e_powersaver.c       |  135 +++++++++++++++++++++++++++++++---
4502  drivers/cpufreq/exynos4210-cpufreq.c |   23 ++++++-
4503  4 files changed, 148 insertions(+), 14 deletions(-)
4504 Merging quilt/rr
4505 $ git merge quilt/rr
4506 Auto-merging drivers/net/virtio_net.c
4507 Merge made by recursive.
4508  arch/x86/lguest/boot.c        |   10 ++++++++++
4509  drivers/char/virtio_console.c |   10 ++++------
4510  drivers/lguest/core.c         |    2 +-
4511  drivers/net/virtio_net.c      |   14 +++++---------
4512  include/linux/virtio_config.h |    3 +++
4513  5 files changed, 23 insertions(+), 16 deletions(-)
4514 Merging input/next
4515 $ git merge input/next
4516 Auto-merging drivers/input/misc/Kconfig
4517 Auto-merging drivers/input/misc/Makefile
4518 Merge made by recursive.
4519  drivers/input/input-polldev.c        |    6 +-
4520  drivers/input/misc/Kconfig           |   45 ++-
4521  drivers/input/misc/Makefile          |    4 +-
4522  drivers/input/misc/bma150.c          |  691 ++++++++++++++++++++++++++++++++++
4523  drivers/input/misc/pm8xxx-vibrator.c |  296 +++++++++++++++
4524  include/linux/bma150.h               |   46 +++
4525  6 files changed, 1074 insertions(+), 14 deletions(-)
4526  create mode 100644 drivers/input/misc/bma150.c
4527  create mode 100644 drivers/input/misc/pm8xxx-vibrator.c
4528  create mode 100644 include/linux/bma150.h
4529 Merging input-mt/next
4530 $ git merge input-mt/next
4531 Already up-to-date.
4532 Merging lsm/for-next
4533 $ git merge lsm/for-next
4534 Already up-to-date.
4535 Merging block/for-next
4536 $ git merge block/for-next
4537 Auto-merging Documentation/kernel-parameters.txt
4538 Auto-merging block/blk-core.c
4539 Merge made by recursive.
4540  Documentation/block/cfq-iosched.txt |   71 +++++++++
4541  Documentation/kernel-parameters.txt |    9 +-
4542  block/Kconfig                       |   10 ++
4543  block/Makefile                      |    1 +
4544  block/blk-core.c                    |    8 +-
4545  block/blk-flush.c                   |   25 +++-
4546  block/blk-softirq.c                 |    8 +
4547  block/blk-throttle.c                |    4 +-
4548  block/blk.h                         |    2 +
4549  block/bsg-lib.c                     |  298 +++++++++++++++++++++++++++++++++++
4550  block/cfq-iosched.c                 |    3 +
4551  block/genhd.c                       |    8 +-
4552  drivers/block/Kconfig               |   17 ++-
4553  drivers/block/drbd/drbd_nl.c        |    4 +-
4554  drivers/block/loop.c                |  297 ++++++++++++++++++++++++-----------
4555  drivers/block/swim3.c               |    1 +
4556  drivers/block/xen-blkfront.c        |    6 +-
4557  drivers/cdrom/cdrom.c               |    8 +-
4558  include/linux/blk_types.h           |    7 +-
4559  include/linux/blkdev.h              |    5 +
4560  include/linux/blktrace_api.h        |    5 +-
4561  include/linux/bsg-lib.h             |   73 +++++++++
4562  include/linux/loop.h                |    5 +-
4563  include/linux/miscdevice.h          |    1 +
4564  include/trace/events/block.h        |   20 ++-
4565  kernel/trace/blktrace.c             |   21 ++-
4566  26 files changed, 782 insertions(+), 135 deletions(-)
4567  create mode 100644 block/bsg-lib.c
4568  create mode 100644 include/linux/bsg-lib.h
4569 Merging quilt/device-mapper
4570 $ git merge quilt/device-mapper
4571 Merge made by recursive.
4572  Documentation/device-mapper/persistent-data.txt    |   84 +
4573  Documentation/device-mapper/thin-provisioning.txt  |  275 +++
4574  drivers/md/Kconfig                                 |    9 +
4575  drivers/md/Makefile                                |    3 +
4576  drivers/md/dm-crypt.c                              |    1 +
4577  drivers/md/dm-flakey.c                             |    4 +-
4578  drivers/md/dm-kcopyd.c                             |   31 +-
4579  drivers/md/dm-raid.c                               |    2 +-
4580  drivers/md/dm-table.c                              |   84 +-
4581  drivers/md/dm-thin-metadata.c                      | 1406 ++++++++++++
4582  drivers/md/dm-thin-metadata.h                      |  168 ++
4583  drivers/md/dm-thin.c                               | 2280 ++++++++++++++++++++
4584  drivers/md/dm.c                                    |   12 +-
4585  drivers/md/persistent-data/Kconfig                 |    7 +
4586  drivers/md/persistent-data/Makefile                |    9 +
4587  drivers/md/persistent-data/dm-block-manager.c      |  998 +++++++++
4588  drivers/md/persistent-data/dm-block-manager.h      |  134 ++
4589  drivers/md/persistent-data/dm-btree-internal.h     |  133 ++
4590  drivers/md/persistent-data/dm-btree-remove.c       |  571 +++++
4591  drivers/md/persistent-data/dm-btree-spine.c        |  222 ++
4592  drivers/md/persistent-data/dm-btree.c              |  861 ++++++++
4593  drivers/md/persistent-data/dm-btree.h              |  158 ++
4594  .../persistent-data/dm-persistent-data-internal.h  |   20 +
4595  drivers/md/persistent-data/dm-space-map-common.h   |   94 +
4596  drivers/md/persistent-data/dm-space-map-disk.c     |  663 ++++++
4597  drivers/md/persistent-data/dm-space-map-disk.h     |   25 +
4598  drivers/md/persistent-data/dm-space-map-metadata.c |  956 ++++++++
4599  drivers/md/persistent-data/dm-space-map-metadata.h |   33 +
4600  drivers/md/persistent-data/dm-space-map.h          |  118 +
4601  .../md/persistent-data/dm-transaction-manager.c    |  414 ++++
4602  .../md/persistent-data/dm-transaction-manager.h    |  130 ++
4603  include/linux/device-mapper.h                      |   40 +-
4604  include/linux/dm-kcopyd.h                          |    4 +
4605  33 files changed, 9927 insertions(+), 22 deletions(-)
4606  create mode 100644 Documentation/device-mapper/persistent-data.txt
4607  create mode 100644 Documentation/device-mapper/thin-provisioning.txt
4608  create mode 100644 drivers/md/dm-thin-metadata.c
4609  create mode 100644 drivers/md/dm-thin-metadata.h
4610  create mode 100644 drivers/md/dm-thin.c
4611  create mode 100644 drivers/md/persistent-data/Kconfig
4612  create mode 100644 drivers/md/persistent-data/Makefile
4613  create mode 100644 drivers/md/persistent-data/dm-block-manager.c
4614  create mode 100644 drivers/md/persistent-data/dm-block-manager.h
4615  create mode 100644 drivers/md/persistent-data/dm-btree-internal.h
4616  create mode 100644 drivers/md/persistent-data/dm-btree-remove.c
4617  create mode 100644 drivers/md/persistent-data/dm-btree-spine.c
4618  create mode 100644 drivers/md/persistent-data/dm-btree.c
4619  create mode 100644 drivers/md/persistent-data/dm-btree.h
4620  create mode 100644 drivers/md/persistent-data/dm-persistent-data-internal.h
4621  create mode 100644 drivers/md/persistent-data/dm-space-map-common.h
4622  create mode 100644 drivers/md/persistent-data/dm-space-map-disk.c
4623  create mode 100644 drivers/md/persistent-data/dm-space-map-disk.h
4624  create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.c
4625  create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.h
4626  create mode 100644 drivers/md/persistent-data/dm-space-map.h
4627  create mode 100644 drivers/md/persistent-data/dm-transaction-manager.c
4628  create mode 100644 drivers/md/persistent-data/dm-transaction-manager.h
4629 Merging embedded/master
4630 $ git merge embedded/master
4631 Already up-to-date.
4632 Merging firmware/master
4633 $ git merge firmware/master
4634 Already up-to-date.
4635 Merging pcmcia/master
4636 $ git merge pcmcia/master
4637 Already up-to-date.
4638 Merging battery/master
4639 $ git merge battery/master
4640 Already up-to-date.
4641 Merging leds/for-mm
4642 $ git merge leds/for-mm
4643 Resolved 'drivers/leds/Kconfig' using previous resolution.
4644 Auto-merging drivers/leds/Kconfig
4645 CONFLICT (content): Merge conflict in drivers/leds/Kconfig
4646 Automatic merge failed; fix conflicts and then commit the result.
4647 $ git commit -v -a
4648 [master e9e1265] Merge remote-tracking branch 'leds/for-mm'
4649 $ git diff -M --stat --summary HEAD^..
4650 Merging backlight/for-mm
4651 $ git merge backlight/for-mm
4652 Already up-to-date.
4653 Merging mmc/mmc-next
4654 $ git merge mmc/mmc-next
4655 Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c
4656 Merge made by recursive.
4657  drivers/mmc/core/host.c            |   11 ++++++++
4658  drivers/mmc/host/sdhci-esdhc-imx.c |   45 +++++++++++++++++++++++++++++++++--
4659  2 files changed, 53 insertions(+), 3 deletions(-)
4660 Merging kgdb/kgdb-next
4661 $ git merge kgdb/kgdb-next
4662 Merge made by recursive.
4663 Merging slab/for-next
4664 $ git merge slab/for-next
4665 Already up-to-date!
4666 Merge made by recursive.
4667 Merging uclinux/for-next
4668 $ git merge uclinux/for-next
4669 Already up-to-date.
4670 Merging md/for-next
4671 $ git merge md/for-next
4672 Merge made by recursive.
4673  drivers/md/md.c    |   12 +++++++++++-
4674  drivers/md/raid5.c |    6 ++----
4675  2 files changed, 13 insertions(+), 5 deletions(-)
4676 Merging mfd/for-next
4677 $ git merge mfd/for-next
4678 Already up-to-date.
4679 Merging hdlc/hdlc-next
4680 $ git merge hdlc/hdlc-next
4681 Already up-to-date.
4682 Merging drm/drm-next
4683 $ git merge drm/drm-next
4684 Already up-to-date.
4685 Merging fbdev/master
4686 $ git merge fbdev/master
4687 Auto-merging arch/powerpc/platforms/85xx/p1022_ds.c
4688 Auto-merging arch/powerpc/platforms/86xx/mpc8610_hpcd.c
4689 Auto-merging arch/powerpc/sysdev/fsl_soc.h
4690 Auto-merging drivers/staging/xgifb/XGI_main_26.c
4691 Auto-merging drivers/video/atmel_lcdfb.c
4692 Auto-merging drivers/video/backlight/adp8860_bl.c
4693 Auto-merging drivers/video/controlfb.c
4694 Auto-merging drivers/video/fb_defio.c
4695 Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
4696 Auto-merging drivers/video/platinumfb.c
4697 Auto-merging drivers/video/via/viafbdev.c
4698 Merge made by recursive.
4699  arch/powerpc/platforms/512x/mpc512x_shared.c |   22 +-
4700  arch/powerpc/platforms/85xx/p1022_ds.c       |   47 +--
4701  arch/powerpc/platforms/86xx/mpc8610_hpcd.c   |   55 ++--
4702  arch/powerpc/sysdev/fsl_soc.h                |   25 +-
4703  drivers/staging/xgifb/XGI_main_26.c          |   22 +-
4704  drivers/video/68328fb.c                      |    4 +-
4705  drivers/video/Kconfig                        |   16 +-
4706  drivers/video/Makefile                       |    1 +
4707  drivers/video/acornfb.c                      |    5 +-
4708  drivers/video/arkfb.c                        |    9 +-
4709  drivers/video/atmel_lcdfb.c                  |   15 +-
4710  drivers/video/aty/radeon_base.c              |   10 +-
4711  drivers/video/au1200fb.c                     |  297 ++++++--------
4712  drivers/video/backlight/adp8860_bl.c         |    1 -
4713  drivers/video/backlight/adp8870_bl.c         |    1 -
4714  drivers/video/controlfb.c                    |    2 +-
4715  drivers/video/da8xx-fb.c                     |  155 +++++++-
4716  drivers/video/fb-puv3.c                      |    4 +-
4717  drivers/video/fb_defio.c                     |    3 +-
4718  drivers/video/fsl-diu-fb.c                   |   74 +++-
4719  drivers/video/g364fb.c                       |    5 +-
4720  drivers/video/grvga.c                        |  579 ++++++++++++++++++++++++++
4721  drivers/video/gxt4500.c                      |    4 +-
4722  drivers/video/hgafb.c                        |    4 +-
4723  drivers/video/imsttfb.c                      |    2 +-
4724  drivers/video/intelfb/intelfbhw.c            |    6 +-
4725  drivers/video/mb862xx/mb862xxfbdrv.c         |    2 +-
4726  drivers/video/mx3fb.c                        |    6 +-
4727  drivers/video/neofb.c                        |    4 +-
4728  drivers/video/platinumfb.c                   |    2 +-
4729  drivers/video/pm2fb.c                        |    6 +-
4730  drivers/video/pm3fb.c                        |    6 +-
4731  drivers/video/pxa3xx-gcu.c                   |    2 -
4732  drivers/video/s3c-fb.c                       |    2 +-
4733  drivers/video/s3fb.c                         |    9 +-
4734  drivers/video/savage/savagefb_driver.c       |   16 +-
4735  drivers/video/sis/sis_main.c                 |   30 +-
4736  drivers/video/skeletonfb.c                   |    2 +-
4737  drivers/video/sm501fb.c                      |    6 +-
4738  drivers/video/tridentfb.c                    |    4 +-
4739  drivers/video/valkyriefb.c                   |    2 +-
4740  drivers/video/vfb.c                          |    4 +-
4741  drivers/video/vga16fb.c                      |    2 +-
4742  drivers/video/via/via_modesetting.h          |    5 +
4743  drivers/video/via/viafbdev.c                 |   16 +-
4744  drivers/video/vt8500lcdfb.c                  |    4 +-
4745  drivers/video/vt8623fb.c                     |    9 +-
4746  drivers/video/xilinxfb.c                     |    1 -
4747  48 files changed, 1110 insertions(+), 398 deletions(-)
4748  create mode 100644 drivers/video/grvga.c
4749 Merging viafb/viafb-next
4750 $ git merge viafb/viafb-next
4751 Merge made by recursive.
4752  drivers/video/via/dvi.c             |   34 +--
4753  drivers/video/via/dvi.h             |    3 +-
4754  drivers/video/via/global.c          |    2 +
4755  drivers/video/via/global.h          |    2 +
4756  drivers/video/via/hw.c              |  544 ++++++-----------------------------
4757  drivers/video/via/hw.h              |  285 +------------------
4758  drivers/video/via/lcd.c             |   53 ++--
4759  drivers/video/via/lcd.h             |    7 +-
4760  drivers/video/via/share.h           |   23 +--
4761  drivers/video/via/via-core.c        |    2 +-
4762  drivers/video/via/via_modesetting.c |  104 +++++++
4763  drivers/video/via/via_modesetting.h |   18 ++
4764  drivers/video/via/viafbdev.c        |  166 ++++++------
4765  drivers/video/via/viamode.c         |   60 +++-
4766  drivers/video/via/viamode.h         |    4 +-
4767  15 files changed, 391 insertions(+), 916 deletions(-)
4768 Merging omap_dss2/for-next
4769 $ git merge omap_dss2/for-next
4770 Already up-to-date.
4771 Merging voltage/for-next
4772 $ git merge voltage/for-next
4773 Merge made by recursive.
4774  drivers/regulator/88pm8607.c           |    2 +-
4775  drivers/regulator/aat2870-regulator.c  |    1 +
4776  drivers/regulator/max8649.c            |    2 +-
4777  drivers/regulator/max8952.c            |    3 ---
4778  drivers/regulator/tps65023-regulator.c |   11 +++++++++++
4779  drivers/regulator/tps6507x-regulator.c |    8 +-------
4780  drivers/regulator/tps65912-regulator.c |    2 --
4781  include/linux/regulator/consumer.h     |    2 +-
4782  8 files changed, 16 insertions(+), 15 deletions(-)
4783 Merging security/next
4784 $ git merge security/next
4785 Auto-merging Documentation/kernel-parameters.txt
4786 Auto-merging MAINTAINERS
4787 Auto-merging fs/gfs2/inode.c
4788 Auto-merging fs/xfs/xfs_iops.c
4789 Removing security/integrity/ima/ima_iint.c
4790 Merge made by recursive.
4791  Documentation/ABI/testing/evm       |   23 ++
4792  Documentation/kernel-parameters.txt |    6 +
4793  MAINTAINERS                         |    5 +
4794  fs/attr.c                           |    5 +-
4795  fs/btrfs/xattr.c                    |   50 +++---
4796  fs/cifs/xattr.c                     |   40 ++--
4797  fs/ext2/xattr_security.c            |   34 ++--
4798  fs/ext3/xattr_security.c            |   36 ++--
4799  fs/ext4/xattr_security.c            |   36 ++--
4800  fs/gfs2/inode.c                     |   38 ++--
4801  fs/jffs2/security.c                 |   35 ++--
4802  fs/jfs/xattr.c                      |   57 +++---
4803  fs/ocfs2/xattr.c                    |   38 +++--
4804  fs/reiserfs/xattr_security.c        |    4 +-
4805  fs/xattr.c                          |   63 ++++++-
4806  fs/xfs/xfs_iops.c                   |   39 ++--
4807  include/linux/evm.h                 |   92 +++++++++
4808  include/linux/ima.h                 |   13 --
4809  include/linux/integrity.h           |   38 ++++
4810  include/linux/security.h            |   28 ++-
4811  include/linux/xattr.h               |   14 ++-
4812  mm/shmem.c                          |    4 +-
4813  security/Kconfig                    |    2 +-
4814  security/Makefile                   |    4 +-
4815  security/commoncap.c                |   16 +-
4816  security/integrity/Kconfig          |    7 +
4817  security/integrity/Makefile         |   12 +
4818  security/integrity/evm/Kconfig      |   14 ++
4819  security/integrity/evm/Makefile     |    6 +
4820  security/integrity/evm/evm.h        |   38 ++++
4821  security/integrity/evm/evm_crypto.c |  216 ++++++++++++++++++++
4822  security/integrity/evm/evm_main.c   |  384 +++++++++++++++++++++++++++++++++++
4823  security/integrity/evm/evm_secfs.c  |  108 ++++++++++
4824  security/integrity/iint.c           |  171 ++++++++++++++++
4825  security/integrity/ima/Kconfig      |    1 +
4826  security/integrity/ima/Makefile     |    2 +-
4827  security/integrity/ima/ima.h        |   29 +--
4828  security/integrity/ima/ima_api.c    |    7 +-
4829  security/integrity/ima/ima_iint.c   |  169 ---------------
4830  security/integrity/ima/ima_main.c   |   12 +-
4831  security/integrity/integrity.h      |   47 +++++
4832  security/security.c                 |   71 ++++++-
4833  security/tomoyo/gc.c                |    2 +-
4834  43 files changed, 1581 insertions(+), 435 deletions(-)
4835  create mode 100644 Documentation/ABI/testing/evm
4836  create mode 100644 include/linux/evm.h
4837  create mode 100644 include/linux/integrity.h
4838  create mode 100644 security/integrity/Kconfig
4839  create mode 100644 security/integrity/Makefile
4840  create mode 100644 security/integrity/evm/Kconfig
4841  create mode 100644 security/integrity/evm/Makefile
4842  create mode 100644 security/integrity/evm/evm.h
4843  create mode 100644 security/integrity/evm/evm_crypto.c
4844  create mode 100644 security/integrity/evm/evm_main.c
4845  create mode 100644 security/integrity/evm/evm_secfs.c
4846  create mode 100644 security/integrity/iint.c
4847  delete mode 100644 security/integrity/ima/ima_iint.c
4848  create mode 100644 security/integrity/integrity.h
4849 Merging selinux/master
4850 $ git merge selinux/master
4851 Already up-to-date.
4852 Merging lblnet/master
4853 $ git merge lblnet/master
4854 Already up-to-date.
4855 Merging agp/agp-next
4856 $ git merge agp/agp-next
4857 Merge made by recursive.
4858 Merging watchdog/master
4859 $ git merge watchdog/master
4860 Merge made by recursive.
4861  drivers/watchdog/hpwdt.c        |    9 +++++----
4862  drivers/watchdog/watchdog_dev.c |   14 +++++++-------
4863  2 files changed, 12 insertions(+), 11 deletions(-)
4864 Merging bdev/master
4865 $ git merge bdev/master
4866 Already up-to-date.
4867 Merging dwmw2-iommu/master
4868 $ git merge dwmw2-iommu/master
4869 Already up-to-date.
4870 Merging cputime/cputime
4871 $ git merge cputime/cputime
4872 Already up-to-date.
4873 Merging osd/linux-next
4874 $ git merge osd/linux-next
4875 Merge made by recursive.
4876  fs/exofs/exofs.h       |    3 --
4877  fs/exofs/super.c       |   57 ++++++++++++++++++-----------------------------
4878  include/scsi/osd_ore.h |    2 +
4879  3 files changed, 24 insertions(+), 38 deletions(-)
4880 Merging jc_docs/docs-next
4881 $ git merge jc_docs/docs-next
4882 Already up-to-date.
4883 Merging nommu/master
4884 $ git merge nommu/master
4885 Already up-to-date.
4886 Merging trivial/for-next
4887 $ git merge trivial/for-next
4888 Auto-merging fs/eventpoll.c
4889 Auto-merging lib/idr.c
4890 Merge made by recursive.
4891  Documentation/ABI/removed/o2cb                     |    2 +-
4892  Documentation/ABI/testing/sysfs-bus-bcma           |    8 ++++----
4893  .../testing/sysfs-class-backlight-driver-adp8870   |   16 ++++++++--------
4894  drivers/usb/serial/mos7720.c                       |    1 -
4895  drivers/usb/serial/mos7840.c                       |    1 -
4896  fs/eventpoll.c                                     |    2 +-
4897  lib/idr.c                                          |    2 +-
4898  7 files changed, 15 insertions(+), 17 deletions(-)
4899 Merging audit/for-next
4900 $ git merge audit/for-next
4901 Already up-to-date.
4902 Merging pm/linux-next
4903 $ git merge pm/linux-next
4904 Auto-merging arch/arm/mach-shmobile/board-mackerel.c
4905 Auto-merging arch/arm/mach-shmobile/setup-sh7372.c
4906 Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
4907 Auto-merging include/linux/netdevice.h
4908 Removing include/linux/pm_qos_params.h
4909 Auto-merging kernel/power/qos.c
4910 Auto-merging net/mac80211/main.c
4911 Merge made by recursive.
4912  Documentation/power/basic-pm-debugging.txt   |   24 ++
4913  Documentation/power/runtime_pm.txt           |    1 +
4914  arch/arm/mach-msm/clock.c                    |    2 +-
4915  arch/arm/mach-omap1/pm_bus.c                 |    1 +
4916  arch/arm/mach-shmobile/board-ap4evb.c        |    1 +
4917  arch/arm/mach-shmobile/board-mackerel.c      |    2 +-
4918  arch/arm/mach-shmobile/include/mach/sh7372.h |    3 +
4919  arch/arm/mach-shmobile/pm-sh7372.c           |   56 +---
4920  arch/arm/mach-shmobile/pm_runtime.c          |    1 +
4921  arch/arm/mach-shmobile/setup-sh7372.c        |    3 +
4922  arch/s390/Kconfig                            |    1 +
4923  arch/s390/kernel/suspend.c                   |  118 ++++++++
4924  arch/s390/kernel/swsusp_asm64.S              |    3 +
4925  drivers/acpi/processor_idle.c                |    2 +-
4926  drivers/base/power/Makefile                  |    4 +-
4927  drivers/base/power/clock_ops.c               |  122 ++++-----
4928  drivers/base/power/common.c                  |   86 ++++++
4929  drivers/base/power/domain.c                  |  331 ++++++++++++----------
4930  drivers/base/power/main.c                    |   34 ++-
4931  drivers/base/power/qos.c                     |  399 ++++++++++++++++++++++++++
4932  drivers/base/power/runtime.c                 |   15 +-
4933  drivers/cpuidle/cpuidle.c                    |    2 +-
4934  drivers/cpuidle/governors/ladder.c           |    2 +-
4935  drivers/cpuidle/governors/menu.c             |    2 +-
4936  drivers/media/video/via-camera.c             |    4 +-
4937  drivers/net/ethernet/intel/e1000e/netdev.c   |    2 +-
4938  drivers/net/wireless/ipw2x00/ipw2100.c       |    4 +-
4939  include/linux/device.h                       |    5 +
4940  include/linux/netdevice.h                    |    4 +-
4941  include/linux/pm.h                           |   31 ++-
4942  include/linux/pm_clock.h                     |   70 +++++
4943  include/linux/pm_domain.h                    |   17 +-
4944  include/linux/pm_qos.h                       |  147 ++++++++++
4945  include/linux/pm_qos_params.h                |   38 ---
4946  include/linux/pm_runtime.h                   |   42 ---
4947  include/linux/suspend.h                      |   86 ++++++
4948  include/sound/pcm.h                          |    4 +-
4949  kernel/Makefile                              |    2 +-
4950  kernel/power/Kconfig                         |    3 +
4951  kernel/power/Makefile                        |    2 +-
4952  kernel/power/main.c                          |  102 +++++++
4953  kernel/{pm_qos_params.c => power/qos.c}      |  273 +++++++++---------
4954  kernel/power/snapshot.c                      |   18 ++
4955  kernel/power/suspend.c                       |   17 +-
4956  net/mac80211/main.c                          |    2 +-
4957  net/mac80211/mlme.c                          |    2 +-
4958  net/mac80211/scan.c                          |    2 +-
4959  sound/core/pcm_native.c                      |    2 +-
4960  48 files changed, 1578 insertions(+), 516 deletions(-)
4961  create mode 100644 drivers/base/power/common.c
4962  create mode 100644 drivers/base/power/qos.c
4963  create mode 100644 include/linux/pm_clock.h
4964  create mode 100644 include/linux/pm_qos.h
4965  delete mode 100644 include/linux/pm_qos_params.h
4966  rename kernel/{pm_qos_params.c => power/qos.c} (71%)
4967 Merging apm/for-next
4968 $ git merge apm/for-next
4969 Already up-to-date.
4970 Merging fsnotify/for-next
4971 $ git merge fsnotify/for-next
4972 Auto-merging fs/cachefiles/namei.c
4973 Auto-merging fs/nfsd/vfs.c
4974 Auto-merging fs/notify/fanotify/fanotify_user.c
4975 Auto-merging fs/notify/group.c
4976 Auto-merging fs/notify/mark.c
4977 Auto-merging include/linux/fsnotify_backend.h
4978 Merge made by recursive.
4979  fs/cachefiles/namei.c              |    1 -
4980  fs/cachefiles/xattr.c              |    1 -
4981  fs/nfsd/vfs.c                      |    3 -
4982  fs/notify/dnotify/dnotify.c        |   15 +++---
4983  fs/notify/fanotify/fanotify.c      |   24 +++++----
4984  fs/notify/fanotify/fanotify_user.c |  101 +++++++++++++++++++++++++-----------
4985  fs/notify/group.c                  |    1 +
4986  fs/notify/mark.c                   |   36 +++++--------
4987  include/linux/fanotify.h           |    5 ++-
4988  include/linux/fsnotify_backend.h   |   14 ++++-
4989  10 files changed, 121 insertions(+), 80 deletions(-)
4990 Merging irda/for-next
4991 $ git merge irda/for-next
4992 Already up-to-date.
4993 Merging i7core_edac/linux_next
4994 $ git merge i7core_edac/linux_next
4995 Auto-merging drivers/edac/i7core_edac.c
4996 Merge made by recursive.
4997  drivers/edac/i7core_edac.c |   23 ++++++++++++++++++++---
4998  1 files changed, 20 insertions(+), 3 deletions(-)
4999 Merging i7300_edac/linux_next
5000 $ git merge i7300_edac/linux_next
5001 Resolved 'arch/x86/kernel/cpu/mcheck/mce.c' using previous resolution.
5002 Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
5003 CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
5004 Removing drivers/edac/edac_mce.c
5005 Auto-merging drivers/edac/i7core_edac.c
5006 Auto-merging include/linux/edac.h
5007 Removing include/linux/edac_mce.h
5008 Automatic merge failed; fix conflicts and then commit the result.
5009 $ git commit -v -a
5010 [master 07885bf] Merge remote-tracking branch 'i7300_edac/linux_next'
5011 $ git diff -M --stat --summary HEAD^..
5012  arch/x86/kernel/cpu/mcheck/mce.c |   18 +--
5013  drivers/edac/Kconfig             |    8 +-
5014  drivers/edac/Makefile            |    1 -
5015  drivers/edac/edac_core.h         |  350 +----------------------------------
5016  drivers/edac/edac_mce.c          |   61 ------
5017  drivers/edac/i7core_edac.c       |  385 ++++++++++++++++++++++++++++++++++----
5018  include/linux/edac.h             |  350 ++++++++++++++++++++++++++++++++++
5019  include/linux/edac_mce.h         |   31 ---
5020  8 files changed, 709 insertions(+), 495 deletions(-)
5021  delete mode 100644 drivers/edac/edac_mce.c
5022  delete mode 100644 include/linux/edac_mce.h
5023 Merging devicetree/devicetree/next
5024 $ git merge devicetree/devicetree/next
5025 Resolved 'drivers/of/base.c' using previous resolution.
5026 Auto-merging drivers/of/base.c
5027 CONFLICT (content): Merge conflict in drivers/of/base.c
5028 Automatic merge failed; fix conflicts and then commit the result.
5029 $ git commit -v -a
5030 [master 08009c7] Merge remote-tracking branch 'devicetree/devicetree/next'
5031 $ git diff -M --stat --summary HEAD^..
5032 Merging spi/spi/next
5033 $ git merge spi/spi/next
5034 Already up-to-date.
5035 Merging gpio/gpio/next
5036 $ git merge gpio/gpio/next
5037 Already up-to-date.
5038 Merging tip/auto-latest
5039 $ git merge tip/auto-latest
5040 Resolved 'arch/x86/mm/fault.c' using previous resolution.
5041 Auto-merging Documentation/kernel-parameters.txt
5042 Auto-merging arch/x86/mm/fault.c
5043 CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
5044 Automatic merge failed; fix conflicts and then commit the result.
5045 $ git commit -v -a
5046 [master db65050] Merge remote-tracking branch 'tip/auto-latest'
5047 $ git diff -M --stat --summary HEAD^..
5048  Documentation/kernel-parameters.txt   |   18 ++++
5049  Documentation/x86/entry_64.txt        |    3 -
5050  arch/x86/Kconfig                      |    9 ++
5051  arch/x86/include/asm/archrandom.h     |   75 +++++++++++++++++
5052  arch/x86/include/asm/cmpxchg_32.h     |   21 +++++
5053  arch/x86/include/asm/cmpxchg_64.h     |   26 ++++++
5054  arch/x86/include/asm/elf.h            |   31 +++++++
5055  arch/x86/include/asm/pgtable_types.h  |    1 -
5056  arch/x86/include/asm/spinlock.h       |  140 +++++++++++---------------------
5057  arch/x86/include/asm/spinlock_types.h |   22 +++++-
5058  arch/x86/include/asm/x86_init.h       |   12 ---
5059  arch/x86/kernel/apic/x2apic_uv_x.c    |    1 -
5060  arch/x86/kernel/cpu/Makefile          |    1 +
5061  arch/x86/kernel/cpu/amd.c             |   47 +++++++----
5062  arch/x86/kernel/cpu/common.c          |    5 +
5063  arch/x86/kernel/cpu/cpu.h             |    1 +
5064  arch/x86/kernel/cpu/rdrand.c          |   73 ++++++++++++++++
5065  arch/x86/kernel/sys_x86_64.c          |   77 +++++++++++++++++-
5066  arch/x86/kernel/x86_init.c            |    4 -
5067  arch/x86/mm/fault.c                   |    2 +-
5068  arch/x86/mm/init.c                    |  147 ++++++++++++++++++++++++---------
5069  arch/x86/mm/mmap.c                    |   20 +----
5070  arch/x86/platform/olpc/olpc.c         |    4 +-
5071  arch/x86/vdso/vma.c                   |    9 ++
5072  arch/x86/xen/mmu.c                    |   15 ----
5073  drivers/char/random.c                 |   23 +++++-
5074  include/linux/random.h                |   13 +++
5075  27 files changed, 590 insertions(+), 210 deletions(-)
5076  create mode 100644 arch/x86/include/asm/archrandom.h
5077  create mode 100644 arch/x86/kernel/cpu/rdrand.c
5078 Merging rcu/rcu/next
5079 $ git merge rcu/rcu/next
5080 Auto-merging Documentation/RCU/NMI-RCU.txt
5081 Auto-merging include/linux/rcupdate.h
5082 Auto-merging include/linux/sched.h
5083 Auto-merging init/Kconfig
5084 Auto-merging kernel/lockdep.c
5085 Auto-merging kernel/pid.c
5086 Auto-merging kernel/rcupdate.c
5087 Auto-merging kernel/rcutorture.c
5088 Auto-merging kernel/rcutree_trace.c
5089 Auto-merging kernel/rtmutex.c
5090 Auto-merging kernel/sched.c
5091 Merge made by recursive.
5092  Documentation/RCU/NMI-RCU.txt       |    2 +-
5093  Documentation/RCU/lockdep-splat.txt |  110 +++++++++
5094  Documentation/RCU/lockdep.txt       |   34 ++-
5095  Documentation/RCU/torture.txt       |  137 ++++++++---
5096  Documentation/RCU/trace.txt         |   38 ++--
5097  include/linux/lockdep.h             |    2 +-
5098  include/linux/rcupdate.h            |  300 +++++++++++-------------
5099  include/linux/rcutiny.h             |   20 ++-
5100  include/linux/rcutree.h             |    2 +
5101  include/linux/sched.h               |    4 -
5102  include/linux/types.h               |   10 +
5103  include/trace/events/rcu.h          |  459 +++++++++++++++++++++++++++++++++++
5104  init/Kconfig                        |    6 +-
5105  kernel/lockdep.c                    |   84 ++++---
5106  kernel/pid.c                        |    4 +-
5107  kernel/rcu.h                        |   85 +++++++
5108  kernel/rcupdate.c                   |   26 ++-
5109  kernel/rcutiny.c                    |  117 ++-------
5110  kernel/rcutiny_plugin.h             |  135 +++++++----
5111  kernel/rcutorture.c                 |   74 +++----
5112  kernel/rcutree.c                    |  226 +++++++++++-------
5113  kernel/rcutree.h                    |   16 +-
5114  kernel/rcutree_plugin.h             |  116 ++++++---
5115  kernel/rcutree_trace.c              |   13 +-
5116  kernel/rtmutex.c                    |    7 +
5117  kernel/sched.c                      |   13 +-
5118  kernel/time/tick-sched.c            |    6 -
5119  27 files changed, 1438 insertions(+), 608 deletions(-)
5120  create mode 100644 Documentation/RCU/lockdep-splat.txt
5121  create mode 100644 include/trace/events/rcu.h
5122  create mode 100644 kernel/rcu.h
5123 Merging kvm/linux-next
5124 $ git merge kvm/linux-next
5125 Already up-to-date.
5126 Merging oprofile/for-next
5127 $ git merge oprofile/for-next
5128 Already up-to-date.
5129 Merging ptrace/ptrace
5130 $ git merge ptrace/ptrace
5131 Already up-to-date.
5132 Merging xen/upstream/xen
5133 $ git merge xen/upstream/xen
5134 Resolved 'arch/x86/xen/Makefile' using previous resolution.
5135 Auto-merging arch/x86/xen/Makefile
5136 CONFLICT (content): Merge conflict in arch/x86/xen/Makefile
5137 Automatic merge failed; fix conflicts and then commit the result.
5138 $ git commit -v -a
5139 [master 5ad93a3] Merge remote-tracking branch 'xen/upstream/xen'
5140 $ git diff -M --stat --summary HEAD^..
5141  arch/x86/xen/Makefile |    2 +-
5142  1 files changed, 1 insertions(+), 1 deletions(-)
5143 Merging xen-two/linux-next
5144 $ git merge xen-two/linux-next
5145 Auto-merging arch/x86/xen/enlighten.c
5146 Auto-merging arch/x86/xen/mmu.c
5147 Merge made by recursive.
5148  .../ABI/testing/sysfs-bus-pci-devices-cciss        |    7 ++
5149  Documentation/blockdev/cciss.txt                   |   10 +++
5150  arch/x86/include/asm/xen/page.h                    |    4 +-
5151  arch/x86/xen/Kconfig                               |    8 --
5152  arch/x86/xen/enlighten.c                           |    4 +-
5153  arch/x86/xen/mmu.c                                 |   50 ++------------
5154  arch/x86/xen/smp.c                                 |    4 +-
5155  drivers/block/cciss.c                              |   69 ++++++++++++++++---
5156  drivers/block/cciss.h                              |    1 +
5157  drivers/block/xen-blkback/blkback.c                |    8 +-
5158  drivers/block/xen-blkback/common.h                 |    2 +-
5159  drivers/block/xen-blkback/xenbus.c                 |   14 +++-
5160  drivers/block/xen-blkfront.c                       |    9 ++-
5161  drivers/pci/xen-pcifront.c                         |    4 +-
5162  drivers/xen/balloon.c                              |   15 ++--
5163  drivers/xen/events.c                               |    9 +--
5164  drivers/xen/gntdev.c                               |    3 +-
5165  drivers/xen/grant-table.c                          |    2 +-
5166  drivers/xen/pci.c                                  |    4 +-
5167  drivers/xen/swiotlb-xen.c                          |   42 ++++++++----
5168  drivers/xen/xen-balloon.c                          |   17 ++---
5169  drivers/xen/xen-pciback/conf_space_header.c        |    2 +-
5170  drivers/xen/xenbus/xenbus_probe.c                  |    7 +-
5171  drivers/xen/xenbus/xenbus_probe.h                  |    3 +-
5172  24 files changed, 170 insertions(+), 128 deletions(-)
5173 Merging xen-pvhvm/linux-next
5174 $ git merge xen-pvhvm/linux-next
5175 Already up-to-date.
5176 Merging edac-amd/for-next
5177 $ git merge edac-amd/for-next
5178 Merge made by recursive.
5179  drivers/edac/mce_amd.c |    4 ++--
5180  1 files changed, 2 insertions(+), 2 deletions(-)
5181 Merging percpu/for-next
5182 $ git merge percpu/for-next
5183 Merge made by recursive.
5184  mm/percpu-vm.c |    5 ++---
5185  mm/percpu.c    |   17 +++++++++--------
5186  2 files changed, 11 insertions(+), 11 deletions(-)
5187 Merging workqueues/for-next
5188 $ git merge workqueues/for-next
5189 Already up-to-date.
5190 Merging sfi/sfi-test
5191 $ git merge sfi/sfi-test
5192 Already up-to-date.
5193 Merging asm-generic/next
5194 $ git merge asm-generic/next
5195 Already up-to-date.
5196 Merging drivers-x86/linux-next
5197 $ git merge drivers-x86/linux-next
5198 Already up-to-date.
5199 Merging hwpoison/hwpoison
5200 $ git merge hwpoison/hwpoison
5201 Already up-to-date.
5202 Merging sysctl/master
5203 $ git merge sysctl/master
5204 Auto-merging fs/proc/proc_sysctl.c
5205 Merge made by recursive.
5206  fs/proc/proc_sysctl.c |   14 ++------------
5207  1 files changed, 2 insertions(+), 12 deletions(-)
5208 Merging namespace/master
5209 $ git merge namespace/master
5210 Auto-merging fs/proc/inode.c
5211 Merge made by recursive.
5212  fs/proc/inode.c      |    6 +-
5213  fs/proc/namespaces.c |  160 +++++++++++++++++++++++++++++++++++++++++++-------
5214  2 files changed, 142 insertions(+), 24 deletions(-)
5215 Merging regmap/for-next
5216 $ git merge regmap/for-next
5217 Auto-merging drivers/base/regmap/regmap-spi.c
5218 Merge made by recursive.
5219  drivers/base/regmap/Makefile         |    1 +
5220  drivers/base/regmap/internal.h       |   66 +++++++++++
5221  drivers/base/regmap/regmap-debugfs.c |  209 ++++++++++++++++++++++++++++++++++
5222  drivers/base/regmap/regmap-i2c.c     |    1 -
5223  drivers/base/regmap/regmap-spi.c     |    1 -
5224  drivers/base/regmap/regmap.c         |  139 +++++++++++++++++-----
5225  include/linux/regmap.h               |   27 ++++-
5226  include/trace/events/regmap.h        |  112 ++++++++++++++++++
5227  8 files changed, 518 insertions(+), 38 deletions(-)
5228  create mode 100644 drivers/base/regmap/internal.h
5229  create mode 100644 drivers/base/regmap/regmap-debugfs.c
5230  create mode 100644 include/trace/events/regmap.h
5231 Merging driver-core/driver-core-next
5232 $ git merge driver-core/driver-core-next
5233 Already up-to-date.
5234 Merging tty/tty-next
5235 $ git merge tty/tty-next
5236 Already up-to-date.
5237 Merging usb/usb-next
5238 $ git merge usb/usb-next
5239 Already up-to-date.
5240 Merging staging/staging-next
5241 $ git merge staging/staging-next
5242 Already up-to-date.
5243 Merging bkl-config/config
5244 $ git merge bkl-config/config
5245 Already up-to-date.
5246 Merging tmem/linux-next
5247 $ git merge tmem/linux-next
5248 Auto-merging include/linux/swap.h
5249 Auto-merging mm/Kconfig
5250 Auto-merging mm/swapfile.c
5251 Merge made by recursive.
5252  .../ABI/testing/sysfs-kernel-mm-frontswap          |   16 +
5253  Documentation/vm/frontswap.txt                     |  210 ++++++++++++
5254  include/linux/frontswap.h                          |   92 ++++++
5255  include/linux/swap.h                               |    2 +
5256  include/linux/swapfile.h                           |   13 +
5257  mm/Kconfig                                         |   17 +
5258  mm/Makefile                                        |    1 +
5259  mm/frontswap.c                                     |  335 ++++++++++++++++++++
5260  mm/page_io.c                                       |   12 +
5261  mm/swapfile.c                                      |   65 +++-
5262  10 files changed, 751 insertions(+), 12 deletions(-)
5263  create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-frontswap
5264  create mode 100644 Documentation/vm/frontswap.txt
5265  create mode 100644 include/linux/frontswap.h
5266  create mode 100644 include/linux/swapfile.h
5267  create mode 100644 mm/frontswap.c
5268 Merging writeback/next
5269 $ git merge writeback/next
5270 Already up-to-date.
5271 Merging arm-dt/devicetree/arm-next
5272 $ git merge arm-dt/devicetree/arm-next
5273 Already up-to-date.
5274 Merging scsi-post-merge/merge-base:master
5275 Merging moduleh/module.h-split
5276 $ git merge moduleh/module.h-split
5277 Resolved 'include/linux/dmaengine.h' using previous resolution.
5278 Auto-merging arch/arm/common/scoop.c
5279 Auto-merging arch/arm/kernel/setup.c
5280 Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
5281 Auto-merging arch/arm/mach-ixp2000/core.c
5282 Auto-merging arch/arm/mach-ixp4xx/common-pci.c
5283 Auto-merging arch/arm/mach-msm/io.c
5284 Auto-merging arch/arm/mach-omap1/board-ams-delta.c
5285 Auto-merging arch/arm/mach-omap1/board-sx1.c
5286 Auto-merging arch/arm/mach-omap1/board-voiceblue.c
5287 Auto-merging arch/arm/mach-orion5x/dns323-setup.c
5288 Auto-merging arch/arm/plat-samsung/platformdata.c
5289 Auto-merging arch/mips/bcm47xx/gpio.c
5290 Auto-merging arch/mips/bcm47xx/setup.c
5291 Auto-merging arch/mips/kernel/traps.c
5292 Auto-merging arch/x86/kernel/cpu/amd.c
5293 Auto-merging drivers/base/power/main.c
5294 Auto-merging drivers/base/power/runtime.c
5295 Auto-merging drivers/bcma/core.c
5296 Auto-merging drivers/bcma/driver_chipcommon.c
5297 Auto-merging drivers/bcma/driver_pci.c
5298 Auto-merging drivers/bcma/main.c
5299 Auto-merging drivers/char/virtio_console.c
5300 Auto-merging drivers/clocksource/sh_cmt.c
5301 Auto-merging drivers/firmware/google/gsmi.c
5302 Auto-merging drivers/hid/hid-axff.c
5303 Auto-merging drivers/hid/hid-debug.c
5304 Auto-merging drivers/hid/hid-sjoy.c
5305 Auto-merging drivers/hid/usbhid/hid-quirks.c
5306 Auto-merging drivers/input/input-polldev.c
5307 Auto-merging drivers/md/dm-raid.c
5308 Auto-merging drivers/md/md.c
5309 Auto-merging drivers/md/raid5.c
5310 Auto-merging drivers/mmc/core/host.c
5311 Auto-merging drivers/mmc/host/sdhci-tegra.c
5312 Auto-merging drivers/mtd/ar7part.c
5313 Auto-merging drivers/mtd/cmdlinepart.c
5314 Auto-merging drivers/mtd/mtdsuper.c
5315 Auto-merging drivers/mtd/nand/cafe_nand.c
5316 Auto-merging drivers/mtd/nand/cmx270_nand.c
5317 Auto-merging drivers/mtd/nand/diskonchip.c
5318 Auto-merging drivers/mtd/nand/nand_bbt.c
5319 Auto-merging drivers/mtd/nand/omap2.c
5320 Auto-merging drivers/mtd/onenand/onenand_bbt.c
5321 Auto-merging drivers/mtd/redboot.c
5322 Auto-merging drivers/net/ethernet/mellanox/mlx4/alloc.c
5323 Auto-merging drivers/net/ethernet/mellanox/mlx4/catas.c
5324 Auto-merging drivers/net/ethernet/mellanox/mlx4/cmd.c
5325 Auto-merging drivers/net/ethernet/mellanox/mlx4/cq.c
5326 Auto-merging drivers/net/ethernet/mellanox/mlx4/eq.c
5327 Auto-merging drivers/net/ethernet/mellanox/mlx4/fw.c
5328 Auto-merging drivers/net/ethernet/mellanox/mlx4/intf.c
5329 Auto-merging drivers/net/ethernet/mellanox/mlx4/mr.c
5330 Auto-merging drivers/net/ethernet/mellanox/mlx4/pd.c
5331 Auto-merging drivers/net/ethernet/mellanox/mlx4/port.c
5332 Auto-merging drivers/net/ethernet/mellanox/mlx4/qp.c
5333 Auto-merging drivers/net/ethernet/mellanox/mlx4/srq.c
5334 Auto-merging drivers/pci/hotplug/pcihp_slot.c
5335 Auto-merging drivers/pci/setup-res.c
5336 Auto-merging drivers/regulator/88pm8607.c
5337 Auto-merging drivers/rtc/interface.c
5338 Auto-merging drivers/s390/cio/qdio_debug.c
5339 Auto-merging drivers/video/atmel_lcdfb.c
5340 Auto-merging drivers/video/carminefb.c
5341 Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
5342 Auto-merging drivers/video/msm/mdp.c
5343 Auto-merging drivers/xen/balloon.c
5344 Auto-merging drivers/xen/swiotlb-xen.c
5345 Auto-merging drivers/xen/xen-selfballoon.c
5346 Auto-merging drivers/xen/xenbus/xenbus_probe.c
5347 Auto-merging fs/exofs/super.c
5348 Auto-merging fs/logfs/super.c
5349 Auto-merging include/linux/bcma/bcma.h
5350 Auto-merging include/linux/blkdev.h
5351 Auto-merging include/linux/device.h
5352 Auto-merging include/linux/dmaengine.h
5353 CONFLICT (content): Merge conflict in include/linux/dmaengine.h
5354 Auto-merging include/linux/hid.h
5355 Auto-merging include/linux/mtd/mtd.h
5356 Auto-merging include/linux/pm_runtime.h
5357 Auto-merging include/net/lib80211.h
5358 Auto-merging include/net/sock.h
5359 Auto-merging kernel/lockdep.c
5360 Auto-merging kernel/pid.c
5361 Auto-merging kernel/power/main.c
5362 Auto-merging kernel/power/suspend.c
5363 Auto-merging kernel/rcupdate.c
5364 Auto-merging kernel/rcutiny.c
5365 Auto-merging kernel/rcutorture.c
5366 Auto-merging kernel/rcutree.c
5367 Auto-merging kernel/rcutree_trace.c
5368 Auto-merging kernel/rtmutex.c
5369 Auto-merging kernel/sched.c
5370 Auto-merging kernel/trace/blktrace.c
5371 Auto-merging mm/swapfile.c
5372 Automatic merge failed; fix conflicts and then commit the result.
5373 $ git commit -v -a
5374 [master 0ac4610] Merge remote-tracking branch 'moduleh/module.h-split'
5375 $ git diff -M --stat --summary HEAD^..
5376  arch/alpha/kernel/core_irongate.c                  |    1 +
5377  arch/alpha/kernel/pci-sysfs.c                      |    1 +
5378  arch/alpha/kernel/pci_iommu.c                      |    1 +
5379  arch/alpha/kernel/setup.c                          |    1 +
5380  arch/arm/common/it8152.c                           |    1 +
5381  arch/arm/common/scoop.c                            |    1 +
5382  arch/arm/kernel/armksyms.c                         |    2 +-
5383  arch/arm/kernel/bios32.c                           |    2 +-
5384  arch/arm/kernel/devtree.c                          |    2 +-
5385  arch/arm/kernel/elf.c                              |    2 +-
5386  arch/arm/kernel/io.c                               |    2 +-
5387  arch/arm/kernel/irq.c                              |    1 -
5388  arch/arm/kernel/leds.c                             |    3 +-
5389  arch/arm/kernel/perf_event.c                       |    2 +-
5390  arch/arm/kernel/pj4-cp0.c                          |    1 -
5391  arch/arm/kernel/process.c                          |    2 +-
5392  arch/arm/kernel/ptrace.c                           |    1 +
5393  arch/arm/kernel/return_address.c                   |    2 +-
5394  arch/arm/kernel/setup.c                            |    2 +-
5395  arch/arm/kernel/stacktrace.c                       |    2 +-
5396  arch/arm/kernel/sys_arm.c                          |    2 +-
5397  arch/arm/kernel/time.c                             |    2 +-
5398  arch/arm/kernel/unwind.c                           |    2 +-
5399  arch/arm/kernel/xscale-cp0.c                       |    1 -
5400  arch/arm/mach-at91/cpuidle.c                       |    1 +
5401  arch/arm/mach-bcmring/dma.c                        |    1 +
5402  arch/arm/mach-bcmring/mm.c                         |    1 +
5403  arch/arm/mach-davinci/board-dm644x-evm.c           |    1 +
5404  arch/arm/mach-davinci/board-dm646x-evm.c           |    1 +
5405  arch/arm/mach-davinci/cdce949.c                    |    1 +
5406  arch/arm/mach-davinci/cpufreq.c                    |    1 +
5407  arch/arm/mach-davinci/cpuidle.c                    |    1 +
5408  arch/arm/mach-ep93xx/core.c                        |    1 +
5409  arch/arm/mach-exynos4/dev-sysmmu.c                 |    1 +
5410  arch/arm/mach-footbridge/dc21285.c                 |    1 +
5411  arch/arm/mach-imx/mach-mx31lilly.c                 |    1 +
5412  arch/arm/mach-imx/mach-mx31lite.c                  |    1 +
5413  arch/arm/mach-imx/mach-mx31moboard.c               |    1 +
5414  arch/arm/mach-iop13xx/pci.c                        |    1 +
5415  arch/arm/mach-ixp2000/core.c                       |    1 +
5416  arch/arm/mach-ixp4xx/common-pci.c                  |    1 +
5417  arch/arm/mach-ixp4xx/common.c                      |    1 +
5418  arch/arm/mach-kirkwood/cpuidle.c                   |    1 +
5419  arch/arm/mach-msm/io.c                             |    1 +
5420  arch/arm/mach-netx/xc.c                            |    1 +
5421  arch/arm/mach-omap1/board-ams-delta.c              |    1 +
5422  arch/arm/mach-omap1/board-sx1.c                    |    1 +
5423  arch/arm/mach-omap1/board-voiceblue.c              |    1 +
5424  arch/arm/mach-omap1/mailbox.c                      |    1 +
5425  arch/arm/mach-omap2/board-omap3evm.c               |    1 +
5426  arch/arm/mach-omap2/clockdomain.c                  |    1 +
5427  arch/arm/mach-omap2/display.c                      |    1 +
5428  arch/arm/mach-omap2/gpmc-onenand.c                 |    1 +
5429  arch/arm/mach-omap2/pm.c                           |    1 +
5430  arch/arm/mach-omap2/prcm.c                         |    1 +
5431  arch/arm/mach-omap2/usb-tusb6010.c                 |    2 +
5432  arch/arm/mach-omap2/voltage.c                      |    1 +
5433  arch/arm/mach-orion5x/dns323-setup.c               |    2 +-
5434  arch/arm/mach-orion5x/pci.c                        |    1 +
5435  arch/arm/mach-pxa/corgi.c                          |    1 +
5436  arch/arm/mach-pxa/poodle.c                         |    1 +
5437  arch/arm/mach-pxa/spitz.c                          |    1 +
5438  arch/arm/mach-s3c2410/mach-h1940.c                 |    1 +
5439  arch/arm/mach-s3c64xx/dev-audio.c                  |    1 +
5440  arch/arm/mach-sa1100/collie.c                      |    1 +
5441  arch/arm/mach-sa1100/jornada720.c                  |    1 +
5442  arch/arm/mach-shmobile/clock.c                     |    1 +
5443  arch/arm/mach-tegra/pcie.c                         |    1 +
5444  arch/arm/mm/fault-armv.c                           |    1 -
5445  arch/arm/mm/init.c                                 |    1 +
5446  arch/arm/plat-iop/gpio.c                           |    1 +
5447  arch/arm/plat-iop/time.c                           |    1 +
5448  arch/arm/plat-omap/clock.c                         |    1 +
5449  arch/arm/plat-omap/mailbox.c                       |    1 +
5450  arch/arm/plat-s3c24xx/devs.c                       |    1 +
5451  arch/arm/plat-s5p/dev-ehci.c                       |    1 +
5452  arch/arm/plat-s5p/dev-onenand.c                    |    2 +
5453  arch/arm/plat-samsung/dev-adc.c                    |    2 +
5454  arch/arm/plat-samsung/dev-asocdma.c                |    1 +
5455  arch/arm/plat-samsung/dev-backlight.c              |    1 +
5456  arch/arm/plat-samsung/dev-ide.c                    |    2 +
5457  arch/arm/plat-samsung/dev-nand.c                   |    1 +
5458  arch/arm/plat-samsung/dev-pwm.c                    |    1 +
5459  arch/arm/plat-samsung/dev-rtc.c                    |    1 +
5460  arch/arm/plat-samsung/dev-ts.c                     |    2 +
5461  arch/arm/plat-samsung/dev-usb.c                    |    1 +
5462  arch/arm/plat-samsung/dev-wdt.c                    |    3 +
5463  arch/arm/plat-samsung/platformdata.c               |    1 +
5464  arch/arm/vfp/vfpmodule.c                           |    1 -
5465  arch/avr32/mach-at32ap/clock.c                     |    1 +
5466  arch/avr32/mach-at32ap/cpufreq.c                   |    1 +
5467  arch/avr32/mach-at32ap/intc.c                      |    1 +
5468  arch/avr32/mach-at32ap/pio.c                       |    1 +
5469  arch/avr32/mm/dma-coherent.c                       |    1 +
5470  arch/blackfin/kernel/dma-mapping.c                 |    1 +
5471  arch/blackfin/kernel/perf_event.c                  |    1 +
5472  arch/blackfin/kernel/sys_bfin.c                    |    1 +
5473  arch/blackfin/mach-bf518/boards/ezbrd.c            |    1 +
5474  arch/blackfin/mach-bf527/boards/ad7160eval.c       |    1 +
5475  arch/blackfin/mach-bf527/boards/ezkit.c            |    1 +
5476  arch/blackfin/mach-bf527/boards/tll6527m.c         |    1 +
5477  arch/blackfin/mach-bf537/boards/dnp5370.c          |    1 +
5478  arch/blackfin/mach-common/cpufreq.c                |    1 +
5479  arch/blackfin/mm/init.c                            |    1 +
5480  arch/ia64/hp/common/hwsw_iommu.c                   |    1 +
5481  arch/ia64/kernel/dma-mapping.c                     |    1 +
5482  arch/ia64/kernel/topology.c                        |    1 +
5483  arch/ia64/sn/kernel/io_init.c                      |    1 +
5484  arch/ia64/sn/pci/pcibr/pcibr_dma.c                 |    1 +
5485  arch/ia64/sn/pci/pcibr/pcibr_provider.c            |    1 +
5486  arch/ia64/sn/pci/tioca_provider.c                  |    1 +
5487  arch/m68k/atari/time.c                             |    1 +
5488  arch/m68k/kernel/dma_mm.c                          |    1 +
5489  arch/m68k/kernel/dma_no.c                          |    1 +
5490  arch/mips/bcm47xx/gpio.c                           |    1 +
5491  arch/mips/bcm47xx/setup.c                          |    1 +
5492  arch/mips/cavium-octeon/csrc-octeon.c              |    1 +
5493  arch/mips/cavium-octeon/dma-octeon.c               |    1 +
5494  arch/mips/cavium-octeon/flash_setup.c              |    1 +
5495  arch/mips/kernel/8250-platform.c                   |    1 -
5496  arch/mips/kernel/cpu-probe.c                       |    3 +-
5497  arch/mips/kernel/i8253.c                           |    2 +-
5498  arch/mips/kernel/init_task.c                       |    2 +-
5499  arch/mips/kernel/irq-msc01.c                       |    1 -
5500  arch/mips/kernel/irq.c                             |    1 -
5501  arch/mips/kernel/mips-mt.c                         |    2 +-
5502  arch/mips/kernel/mips_ksyms.c                      |    2 +-
5503  arch/mips/kernel/module.c                          |    1 -
5504  arch/mips/kernel/process.c                         |    2 +-
5505  arch/mips/kernel/prom.c                            |    2 +-
5506  arch/mips/kernel/reset.c                           |    2 +-
5507  arch/mips/kernel/rtlx.c                            |    1 -
5508  arch/mips/kernel/setup.c                           |    2 +-
5509  arch/mips/kernel/spinlock_test.c                   |    2 +-
5510  arch/mips/kernel/stacktrace.c                      |    2 +-
5511  arch/mips/kernel/time.c                            |    2 +-
5512  arch/mips/kernel/traps.c                           |    1 -
5513  arch/mips/kernel/unaligned.c                       |    1 -
5514  arch/mips/kernel/vpe.c                             |    1 -
5515  arch/mips/loongson/common/platform.c               |    1 +
5516  arch/mips/pci/pci-ip27.c                           |    1 +
5517  arch/mips/pci/pci.c                                |    1 +
5518  arch/mips/powertv/pci/fixup-powertv.c              |    1 +
5519  arch/mips/powertv/powertv-usb.c                    |    1 +
5520  arch/mips/rb532/gpio.c                             |    1 +
5521  arch/mips/rb532/setup.c                            |    1 +
5522  arch/mips/txx9/generic/spi_eeprom.c                |    1 +
5523  arch/mips/txx9/rbtx4939/setup.c                    |    1 +
5524  arch/mips/vr41xx/common/giu.c                      |    1 +
5525  arch/mips/vr41xx/common/rtc.c                      |    1 +
5526  arch/parisc/kernel/drivers.c                       |    1 +
5527  arch/parisc/kernel/pci-dma.c                       |    1 +
5528  arch/parisc/kernel/setup.c                         |    1 +
5529  arch/parisc/lib/iomap.c                            |    1 +
5530  arch/powerpc/include/asm/lv1call.h                 |    1 +
5531  arch/powerpc/include/asm/machdep.h                 |    1 +
5532  arch/powerpc/include/asm/spu.h                     |    1 +
5533  arch/powerpc/kernel/btext.c                        |    2 +-
5534  arch/powerpc/kernel/clock.c                        |    2 +-
5535  arch/powerpc/kernel/cputable.c                     |    2 +-
5536  arch/powerpc/kernel/crash.c                        |    1 +
5537  arch/powerpc/kernel/dma-iommu.c                    |    1 +
5538  arch/powerpc/kernel/dma.c                          |    1 +
5539  arch/powerpc/kernel/firmware.c                     |    3 +-
5540  arch/powerpc/kernel/hw_breakpoint.c                |    1 -
5541  arch/powerpc/kernel/ibmebus.c                      |    2 +
5542  arch/powerpc/kernel/init_task.c                    |    2 +-
5543  arch/powerpc/kernel/io-workarounds.c               |    1 +
5544  arch/powerpc/kernel/io.c                           |    2 +-
5545  arch/powerpc/kernel/iomap.c                        |    1 +
5546  arch/powerpc/kernel/irq.c                          |    2 +-
5547  arch/powerpc/kernel/isa-bridge.c                   |    1 +
5548  arch/powerpc/kernel/kvm.c                          |    1 +
5549  arch/powerpc/kernel/module.c                       |    1 -
5550  arch/powerpc/kernel/of_platform.c                  |    2 +-
5551  arch/powerpc/kernel/paca.c                         |    2 +-
5552  arch/powerpc/kernel/pci-common.c                   |    1 +
5553  arch/powerpc/kernel/pci_32.c                       |    1 +
5554  arch/powerpc/kernel/pci_64.c                       |    1 +
5555  arch/powerpc/kernel/pci_dn.c                       |    1 +
5556  arch/powerpc/kernel/pci_of_scan.c                  |    1 +
5557  arch/powerpc/kernel/pmc.c                          |    2 +-
5558  arch/powerpc/kernel/ppc_ksyms.c                    |    2 +-
5559  arch/powerpc/kernel/process.c                      |    2 +-
5560  arch/powerpc/kernel/prom.c                         |    2 +-
5561  arch/powerpc/kernel/prom_parse.c                   |    1 -
5562  arch/powerpc/kernel/ptrace.c                       |    1 -
5563  arch/powerpc/kernel/rtas.c                         |    2 +-
5564  arch/powerpc/kernel/setup-common.c                 |    2 +-
5565  arch/powerpc/kernel/setup_64.c                     |    2 +-
5566  arch/powerpc/kernel/signal_64.c                    |    1 -
5567  arch/powerpc/kernel/smp.c                          |    2 +-
5568  arch/powerpc/kernel/stacktrace.c                   |    2 +-
5569  arch/powerpc/kernel/swsusp_64.c                    |    1 +
5570  arch/powerpc/kernel/sysfs.c                        |    2 +-
5571  arch/powerpc/kernel/time.c                         |    2 +-
5572  arch/powerpc/kernel/vdso.c                         |    1 -
5573  arch/powerpc/kernel/vio.c                          |    3 +-
5574  arch/powerpc/kvm/44x.c                             |    1 +
5575  arch/powerpc/kvm/book3s.c                          |    1 +
5576  arch/powerpc/kvm/book3s_exports.c                  |    2 +-
5577  arch/powerpc/kvm/book3s_hv.c                       |    1 +
5578  arch/powerpc/kvm/book3s_hv_builtin.c               |    1 +
5579  arch/powerpc/kvm/book3s_pr.c                       |    1 +
5580  arch/powerpc/kvm/powerpc.c                         |    1 -
5581  arch/powerpc/lib/checksum_wrappers_64.c            |    2 +-
5582  arch/powerpc/lib/devres.c                          |    2 +-
5583  arch/powerpc/lib/locks.c                           |    2 +-
5584  arch/powerpc/lib/rheap.c                           |    2 +-
5585  arch/powerpc/mm/dma-noncoherent.c                  |    1 +
5586  arch/powerpc/mm/hash_utils_64.c                    |    1 +
5587  arch/powerpc/mm/mem.c                              |    2 +-
5588  arch/powerpc/mm/mmu_context_hash32.c               |    1 +
5589  arch/powerpc/mm/mmu_context_hash64.c               |    2 +-
5590  arch/powerpc/mm/numa.c                             |    2 +-
5591  arch/powerpc/mm/pgtable_64.c                       |    1 +
5592  arch/powerpc/mm/slice.c                            |    2 +-
5593  arch/powerpc/mm/tlb_hash32.c                       |    1 +
5594  arch/powerpc/mm/tlb_nohash.c                       |    1 +
5595  arch/powerpc/platforms/44x/warp.c                  |    1 +
5596  arch/powerpc/platforms/512x/clock.c                |    1 +
5597  arch/powerpc/platforms/52xx/mpc52xx_common.c       |    1 +
5598  arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c      |    1 +
5599  arch/powerpc/platforms/83xx/suspend.c              |    1 +
5600  arch/powerpc/platforms/85xx/mpc85xx_cds.c          |    1 -
5601  arch/powerpc/platforms/85xx/mpc85xx_mds.c          |    1 -
5602  arch/powerpc/platforms/85xx/sbc8548.c              |    1 -
5603  arch/powerpc/platforms/86xx/gef_gpio.c             |    1 +
5604  arch/powerpc/platforms/8xx/tqm8xx_setup.c          |    1 -
5605  arch/powerpc/platforms/cell/axon_msi.c             |    1 +
5606  arch/powerpc/platforms/cell/beat.c                 |    2 +-
5607  arch/powerpc/platforms/cell/beat_spu_priv1.c       |    2 -
5608  arch/powerpc/platforms/cell/beat_wrapper.h         |    1 +
5609  arch/powerpc/platforms/cell/cbe_cpufreq.c          |    1 +
5610  arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c      |    1 +
5611  arch/powerpc/platforms/cell/cbe_powerbutton.c      |    1 +
5612  arch/powerpc/platforms/cell/cbe_regs.c             |    2 +-
5613  arch/powerpc/platforms/cell/celleb_setup.c         |    1 +
5614  arch/powerpc/platforms/cell/cpufreq_spudemand.c    |    1 +
5615  arch/powerpc/platforms/cell/interrupt.c            |    2 +-
5616  arch/powerpc/platforms/cell/pmu.c                  |    1 +
5617  arch/powerpc/platforms/cell/qpace_setup.c          |    1 +
5618  arch/powerpc/platforms/cell/setup.c                |    1 +
5619  arch/powerpc/platforms/cell/smp.c                  |    1 -
5620  arch/powerpc/platforms/cell/spu_callbacks.c        |    2 +-
5621  arch/powerpc/platforms/cell/spu_fault.c            |    2 +-
5622  arch/powerpc/platforms/cell/spu_manage.c           |    2 +-
5623  arch/powerpc/platforms/cell/spu_notify.c           |    3 +-
5624  arch/powerpc/platforms/cell/spu_priv1_mmio.c       |    1 -
5625  arch/powerpc/platforms/cell/spufs/backing_ops.c    |    1 -
5626  arch/powerpc/platforms/cell/spufs/context.c        |    2 +-
5627  arch/powerpc/platforms/cell/spufs/coredump.c       |    1 -
5628  arch/powerpc/platforms/cell/spufs/fault.c          |    1 -
5629  arch/powerpc/platforms/cell/spufs/file.c           |    2 +-
5630  arch/powerpc/platforms/cell/spufs/hw_ops.c         |    1 -
5631  arch/powerpc/platforms/cell/spufs/sched.c          |    1 -
5632  arch/powerpc/platforms/cell/spufs/switch.c         |    2 +-
5633  arch/powerpc/platforms/cell/spufs/syscalls.c       |    2 +-
5634  arch/powerpc/platforms/embedded6xx/holly.c         |    1 +
5635  arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c  |    1 +
5636  arch/powerpc/platforms/iseries/hvlpconfig.c        |    2 +-
5637  arch/powerpc/platforms/iseries/iommu.c             |    2 +-
5638  arch/powerpc/platforms/iseries/ksyms.c             |    2 +-
5639  arch/powerpc/platforms/iseries/lpardata.c          |    1 -
5640  arch/powerpc/platforms/iseries/lpevents.c          |    2 +-
5641  arch/powerpc/platforms/iseries/mf.c                |    1 +
5642  arch/powerpc/platforms/iseries/pci.c               |    1 -
5643  arch/powerpc/platforms/iseries/setup.c             |    1 +
5644  arch/powerpc/platforms/iseries/smp.c               |    1 -
5645  arch/powerpc/platforms/iseries/vio.c               |    2 +-
5646  arch/powerpc/platforms/iseries/viopath.c           |    2 +-
5647  arch/powerpc/platforms/maple/setup.c               |    1 +
5648  arch/powerpc/platforms/pasemi/cpufreq.c            |    1 +
5649  arch/powerpc/platforms/pasemi/dma_lib.c            |    3 +-
5650  arch/powerpc/platforms/pasemi/setup.c              |    1 +
5651  arch/powerpc/platforms/powermac/backlight.c        |    1 +
5652  arch/powerpc/platforms/powermac/feature.c          |    1 +
5653  arch/powerpc/platforms/powermac/low_i2c.c          |    2 +-
5654  arch/powerpc/platforms/powermac/nvram.c            |    2 +-
5655  arch/powerpc/platforms/powermac/pic.c              |    1 -
5656  arch/powerpc/platforms/powermac/setup.c            |    1 +
5657  arch/powerpc/platforms/ps3/exports.c               |    2 -
5658  arch/powerpc/platforms/ps3/interrupt.c             |    2 +-
5659  arch/powerpc/platforms/ps3/mm.c                    |    2 +-
5660  arch/powerpc/platforms/ps3/os-area.c               |    1 +
5661  arch/powerpc/platforms/ps3/setup.c                 |    1 +
5662  arch/powerpc/platforms/ps3/spu.c                   |    1 +
5663  arch/powerpc/platforms/ps3/system-bus.c            |    2 +-
5664  arch/powerpc/platforms/pseries/eeh.c               |    2 +
5665  arch/powerpc/platforms/pseries/eeh_event.c         |    1 +
5666  arch/powerpc/platforms/pseries/eeh_sysfs.c         |    1 +
5667  arch/powerpc/platforms/pseries/hotplug-cpu.c       |    1 +
5668  arch/powerpc/platforms/pseries/hvconsole.c         |    3 +-
5669  arch/powerpc/platforms/pseries/io_event_irq.c      |    2 +-
5670  arch/powerpc/platforms/pseries/iommu.c             |    1 +
5671  arch/powerpc/platforms/pseries/lpar.c              |    1 +
5672  arch/powerpc/platforms/pseries/mobility.c          |    1 +
5673  arch/powerpc/platforms/pseries/pci_dlpar.c         |    1 +
5674  arch/powerpc/platforms/pseries/plpar_wrappers.h    |    3 +
5675  arch/powerpc/platforms/pseries/setup.c             |    2 +-
5676  arch/powerpc/platforms/pseries/smp.c               |    1 -
5677  arch/powerpc/platforms/pseries/suspend.c           |    1 +
5678  arch/powerpc/sysdev/bestcomm/sram.c                |    2 +-
5679  arch/powerpc/sysdev/cpm_common.c                   |    1 +
5680  arch/powerpc/sysdev/dcr.c                          |    1 +
5681  arch/powerpc/sysdev/fsl_gtm.c                      |    1 +
5682  arch/powerpc/sysdev/fsl_lbc.c                      |    3 +-
5683  arch/powerpc/sysdev/fsl_pmc.c                      |    1 +
5684  arch/powerpc/sysdev/fsl_rio.c                      |    2 +-
5685  arch/powerpc/sysdev/fsl_soc.c                      |    2 +-
5686  arch/powerpc/sysdev/mpc5xxx_clocks.c               |    1 +
5687  arch/powerpc/sysdev/mpc8xx_pic.c                   |    1 -
5688  arch/powerpc/sysdev/mv64x60_pci.c                  |    1 +
5689  arch/powerpc/sysdev/pmi.c                          |    1 +
5690  arch/powerpc/sysdev/ppc4xx_msi.c                   |    1 +
5691  arch/powerpc/sysdev/qe_lib/gpio.c                  |    1 +
5692  arch/powerpc/sysdev/qe_lib/ucc.c                   |    2 +-
5693  arch/powerpc/sysdev/qe_lib/ucc_fast.c              |    2 +-
5694  arch/powerpc/sysdev/qe_lib/ucc_slow.c              |    2 +-
5695  arch/powerpc/sysdev/qe_lib/usb.c                   |    1 +
5696  arch/powerpc/sysdev/rtc_cmos_setup.c               |    1 +
5697  arch/powerpc/sysdev/scom.c                         |    1 +
5698  arch/powerpc/sysdev/simple_gpio.c                  |    1 -
5699  arch/powerpc/sysdev/tsi108_dev.c                   |    2 +-
5700  arch/powerpc/xmon/xmon.c                           |    2 +-
5701  arch/s390/crypto/sha_common.c                      |    1 +
5702  arch/s390/mm/init.c                                |    1 +
5703  arch/sh/drivers/dma/dma-sysfs.c                    |    1 +
5704  arch/sh/drivers/pci/pci.c                          |    1 +
5705  arch/sh/kernel/cpu/shmobile/cpuidle.c              |    1 +
5706  arch/sh/kernel/perf_event.c                        |    1 +
5707  arch/sh/kernel/topology.c                          |    1 +
5708  arch/sh/mm/init.c                                  |    1 +
5709  arch/sparc/include/asm/termios.h                   |    1 -
5710  arch/sparc/kernel/auxio_32.c                       |    1 +
5711  arch/sparc/kernel/btext.c                          |    1 -
5712  arch/sparc/kernel/central.c                        |    1 +
5713  arch/sparc/kernel/cpu.c                            |    2 +-
5714  arch/sparc/kernel/cpumap.c                         |    2 +-
5715  arch/sparc/kernel/dma.c                            |    1 -
5716  arch/sparc/kernel/ebus.c                           |    2 +-
5717  arch/sparc/kernel/hvapi.c                          |    2 +-
5718  arch/sparc/kernel/idprom.c                         |    2 +-
5719  arch/sparc/kernel/iommu.c                          |    2 +-
5720  arch/sparc/kernel/irq_32.c                         |    1 +
5721  arch/sparc/kernel/irq_64.c                         |    1 -
5722  arch/sparc/kernel/ldc.c                            |    2 +-
5723  arch/sparc/kernel/leon_kernel.c                    |    1 -
5724  arch/sparc/kernel/leon_pci_grpci2.c                |    1 -
5725  arch/sparc/kernel/nmi.c                            |    2 +-
5726  arch/sparc/kernel/of_device_32.c                   |    1 -
5727  arch/sparc/kernel/of_device_64.c                   |    3 +-
5728  arch/sparc/kernel/of_device_common.c               |    2 +-
5729  arch/sparc/kernel/pci.c                            |    2 +-
5730  arch/sparc/kernel/pci_fire.c                       |    1 +
5731  arch/sparc/kernel/pci_psycho.c                     |    1 +
5732  arch/sparc/kernel/pci_sabre.c                      |    1 +
5733  arch/sparc/kernel/pci_schizo.c                     |    1 +
5734  arch/sparc/kernel/pci_sun4v.c                      |    1 +
5735  arch/sparc/kernel/pcic.c                           |    1 +
5736  arch/sparc/kernel/pcr.c                            |    3 +-
5737  arch/sparc/kernel/pmc.c                            |    1 +
5738  arch/sparc/kernel/power.c                          |    2 +-
5739  arch/sparc/kernel/process_64.c                     |    2 +-
5740  arch/sparc/kernel/prom_32.c                        |    1 -
5741  arch/sparc/kernel/prom_64.c                        |    1 -
5742  arch/sparc/kernel/prom_common.c                    |    2 +-
5743  arch/sparc/kernel/reboot.c                         |    2 +-
5744  arch/sparc/kernel/sbus.c                           |    1 +
5745  arch/sparc/kernel/setup_32.c                       |    1 +
5746  arch/sparc/kernel/setup_64.c                       |    1 +
5747  arch/sparc/kernel/smp_64.c                         |    2 +-
5748  arch/sparc/kernel/sparc_ksyms_64.c                 |    2 +-
5749  arch/sparc/kernel/stacktrace.c                     |    2 +-
5750  arch/sparc/kernel/sys_sparc32.c                    |    1 -
5751  arch/sparc/kernel/sys_sparc_64.c                   |    2 +-
5752  arch/sparc/kernel/time_64.c                        |    2 +-
5753  arch/sparc/kernel/traps_32.c                       |    1 +
5754  arch/sparc/kernel/unaligned_32.c                   |    1 -
5755  arch/sparc/kernel/vio.c                            |    1 +
5756  arch/sparc/kernel/viohs.c                          |    2 +-
5757  arch/sparc/mm/fault_32.c                           |    1 -
5758  arch/sparc/mm/generic_32.c                         |    1 +
5759  arch/sparc/mm/generic_64.c                         |    1 +
5760  arch/sparc/mm/highmem.c                            |    1 +
5761  arch/sparc/mm/hugetlbpage.c                        |    1 -
5762  arch/x86/crypto/aes_glue.c                         |    1 +
5763  arch/x86/crypto/aesni-intel_glue.c                 |    1 +
5764  arch/x86/kernel/cpu/amd.c                          |    1 +
5765  arch/x86/kernel/cpu/mcheck/therm_throt.c           |    1 +
5766  arch/x86/kernel/devicetree.c                       |    1 +
5767  arch/x86/kernel/e820.c                             |    1 +
5768  arch/x86/kernel/hpet.c                             |    1 +
5769  arch/x86/kernel/irq.c                              |    1 +
5770  arch/x86/kernel/pci-dma.c                          |    1 +
5771  arch/x86/kernel/probe_roms.c                       |    4 +-
5772  arch/x86/kernel/rtc.c                              |    1 +
5773  arch/x86/kernel/smp.c                              |    1 +
5774  arch/x86/kernel/time.c                             |    1 +
5775  arch/x86/kernel/topology.c                         |    1 +
5776  arch/x86/kernel/vsyscall_64.c                      |    1 +
5777  arch/x86/pci/i386.c                                |    1 +
5778  arch/x86/pci/legacy.c                              |    1 +
5779  arch/x86/platform/efi/efi.c                        |    1 +
5780  arch/x86/platform/efi/efi_32.c                     |    1 +
5781  arch/x86/platform/mrst/vrtc.c                      |    1 +
5782  arch/x86/platform/olpc/olpc-xo1-pm.c               |    1 +
5783  arch/x86/platform/uv/bios_uv.c                     |    1 +
5784  arch/x86/power/cpu.c                               |    1 +
5785  arch/x86/video/fbdev.c                             |    1 +
5786  block/blk-integrity.c                              |    1 +
5787  block/ioctl.c                                      |    1 +
5788  crypto/async_tx/async_memcpy.c                     |    1 +
5789  crypto/async_tx/async_pq.c                         |    1 +
5790  crypto/async_tx/async_raid6_recov.c                |    1 +
5791  crypto/async_tx/async_tx.c                         |    1 +
5792  crypto/async_tx/async_xor.c                        |    1 +
5793  crypto/async_tx/raid6test.c                        |    1 +
5794  crypto/crypto_wq.c                                 |    1 +
5795  crypto/md4.c                                       |    1 +
5796  crypto/proc.c                                      |    1 +
5797  crypto/vmac.c                                      |    1 +
5798  crypto/xcbc.c                                      |    1 +
5799  drivers/acpi/acpica/hwsleep.c                      |    1 +
5800  drivers/acpi/ec_sys.c                              |    1 +
5801  drivers/acpi/sbshc.c                               |    1 +
5802  drivers/acpi/sysfs.c                               |    2 +-
5803  drivers/ata/libata-eh.c                            |    1 +
5804  drivers/ata/libata-pmp.c                           |    1 +
5805  drivers/ata/libata-scsi.c                          |    1 +
5806  drivers/ata/libata-sff.c                           |    1 +
5807  drivers/base/base.h                                |    1 +
5808  drivers/base/dma-coherent.c                        |    1 +
5809  drivers/base/dma-mapping.c                         |    1 +
5810  drivers/base/hypervisor.c                          |    1 +
5811  drivers/base/power/generic_ops.c                   |    1 +
5812  drivers/base/power/main.c                          |    1 +
5813  drivers/base/power/runtime.c                       |    1 +
5814  drivers/base/power/sysfs.c                         |    1 +
5815  drivers/base/power/trace.c                         |    1 +
5816  drivers/base/power/wakeup.c                        |    1 +
5817  drivers/base/transport_class.c                     |    1 +
5818  drivers/bcma/core.c                                |    1 +
5819  drivers/bcma/driver_chipcommon.c                   |    1 +
5820  drivers/bcma/driver_pci.c                          |    1 +
5821  drivers/bcma/host_pci.c                            |    1 +
5822  drivers/bcma/main.c                                |    1 +
5823  drivers/block/aoe/aoechr.c                         |    1 +
5824  drivers/block/ps3disk.c                            |    1 +
5825  drivers/block/ps3vram.c                            |    1 +
5826  drivers/block/virtio_blk.c                         |    1 +
5827  drivers/char/hw_random/virtio-rng.c                |    1 +
5828  drivers/char/ramoops.c                             |    1 +
5829  drivers/char/ttyprintk.c                           |    1 +
5830  drivers/char/virtio_console.c                      |    1 +
5831  drivers/clocksource/sh_cmt.c                       |    1 +
5832  drivers/clocksource/sh_mtu2.c                      |    1 +
5833  drivers/clocksource/sh_tmu.c                       |    1 +
5834  drivers/cpufreq/cpufreq_stats.c                    |    1 +
5835  drivers/cpufreq/s3c64xx-cpufreq.c                  |    1 +
5836  drivers/crypto/mv_cesa.c                           |    1 +
5837  drivers/dca/dca-core.c                             |    1 +
5838  drivers/dca/dca-sysfs.c                            |    1 +
5839  drivers/dma/intel_mid_dma.c                        |    1 +
5840  drivers/dma/ipu/ipu_idmac.c                        |    1 +
5841  drivers/dma/ste_dma40.c                            |    1 +
5842  drivers/edac/mce_amd_inj.c                         |    1 +
5843  drivers/firewire/core-iso.c                        |    1 +
5844  drivers/firmware/google/gsmi.c                     |    1 +
5845  drivers/firmware/sigma.c                           |    1 +
5846  drivers/gpio/gpio-74x164.c                         |    1 +
5847  drivers/gpio/gpio-ep93xx.c                         |    1 +
5848  drivers/gpio/gpio-mc33880.c                        |    1 +
5849  drivers/gpio/gpio-mcp23s08.c                       |    1 +
5850  drivers/gpio/gpio-ml-ioh.c                         |    1 +
5851  drivers/gpio/gpio-mpc5200.c                        |    1 +
5852  drivers/gpio/gpio-mxc.c                            |    1 +
5853  drivers/gpio/gpio-mxs.c                            |    1 +
5854  drivers/gpio/gpio-pcf857x.c                        |    1 +
5855  drivers/gpio/gpio-pch.c                            |    1 +
5856  drivers/gpio/gpio-xilinx.c                         |    1 +
5857  drivers/gpu/drm/ttm/ttm_tt.c                       |    1 +
5858  drivers/hid/hid-axff.c                             |    1 +
5859  drivers/hid/hid-debug.c                            |    1 +
5860  drivers/hid/hid-dr.c                               |    1 +
5861  drivers/hid/hid-emsff.c                            |    1 +
5862  drivers/hid/hid-gaff.c                             |    1 +
5863  drivers/hid/hid-holtekff.c                         |    1 +
5864  drivers/hid/hid-picolcd.c                          |    1 +
5865  drivers/hid/hid-pl.c                               |    1 +
5866  drivers/hid/hid-roccat-common.c                    |    1 +
5867  drivers/hid/hid-roccat.c                           |    1 +
5868  drivers/hid/hid-sjoy.c                             |    1 +
5869  drivers/hid/hid-tmff.c                             |    1 +
5870  drivers/hid/hid-zpff.c                             |    1 +
5871  drivers/hid/usbhid/hid-quirks.c                    |    1 +
5872  drivers/hwmon/ultra45_env.c                        |    1 +
5873  drivers/i2c/busses/i2c-pxa-pci.c                   |    1 +
5874  drivers/i2c/busses/i2c-sh7760.c                    |    1 +
5875  drivers/i2c/busses/i2c-tegra.c                     |    1 +
5876  drivers/i2c/i2c-boardinfo.c                        |    1 +
5877  drivers/ide/buddha.c                               |    1 +
5878  drivers/ide/cmd640.c                               |    1 +
5879  drivers/ide/ide-acpi.c                             |    1 +
5880  drivers/ide/ide-atapi.c                            |    1 +
5881  drivers/ide/ide-disk_proc.c                        |    1 +
5882  drivers/ide/ide-dma-sff.c                          |    1 +
5883  drivers/ide/ide-dma.c                              |    1 +
5884  drivers/ide/ide-eh.c                               |    1 +
5885  drivers/ide/ide-floppy_proc.c                      |    1 +
5886  drivers/ide/ide-io-std.c                           |    1 +
5887  drivers/ide/ide-ioctls.c                           |    1 +
5888  drivers/ide/ide-legacy.c                           |    1 +
5889  drivers/ide/ide-lib.c                              |    1 +
5890  drivers/ide/ide-pnp.c                              |    1 +
5891  drivers/ide/ide-taskfile.c                         |    1 +
5892  drivers/ide/ide-xfer-mode.c                        |    1 +
5893  drivers/ide/macide.c                               |    1 +
5894  drivers/ide/pmac.c                                 |    1 +
5895  drivers/ide/q40ide.c                               |    1 +
5896  drivers/ide/setup-pci.c                            |    1 +
5897  drivers/ide/tc86c001.c                             |    1 +
5898  drivers/idle/intel_idle.c                          |    1 +
5899  drivers/infiniband/core/cm.c                       |    1 +
5900  drivers/infiniband/core/fmr_pool.c                 |    1 +
5901  drivers/infiniband/core/mad.c                      |    1 +
5902  drivers/infiniband/core/multicast.c                |    1 +
5903  drivers/infiniband/core/packer.c                   |    1 +
5904  drivers/infiniband/core/sysfs.c                    |    1 +
5905  drivers/infiniband/core/ud_header.c                |    1 +
5906  drivers/infiniband/core/umem.c                     |    1 +
5907  drivers/infiniband/core/uverbs_marshall.c          |    1 +
5908  drivers/infiniband/core/verbs.c                    |    1 +
5909  drivers/infiniband/hw/ipath/ipath_diag.c           |    1 +
5910  drivers/infiniband/hw/ipath/ipath_file_ops.c       |    1 +
5911  drivers/infiniband/hw/ipath/ipath_sysfs.c          |    1 +
5912  drivers/infiniband/hw/ipath/ipath_verbs.c          |    1 +
5913  drivers/infiniband/hw/mthca/mthca_catas.c          |    1 +
5914  drivers/infiniband/hw/mthca/mthca_cmd.c            |    1 +
5915  drivers/infiniband/hw/mthca/mthca_provider.c       |    2 +
5916  drivers/infiniband/hw/qib/qib_diag.c               |    1 +
5917  drivers/infiniband/hw/qib/qib_file_ops.c           |    1 +
5918  drivers/infiniband/hw/qib/qib_iba7220.c            |    1 +
5919  drivers/infiniband/hw/qib/qib_iba7322.c            |    1 +
5920  drivers/infiniband/hw/qib/qib_pcie.c               |    1 +
5921  drivers/infiniband/hw/qib/qib_sd7220.c             |    1 +
5922  drivers/infiniband/hw/qib/qib_verbs.c              |    1 +
5923  drivers/input/input-compat.c                       |    1 +
5924  drivers/input/input-mt.c                           |    1 +
5925  drivers/input/input-polldev.c                      |    1 +
5926  drivers/input/joystick/as5011.c                    |    1 +
5927  drivers/input/keyboard/nomadik-ske-keypad.c        |    1 +
5928  drivers/input/keyboard/tnetv107x-keypad.c          |    1 +
5929  drivers/input/misc/ad714x.c                        |    1 +
5930  drivers/input/misc/adxl34x.c                       |    1 +
5931  drivers/input/misc/ati_remote2.c                   |    1 +
5932  drivers/input/misc/cma3000_d0x.c                   |    1 +
5933  drivers/input/misc/dm355evm_keys.c                 |    1 +
5934  drivers/input/sparse-keymap.c                      |    1 +
5935  drivers/input/touchscreen/ad7877.c                 |    1 +
5936  drivers/input/touchscreen/ad7879-spi.c             |    1 +
5937  drivers/input/touchscreen/ad7879.c                 |    1 +
5938  drivers/input/touchscreen/ads7846.c                |    1 +
5939  drivers/input/touchscreen/bu21013_ts.c             |    1 +
5940  drivers/isdn/capi/kcapi_proc.c                     |    1 +
5941  drivers/leds/dell-led.c                            |    1 +
5942  drivers/leds/leds-88pm860x.c                       |    1 +
5943  drivers/leds/leds-asic3.c                          |    1 +
5944  drivers/leds/leds-atmel-pwm.c                      |    1 +
5945  drivers/leds/leds-cobalt-raq.c                     |    1 +
5946  drivers/leds/leds-fsg.c                            |    1 +
5947  drivers/leds/leds-gpio.c                           |    1 +
5948  drivers/leds/leds-lm3530.c                         |    1 +
5949  drivers/leds/leds-locomo.c                         |    1 +
5950  drivers/leds/leds-lt3593.c                         |    1 +
5951  drivers/leds/leds-net48xx.c                        |    1 +
5952  drivers/leds/leds-net5501.c                        |    1 +
5953  drivers/leds/leds-ns2.c                            |    1 +
5954  drivers/leds/leds-s3c24xx.c                        |    1 +
5955  drivers/leds/leds-wm831x-status.c                  |    1 +
5956  drivers/leds/leds-wm8350.c                         |    1 +
5957  drivers/leds/leds-wrap.c                           |    1 +
5958  drivers/lguest/lguest_device.c                     |    1 +
5959  drivers/md/dm-exception-store.c                    |    1 +
5960  drivers/md/dm-log-userspace-base.c                 |    1 +
5961  drivers/md/dm-path-selector.c                      |    1 +
5962  drivers/md/dm-raid.c                               |    1 +
5963  drivers/md/dm-round-robin.c                        |    1 +
5964  drivers/md/dm-service-time.c                       |    1 +
5965  drivers/md/dm-snap-persistent.c                    |    1 +
5966  drivers/md/dm-snap-transient.c                     |    1 +
5967  drivers/md/dm-uevent.c                             |    1 +
5968  drivers/md/faulty.c                                |    1 +
5969  drivers/md/linear.c                                |    1 +
5970  drivers/md/md.c                                    |    1 +
5971  drivers/md/multipath.c                             |    1 +
5972  drivers/md/raid0.c                                 |    1 +
5973  drivers/md/raid1.c                                 |    1 +
5974  drivers/md/raid10.c                                |    1 +
5975  drivers/md/raid5.c                                 |    1 +
5976  drivers/media/common/saa7146_core.c                |    1 +
5977  drivers/media/common/saa7146_fops.c                |    1 +
5978  drivers/media/common/saa7146_hlp.c                 |    1 +
5979  drivers/media/common/saa7146_video.c               |    1 +
5980  drivers/media/common/tuners/tuner-types.c          |    1 +
5981  drivers/media/dvb/frontends/dibx000_common.c       |    1 +
5982  drivers/media/dvb/siano/sms-cards.c                |    1 +
5983  drivers/media/dvb/siano/smsendian.c                |    1 +
5984  drivers/media/dvb/siano/smssdio.c                  |    1 +
5985  drivers/media/dvb/siano/smsusb.c                   |    1 +
5986  drivers/media/media-device.c                       |    1 +
5987  drivers/media/radio/radio-timb.c                   |    1 +
5988  drivers/media/radio/radio-wl1273.c                 |    1 +
5989  drivers/media/radio/si4713-i2c.c                   |    1 +
5990  drivers/media/radio/wl128x/fmdrv_v4l2.c            |    2 +
5991  drivers/media/rc/ir-jvc-decoder.c                  |    1 +
5992  drivers/media/rc/ir-lirc-codec.c                   |    1 +
5993  drivers/media/rc/ir-nec-decoder.c                  |    1 +
5994  drivers/media/rc/ir-raw.c                          |    2 +
5995  drivers/media/rc/ir-rc5-decoder.c                  |    1 +
5996  drivers/media/rc/ir-rc5-sz-decoder.c               |    1 +
5997  drivers/media/rc/ir-rc6-decoder.c                  |    1 +
5998  drivers/media/rc/ir-sony-decoder.c                 |    1 +
5999  drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c    |    1 +
6000  drivers/media/rc/keymaps/rc-alink-dtu-m.c          |    1 +
6001  drivers/media/rc/keymaps/rc-anysee.c               |    1 +
6002  drivers/media/rc/keymaps/rc-apac-viewcomp.c        |    1 +
6003  drivers/media/rc/keymaps/rc-asus-pc39.c            |    1 +
6004  drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c |    1 +
6005  drivers/media/rc/keymaps/rc-avermedia-a16d.c       |    1 +
6006  drivers/media/rc/keymaps/rc-avermedia-cardbus.c    |    1 +
6007  drivers/media/rc/keymaps/rc-avermedia-dvbt.c       |    1 +
6008  drivers/media/rc/keymaps/rc-avermedia-m135a.c      |    1 +
6009  .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c    |    1 +
6010  drivers/media/rc/keymaps/rc-avermedia-rm-ks.c      |    1 +
6011  drivers/media/rc/keymaps/rc-avermedia.c            |    1 +
6012  drivers/media/rc/keymaps/rc-avertv-303.c           |    1 +
6013  drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c   |    1 +
6014  drivers/media/rc/keymaps/rc-behold-columbus.c      |    1 +
6015  drivers/media/rc/keymaps/rc-behold.c               |    1 +
6016  drivers/media/rc/keymaps/rc-budget-ci-old.c        |    1 +
6017  drivers/media/rc/keymaps/rc-cinergy-1400.c         |    1 +
6018  drivers/media/rc/keymaps/rc-cinergy.c              |    1 +
6019  drivers/media/rc/keymaps/rc-dib0700-nec.c          |    1 +
6020  drivers/media/rc/keymaps/rc-dib0700-rc5.c          |    1 +
6021  drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c  |    1 +
6022  drivers/media/rc/keymaps/rc-digittrade.c           |    1 +
6023  drivers/media/rc/keymaps/rc-dm1105-nec.c           |    1 +
6024  drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c      |    1 +
6025  drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c   |    1 +
6026  drivers/media/rc/keymaps/rc-em-terratec.c          |    1 +
6027  drivers/media/rc/keymaps/rc-encore-enltv-fm53.c    |    1 +
6028  drivers/media/rc/keymaps/rc-encore-enltv.c         |    1 +
6029  drivers/media/rc/keymaps/rc-encore-enltv2.c        |    1 +
6030  drivers/media/rc/keymaps/rc-evga-indtube.c         |    1 +
6031  drivers/media/rc/keymaps/rc-eztv.c                 |    1 +
6032  drivers/media/rc/keymaps/rc-flydvb.c               |    1 +
6033  drivers/media/rc/keymaps/rc-flyvideo.c             |    1 +
6034  drivers/media/rc/keymaps/rc-fusionhdtv-mce.c       |    1 +
6035  drivers/media/rc/keymaps/rc-gadmei-rm008z.c        |    1 +
6036  drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c   |    1 +
6037  drivers/media/rc/keymaps/rc-gotview7135.c          |    1 +
6038  drivers/media/rc/keymaps/rc-hauppauge.c            |    1 +
6039  drivers/media/rc/keymaps/rc-imon-mce.c             |    1 +
6040  drivers/media/rc/keymaps/rc-imon-pad.c             |    1 +
6041  drivers/media/rc/keymaps/rc-iodata-bctv7e.c        |    1 +
6042  drivers/media/rc/keymaps/rc-kaiomy.c               |    1 +
6043  drivers/media/rc/keymaps/rc-kworld-315u.c          |    1 +
6044  .../media/rc/keymaps/rc-kworld-plus-tv-analog.c    |    1 +
6045  drivers/media/rc/keymaps/rc-leadtek-y04g0051.c     |    1 +
6046  drivers/media/rc/keymaps/rc-lirc.c                 |    1 +
6047  drivers/media/rc/keymaps/rc-lme2510.c              |    1 +
6048  drivers/media/rc/keymaps/rc-manli.c                |    1 +
6049  drivers/media/rc/keymaps/rc-msi-digivox-ii.c       |    1 +
6050  drivers/media/rc/keymaps/rc-msi-digivox-iii.c      |    1 +
6051  drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c  |    1 +
6052  drivers/media/rc/keymaps/rc-msi-tvanywhere.c       |    1 +
6053  drivers/media/rc/keymaps/rc-nebula.c               |    1 +
6054  .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c  |    1 +
6055  drivers/media/rc/keymaps/rc-norwood.c              |    1 +
6056  drivers/media/rc/keymaps/rc-npgtech.c              |    1 +
6057  drivers/media/rc/keymaps/rc-pctv-sedna.c           |    1 +
6058  drivers/media/rc/keymaps/rc-pinnacle-color.c       |    1 +
6059  drivers/media/rc/keymaps/rc-pinnacle-grey.c        |    1 +
6060  drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c     |    1 +
6061  drivers/media/rc/keymaps/rc-pixelview-002t.c       |    1 +
6062  drivers/media/rc/keymaps/rc-pixelview-mk12.c       |    1 +
6063  drivers/media/rc/keymaps/rc-pixelview-new.c        |    1 +
6064  drivers/media/rc/keymaps/rc-pixelview.c            |    1 +
6065  .../media/rc/keymaps/rc-powercolor-real-angel.c    |    1 +
6066  drivers/media/rc/keymaps/rc-proteus-2309.c         |    1 +
6067  drivers/media/rc/keymaps/rc-purpletv.c             |    1 +
6068  drivers/media/rc/keymaps/rc-pv951.c                |    1 +
6069  drivers/media/rc/keymaps/rc-rc6-mce.c              |    1 +
6070  .../media/rc/keymaps/rc-real-audio-220-32-keys.c   |    1 +
6071  drivers/media/rc/keymaps/rc-streamzap.c            |    1 +
6072  drivers/media/rc/keymaps/rc-tbs-nec.c              |    1 +
6073  drivers/media/rc/keymaps/rc-technisat-usb2.c       |    1 +
6074  drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c  |    1 +
6075  drivers/media/rc/keymaps/rc-terratec-slim-2.c      |    1 +
6076  drivers/media/rc/keymaps/rc-terratec-slim.c        |    1 +
6077  drivers/media/rc/keymaps/rc-tevii-nec.c            |    1 +
6078  drivers/media/rc/keymaps/rc-tivo.c                 |    1 +
6079  drivers/media/rc/keymaps/rc-total-media-in-hand.c  |    1 +
6080  drivers/media/rc/keymaps/rc-trekstor.c             |    1 +
6081  drivers/media/rc/keymaps/rc-tt-1500.c              |    1 +
6082  drivers/media/rc/keymaps/rc-twinhan1027.c          |    1 +
6083  drivers/media/rc/keymaps/rc-videomate-m1f.c        |    1 +
6084  drivers/media/rc/keymaps/rc-videomate-s350.c       |    1 +
6085  drivers/media/rc/keymaps/rc-videomate-tv-pvr.c     |    1 +
6086  drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c |    1 +
6087  drivers/media/rc/keymaps/rc-winfast.c              |    1 +
6088  drivers/media/rc/rc-main.c                         |    1 +
6089  drivers/media/video/adp1653.c                      |    1 +
6090  drivers/media/video/ak881x.c                       |    1 +
6091  drivers/media/video/cpia2/cpia2_usb.c              |    1 +
6092  drivers/media/video/cx25840/cx25840-ir.c           |    1 +
6093  drivers/media/video/davinci/dm355_ccdc.c           |    1 +
6094  drivers/media/video/davinci/dm644x_ccdc.c          |    1 +
6095  drivers/media/video/hdpvr/hdpvr-i2c.c              |    1 +
6096  drivers/media/video/hexium_gemini.c                |    1 +
6097  drivers/media/video/hexium_orion.c                 |    1 +
6098  drivers/media/video/imx074.c                       |    1 +
6099  drivers/media/video/m5mols/m5mols_core.c           |    1 +
6100  drivers/media/video/mt9m001.c                      |    1 +
6101  drivers/media/video/mt9m111.c                      |    1 +
6102  drivers/media/video/mt9t031.c                      |    1 +
6103  drivers/media/video/mt9v011.c                      |    1 +
6104  drivers/media/video/mt9v022.c                      |    1 +
6105  drivers/media/video/mt9v032.c                      |    1 +
6106  drivers/media/video/mxb.c                          |    1 +
6107  drivers/media/video/noon010pc30.c                  |    1 +
6108  drivers/media/video/omap24xxcam.c                  |    1 +
6109  drivers/media/video/ov6650.c                       |    1 +
6110  drivers/media/video/pvrusb2/pvrusb2-devattr.c      |    1 +
6111  drivers/media/video/pvrusb2/pvrusb2-hdw.c          |    1 +
6112  drivers/media/video/pvrusb2/pvrusb2-i2c-core.c     |    1 +
6113  drivers/media/video/pvrusb2/pvrusb2-v4l2.c         |    1 +
6114  drivers/media/video/rj54n1cb0c.c                   |    1 +
6115  drivers/media/video/sh_mobile_csi2.c               |    1 +
6116  drivers/media/video/sh_vou.c                       |    1 +
6117  drivers/media/video/sr030pc30.c                    |    1 +
6118  drivers/media/video/tcm825x.c                      |    1 +
6119  drivers/media/video/timblogiw.c                    |    1 +
6120  drivers/media/video/tvp514x.c                      |    1 +
6121  drivers/media/video/tvp5150.c                      |    1 +
6122  drivers/media/video/tvp7002.c                      |    1 +
6123  drivers/media/video/usbvision/usbvision-cards.c    |    1 +
6124  drivers/media/video/v4l2-ctrls.c                   |    1 +
6125  drivers/media/video/v4l2-device.c                  |    1 +
6126  drivers/media/video/v4l2-event.c                   |    1 +
6127  drivers/media/video/v4l2-fh.c                      |    1 +
6128  drivers/media/video/v4l2-int-device.c              |    1 +
6129  drivers/media/video/v4l2-subdev.c                  |    1 +
6130  drivers/memstick/core/memstick.c                   |    1 +
6131  drivers/memstick/core/mspro_block.c                |    1 +
6132  drivers/memstick/host/jmb38x_ms.c                  |    1 +
6133  drivers/memstick/host/tifm_ms.c                    |    1 +
6134  drivers/message/i2o/pci.c                          |    1 +
6135  drivers/mfd/ab3100-core.c                          |    1 +
6136  drivers/mfd/ab3550-core.c                          |    1 +
6137  drivers/mfd/ab8500-debugfs.c                       |    1 +
6138  drivers/mfd/ab8500-sysctrl.c                       |    1 +
6139  drivers/mfd/abx500-core.c                          |    1 +
6140  drivers/mfd/asic3.c                                |    1 +
6141  drivers/mfd/dm355evm_msp.c                         |    1 +
6142  drivers/mfd/max8997.c                              |    1 +
6143  drivers/mfd/mfd-core.c                             |    1 +
6144  drivers/mfd/pcf50633-irq.c                         |    1 +
6145  drivers/mfd/tmio_core.c                            |    1 +
6146  drivers/mfd/twl-core.c                             |    1 +
6147  drivers/mfd/twl6030-irq.c                          |    1 +
6148  drivers/mfd/wl1273-core.c                          |    1 +
6149  drivers/mfd/wm8400-core.c                          |    1 +
6150  drivers/misc/ab8500-pwm.c                          |    1 +
6151  drivers/misc/atmel-ssc.c                           |    1 +
6152  drivers/misc/atmel_tclib.c                         |    1 +
6153  drivers/misc/bh1780gli.c                           |    1 +
6154  drivers/misc/kgdbts.c                              |    1 +
6155  drivers/misc/ti-st/st_kim.c                        |    1 +
6156  drivers/misc/tifm_7xx1.c                           |    1 +
6157  drivers/misc/tifm_core.c                           |    1 +
6158  drivers/mmc/card/mmc_test.c                        |    1 +
6159  drivers/mmc/core/bus.c                             |    2 +
6160  drivers/mmc/core/debugfs.c                         |    1 +
6161  drivers/mmc/core/host.c                            |    1 +
6162  drivers/mmc/core/mmc.c                             |    1 +
6163  drivers/mmc/core/mmc_ops.c                         |    1 +
6164  drivers/mmc/core/quirks.c                          |    1 +
6165  drivers/mmc/core/sd.c                              |    1 +
6166  drivers/mmc/core/sd_ops.c                          |    1 +
6167  drivers/mmc/core/sdio_bus.c                        |    1 +
6168  drivers/mmc/core/sdio_io.c                         |    1 +
6169  drivers/mmc/core/sdio_irq.c                        |    1 +
6170  drivers/mmc/host/mmc_spi.c                         |    1 +
6171  drivers/mmc/host/mxs-mmc.c                         |    1 +
6172  drivers/mmc/host/sdhci-of-esdhc.c                  |    1 +
6173  drivers/mmc/host/sdhci-of-hlwd.c                   |    1 +
6174  drivers/mmc/host/sdhci-pci.c                       |    1 +
6175  drivers/mmc/host/sdhci-pltfm.c                     |    1 +
6176  drivers/mmc/host/sdhci-pxav2.c                     |    1 +
6177  drivers/mmc/host/sdhci-pxav3.c                     |    1 +
6178  drivers/mmc/host/sdhci-spear.c                     |    1 +
6179  drivers/mmc/host/sdhci-tegra.c                     |    1 +
6180  drivers/mmc/host/sdhci.c                           |    1 +
6181  drivers/mmc/host/sdricoh_cs.c                      |    1 +
6182  drivers/mmc/host/sh_mmcif.c                        |    1 +
6183  drivers/mmc/host/sh_mobile_sdhi.c                  |    1 +
6184  drivers/mmc/host/tifm_sd.c                         |    1 +
6185  drivers/mmc/host/via-sdmmc.c                       |    1 +
6186  drivers/mtd/ar7part.c                              |    1 +
6187  drivers/mtd/cmdlinepart.c                          |    1 +
6188  drivers/mtd/lpddr/lpddr_cmds.c                     |    1 +
6189  drivers/mtd/mtdblock_ro.c                          |    1 +
6190  drivers/mtd/mtdsuper.c                             |    1 +
6191  drivers/mtd/nand/cafe_nand.c                       |    1 +
6192  drivers/mtd/nand/cmx270_nand.c                     |    1 +
6193  drivers/mtd/nand/diskonchip.c                      |    1 +
6194  drivers/mtd/nand/nand_bbt.c                        |    1 +
6195  drivers/mtd/nand/omap2.c                           |    1 +
6196  drivers/mtd/nand/sm_common.c                       |    1 +
6197  drivers/mtd/onenand/onenand_bbt.c                  |    1 +
6198  drivers/mtd/redboot.c                              |    1 +
6199  drivers/mtd/rfd_ftl.c                              |    1 +
6200  drivers/mtd/ubi/vmt.c                              |    1 +
6201  drivers/net/ethernet/mellanox/mlx4/alloc.c         |    1 +
6202  drivers/net/ethernet/mellanox/mlx4/catas.c         |    1 +
6203  drivers/net/ethernet/mellanox/mlx4/cmd.c           |    1 +
6204  drivers/net/ethernet/mellanox/mlx4/cq.c            |    1 +
6205  drivers/net/ethernet/mellanox/mlx4/eq.c            |    1 +
6206  drivers/net/ethernet/mellanox/mlx4/fw.c            |    1 +
6207  drivers/net/ethernet/mellanox/mlx4/intf.c          |    1 +
6208  drivers/net/ethernet/mellanox/mlx4/mr.c            |    1 +
6209  drivers/net/ethernet/mellanox/mlx4/pd.c            |    1 +
6210  drivers/net/ethernet/mellanox/mlx4/port.c          |    1 +
6211  drivers/net/ethernet/mellanox/mlx4/qp.c            |    1 +
6212  drivers/net/ethernet/mellanox/mlx4/srq.c           |    1 +
6213  drivers/net/phy/realtek.c                          |    1 +
6214  drivers/net/wireless/b43/pcmcia.c                  |    1 +
6215  drivers/of/of_pci.c                                |    1 +
6216  drivers/of/of_pci_irq.c                            |    1 +
6217  drivers/of/of_spi.c                                |    1 +
6218  drivers/parisc/ccio-dma.c                          |    1 +
6219  drivers/parisc/sba_iommu.c                         |    1 +
6220  drivers/pci/hotplug-pci.c                          |    1 +
6221  drivers/pci/hotplug/pciehp_acpi.c                  |    1 +
6222  drivers/pci/hotplug/pcihp_slot.c                   |    1 +
6223  drivers/pci/hotplug/rpadlpar_core.c                |    1 +
6224  drivers/pci/htirq.c                                |    1 +
6225  drivers/pci/iov.c                                  |    1 +
6226  drivers/pci/irq.c                                  |    1 +
6227  drivers/pci/msi.c                                  |    1 +
6228  drivers/pci/pci-sysfs.c                            |    1 +
6229  drivers/pci/quirks.c                               |    1 +
6230  drivers/pci/rom.c                                  |    1 +
6231  drivers/pci/setup-res.c                            |    1 +
6232  drivers/pci/slot.c                                 |    1 +
6233  drivers/pci/vpd.c                                  |    1 +
6234  drivers/pcmcia/db1xxx_ss.c                         |    1 +
6235  drivers/pcmcia/pxa2xx_cm_x255.c                    |    1 +
6236  drivers/pcmcia/pxa2xx_cm_x270.c                    |    1 +
6237  drivers/platform/x86/intel_scu_ipc.c               |    1 +
6238  drivers/platform/x86/msi-wmi.c                     |    1 +
6239  drivers/platform/x86/wmi.c                         |    1 +
6240  drivers/power/max17042_battery.c                   |    1 +
6241  drivers/power/max8903_charger.c                    |    1 +
6242  drivers/power/max8997_charger.c                    |    1 +
6243  drivers/power/max8998_charger.c                    |    1 +
6244  drivers/power/power_supply_sysfs.c                 |    1 +
6245  drivers/ps3/ps3stor_lib.c                          |    1 +
6246  drivers/ps3/sys-manager-core.c                     |    1 +
6247  drivers/rapidio/switches/idt_gen2.c                |    1 +
6248  drivers/regulator/88pm8607.c                       |    1 +
6249  drivers/regulator/ab8500.c                         |    1 +
6250  drivers/regulator/bq24022.c                        |    1 +
6251  drivers/regulator/da903x.c                         |    1 +
6252  drivers/regulator/db8500-prcmu.c                   |    1 +
6253  drivers/regulator/dummy.c                          |    1 +
6254  drivers/regulator/fixed.c                          |    1 +
6255  drivers/regulator/lp3971.c                         |    1 +
6256  drivers/regulator/lp3972.c                         |    1 +
6257  drivers/regulator/max8925-regulator.c              |    1 +
6258  drivers/regulator/max8997.c                        |    1 +
6259  drivers/regulator/mc13783-regulator.c              |    1 +
6260  drivers/regulator/mc13892-regulator.c              |    1 +
6261  drivers/regulator/mc13xxx-regulator-core.c         |    1 +
6262  drivers/regulator/tps6586x-regulator.c             |    1 +
6263  drivers/regulator/userspace-consumer.c             |    1 +
6264  drivers/regulator/virtual.c                        |    1 +
6265  drivers/regulator/wm8400-regulator.c               |    1 +
6266  drivers/rtc/interface.c                            |    1 +
6267  drivers/rtc/rtc-dm355evm.c                         |    1 +
6268  drivers/rtc/rtc-ds1305.c                           |    1 +
6269  drivers/rtc/rtc-ds1511.c                           |    1 +
6270  drivers/rtc/rtc-ds1553.c                           |    1 +
6271  drivers/rtc/rtc-ds1672.c                           |    1 +
6272  drivers/rtc/rtc-ds1742.c                           |    1 +
6273  drivers/rtc/rtc-em3027.c                           |    1 +
6274  drivers/rtc/rtc-isl12022.c                         |    1 +
6275  drivers/rtc/rtc-mv.c                               |    1 +
6276  drivers/rtc/rtc-pcf2123.c                          |    1 +
6277  drivers/rtc/rtc-pcf8563.c                          |    1 +
6278  drivers/rtc/rtc-rs5c348.c                          |    1 +
6279  drivers/rtc/rtc-rs5c372.c                          |    1 +
6280  drivers/rtc/rtc-stk17ta8.c                         |    1 +
6281  drivers/rtc/rtc-tx4939.c                           |    1 +
6282  drivers/rtc/rtc-x1205.c                            |    1 +
6283  drivers/s390/char/fs3270.c                         |    1 +
6284  drivers/s390/char/sclp_cpi_sys.c                   |    1 +
6285  drivers/s390/char/vmur.c                           |    1 +
6286  drivers/s390/cio/chp.c                             |    2 +
6287  drivers/s390/cio/qdio_debug.c                      |    2 +
6288  drivers/s390/kvm/kvm_virtio.c                      |    1 +
6289  drivers/s390/scsi/zfcp_ccw.c                       |    1 +
6290  drivers/s390/scsi/zfcp_dbf.c                       |    1 +
6291  drivers/s390/scsi/zfcp_scsi.c                      |    1 +
6292  drivers/scsi/a2091.c                               |    1 +
6293  drivers/scsi/a3000.c                               |    1 +
6294  drivers/scsi/aacraid/aachba.c                      |    1 +
6295  drivers/scsi/bfa/bfad_debugfs.c                    |    1 +
6296  drivers/scsi/bfa/bfad_im.c                         |    2 +
6297  drivers/scsi/device_handler/scsi_dh.c              |    1 +
6298  drivers/scsi/device_handler/scsi_dh_alua.c         |    1 +
6299  drivers/scsi/device_handler/scsi_dh_emc.c          |    1 +
6300  drivers/scsi/device_handler/scsi_dh_hp_sw.c        |    1 +
6301  drivers/scsi/device_handler/scsi_dh_rdac.c         |    1 +
6302  drivers/scsi/gvp11.c                               |    1 +
6303  drivers/scsi/libfc/fc_disc.c                       |    1 +
6304  drivers/scsi/libfc/fc_elsct.c                      |    1 +
6305  drivers/scsi/libfc/fc_exch.c                       |    1 +
6306  drivers/scsi/libfc/fc_libfc.c                      |    1 +
6307  drivers/scsi/libfc/fc_lport.c                      |    1 +
6308  drivers/scsi/libfc/fc_npiv.c                       |    1 +
6309  drivers/scsi/libfc/fc_rport.c                      |    1 +
6310  drivers/scsi/libsas/sas_scsi_host.c                |    1 +
6311  drivers/scsi/libsas/sas_task.c                     |    1 +
6312  drivers/scsi/libsrp.c                              |    1 +
6313  drivers/scsi/lpfc/lpfc_attr.c                      |    1 +
6314  drivers/scsi/lpfc/lpfc_debugfs.c                   |    1 +
6315  drivers/scsi/lpfc/lpfc_init.c                      |    1 +
6316  drivers/scsi/lpfc/lpfc_scsi.c                      |    1 +
6317  drivers/scsi/mac53c94.c                            |    1 +
6318  drivers/scsi/megaraid/megaraid_mbox.c              |    1 +
6319  drivers/scsi/osd/osd_initiator.c                   |    1 +
6320  drivers/scsi/ps3rom.c                              |    1 +
6321  drivers/scsi/scsi_lib.c                            |    1 +
6322  drivers/scsi/scsi_lib_dma.c                        |    1 +
6323  drivers/scsi/scsi_pm.c                             |    1 +
6324  drivers/scsi/sr_ioctl.c                            |    1 +
6325  drivers/sfi/sfi_core.h                             |    3 +
6326  drivers/sh/intc/core.c                             |    1 +
6327  drivers/sh/intc/virq.c                             |    1 +
6328  drivers/sh/maple/maple.c                           |    1 +
6329  drivers/spi/spi-altera.c                           |    1 +
6330  drivers/spi/spi-au1550.c                           |    1 +
6331  drivers/spi/spi-bitbang.c                          |    1 +
6332  drivers/spi/spi-butterfly.c                        |    1 +
6333  drivers/spi/spi-dw-mmio.c                          |    1 +
6334  drivers/spi/spi-dw-pci.c                           |    1 +
6335  drivers/spi/spi-dw.c                               |    1 +
6336  drivers/spi/spi-gpio.c                             |    1 +
6337  drivers/spi/spi-oc-tiny.c                          |    1 +
6338  drivers/spi/spi-omap-uwire.c                       |    1 +
6339  drivers/spi/spi-orion.c                            |    1 +
6340  drivers/spi/spi-pxa2xx-pci.c                       |    1 +
6341  drivers/spi/spi-s3c24xx.c                          |    1 +
6342  drivers/spi/spi-sh-msiof.c                         |    1 +
6343  drivers/spi/spi-sh-sci.c                           |    1 +
6344  drivers/spi/spi-ti-ssp.c                           |    1 +
6345  drivers/spi/spi-tle62x0.c                          |    1 +
6346  drivers/spi/spi-txx9.c                             |    1 +
6347  drivers/spi/spi.c                                  |    1 +
6348  drivers/ssb/b43_pci_bridge.c                       |    1 +
6349  drivers/ssb/driver_chipcommon.c                    |    1 +
6350  drivers/ssb/driver_chipcommon_pmu.c                |    1 +
6351  drivers/ssb/driver_gige.c                          |    1 +
6352  drivers/ssb/driver_pcicore.c                       |    1 +
6353  drivers/ssb/embedded.c                             |    1 +
6354  drivers/ssb/main.c                                 |    1 +
6355  drivers/ssb/pcihost_wrapper.c                      |    1 +
6356  drivers/staging/altera-stapl/altera.c              |    1 +
6357  drivers/staging/brcm80211/brcmutil/wifi.c          |    1 +
6358  drivers/staging/dt3155v4l/dt3155v4l.c              |    1 +
6359  drivers/staging/iio/accel/adis16201_core.c         |    1 +
6360  drivers/staging/iio/accel/adis16203_core.c         |    1 +
6361  drivers/staging/iio/accel/adis16204_core.c         |    1 +
6362  drivers/staging/iio/accel/adis16209_core.c         |    1 +
6363  drivers/staging/iio/accel/adis16220_core.c         |    1 +
6364  drivers/staging/iio/accel/adis16240_core.c         |    1 +
6365  drivers/staging/iio/accel/kxsd9.c                  |    1 +
6366  drivers/staging/iio/accel/lis3l02dq_core.c         |    1 +
6367  drivers/staging/iio/accel/sca3000_core.c           |    1 +
6368  drivers/staging/iio/adc/ad7150.c                   |    1 +
6369  drivers/staging/iio/adc/ad7152.c                   |    1 +
6370  drivers/staging/iio/adc/ad7291.c                   |    1 +
6371  drivers/staging/iio/adc/ad7298_core.c              |    1 +
6372  drivers/staging/iio/adc/ad7314.c                   |    1 +
6373  drivers/staging/iio/adc/ad7476_core.c              |    1 +
6374  drivers/staging/iio/adc/ad7606_core.c              |    1 +
6375  drivers/staging/iio/adc/ad7745.c                   |    1 +
6376  drivers/staging/iio/adc/ad7780.c                   |    1 +
6377  drivers/staging/iio/adc/ad7816.c                   |    1 +
6378  drivers/staging/iio/adc/ad7887_core.c              |    1 +
6379  drivers/staging/iio/adc/ad799x_core.c              |    1 +
6380  drivers/staging/iio/adc/adt7310.c                  |    1 +
6381  drivers/staging/iio/adc/adt7410.c                  |    1 +
6382  drivers/staging/iio/adc/adt75.c                    |    1 +
6383  drivers/staging/iio/adc/max1363_core.c             |    1 +
6384  drivers/staging/iio/addac/adt7316-i2c.c            |    1 +
6385  drivers/staging/iio/addac/adt7316.c                |    1 +
6386  drivers/staging/iio/dac/ad5446.c                   |    1 +
6387  drivers/staging/iio/dac/ad5504.c                   |    1 +
6388  drivers/staging/iio/dac/ad5624r_spi.c              |    1 +
6389  drivers/staging/iio/dac/ad5686.c                   |    1 +
6390  drivers/staging/iio/dac/ad5791.c                   |    1 +
6391  drivers/staging/iio/dds/ad5930.c                   |    1 +
6392  drivers/staging/iio/dds/ad9832.c                   |    1 +
6393  drivers/staging/iio/dds/ad9834.c                   |    1 +
6394  drivers/staging/iio/dds/ad9850.c                   |    1 +
6395  drivers/staging/iio/dds/ad9852.c                   |    1 +
6396  drivers/staging/iio/dds/ad9910.c                   |    1 +
6397  drivers/staging/iio/dds/ad9951.c                   |    1 +
6398  drivers/staging/iio/gyro/adis16060_core.c          |    1 +
6399  drivers/staging/iio/gyro/adis16080_core.c          |    1 +
6400  drivers/staging/iio/gyro/adis16130_core.c          |    1 +
6401  drivers/staging/iio/gyro/adis16260_core.c          |    1 +
6402  drivers/staging/iio/gyro/adxrs450_core.c           |    1 +
6403  drivers/staging/iio/imu/adis16400_core.c           |    1 +
6404  drivers/staging/iio/industrialio-ring.c            |    1 +
6405  drivers/staging/iio/light/tsl2583.c                |    1 +
6406  drivers/staging/iio/meter/ade7753.c                |    1 +
6407  drivers/staging/iio/meter/ade7754.c                |    1 +
6408  drivers/staging/iio/meter/ade7758_core.c           |    1 +
6409  drivers/staging/iio/meter/ade7759.c                |    1 +
6410  drivers/staging/iio/meter/ade7854-i2c.c            |    1 +
6411  drivers/staging/iio/meter/ade7854-spi.c            |    1 +
6412  drivers/staging/iio/meter/ade7854.c                |    1 +
6413  drivers/staging/iio/resolver/ad2s120x.c            |    1 +
6414  drivers/staging/iio/resolver/ad2s1210.c            |    1 +
6415  drivers/staging/iio/resolver/ad2s90.c              |    1 +
6416  drivers/staging/iio/trigger.h                      |    1 +
6417  .../staging/intel_sst/intel_sst_drv_interface.c    |    1 +
6418  drivers/staging/line6/audio.c                      |    1 +
6419  drivers/staging/olpc_dcon/olpc_dcon.c              |    1 +
6420  drivers/staging/sm7xx/smtcfb.c                     |    2 +
6421  drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c      |    1 +
6422  drivers/staging/usbip/stub_dev.c                   |    1 +
6423  drivers/staging/usbip/stub_main.c                  |    1 +
6424  drivers/staging/usbip/usbip_event.c                |    1 +
6425  drivers/tty/hvc/hvc_iseries.c                      |    1 +
6426  drivers/tty/hvc/hvc_vio.c                          |    1 +
6427  drivers/tty/serial/jsm/jsm_driver.c                |    2 +-
6428  drivers/tty/serial/kgdboc.c                        |    1 +
6429  drivers/tty/serial/max3100.c                       |    1 +
6430  drivers/tty/serial/max3107-aava.c                  |    1 +
6431  drivers/tty/serial/max3107.c                       |    1 +
6432  drivers/tty/serial/nwpserial.c                     |    1 +
6433  drivers/tty/serial/timbuart.c                      |    1 +
6434  drivers/tty/serial/xilinx_uartps.c                 |    1 +
6435  drivers/tty/vt/vc_screen.c                         |    1 +
6436  drivers/uio/uio_pdrv.c                             |    1 +
6437  drivers/uio/uio_pdrv_genirq.c                      |    1 +
6438  drivers/usb/c67x00/c67x00-drv.c                    |    1 +
6439  drivers/usb/core/driver.c                          |    1 +
6440  drivers/usb/core/notify.c                          |    1 +
6441  drivers/usb/gadget/cdc2.c                          |    1 +
6442  drivers/usb/gadget/composite.c                     |    1 +
6443  drivers/usb/gadget/dbgp.c                          |    1 +
6444  drivers/usb/gadget/f_fs.c                          |    1 +
6445  drivers/usb/gadget/f_obex.c                        |    1 +
6446  drivers/usb/gadget/f_sourcesink.c                  |    1 +
6447  drivers/usb/gadget/file_storage.c                  |    1 +
6448  drivers/usb/gadget/fusb300_udc.c                   |    1 +
6449  drivers/usb/gadget/gmidi.c                         |    1 +
6450  drivers/usb/gadget/u_serial.c                      |    1 +
6451  drivers/usb/host/fsl-mph-dr-of.c                   |    1 +
6452  drivers/usb/host/isp1760-if.c                      |    1 +
6453  drivers/usb/host/pci-quirks.c                      |    1 +
6454  drivers/usb/host/whci/debug.c                      |    1 +
6455  drivers/usb/host/whci/hcd.c                        |    1 +
6456  drivers/usb/host/xhci-hub.c                        |    1 +
6457  drivers/usb/host/xhci-pci.c                        |    1 +
6458  drivers/usb/mon/mon_bin.c                          |    1 +
6459  drivers/usb/mon/mon_stat.c                         |    1 +
6460  drivers/usb/mon/mon_text.c                         |    1 +
6461  drivers/usb/otg/gpio_vbus.c                        |    1 +
6462  drivers/usb/otg/otg.c                              |    1 +
6463  drivers/usb/otg/ulpi.c                             |    1 +
6464  drivers/usb/serial/aircable.c                      |    1 +
6465  drivers/usb/serial/qcserial.c                      |    1 +
6466  drivers/usb/storage/option_ms.c                    |    1 +
6467  drivers/usb/storage/protocol.c                     |    1 +
6468  drivers/usb/storage/sierra_ms.c                    |    1 +
6469  drivers/usb/storage/transport.c                    |    1 +
6470  drivers/usb/storage/uas.c                          |    1 +
6471  drivers/usb/wusbcore/devconnect.c                  |    1 +
6472  drivers/usb/wusbcore/mmc.c                         |    1 +
6473  drivers/usb/wusbcore/rh.c                          |    1 +
6474  drivers/usb/wusbcore/security.c                    |    1 +
6475  drivers/usb/wusbcore/wa-hc.c                       |    1 +
6476  drivers/usb/wusbcore/wa-rpipe.c                    |    1 +
6477  drivers/usb/wusbcore/wa-xfer.c                     |    1 +
6478  drivers/uwb/est.c                                  |    1 +
6479  drivers/uwb/i1480/dfu/dfu.c                        |    1 +
6480  drivers/uwb/ie.c                                   |    1 +
6481  drivers/uwb/lc-dev.c                               |    2 +
6482  drivers/uwb/neh.c                                  |    1 +
6483  drivers/uwb/pal.c                                  |    1 +
6484  drivers/uwb/radio.c                                |    1 +
6485  drivers/uwb/reset.c                                |    1 +
6486  drivers/uwb/rsv.c                                  |    1 +
6487  drivers/uwb/scan.c                                 |    1 +
6488  drivers/uwb/umc-bus.c                              |    1 +
6489  drivers/uwb/umc-dev.c                              |    1 +
6490  drivers/uwb/umc-drv.c                              |    1 +
6491  drivers/uwb/whci.c                                 |    1 +
6492  drivers/video/atmel_lcdfb.c                        |    1 +
6493  drivers/video/backlight/88pm860x_bl.c              |    1 +
6494  drivers/video/backlight/adp5520_bl.c               |    1 +
6495  drivers/video/backlight/ams369fg06.c               |    1 +
6496  drivers/video/backlight/da903x_bl.c                |    1 +
6497  drivers/video/backlight/l4f00242t03.c              |    1 +
6498  drivers/video/backlight/ld9040.c                   |    1 +
6499  drivers/video/backlight/lms283gf05.c               |    1 +
6500  drivers/video/backlight/max8925_bl.c               |    1 +
6501  drivers/video/backlight/s6e63m0.c                  |    1 +
6502  drivers/video/backlight/wm831x_bl.c                |    1 +
6503  drivers/video/carminefb.c                          |    1 +
6504  drivers/video/cobalt_lcdfb.c                       |    1 +
6505  drivers/video/fb_ddc.c                             |    3 +-
6506  drivers/video/fb_notify.c                          |    1 +
6507  drivers/video/mb862xx/mb862xx-i2c.c                |    1 +
6508  drivers/video/mb862xx/mb862xxfbdrv.c               |    1 +
6509  drivers/video/msm/mdp.c                            |    1 +
6510  drivers/video/omap/lcd_mipid.c                     |    1 +
6511  drivers/video/omap/omapfb_main.c                   |    1 +
6512  drivers/video/omap2/dss/dispc.c                    |    1 +
6513  drivers/video/omap2/dss/dpi.c                      |    1 +
6514  drivers/video/omap2/dss/dsi.c                      |    1 +
6515  drivers/video/omap2/dss/dss.c                      |    1 +
6516  drivers/video/omap2/dss/rfbi.c                     |    1 +
6517  drivers/video/omap2/dss/sdi.c                      |    1 +
6518  drivers/video/omap2/omapfb/omapfb-ioctl.c          |    1 +
6519  drivers/video/savage/savagefb_accel.c              |    1 +
6520  drivers/video/sh_mipi_dsi.c                        |    1 +
6521  drivers/video/sh_mobile_lcdcfb.c                   |    1 +
6522  drivers/video/via/via-gpio.c                       |    1 +
6523  drivers/video/w100fb.c                             |    1 +
6524  drivers/virtio/virtio.c                            |    1 +
6525  drivers/virtio/virtio_balloon.c                    |    1 +
6526  drivers/virtio/virtio_ring.c                       |    1 +
6527  drivers/w1/w1_family.c                             |    1 +
6528  drivers/xen/balloon.c                              |    1 +
6529  drivers/xen/manage.c                               |    1 +
6530  drivers/xen/swiotlb-xen.c                          |    1 +
6531  drivers/xen/xen-pciback/conf_space.c               |    1 +
6532  drivers/xen/xen-selfballoon.c                      |    2 +
6533  drivers/xen/xenbus/xenbus_client.c                 |    1 +
6534  drivers/xen/xenbus/xenbus_probe.c                  |    1 +
6535  drivers/xen/xenbus/xenbus_probe_backend.c          |    1 +
6536  drivers/xen/xenbus/xenbus_probe_frontend.c         |    1 +
6537  drivers/zorro/proc.c                               |    1 +
6538  fs/bio-integrity.c                                 |    1 +
6539  fs/exofs/super.c                                   |    1 +
6540  fs/gfs2/ops_fstype.c                               |    1 +
6541  fs/ioprio.c                                        |    1 +
6542  fs/jfs/jfs_logmgr.c                                |    1 +
6543  fs/logfs/super.c                                   |    1 +
6544  fs/nfsd/nfssvc.c                                   |    1 +
6545  fs/proc/vmcore.c                                   |    1 +
6546  include/acpi/platform/aclinux.h                    |    2 +-
6547  include/drm/drmP.h                                 |    3 +-
6548  include/linux/bcma/bcma.h                          |    7 +-
6549  include/linux/blkdev.h                             |    2 +-
6550  include/linux/cpuidle.h                            |    3 +-
6551  include/linux/crypto.h                             |    6 --
6552  include/linux/device.h                             |   15 ++-
6553  include/linux/device_cgroup.h                      |    1 -
6554  include/linux/dmaengine.h                          |    2 +
6555  include/linux/export.h                             |   89 ++++++++++++++++++++
6556  include/linux/firmware.h                           |    2 +-
6557  include/linux/ftrace.h                             |    2 +-
6558  include/linux/gameport.h                           |   17 ++--
6559  include/linux/hid.h                                |    9 +-
6560  include/linux/i2c.h                                |   10 +-
6561  include/linux/ipmi.h                               |    3 +-
6562  include/linux/ipmi_smi.h                           |    1 -
6563  include/linux/mdio-bitbang.h                       |    3 +-
6564  include/linux/module.h                             |   68 +---------------
6565  include/linux/mtd/mtd.h                            |    3 +-
6566  include/linux/of_platform.h                        |    1 -
6567  include/linux/pci_hotplug.h                        |   10 +--
6568  include/linux/pm_runtime.h                         |    1 +
6569  include/linux/regulator/driver.h                   |    1 +
6570  include/linux/serio.h                              |   20 +++--
6571  include/linux/ssb/ssb.h                            |    7 +-
6572  include/linux/stop_machine.h                       |    1 +
6573  include/linux/sunrpc/svc_xprt.h                    |    3 +-
6574  include/linux/sysdev.h                             |    1 -
6575  include/linux/textsearch.h                         |    3 +-
6576  include/linux/uio_driver.h                         |   12 ++--
6577  include/linux/usb.h                                |    9 +-
6578  include/linux/uwb.h                                |    1 +
6579  include/linux/uwb/umc.h                            |    7 +-
6580  include/linux/vermagic.h                           |    1 -
6581  include/linux/vlynq.h                              |    3 +-
6582  include/media/saa7146.h                            |    3 +-
6583  include/media/v4l2-int-device.h                    |    3 +-
6584  include/net/inet_timewait_sock.h                   |    1 -
6585  include/net/lib80211.h                             |    3 +-
6586  include/net/sch_generic.h                          |    1 -
6587  include/net/sock.h                                 |    2 +-
6588  include/sound/core.h                               |    2 +-
6589  include/trace/define_trace.h                       |    2 +-
6590  include/trace/events/module.h                      |    2 +-
6591  include/xen/xenbus.h                               |    1 +
6592  kernel/async.c                                     |    2 +-
6593  kernel/audit.c                                     |    2 +-
6594  kernel/auditsc.c                                   |    2 +-
6595  kernel/capability.c                                |    2 +-
6596  kernel/cgroup_freezer.c                            |    2 +-
6597  kernel/compat.c                                    |    1 +
6598  kernel/cpu.c                                       |    2 +-
6599  kernel/cpuset.c                                    |    2 +-
6600  kernel/crash_dump.c                                |    2 +-
6601  kernel/cred.c                                      |    2 +-
6602  kernel/debug/kdb/kdb_debugger.c                    |    1 +
6603  kernel/dma.c                                       |    2 +-
6604  kernel/events/core.c                               |    1 +
6605  kernel/exit.c                                      |    3 +-
6606  kernel/fork.c                                      |    3 +-
6607  kernel/freezer.c                                   |    2 +-
6608  kernel/futex.c                                     |    2 +-
6609  kernel/groups.c                                    |    2 +-
6610  kernel/hrtimer.c                                   |    2 +-
6611  kernel/hung_task.c                                 |    2 +-
6612  kernel/irq_work.c                                  |    4 +-
6613  kernel/kfifo.c                                     |    2 +-
6614  kernel/kprobes.c                                   |    2 +-
6615  kernel/ksysfs.c                                    |    3 +-
6616  kernel/kthread.c                                   |    2 +-
6617  kernel/latencytop.c                                |    2 +-
6618  kernel/lockdep.c                                   |    2 +-
6619  kernel/lockdep_proc.c                              |    2 +-
6620  kernel/module.c                                    |    2 +-
6621  kernel/mutex-debug.c                               |    2 +-
6622  kernel/mutex.c                                     |    2 +-
6623  kernel/notifier.c                                  |    2 +-
6624  kernel/nsproxy.c                                   |    2 +-
6625  kernel/padata.c                                    |    2 +-
6626  kernel/params.c                                    |    4 +-
6627  kernel/pid.c                                       |    2 +-
6628  kernel/posix-timers.c                              |    2 +-
6629  kernel/power/hibernate.c                           |    1 +
6630  kernel/power/main.c                                |    1 +
6631  kernel/power/suspend.c                             |    2 +
6632  kernel/printk.c                                    |    2 +-
6633  kernel/profile.c                                   |    2 +-
6634  kernel/ptrace.c                                    |    2 +-
6635  kernel/range.c                                     |    2 +-
6636  kernel/rcupdate.c                                  |    2 +-
6637  kernel/rcutiny.c                                   |    4 +-
6638  kernel/rcutorture.c                                |    3 +-
6639  kernel/rcutree.c                                   |    2 +-
6640  kernel/rcutree_trace.c                             |    3 +-
6641  kernel/relay.c                                     |    2 +-
6642  kernel/resource.c                                  |    2 +-
6643  kernel/rtmutex-debug.c                             |    2 +-
6644  kernel/rtmutex-tester.c                            |    2 +-
6645  kernel/rtmutex.c                                   |    2 +-
6646  kernel/rwsem.c                                     |    2 +-
6647  kernel/sched.c                                     |    2 +-
6648  kernel/sched_clock.c                               |    2 +-
6649  kernel/semaphore.c                                 |    2 +-
6650  kernel/signal.c                                    |    2 +-
6651  kernel/smp.c                                       |    2 +-
6652  kernel/softirq.c                                   |    2 +-
6653  kernel/spinlock.c                                  |    2 +-
6654  kernel/srcu.c                                      |    2 +-
6655  kernel/stacktrace.c                                |    2 +-
6656  kernel/stop_machine.c                              |    2 +-
6657  kernel/sys.c                                       |    3 +-
6658  kernel/sysctl.c                                    |    2 +-
6659  kernel/time.c                                      |    2 +-
6660  kernel/time/posix-clock.c                          |    1 +
6661  kernel/timer.c                                     |    2 +-
6662  kernel/trace/blktrace.c                            |    1 +
6663  kernel/trace/ftrace.c                              |    1 +
6664  kernel/trace/trace_syscalls.c                      |    1 +
6665  kernel/up.c                                        |    2 +-
6666  kernel/user-return-notifier.c                      |    2 +-
6667  kernel/user.c                                      |    2 +-
6668  kernel/user_namespace.c                            |    2 +-
6669  kernel/utsname.c                                   |    2 +-
6670  kernel/utsname_sysctl.c                            |    2 +-
6671  kernel/wait.c                                      |    2 +-
6672  kernel/watchdog.c                                  |    3 +-
6673  kernel/workqueue.c                                 |    2 +-
6674  lib/dma-debug.c                                    |    1 +
6675  lib/raid6/algos.c                                  |    1 +
6676  lib/raid6/mktables.c                               |    1 +
6677  lib/raid6/recov.c                                  |    1 +
6678  mm/fremap.c                                        |    1 -
6679  mm/memcontrol.c                                    |    1 +
6680  mm/memory-failure.c                                |    1 +
6681  mm/mmzone.c                                        |    1 -
6682  mm/quicklist.c                                     |    1 -
6683  mm/sparse-vmemmap.c                                |    1 -
6684  mm/swap_state.c                                    |    1 -
6685  mm/swapfile.c                                      |    1 -
6686  net/caif/cfpkt_skbuff.c                            |    1 +
6687  net/netfilter/ipset/pfxlen.c                       |    1 +
6688  net/rfkill/input.c                                 |    1 +
6689  security/selinux/netlink.c                         |    1 +
6690  sound/core/control.c                               |    1 +
6691  sound/core/device.c                                |    1 +
6692  sound/core/hwdep.c                                 |    1 +
6693  sound/core/info.c                                  |    1 +
6694  sound/core/info_oss.c                              |    1 +
6695  sound/core/init.c                                  |    1 +
6696  sound/core/isadma.c                                |    1 +
6697  sound/core/jack.c                                  |    1 +
6698  sound/core/memory.c                                |    1 +
6699  sound/core/misc.c                                  |    1 +
6700  sound/core/oss/mixer_oss.c                         |    1 +
6701  sound/core/rawmidi.c                               |    1 +
6702  sound/core/seq/oss/seq_oss.c                       |    2 +-
6703  sound/core/seq/oss/seq_oss_init.c                  |    2 +-
6704  sound/core/seq/oss/seq_oss_synth.c                 |    1 +
6705  sound/core/seq/seq.c                               |    2 +-
6706  sound/core/seq/seq_clientmgr.c                     |    1 +
6707  sound/core/seq/seq_device.c                        |    1 +
6708  sound/core/seq/seq_dummy.c                         |    2 +-
6709  sound/core/seq/seq_info.c                          |    1 +
6710  sound/core/seq/seq_lock.c                          |    1 +
6711  sound/core/seq/seq_memory.c                        |    1 +
6712  sound/core/seq/seq_midi.c                          |    2 +-
6713  sound/core/seq/seq_midi_emul.c                     |    1 +
6714  sound/core/seq/seq_midi_event.c                    |    1 +
6715  sound/core/seq/seq_ports.c                         |    1 +
6716  sound/core/seq/seq_system.c                        |    1 +
6717  sound/core/seq/seq_virmidi.c                       |    1 +
6718  sound/core/sound.c                                 |    2 +-
6719  sound/core/sound_oss.c                             |    1 +
6720  sound/core/timer.c                                 |    2 +-
6721  sound/core/vmaster.c                               |    1 +
6722  sound/drivers/mpu401/mpu401.c                      |    2 +-
6723  sound/drivers/mpu401/mpu401_uart.c                 |    1 +
6724  sound/drivers/mtpav.c                              |    1 +
6725  sound/drivers/mts64.c                              |    1 +
6726  sound/drivers/opl3/opl3_lib.c                      |    1 +
6727  sound/drivers/opl3/opl3_oss.c                      |    1 +
6728  sound/drivers/opl3/opl3_seq.c                      |    1 +
6729  sound/drivers/opl3/opl3_synth.c                    |    1 +
6730  sound/drivers/opl4/opl4_lib.c                      |    1 +
6731  sound/drivers/opl4/opl4_proc.c                     |    1 +
6732  sound/drivers/opl4/opl4_seq.c                      |    1 +
6733  sound/drivers/portman2x4.c                         |    1 +
6734  sound/drivers/serial-u16550.c                      |    2 +-
6735  sound/drivers/virmidi.c                            |    2 +-
6736  sound/firewire/iso-resources.c                     |    1 +
6737  sound/firewire/packets-buffer.c                    |    1 +
6738  sound/i2c/i2c.c                                    |    1 +
6739  sound/i2c/other/ak4xxx-adda.c                      |    1 +
6740  sound/i2c/other/pt2258.c                           |    1 +
6741  sound/i2c/other/tea575x-tuner.c                    |    1 +
6742  sound/i2c/tea6330t.c                               |    1 +
6743  sound/isa/sb/emu8000.c                             |    1 +
6744  sound/isa/sb/emu8000_callback.c                    |    1 +
6745  sound/isa/sb/emu8000_patch.c                       |    1 +
6746  sound/isa/sb/emu8000_synth.c                       |    1 +
6747  sound/isa/wavefront/wavefront_fx.c                 |    1 +
6748  sound/isa/wavefront/wavefront_synth.c              |    1 +
6749  sound/pci/als4000.c                                |    2 +-
6750  sound/pci/asihpi/hpioctl.c                         |    1 +
6751  sound/pci/ctxfi/xfi.c                              |    1 +
6752  sound/pci/oxygen/oxygen_io.c                       |    1 +
6753  sound/soc/blackfin/bf5xx-sport.c                   |    1 +
6754  sound/soc/tegra/tegra_asoc_utils.c                 |    1 +
6755  sound/synth/emux/emux.c                            |    1 +
6756  sound/synth/emux/emux_oss.c                        |    1 +
6757  sound/synth/emux/emux_seq.c                        |    2 +-
6758  sound/synth/emux/emux_synth.c                      |    1 +
6759  sound/synth/emux/soundfont.c                       |    1 +
6760  sound/synth/util_mem.c                             |    1 +
6761  sound/usb/6fire/firmware.c                         |    1 +
6762  sound/usb/midi.c                                   |    1 +
6763  virt/kvm/iommu.c                                   |    2 +
6764  1388 files changed, 1520 insertions(+), 426 deletions(-)
6765  create mode 100644 include/linux/export.h
6766 $ git am -3 ../patches/0001-dm-use-export.h-instead-of-module.h-where-possible.patch
6767 Applying: dm: use export.h instead of module.h where possible
6768 $ git reset HEAD^
6769 Unstaged changes after reset:
6770 M       drivers/md/persistent-data/dm-btree-remove.c
6771 M       drivers/md/persistent-data/dm-btree.c
6772 M       drivers/md/persistent-data/dm-space-map-disk.c
6773 M       drivers/md/persistent-data/dm-transaction-manager.c
6774 $ git add .
6775 $ git commit -v -a --amend
6776 [master 787bdaa] Merge remote-tracking branch 'moduleh/module.h-split'
6777 $ git am -3 ../patches/0001-block-bsg-lib.c-needs-export.h-not-module.h.patch
6778 Applying: block: bsg-lib.c needs export.h not module.h
6779 $ git reset HEAD^
6780 Unstaged changes after reset:
6781 M       block/bsg-lib.c
6782 $ git add .
6783 $ git commit -v -a --amend
6784 [master d04ef14] Merge remote-tracking branch 'moduleh/module.h-split'
6785 $ git am -3 ../patches/0001-PM-EXPORT_SYMBOL-needs-export.h.patch
6786 Applying: PM: EXPORT_SYMBOL needs export.h
6787 $ git reset HEAD^
6788 Unstaged changes after reset:
6789 M       drivers/base/power/common.c
6790 $ git add .
6791 $ git commit -v -a --amend
6792 [master 1b2cd61] Merge remote-tracking branch 'moduleh/module.h-split'
6793 $ git clone -s -l -n -q . ../rebase-tmp
6794 $ cd ../rebase-tmp
6795 $ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm
6796 From ../next
6797  * [new branch]      quilt/akpm -> akpm
6798 $ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base
6799 From ../next
6800  * [new branch]      quilt/akpm-base -> akpm-base
6801 $ git checkout akpm
6802 Switched to branch 'akpm'
6803 $ git rebase --onto master akpm-base
6804 First, rewinding head to replay your work on top of it...
6805 Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
6806 Applying: This patch makes two changes:
6807 Applying: On thread exit shm_exit_ns() is called, it uses shm_ids(ns).rw_mutex.  It
6808 Applying: Because of x86-implement-strict-user-copy-checks-for-x86_64.patch
6809 Applying: When no floppy is found the module code can be released while a timer
6810 Applying: The parameter's origin type is long.  On an i386 architecture, it can
6811 Applying: Add support for Aspire 1410 BIOS v1.3314.  Fixes the following error:
6812 Applying: This makes the iris driver use the platform API, so it is properly exposed
6813 Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
6814 Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
6815 Applying: Cc: Ed Wildgoose <git@wildgooses.com>
6816 Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
6817 Applying: The x86 timer interrupt handler is the only handler not traced in the
6818 Applying: The current interrupt traces from irq_handler_entry and irq_handler_exit
6819 Applying: Don't allow everybody to use a modem.
6820 Applying: The address limit is already set in flush_old_exec() so this
6821 Applying: A call to va_copy() should always be followed by a call to va_end() in the
6822 Applying: Don't dereference em if it's NULL or an error pointer.
6823 Applying: Some messing with error codes to return 0 on out id's and match
6824 Applying: fb_set_suspend() must be called with the console semaphore held, which
6825 Applying: hwmon was using an idr with a NULL pointer, so convert to an
6826 Applying: A straightforward looking use of idr for a device id.
6827 Applying: The address limit is already set in flush_old_exec() so this
6828 Applying: The address limit is already set in flush_old_exec() so this
6829 Applying: Add new check (assert_init) to make sure objects are initialized and
6830 Applying: del_timer_sync() calls debug_object_assert_init() to assert that a timer
6831 Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
6832 Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
6833 Applying: The address limit is already set in flush_old_exec() so those calls to
6834 Applying: When do pci remove/rescan on system that have more iommus, got
6835 Applying: The current implementation of dmi_name_in_vendors() is an invitation to
6836 Applying: For headers that get exported to userland and make use of u32 style
6837 Applying: Fix sparse warnings of right shift bigger than source value size:
6838 Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
6839 Applying: Some mangling of errors was necessary to maintain current interface.
6840 Applying: This does involve additional use of the spin lock in idr.c.  Is this an
6841 Applying: Instead of open coding this function use kstrtoul_from_user() directly.
6842 Applying: brd_make_request() always returns 0, which doesn't make much sense.
6843 Applying: The address limit is already set in flush_old_exec() so this assignment of
6844 Applying: The basic idea behind cross memory attach is to allow MPI programs doing
6845 Applying: - Add x86_64 specific wire up
6846 Applying: acct_isolated of compaction uses page_lru_base_type which returns only
6847 Applying: Change ISOLATE_XXX macro with bitwise isolate_mode_t type.  Normally,
6848 Applying: In async mode, compaction doesn't migrate dirty or writeback pages.  So,
6849 Applying: In __zone_reclaim case, we don't want to shrink mapped page.  Nonetheless,
6850 Applying: unmap_and_move() is one a big messy function.  Clean it up.
6851 Applying: radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was
6852 Applying: per-task block plug can reduce block queue lock contention and increase
6853 Applying: The tracing ring-buffer used this function briefly, but not anymore.
6854 Applying: After selecting a task to kill, the oom killer iterates all processes and
6855 Applying: Remove PageSwapBacked (!page_is_file_cache) cases from
6856 Applying: Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
6857 Applying: The current implementation of the /dev/hpet driver couples opening the
6858 Applying: smp_call_function() only lets all other CPUs execute a specific function,
6859 Applying: auto_demotion_disable is called only for online CPUs.  For hotplugged
6860 Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:
6861 Applying: Strict user copy checks are only really supported on x86_32 even though
6862 Applying: The help text for this config is duplicated across the x86, parisc, and
6863 Applying: s/lib-/obj-/ for usercopy.o
6864 Applying: After an "unexpected" reboot, I found this Oops in my logs:
6865 Applying: In the move of the lis3 driver, the hp_accel.c file got dropped from the
6866 Applying: Add axis correction for HP EliteBook 2730p.
6867 Applying: Add axis correction for HP EliteBook 8540w.
6868 Applying: Add axis correction for HP ProBook 6555b.
6869 Applying: Adapt the help text for CONFIG_HP_ACCEL to the move of
6870 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
6871 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
6872 Applying: Change exported functions to use the device given as parameter
6873 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
6874 Applying: Add V2 of the LED driver for a single timer channel for the TPU hardware
6875 Applying: Add support for slice by 8 to existing crc32 algorithm.  Also modify
6876 Applying: don't include asm/msr.h
6877 Applying: This is the one use of an ida that doesn't retry on receiving -EAGAIN.
6878 Applying: One can get this information from minix/inode.c, but adding the
6879 Applying: Signed-off-by: Igor Mammedov <imammedo@redhat.com>
6880 Applying: Force this on for -next/mm testing purposes.
6881 Applying: Add a proc_dointvec_bool() sysctl handler for cases where the input value
6882 Applying: Use the new proc_do_intvec_bool() handler for various boolean inputs.
6883 Applying: Add a proc_dointvec_unsigned() sysctl handler for positive value cases.
6884 Applying: Cc: Alexey Dobriyan <adobriyan@gmail.com>
6885 Applying: Use the new proc_do_intvec_unsigned() handler for various unsigned inputs.
6886 Applying: A default echo function has been provided so it is no longer an error when
6887 Applying: This client driver allows you to use a GPIO pin as a source for PPS
6888 Applying: remove unneeded cast of void*
6889 Applying: Straightforward.  As an aside, the ida_init calls are not needed as far as
6890 $ cd ../next
6891 $ git fetch -f ../rebase-tmp akpm:akpm
6892 From ../rebase-tmp
6893  + 7d607ff...6994b54 akpm       -> akpm  (forced update)
6894 $ rm -rf ../rebase-tmp
6895 Merging akpm
6896 $ git merge --no-ff akpm
6897 Removing arch/sparc/lib/usercopy.c
6898 Removing drivers/leds/leds-alix2.c
6899 Merge made by recursive.
6900  Documentation/DocBook/debugobjects.tmpl            |   50 ++
6901  .../trace/postprocess/trace-vmscan-postprocess.pl  |    8 +-
6902  MAINTAINERS                                        |    1 +
6903  arch/arm/include/asm/processor.h                   |    1 -
6904  arch/arm/mach-ux500/mbox-db5500.c                  |    2 +-
6905  arch/ia64/include/asm/processor.h                  |    1 -
6906  arch/parisc/Kconfig                                |    1 +
6907  arch/parisc/Kconfig.debug                          |   14 -
6908  arch/parisc/include/asm/processor.h                |    2 -
6909  arch/parisc/kernel/process.c                       |    1 -
6910  arch/powerpc/include/asm/systbl.h                  |    2 +
6911  arch/powerpc/include/asm/unistd.h                  |    4 +-
6912  arch/s390/Kconfig                                  |    1 +
6913  arch/s390/Kconfig.debug                            |   14 -
6914  arch/s390/lib/Makefile                             |    1 -
6915  arch/sparc/kernel/process_32.c                     |    3 +-
6916  arch/sparc/kernel/process_64.c                     |    3 -
6917  arch/sparc/lib/Makefile                            |    1 -
6918  arch/sparc/lib/usercopy.c                          |    8 -
6919  arch/tile/Kconfig                                  |    8 +-
6920  arch/tile/include/asm/uaccess.h                    |    7 +-
6921  arch/tile/lib/uaccess.c                            |    8 -
6922  arch/unicore32/include/asm/processor.h             |    1 -
6923  arch/x86/Kconfig                                   |   15 +
6924  arch/x86/Kconfig.debug                             |   14 -
6925  arch/x86/ia32/ia32entry.S                          |    2 +
6926  arch/x86/include/asm/irq_vectors.h                 |   50 ++
6927  arch/x86/include/asm/uaccess_64.h                  |   12 +-
6928  arch/x86/include/asm/unistd_32.h                   |    4 +-
6929  arch/x86/include/asm/unistd_64.h                   |    4 +
6930  arch/x86/kernel/apic/apic.c                        |    7 +
6931  arch/x86/kernel/cpu/mcheck/therm_throt.c           |    3 +
6932  arch/x86/kernel/cpu/mcheck/threshold.c             |    3 +
6933  arch/x86/kernel/e820.c                             |   59 +--
6934  arch/x86/kernel/irq.c                              |    6 +-
6935  arch/x86/kernel/irq_work.c                         |    3 +
6936  arch/x86/kernel/smp.c                              |    7 +
6937  arch/x86/kernel/syscall_table_32.S                 |    2 +
6938  arch/x86/kernel/time.c                             |   15 +-
6939  arch/x86/kernel/traps.c                            |    3 +
6940  arch/x86/lib/usercopy_32.c                         |    6 -
6941  arch/x86/mm/mmap.c                                 |    4 +-
6942  arch/x86/mm/tlb.c                                  |    3 +
6943  arch/x86/platform/Makefile                         |    1 +
6944  arch/x86/platform/geode/Makefile                   |    1 +
6945  arch/x86/platform/geode/alix.c                     |  142 ++++++
6946  arch/x86/platform/iris/iris.c                      |   67 +++-
6947  drivers/block/brd.c                                |    2 +-
6948  drivers/block/floppy.c                             |    8 +-
6949  drivers/char/hpet.c                                |   56 ++-
6950  drivers/firmware/dmi_scan.c                        |    6 +-
6951  drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c      |   34 +-
6952  drivers/hwmon/hwmon.c                              |   32 +-
6953  drivers/hwmon/ibmaem.c                             |   47 +--
6954  drivers/idle/intel_idle.c                          |   59 ++-
6955  drivers/iommu/dmar.c                               |    7 +-
6956  drivers/iommu/intel-iommu.c                        |  177 +++++++-
6957  drivers/leds/Kconfig                               |   20 +-
6958  drivers/leds/Makefile                              |    2 +-
6959  drivers/leds/leds-alix2.c                          |  239 ----------
6960  drivers/leds/leds-renesas-tpu.c                    |  343 ++++++++++++++
6961  drivers/misc/lis3lv02d/lis3lv02d.c                 |  389 +++++++++-------
6962  drivers/misc/lis3lv02d/lis3lv02d.h                 |    9 +-
6963  drivers/misc/lis3lv02d/lis3lv02d_i2c.c             |   11 +-
6964  drivers/misc/lis3lv02d/lis3lv02d_spi.c             |    2 +-
6965  drivers/platform/x86/Kconfig                       |    2 +-
6966  drivers/platform/x86/acerhdf.c                     |    1 +
6967  drivers/platform/x86/hp_accel.c                    |   10 +-
6968  drivers/pps/clients/Kconfig                        |    9 +
6969  drivers/pps/clients/Makefile                       |    1 +
6970  drivers/pps/clients/pps-gpio.c                     |  227 +++++++++
6971  drivers/pps/clients/pps-ktimer.c                   |   12 -
6972  drivers/pps/clients/pps_parport.c                  |    9 -
6973  drivers/pps/kapi.c                                 |   20 +-
6974  drivers/rtc/class.c                                |   32 +-
6975  drivers/scsi/aacraid/commctrl.c                    |    1 +
6976  drivers/scsi/megaraid.c                            |    8 +-
6977  drivers/scsi/osd/osd_uld.c                         |   22 +-
6978  drivers/scsi/sd.c                                  |   32 +-
6979  drivers/scsi/sg.c                                  |   25 +-
6980  drivers/video/fbmem.c                              |   24 +-
6981  drivers/w1/slaves/w1_ds2760.c                      |   48 +--
6982  drivers/w1/slaves/w1_ds2780.c                      |   48 +--
6983  fs/aio.c                                           |    4 +-
6984  fs/btrfs/inode.c                                   |    3 +-
6985  fs/compat.c                                        |    7 +-
6986  fs/ext4/ext4.h                                     |    7 +-
6987  fs/ext4/ialloc.c                                   |    4 +-
6988  fs/ocfs2/ocfs2.h                                   |   47 ++
6989  fs/ocfs2/quota_local.c                             |   10 +-
6990  fs/read_write.c                                    |    8 +-
6991  include/linux/compat.h                             |    3 +-
6992  include/linux/debugobjects.h                       |    6 +
6993  include/linux/dmar.h                               |    5 +
6994  include/linux/fs.h                                 |    7 +-
6995  include/linux/hpet.h                               |    1 +
6996  include/linux/jiffies.h                            |    2 +-
6997  include/linux/leds-renesas-tpu.h                   |   14 +
6998  include/linux/magic.h                              |   10 +-
6999  include/linux/memcontrol.h                         |    3 +-
7000  include/linux/mmzone.h                             |   12 +
7001  include/linux/pps-gpio.h                           |   32 ++
7002  include/linux/swap.h                               |    7 +-
7003  include/linux/syscalls.h                           |   13 +
7004  include/linux/sysctl.h                             |    4 +
7005  include/linux/writeback.h                          |    2 -
7006  include/scsi/scsi_netlink.h                        |    2 +-
7007  include/trace/events/irq_vectors.h                 |   56 +++
7008  include/trace/events/vmscan.h                      |    8 +-
7009  init/do_mounts.c                                   |   46 ++-
7010  ipc/msgutil.c                                      |    6 +
7011  ipc/shm.c                                          |   13 +-
7012  ipc/util.c                                         |   30 +-
7013  ipc/util.h                                         |    1 +
7014  kernel/audit.c                                     |    5 +-
7015  kernel/kprobes.c                                   |    2 +-
7016  kernel/sys_ni.c                                    |    4 +
7017  kernel/sysctl.c                                    |  103 +++--
7018  kernel/time.c                                      |    2 +-
7019  kernel/timer.c                                     |   54 ++-
7020  lib/Kconfig.debug                                  |   18 +
7021  lib/Makefile                                       |    1 +
7022  lib/crc32.c                                        |  370 +++++++++++-----
7023  lib/crc32defs.h                                    |   16 +-
7024  lib/debugobjects.c                                 |   33 ++
7025  lib/gen_crc32table.c                               |   59 ++-
7026  lib/radix-tree.c                                   |   10 +-
7027  {arch/s390/lib => lib}/usercopy.c                  |    0
7028  mm/Makefile                                        |    3 +-
7029  mm/compaction.c                                    |   24 +-
7030  mm/memcontrol.c                                    |    5 +-
7031  mm/mempolicy.c                                     |    4 +-
7032  mm/migrate.c                                       |   75 ++--
7033  mm/mincore.c                                       |    6 +
7034  mm/oom_kill.c                                      |    5 +-
7035  mm/page-writeback.c                                |  122 +++---
7036  mm/process_vm_access.c                             |  487 ++++++++++++++++++++
7037  mm/vmscan.c                                        |   63 ++-
7038  security/keys/compat.c                             |    2 +-
7039  security/keys/keyctl.c                             |    2 +-
7040  security/selinux/selinuxfs.c                       |   14 +-
7041  141 files changed, 3100 insertions(+), 1311 deletions(-)
7042  delete mode 100644 arch/sparc/lib/usercopy.c
7043  create mode 100644 arch/x86/platform/geode/Makefile
7044  create mode 100644 arch/x86/platform/geode/alix.c
7045  delete mode 100644 drivers/leds/leds-alix2.c
7046  create mode 100644 drivers/leds/leds-renesas-tpu.c
7047  create mode 100644 drivers/pps/clients/pps-gpio.c
7048  create mode 100644 include/linux/leds-renesas-tpu.h
7049  create mode 100644 include/linux/pps-gpio.h
7050  create mode 100644 include/trace/events/irq_vectors.h
7051  rename {arch/s390/lib => lib}/usercopy.c (100%)
7052  create mode 100644 mm/process_vm_access.c
7053 $ git am -3 ../patches/0001-do_mounts-remove-__init_data-from-root_wait.patch
7054 Applying: do_mounts: remove __init_data from root_wait
7055 $ git reset HEAD^
7056 Unstaged changes after reset:
7057 M       init/do_mounts.c
7058 $ git add .
7059 $ git commit -v -a --amend
7060 [master 9d1d7f7] Merge branch 'akpm'
7061 $ git revert 57afcf09649c
7062 [master 1e4cc06] Revert "PM QoS: Add global notification mechanism for device constraints"
7063  3 files changed, 15 insertions(+), 87 deletions(-)
7064 $ git revert b6d5b88750dc
7065 [master a0184cf] Revert "PM QoS: Implement per-device PM QoS constraints"
7066  5 files changed, 2 insertions(+), 394 deletions(-)
7067  delete mode 100644 drivers/base/power/qos.c