Next/merge.log

   1 $ date
   2 Wed Aug 17 10:41:20 EST 2011
   3 $ git checkout master
   4 Already on 'master'
   5 $ git reset --hard stable
   6 HEAD is now at 2f6a123 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
   7 Merging origin/master
   8 $ git merge origin/master
   9 Updating 2f6a123..4bc9b07
  10 Fast-forward
  11  Documentation/PCI/MSI-HOWTO.txt           |   89 +++++++-------
  12  arch/ia64/Kconfig                         |    1 -
  13  arch/ia64/configs/generic_defconfig       |    1 +
  14  arch/sparc/Kconfig                        |    1 +
  15  arch/sparc/include/asm/spinlock_32.h      |   11 ++-
  16  arch/sparc/include/asm/spinlock_64.h      |    6 -
  17  arch/x86/mm/fault.c                       |    1 +
  18  drivers/base/regmap/regmap-spi.c          |    1 +
  19  drivers/gpu/drm/i915/i915_debugfs.c       |    2 +-
  20  drivers/gpu/drm/i915/i915_drv.h           |    4 +
  21  drivers/gpu/drm/i915/i915_irq.c           |    6 +-
  22  drivers/gpu/drm/i915/i915_reg.h           |   13 +--
  23  drivers/gpu/drm/i915/i915_suspend.c       |    3 +-
  24  drivers/gpu/drm/i915/intel_display.c      |  187 +++++++++++++++++++++--------
  25  drivers/gpu/drm/i915/intel_dp.c           |    7 +
  26  drivers/gpu/drm/i915/intel_drv.h          |    3 +-
  27  drivers/gpu/drm/i915/intel_lvds.c         |   82 ++++++-------
  28  drivers/gpu/drm/i915/intel_opregion.c     |    1 -
  29  drivers/gpu/drm/i915/intel_panel.c        |   72 +++++++++++-
  30  drivers/staging/gma500/mdfld_dsi_dbi.c    |    3 +-
  31  drivers/staging/gma500/mdfld_dsi_dbi.h    |    3 -
  32  drivers/staging/gma500/mdfld_dsi_dpi.c    |    7 +-
  33  drivers/staging/gma500/mdfld_dsi_output.c |    4 +-
  34  drivers/staging/gma500/medfield.h         |    2 -
  35  drivers/staging/gma500/psb_drv.h          |    1 -
  36  drivers/xen/xen-selfballoon.c             |    1 +
  37  26 files changed, 333 insertions(+), 179 deletions(-)
  38 Merging fixes/fixes
  39 $ git merge fixes/fixes
  40 Already up-to-date.
  41 Merging kbuild-current/rc-fixes
  42 $ git merge kbuild-current/rc-fixes
  43 Already up-to-date.
  44 Merging arm-current/master
  45 $ git merge arm-current/master
  46 Already up-to-date.
  47 Merging m68k-current/for-linus
  48 $ git merge m68k-current/for-linus
  49 Already up-to-date.
  50 Merging powerpc-merge/merge
  51 $ git merge powerpc-merge/merge
  52 Already up-to-date.
  53 Merging 52xx-and-virtex-current/powerpc/merge
  54 $ git merge 52xx-and-virtex-current/powerpc/merge
  55 Already up-to-date.
  56 Merging sparc-current/master
  57 $ git merge sparc-current/master
  58 Already up-to-date.
  59 Merging scsi-rc-fixes/master
  60 $ git merge scsi-rc-fixes/master
  61 Already up-to-date.
  62 Merging net-current/master
  63 $ git merge net-current/master
  64 Merge made by recursive.
  65  Documentation/networking/00-INDEX    |  116 ++++++++++++++++++++++++++++++++++
  66  Documentation/networking/scaling.txt |   23 +++++---
  67  drivers/net/can/sja1000/plx_pci.c    |    4 +-
  68  drivers/net/e1000e/e1000.h           |    4 +
  69  drivers/net/e1000e/ich8lan.c         |   65 +++++++++++++++----
  70  drivers/net/e1000e/netdev.c          |   80 ++++++++++++++++++++++-
  71  drivers/net/gianfar.c                |    9 ++-
  72  drivers/net/gianfar_ethtool.c        |   26 ++++++--
  73  drivers/net/ixgbe/ixgbe_main.c       |    4 +-
  74  drivers/net/sh_eth.c                 |    1 +
  75  drivers/net/usb/cdc_ncm.c            |   47 +++++++++++---
  76  drivers/net/vmxnet3/vmxnet3_drv.c    |   34 ++++++----
  77  12 files changed, 355 insertions(+), 58 deletions(-)
  78 Merging sound-current/for-linus
  79 $ git merge sound-current/for-linus
  80 Already up-to-date.
  81 Merging pci-current/for-linus
  82 $ git merge pci-current/for-linus
  83 Merge made by recursive.
  84  arch/x86/pci/acpi.c              |    9 ++
  85  drivers/pci/hotplug/pcihp_slot.c |   45 +----------
  86  drivers/pci/pci.c                |   67 +++++++++++++++
  87  drivers/pci/pci.h                |    4 +
  88  drivers/pci/probe.c              |  146 +++++++++++++++++++++++++++++++++
  89  drivers/pci/setup-bus.c          |  166 ++++++++++++++++++++++++++-----------
  90  drivers/pci/setup-res.c          |  152 ++++++++++++++++++++++-------------
  91  include/linux/pci.h              |   16 ++++-
  92  8 files changed, 453 insertions(+), 152 deletions(-)
  93 Merging wireless-current/master
  94 $ git merge wireless-current/master
  95 Merge made by recursive.
  96  drivers/net/wireless/iwlwifi/iwl-pci.c  |   25 ++++++++++---------------
  97  drivers/net/wireless/rt2x00/rt2800usb.c |   20 +++++++++++++++-----
  98  drivers/net/wireless/rt2x00/rt2x00usb.c |   17 +++++++----------
  99  drivers/net/wireless/wl12xx/acx.c       |    6 +-----
 100  drivers/net/wireless/wl12xx/testmode.c  |    5 ++++-
 101  5 files changed, 37 insertions(+), 36 deletions(-)
 102 Merging driver-core.current/driver-core-linus
 103 $ git merge driver-core.current/driver-core-linus
 104 Merge made by recursive.
 105  drivers/base/devtmpfs.c        |    2 +-
 106  drivers/base/platform.c        |    2 +-
 107  drivers/firmware/google/gsmi.c |    2 +-
 108  3 files changed, 3 insertions(+), 3 deletions(-)
 109 Merging tty.current/tty-linus
 110 $ git merge tty.current/tty-linus
 111 Merge made by recursive.
 112  drivers/tty/serial/samsung.c |    8 ++++++--
 113  1 files changed, 6 insertions(+), 2 deletions(-)
 114 Merging usb.current/usb-linus
 115 $ git merge usb.current/usb-linus
 116 Already up-to-date.
 117 Merging staging.current/staging-linus
 118 $ git merge staging.current/staging-linus
 119 Already up-to-date.
 120 Merging cpufreq-current/fixes
 121 $ git merge cpufreq-current/fixes
 122 Already up-to-date.
 123 Merging input-current/for-linus
 124 $ git merge input-current/for-linus
 125 Auto-merging drivers/input/joystick/analog.c
 126 Merge made by recursive.
 127  drivers/input/joystick/analog.c    |    2 +-
 128  drivers/input/keyboard/tegra-kbc.c |    2 +-
 129  drivers/input/misc/mma8450.c       |    2 +-
 130  drivers/input/misc/mpu3050.c       |    2 +-
 131  drivers/input/mouse/bcm5974.c      |   20 ++++++++++++++++++++
 132  drivers/input/tablet/wacom_sys.c   |   17 ++++++++++-------
 133  drivers/input/tablet/wacom_wac.c   |    4 ++++
 134  7 files changed, 38 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/emergency-restart.h         |    6 -
 214  arch/arm/include/asm/errno.h                     |    6 -
 215  arch/arm/include/asm/gpio.h                      |   19 ++
 216  arch/arm/include/asm/hardware/cache-l2x0.h       |   19 ++-
 217  arch/arm/include/asm/hardware/iop3xx-gpio.h      |    2 +
 218  arch/arm/include/asm/ioctl.h                     |    1 -
 219  arch/arm/include/asm/irq_regs.h                  |    1 -
 220  arch/arm/include/asm/kdebug.h                    |    1 -
 221  arch/arm/include/asm/local.h                     |    1 -
 222  arch/arm/include/asm/local64.h                   |    1 -
 223  arch/arm/include/asm/memory.h                    |    7 -
 224  arch/arm/include/asm/module.h                    |    4 -
 225  arch/arm/include/asm/percpu.h                    |    6 -
 226  arch/arm/include/asm/pgalloc.h                   |    2 +-
 227  arch/arm/include/asm/pgtable.h                   |   23 +-
 228  arch/arm/include/asm/pmu.h                       |   10 +-
 229  arch/arm/include/asm/poll.h                      |    1 -
 230  arch/arm/include/asm/resource.h                  |    6 -
 231  arch/arm/include/asm/sections.h                  |    1 -
 232  arch/arm/include/asm/siginfo.h                   |    6 -
 233  arch/arm/include/asm/sizes.h                     |   21 --
 234  arch/arm/include/asm/tlb.h                       |    1 +
 235  arch/arm/include/asm/topology.h                  |   33 ++
 236  arch/arm/kernel/Makefile                         |    1 +
 237  arch/arm/kernel/head.S                           |   61 +---
 238  arch/arm/kernel/pmu.c                            |   26 +-
 239  arch/arm/kernel/setup.c                          |   15 +-
 240  arch/arm/kernel/smp.c                            |    5 +
 241  arch/arm/kernel/smp_twd.c                        |    4 +-
 242  arch/arm/kernel/topology.c                       |  148 +++++++++
 243  arch/arm/mach-at91/at91cap9_devices.c            |    2 +-
 244  arch/arm/mach-at91/at91rm9200_devices.c          |    2 +-
 245  arch/arm/mach-at91/at91sam9260_devices.c         |    2 +-
 246  arch/arm/mach-at91/at91sam9261_devices.c         |    2 +-
 247  arch/arm/mach-at91/at91sam9263_devices.c         |    2 +-
 248  arch/arm/mach-at91/at91sam9g45_devices.c         |    2 +-
 249  arch/arm/mach-at91/at91sam9rl_devices.c          |    2 +-
 250  arch/arm/mach-at91/board-1arm.c                  |    2 +-
 251  arch/arm/mach-at91/board-afeb-9260v1.c           |    2 +-
 252  arch/arm/mach-at91/board-cam60.c                 |    2 +-
 253  arch/arm/mach-at91/board-cap9adk.c               |    2 +-
 254  arch/arm/mach-at91/board-carmeva.c               |    2 +-
 255  arch/arm/mach-at91/board-cpu9krea.c              |    2 +-
 256  arch/arm/mach-at91/board-cpuat91.c               |    2 +-
 257  arch/arm/mach-at91/board-csb337.c                |    2 +-
 258  arch/arm/mach-at91/board-csb637.c                |    2 +-
 259  arch/arm/mach-at91/board-eb9200.c                |    2 +-
 260  arch/arm/mach-at91/board-ecbat91.c               |    2 +-
 261  arch/arm/mach-at91/board-kafa.c                  |    2 +-
 262  arch/arm/mach-at91/board-kb9202.c                |    2 +-
 263  arch/arm/mach-at91/board-neocore926.c            |    2 +-
 264  arch/arm/mach-at91/board-picotux200.c            |    2 +-
 265  arch/arm/mach-at91/board-qil-a9260.c             |    2 +-
 266  arch/arm/mach-at91/board-rm9200dk.c              |    2 +-
 267  arch/arm/mach-at91/board-rm9200ek.c              |    2 +-
 268  arch/arm/mach-at91/board-sam9-l9260.c            |    2 +-
 269  arch/arm/mach-at91/board-sam9260ek.c             |    2 +-
 270  arch/arm/mach-at91/board-sam9261ek.c             |    2 +-
 271  arch/arm/mach-at91/board-sam9263ek.c             |    2 +-
 272  arch/arm/mach-at91/board-sam9g20ek.c             |    2 +-
 273  arch/arm/mach-at91/board-sam9m10g45ek.c          |    2 +-
 274  arch/arm/mach-at91/board-sam9rlek.c              |    2 +-
 275  arch/arm/mach-at91/board-usb-a9260.c             |    2 +-
 276  arch/arm/mach-at91/board-usb-a9263.c             |    2 +-
 277  arch/arm/mach-at91/board-yl-9200.c               |    2 +-
 278  arch/arm/mach-at91/gpio.c                        |    4 +-
 279  arch/arm/mach-at91/include/mach/gpio.h           |    5 -
 280  arch/arm/mach-at91/leds.c                        |    2 +-
 281  arch/arm/mach-at91/pm.c                          |    2 +-
 282  arch/arm/mach-davinci/da830.c                    |    2 +-
 283  arch/arm/mach-davinci/da850.c                    |    2 +-
 284  arch/arm/mach-davinci/gpio.c                     |    4 +-
 285  arch/arm/mach-davinci/include/mach/gpio.h        |    7 +-
 286  arch/arm/mach-davinci/tnetv107x.c                |    2 +-
 287  arch/arm/mach-ep93xx/include/mach/gpio.h         |    8 -
 288  arch/arm/mach-exynos4/include/mach/gpio.h        |    7 -
 289  arch/arm/mach-gemini/include/mach/gpio.h         |    5 -
 290  arch/arm/mach-imx/iomux-imx31.c                  |    3 +-
 291  arch/arm/mach-imx/mach-mx27ads.c                 |    3 +-
 292  arch/arm/mach-ixp2000/core.c                     |    4 +-
 293  arch/arm/mach-ixp2000/ixdp2x00.c                 |    3 +-
 294  arch/arm/mach-ixp4xx/common-pci.c                |    3 +-
 295  arch/arm/mach-ixp4xx/dsmg600-setup.c             |    3 +-
 296  arch/arm/mach-ixp4xx/fsg-setup.c                 |    3 +-
 297  arch/arm/mach-ixp4xx/include/mach/gpio.h         |    3 +
 298  arch/arm/mach-ixp4xx/nas100d-setup.c             |    3 +-
 299  arch/arm/mach-ixp4xx/nslu2-setup.c               |    3 +-
 300  arch/arm/mach-kirkwood/irq.c                     |    3 +-
 301  arch/arm/mach-kirkwood/mpp.c                     |    3 +-
 302  arch/arm/mach-ks8695/board-acs5k.c               |    3 +-
 303  arch/arm/mach-ks8695/board-dsm320.c              |    3 +-
 304  arch/arm/mach-ks8695/board-micrel.c              |    3 +-
 305  arch/arm/mach-ks8695/gpio.c                      |    3 +-
 306  arch/arm/mach-ks8695/include/mach/gpio.h         |   11 -
 307  arch/arm/mach-ks8695/leds.c                      |    3 +-
 308  arch/arm/mach-lpc32xx/include/mach/gpio.h        |   22 --
 309  arch/arm/mach-mmp/aspenite.c                     |    5 +-
 310  arch/arm/mach-mmp/mmp2.c                         |    3 +-
 311  arch/arm/mach-mmp/pxa168.c                       |    3 +-
 312  arch/arm/mach-mmp/pxa910.c                       |    3 +-
 313  arch/arm/mach-mmp/tavorevb.c                     |    3 +-
 314  arch/arm/mach-mmp/ttc_dkb.c                      |    2 +-
 315  arch/arm/mach-msm/board-msm7x27.c                |    3 +-
 316  arch/arm/mach-msm/board-msm7x30.c                |   25 ++-
 317  arch/arm/mach-msm/board-msm8960.c                |   22 ++
 318  arch/arm/mach-msm/board-msm8x60.c                |   25 ++
 319  arch/arm/mach-msm/board-qsd8x50.c                |    3 +-
 320  arch/arm/mach-msm/board-sapphire.c               |    3 +-
 321  arch/arm/mach-msm/board-trout-mmc.c              |    3 +-
 322  arch/arm/mach-msm/board-trout-panel.c            |    3 +-
 323  arch/arm/mach-msm/include/mach/gpio.h            |   27 +--
 324  arch/arm/mach-msm/include/mach/memory.h          |    6 +-
 325  arch/arm/mach-mv78xx0/irq.c                      |    3 +-
 326  arch/arm/mach-mv78xx0/mpp.c                      |    3 +-
 327  arch/arm/mach-mxs/include/mach/gpio.h            |    8 -
 328  arch/arm/mach-omap1/board-ams-delta.c            |    3 +-
 329  arch/arm/mach-omap1/board-fsample.c              |    3 +-
 330  arch/arm/mach-omap1/board-generic.c              |    3 +-
 331  arch/arm/mach-omap1/board-h2-mmc.c               |    3 +-
 332  arch/arm/mach-omap1/board-h2.c                   |    3 +-
 333  arch/arm/mach-omap1/board-h3-mmc.c               |    3 +-
 334  arch/arm/mach-omap1/board-h3.c                   |    3 +-
 335  arch/arm/mach-omap1/board-htcherald.c            |    1 -
 336  arch/arm/mach-omap1/board-innovator.c            |    3 +-
 337  arch/arm/mach-omap1/board-nokia770.c             |    3 +-
 338  arch/arm/mach-omap1/board-osk.c                  |    3 +-
 339  arch/arm/mach-omap1/board-palmte.c               |    3 +-
 340  arch/arm/mach-omap1/board-palmtt.c               |    2 +-
 341  arch/arm/mach-omap1/board-palmz71.c              |    2 +-
 342  arch/arm/mach-omap1/board-perseus2.c             |    3 +-
 343  arch/arm/mach-omap1/board-sx1-mmc.c              |    2 +-
 344  arch/arm/mach-omap1/board-sx1.c                  |    3 +-
 345  arch/arm/mach-omap1/board-voiceblue.c            |    2 +-
 346  arch/arm/mach-omap1/devices.c                    |    2 +-
 347  arch/arm/mach-omap1/fpga.c                       |    2 +-
 348  arch/arm/mach-omap1/irq.c                        |    3 +-
 349  arch/arm/mach-omap1/leds-h2p2-debug.c            |    2 +-
 350  arch/arm/mach-omap1/leds-osk.c                   |    3 +-
 351  arch/arm/mach-omap1/leds.c                       |    2 +-
 352  arch/arm/mach-omap1/serial.c                     |    3 +-
 353  arch/arm/mach-omap2/board-generic.c              |    3 +-
 354  arch/arm/mach-omap2/board-h4.c                   |    3 +-
 355  arch/arm/mach-omap2/board-ldp.c                  |    3 +-
 356  arch/arm/mach-omap2/devices.c                    |    3 +-
 357  arch/arm/mach-orion5x/db88f5281-setup.c          |    3 +-
 358  arch/arm/mach-orion5x/dns323-setup.c             |    3 +-
 359  arch/arm/mach-orion5x/irq.c                      |    3 +-
 360  arch/arm/mach-orion5x/kurobox_pro-setup.c        |    3 +-
 361  arch/arm/mach-orion5x/mv2120-setup.c             |    3 +-
 362  arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c     |    3 +-
 363  arch/arm/mach-orion5x/rd88f5181l-ge-setup.c      |    3 +-
 364  arch/arm/mach-orion5x/rd88f5182-setup.c          |    3 +-
 365  arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c     |    3 +-
 366  arch/arm/mach-orion5x/terastation_pro2-setup.c   |    3 +-
 367  arch/arm/mach-orion5x/ts209-setup.c              |    3 +-
 368  arch/arm/mach-orion5x/ts409-setup.c              |    3 +-
 369  arch/arm/mach-orion5x/wnr854t-setup.c            |    3 +-
 370  arch/arm/mach-orion5x/wrt350n-v2-setup.c         |    3 +-
 371  arch/arm/mach-pnx4008/gpio.c                     |    3 +-
 372  arch/arm/mach-pnx4008/serial.c                   |    3 +-
 373  arch/arm/mach-pxa/generic.c                      |    2 +-
 374  arch/arm/mach-pxa/include/mach/littleton.h       |    2 +-
 375  arch/arm/mach-pxa/irq.c                          |    3 +-
 376  arch/arm/mach-pxa/lpd270.c                       |    3 +-
 377  arch/arm/mach-pxa/lubbock.c                      |    2 +-
 378  arch/arm/mach-pxa/mainstone.c                    |    3 +-
 379  arch/arm/mach-pxa/mfp-pxa2xx.c                   |    3 +-
 380  arch/arm/mach-pxa/pcm990-baseboard.c             |    3 +-
 381  arch/arm/mach-pxa/pxa25x.c                       |    2 +-
 382  arch/arm/mach-pxa/pxa27x.c                       |    2 +-
 383  arch/arm/mach-pxa/pxa3xx.c                       |    3 +-
 384  arch/arm/mach-pxa/pxa95x.c                       |    3 +-
 385  arch/arm/mach-pxa/saar.c                         |    2 +-
 386  arch/arm/mach-pxa/saarb.c                        |    3 +-
 387  arch/arm/mach-realview/include/mach/gpio.h       |    7 +-
 388  arch/arm/mach-realview/include/mach/system.h     |    1 +
 389  arch/arm/mach-s3c2410/include/mach/gpio.h        |    6 -
 390  arch/arm/mach-s3c2410/include/mach/h1940-latch.h |    2 +-
 391  arch/arm/mach-s3c64xx/include/mach/gpio.h        |    7 -
 392  arch/arm/mach-s5p64x0/include/mach/gpio.h        |    7 -
 393  arch/arm/mach-s5pc100/include/mach/gpio.h        |    7 -
 394  arch/arm/mach-s5pv210/include/mach/gpio.h        |    7 -
 395  arch/arm/mach-sa1100/generic.c                   |    2 +-
 396  arch/arm/mach-sa1100/gpio.c                      |    3 +-
 397  arch/arm/mach-sa1100/include/mach/gpio.h         |    2 +
 398  arch/arm/mach-shmobile/include/mach/gpio.h       |   24 +--
 399  arch/arm/mach-tegra/board-trimslice-pinmux.c     |    3 +-
 400  arch/arm/mach-tegra/include/mach/gpio.h          |    7 +-
 401  arch/arm/mach-u300/include/mach/gpio.h           |    3 +
 402  arch/arm/mach-ux500/board-mop500-u8500uib.c      |    3 +-
 403  arch/arm/mach-versatile/include/mach/gpio.h      |    7 +-
 404  arch/arm/mach-vt8500/include/mach/gpio.h         |    7 +-
 405  arch/arm/mach-w90x900/include/mach/gpio.h        |    6 +-
 406  arch/arm/mm/cache-l2x0.c                         |  103 +++++++
 407  arch/arm/mm/proc-v6.S                            |   16 +
 408  arch/arm/plat-mxc/include/mach/gpio.h            |    6 -
 409  arch/arm/plat-nomadik/include/plat/gpio.h        |   12 +-
 410  arch/arm/plat-omap/debug-devices.c               |    3 +-
 411  arch/arm/plat-omap/debug-leds.c                  |    3 +-
 412  arch/arm/plat-omap/devices.c                     |    3 +-
 413  arch/arm/plat-omap/include/plat/gpio.h           |   20 --
 414  arch/arm/plat-orion/include/plat/gpio.h          |    9 -
 415  arch/arm/plat-pxa/gpio.c                         |    4 +-
 416  arch/arm/plat-pxa/include/plat/gpio.h            |    2 +
 417  arch/arm/plat-spear/include/plat/gpio.h          |   25 +--
 418  arch/arm/tools/mach-types                        |  348 ++++++++++++----------
 419  drivers/ata/pata_at91.c                          |    2 +-
 420  drivers/gpio/gpio-nomadik.c                      |    2 +-
 421  drivers/gpio/gpio-omap.c                         |    2 +-
 422  drivers/i2c/busses/i2c-ixp2000.c                 |    2 +-
 423  drivers/ide/at91_ide.c                           |    2 +-
 424  drivers/input/keyboard/omap-keypad.c             |    2 +-
 425  drivers/mfd/menelaus.c                           |    2 +-
 426  drivers/mmc/host/omap.c                          |    2 +-
 427  drivers/mmc/host/sdhci-tegra.c                   |    2 +-
 428  drivers/mtd/nand/ams-delta.c                     |    2 +-
 429  drivers/mtd/onenand/omap2.c                      |    2 +-
 430  drivers/net/arm/at91_ether.c                     |    2 +-
 431  drivers/pcmcia/pxa2xx_vpac270.c                  |    2 +-
 432  drivers/spi/spi-atmel.c                          |    2 +-
 433  drivers/tty/serial/atmel_serial.c                |    2 +-
 434  drivers/usb/host/ohci-pnx4008.c                  |    2 +-
 435  drivers/usb/musb/davinci.c                       |    2 +-
 436  drivers/video/atmel_lcdfb.c                      |    2 +-
 437  drivers/video/omap/lcd_apollon.c                 |    2 +-
 438  drivers/video/omap/lcd_h3.c                      |    2 +-
 439  drivers/video/omap/lcd_inn1610.c                 |    2 +-
 440  drivers/video/omap/lcd_ldp.c                     |    2 +-
 441  drivers/video/omap/lcd_osk.c                     |    2 +-
 442  drivers/video/omap/lcd_overo.c                   |    2 +-
 443  drivers/video/omap/lcd_palmtt.c                  |    2 +-
 444  drivers/video/pnx4008/sdum.c                     |    2 +-
 445  tools/perf/arch/arm/util/dwarf-regs.c            |    3 +
 446  242 files changed, 966 insertions(+), 847 deletions(-)
 447  create mode 100644 Documentation/devicetree/bindings/arm/l2cc.txt
 448  delete mode 100644 arch/arm/include/asm/auxvec.h
 449  delete mode 100644 arch/arm/include/asm/bitsperlong.h
 450  delete mode 100644 arch/arm/include/asm/cputime.h
 451  delete mode 100644 arch/arm/include/asm/emergency-restart.h
 452  delete mode 100644 arch/arm/include/asm/errno.h
 453  delete mode 100644 arch/arm/include/asm/ioctl.h
 454  delete mode 100644 arch/arm/include/asm/irq_regs.h
 455  delete mode 100644 arch/arm/include/asm/kdebug.h
 456  delete mode 100644 arch/arm/include/asm/local.h
 457  delete mode 100644 arch/arm/include/asm/local64.h
 458  delete mode 100644 arch/arm/include/asm/percpu.h
 459  delete mode 100644 arch/arm/include/asm/poll.h
 460  delete mode 100644 arch/arm/include/asm/resource.h
 461  delete mode 100644 arch/arm/include/asm/sections.h
 462  delete mode 100644 arch/arm/include/asm/siginfo.h
 463  delete mode 100644 arch/arm/include/asm/sizes.h
 464  create mode 100644 arch/arm/kernel/topology.c
 465 Merging arm-lpae/for-next
 466 $ git merge arm-lpae/for-next
 467 Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution.
 468 Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution.
 469 Resolved 'arch/arm/include/asm/tlb.h' using previous resolution.
 470 Auto-merging arch/arm/Kconfig
 471 Auto-merging arch/arm/include/asm/pgalloc.h
 472 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
 473 Auto-merging arch/arm/include/asm/pgtable.h
 474 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
 475 Auto-merging arch/arm/include/asm/tlb.h
 476 CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
 477 Auto-merging arch/arm/kernel/head.S
 478 Auto-merging arch/arm/kernel/module.c
 479 Auto-merging arch/arm/kernel/setup.c
 480 Auto-merging arch/arm/mm/alignment.c
 481 Automatic merge failed; fix conflicts and then commit the result.
 482 $ git commit -v -a
 483 [master 0635a13] Merge remote-tracking branch 'arm-lpae/for-next'
 484 $ git diff -M --stat --summary HEAD^..
 485  arch/arm/Kconfig                            |    2 +-
 486  arch/arm/boot/compressed/head.S             |    1 +
 487  arch/arm/include/asm/assembler.h            |   11 +
 488  arch/arm/include/asm/dma-mapping.h          |    2 +-
 489  arch/arm/include/asm/page.h                 |   44 +---
 490  arch/arm/include/asm/pgalloc.h              |   28 ++-
 491  arch/arm/include/asm/pgtable-2level-hwdef.h |   93 ++++++
 492  arch/arm/include/asm/pgtable-2level-types.h |   67 +++++
 493  arch/arm/include/asm/pgtable-2level.h       |  143 +++++++++
 494  arch/arm/include/asm/pgtable-3level-hwdef.h |   82 ++++++
 495  arch/arm/include/asm/pgtable-3level-types.h |   70 +++++
 496  arch/arm/include/asm/pgtable-3level.h       |  107 +++++++
 497  arch/arm/include/asm/pgtable-hwdef.h        |   81 +-----
 498  arch/arm/include/asm/pgtable.h              |  211 +++++---------
 499  arch/arm/include/asm/proc-fns.h             |   21 ++
 500  arch/arm/include/asm/setup.h                |    8 +
 501  arch/arm/include/asm/tlb.h                  |   11 +-
 502  arch/arm/include/asm/tlbflush.h             |    4 +-
 503  arch/arm/kernel/head.S                      |  119 ++++++---
 504  arch/arm/kernel/module.c                    |    2 +-
 505  arch/arm/kernel/setup.c                     |   10 +
 506  arch/arm/kernel/sleep.S                     |    2 +
 507  arch/arm/mm/Kconfig                         |   13 +
 508  arch/arm/mm/Makefile                        |    4 +
 509  arch/arm/mm/alignment.c                     |    8 +-
 510  arch/arm/mm/context.c                       |   19 +-
 511  arch/arm/mm/dma-mapping.c                   |    6 +-
 512  arch/arm/mm/fault.c                         |   87 ++++++
 513  arch/arm/mm/idmap.c                         |   36 +++-
 514  arch/arm/mm/ioremap.c                       |   39 ++-
 515  arch/arm/mm/mm.h                            |    4 +-
 516  arch/arm/mm/mmu.c                           |   53 +++-
 517  arch/arm/mm/pgd.c                           |   51 +++-
 518  arch/arm/mm/proc-macros.S                   |    5 +-
 519  arch/arm/mm/proc-v7lpae.S                   |  422 +++++++++++++++++++++++++++
 520  35 files changed, 1523 insertions(+), 343 deletions(-)
 521  create mode 100644 arch/arm/include/asm/pgtable-2level-hwdef.h
 522  create mode 100644 arch/arm/include/asm/pgtable-2level-types.h
 523  create mode 100644 arch/arm/include/asm/pgtable-2level.h
 524  create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h
 525  create mode 100644 arch/arm/include/asm/pgtable-3level-types.h
 526  create mode 100644 arch/arm/include/asm/pgtable-3level.h
 527  create mode 100644 arch/arm/mm/proc-v7lpae.S
 528 Merging arm-soc/for-next
 529 $ git merge arm-soc/for-next
 530 Already up-to-date.
 531 Merging at91/at91-next
 532 $ git merge at91/at91-next
 533 Already up-to-date.
 534 Merging davinci/davinci-next
 535 $ git merge davinci/davinci-next
 536 Already up-to-date.
 537 Merging i.MX/for-next
 538 $ git merge i.MX/for-next
 539 Already up-to-date.
 540 Merging linux-spec/for-next
 541 $ git merge linux-spec/for-next
 542 Already up-to-date.
 543 Merging msm/for-next
 544 $ git merge msm/for-next
 545 Resolved 'arch/arm/mach-msm/io.c' using previous resolution.
 546 Auto-merging arch/arm/mach-msm/Makefile
 547 Auto-merging arch/arm/mach-msm/acpuclock-arm11.c
 548 Auto-merging arch/arm/mach-msm/board-msm7x30.c
 549 Auto-merging arch/arm/mach-msm/board-msm8960.c
 550 Auto-merging arch/arm/mach-msm/board-msm8x60.c
 551 Auto-merging arch/arm/mach-msm/board-qsd8x50.c
 552 Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
 553 Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
 554 Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
 555 Auto-merging arch/arm/mach-msm/io.c
 556 CONFLICT (content): Merge conflict in arch/arm/mach-msm/io.c
 557 Automatic merge failed; fix conflicts and then commit the result.
 558 $ git commit -v -a
 559 [master a0ace39] Merge remote-tracking branch 'msm/for-next'
 560 $ git diff -M --stat --summary HEAD^..
 561  arch/arm/mach-msm/Makefile                      |    5 +-
 562  arch/arm/mach-msm/acpuclock-arm11.c             |    2 +-
 563  arch/arm/mach-msm/board-halibut.c               |    1 +
 564  arch/arm/mach-msm/board-mahimahi.c              |    1 +
 565  arch/arm/mach-msm/board-msm7x30.c               |    1 +
 566  arch/arm/mach-msm/board-msm8960.c               |   18 +
 567  arch/arm/mach-msm/board-msm8x60.c               |    9 +-
 568  arch/arm/mach-msm/board-qsd8x50.c               |    1 +
 569  arch/arm/mach-msm/board-trout.c                 |    1 +
 570  arch/arm/mach-msm/clock-dummy.c                 |   81 +++++
 571  arch/arm/mach-msm/clock.h                       |   11 +
 572  arch/arm/mach-msm/devices-msm7x00.c             |   21 ++-
 573  arch/arm/mach-msm/devices-msm7x30.c             |   21 ++-
 574  arch/arm/mach-msm/devices-msm8960.c             |  181 +++++++++++
 575  arch/arm/mach-msm/devices-msm8x60.c             |   56 ++++
 576  arch/arm/mach-msm/devices-qsd8x50.c             |   21 ++-
 577  arch/arm/mach-msm/devices.h                     |    8 +
 578  arch/arm/mach-msm/dma.c                         |  391 ++++++++++++++++++-----
 579  arch/arm/mach-msm/include/mach/dma.h            |   84 +++---
 580  arch/arm/mach-msm/include/mach/msm_iomap-7x00.h |    5 +-
 581  arch/arm/mach-msm/include/mach/msm_iomap-7x30.h |    5 +-
 582  arch/arm/mach-msm/include/mach/msm_iomap-8960.h |    3 +
 583  arch/arm/mach-msm/include/mach/msm_iomap-8x50.h |    5 +-
 584  arch/arm/mach-msm/include/mach/msm_iomap-8x60.h |    6 +
 585  arch/arm/mach-msm/io.c                          |    3 -
 586  25 files changed, 808 insertions(+), 133 deletions(-)
 587  create mode 100644 arch/arm/mach-msm/clock-dummy.c
 588  create mode 100644 arch/arm/mach-msm/devices-msm8x60.c
 589 Merging omap/for-next
 590 $ git merge omap/for-next
 591 Already up-to-date.
 592 Merging pxa/for-next
 593 $ git merge pxa/for-next
 594 Already up-to-date.
 595 Merging samsung/next-samsung
 596 $ git merge samsung/next-samsung
 597 Already up-to-date.
 598 Merging s5p/for-next
 599 $ git merge s5p/for-next
 600 Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
 601 Merge made by recursive.
 602  arch/arm/mach-exynos4/Kconfig                  |    6 ++++
 603  arch/arm/mach-exynos4/clock.c                  |    2 +-
 604  arch/arm/mach-exynos4/cpu.c                    |    1 -
 605  arch/arm/mach-exynos4/include/mach/irqs.h      |    5 +--
 606  arch/arm/mach-exynos4/irq-eint.c               |    7 ++++
 607  arch/arm/mach-exynos4/mach-nuri.c              |   34 +++++++++++++++++++++
 608  arch/arm/mach-exynos4/mach-smdkv310.c          |   11 +++++++
 609  arch/arm/mach-exynos4/mach-universal_c210.c    |   38 ++++++++++++++++++++++-
 610  arch/arm/mach-s3c64xx/mach-crag6410.c          |    9 +++++
 611  arch/arm/mach-s3c64xx/pm.c                     |    1 +
 612  arch/arm/mach-s5p64x0/irq-eint.c               |    2 +-
 613  arch/arm/mach-s5pv210/Kconfig                  |    6 ----
 614  arch/arm/mach-s5pv210/Makefile                 |    2 +-
 615  arch/arm/mach-s5pv210/pm.c                     |    2 +-
 616  arch/arm/plat-s5p/irq-gpioint.c                |    6 ++++
 617  arch/arm/plat-samsung/include/plat/backlight.h |    2 +-
 618  16 files changed, 117 insertions(+), 17 deletions(-)
 619 Merging tegra/for-next
 620 $ git merge tegra/for-next
 621 Already up-to-date.
 622 Merging ux500-core/ux500-core
 623 $ git merge ux500-core/ux500-core
 624 Already up-to-date.
 625 Merging xilinx/arm-next
 626 $ git merge xilinx/arm-next
 627 Already up-to-date.
 628 Merging blackfin/for-linus
 629 $ git merge blackfin/for-linus
 630 Merge made by recursive.
 631  arch/blackfin/include/asm/uaccess.h     |    6 +++---
 632  arch/blackfin/mach-bf533/boards/H8606.c |    3 ++-
 633  2 files changed, 5 insertions(+), 4 deletions(-)
 634 Merging cris/for-next
 635 $ git merge cris/for-next
 636 Auto-merging arch/cris/arch-v32/drivers/cryptocop.c
 637 Auto-merging drivers/net/cris/eth_v10.c
 638 Merge made by recursive.
 639  Documentation/cris/README               |   62 +++++++++++++++---------------
 640  arch/cris/arch-v32/drivers/cryptocop.c  |    6 +--
 641  arch/cris/arch-v32/kernel/ptrace.c      |    2 -
 642  arch/cris/include/arch-v32/arch/cache.h |    2 +-
 643  drivers/net/cris/eth_v10.c              |    1 -
 644  5 files changed, 34 insertions(+), 39 deletions(-)
 645 Merging ia64/test
 646 $ git merge ia64/test
 647 Merge made by recursive.
 648  arch/ia64/sn/kernel/sn2/sn_hwperf.c |   12 +++--
 649  drivers/acpi/apei/erst.c            |    2 +-
 650  drivers/firmware/efivars.c          |    2 +-
 651  fs/pstore/inode.c                   |   40 +++++++++++++++--
 652  fs/pstore/internal.h                |    2 +-
 653  fs/pstore/platform.c                |   82 ++++++++++++++++++++++++++++-------
 654  include/linux/pstore.h              |    2 +-
 655  7 files changed, 114 insertions(+), 28 deletions(-)
 656 Merging m68k/for-next
 657 $ git merge m68k/for-next
 658 Merge made by recursive.
 659  arch/m68k/mac/macints.c      |    2 +-
 660  arch/m68k/mac/misc.c         |   40 +++++++++++++++++++++++-----------------
 661  drivers/zorro/zorro-driver.c |    8 ++++----
 662  3 files changed, 28 insertions(+), 22 deletions(-)
 663 Merging m68knommu/for-next
 664 $ git merge m68knommu/for-next
 665 Merge made by recursive.
 666  arch/m68k/include/asm/m520xsim.h |   26 +++++++++----------
 667  arch/m68k/include/asm/mcfqspi.h  |    8 ++++--
 668  arch/m68k/lib/memcpy.c           |    9 +++++++
 669  arch/m68k/platform/520x/config.c |    6 ++--
 670  arch/m68k/platform/520x/gpio.c   |   50 +++++--------------------------------
 671  5 files changed, 36 insertions(+), 63 deletions(-)
 672 Merging microblaze/next
 673 $ git merge microblaze/next
 674 Already up-to-date.
 675 Merging mips/mips-for-linux-next
 676 $ git merge mips/mips-for-linux-next
 677 Removing arch/mips/nxp/pnx8550/common/pci.c
 678 Removing arch/mips/nxp/pnx8550/common/setup.c
 679 Merge made by recursive.
 680  arch/mips/Kconfig                                  |    1 +
 681  arch/mips/Makefile                                 |    2 +
 682  arch/mips/alchemy/common/platform.c                |    2 +-
 683  arch/mips/alchemy/common/power.c                   |   22 ++-
 684  arch/mips/ar7/irq.c                                |    3 +-
 685  arch/mips/bcm63xx/irq.c                            |    1 +
 686  arch/mips/cobalt/irq.c                             |    1 +
 687  arch/mips/dec/setup.c                              |    4 +
 688  arch/mips/emma/markeins/irq.c                      |    2 +-
 689  arch/mips/include/asm/cacheflush.h                 |   24 ++++
 690  arch/mips/include/asm/io.h                         |   12 +--
 691  .../asm/mach-cavium-octeon/cpu-feature-overrides.h |    1 -
 692  arch/mips/include/asm/mipsprom.h                   |    6 +-
 693  arch/mips/include/asm/prom.h                       |    6 +-
 694  arch/mips/kernel/ftrace.c                          |   39 +++---
 695  arch/mips/kernel/scall32-o32.S                     |    2 +-
 696  arch/mips/kernel/signal.c                          |    3 +
 697  arch/mips/kernel/traps.c                           |    6 +-
 698  arch/mips/lantiq/irq.c                             |    6 +-
 699  arch/mips/lasat/interrupt.c                        |    1 +
 700  arch/mips/loongson/fuloong-2e/irq.c                |    1 +
 701  arch/mips/loongson/lemote-2f/irq.c                 |    3 +-
 702  arch/mips/mm/c-octeon.c                            |    6 +
 703  arch/mips/mm/c-r3k.c                               |    7 +
 704  arch/mips/mm/c-r4k.c                               |   35 +++++
 705  arch/mips/mm/c-tx39.c                              |    7 +
 706  arch/mips/mm/cache.c                               |    5 +
 707  arch/mips/mm/tlbex.c                               |    3 +-
 708  arch/mips/mti-malta/malta-int.c                    |    6 +-
 709  arch/mips/netlogic/Platform                        |    5 +
 710  arch/mips/netlogic/xlr/setup.c                     |    4 +-
 711  arch/mips/netlogic/xlr/smp.c                       |    2 +-
 712  arch/mips/netlogic/xlr/smpboot.S                   |   16 ++-
 713  arch/mips/nxp/pnx8550/common/pci.c                 |  134 ------------------
 714  arch/mips/nxp/pnx8550/common/setup.c               |  143 --------------------
 715  arch/mips/pci/pci-lantiq.c                         |    9 +-
 716  arch/mips/pci/pci-rc32434.c                        |    2 +-
 717  arch/mips/pmc-sierra/msp71xx/msp_irq.c             |    6 +-
 718  arch/mips/pmc-sierra/msp71xx/msp_setup.c           |    1 +
 719  arch/mips/pmc-sierra/yosemite/py-console.c         |   12 +--
 720  arch/mips/pnx8550/common/int.c                     |    2 +-
 721  arch/mips/pnx8550/common/prom.c                    |    2 +-
 722  arch/mips/sgi-ip22/ip22-int.c                      |   10 +-
 723  arch/mips/sgi-ip27/ip27-irq.c                      |    4 +-
 724  arch/mips/sni/rm200.c                              |    1 +
 725  arch/mips/vr41xx/common/irq.c                      |    1 +
 726  drivers/mtd/maps/lantiq-flash.c                    |    4 +-
 727  47 files changed, 204 insertions(+), 371 deletions(-)
 728  delete mode 100644 arch/mips/nxp/pnx8550/common/pci.c
 729  delete mode 100644 arch/mips/nxp/pnx8550/common/setup.c
 730 Merging openrisc/for-upstream
 731 $ git merge openrisc/for-upstream
 732 Already up-to-date.
 733 Merging parisc/for-next
 734 $ git merge parisc/for-next
 735 Already up-to-date.
 736 Merging powerpc/next
 737 $ git merge powerpc/next
 738 Already up-to-date.
 739 Merging 4xx/next
 740 $ git merge 4xx/next
 741 Removing arch/powerpc/boot/dts/hcu4.dts
 742 Removing arch/powerpc/configs/40x/hcu4_defconfig
 743 Removing arch/powerpc/platforms/40x/hcu4.c
 744 Auto-merging arch/powerpc/sysdev/ppc4xx_pci.c
 745 Merge made by recursive.
 746  arch/powerpc/Kconfig                    |    2 +-
 747  arch/powerpc/boot/dts/hcu4.dts          |  168 ------------------------------
 748  arch/powerpc/boot/dts/yosemite.dts      |   36 +++++++
 749  arch/powerpc/configs/40x/hcu4_defconfig |   80 --------------
 750  arch/powerpc/configs/ppc40x_defconfig   |    1 -
 751  arch/powerpc/include/asm/kexec.h        |    2 +-
 752  arch/powerpc/kernel/misc_32.S           |  171 +++++++++++++++++++++++++++++++
 753  arch/powerpc/platforms/40x/Kconfig      |    8 --
 754  arch/powerpc/platforms/40x/Makefile     |    1 -
 755  arch/powerpc/platforms/40x/hcu4.c       |   61 -----------
 756  arch/powerpc/sysdev/ppc4xx_pci.c        |   89 +++++++++++++---
 757  arch/powerpc/sysdev/ppc4xx_pci.h        |   12 ++
 758  drivers/edac/ppc4xx_edac.c              |    2 +-
 759  13 files changed, 294 insertions(+), 339 deletions(-)
 760  delete mode 100644 arch/powerpc/boot/dts/hcu4.dts
 761  delete mode 100644 arch/powerpc/configs/40x/hcu4_defconfig
 762  delete mode 100644 arch/powerpc/platforms/40x/hcu4.c
 763 Merging 52xx-and-virtex/powerpc/next
 764 $ git merge 52xx-and-virtex/powerpc/next
 765 Merge made by recursive.
 766  arch/powerpc/boot/dts/charon.dts             |  236 ++++++++++++++++++++++++++
 767  arch/powerpc/configs/52xx/tqm5200_defconfig  |   20 ++-
 768  arch/powerpc/platforms/52xx/mpc5200_simple.c |    1 +
 769  3 files changed, 249 insertions(+), 8 deletions(-)
 770  create mode 100644 arch/powerpc/boot/dts/charon.dts
 771 Merging galak/next
 772 $ git merge galak/next
 773 Already up-to-date.
 774 Merging s390/features
 775 $ git merge s390/features
 776 Merge made by recursive.
 777  arch/s390/kernel/early.c        |   14 ++++++++------
 778  drivers/s390/block/dasd_ioctl.c |   10 +++++++---
 779  drivers/s390/cio/ccwreq.c       |   23 ++++++++++++++++++++---
 780  3 files changed, 35 insertions(+), 12 deletions(-)
 781 Merging sh/sh-latest
 782 $ git merge sh/sh-latest
 783 Merge made by recursive.
 784  arch/sh/boards/mach-ecovec24/setup.c |    4 ++++
 785  1 files changed, 4 insertions(+), 0 deletions(-)
 786 Merging rmobile/rmobile-latest
 787 $ git merge rmobile/rmobile-latest
 788 Already up-to-date.
 789 Merging sparc/master
 790 $ git merge sparc/master
 791 Already up-to-date.
 792 Merging tile/master
 793 $ git merge tile/master
 794 Merge made by recursive.
 795  arch/tile/kernel/intvec_32.S     |    2 +-
 796  arch/tile/lib/atomic_asm_32.S    |    2 +-
 797  fs/nfs/blocklayout/blocklayout.c |    1 +
 798  fs/nfs/nfs4filelayout.c          |    6 +++---
 799  4 files changed, 6 insertions(+), 5 deletions(-)
 800 Merging unicore32/unicore32
 801 $ git merge unicore32/unicore32
 802 Merge made by recursive.
 803  arch/unicore32/include/asm/bitops.h |   12 ++++++------
 804  arch/unicore32/kernel/ksyms.c       |    4 ++--
 805  arch/unicore32/lib/findbit.S        |   14 ++++++++------
 806  3 files changed, 16 insertions(+), 14 deletions(-)
 807 Merging xtensa/master
 808 $ git merge xtensa/master
 809 Already up-to-date.
 810 Merging ceph/for-next
 811 $ git merge ceph/for-next
 812 Auto-merging fs/ceph/caps.c
 813 Auto-merging fs/ceph/super.h
 814 Auto-merging include/linux/ceph/libceph.h
 815 Merge made by recursive.
 816  drivers/block/rbd.c            |    2 +-
 817  fs/ceph/addr.c                 |  192 +++++++++++++++++++++++++---------------
 818  fs/ceph/caps.c                 |    2 +-
 819  fs/ceph/ioctl.h                |   55 +++++++++++-
 820  fs/ceph/mds_client.c           |   11 ++-
 821  fs/ceph/super.c                |   23 ++++--
 822  fs/ceph/super.h                |    8 +-
 823  include/linux/ceph/libceph.h   |    4 +-
 824  include/linux/ceph/messenger.h |    3 +-
 825  net/ceph/ceph_common.c         |   47 +++++-----
 826  net/ceph/messenger.c           |   16 +++-
 827  net/ceph/mon_client.c          |   71 ++++++++-------
 828  net/ceph/msgpool.c             |   42 ++++++---
 829  net/ceph/osd_client.c          |    8 +-
 830  14 files changed, 318 insertions(+), 166 deletions(-)
 831 Merging cifs/master
 832 $ git merge cifs/master
 833 Merge made by recursive.
 834  fs/cifs/dir.c |    4 ++--
 835  1 files changed, 2 insertions(+), 2 deletions(-)
 836 Merging configfs/linux-next
 837 $ git merge configfs/linux-next
 838 Already up-to-date.
 839 Merging ecryptfs/next
 840 $ git merge ecryptfs/next
 841 Already up-to-date.
 842 Merging ext3/for_next
 843 $ git merge ext3/for_next
 844 Already up-to-date.
 845 Merging ext4/dev
 846 $ git merge ext4/dev
 847 Merge made by recursive.
 848  fs/ext4/ext4.h          |    5 +++--
 849  fs/ext4/ext4_jbd2.h     |    4 ++--
 850  fs/ext4/file.c          |   10 ++++++++++
 851  fs/ext4/inode.c         |   11 +++++++++++
 852  fs/ext4/super.c         |    7 ++++---
 853  fs/jbd2/transaction.c   |   42 +++++++++++++++++++++++++++++++++++++-----
 854  include/linux/ext2_fs.h |    4 ++--
 855  include/linux/ext3_fs.h |    4 ++--
 856  8 files changed, 71 insertions(+), 16 deletions(-)
 857 Merging fatfs/master
 858 $ git merge fatfs/master
 859 Already up-to-date.
 860 Merging fuse/for-next
 861 $ git merge fuse/for-next
 862 Auto-merging fs/fuse/file.c
 863 Auto-merging fs/fuse/fuse_i.h
 864 Auto-merging fs/fuse/inode.c
 865 Merge made by recursive.
 866  fs/fuse/file.c       |   84 ++++++++------------------------------------------
 867  fs/fuse/fuse_i.h     |    8 ++++-
 868  fs/fuse/inode.c      |   10 +++++-
 869  include/linux/fuse.h |    9 +++++-
 870  4 files changed, 36 insertions(+), 75 deletions(-)
 871 Merging gfs2/master
 872 $ git merge gfs2/master
 873 Auto-merging fs/gfs2/acl.c
 874 Merge made by recursive.
 875  fs/gfs2/acl.c    |    5 +-
 876  fs/gfs2/aops.c   |    6 ---
 877  fs/gfs2/dir.c    |   42 +++++---------------
 878  fs/gfs2/file.c   |   37 +++++++++++++-----
 879  fs/gfs2/glops.c  |   29 +++++++++++---
 880  fs/gfs2/incore.h |    1 +
 881  fs/gfs2/inode.c  |   49 ++++++++---------------
 882  fs/gfs2/inode.h  |    2 +-
 883  fs/gfs2/quota.c  |   13 +-----
 884  fs/gfs2/super.c  |  111 +++++++++++++++++++++++++++++++++++-------------------
 885  fs/gfs2/xattr.c  |    5 +-
 886  11 files changed, 157 insertions(+), 143 deletions(-)
 887 Merging hfsplus/for-next
 888 $ git merge hfsplus/for-next
 889 Already up-to-date.
 890 Merging jfs/next
 891 $ git merge jfs/next
 892 Already up-to-date.
 893 Merging logfs/master
 894 $ git merge logfs/master
 895 Auto-merging fs/logfs/logfs.h
 896 Merge made by recursive.
 897  fs/logfs/dev_mtd.c   |   26 ++++++++++++--------------
 898  fs/logfs/logfs.h     |    1 +
 899  fs/logfs/readwrite.c |    4 ++++
 900  fs/logfs/segment.c   |   14 ++++++++++----
 901  fs/logfs/super.c     |    1 +
 902  5 files changed, 28 insertions(+), 18 deletions(-)
 903 Merging nfs/linux-next
 904 $ git merge nfs/linux-next
 905 Merge made by recursive.
 906  fs/nfs/callback.h                   |    2 +-
 907  fs/nfs/callback_proc.c              |   25 +++++++++++++++++++------
 908  fs/nfs/callback_xdr.c               |   24 +++++++-----------------
 909  fs/nfs/objlayout/objio_osd.c        |   28 ++++++++++++----------------
 910  fs/nfs/objlayout/pnfs_osd_xdr_cli.c |    3 +++
 911  5 files changed, 42 insertions(+), 40 deletions(-)
 912 Merging nfsd/nfsd-next
 913 $ git merge nfsd/nfsd-next
 914 Already up-to-date.
 915 Merging nilfs2/for-next
 916 $ git merge nilfs2/for-next
 917 Already up-to-date.
 918 Merging ocfs2/linux-next
 919 $ git merge ocfs2/linux-next
 920 Auto-merging fs/ocfs2/move_extents.c
 921 Auto-merging fs/ocfs2/super.c
 922 Merge made by recursive.
 923  fs/ocfs2/dlmglue.c      |   21 +++++++++++++++------
 924  fs/ocfs2/ioctl.c        |    8 ++++----
 925  fs/ocfs2/move_extents.c |    2 +-
 926  fs/ocfs2/ocfs2.h        |    4 ++--
 927  fs/ocfs2/super.c        |    3 ++-
 928  5 files changed, 24 insertions(+), 14 deletions(-)
 929 Merging omfs/for-next
 930 $ git merge omfs/for-next
 931 Already up-to-date.
 932 Merging squashfs/master
 933 $ git merge squashfs/master
 934 Already up-to-date.
 935 Merging udf/for_next
 936 $ git merge udf/for_next
 937 Already up-to-date.
 938 Merging v9fs/for-next
 939 $ git merge v9fs/for-next
 940 Merge made by recursive.
 941  fs/9p/v9fs.c           |    2 -
 942  fs/9p/v9fs_vfs.h       |    4 +-
 943  fs/9p/vfs_inode.c      |   95 ++++++++++++++++++++++++++----------------------
 944  fs/9p/vfs_inode_dotl.c |   31 ++++++++++------
 945  fs/9p/vfs_super.c      |    2 +-
 946  include/net/9p/9p.h    |    6 ---
 947  net/9p/Kconfig         |    5 ---
 948  net/9p/mod.c           |    2 -
 949  net/9p/protocol.c      |    7 ----
 950  net/9p/trans_virtio.c  |   12 +++++--
 951  10 files changed, 82 insertions(+), 84 deletions(-)
 952 Merging ubifs/linux-next
 953 $ git merge ubifs/linux-next
 954 Already up-to-date.
 955 Merging xfs/master
 956 $ git merge xfs/master
 957 Auto-merging fs/xfs/xfs_linux.h
 958 Auto-merging fs/xfs/xfs_quotaops.c
 959 Auto-merging fs/xfs/xfs_trace.c
 960 Merge made by recursive.
 961  fs/xfs/Makefile                       |  117 ++++++++++++++++-----------------
 962  fs/xfs/{linux-2.6 => }/kmem.c         |    0
 963  fs/xfs/{linux-2.6 => }/kmem.h         |    0
 964  fs/xfs/{linux-2.6 => }/mrlock.h       |    0
 965  fs/xfs/{linux-2.6 => }/time.h         |    0
 966  fs/xfs/{support => }/uuid.c           |    0
 967  fs/xfs/{support => }/uuid.h           |    0
 968  fs/xfs/xfs.h                          |    3 +-
 969  fs/xfs/{linux-2.6 => }/xfs_acl.c      |    0
 970  fs/xfs/{linux-2.6 => }/xfs_aops.c     |    0
 971  fs/xfs/{linux-2.6 => }/xfs_aops.h     |    0
 972  fs/xfs/{linux-2.6 => }/xfs_buf.c      |    0
 973  fs/xfs/{linux-2.6 => }/xfs_buf.h      |    0
 974  fs/xfs/{linux-2.6 => }/xfs_discard.c  |    0
 975  fs/xfs/{linux-2.6 => }/xfs_discard.h  |    0
 976  fs/xfs/{quota => }/xfs_dquot.c        |    0
 977  fs/xfs/{quota => }/xfs_dquot.h        |    0
 978  fs/xfs/{quota => }/xfs_dquot_item.c   |    0
 979  fs/xfs/{quota => }/xfs_dquot_item.h   |    0
 980  fs/xfs/{linux-2.6 => }/xfs_export.c   |    0
 981  fs/xfs/{linux-2.6 => }/xfs_export.h   |    0
 982  fs/xfs/{linux-2.6 => }/xfs_file.c     |    0
 983  fs/xfs/{linux-2.6 => }/xfs_fs_subr.c  |    0
 984  fs/xfs/{linux-2.6 => }/xfs_globals.c  |    0
 985  fs/xfs/{linux-2.6 => }/xfs_ioctl.c    |    0
 986  fs/xfs/{linux-2.6 => }/xfs_ioctl.h    |    0
 987  fs/xfs/{linux-2.6 => }/xfs_ioctl32.c  |    0
 988  fs/xfs/{linux-2.6 => }/xfs_ioctl32.h  |    0
 989  fs/xfs/{linux-2.6 => }/xfs_iops.c     |    0
 990  fs/xfs/{linux-2.6 => }/xfs_iops.h     |    0
 991  fs/xfs/{linux-2.6 => }/xfs_linux.h    |   27 ++++----
 992  fs/xfs/{linux-2.6 => }/xfs_message.c  |    0
 993  fs/xfs/{linux-2.6 => }/xfs_message.h  |    0
 994  fs/xfs/{quota => }/xfs_qm.c           |    0
 995  fs/xfs/{quota => }/xfs_qm.h           |    0
 996  fs/xfs/{quota => }/xfs_qm_bhv.c       |    0
 997  fs/xfs/{quota => }/xfs_qm_stats.c     |    0
 998  fs/xfs/{quota => }/xfs_qm_stats.h     |    0
 999  fs/xfs/{quota => }/xfs_qm_syscalls.c  |    0
1000  fs/xfs/{quota => }/xfs_quota_priv.h   |    0
1001  fs/xfs/{linux-2.6 => }/xfs_quotaops.c |    2 +-
1002  fs/xfs/{linux-2.6 => }/xfs_stats.c    |    0
1003  fs/xfs/{linux-2.6 => }/xfs_stats.h    |    0
1004  fs/xfs/{linux-2.6 => }/xfs_super.c    |    0
1005  fs/xfs/{linux-2.6 => }/xfs_super.h    |    0
1006  fs/xfs/{linux-2.6 => }/xfs_sync.c     |    0
1007  fs/xfs/{linux-2.6 => }/xfs_sync.h     |    0
1008  fs/xfs/{linux-2.6 => }/xfs_sysctl.c   |    0
1009  fs/xfs/{linux-2.6 => }/xfs_sysctl.h   |    0
1010  fs/xfs/{linux-2.6 => }/xfs_trace.c    |    4 +-
1011  fs/xfs/{linux-2.6 => }/xfs_trace.h    |    0
1012  fs/xfs/{quota => }/xfs_trans_dquot.c  |    0
1013  fs/xfs/{linux-2.6 => }/xfs_vnode.h    |    0
1014  fs/xfs/{linux-2.6 => }/xfs_xattr.c    |    0
1015  kernel/sysctl_binary.c                |    2 +-
1016  kernel/sysctl_check.c                 |    2 +-
1017  56 files changed, 76 insertions(+), 81 deletions(-)
1018  rename fs/xfs/{linux-2.6 => }/kmem.c (100%)
1019  rename fs/xfs/{linux-2.6 => }/kmem.h (100%)
1020  rename fs/xfs/{linux-2.6 => }/mrlock.h (100%)
1021  rename fs/xfs/{linux-2.6 => }/time.h (100%)
1022  rename fs/xfs/{support => }/uuid.c (100%)
1023  rename fs/xfs/{support => }/uuid.h (100%)
1024  rename fs/xfs/{linux-2.6 => }/xfs_acl.c (100%)
1025  rename fs/xfs/{linux-2.6 => }/xfs_aops.c (100%)
1026  rename fs/xfs/{linux-2.6 => }/xfs_aops.h (100%)
1027  rename fs/xfs/{linux-2.6 => }/xfs_buf.c (100%)
1028  rename fs/xfs/{linux-2.6 => }/xfs_buf.h (100%)
1029  rename fs/xfs/{linux-2.6 => }/xfs_discard.c (100%)
1030  rename fs/xfs/{linux-2.6 => }/xfs_discard.h (100%)
1031  rename fs/xfs/{quota => }/xfs_dquot.c (100%)
1032  rename fs/xfs/{quota => }/xfs_dquot.h (100%)
1033  rename fs/xfs/{quota => }/xfs_dquot_item.c (100%)
1034  rename fs/xfs/{quota => }/xfs_dquot_item.h (100%)
1035  rename fs/xfs/{linux-2.6 => }/xfs_export.c (100%)
1036  rename fs/xfs/{linux-2.6 => }/xfs_export.h (100%)
1037  rename fs/xfs/{linux-2.6 => }/xfs_file.c (100%)
1038  rename fs/xfs/{linux-2.6 => }/xfs_fs_subr.c (100%)
1039  rename fs/xfs/{linux-2.6 => }/xfs_globals.c (100%)
1040  rename fs/xfs/{linux-2.6 => }/xfs_ioctl.c (100%)
1041  rename fs/xfs/{linux-2.6 => }/xfs_ioctl.h (100%)
1042  rename fs/xfs/{linux-2.6 => }/xfs_ioctl32.c (100%)
1043  rename fs/xfs/{linux-2.6 => }/xfs_ioctl32.h (100%)
1044  rename fs/xfs/{linux-2.6 => }/xfs_iops.c (100%)
1045  rename fs/xfs/{linux-2.6 => }/xfs_iops.h (100%)
1046  rename fs/xfs/{linux-2.6 => }/xfs_linux.h (96%)
1047  rename fs/xfs/{linux-2.6 => }/xfs_message.c (100%)
1048  rename fs/xfs/{linux-2.6 => }/xfs_message.h (100%)
1049  rename fs/xfs/{quota => }/xfs_qm.c (100%)
1050  rename fs/xfs/{quota => }/xfs_qm.h (100%)
1051  rename fs/xfs/{quota => }/xfs_qm_bhv.c (100%)
1052  rename fs/xfs/{quota => }/xfs_qm_stats.c (100%)
1053  rename fs/xfs/{quota => }/xfs_qm_stats.h (100%)
1054  rename fs/xfs/{quota => }/xfs_qm_syscalls.c (100%)
1055  rename fs/xfs/{quota => }/xfs_quota_priv.h (100%)
1056  rename fs/xfs/{linux-2.6 => }/xfs_quotaops.c (99%)
1057  rename fs/xfs/{linux-2.6 => }/xfs_stats.c (100%)
1058  rename fs/xfs/{linux-2.6 => }/xfs_stats.h (100%)
1059  rename fs/xfs/{linux-2.6 => }/xfs_super.c (100%)
1060  rename fs/xfs/{linux-2.6 => }/xfs_super.h (100%)
1061  rename fs/xfs/{linux-2.6 => }/xfs_sync.c (100%)
1062  rename fs/xfs/{linux-2.6 => }/xfs_sync.h (100%)
1063  rename fs/xfs/{linux-2.6 => }/xfs_sysctl.c (100%)
1064  rename fs/xfs/{linux-2.6 => }/xfs_sysctl.h (100%)
1065  rename fs/xfs/{linux-2.6 => }/xfs_trace.c (96%)
1066  rename fs/xfs/{linux-2.6 => }/xfs_trace.h (100%)
1067  rename fs/xfs/{quota => }/xfs_trans_dquot.c (100%)
1068  rename fs/xfs/{linux-2.6 => }/xfs_vnode.h (100%)
1069  rename fs/xfs/{linux-2.6 => }/xfs_xattr.c (100%)
1070 $ git am -3 ../patches/xfs_fix_tracing_build.patch
1071 Applying: xfs: fix tracing builds inside the source tree
1072 $ git reset HEAD^
1073 Unstaged changes after reset:
1074 M       fs/xfs/Makefile
1075 $ git add .
1076 $ git commit -v -a --amend
1077 [master 23d3ad9] Merge remote-tracking branch 'xfs/master'
1078 Merging vfs/for-next
1079 $ git merge vfs/for-next
1080 Already up-to-date.
1081 Merging vfs-scale/vfs-scale-working
1082 $ git merge vfs-scale/vfs-scale-working
1083 Already up-to-date.
1084 Merging pci/linux-next
1085 $ git merge pci/linux-next
1086 Already up-to-date.
1087 Merging hid/for-next
1088 $ git merge hid/for-next
1089 Merge made by recursive.
1090  .../ABI/testing/sysfs-driver-hid-logitech-lg4ff    |    7 +
1091  drivers/hid/Kconfig                                |   19 +-
1092  drivers/hid/Makefile                               |    2 +-
1093  drivers/hid/hid-apple.c                            |    9 +
1094  drivers/hid/hid-axff.c                             |   36 ++-
1095  drivers/hid/hid-core.c                             |   50 ++-
1096  drivers/hid/hid-debug.c                            |    5 +
1097  drivers/hid/hid-ids.h                              |    7 +
1098  drivers/hid/hid-lg.c                               |   29 +-
1099  drivers/hid/hid-lg.h                               |    4 +-
1100  drivers/hid/hid-lg4ff.c                            |  403 ++++++++++++++++++--
1101  drivers/hid/hid-lgff.c                             |   13 -
1102  drivers/hid/hid-magicmouse.c                       |   56 +++-
1103  drivers/hid/hid-multitouch.c                       |   15 +
1104  drivers/hid/hid-prodikeys.c                        |    8 +-
1105  drivers/hid/hid-sjoy.c                             |   68 ++--
1106  drivers/hid/hid-zydacron.c                         |    4 +-
1107  drivers/hid/usbhid/hid-quirks.c                    |    1 -
1108  include/linux/hid.h                                |    2 +
1109  19 files changed, 615 insertions(+), 123 deletions(-)
1110  create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
1111 Merging quilt/i2c
1112 $ git merge quilt/i2c
1113 Already up-to-date.
1114 Merging bjdooks-i2c/next-i2c
1115 $ git merge bjdooks-i2c/next-i2c
1116 Already up-to-date.
1117 Merging quilt/jdelvare-hwmon
1118 $ git merge quilt/jdelvare-hwmon
1119 Already up-to-date.
1120 Merging hwmon-staging/hwmon-next
1121 $ git merge hwmon-staging/hwmon-next
1122 Already up-to-date.
1123 Merging quilt/kernel-doc
1124 $ git merge quilt/kernel-doc
1125 Already up-to-date.
1126 Merging docs/docs-move
1127 $ git merge docs/docs-move
1128 Already up-to-date.
1129 Merging v4l-dvb/master
1130 $ git merge v4l-dvb/master
1131 Already up-to-date.
1132 Merging kbuild/for-next
1133 $ git merge kbuild/for-next
1134 Merge made by recursive.
1135  scripts/kconfig/menu.c  |   13 +++++--------
1136  scripts/kconfig/nconf.c |    2 --
1137  2 files changed, 5 insertions(+), 10 deletions(-)
1138 Merging kconfig/for-next
1139 $ git merge kconfig/for-next
1140 Already up-to-date!
1141 Merge made by recursive.
1142 Merging ide/master
1143 $ git merge ide/master
1144 Already up-to-date.
1145 Merging libata/NEXT
1146 $ git merge libata/NEXT
1147 Already up-to-date.
1148 Merging infiniband/for-next
1149 $ git merge infiniband/for-next
1150 Merge made by recursive.
1151  drivers/infiniband/ulp/ipoib/ipoib_main.c |    8 +++++---
1152  1 files changed, 5 insertions(+), 3 deletions(-)
1153 Merging acpi/test
1154 $ git merge acpi/test
1155 Auto-merging Documentation/kernel-parameters.txt
1156 Merge made by recursive.
1157  Documentation/kernel-parameters.txt |    9 ++++++---
1158  drivers/acpi/acpica/hwxface.c       |    3 +--
1159  drivers/acpi/apei/Kconfig           |    1 +
1160  drivers/acpi/apei/apei-base.c       |    2 +-
1161  drivers/acpi/reboot.c               |    3 +--
1162  drivers/acpi/scan.c                 |    3 +--
1163  6 files changed, 11 insertions(+), 10 deletions(-)
1164 Merging idle-test/idle-test
1165 $ git merge idle-test/idle-test
1166 Already up-to-date.
1167 Merging powertools/tools-test
1168 $ git merge powertools/tools-test
1169 Already up-to-date.
1170 Merging cpupowerutils/master
1171 $ git merge cpupowerutils/master
1172 Removing tools/power/cpupower/debug/x86_64/centrino-decode.c
1173 Removing tools/power/cpupower/debug/x86_64/powernow-k8-decode.c
1174 Merge made by recursive.
1175  tools/power/cpupower/Makefile                      |    2 +-
1176  tools/power/cpupower/debug/x86_64/Makefile         |    8 +-
1177  .../power/cpupower/debug/x86_64/centrino-decode.c  |    1 -
1178  .../cpupower/debug/x86_64/powernow-k8-decode.c     |    1 -
1179  tools/power/cpupower/utils/helpers/helpers.h       |    3 +
1180  tools/power/cpupower/utils/helpers/sysfs.c         |   50 ++++++
1181  tools/power/cpupower/utils/helpers/sysfs.h         |    2 +
1182  tools/power/cpupower/utils/helpers/topology.c      |    5 +-
1183  .../cpupower/utils/idle_monitor/cpuidle_sysfs.c    |    2 +-
1184  .../cpupower/utils/idle_monitor/cpupower-monitor.c |   18 ++-
1185  .../cpupower/utils/idle_monitor/mperf_monitor.c    |  177 ++++++++++++++-----
1186  11 files changed, 210 insertions(+), 59 deletions(-)
1187  delete mode 120000 tools/power/cpupower/debug/x86_64/centrino-decode.c
1188  delete mode 120000 tools/power/cpupower/debug/x86_64/powernow-k8-decode.c
1189 Merging ieee1394/for-next
1190 $ git merge ieee1394/for-next
1191 Auto-merging drivers/firewire/core-device.c
1192 Merge made by recursive.
1193  drivers/firewire/core-device.c |   15 ++++++++++-----
1194  1 files changed, 10 insertions(+), 5 deletions(-)
1195 Merging ubi/linux-next
1196 $ git merge ubi/linux-next
1197 Already up-to-date.
1198 Merging dlm/next
1199 $ git merge dlm/next
1200 Already up-to-date.
1201 Merging swiotlb/master
1202 $ git merge swiotlb/master
1203 Merge made by recursive.
1204 Merging ibft/master
1205 $ git merge ibft/master
1206 Merge made by recursive.
1207 Merging scsi/master
1208 $ git merge scsi/master
1209 Already up-to-date.
1210 Merging iscsi-target/for-next
1211 $ git merge iscsi-target/for-next
1212 Already up-to-date.
1213 Merging slave-dma/next
1214 $ git merge slave-dma/next
1215 Merge made by recursive.
1216  drivers/dma/dmatest.c     |    6 ++++++
1217  drivers/dma/mxs-dma.c     |   45 ++++++++++++++++++++++++---------------------
1218  include/linux/dmaengine.h |   13 +++++++++++--
1219  3 files changed, 41 insertions(+), 23 deletions(-)
1220 Merging async_tx/next
1221 $ git merge async_tx/next
1222 Already up-to-date.
1223 Merging net/master
1224 $ git merge net/master
1225 Auto-merging MAINTAINERS
1226 Removing drivers/net/arm/Kconfig
1227 Removing drivers/net/arm/Makefile
1228 Removing drivers/net/benet/Kconfig
1229 Removing drivers/net/bna/bfi_ctreg.h
1230 Removing drivers/net/bna/bfi_ll.h
1231 Removing drivers/net/bna/bna_ctrl.c
1232 Removing drivers/net/bna/bna_hw.h
1233 Removing drivers/net/bna/bna_txrx.c
1234 Auto-merging drivers/net/ethernet/8390/axnet_cs.c
1235 Auto-merging drivers/net/ethernet/8390/etherh.c
1236 Auto-merging drivers/net/ethernet/8390/pcnet_cs.c
1237 Auto-merging drivers/net/ethernet/broadcom/cnic.c
1238 Auto-merging drivers/net/ethernet/brocade/bna/Makefile
1239 Auto-merging drivers/net/ethernet/brocade/bna/bfa_cee.c
1240 Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs.h
1241 Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
1242 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.c
1243 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.h
1244 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
1245 Auto-merging drivers/net/ethernet/brocade/bna/bfi.h
1246 Auto-merging drivers/net/ethernet/brocade/bna/bna.h
1247 Auto-merging drivers/net/ethernet/brocade/bna/bna_types.h
1248 Auto-merging drivers/net/ethernet/brocade/bna/bnad.c
1249 Auto-merging drivers/net/ethernet/brocade/bna/bnad.h
1250 Auto-merging drivers/net/ethernet/brocade/bna/bnad_ethtool.c
1251 Auto-merging drivers/net/ethernet/brocade/bna/cna.h
1252 Auto-merging drivers/net/ethernet/dec/tulip/Kconfig
1253 Auto-merging drivers/net/ethernet/emulex/benet/be.h
1254 Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.c
1255 Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.h
1256 Auto-merging drivers/net/ethernet/emulex/benet/be_ethtool.c
1257 Auto-merging drivers/net/ethernet/emulex/benet/be_hw.h
1258 Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
1259 Auto-merging drivers/net/ethernet/freescale/fs_enet/Kconfig
1260 Auto-merging drivers/net/ethernet/freescale/ucc_geth.c
1261 Auto-merging drivers/net/ethernet/ibm/emac/Kconfig
1262 Auto-merging drivers/net/ethernet/icplus/ipg.c
1263 Auto-merging drivers/net/ethernet/intel/e1000e/Makefile
1264 Auto-merging drivers/net/ethernet/octeon/Kconfig
1265 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic.h
1266 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
1267 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
1268 Auto-merging drivers/net/ethernet/qlogic/qla3xxx.c
1269 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
1270 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
1271 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
1272 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
1273 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
1274 Auto-merging drivers/net/ethernet/sfc/Kconfig
1275 Auto-merging drivers/net/ethernet/smsc/smsc911x.c
1276 Auto-merging drivers/net/ethernet/stmicro/stmmac/Kconfig
1277 Auto-merging drivers/net/ethernet/sun/sungem.c
1278 Auto-merging drivers/net/ethernet/toshiba/spider_net.c
1279 Auto-merging drivers/net/ethernet/toshiba/spider_net.h
1280 Auto-merging drivers/net/ethernet/via/via-velocity.c
1281 Auto-merging drivers/net/ethernet/xscale/ixp2000/Kconfig
1282 Removing drivers/net/octeon/Makefile
1283 Removing drivers/net/pci-skeleton.c
1284 Auto-merging include/linux/sungem_phy.h
1285 Auto-merging net/ipv4/route.c
1286 Merge made by recursive.
1287  Documentation/devicetree/bindings/net/smsc911x.txt |   38 +
1288  MAINTAINERS                                        |  158 +-
1289  arch/s390/include/asm/qdio.h                       |   78 +-
1290  drivers/infiniband/hw/cxgb3/Makefile               |    2 +-
1291  drivers/infiniband/hw/cxgb4/Makefile               |    2 +-
1292  drivers/infiniband/hw/mlx4/Kconfig                 |    3 +-
1293  drivers/net/Kconfig                                | 2829 +-------------
1294  drivers/net/Makefile                               |  235 +--
1295  drivers/net/arm/Kconfig                            |   74 -
1296  drivers/net/arm/Makefile                           |   14 -
1297  drivers/net/benet/Kconfig                          |    6 -
1298  drivers/net/bna/bfi_ctreg.h                        |  646 ---
1299  drivers/net/bna/bfi_ll.h                           |  438 --
1300  drivers/net/bna/bna_ctrl.c                         | 3076 --------------
1301  drivers/net/bna/bna_hw.h                           | 1490 -------
1302  drivers/net/bna/bna_txrx.c                         | 4185 --------------------
1303  drivers/net/bonding/bond_main.c                    |    9 +
1304  drivers/net/{ => ethernet/3com}/3c501.c            |    0
1305  drivers/net/{ => ethernet/3com}/3c501.h            |    0
1306  drivers/net/{ => ethernet/3com}/3c509.c            |    0
1307  drivers/net/{ => ethernet/3com}/3c515.c            |    0
1308  drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c   |    0
1309  drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c   |    0
1310  drivers/net/{ => ethernet/3com}/3c59x.c            |    0
1311  drivers/net/ethernet/3com/Kconfig                  |  120 +
1312  drivers/net/ethernet/3com/Makefile                 |   11 +
1313  drivers/net/{ => ethernet/3com}/typhoon.c          |    0
1314  drivers/net/{ => ethernet/3com}/typhoon.h          |    0
1315  drivers/net/{ => ethernet/8390}/3c503.c            |    0
1316  drivers/net/{ => ethernet/8390}/3c503.h            |    0
1317  drivers/net/{ => ethernet/8390}/8390.c             |    0
1318  drivers/net/{ => ethernet/8390}/8390.h             |    0
1319  drivers/net/{ => ethernet/8390}/8390p.c            |    0
1320  drivers/net/ethernet/8390/Kconfig                  |  336 ++
1321  drivers/net/ethernet/8390/Makefile                 |   29 +
1322  drivers/net/{ => ethernet/8390}/ac3200.c           |    0
1323  drivers/net/{ => ethernet/8390}/apne.c             |    0
1324  drivers/net/{ => ethernet/8390}/ax88796.c          |    0
1325  drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c   |    2 +-
1326  drivers/net/{ => ethernet/8390}/e2100.c            |    0
1327  drivers/net/{ => ethernet/8390}/es3210.c           |    0
1328  drivers/net/{arm => ethernet/8390}/etherh.c        |    2 +-
1329  drivers/net/{ => ethernet/8390}/hp-plus.c          |    0
1330  drivers/net/{ => ethernet/8390}/hp.c               |    0
1331  drivers/net/{ => ethernet/8390}/hydra.c            |    0
1332  drivers/net/{ => ethernet/8390}/lib8390.c          |    0
1333  drivers/net/{ => ethernet/8390}/lne390.c           |    0
1334  drivers/net/{ => ethernet/8390}/mac8390.c          |    0
1335  drivers/net/{ => ethernet/8390}/ne-h8300.c         |    0
1336  drivers/net/{ => ethernet/8390}/ne.c               |    0
1337  drivers/net/{ => ethernet/8390}/ne2.c              |    0
1338  drivers/net/{ => ethernet/8390}/ne2k-pci.c         |    0
1339  drivers/net/{ => ethernet/8390}/ne3210.c           |    0
1340  drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c   |    2 +-
1341  drivers/net/{ => ethernet/8390}/smc-mca.c          |    0
1342  drivers/net/{ => ethernet/8390}/smc-ultra.c        |    0
1343  drivers/net/{ => ethernet/8390}/smc-ultra32.c      |    0
1344  drivers/net/{ => ethernet/8390}/stnic.c            |    0
1345  drivers/net/{ => ethernet/8390}/wd.c               |    0
1346  drivers/net/{ => ethernet/8390}/zorro8390.c        |    0
1347  drivers/net/ethernet/Kconfig                       |  173 +
1348  drivers/net/ethernet/Makefile                      |   74 +
1349  drivers/net/ethernet/adaptec/Kconfig               |   34 +
1350  drivers/net/ethernet/adaptec/Makefile              |    5 +
1351  drivers/net/{ => ethernet/adaptec}/starfire.c      |    0
1352  drivers/net/ethernet/adi/Kconfig                   |   68 +
1353  drivers/net/ethernet/adi/Makefile                  |    5 +
1354  drivers/net/{ => ethernet/adi}/bfin_mac.c          |    0
1355  drivers/net/{ => ethernet/adi}/bfin_mac.h          |    0
1356  drivers/net/ethernet/aeroflex/Kconfig              |   11 +
1357  drivers/net/ethernet/aeroflex/Makefile             |    5 +
1358  drivers/net/{ => ethernet/aeroflex}/greth.c        |    0
1359  drivers/net/{ => ethernet/aeroflex}/greth.h        |    0
1360  drivers/net/ethernet/alteon/Kconfig                |   47 +
1361  drivers/net/ethernet/alteon/Makefile               |    5 +
1362  drivers/net/{ => ethernet/alteon}/acenic.c         |    0
1363  drivers/net/{ => ethernet/alteon}/acenic.h         |    0
1364  drivers/net/{ => ethernet/amd}/7990.c              |    0
1365  drivers/net/{ => ethernet/amd}/7990.h              |    0
1366  drivers/net/ethernet/amd/Kconfig                   |  192 +
1367  drivers/net/ethernet/amd/Makefile                  |   20 +
1368  drivers/net/{ => ethernet/amd}/a2065.c             |    0
1369  drivers/net/{ => ethernet/amd}/a2065.h             |    0
1370  drivers/net/{arm => ethernet/amd}/am79c961a.c      |    0
1371  drivers/net/{arm => ethernet/amd}/am79c961a.h      |    0
1372  drivers/net/{ => ethernet/amd}/amd8111e.c          |    0
1373  drivers/net/{ => ethernet/amd}/amd8111e.h          |    0
1374  drivers/net/{ => ethernet/amd}/ariadne.c           |    0
1375  drivers/net/{ => ethernet/amd}/ariadne.h           |    0
1376  drivers/net/{ => ethernet/amd}/atarilance.c        |    0
1377  drivers/net/{ => ethernet/amd}/au1000_eth.c        |    0
1378  drivers/net/{ => ethernet/amd}/au1000_eth.h        |    0
1379  drivers/net/{ => ethernet/amd}/declance.c          |    0
1380  drivers/net/{ => ethernet/amd}/depca.c             |    0
1381  drivers/net/{ => ethernet/amd}/depca.h             |    0
1382  drivers/net/{ => ethernet/amd}/hplance.c           |    0
1383  drivers/net/{ => ethernet/amd}/hplance.h           |    0
1384  drivers/net/{ => ethernet/amd}/lance.c             |    0
1385  drivers/net/{ => ethernet/amd}/mvme147.c           |    0
1386  drivers/net/{ => ethernet/amd}/ni65.c              |    0
1387  drivers/net/{ => ethernet/amd}/ni65.h              |    0
1388  drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c   |    0
1389  drivers/net/{ => ethernet/amd}/pcnet32.c           |    0
1390  drivers/net/{ => ethernet/amd}/sun3lance.c         |    0
1391  drivers/net/{ => ethernet/amd}/sunlance.c          |    0
1392  drivers/net/ethernet/apple/Kconfig                 |   96 +
1393  drivers/net/ethernet/apple/Makefile                |    9 +
1394  drivers/net/{ => ethernet/apple}/bmac.c            |    0
1395  drivers/net/{ => ethernet/apple}/bmac.h            |    0
1396  drivers/net/{ => ethernet/apple}/cs89x0.c          |    0
1397  drivers/net/{ => ethernet/apple}/cs89x0.h          |    0
1398  drivers/net/{ => ethernet/apple}/mac89x0.c         |    0
1399  drivers/net/{ => ethernet/apple}/mace.c            |    0
1400  drivers/net/{ => ethernet/apple}/mace.h            |    0
1401  drivers/net/{ => ethernet/apple}/macmace.c         |    0
1402  drivers/net/ethernet/atheros/Kconfig               |   65 +
1403  drivers/net/ethernet/atheros/Makefile              |    8 +
1404  drivers/net/{ => ethernet/atheros}/atl1c/Makefile  |    0
1405  drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h   |    0
1406  .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c   |    0
1407  .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c    |    0
1408  .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h    |    0
1409  .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c  |    0
1410  drivers/net/{ => ethernet/atheros}/atl1e/Makefile  |    0
1411  drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h   |    0
1412  .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c   |    0
1413  .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c    |    0
1414  .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h    |    0
1415  .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c  |    0
1416  .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c |    0
1417  drivers/net/{ => ethernet/atheros}/atlx/Makefile   |    0
1418  drivers/net/{ => ethernet/atheros}/atlx/atl1.c     |    0
1419  drivers/net/{ => ethernet/atheros}/atlx/atl1.h     |    0
1420  drivers/net/{ => ethernet/atheros}/atlx/atl2.c     |    0
1421  drivers/net/{ => ethernet/atheros}/atlx/atl2.h     |    0
1422  drivers/net/{ => ethernet/atheros}/atlx/atlx.c     |    0
1423  drivers/net/{ => ethernet/atheros}/atlx/atlx.h     |    0
1424  drivers/net/ethernet/broadcom/Kconfig              |  119 +
1425  drivers/net/ethernet/broadcom/Makefile             |   11 +
1426  drivers/net/{ => ethernet/broadcom}/b44.c          |    0
1427  drivers/net/{ => ethernet/broadcom}/b44.h          |    0
1428  drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c |    0
1429  drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h |    0
1430  drivers/net/{ => ethernet/broadcom}/bnx2.c         |    0
1431  drivers/net/{ => ethernet/broadcom}/bnx2.h         |    0
1432  drivers/net/{ => ethernet/broadcom}/bnx2_fw.h      |    0
1433  drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile |    0
1434  drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h  |    0
1435  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c  |    0
1436  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h  |    0
1437  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c  |    0
1438  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h  |    0
1439  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h |    0
1440  .../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c  |    0
1441  .../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h  |    0
1442  .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h            |    0
1443  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h  |    0
1444  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h |    0
1445  .../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h |    0
1446  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c |    0
1447  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h |    0
1448  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c |    0
1449  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h  |    0
1450  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c   |    0
1451  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h   |    0
1452  .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c    |    0
1453  .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h    |    0
1454  drivers/net/{ => ethernet/broadcom}/cnic.c         |    4 +-
1455  drivers/net/{ => ethernet/broadcom}/cnic.h         |    0
1456  drivers/net/{ => ethernet/broadcom}/cnic_defs.h    |    0
1457  drivers/net/{ => ethernet/broadcom}/cnic_if.h      |    0
1458  drivers/net/{ => ethernet/broadcom}/sb1250-mac.c   |    0
1459  drivers/net/{ => ethernet/broadcom}/tg3.c          |    0
1460  drivers/net/{ => ethernet/broadcom}/tg3.h          |    0
1461  drivers/net/ethernet/brocade/Kconfig               |   22 +
1462  drivers/net/ethernet/brocade/Makefile              |    5 +
1463  drivers/net/ethernet/brocade/bna/Kconfig           |   17 +
1464  drivers/net/{ => ethernet/brocade}/bna/Makefile    |    5 +-
1465  drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c   |    3 -
1466  drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h   |    0
1467  drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h    |    0
1468  drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h  |   25 +-
1469  .../net/{ => ethernet/brocade}/bna/bfa_defs_cna.h  |    0
1470  .../{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h |   28 +-
1471  .../{ => ethernet/brocade}/bna/bfa_defs_status.h   |    0
1472  drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c   |  405 ++-
1473  drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h   |   45 +-
1474  .../net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c    |  157 +-
1475  drivers/net/ethernet/brocade/bna/bfa_msgq.c        |  669 ++++
1476  drivers/net/ethernet/brocade/bna/bfa_msgq.h        |  130 +
1477  drivers/net/{ => ethernet/brocade}/bna/bfi.h       |  195 +-
1478  drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h   |    0
1479  drivers/net/ethernet/brocade/bna/bfi_enet.h        |  901 +++++
1480  drivers/net/ethernet/brocade/bna/bfi_reg.h         |  452 +++
1481  drivers/net/{ => ethernet/brocade}/bna/bna.h       |  337 +-
1482  drivers/net/ethernet/brocade/bna/bna_enet.c        | 2129 ++++++++++
1483  drivers/net/ethernet/brocade/bna/bna_hw_defs.h     |  413 ++
1484  drivers/net/ethernet/brocade/bna/bna_tx_rx.c       | 3787 ++++++++++++++++++
1485  drivers/net/{ => ethernet/brocade}/bna/bna_types.h |  654 ++--
1486  drivers/net/{ => ethernet/brocade}/bna/bnad.c      |  643 ++--
1487  drivers/net/{ => ethernet/brocade}/bna/bnad.h      |   38 +-
1488  .../net/{ => ethernet/brocade}/bna/bnad_ethtool.c  |  384 +--
1489  drivers/net/{ => ethernet/brocade}/bna/cna.h       |   31 +-
1490  drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c |    0
1491  drivers/net/ethernet/cadence/Kconfig               |   44 +
1492  drivers/net/ethernet/cadence/Makefile              |    6 +
1493  drivers/net/{arm => ethernet/cadence}/at91_ether.c |    0
1494  drivers/net/{arm => ethernet/cadence}/at91_ether.h |    0
1495  drivers/net/{ => ethernet/cadence}/macb.c          |    0
1496  drivers/net/{ => ethernet/cadence}/macb.h          |    0
1497  drivers/net/ethernet/chelsio/Kconfig               |  106 +
1498  drivers/net/ethernet/chelsio/Makefile              |    8 +
1499  .../{chelsio => ethernet/chelsio/cxgb}/Makefile    |    0
1500  .../{chelsio => ethernet/chelsio/cxgb}/common.h    |    0
1501  .../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h  |    0
1502  .../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h  |    0
1503  .../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c |    0
1504  .../{chelsio => ethernet/chelsio/cxgb}/elmer0.h    |    0
1505  .../net/{chelsio => ethernet/chelsio/cxgb}/espi.c  |    0
1506  .../net/{chelsio => ethernet/chelsio/cxgb}/espi.h  |    0
1507  .../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h |    0
1508  .../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h  |    0
1509  .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c |    0
1510  .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h |    0
1511  .../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c |    0
1512  .../{chelsio => ethernet/chelsio/cxgb}/my3126.c    |    0
1513  .../{chelsio => ethernet/chelsio/cxgb}/pm3393.c    |    0
1514  .../net/{chelsio => ethernet/chelsio/cxgb}/regs.h  |    0
1515  .../net/{chelsio => ethernet/chelsio/cxgb}/sge.c   |    0
1516  .../net/{chelsio => ethernet/chelsio/cxgb}/sge.h   |    0
1517  .../net/{chelsio => ethernet/chelsio/cxgb}/subr.c  |    0
1518  .../chelsio/cxgb}/suni1x10gexp_regs.h              |    0
1519  .../net/{chelsio => ethernet/chelsio/cxgb}/tp.c    |    0
1520  .../net/{chelsio => ethernet/chelsio/cxgb}/tp.h    |    0
1521  .../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c   |    0
1522  .../chelsio/cxgb}/vsc7326_reg.h                    |    0
1523  drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile  |    0
1524  drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h |    0
1525  drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c |    0
1526  drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c  |    0
1527  drivers/net/{ => ethernet/chelsio}/cxgb3/common.h  |    0
1528  .../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h  |    0
1529  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h  |    0
1530  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h |    0
1531  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c  |    0
1532  .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c   |    0
1533  .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h   |    0
1534  .../chelsio}/cxgb3/firmware_exports.h              |    0
1535  drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c     |    0
1536  drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h     |    0
1537  drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c     |    0
1538  drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h    |    0
1539  drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c     |    0
1540  .../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h    |    0
1541  drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h  |    0
1542  drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c   |    0
1543  drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h  |    0
1544  drivers/net/{ => ethernet/chelsio}/cxgb3/version.h |    0
1545  drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c |    0
1546  drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c   |    0
1547  drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile  |    0
1548  drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h   |    0
1549  .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c  |    0
1550  .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h   |    0
1551  drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c     |    0
1552  drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h     |    0
1553  drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c     |    0
1554  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c   |    0
1555  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h   |    0
1556  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h  |    0
1557  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h |    0
1558  .../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h    |    0
1559  .../net/{ => ethernet/chelsio}/cxgb4vf/Makefile    |    0
1560  .../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h   |    0
1561  .../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c  |    0
1562  drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c   |    0
1563  .../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h   |    0
1564  .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h |    0
1565  .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c   |    0
1566  drivers/net/ethernet/cirrus/Kconfig                |   28 +
1567  drivers/net/ethernet/cirrus/Makefile               |    5 +
1568  drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c  |    0
1569  drivers/net/ethernet/cisco/Kconfig                 |   22 +
1570  drivers/net/ethernet/cisco/Makefile                |    5 +
1571  drivers/net/ethernet/cisco/enic/Kconfig            |    9 +
1572  drivers/net/{ => ethernet/cisco}/enic/Makefile     |    0
1573  drivers/net/{ => ethernet/cisco}/enic/cq_desc.h    |    0
1574  .../net/{ => ethernet/cisco}/enic/cq_enet_desc.h   |    0
1575  drivers/net/{ => ethernet/cisco}/enic/enic.h       |    0
1576  drivers/net/{ => ethernet/cisco}/enic/enic_dev.c   |    0
1577  drivers/net/{ => ethernet/cisco}/enic/enic_dev.h   |    0
1578  drivers/net/{ => ethernet/cisco}/enic/enic_main.c  |    0
1579  drivers/net/{ => ethernet/cisco}/enic/enic_pp.c    |    0
1580  drivers/net/{ => ethernet/cisco}/enic/enic_pp.h    |    0
1581  drivers/net/{ => ethernet/cisco}/enic/enic_res.c   |    0
1582  drivers/net/{ => ethernet/cisco}/enic/enic_res.h   |    0
1583  .../net/{ => ethernet/cisco}/enic/rq_enet_desc.h   |    0
1584  drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c    |    0
1585  drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h    |    0
1586  drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c   |    0
1587  drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h   |    0
1588  .../net/{ => ethernet/cisco}/enic/vnic_devcmd.h    |    0
1589  drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h  |    0
1590  drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c  |    0
1591  drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h  |    0
1592  drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h   |    0
1593  .../net/{ => ethernet/cisco}/enic/vnic_resource.h  |    0
1594  drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c    |    0
1595  drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h    |    0
1596  drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h   |    0
1597  drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h |    0
1598  drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c   |    0
1599  drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h   |    0
1600  drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c    |    0
1601  drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h    |    0
1602  .../net/{ => ethernet/cisco}/enic/wq_enet_desc.h   |    0
1603  drivers/net/ethernet/davicom/Kconfig               |   31 +
1604  drivers/net/ethernet/davicom/Makefile              |    5 +
1605  drivers/net/{ => ethernet/davicom}/dm9000.c        |    0
1606  drivers/net/{ => ethernet/davicom}/dm9000.h        |    0
1607  drivers/net/ethernet/dec/Kconfig                   |   36 +
1608  drivers/net/ethernet/dec/Makefile                  |    6 +
1609  drivers/net/{ => ethernet/dec}/ewrk3.c             |    0
1610  drivers/net/{ => ethernet/dec}/ewrk3.h             |    0
1611  drivers/net/{ => ethernet/dec}/tulip/21142.c       |    0
1612  drivers/net/{ => ethernet/dec}/tulip/Kconfig       |   20 +-
1613  drivers/net/{ => ethernet/dec}/tulip/Makefile      |    0
1614  drivers/net/{ => ethernet/dec}/tulip/de2104x.c     |    0
1615  drivers/net/{ => ethernet/dec}/tulip/de4x5.c       |    0
1616  drivers/net/{ => ethernet/dec}/tulip/de4x5.h       |    0
1617  drivers/net/{ => ethernet/dec}/tulip/dmfe.c        |    0
1618  drivers/net/{ => ethernet/dec}/tulip/eeprom.c      |    0
1619  drivers/net/{ => ethernet/dec}/tulip/interrupt.c   |    0
1620  drivers/net/{ => ethernet/dec}/tulip/media.c       |    0
1621  drivers/net/{ => ethernet/dec}/tulip/pnic.c        |    0
1622  drivers/net/{ => ethernet/dec}/tulip/pnic2.c       |    0
1623  drivers/net/{ => ethernet/dec}/tulip/timer.c       |    0
1624  drivers/net/{ => ethernet/dec}/tulip/tulip.h       |    0
1625  drivers/net/{ => ethernet/dec}/tulip/tulip_core.c  |    0
1626  drivers/net/{ => ethernet/dec}/tulip/uli526x.c     |    0
1627  drivers/net/{ => ethernet/dec}/tulip/winbond-840.c |    0
1628  drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c   |    0
1629  drivers/net/ethernet/dlink/Kconfig                 |   84 +
1630  drivers/net/ethernet/dlink/Makefile                |    8 +
1631  drivers/net/{ => ethernet/dlink}/de600.c           |    0
1632  drivers/net/{ => ethernet/dlink}/de600.h           |    0
1633  drivers/net/{ => ethernet/dlink}/de620.c           |    0
1634  drivers/net/{ => ethernet/dlink}/de620.h           |    0
1635  drivers/net/{ => ethernet/dlink}/dl2k.c            |    0
1636  drivers/net/{ => ethernet/dlink}/dl2k.h            |    0
1637  drivers/net/{ => ethernet/dlink}/sundance.c        |    0
1638  drivers/net/{ => ethernet}/dnet.c                  |    0
1639  drivers/net/{ => ethernet}/dnet.h                  |    0
1640  drivers/net/ethernet/emulex/Kconfig                |   22 +
1641  drivers/net/ethernet/emulex/Makefile               |    5 +
1642  drivers/net/ethernet/emulex/benet/Kconfig          |    6 +
1643  drivers/net/{ => ethernet/emulex}/benet/Makefile   |    0
1644  drivers/net/{ => ethernet/emulex}/benet/be.h       |  123 +-
1645  drivers/net/{ => ethernet/emulex}/benet/be_cmds.c  |  160 +-
1646  drivers/net/{ => ethernet/emulex}/benet/be_cmds.h  |   91 +-
1647  .../net/{ => ethernet/emulex}/benet/be_ethtool.c   |  154 +-
1648  drivers/net/{ => ethernet/emulex}/benet/be_hw.h    |   21 +-
1649  drivers/net/{ => ethernet/emulex}/benet/be_main.c  |  481 +--
1650  drivers/net/{ => ethernet}/ethoc.c                 |    0
1651  drivers/net/ethernet/faraday/Kconfig               |   38 +
1652  drivers/net/ethernet/faraday/Makefile              |    6 +
1653  drivers/net/{ => ethernet/faraday}/ftgmac100.c     |    0
1654  drivers/net/{ => ethernet/faraday}/ftgmac100.h     |    0
1655  drivers/net/{ => ethernet/faraday}/ftmac100.c      |    0
1656  drivers/net/{ => ethernet/faraday}/ftmac100.h      |    0
1657  drivers/net/{ => ethernet}/fealnx.c                |    0
1658  drivers/net/ethernet/freescale/Kconfig             |   88 +
1659  drivers/net/ethernet/freescale/Makefile            |   18 +
1660  drivers/net/{ => ethernet/freescale}/fec.c         |    0
1661  drivers/net/{ => ethernet/freescale}/fec.h         |    0
1662  drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c |    0
1663  drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h |    0
1664  .../net/{ => ethernet/freescale}/fec_mpc52xx_phy.c |    0
1665  .../net/{ => ethernet/freescale}/fs_enet/Kconfig   |    2 +-
1666  .../net/{ => ethernet/freescale}/fs_enet/Makefile  |    0
1667  drivers/net/{ => ethernet/freescale}/fs_enet/fec.h |    0
1668  .../freescale}/fs_enet/fs_enet-main.c              |    0
1669  .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h |    0
1670  .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c |    0
1671  .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c |    0
1672  .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c |    0
1673  .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c |    0
1674  .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c |    0
1675  drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c |    0
1676  drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h |    0
1677  drivers/net/{ => ethernet/freescale}/gianfar.c     |    0
1678  drivers/net/{ => ethernet/freescale}/gianfar.h     |    0
1679  .../net/{ => ethernet/freescale}/gianfar_ethtool.c |    0
1680  drivers/net/{ => ethernet/freescale}/gianfar_ptp.c |    0
1681  .../net/{ => ethernet/freescale}/gianfar_sysfs.c   |    0
1682  drivers/net/{ => ethernet/freescale}/ucc_geth.c    |   10 +-
1683  drivers/net/{ => ethernet/freescale}/ucc_geth.h    |    0
1684  .../{ => ethernet/freescale}/ucc_geth_ethtool.c    |    0
1685  drivers/net/ethernet/fujitsu/Kconfig               |   53 +
1686  drivers/net/ethernet/fujitsu/Makefile              |    7 +
1687  drivers/net/{ => ethernet/fujitsu}/at1700.c        |    0
1688  drivers/net/{ => ethernet/fujitsu}/eth16i.c        |    0
1689  .../net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c  |    0
1690  drivers/net/ethernet/hp/Kconfig                    |   31 +
1691  drivers/net/ethernet/hp/Makefile                   |    5 +
1692  drivers/net/{ => ethernet/hp}/hp100.c              |    0
1693  drivers/net/{ => ethernet/hp}/hp100.h              |    0
1694  drivers/net/{ => ethernet/i825xx}/3c505.c          |    0
1695  drivers/net/{ => ethernet/i825xx}/3c505.h          |    0
1696  drivers/net/{ => ethernet/i825xx}/3c507.c          |    0
1697  drivers/net/{ => ethernet/i825xx}/3c523.c          |    0
1698  drivers/net/{ => ethernet/i825xx}/3c523.h          |    0
1699  drivers/net/{ => ethernet/i825xx}/3c527.c          |    0
1700  drivers/net/{ => ethernet/i825xx}/3c527.h          |    0
1701  drivers/net/{ => ethernet/i825xx}/82596.c          |    0
1702  drivers/net/ethernet/i825xx/Kconfig                |  182 +
1703  drivers/net/ethernet/i825xx/Makefile               |   20 +
1704  drivers/net/{ => ethernet/i825xx}/eepro.c          |    0
1705  drivers/net/{ => ethernet/i825xx}/eexpress.c       |    0
1706  drivers/net/{ => ethernet/i825xx}/eexpress.h       |    0
1707  drivers/net/{arm => ethernet/i825xx}/ether1.c      |    0
1708  drivers/net/{arm => ethernet/i825xx}/ether1.h      |    0
1709  drivers/net/{ => ethernet/i825xx}/lasi_82596.c     |    0
1710  drivers/net/{ => ethernet/i825xx}/lib82596.c       |    0
1711  drivers/net/{ => ethernet/i825xx}/lp486e.c         |    0
1712  drivers/net/{ => ethernet/i825xx}/ni52.c           |    0
1713  drivers/net/{ => ethernet/i825xx}/ni52.h           |    0
1714  drivers/net/{ => ethernet/i825xx}/sni_82596.c      |    0
1715  drivers/net/{ => ethernet/i825xx}/sun3_82586.c     |    0
1716  drivers/net/{ => ethernet/i825xx}/sun3_82586.h     |    0
1717  drivers/net/{ => ethernet/i825xx}/znet.c           |    0
1718  drivers/net/ethernet/ibm/Kconfig                   |   47 +
1719  drivers/net/ethernet/ibm/Makefile                  |    8 +
1720  drivers/net/{ => ethernet/ibm}/ehea/Makefile       |    0
1721  drivers/net/{ => ethernet/ibm}/ehea/ehea.h         |    0
1722  drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c |    0
1723  drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h      |    0
1724  drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c    |    0
1725  drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c    |    0
1726  drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h    |    0
1727  drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c     |    0
1728  drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h     |    0
1729  .../net/{ibm_newemac => ethernet/ibm/emac}/Kconfig |   40 +-
1730  .../{ibm_newemac => ethernet/ibm/emac}/Makefile    |    0
1731  .../net/{ibm_newemac => ethernet/ibm/emac}/core.c  |    0
1732  .../net/{ibm_newemac => ethernet/ibm/emac}/core.h  |    0
1733  .../net/{ibm_newemac => ethernet/ibm/emac}/debug.c |    0
1734  .../net/{ibm_newemac => ethernet/ibm/emac}/debug.h |    0
1735  .../net/{ibm_newemac => ethernet/ibm/emac}/emac.h  |    0
1736  .../net/{ibm_newemac => ethernet/ibm/emac}/mal.c   |    0
1737  .../net/{ibm_newemac => ethernet/ibm/emac}/mal.h   |    0
1738  .../net/{ibm_newemac => ethernet/ibm/emac}/phy.c   |    0
1739  .../net/{ibm_newemac => ethernet/ibm/emac}/phy.h   |    0
1740  .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c |    0
1741  .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h |    0
1742  .../net/{ibm_newemac => ethernet/ibm/emac}/tah.c   |    0
1743  .../net/{ibm_newemac => ethernet/ibm/emac}/tah.h   |    0
1744  .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.c  |    0
1745  .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.h  |    0
1746  drivers/net/{ => ethernet/ibm}/ibmveth.c           |    0
1747  drivers/net/{ => ethernet/ibm}/ibmveth.h           |    0
1748  drivers/net/{ => ethernet/ibm}/iseries_veth.c      |    0
1749  drivers/net/ethernet/icplus/Kconfig                |   13 +
1750  drivers/net/ethernet/icplus/Makefile               |    5 +
1751  drivers/net/{ => ethernet/icplus}/ipg.c            |  197 +-
1752  drivers/net/{ => ethernet/icplus}/ipg.h            |    0
1753  drivers/net/ethernet/intel/Kconfig                 |  220 +
1754  drivers/net/ethernet/intel/Makefile                |   12 +
1755  drivers/net/{ => ethernet/intel}/e100.c            |    0
1756  drivers/net/{ => ethernet/intel}/e1000/Makefile    |    0
1757  drivers/net/{ => ethernet/intel}/e1000/e1000.h     |    0
1758  .../net/{ => ethernet/intel}/e1000/e1000_ethtool.c |    0
1759  drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c  |    0
1760  drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h  |    0
1761  .../net/{ => ethernet/intel}/e1000/e1000_main.c    |    0
1762  .../net/{ => ethernet/intel}/e1000/e1000_osdep.h   |    0
1763  .../net/{ => ethernet/intel}/e1000/e1000_param.c   |    0
1764  .../intel/e1000e/80003es2lan.c}                    |    0
1765  drivers/net/{ => ethernet/intel}/e1000e/82571.c    |    0
1766  drivers/net/{ => ethernet/intel}/e1000e/Makefile   |    2 +-
1767  drivers/net/{ => ethernet/intel}/e1000e/defines.h  |    0
1768  drivers/net/{ => ethernet/intel}/e1000e/e1000.h    |    0
1769  drivers/net/{ => ethernet/intel}/e1000e/ethtool.c  |    0
1770  drivers/net/{ => ethernet/intel}/e1000e/hw.h       |    0
1771  drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c  |    0
1772  drivers/net/{ => ethernet/intel}/e1000e/lib.c      |    0
1773  drivers/net/{ => ethernet/intel}/e1000e/netdev.c   |    0
1774  drivers/net/{ => ethernet/intel}/e1000e/param.c    |    0
1775  drivers/net/{ => ethernet/intel}/e1000e/phy.c      |    0
1776  drivers/net/{ => ethernet/intel}/igb/Makefile      |    0
1777  drivers/net/{ => ethernet/intel}/igb/e1000_82575.c |    0
1778  drivers/net/{ => ethernet/intel}/igb/e1000_82575.h |    0
1779  .../net/{ => ethernet/intel}/igb/e1000_defines.h   |    0
1780  drivers/net/{ => ethernet/intel}/igb/e1000_hw.h    |    0
1781  drivers/net/{ => ethernet/intel}/igb/e1000_mac.c   |    0
1782  drivers/net/{ => ethernet/intel}/igb/e1000_mac.h   |    0
1783  drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c   |    0
1784  drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h   |    0
1785  drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c   |    0
1786  drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h   |    0
1787  drivers/net/{ => ethernet/intel}/igb/e1000_phy.c   |    0
1788  drivers/net/{ => ethernet/intel}/igb/e1000_phy.h   |    0
1789  drivers/net/{ => ethernet/intel}/igb/e1000_regs.h  |    0
1790  drivers/net/{ => ethernet/intel}/igb/igb.h         |    0
1791  drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c |    0
1792  drivers/net/{ => ethernet/intel}/igb/igb_main.c    |    0
1793  drivers/net/{ => ethernet/intel}/igbvf/Makefile    |    0
1794  drivers/net/{ => ethernet/intel}/igbvf/defines.h   |    0
1795  drivers/net/{ => ethernet/intel}/igbvf/ethtool.c   |    0
1796  drivers/net/{ => ethernet/intel}/igbvf/igbvf.h     |    0
1797  drivers/net/{ => ethernet/intel}/igbvf/mbx.c       |    0
1798  drivers/net/{ => ethernet/intel}/igbvf/mbx.h       |    0
1799  drivers/net/{ => ethernet/intel}/igbvf/netdev.c    |    0
1800  drivers/net/{ => ethernet/intel}/igbvf/regs.h      |    0
1801  drivers/net/{ => ethernet/intel}/igbvf/vf.c        |    0
1802  drivers/net/{ => ethernet/intel}/igbvf/vf.h        |    0
1803  drivers/net/{ => ethernet/intel}/ixgb/Makefile     |    0
1804  drivers/net/{ => ethernet/intel}/ixgb/ixgb.h       |    0
1805  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c    |    0
1806  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h    |    0
1807  .../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c   |    0
1808  drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c    |    0
1809  drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h    |    0
1810  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h   |    0
1811  drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c  |    0
1812  drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h |    0
1813  drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c |    0
1814  drivers/net/{ => ethernet/intel}/ixgbe/Makefile    |    0
1815  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h     |    0
1816  .../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c   |    0
1817  .../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c   |    0
1818  .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c  |    0
1819  .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h  |    0
1820  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c |    0
1821  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h |    0
1822  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c   |    0
1823  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h   |    0
1824  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c   |    0
1825  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h   |    0
1826  .../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c  |    0
1827  .../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c |    0
1828  .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c    |    0
1829  .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h    |    0
1830  .../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c    |    0
1831  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c |    0
1832  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h |    0
1833  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c |    0
1834  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h |    0
1835  .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c   |    0
1836  .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h   |    0
1837  .../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h    |    0
1838  .../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c    |    0
1839  drivers/net/{ => ethernet/intel}/ixgbevf/Makefile  |    0
1840  drivers/net/{ => ethernet/intel}/ixgbevf/defines.h |    0
1841  drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c |    0
1842  drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h |    0
1843  .../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c    |    0
1844  drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c     |    0
1845  drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h     |    0
1846  drivers/net/{ => ethernet/intel}/ixgbevf/regs.h    |    0
1847  drivers/net/{ => ethernet/intel}/ixgbevf/vf.c      |    0
1848  drivers/net/{ => ethernet/intel}/ixgbevf/vf.h      |    0
1849  drivers/net/{ => ethernet}/jme.c                   |    0
1850  drivers/net/{ => ethernet}/jme.h                   |    0
1851  drivers/net/{ => ethernet}/korina.c                |    0
1852  drivers/net/{ => ethernet}/lantiq_etop.c           |    0
1853  drivers/net/ethernet/marvell/Kconfig               |  110 +
1854  drivers/net/ethernet/marvell/Makefile              |    8 +
1855  drivers/net/{ => ethernet/marvell}/mv643xx_eth.c   |    0
1856  drivers/net/{ => ethernet/marvell}/pxa168_eth.c    |    0
1857  drivers/net/{ => ethernet/marvell}/skge.c          |    0
1858  drivers/net/{ => ethernet/marvell}/skge.h          |    0
1859  drivers/net/{ => ethernet/marvell}/sky2.c          |    0
1860  drivers/net/{ => ethernet/marvell}/sky2.h          |    0
1861  drivers/net/ethernet/mellanox/Kconfig              |   22 +
1862  drivers/net/ethernet/mellanox/Makefile             |    5 +
1863  drivers/net/ethernet/mellanox/mlx4/Kconfig         |   27 +
1864  drivers/net/{ => ethernet/mellanox}/mlx4/Makefile  |    0
1865  drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c   |    0
1866  drivers/net/{ => ethernet/mellanox}/mlx4/catas.c   |    0
1867  drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c     |    0
1868  drivers/net/{ => ethernet/mellanox}/mlx4/cq.c      |    0
1869  drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c   |    0
1870  .../net/{ => ethernet/mellanox}/mlx4/en_ethtool.c  |    0
1871  drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c |    0
1872  .../net/{ => ethernet/mellanox}/mlx4/en_netdev.c   |    0
1873  drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c |    0
1874  drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h |    0
1875  .../{ => ethernet/mellanox}/mlx4/en_resources.c    |    0
1876  drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c   |    0
1877  .../net/{ => ethernet/mellanox}/mlx4/en_selftest.c |    0
1878  drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c   |    0
1879  drivers/net/{ => ethernet/mellanox}/mlx4/eq.c      |    0
1880  drivers/net/{ => ethernet/mellanox}/mlx4/fw.c      |    0
1881  drivers/net/{ => ethernet/mellanox}/mlx4/fw.h      |    0
1882  drivers/net/{ => ethernet/mellanox}/mlx4/icm.c     |    0
1883  drivers/net/{ => ethernet/mellanox}/mlx4/icm.h     |    0
1884  drivers/net/{ => ethernet/mellanox}/mlx4/intf.c    |    0
1885  drivers/net/{ => ethernet/mellanox}/mlx4/main.c    |    0
1886  drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c     |    0
1887  drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h    |    0
1888  drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h |    0
1889  drivers/net/{ => ethernet/mellanox}/mlx4/mr.c      |    0
1890  drivers/net/{ => ethernet/mellanox}/mlx4/pd.c      |    0
1891  drivers/net/{ => ethernet/mellanox}/mlx4/port.c    |    0
1892  drivers/net/{ => ethernet/mellanox}/mlx4/profile.c |    0
1893  drivers/net/{ => ethernet/mellanox}/mlx4/qp.c      |    0
1894  drivers/net/{ => ethernet/mellanox}/mlx4/reset.c   |    0
1895  drivers/net/{ => ethernet/mellanox}/mlx4/sense.c   |    0
1896  drivers/net/{ => ethernet/mellanox}/mlx4/srq.c     |    0
1897  drivers/net/ethernet/micrel/Kconfig                |   64 +
1898  drivers/net/ethernet/micrel/Makefile               |    9 +
1899  drivers/net/{arm => ethernet/micrel}/ks8695net.c   |    0
1900  drivers/net/{arm => ethernet/micrel}/ks8695net.h   |    0
1901  drivers/net/{ => ethernet/micrel}/ks8842.c         |    0
1902  drivers/net/{ => ethernet/micrel}/ks8851.c         |    0
1903  drivers/net/{ => ethernet/micrel}/ks8851.h         |    0
1904  drivers/net/{ => ethernet/micrel}/ks8851_mll.c     |    0
1905  drivers/net/{ => ethernet/micrel}/ksz884x.c        |    0
1906  drivers/net/ethernet/microchip/Kconfig             |   37 +
1907  drivers/net/ethernet/microchip/Makefile            |    5 +
1908  drivers/net/{ => ethernet/microchip}/enc28j60.c    |    0
1909  drivers/net/{ => ethernet/microchip}/enc28j60_hw.h |    0
1910  drivers/net/{ => ethernet}/mipsnet.c               |    0
1911  drivers/net/ethernet/myricom/Kconfig               |   46 +
1912  drivers/net/ethernet/myricom/Makefile              |    5 +
1913  .../net/{ => ethernet/myricom}/myri10ge/Makefile   |    0
1914  .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c |    0
1915  .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h |    0
1916  .../myricom}/myri10ge/myri10ge_mcp_gen_header.h    |    0
1917  drivers/net/ethernet/natsemi/Kconfig               |   82 +
1918  drivers/net/ethernet/natsemi/Makefile              |   10 +
1919  drivers/net/{ => ethernet/natsemi}/ibmlana.c       |    0
1920  drivers/net/{ => ethernet/natsemi}/ibmlana.h       |    0
1921  drivers/net/{ => ethernet/natsemi}/jazzsonic.c     |    0
1922  drivers/net/{ => ethernet/natsemi}/macsonic.c      |    0
1923  drivers/net/{ => ethernet/natsemi}/natsemi.c       |    0
1924  drivers/net/{ => ethernet/natsemi}/ns83820.c       |    0
1925  drivers/net/{ => ethernet/natsemi}/sonic.c         |    0
1926  drivers/net/{ => ethernet/natsemi}/sonic.h         |    0
1927  drivers/net/{ => ethernet/natsemi}/xtsonic.c       |    0
1928  drivers/net/ethernet/neterion/Kconfig              |   54 +
1929  drivers/net/ethernet/neterion/Makefile             |    6 +
1930  drivers/net/{ => ethernet/neterion}/s2io-regs.h    |    0
1931  drivers/net/{ => ethernet/neterion}/s2io.c         |    0
1932  drivers/net/{ => ethernet/neterion}/s2io.h         |    0
1933  drivers/net/{ => ethernet/neterion}/vxge/Makefile  |    0
1934  .../net/{ => ethernet/neterion}/vxge/vxge-config.c |    0
1935  .../net/{ => ethernet/neterion}/vxge/vxge-config.h |    0
1936  .../{ => ethernet/neterion}/vxge/vxge-ethtool.c    |    0
1937  .../{ => ethernet/neterion}/vxge/vxge-ethtool.h    |    0
1938  .../net/{ => ethernet/neterion}/vxge/vxge-main.c   |    0
1939  .../net/{ => ethernet/neterion}/vxge/vxge-main.h   |    0
1940  .../net/{ => ethernet/neterion}/vxge/vxge-reg.h    |    0
1941  .../{ => ethernet/neterion}/vxge/vxge-traffic.c    |    0
1942  .../{ => ethernet/neterion}/vxge/vxge-traffic.h    |    0
1943  .../{ => ethernet/neterion}/vxge/vxge-version.h    |    0
1944  drivers/net/{ => ethernet}/netx-eth.c              |    0
1945  drivers/net/ethernet/nuvoton/Kconfig               |   29 +
1946  drivers/net/ethernet/nuvoton/Makefile              |    5 +
1947  .../net/{arm => ethernet/nuvoton}/w90p910_ether.c  |    0
1948  drivers/net/ethernet/nvidia/Kconfig                |   31 +
1949  drivers/net/ethernet/nvidia/Makefile               |    5 +
1950  drivers/net/{ => ethernet/nvidia}/forcedeth.c      |    0
1951  drivers/net/{ => ethernet}/octeon/Kconfig          |    6 +-
1952  drivers/net/ethernet/octeon/Makefile               |    5 +
1953  drivers/net/{ => ethernet}/octeon/octeon_mgmt.c    |    0
1954  drivers/net/ethernet/oki-semi/Kconfig              |   22 +
1955  drivers/net/ethernet/oki-semi/Makefile             |    5 +
1956  drivers/net/ethernet/oki-semi/pch_gbe/Kconfig      |   20 +
1957  .../net/{ => ethernet/oki-semi}/pch_gbe/Makefile   |    0
1958  .../net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h  |    0
1959  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c  |    0
1960  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h  |    0
1961  .../oki-semi}/pch_gbe/pch_gbe_ethtool.c            |    0
1962  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c |    0
1963  .../oki-semi}/pch_gbe/pch_gbe_param.c              |    0
1964  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c  |    0
1965  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h  |    0
1966  drivers/net/ethernet/packetengines/Kconfig         |   46 +
1967  drivers/net/ethernet/packetengines/Makefile        |    6 +
1968  drivers/net/{ => ethernet/packetengines}/hamachi.c |    0
1969  .../net/{ => ethernet/packetengines}/yellowfin.c   |    0
1970  drivers/net/ethernet/pasemi/Kconfig                |   29 +
1971  drivers/net/ethernet/pasemi/Makefile               |    5 +
1972  drivers/net/{ => ethernet/pasemi}/pasemi_mac.c     |    0
1973  drivers/net/{ => ethernet/pasemi}/pasemi_mac.h     |    0
1974  .../net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c |    0
1975  drivers/net/ethernet/qlogic/Kconfig                |   53 +
1976  drivers/net/ethernet/qlogic/Makefile               |    8 +
1977  drivers/net/{ => ethernet/qlogic}/netxen/Makefile  |    0
1978  .../net/{ => ethernet/qlogic}/netxen/netxen_nic.h  |    6 +
1979  .../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c  |    0
1980  .../qlogic}/netxen/netxen_nic_ethtool.c            |    0
1981  .../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h  |    0
1982  .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c   |    0
1983  .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h   |    0
1984  .../{ => ethernet/qlogic}/netxen/netxen_nic_init.c |    8 +-
1985  .../{ => ethernet/qlogic}/netxen/netxen_nic_main.c |  103 +-
1986  drivers/net/{ => ethernet/qlogic}/qla3xxx.c        |    2 +-
1987  drivers/net/{ => ethernet/qlogic}/qla3xxx.h        |    0
1988  drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile  |    0
1989  drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h  |    6 +-
1990  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c  |    0
1991  .../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c  |   22 +-
1992  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h  |    0
1993  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c   |    4 +-
1994  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c |    3 +-
1995  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c |   40 +-
1996  drivers/net/{ => ethernet/qlogic}/qlge/Makefile    |    0
1997  drivers/net/{ => ethernet/qlogic}/qlge/qlge.h      |    0
1998  drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c  |    0
1999  .../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c  |    0
2000  drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c |    0
2001  drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c  |    0
2002  drivers/net/ethernet/racal/Kconfig                 |   32 +
2003  drivers/net/ethernet/racal/Makefile                |    5 +
2004  drivers/net/{ => ethernet/racal}/ni5010.c          |    0
2005  drivers/net/{ => ethernet/racal}/ni5010.h          |    0
2006  drivers/net/ethernet/rdc/Kconfig                   |   33 +
2007  drivers/net/ethernet/rdc/Makefile                  |    5 +
2008  drivers/net/{ => ethernet/rdc}/r6040.c             |    0
2009  drivers/net/{ => ethernet/realtek}/8139cp.c        |    0
2010  drivers/net/{ => ethernet/realtek}/8139too.c       |    0
2011  drivers/net/ethernet/realtek/Kconfig               |  126 +
2012  drivers/net/ethernet/realtek/Makefile              |    9 +
2013  drivers/net/{ => ethernet/realtek}/atp.c           |    0
2014  drivers/net/{ => ethernet/realtek}/atp.h           |    0
2015  drivers/net/{ => ethernet/realtek}/r8169.c         |    0
2016  drivers/net/{ => ethernet/realtek}/sc92031.c       |    0
2017  drivers/net/ethernet/renesas/Kconfig               |   18 +
2018  drivers/net/ethernet/renesas/Makefile              |    5 +
2019  drivers/net/{ => ethernet/renesas}/sh_eth.c        |    0
2020  drivers/net/{ => ethernet/renesas}/sh_eth.h        |    0
2021  drivers/net/{ => ethernet}/s6gmac.c                |    0
2022  drivers/net/ethernet/seeq/Kconfig                  |   45 +
2023  drivers/net/ethernet/seeq/Makefile                 |    7 +
2024  drivers/net/{arm => ethernet/seeq}/ether3.c        |    0
2025  drivers/net/{arm => ethernet/seeq}/ether3.h        |    0
2026  drivers/net/{ => ethernet/seeq}/seeq8005.c         |    0
2027  drivers/net/{ => ethernet/seeq}/seeq8005.h         |    0
2028  drivers/net/{ => ethernet/seeq}/sgiseeq.c          |    0
2029  drivers/net/{ => ethernet/seeq}/sgiseeq.h          |    0
2030  drivers/net/{ => ethernet}/sfc/Kconfig             |    4 +-
2031  drivers/net/{ => ethernet}/sfc/Makefile            |    0
2032  drivers/net/{ => ethernet}/sfc/bitfield.h          |    0
2033  drivers/net/{ => ethernet}/sfc/efx.c               |    0
2034  drivers/net/{ => ethernet}/sfc/efx.h               |    0
2035  drivers/net/{ => ethernet}/sfc/enum.h              |    0
2036  drivers/net/{ => ethernet}/sfc/ethtool.c           |    0
2037  drivers/net/{ => ethernet}/sfc/falcon.c            |    0
2038  drivers/net/{ => ethernet}/sfc/falcon_boards.c     |    0
2039  drivers/net/{ => ethernet}/sfc/falcon_xmac.c       |    0
2040  drivers/net/{ => ethernet}/sfc/filter.c            |    0
2041  drivers/net/{ => ethernet}/sfc/filter.h            |    0
2042  drivers/net/{ => ethernet}/sfc/io.h                |    0
2043  drivers/net/{ => ethernet}/sfc/mac.h               |    0
2044  drivers/net/{ => ethernet}/sfc/mcdi.c              |    0
2045  drivers/net/{ => ethernet}/sfc/mcdi.h              |    0
2046  drivers/net/{ => ethernet}/sfc/mcdi_mac.c          |    0
2047  drivers/net/{ => ethernet}/sfc/mcdi_pcol.h         |    0
2048  drivers/net/{ => ethernet}/sfc/mcdi_phy.c          |    0
2049  drivers/net/{ => ethernet}/sfc/mdio_10g.c          |    0
2050  drivers/net/{ => ethernet}/sfc/mdio_10g.h          |    0
2051  drivers/net/{ => ethernet}/sfc/mtd.c               |    0
2052  drivers/net/{ => ethernet}/sfc/net_driver.h        |    0
2053  drivers/net/{ => ethernet}/sfc/nic.c               |    0
2054  drivers/net/{ => ethernet}/sfc/nic.h               |    0
2055  drivers/net/{ => ethernet}/sfc/phy.h               |    0
2056  drivers/net/{ => ethernet}/sfc/qt202x_phy.c        |    0
2057  drivers/net/{ => ethernet}/sfc/regs.h              |    0
2058  drivers/net/{ => ethernet}/sfc/rx.c                |    0
2059  drivers/net/{ => ethernet}/sfc/selftest.c          |    0
2060  drivers/net/{ => ethernet}/sfc/selftest.h          |    0
2061  drivers/net/{ => ethernet}/sfc/siena.c             |    0
2062  drivers/net/{ => ethernet}/sfc/spi.h               |    0
2063  drivers/net/{ => ethernet}/sfc/tenxpress.c         |    0
2064  drivers/net/{ => ethernet}/sfc/tx.c                |    0
2065  drivers/net/{ => ethernet}/sfc/txc43128_phy.c      |    0
2066  drivers/net/{ => ethernet}/sfc/workarounds.h       |    0
2067  drivers/net/ethernet/sgi/Kconfig                   |   34 +
2068  drivers/net/ethernet/sgi/Makefile                  |    6 +
2069  drivers/net/{ => ethernet/sgi}/ioc3-eth.c          |    0
2070  drivers/net/{ => ethernet/sgi}/meth.c              |    0
2071  drivers/net/{ => ethernet/sgi}/meth.h              |    0
2072  drivers/net/ethernet/sis/Kconfig                   |   50 +
2073  drivers/net/ethernet/sis/Makefile                  |    6 +
2074  drivers/net/{ => ethernet/sis}/sis190.c            |    0
2075  drivers/net/{ => ethernet/sis}/sis900.c            |    0
2076  drivers/net/{ => ethernet/sis}/sis900.h            |    0
2077  drivers/net/ethernet/smsc/Kconfig                  |  131 +
2078  drivers/net/ethernet/smsc/Makefile                 |   11 +
2079  drivers/net/{ => ethernet/smsc}/epic100.c          |    0
2080  drivers/net/{ => ethernet/smsc}/smc911x.c          |    0
2081  drivers/net/{ => ethernet/smsc}/smc911x.h          |    0
2082  drivers/net/{ => ethernet/smsc}/smc9194.c          |    0
2083  drivers/net/{ => ethernet/smsc}/smc9194.h          |    0
2084  .../net/{pcmcia => ethernet/smsc}/smc91c92_cs.c    |    0
2085  drivers/net/{ => ethernet/smsc}/smc91x.c           |    0
2086  drivers/net/{ => ethernet/smsc}/smc91x.h           |    0
2087  drivers/net/{ => ethernet/smsc}/smsc911x.c         |   85 +-
2088  drivers/net/{ => ethernet/smsc}/smsc911x.h         |    0
2089  drivers/net/{ => ethernet/smsc}/smsc9420.c         |    0
2090  drivers/net/{ => ethernet/smsc}/smsc9420.h         |    0
2091  drivers/net/ethernet/stmicro/Kconfig               |   22 +
2092  drivers/net/ethernet/stmicro/Makefile              |    5 +
2093  drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig  |   14 +-
2094  drivers/net/{ => ethernet/stmicro}/stmmac/Makefile |    0
2095  drivers/net/{ => ethernet/stmicro}/stmmac/common.h |    0
2096  drivers/net/{ => ethernet/stmicro}/stmmac/descs.h  |    0
2097  .../net/{ => ethernet/stmicro}/stmmac/dwmac100.h   |    0
2098  .../net/{ => ethernet/stmicro}/stmmac/dwmac1000.h  |    0
2099  .../{ => ethernet/stmicro}/stmmac/dwmac1000_core.c |    0
2100  .../{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c  |    0
2101  .../{ => ethernet/stmicro}/stmmac/dwmac100_core.c  |    0
2102  .../{ => ethernet/stmicro}/stmmac/dwmac100_dma.c   |    0
2103  .../net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h  |    0
2104  .../net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c  |    0
2105  .../net/{ => ethernet/stmicro}/stmmac/enh_desc.c   |    0
2106  .../net/{ => ethernet/stmicro}/stmmac/norm_desc.c  |    0
2107  drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h |    0
2108  .../{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c |    0
2109  .../{ => ethernet/stmicro}/stmmac/stmmac_main.c    |    0
2110  .../{ => ethernet/stmicro}/stmmac/stmmac_mdio.c    |    0
2111  .../{ => ethernet/stmicro}/stmmac/stmmac_timer.c   |    0
2112  .../{ => ethernet/stmicro}/stmmac/stmmac_timer.h   |    0
2113  drivers/net/ethernet/sun/Kconfig                   |   87 +
2114  drivers/net/ethernet/sun/Makefile                  |   11 +
2115  drivers/net/{ => ethernet/sun}/cassini.c           |    0
2116  drivers/net/{ => ethernet/sun}/cassini.h           |    0
2117  drivers/net/{ => ethernet/sun}/niu.c               |    0
2118  drivers/net/{ => ethernet/sun}/niu.h               |    0
2119  drivers/net/{ => ethernet/sun}/sunbmac.c           |    0
2120  drivers/net/{ => ethernet/sun}/sunbmac.h           |    0
2121  drivers/net/{ => ethernet/sun}/sungem.c            |    4 +-
2122  drivers/net/{ => ethernet/sun}/sungem.h            |    0
2123  drivers/net/{ => ethernet/sun}/sunhme.c            |    0
2124  drivers/net/{ => ethernet/sun}/sunhme.h            |    0
2125  drivers/net/{ => ethernet/sun}/sunqe.c             |    0
2126  drivers/net/{ => ethernet/sun}/sunqe.h             |    0
2127  drivers/net/{ => ethernet/sun}/sunvnet.c           |    0
2128  drivers/net/{ => ethernet/sun}/sunvnet.h           |    0
2129  drivers/net/ethernet/tehuti/Kconfig                |   26 +
2130  drivers/net/ethernet/tehuti/Makefile               |    5 +
2131  drivers/net/{ => ethernet/tehuti}/tehuti.c         |    0
2132  drivers/net/{ => ethernet/tehuti}/tehuti.h         |    0
2133  drivers/net/ethernet/ti/Kconfig                    |   76 +
2134  drivers/net/ethernet/ti/Makefile                   |    9 +
2135  drivers/net/{ => ethernet/ti}/cpmac.c              |    0
2136  drivers/net/{ => ethernet/ti}/davinci_cpdma.c      |    0
2137  drivers/net/{ => ethernet/ti}/davinci_cpdma.h      |    0
2138  drivers/net/{ => ethernet/ti}/davinci_emac.c       |    0
2139  drivers/net/{ => ethernet/ti}/davinci_mdio.c       |    0
2140  drivers/net/{ => ethernet/ti}/tlan.c               |    0
2141  drivers/net/{ => ethernet/ti}/tlan.h               |    0
2142  drivers/net/ethernet/tile/Kconfig                  |   15 +
2143  drivers/net/{ => ethernet}/tile/Makefile           |    0
2144  drivers/net/{ => ethernet}/tile/tilepro.c          |    0
2145  drivers/net/ethernet/toshiba/Kconfig               |   56 +
2146  drivers/net/ethernet/toshiba/Makefile              |   10 +
2147  drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c |    0
2148  drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h |    0
2149  .../{ => ethernet/toshiba}/ps3_gelic_wireless.c    |    0
2150  .../{ => ethernet/toshiba}/ps3_gelic_wireless.h    |    0
2151  drivers/net/{ => ethernet/toshiba}/spider_net.c    |    4 +-
2152  drivers/net/{ => ethernet/toshiba}/spider_net.h    |    2 +-
2153  .../{ => ethernet/toshiba}/spider_net_ethtool.c    |    0
2154  drivers/net/{ => ethernet/toshiba}/tc35815.c       |    0
2155  drivers/net/ethernet/tundra/Kconfig                |   28 +
2156  drivers/net/ethernet/tundra/Makefile               |    5 +
2157  drivers/net/{ => ethernet/tundra}/tsi108_eth.c     |    0
2158  drivers/net/{ => ethernet/tundra}/tsi108_eth.h     |    0
2159  drivers/net/ethernet/via/Kconfig                   |   56 +
2160  drivers/net/ethernet/via/Makefile                  |    6 +
2161  drivers/net/{ => ethernet/via}/via-rhine.c         |    0
2162  drivers/net/{ => ethernet/via}/via-velocity.c      |  146 +-
2163  drivers/net/{ => ethernet/via}/via-velocity.h      |    0
2164  drivers/net/ethernet/xilinx/Kconfig                |   35 +
2165  drivers/net/ethernet/xilinx/Makefile               |    7 +
2166  drivers/net/{ => ethernet/xilinx}/ll_temac.h       |    0
2167  drivers/net/{ => ethernet/xilinx}/ll_temac_main.c  |    0
2168  drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c  |    0
2169  .../net/{ => ethernet/xilinx}/xilinx_emaclite.c    |    0
2170  drivers/net/ethernet/xircom/Kconfig                |   30 +
2171  drivers/net/ethernet/xircom/Makefile               |    5 +
2172  .../net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c   |    0
2173  drivers/net/ethernet/xscale/Kconfig                |   31 +
2174  drivers/net/ethernet/xscale/Makefile               |    6 +
2175  drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig  |    2 +-
2176  drivers/net/{ => ethernet/xscale}/ixp2000/Makefile |    0
2177  drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c  |    0
2178  drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h  |    0
2179  .../net/{ => ethernet/xscale}/ixp2000/enp2611.c    |    0
2180  .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.c    |    0
2181  .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.h    |    0
2182  .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc    |    0
2183  .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode |    0
2184  .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc    |    0
2185  .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode |    0
2186  drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c |    0
2187  drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h |    0
2188  .../{ => ethernet/xscale}/ixp2000/ixpdev_priv.h    |    0
2189  drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c |    0
2190  drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h |    0
2191  drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c  |    0
2192  drivers/net/octeon/Makefile                        |    2 -
2193  drivers/net/pci-skeleton.c                         | 1923 ---------
2194  drivers/net/pcmcia/Kconfig                         |   78 -
2195  drivers/net/pcmcia/Makefile                        |    8 -
2196  drivers/net/slip.c                                 |   29 +-
2197  drivers/net/slip.h                                 |    9 -
2198  drivers/net/sungem_phy.c                           |    7 +-
2199  drivers/net/usb/lg-vl600.c                         |   19 +
2200  drivers/s390/cio/qdio.h                            |   38 +-
2201  drivers/s390/cio/qdio_debug.c                      |    3 +
2202  drivers/s390/cio/qdio_main.c                       |  208 +-
2203  drivers/s390/cio/qdio_setup.c                      |   83 +-
2204  drivers/s390/cio/qdio_thinint.c                    |   88 +-
2205  drivers/s390/net/qeth_core.h                       |   50 +-
2206  drivers/s390/net/qeth_core_main.c                  |  777 ++++-
2207  drivers/s390/net/qeth_l2_main.c                    |    2 +-
2208  drivers/s390/net/qeth_l3.h                         |    4 +
2209  drivers/s390/net/qeth_l3_main.c                    |   88 +-
2210  drivers/s390/net/qeth_l3_sys.c                     |  110 +-
2211  drivers/scsi/bnx2fc/Kconfig                        |    3 +-
2212  drivers/scsi/bnx2fc/bnx2fc.h                       |    2 +-
2213  drivers/scsi/bnx2i/Kconfig                         |    3 +-
2214  drivers/scsi/bnx2i/bnx2i.h                         |    2 +-
2215  drivers/scsi/cxgbi/cxgb3i/Kbuild                   |    2 +-
2216  drivers/scsi/cxgbi/cxgb3i/Kconfig                  |    3 +-
2217  drivers/scsi/cxgbi/cxgb4i/Kbuild                   |    2 +-
2218  drivers/scsi/cxgbi/cxgb4i/Kconfig                  |    3 +-
2219  include/linux/if_ether.h                           |    1 +
2220  {drivers/net => include/linux}/sungem_phy.h        |    2 +-
2221  include/net/addrconf.h                             |    2 +-
2222  include/net/if_inet6.h                             |    1 +
2223  include/net/iucv/af_iucv.h                         |   52 +
2224  include/net/iucv/iucv.h                            |   36 +-
2225  net/802/garp.c                                     |    4 +-
2226  net/802/stp.c                                      |    4 +-
2227  net/8021q/vlan.c                                   |    2 +-
2228  net/bridge/netfilter/ebtable_broute.c              |    4 +-
2229  net/caif/cfmuxl.c                                  |    6 +-
2230  net/can/af_can.c                                   |    4 +-
2231  net/core/dev.c                                     |   14 +-
2232  net/core/dst.c                                     |   15 +-
2233  net/core/fib_rules.c                               |    4 +-
2234  net/core/filter.c                                  |    2 +-
2235  net/core/neighbour.c                               |   40 +-
2236  net/core/net-sysfs.c                               |    8 +-
2237  net/core/netpoll.c                                 |    4 +-
2238  net/core/rtnetlink.c                               |    1 -
2239  net/core/sock.c                                    |    4 +-
2240  net/dccp/ccids/ccid2.c                             |   84 +-
2241  net/dccp/ccids/ccid2.h                             |    6 +
2242  net/dccp/dccp.h                                    |    1 +
2243  net/dccp/feat.c                                    |  202 +-
2244  net/dccp/feat.h                                    |    1 +
2245  net/dccp/proto.c                                   |    1 -
2246  net/decnet/dn_dev.c                                |    6 +-
2247  net/ipv4/devinet.c                                 |    6 +-
2248  net/ipv4/fib_trie.c                                |   12 +-
2249  net/ipv4/gre.c                                     |    4 +-
2250  net/ipv4/igmp.c                                    |   10 +-
2251  net/ipv4/ipip.c                                    |   10 +-
2252  net/ipv4/ipmr.c                                    |    8 +-
2253  net/ipv4/netfilter/nf_nat_amanda.c                 |    4 +-
2254  net/ipv4/netfilter/nf_nat_core.c                   |   24 +-
2255  net/ipv4/netfilter/nf_nat_ftp.c                    |    4 +-
2256  net/ipv4/netfilter/nf_nat_h323.c                   |   36 +-
2257  net/ipv4/netfilter/nf_nat_irc.c                    |    4 +-
2258  net/ipv4/netfilter/nf_nat_pptp.c                   |   16 +-
2259  net/ipv4/netfilter/nf_nat_sip.c                    |   28 +-
2260  net/ipv4/netfilter/nf_nat_snmp_basic.c             |    4 +-
2261  net/ipv4/netfilter/nf_nat_standalone.c             |    6 +-
2262  net/ipv4/netfilter/nf_nat_tftp.c                   |    4 +-
2263  net/ipv4/route.c                                   |    6 +-
2264  net/ipv4/udp.c                                     |    7 +-
2265  net/ipv6/addrconf.c                                |   73 +-
2266  net/ipv6/exthdrs.c                                 |    7 +-
2267  net/ipv6/icmp.c                                    |   25 +-
2268  net/ipv6/inet6_connection_sock.c                   |    9 +-
2269  net/ipv6/ip6_tunnel.c                              |   37 +-
2270  net/ipv6/ndisc.c                                   |   31 +-
2271  net/ipv6/raw.c                                     |    8 +-
2272  net/ipv6/sit.c                                     |   12 +-
2273  net/ipv6/udp.c                                     |    2 +-
2274  net/iucv/Kconfig                                   |   14 +-
2275  net/iucv/af_iucv.c                                 |  868 ++++-
2276  net/iucv/iucv.c                                    |   23 +
2277  net/mac80211/agg-rx.c                              |    4 +-
2278  net/mac80211/cfg.c                                 |    8 +-
2279  net/mac80211/ibss.c                                |    6 +-
2280  net/mac80211/iface.c                               |    2 +-
2281  net/mac80211/mesh_pathtbl.c                        |    4 +-
2282  net/mac80211/sta_info.c                            |    8 +-
2283  net/netfilter/core.c                               |    4 +-
2284  net/netfilter/nf_conntrack_core.c                  |   12 +-
2285  net/netfilter/nf_conntrack_ecache.c                |    8 +-
2286  net/netfilter/nf_conntrack_extend.c                |    4 +-
2287  net/netfilter/nf_conntrack_helper.c                |    6 +-
2288  net/netfilter/nf_conntrack_netlink.c               |    6 +-
2289  net/netfilter/nf_log.c                             |   10 +-
2290  net/netfilter/nf_queue.c                           |    6 +-
2291  net/netfilter/nfnetlink.c                          |    6 +-
2292  net/netlabel/netlabel_domainhash.c                 |    6 +-
2293  net/netlabel/netlabel_unlabeled.c                  |    6 +-
2294  net/netlink/af_netlink.c                           |    2 +-
2295  net/phonet/af_phonet.c                             |    4 +-
2296  net/phonet/pn_dev.c                                |    6 +-
2297  net/phonet/socket.c                                |    6 +-
2298  net/socket.c                                       |    4 +-
2299  net/sunrpc/auth_gss/auth_gss.c                     |    4 +-
2300  net/xfrm/xfrm_user.c                               |    4 +-
2301  1014 files changed, 18388 insertions(+), 18082 deletions(-)
2302  create mode 100644 Documentation/devicetree/bindings/net/smsc911x.txt
2303  delete mode 100644 drivers/net/arm/Kconfig
2304  delete mode 100644 drivers/net/arm/Makefile
2305  delete mode 100644 drivers/net/benet/Kconfig
2306  delete mode 100644 drivers/net/bna/bfi_ctreg.h
2307  delete mode 100644 drivers/net/bna/bfi_ll.h
2308  delete mode 100644 drivers/net/bna/bna_ctrl.c
2309  delete mode 100644 drivers/net/bna/bna_hw.h
2310  delete mode 100644 drivers/net/bna/bna_txrx.c
2311  rename drivers/net/{ => ethernet/3com}/3c501.c (100%)
2312  rename drivers/net/{ => ethernet/3com}/3c501.h (100%)
2313  rename drivers/net/{ => ethernet/3com}/3c509.c (100%)
2314  rename drivers/net/{ => ethernet/3com}/3c515.c (100%)
2315  rename drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c (100%)
2316  rename drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c (100%)
2317  rename drivers/net/{ => ethernet/3com}/3c59x.c (100%)
2318  create mode 100644 drivers/net/ethernet/3com/Kconfig
2319  create mode 100644 drivers/net/ethernet/3com/Makefile
2320  rename drivers/net/{ => ethernet/3com}/typhoon.c (100%)
2321  rename drivers/net/{ => ethernet/3com}/typhoon.h (100%)
2322  rename drivers/net/{ => ethernet/8390}/3c503.c (100%)
2323  rename drivers/net/{ => ethernet/8390}/3c503.h (100%)
2324  rename drivers/net/{ => ethernet/8390}/8390.c (100%)
2325  rename drivers/net/{ => ethernet/8390}/8390.h (100%)
2326  rename drivers/net/{ => ethernet/8390}/8390p.c (100%)
2327  create mode 100644 drivers/net/ethernet/8390/Kconfig
2328  create mode 100644 drivers/net/ethernet/8390/Makefile
2329  rename drivers/net/{ => ethernet/8390}/ac3200.c (100%)
2330  rename drivers/net/{ => ethernet/8390}/apne.c (100%)
2331  rename drivers/net/{ => ethernet/8390}/ax88796.c (100%)
2332  rename drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c (99%)
2333  rename drivers/net/{ => ethernet/8390}/e2100.c (100%)
2334  rename drivers/net/{ => ethernet/8390}/es3210.c (100%)
2335  rename drivers/net/{arm => ethernet/8390}/etherh.c (99%)
2336  rename drivers/net/{ => ethernet/8390}/hp-plus.c (100%)
2337  rename drivers/net/{ => ethernet/8390}/hp.c (100%)
2338  rename drivers/net/{ => ethernet/8390}/hydra.c (100%)
2339  rename drivers/net/{ => ethernet/8390}/lib8390.c (100%)
2340  rename drivers/net/{ => ethernet/8390}/lne390.c (100%)
2341  rename drivers/net/{ => ethernet/8390}/mac8390.c (100%)
2342  rename drivers/net/{ => ethernet/8390}/ne-h8300.c (100%)
2343  rename drivers/net/{ => ethernet/8390}/ne.c (100%)
2344  rename drivers/net/{ => ethernet/8390}/ne2.c (100%)
2345  rename drivers/net/{ => ethernet/8390}/ne2k-pci.c (100%)
2346  rename drivers/net/{ => ethernet/8390}/ne3210.c (100%)
2347  rename drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c (99%)
2348  rename drivers/net/{ => ethernet/8390}/smc-mca.c (100%)
2349  rename drivers/net/{ => ethernet/8390}/smc-ultra.c (100%)
2350  rename drivers/net/{ => ethernet/8390}/smc-ultra32.c (100%)
2351  rename drivers/net/{ => ethernet/8390}/stnic.c (100%)
2352  rename drivers/net/{ => ethernet/8390}/wd.c (100%)
2353  rename drivers/net/{ => ethernet/8390}/zorro8390.c (100%)
2354  create mode 100644 drivers/net/ethernet/Kconfig
2355  create mode 100644 drivers/net/ethernet/Makefile
2356  create mode 100644 drivers/net/ethernet/adaptec/Kconfig
2357  create mode 100644 drivers/net/ethernet/adaptec/Makefile
2358  rename drivers/net/{ => ethernet/adaptec}/starfire.c (100%)
2359  create mode 100644 drivers/net/ethernet/adi/Kconfig
2360  create mode 100644 drivers/net/ethernet/adi/Makefile
2361  rename drivers/net/{ => ethernet/adi}/bfin_mac.c (100%)
2362  rename drivers/net/{ => ethernet/adi}/bfin_mac.h (100%)
2363  create mode 100644 drivers/net/ethernet/aeroflex/Kconfig
2364  create mode 100644 drivers/net/ethernet/aeroflex/Makefile
2365  rename drivers/net/{ => ethernet/aeroflex}/greth.c (100%)
2366  rename drivers/net/{ => ethernet/aeroflex}/greth.h (100%)
2367  create mode 100644 drivers/net/ethernet/alteon/Kconfig
2368  create mode 100644 drivers/net/ethernet/alteon/Makefile
2369  rename drivers/net/{ => ethernet/alteon}/acenic.c (100%)
2370  rename drivers/net/{ => ethernet/alteon}/acenic.h (100%)
2371  rename drivers/net/{ => ethernet/amd}/7990.c (100%)
2372  rename drivers/net/{ => ethernet/amd}/7990.h (100%)
2373  create mode 100644 drivers/net/ethernet/amd/Kconfig
2374  create mode 100644 drivers/net/ethernet/amd/Makefile
2375  rename drivers/net/{ => ethernet/amd}/a2065.c (100%)
2376  rename drivers/net/{ => ethernet/amd}/a2065.h (100%)
2377  rename drivers/net/{arm => ethernet/amd}/am79c961a.c (100%)
2378  rename drivers/net/{arm => ethernet/amd}/am79c961a.h (100%)
2379  rename drivers/net/{ => ethernet/amd}/amd8111e.c (100%)
2380  rename drivers/net/{ => ethernet/amd}/amd8111e.h (100%)
2381  rename drivers/net/{ => ethernet/amd}/ariadne.c (100%)
2382  rename drivers/net/{ => ethernet/amd}/ariadne.h (100%)
2383  rename drivers/net/{ => ethernet/amd}/atarilance.c (100%)
2384  rename drivers/net/{ => ethernet/amd}/au1000_eth.c (100%)
2385  rename drivers/net/{ => ethernet/amd}/au1000_eth.h (100%)
2386  rename drivers/net/{ => ethernet/amd}/declance.c (100%)
2387  rename drivers/net/{ => ethernet/amd}/depca.c (100%)
2388  rename drivers/net/{ => ethernet/amd}/depca.h (100%)
2389  rename drivers/net/{ => ethernet/amd}/hplance.c (100%)
2390  rename drivers/net/{ => ethernet/amd}/hplance.h (100%)
2391  rename drivers/net/{ => ethernet/amd}/lance.c (100%)
2392  rename drivers/net/{ => ethernet/amd}/mvme147.c (100%)
2393  rename drivers/net/{ => ethernet/amd}/ni65.c (100%)
2394  rename drivers/net/{ => ethernet/amd}/ni65.h (100%)
2395  rename drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c (100%)
2396  rename drivers/net/{ => ethernet/amd}/pcnet32.c (100%)
2397  rename drivers/net/{ => ethernet/amd}/sun3lance.c (100%)
2398  rename drivers/net/{ => ethernet/amd}/sunlance.c (100%)
2399  create mode 100644 drivers/net/ethernet/apple/Kconfig
2400  create mode 100644 drivers/net/ethernet/apple/Makefile
2401  rename drivers/net/{ => ethernet/apple}/bmac.c (100%)
2402  rename drivers/net/{ => ethernet/apple}/bmac.h (100%)
2403  rename drivers/net/{ => ethernet/apple}/cs89x0.c (100%)
2404  rename drivers/net/{ => ethernet/apple}/cs89x0.h (100%)
2405  rename drivers/net/{ => ethernet/apple}/mac89x0.c (100%)
2406  rename drivers/net/{ => ethernet/apple}/mace.c (100%)
2407  rename drivers/net/{ => ethernet/apple}/mace.h (100%)
2408  rename drivers/net/{ => ethernet/apple}/macmace.c (100%)
2409  create mode 100644 drivers/net/ethernet/atheros/Kconfig
2410  create mode 100644 drivers/net/ethernet/atheros/Makefile
2411  rename drivers/net/{ => ethernet/atheros}/atl1c/Makefile (100%)
2412  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h (100%)
2413  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_ethtool.c (100%)
2414  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.c (100%)
2415  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.h (100%)
2416  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_main.c (100%)
2417  rename drivers/net/{ => ethernet/atheros}/atl1e/Makefile (100%)
2418  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h (100%)
2419  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_ethtool.c (100%)
2420  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.c (100%)
2421  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.h (100%)
2422  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_main.c (100%)
2423  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_param.c (100%)
2424  rename drivers/net/{ => ethernet/atheros}/atlx/Makefile (100%)
2425  rename drivers/net/{ => ethernet/atheros}/atlx/atl1.c (100%)
2426  rename drivers/net/{ => ethernet/atheros}/atlx/atl1.h (100%)
2427  rename drivers/net/{ => ethernet/atheros}/atlx/atl2.c (100%)
2428  rename drivers/net/{ => ethernet/atheros}/atlx/atl2.h (100%)
2429  rename drivers/net/{ => ethernet/atheros}/atlx/atlx.c (100%)
2430  rename drivers/net/{ => ethernet/atheros}/atlx/atlx.h (100%)
2431  create mode 100644 drivers/net/ethernet/broadcom/Kconfig
2432  create mode 100644 drivers/net/ethernet/broadcom/Makefile
2433  rename drivers/net/{ => ethernet/broadcom}/b44.c (100%)
2434  rename drivers/net/{ => ethernet/broadcom}/b44.h (100%)
2435  rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c (100%)
2436  rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h (100%)
2437  rename drivers/net/{ => ethernet/broadcom}/bnx2.c (100%)
2438  rename drivers/net/{ => ethernet/broadcom}/bnx2.h (100%)
2439  rename drivers/net/{ => ethernet/broadcom}/bnx2_fw.h (100%)
2440  rename drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile (100%)
2441  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h (100%)
2442  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c (100%)
2443  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h (100%)
2444  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c (100%)
2445  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h (100%)
2446  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h (100%)
2447  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c (100%)
2448  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h (100%)
2449  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_file_hdr.h (100%)
2450  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h (100%)
2451  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h (100%)
2452  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h (100%)
2453  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c (100%)
2454  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h (100%)
2455  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c (100%)
2456  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h (100%)
2457  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c (100%)
2458  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h (100%)
2459  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c (100%)
2460  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h (100%)
2461  rename drivers/net/{ => ethernet/broadcom}/cnic.c (99%)
2462  rename drivers/net/{ => ethernet/broadcom}/cnic.h (100%)
2463  rename drivers/net/{ => ethernet/broadcom}/cnic_defs.h (100%)
2464  rename drivers/net/{ => ethernet/broadcom}/cnic_if.h (100%)
2465  rename drivers/net/{ => ethernet/broadcom}/sb1250-mac.c (100%)
2466  rename drivers/net/{ => ethernet/broadcom}/tg3.c (100%)
2467  rename drivers/net/{ => ethernet/broadcom}/tg3.h (100%)
2468  create mode 100644 drivers/net/ethernet/brocade/Kconfig
2469  create mode 100644 drivers/net/ethernet/brocade/Makefile
2470  create mode 100644 drivers/net/ethernet/brocade/bna/Kconfig
2471  rename drivers/net/{ => ethernet/brocade}/bna/Makefile (52%)
2472  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c (98%)
2473  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h (100%)
2474  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h (100%)
2475  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h (92%)
2476  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_cna.h (100%)
2477  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h (89%)
2478  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_status.h (100%)
2479  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c (87%)
2480  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h (88%)
2481  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c (76%)
2482  create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.c
2483  create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.h
2484  rename drivers/net/{ => ethernet/brocade}/bna/bfi.h (70%)
2485  rename drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h (100%)
2486  create mode 100644 drivers/net/ethernet/brocade/bna/bfi_enet.h
2487  create mode 100644 drivers/net/ethernet/brocade/bna/bfi_reg.h
2488  rename drivers/net/{ => ethernet/brocade}/bna/bna.h (67%)
2489  create mode 100644 drivers/net/ethernet/brocade/bna/bna_enet.c
2490  create mode 100644 drivers/net/ethernet/brocade/bna/bna_hw_defs.h
2491  create mode 100644 drivers/net/ethernet/brocade/bna/bna_tx_rx.c
2492  rename drivers/net/{ => ethernet/brocade}/bna/bna_types.h (58%)
2493  rename drivers/net/{ => ethernet/brocade}/bna/bnad.c (85%)
2494  rename drivers/net/{ => ethernet/brocade}/bna/bnad.h (89%)
2495  rename drivers/net/{ => ethernet/brocade}/bna/bnad_ethtool.c (67%)
2496  rename drivers/net/{ => ethernet/brocade}/bna/cna.h (68%)
2497  rename drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c (100%)
2498  create mode 100644 drivers/net/ethernet/cadence/Kconfig
2499  create mode 100644 drivers/net/ethernet/cadence/Makefile
2500  rename drivers/net/{arm => ethernet/cadence}/at91_ether.c (100%)
2501  rename drivers/net/{arm => ethernet/cadence}/at91_ether.h (100%)
2502  rename drivers/net/{ => ethernet/cadence}/macb.c (100%)
2503  rename drivers/net/{ => ethernet/cadence}/macb.h (100%)
2504  create mode 100644 drivers/net/ethernet/chelsio/Kconfig
2505  create mode 100644 drivers/net/ethernet/chelsio/Makefile
2506  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/Makefile (100%)
2507  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/common.h (100%)
2508  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cphy.h (100%)
2509  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h (100%)
2510  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c (100%)
2511  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/elmer0.h (100%)
2512  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.c (100%)
2513  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.h (100%)
2514  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h (100%)
2515  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/gmac.h (100%)
2516  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c (100%)
2517  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h (100%)
2518  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c (100%)
2519  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/my3126.c (100%)
2520  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/pm3393.c (100%)
2521  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/regs.h (100%)
2522  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.c (100%)
2523  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.h (100%)
2524  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/subr.c (100%)
2525  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/suni1x10gexp_regs.h (100%)
2526  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.c (100%)
2527  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.h (100%)
2528  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326.c (100%)
2529  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326_reg.h (100%)
2530  rename drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile (100%)
2531  rename drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h (100%)
2532  rename drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c (100%)
2533  rename drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c (100%)
2534  rename drivers/net/{ => ethernet/chelsio}/cxgb3/common.h (100%)
2535  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h (100%)
2536  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h (100%)
2537  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h (100%)
2538  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c (100%)
2539  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c (100%)
2540  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h (100%)
2541  rename drivers/net/{ => ethernet/chelsio}/cxgb3/firmware_exports.h (100%)
2542  rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c (100%)
2543  rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h (100%)
2544  rename drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c (100%)
2545  rename drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h (100%)
2546  rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c (100%)
2547  rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge_defs.h (100%)
2548  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h (100%)
2549  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c (100%)
2550  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h (100%)
2551  rename drivers/net/{ => ethernet/chelsio}/cxgb3/version.h (100%)
2552  rename drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c (100%)
2553  rename drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c (100%)
2554  rename drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile (100%)
2555  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h (100%)
2556  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c (100%)
2557  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h (100%)
2558  rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c (100%)
2559  rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h (100%)
2560  rename drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c (100%)
2561  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c (100%)
2562  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h (100%)
2563  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h (100%)
2564  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h (100%)
2565  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h (100%)
2566  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/Makefile (100%)
2567  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/adapter.h (100%)
2568  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c (100%)
2569  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c (100%)
2570  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h (100%)
2571  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h (100%)
2572  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c (100%)
2573  create mode 100644 drivers/net/ethernet/cirrus/Kconfig
2574  create mode 100644 drivers/net/ethernet/cirrus/Makefile
2575  rename drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c (100%)
2576  create mode 100644 drivers/net/ethernet/cisco/Kconfig
2577  create mode 100644 drivers/net/ethernet/cisco/Makefile
2578  create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig
2579  rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%)
2580  rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%)
2581  rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%)
2582  rename drivers/net/{ => ethernet/cisco}/enic/enic.h (100%)
2583  rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%)
2584  rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (100%)
2585  rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (100%)
2586  rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (100%)
2587  rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (100%)
2588  rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%)
2589  rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%)
2590  rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%)
2591  rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%)
2592  rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%)
2593  rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (100%)
2594  rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (100%)
2595  rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%)
2596  rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%)
2597  rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%)
2598  rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%)
2599  rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%)
2600  rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%)
2601  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%)
2602  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%)
2603  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%)
2604  rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%)
2605  rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%)
2606  rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%)
2607  rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%)
2608  rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%)
2609  rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%)
2610  create mode 100644 drivers/net/ethernet/davicom/Kconfig
2611  create mode 100644 drivers/net/ethernet/davicom/Makefile
2612  rename drivers/net/{ => ethernet/davicom}/dm9000.c (100%)
2613  rename drivers/net/{ => ethernet/davicom}/dm9000.h (100%)
2614  create mode 100644 drivers/net/ethernet/dec/Kconfig
2615  create mode 100644 drivers/net/ethernet/dec/Makefile
2616  rename drivers/net/{ => ethernet/dec}/ewrk3.c (100%)
2617  rename drivers/net/{ => ethernet/dec}/ewrk3.h (100%)
2618  rename drivers/net/{ => ethernet/dec}/tulip/21142.c (100%)
2619  rename drivers/net/{ => ethernet/dec}/tulip/Kconfig (96%)
2620  rename drivers/net/{ => ethernet/dec}/tulip/Makefile (100%)
2621  rename drivers/net/{ => ethernet/dec}/tulip/de2104x.c (100%)
2622  rename drivers/net/{ => ethernet/dec}/tulip/de4x5.c (100%)
2623  rename drivers/net/{ => ethernet/dec}/tulip/de4x5.h (100%)
2624  rename drivers/net/{ => ethernet/dec}/tulip/dmfe.c (100%)
2625  rename drivers/net/{ => ethernet/dec}/tulip/eeprom.c (100%)
2626  rename drivers/net/{ => ethernet/dec}/tulip/interrupt.c (100%)
2627  rename drivers/net/{ => ethernet/dec}/tulip/media.c (100%)
2628  rename drivers/net/{ => ethernet/dec}/tulip/pnic.c (100%)
2629  rename drivers/net/{ => ethernet/dec}/tulip/pnic2.c (100%)
2630  rename drivers/net/{ => ethernet/dec}/tulip/timer.c (100%)
2631  rename drivers/net/{ => ethernet/dec}/tulip/tulip.h (100%)
2632  rename drivers/net/{ => ethernet/dec}/tulip/tulip_core.c (100%)
2633  rename drivers/net/{ => ethernet/dec}/tulip/uli526x.c (100%)
2634  rename drivers/net/{ => ethernet/dec}/tulip/winbond-840.c (100%)
2635  rename drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c (100%)
2636  create mode 100644 drivers/net/ethernet/dlink/Kconfig
2637  create mode 100644 drivers/net/ethernet/dlink/Makefile
2638  rename drivers/net/{ => ethernet/dlink}/de600.c (100%)
2639  rename drivers/net/{ => ethernet/dlink}/de600.h (100%)
2640  rename drivers/net/{ => ethernet/dlink}/de620.c (100%)
2641  rename drivers/net/{ => ethernet/dlink}/de620.h (100%)
2642  rename drivers/net/{ => ethernet/dlink}/dl2k.c (100%)
2643  rename drivers/net/{ => ethernet/dlink}/dl2k.h (100%)
2644  rename drivers/net/{ => ethernet/dlink}/sundance.c (100%)
2645  rename drivers/net/{ => ethernet}/dnet.c (100%)
2646  rename drivers/net/{ => ethernet}/dnet.h (100%)
2647  create mode 100644 drivers/net/ethernet/emulex/Kconfig
2648  create mode 100644 drivers/net/ethernet/emulex/Makefile
2649  create mode 100644 drivers/net/ethernet/emulex/benet/Kconfig
2650  rename drivers/net/{ => ethernet/emulex}/benet/Makefile (100%)
2651  rename drivers/net/{ => ethernet/emulex}/benet/be.h (85%)
2652  rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.c (94%)
2653  rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.h (95%)
2654  rename drivers/net/{ => ethernet/emulex}/benet/be_ethtool.c (85%)
2655  rename drivers/net/{ => ethernet/emulex}/benet/be_hw.h (94%)
2656  rename drivers/net/{ => ethernet/emulex}/benet/be_main.c (91%)
2657  rename drivers/net/{ => ethernet}/ethoc.c (100%)
2658  create mode 100644 drivers/net/ethernet/faraday/Kconfig
2659  create mode 100644 drivers/net/ethernet/faraday/Makefile
2660  rename drivers/net/{ => ethernet/faraday}/ftgmac100.c (100%)
2661  rename drivers/net/{ => ethernet/faraday}/ftgmac100.h (100%)
2662  rename drivers/net/{ => ethernet/faraday}/ftmac100.c (100%)
2663  rename drivers/net/{ => ethernet/faraday}/ftmac100.h (100%)
2664  rename drivers/net/{ => ethernet}/fealnx.c (100%)
2665  create mode 100644 drivers/net/ethernet/freescale/Kconfig
2666  create mode 100644 drivers/net/ethernet/freescale/Makefile
2667  rename drivers/net/{ => ethernet/freescale}/fec.c (100%)
2668  rename drivers/net/{ => ethernet/freescale}/fec.h (100%)
2669  rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c (100%)
2670  rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h (100%)
2671  rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx_phy.c (100%)
2672  rename drivers/net/{ => ethernet/freescale}/fs_enet/Kconfig (91%)
2673  rename drivers/net/{ => ethernet/freescale}/fs_enet/Makefile (100%)
2674  rename drivers/net/{ => ethernet/freescale}/fs_enet/fec.h (100%)
2675  rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet-main.c (100%)
2676  rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet.h (100%)
2677  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fcc.c (100%)
2678  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fec.c (100%)
2679  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-scc.c (100%)
2680  rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-bitbang.c (100%)
2681  rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-fec.c (100%)
2682  rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c (100%)
2683  rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h (100%)
2684  rename drivers/net/{ => ethernet/freescale}/gianfar.c (100%)
2685  rename drivers/net/{ => ethernet/freescale}/gianfar.h (100%)
2686  rename drivers/net/{ => ethernet/freescale}/gianfar_ethtool.c (100%)
2687  rename drivers/net/{ => ethernet/freescale}/gianfar_ptp.c (100%)
2688  rename drivers/net/{ => ethernet/freescale}/gianfar_sysfs.c (100%)
2689  rename drivers/net/{ => ethernet/freescale}/ucc_geth.c (99%)
2690  rename drivers/net/{ => ethernet/freescale}/ucc_geth.h (100%)
2691  rename drivers/net/{ => ethernet/freescale}/ucc_geth_ethtool.c (100%)
2692  create mode 100644 drivers/net/ethernet/fujitsu/Kconfig
2693  create mode 100644 drivers/net/ethernet/fujitsu/Makefile
2694  rename drivers/net/{ => ethernet/fujitsu}/at1700.c (100%)
2695  rename drivers/net/{ => ethernet/fujitsu}/eth16i.c (100%)
2696  rename drivers/net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c (100%)
2697  create mode 100644 drivers/net/ethernet/hp/Kconfig
2698  create mode 100644 drivers/net/ethernet/hp/Makefile
2699  rename drivers/net/{ => ethernet/hp}/hp100.c (100%)
2700  rename drivers/net/{ => ethernet/hp}/hp100.h (100%)
2701  rename drivers/net/{ => ethernet/i825xx}/3c505.c (100%)
2702  rename drivers/net/{ => ethernet/i825xx}/3c505.h (100%)
2703  rename drivers/net/{ => ethernet/i825xx}/3c507.c (100%)
2704  rename drivers/net/{ => ethernet/i825xx}/3c523.c (100%)
2705  rename drivers/net/{ => ethernet/i825xx}/3c523.h (100%)
2706  rename drivers/net/{ => ethernet/i825xx}/3c527.c (100%)
2707  rename drivers/net/{ => ethernet/i825xx}/3c527.h (100%)
2708  rename drivers/net/{ => ethernet/i825xx}/82596.c (100%)
2709  create mode 100644 drivers/net/ethernet/i825xx/Kconfig
2710  create mode 100644 drivers/net/ethernet/i825xx/Makefile
2711  rename drivers/net/{ => ethernet/i825xx}/eepro.c (100%)
2712  rename drivers/net/{ => ethernet/i825xx}/eexpress.c (100%)
2713  rename drivers/net/{ => ethernet/i825xx}/eexpress.h (100%)
2714  rename drivers/net/{arm => ethernet/i825xx}/ether1.c (100%)
2715  rename drivers/net/{arm => ethernet/i825xx}/ether1.h (100%)
2716  rename drivers/net/{ => ethernet/i825xx}/lasi_82596.c (100%)
2717  rename drivers/net/{ => ethernet/i825xx}/lib82596.c (100%)
2718  rename drivers/net/{ => ethernet/i825xx}/lp486e.c (100%)
2719  rename drivers/net/{ => ethernet/i825xx}/ni52.c (100%)
2720  rename drivers/net/{ => ethernet/i825xx}/ni52.h (100%)
2721  rename drivers/net/{ => ethernet/i825xx}/sni_82596.c (100%)
2722  rename drivers/net/{ => ethernet/i825xx}/sun3_82586.c (100%)
2723  rename drivers/net/{ => ethernet/i825xx}/sun3_82586.h (100%)
2724  rename drivers/net/{ => ethernet/i825xx}/znet.c (100%)
2725  create mode 100644 drivers/net/ethernet/ibm/Kconfig
2726  create mode 100644 drivers/net/ethernet/ibm/Makefile
2727  rename drivers/net/{ => ethernet/ibm}/ehea/Makefile (100%)
2728  rename drivers/net/{ => ethernet/ibm}/ehea/ehea.h (100%)
2729  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c (100%)
2730  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h (100%)
2731  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c (100%)
2732  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c (100%)
2733  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h (100%)
2734  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c (100%)
2735  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h (100%)
2736  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Kconfig (63%)
2737  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Makefile (100%)
2738  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.c (100%)
2739  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.h (100%)
2740  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.c (100%)
2741  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.h (100%)
2742  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/emac.h (100%)
2743  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.c (100%)
2744  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.h (100%)
2745  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.c (100%)
2746  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.h (100%)
2747  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c (100%)
2748  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h (100%)
2749  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.c (100%)
2750  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.h (100%)
2751  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.c (100%)
2752  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.h (100%)
2753  rename drivers/net/{ => ethernet/ibm}/ibmveth.c (100%)
2754  rename drivers/net/{ => ethernet/ibm}/ibmveth.h (100%)
2755  rename drivers/net/{ => ethernet/ibm}/iseries_veth.c (100%)
2756  create mode 100644 drivers/net/ethernet/icplus/Kconfig
2757  create mode 100644 drivers/net/ethernet/icplus/Makefile
2758  rename drivers/net/{ => ethernet/icplus}/ipg.c (92%)
2759  rename drivers/net/{ => ethernet/icplus}/ipg.h (100%)
2760  create mode 100644 drivers/net/ethernet/intel/Kconfig
2761  create mode 100644 drivers/net/ethernet/intel/Makefile
2762  rename drivers/net/{ => ethernet/intel}/e100.c (100%)
2763  rename drivers/net/{ => ethernet/intel}/e1000/Makefile (100%)
2764  rename drivers/net/{ => ethernet/intel}/e1000/e1000.h (100%)
2765  rename drivers/net/{ => ethernet/intel}/e1000/e1000_ethtool.c (100%)
2766  rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c (100%)
2767  rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h (100%)
2768  rename drivers/net/{ => ethernet/intel}/e1000/e1000_main.c (100%)
2769  rename drivers/net/{ => ethernet/intel}/e1000/e1000_osdep.h (100%)
2770  rename drivers/net/{ => ethernet/intel}/e1000/e1000_param.c (100%)
2771  rename drivers/net/{e1000e/es2lan.c => ethernet/intel/e1000e/80003es2lan.c} (100%)
2772  rename drivers/net/{ => ethernet/intel}/e1000e/82571.c (100%)
2773  rename drivers/net/{ => ethernet/intel}/e1000e/Makefile (96%)
2774  rename drivers/net/{ => ethernet/intel}/e1000e/defines.h (100%)
2775  rename drivers/net/{ => ethernet/intel}/e1000e/e1000.h (100%)
2776  rename drivers/net/{ => ethernet/intel}/e1000e/ethtool.c (100%)
2777  rename drivers/net/{ => ethernet/intel}/e1000e/hw.h (100%)
2778  rename drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c (100%)
2779  rename drivers/net/{ => ethernet/intel}/e1000e/lib.c (100%)
2780  rename drivers/net/{ => ethernet/intel}/e1000e/netdev.c (100%)
2781  rename drivers/net/{ => ethernet/intel}/e1000e/param.c (100%)
2782  rename drivers/net/{ => ethernet/intel}/e1000e/phy.c (100%)
2783  rename drivers/net/{ => ethernet/intel}/igb/Makefile (100%)
2784  rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.c (100%)
2785  rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.h (100%)
2786  rename drivers/net/{ => ethernet/intel}/igb/e1000_defines.h (100%)
2787  rename drivers/net/{ => ethernet/intel}/igb/e1000_hw.h (100%)
2788  rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.c (100%)
2789  rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.h (100%)
2790  rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c (100%)
2791  rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h (100%)
2792  rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c (100%)
2793  rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h (100%)
2794  rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.c (100%)
2795  rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.h (100%)
2796  rename drivers/net/{ => ethernet/intel}/igb/e1000_regs.h (100%)
2797  rename drivers/net/{ => ethernet/intel}/igb/igb.h (100%)
2798  rename drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c (100%)
2799  rename drivers/net/{ => ethernet/intel}/igb/igb_main.c (100%)
2800  rename drivers/net/{ => ethernet/intel}/igbvf/Makefile (100%)
2801  rename drivers/net/{ => ethernet/intel}/igbvf/defines.h (100%)
2802  rename drivers/net/{ => ethernet/intel}/igbvf/ethtool.c (100%)
2803  rename drivers/net/{ => ethernet/intel}/igbvf/igbvf.h (100%)
2804  rename drivers/net/{ => ethernet/intel}/igbvf/mbx.c (100%)
2805  rename drivers/net/{ => ethernet/intel}/igbvf/mbx.h (100%)
2806  rename drivers/net/{ => ethernet/intel}/igbvf/netdev.c (100%)
2807  rename drivers/net/{ => ethernet/intel}/igbvf/regs.h (100%)
2808  rename drivers/net/{ => ethernet/intel}/igbvf/vf.c (100%)
2809  rename drivers/net/{ => ethernet/intel}/igbvf/vf.h (100%)
2810  rename drivers/net/{ => ethernet/intel}/ixgb/Makefile (100%)
2811  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb.h (100%)
2812  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c (100%)
2813  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h (100%)
2814  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c (100%)
2815  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c (100%)
2816  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h (100%)
2817  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h (100%)
2818  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c (100%)
2819  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h (100%)
2820  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c (100%)
2821  rename drivers/net/{ => ethernet/intel}/ixgbe/Makefile (100%)
2822  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h (100%)
2823  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c (100%)
2824  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c (100%)
2825  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.c (100%)
2826  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.h (100%)
2827  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c (100%)
2828  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h (100%)
2829  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c (100%)
2830  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h (100%)
2831  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c (100%)
2832  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h (100%)
2833  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c (100%)
2834  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c (100%)
2835  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c (100%)
2836  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h (100%)
2837  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_main.c (100%)
2838  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c (100%)
2839  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h (100%)
2840  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c (100%)
2841  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h (100%)
2842  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c (100%)
2843  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h (100%)
2844  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_type.h (100%)
2845  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c (100%)
2846  rename drivers/net/{ => ethernet/intel}/ixgbevf/Makefile (100%)
2847  rename drivers/net/{ => ethernet/intel}/ixgbevf/defines.h (100%)
2848  rename drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c (100%)
2849  rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h (100%)
2850  rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf_main.c (100%)
2851  rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c (100%)
2852  rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h (100%)
2853  rename drivers/net/{ => ethernet/intel}/ixgbevf/regs.h (100%)
2854  rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.c (100%)
2855  rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.h (100%)
2856  rename drivers/net/{ => ethernet}/jme.c (100%)
2857  rename drivers/net/{ => ethernet}/jme.h (100%)
2858  rename drivers/net/{ => ethernet}/korina.c (100%)
2859  rename drivers/net/{ => ethernet}/lantiq_etop.c (100%)
2860  create mode 100644 drivers/net/ethernet/marvell/Kconfig
2861  create mode 100644 drivers/net/ethernet/marvell/Makefile
2862  rename drivers/net/{ => ethernet/marvell}/mv643xx_eth.c (100%)
2863  rename drivers/net/{ => ethernet/marvell}/pxa168_eth.c (100%)
2864  rename drivers/net/{ => ethernet/marvell}/skge.c (100%)
2865  rename drivers/net/{ => ethernet/marvell}/skge.h (100%)
2866  rename drivers/net/{ => ethernet/marvell}/sky2.c (100%)
2867  rename drivers/net/{ => ethernet/marvell}/sky2.h (100%)
2868  create mode 100644 drivers/net/ethernet/mellanox/Kconfig
2869  create mode 100644 drivers/net/ethernet/mellanox/Makefile
2870  create mode 100644 drivers/net/ethernet/mellanox/mlx4/Kconfig
2871  rename drivers/net/{ => ethernet/mellanox}/mlx4/Makefile (100%)
2872  rename drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c (100%)
2873  rename drivers/net/{ => ethernet/mellanox}/mlx4/catas.c (100%)
2874  rename drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c (100%)
2875  rename drivers/net/{ => ethernet/mellanox}/mlx4/cq.c (100%)
2876  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c (100%)
2877  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_ethtool.c (100%)
2878  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c (100%)
2879  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_netdev.c (100%)
2880  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c (100%)
2881  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h (100%)
2882  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_resources.c (100%)
2883  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c (100%)
2884  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_selftest.c (100%)
2885  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c (100%)
2886  rename drivers/net/{ => ethernet/mellanox}/mlx4/eq.c (100%)
2887  rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.c (100%)
2888  rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.h (100%)
2889  rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.c (100%)
2890  rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.h (100%)
2891  rename drivers/net/{ => ethernet/mellanox}/mlx4/intf.c (100%)
2892  rename drivers/net/{ => ethernet/mellanox}/mlx4/main.c (100%)
2893  rename drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c (100%)
2894  rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h (100%)
2895  rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h (100%)
2896  rename drivers/net/{ => ethernet/mellanox}/mlx4/mr.c (100%)
2897  rename drivers/net/{ => ethernet/mellanox}/mlx4/pd.c (100%)
2898  rename drivers/net/{ => ethernet/mellanox}/mlx4/port.c (100%)
2899  rename drivers/net/{ => ethernet/mellanox}/mlx4/profile.c (100%)
2900  rename drivers/net/{ => ethernet/mellanox}/mlx4/qp.c (100%)
2901  rename drivers/net/{ => ethernet/mellanox}/mlx4/reset.c (100%)
2902  rename drivers/net/{ => ethernet/mellanox}/mlx4/sense.c (100%)
2903  rename drivers/net/{ => ethernet/mellanox}/mlx4/srq.c (100%)
2904  create mode 100644 drivers/net/ethernet/micrel/Kconfig
2905  create mode 100644 drivers/net/ethernet/micrel/Makefile
2906  rename drivers/net/{arm => ethernet/micrel}/ks8695net.c (100%)
2907  rename drivers/net/{arm => ethernet/micrel}/ks8695net.h (100%)
2908  rename drivers/net/{ => ethernet/micrel}/ks8842.c (100%)
2909  rename drivers/net/{ => ethernet/micrel}/ks8851.c (100%)
2910  rename drivers/net/{ => ethernet/micrel}/ks8851.h (100%)
2911  rename drivers/net/{ => ethernet/micrel}/ks8851_mll.c (100%)
2912  rename drivers/net/{ => ethernet/micrel}/ksz884x.c (100%)
2913  create mode 100644 drivers/net/ethernet/microchip/Kconfig
2914  create mode 100644 drivers/net/ethernet/microchip/Makefile
2915  rename drivers/net/{ => ethernet/microchip}/enc28j60.c (100%)
2916  rename drivers/net/{ => ethernet/microchip}/enc28j60_hw.h (100%)
2917  rename drivers/net/{ => ethernet}/mipsnet.c (100%)
2918  create mode 100644 drivers/net/ethernet/myricom/Kconfig
2919  create mode 100644 drivers/net/ethernet/myricom/Makefile
2920  rename drivers/net/{ => ethernet/myricom}/myri10ge/Makefile (100%)
2921  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge.c (100%)
2922  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h (100%)
2923  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp_gen_header.h (100%)
2924  create mode 100644 drivers/net/ethernet/natsemi/Kconfig
2925  create mode 100644 drivers/net/ethernet/natsemi/Makefile
2926  rename drivers/net/{ => ethernet/natsemi}/ibmlana.c (100%)
2927  rename drivers/net/{ => ethernet/natsemi}/ibmlana.h (100%)
2928  rename drivers/net/{ => ethernet/natsemi}/jazzsonic.c (100%)
2929  rename drivers/net/{ => ethernet/natsemi}/macsonic.c (100%)
2930  rename drivers/net/{ => ethernet/natsemi}/natsemi.c (100%)
2931  rename drivers/net/{ => ethernet/natsemi}/ns83820.c (100%)
2932  rename drivers/net/{ => ethernet/natsemi}/sonic.c (100%)
2933  rename drivers/net/{ => ethernet/natsemi}/sonic.h (100%)
2934  rename drivers/net/{ => ethernet/natsemi}/xtsonic.c (100%)
2935  create mode 100644 drivers/net/ethernet/neterion/Kconfig
2936  create mode 100644 drivers/net/ethernet/neterion/Makefile
2937  rename drivers/net/{ => ethernet/neterion}/s2io-regs.h (100%)
2938  rename drivers/net/{ => ethernet/neterion}/s2io.c (100%)
2939  rename drivers/net/{ => ethernet/neterion}/s2io.h (100%)
2940  rename drivers/net/{ => ethernet/neterion}/vxge/Makefile (100%)
2941  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.c (100%)
2942  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.h (100%)
2943  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.c (100%)
2944  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.h (100%)
2945  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.c (100%)
2946  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.h (100%)
2947  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-reg.h (100%)
2948  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.c (100%)
2949  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.h (100%)
2950  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-version.h (100%)
2951  rename drivers/net/{ => ethernet}/netx-eth.c (100%)
2952  create mode 100644 drivers/net/ethernet/nuvoton/Kconfig
2953  create mode 100644 drivers/net/ethernet/nuvoton/Makefile
2954  rename drivers/net/{arm => ethernet/nuvoton}/w90p910_ether.c (100%)
2955  create mode 100644 drivers/net/ethernet/nvidia/Kconfig
2956  create mode 100644 drivers/net/ethernet/nvidia/Makefile
2957  rename drivers/net/{ => ethernet/nvidia}/forcedeth.c (100%)
2958  rename drivers/net/{ => ethernet}/octeon/Kconfig (85%)
2959  create mode 100644 drivers/net/ethernet/octeon/Makefile
2960  rename drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (100%)
2961  create mode 100644 drivers/net/ethernet/oki-semi/Kconfig
2962  create mode 100644 drivers/net/ethernet/oki-semi/Makefile
2963  create mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
2964  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/Makefile (100%)
2965  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h (100%)
2966  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c (100%)
2967  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h (100%)
2968  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_ethtool.c (100%)
2969  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c (100%)
2970  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_param.c (100%)
2971  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c (100%)
2972  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h (100%)
2973  create mode 100644 drivers/net/ethernet/packetengines/Kconfig
2974  create mode 100644 drivers/net/ethernet/packetengines/Makefile
2975  rename drivers/net/{ => ethernet/packetengines}/hamachi.c (100%)
2976  rename drivers/net/{ => ethernet/packetengines}/yellowfin.c (100%)
2977  create mode 100644 drivers/net/ethernet/pasemi/Kconfig
2978  create mode 100644 drivers/net/ethernet/pasemi/Makefile
2979  rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.c (100%)
2980  rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.h (100%)
2981  rename drivers/net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c (100%)
2982  create mode 100644 drivers/net/ethernet/qlogic/Kconfig
2983  create mode 100644 drivers/net/ethernet/qlogic/Makefile
2984  rename drivers/net/{ => ethernet/qlogic}/netxen/Makefile (100%)
2985  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic.h (99%)
2986  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c (100%)
2987  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ethtool.c (100%)
2988  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h (100%)
2989  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.c (100%)
2990  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.h (100%)
2991  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_init.c (99%)
2992  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_main.c (96%)
2993  rename drivers/net/{ => ethernet/qlogic}/qla3xxx.c (99%)
2994  rename drivers/net/{ => ethernet/qlogic}/qla3xxx.h (100%)
2995  rename drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile (100%)
2996  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h (99%)
2997  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c (100%)
2998  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c (98%)
2999  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h (100%)
3000  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c (99%)
3001  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c (99%)
3002  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c (98%)
3003  rename drivers/net/{ => ethernet/qlogic}/qlge/Makefile (100%)
3004  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge.h (100%)
3005  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c (100%)
3006  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c (100%)
3007  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c (100%)
3008  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c (100%)
3009  create mode 100644 drivers/net/ethernet/racal/Kconfig
3010  create mode 100644 drivers/net/ethernet/racal/Makefile
3011  rename drivers/net/{ => ethernet/racal}/ni5010.c (100%)
3012  rename drivers/net/{ => ethernet/racal}/ni5010.h (100%)
3013  create mode 100644 drivers/net/ethernet/rdc/Kconfig
3014  create mode 100644 drivers/net/ethernet/rdc/Makefile
3015  rename drivers/net/{ => ethernet/rdc}/r6040.c (100%)
3016  rename drivers/net/{ => ethernet/realtek}/8139cp.c (100%)
3017  rename drivers/net/{ => ethernet/realtek}/8139too.c (100%)
3018  create mode 100644 drivers/net/ethernet/realtek/Kconfig
3019  create mode 100644 drivers/net/ethernet/realtek/Makefile
3020  rename drivers/net/{ => ethernet/realtek}/atp.c (100%)
3021  rename drivers/net/{ => ethernet/realtek}/atp.h (100%)
3022  rename drivers/net/{ => ethernet/realtek}/r8169.c (100%)
3023  rename drivers/net/{ => ethernet/realtek}/sc92031.c (100%)
3024  create mode 100644 drivers/net/ethernet/renesas/Kconfig
3025  create mode 100644 drivers/net/ethernet/renesas/Makefile
3026  rename drivers/net/{ => ethernet/renesas}/sh_eth.c (100%)
3027  rename drivers/net/{ => ethernet/renesas}/sh_eth.h (100%)
3028  rename drivers/net/{ => ethernet}/s6gmac.c (100%)
3029  create mode 100644 drivers/net/ethernet/seeq/Kconfig
3030  create mode 100644 drivers/net/ethernet/seeq/Makefile
3031  rename drivers/net/{arm => ethernet/seeq}/ether3.c (100%)
3032  rename drivers/net/{arm => ethernet/seeq}/ether3.h (100%)
3033  rename drivers/net/{ => ethernet/seeq}/seeq8005.c (100%)
3034  rename drivers/net/{ => ethernet/seeq}/seeq8005.h (100%)
3035  rename drivers/net/{ => ethernet/seeq}/sgiseeq.c (100%)
3036  rename drivers/net/{ => ethernet/seeq}/sgiseeq.h (100%)
3037  rename drivers/net/{ => ethernet}/sfc/Kconfig (96%)
3038  rename drivers/net/{ => ethernet}/sfc/Makefile (100%)
3039  rename drivers/net/{ => ethernet}/sfc/bitfield.h (100%)
3040  rename drivers/net/{ => ethernet}/sfc/efx.c (100%)
3041  rename drivers/net/{ => ethernet}/sfc/efx.h (100%)
3042  rename drivers/net/{ => ethernet}/sfc/enum.h (100%)
3043  rename drivers/net/{ => ethernet}/sfc/ethtool.c (100%)
3044  rename drivers/net/{ => ethernet}/sfc/falcon.c (100%)
3045  rename drivers/net/{ => ethernet}/sfc/falcon_boards.c (100%)
3046  rename drivers/net/{ => ethernet}/sfc/falcon_xmac.c (100%)
3047  rename drivers/net/{ => ethernet}/sfc/filter.c (100%)
3048  rename drivers/net/{ => ethernet}/sfc/filter.h (100%)
3049  rename drivers/net/{ => ethernet}/sfc/io.h (100%)
3050  rename drivers/net/{ => ethernet}/sfc/mac.h (100%)
3051  rename drivers/net/{ => ethernet}/sfc/mcdi.c (100%)
3052  rename drivers/net/{ => ethernet}/sfc/mcdi.h (100%)
3053  rename drivers/net/{ => ethernet}/sfc/mcdi_mac.c (100%)
3054  rename drivers/net/{ => ethernet}/sfc/mcdi_pcol.h (100%)
3055  rename drivers/net/{ => ethernet}/sfc/mcdi_phy.c (100%)
3056  rename drivers/net/{ => ethernet}/sfc/mdio_10g.c (100%)
3057  rename drivers/net/{ => ethernet}/sfc/mdio_10g.h (100%)
3058  rename drivers/net/{ => ethernet}/sfc/mtd.c (100%)
3059  rename drivers/net/{ => ethernet}/sfc/net_driver.h (100%)
3060  rename drivers/net/{ => ethernet}/sfc/nic.c (100%)
3061  rename drivers/net/{ => ethernet}/sfc/nic.h (100%)
3062  rename drivers/net/{ => ethernet}/sfc/phy.h (100%)
3063  rename drivers/net/{ => ethernet}/sfc/qt202x_phy.c (100%)
3064  rename drivers/net/{ => ethernet}/sfc/regs.h (100%)
3065  rename drivers/net/{ => ethernet}/sfc/rx.c (100%)
3066  rename drivers/net/{ => ethernet}/sfc/selftest.c (100%)
3067  rename drivers/net/{ => ethernet}/sfc/selftest.h (100%)
3068  rename drivers/net/{ => ethernet}/sfc/siena.c (100%)
3069  rename drivers/net/{ => ethernet}/sfc/spi.h (100%)
3070  rename drivers/net/{ => ethernet}/sfc/tenxpress.c (100%)
3071  rename drivers/net/{ => ethernet}/sfc/tx.c (100%)
3072  rename drivers/net/{ => ethernet}/sfc/txc43128_phy.c (100%)
3073  rename drivers/net/{ => ethernet}/sfc/workarounds.h (100%)
3074  create mode 100644 drivers/net/ethernet/sgi/Kconfig
3075  create mode 100644 drivers/net/ethernet/sgi/Makefile
3076  rename drivers/net/{ => ethernet/sgi}/ioc3-eth.c (100%)
3077  rename drivers/net/{ => ethernet/sgi}/meth.c (100%)
3078  rename drivers/net/{ => ethernet/sgi}/meth.h (100%)
3079  create mode 100644 drivers/net/ethernet/sis/Kconfig
3080  create mode 100644 drivers/net/ethernet/sis/Makefile
3081  rename drivers/net/{ => ethernet/sis}/sis190.c (100%)
3082  rename drivers/net/{ => ethernet/sis}/sis900.c (100%)
3083  rename drivers/net/{ => ethernet/sis}/sis900.h (100%)
3084  create mode 100644 drivers/net/ethernet/smsc/Kconfig
3085  create mode 100644 drivers/net/ethernet/smsc/Makefile
3086  rename drivers/net/{ => ethernet/smsc}/epic100.c (100%)
3087  rename drivers/net/{ => ethernet/smsc}/smc911x.c (100%)
3088  rename drivers/net/{ => ethernet/smsc}/smc911x.h (100%)
3089  rename drivers/net/{ => ethernet/smsc}/smc9194.c (100%)
3090  rename drivers/net/{ => ethernet/smsc}/smc9194.h (100%)
3091  rename drivers/net/{pcmcia => ethernet/smsc}/smc91c92_cs.c (100%)
3092  rename drivers/net/{ => ethernet/smsc}/smc91x.c (100%)
3093  rename drivers/net/{ => ethernet/smsc}/smc91x.h (100%)
3094  rename drivers/net/{ => ethernet/smsc}/smsc911x.c (97%)
3095  rename drivers/net/{ => ethernet/smsc}/smsc911x.h (100%)
3096  rename drivers/net/{ => ethernet/smsc}/smsc9420.c (100%)
3097  rename drivers/net/{ => ethernet/smsc}/smsc9420.h (100%)
3098  create mode 100644 drivers/net/ethernet/stmicro/Kconfig
3099  create mode 100644 drivers/net/ethernet/stmicro/Makefile
3100  rename drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig (93%)
3101  rename drivers/net/{ => ethernet/stmicro}/stmmac/Makefile (100%)
3102  rename drivers/net/{ => ethernet/stmicro}/stmmac/common.h (100%)
3103  rename drivers/net/{ => ethernet/stmicro}/stmmac/descs.h (100%)
3104  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100.h (100%)
3105  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000.h (100%)
3106  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_core.c (100%)
3107  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c (100%)
3108  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_core.c (100%)
3109  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_dma.c (100%)
3110  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h (100%)
3111  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c (100%)
3112  rename drivers/net/{ => ethernet/stmicro}/stmmac/enh_desc.c (100%)
3113  rename drivers/net/{ => ethernet/stmicro}/stmmac/norm_desc.c (100%)
3114  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h (100%)
3115  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c (100%)
3116  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_main.c (100%)
3117  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_mdio.c (100%)
3118  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.c (100%)
3119  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.h (100%)
3120  create mode 100644 drivers/net/ethernet/sun/Kconfig
3121  create mode 100644 drivers/net/ethernet/sun/Makefile
3122  rename drivers/net/{ => ethernet/sun}/cassini.c (100%)
3123  rename drivers/net/{ => ethernet/sun}/cassini.h (100%)
3124  rename drivers/net/{ => ethernet/sun}/niu.c (100%)
3125  rename drivers/net/{ => ethernet/sun}/niu.h (100%)
3126  rename drivers/net/{ => ethernet/sun}/sunbmac.c (100%)
3127  rename drivers/net/{ => ethernet/sun}/sunbmac.h (100%)
3128  rename drivers/net/{ => ethernet/sun}/sungem.c (99%)
3129  rename drivers/net/{ => ethernet/sun}/sungem.h (100%)
3130  rename drivers/net/{ => ethernet/sun}/sunhme.c (100%)
3131  rename drivers/net/{ => ethernet/sun}/sunhme.h (100%)
3132  rename drivers/net/{ => ethernet/sun}/sunqe.c (100%)
3133  rename drivers/net/{ => ethernet/sun}/sunqe.h (100%)
3134  rename drivers/net/{ => ethernet/sun}/sunvnet.c (100%)
3135  rename drivers/net/{ => ethernet/sun}/sunvnet.h (100%)
3136  create mode 100644 drivers/net/ethernet/tehuti/Kconfig
3137  create mode 100644 drivers/net/ethernet/tehuti/Makefile
3138  rename drivers/net/{ => ethernet/tehuti}/tehuti.c (100%)
3139  rename drivers/net/{ => ethernet/tehuti}/tehuti.h (100%)
3140  create mode 100644 drivers/net/ethernet/ti/Kconfig
3141  create mode 100644 drivers/net/ethernet/ti/Makefile
3142  rename drivers/net/{ => ethernet/ti}/cpmac.c (100%)
3143  rename drivers/net/{ => ethernet/ti}/davinci_cpdma.c (100%)
3144  rename drivers/net/{ => ethernet/ti}/davinci_cpdma.h (100%)
3145  rename drivers/net/{ => ethernet/ti}/davinci_emac.c (100%)
3146  rename drivers/net/{ => ethernet/ti}/davinci_mdio.c (100%)
3147  rename drivers/net/{ => ethernet/ti}/tlan.c (100%)
3148  rename drivers/net/{ => ethernet/ti}/tlan.h (100%)
3149  create mode 100644 drivers/net/ethernet/tile/Kconfig
3150  rename drivers/net/{ => ethernet}/tile/Makefile (100%)
3151  rename drivers/net/{ => ethernet}/tile/tilepro.c (100%)
3152  create mode 100644 drivers/net/ethernet/toshiba/Kconfig
3153  create mode 100644 drivers/net/ethernet/toshiba/Makefile
3154  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c (100%)
3155  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h (100%)
3156  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.c (100%)
3157  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.h (100%)
3158  rename drivers/net/{ => ethernet/toshiba}/spider_net.c (99%)
3159  rename drivers/net/{ => ethernet/toshiba}/spider_net.h (99%)
3160  rename drivers/net/{ => ethernet/toshiba}/spider_net_ethtool.c (100%)
3161  rename drivers/net/{ => ethernet/toshiba}/tc35815.c (100%)
3162  create mode 100644 drivers/net/ethernet/tundra/Kconfig
3163  create mode 100644 drivers/net/ethernet/tundra/Makefile
3164  rename drivers/net/{ => ethernet/tundra}/tsi108_eth.c (100%)
3165  rename drivers/net/{ => ethernet/tundra}/tsi108_eth.h (100%)
3166  create mode 100644 drivers/net/ethernet/via/Kconfig
3167  create mode 100644 drivers/net/ethernet/via/Makefile
3168  rename drivers/net/{ => ethernet/via}/via-rhine.c (100%)
3169  rename drivers/net/{ => ethernet/via}/via-velocity.c (97%)
3170  rename drivers/net/{ => ethernet/via}/via-velocity.h (100%)
3171  create mode 100644 drivers/net/ethernet/xilinx/Kconfig
3172  create mode 100644 drivers/net/ethernet/xilinx/Makefile
3173  rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%)
3174  rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (100%)
3175  rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%)
3176  rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%)
3177  create mode 100644 drivers/net/ethernet/xircom/Kconfig
3178  create mode 100644 drivers/net/ethernet/xircom/Makefile
3179  rename drivers/net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c (100%)
3180  create mode 100644 drivers/net/ethernet/xscale/Kconfig
3181  create mode 100644 drivers/net/ethernet/xscale/Makefile
3182  rename drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig (94%)
3183  rename drivers/net/{ => ethernet/xscale}/ixp2000/Makefile (100%)
3184  rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c (100%)
3185  rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h (100%)
3186  rename drivers/net/{ => ethernet/xscale}/ixp2000/enp2611.c (100%)
3187  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.c (100%)
3188  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.h (100%)
3189  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc (100%)
3190  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode (100%)
3191  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc (100%)
3192  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode (100%)
3193  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c (100%)
3194  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h (100%)
3195  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev_priv.h (100%)
3196  rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c (100%)
3197  rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h (100%)
3198  rename drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c (100%)
3199  delete mode 100644 drivers/net/octeon/Makefile
3200  delete mode 100644 drivers/net/pci-skeleton.c
3201  rename {drivers/net => include/linux}/sungem_phy.h (98%)
3202 Merging wireless/master
3203 $ git merge wireless/master
3204 Auto-merging arch/mips/Kconfig
3205 Auto-merging drivers/net/wireless/ath/ath5k/base.c
3206 Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
3207 Removing drivers/staging/ath6kl/Kconfig
3208 Removing drivers/staging/ath6kl/Makefile
3209 Removing drivers/staging/ath6kl/TODO
3210 Removing drivers/staging/ath6kl/bmi/include/bmi_internal.h
3211 Removing drivers/staging/ath6kl/bmi/src/bmi.c
3212 Removing drivers/staging/ath6kl/hif/common/hif_sdio_common.h
3213 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
3214 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
3215 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
3216 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.c
3217 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.h
3218 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
3219 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
3220 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
3221 Removing drivers/staging/ath6kl/htc2/htc.c
3222 Removing drivers/staging/ath6kl/htc2/htc_debug.h
3223 Removing drivers/staging/ath6kl/htc2/htc_internal.h
3224 Removing drivers/staging/ath6kl/htc2/htc_recv.c
3225 Removing drivers/staging/ath6kl/htc2/htc_send.c
3226 Removing drivers/staging/ath6kl/htc2/htc_services.c
3227 Removing drivers/staging/ath6kl/include/a_config.h
3228 Removing drivers/staging/ath6kl/include/a_debug.h
3229 Removing drivers/staging/ath6kl/include/a_drv.h
3230 Removing drivers/staging/ath6kl/include/a_drv_api.h
3231 Removing drivers/staging/ath6kl/include/a_osapi.h
3232 Removing drivers/staging/ath6kl/include/aggr_recv_api.h
3233 Removing drivers/staging/ath6kl/include/ar3kconfig.h
3234 Removing drivers/staging/ath6kl/include/ar6000_api.h
3235 Removing drivers/staging/ath6kl/include/ar6000_diag.h
3236 Removing drivers/staging/ath6kl/include/ar6kap_common.h
3237 Removing drivers/staging/ath6kl/include/athbtfilter.h
3238 Removing drivers/staging/ath6kl/include/bmi.h
3239 Removing drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
3240 Removing drivers/staging/ath6kl/include/common/AR6002/addrs.h
3241 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
3242 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
3243 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
3244 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
3245 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
3246 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
3247 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
3248 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
3249 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
3250 Removing drivers/staging/ath6kl/include/common/athdefs.h
3251 Removing drivers/staging/ath6kl/include/common/bmi_msg.h
3252 Removing drivers/staging/ath6kl/include/common/cnxmgmt.h
3253 Removing drivers/staging/ath6kl/include/common/dbglog.h
3254 Removing drivers/staging/ath6kl/include/common/dbglog_id.h
3255 Removing drivers/staging/ath6kl/include/common/discovery.h
3256 Removing drivers/staging/ath6kl/include/common/epping_test.h
3257 Removing drivers/staging/ath6kl/include/common/gmboxif.h
3258 Removing drivers/staging/ath6kl/include/common/gpio_reg.h
3259 Removing drivers/staging/ath6kl/include/common/htc.h
3260 Removing drivers/staging/ath6kl/include/common/htc_services.h
3261 Removing drivers/staging/ath6kl/include/common/pkt_log.h
3262 Removing drivers/staging/ath6kl/include/common/roaming.h
3263 Removing drivers/staging/ath6kl/include/common/targaddrs.h
3264 Removing drivers/staging/ath6kl/include/common/testcmd.h
3265 Removing drivers/staging/ath6kl/include/common/tlpm.h
3266 Removing drivers/staging/ath6kl/include/common/wlan_defs.h
3267 Removing drivers/staging/ath6kl/include/common/wmi.h
3268 Removing drivers/staging/ath6kl/include/common/wmix.h
3269 Removing drivers/staging/ath6kl/include/common_drv.h
3270 Removing drivers/staging/ath6kl/include/dbglog_api.h
3271 Removing drivers/staging/ath6kl/include/dl_list.h
3272 Removing drivers/staging/ath6kl/include/dset_api.h
3273 Removing drivers/staging/ath6kl/include/hci_transport_api.h
3274 Removing drivers/staging/ath6kl/include/hif.h
3275 Removing drivers/staging/ath6kl/include/host_version.h
3276 Removing drivers/staging/ath6kl/include/htc_api.h
3277 Removing drivers/staging/ath6kl/include/htc_packet.h
3278 Removing drivers/staging/ath6kl/include/wlan_api.h
3279 Removing drivers/staging/ath6kl/include/wmi_api.h
3280 Removing drivers/staging/ath6kl/miscdrv/ar3kconfig.c
3281 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
3282 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
3283 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.
3284 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
3285 Removing drivers/staging/ath6kl/miscdrv/common_drv.c
3286 Removing drivers/staging/ath6kl/miscdrv/credit_dist.c
3287 Removing drivers/staging/ath6kl/miscdrv/miscdrv.h
3288 Removing drivers/staging/ath6kl/os/linux/ar6000_drv.c
3289 Removing drivers/staging/ath6kl/os/linux/ar6000_pm.c
3290 Removing drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
3291 Removing drivers/staging/ath6kl/os/linux/cfg80211.c
3292 Removing drivers/staging/ath6kl/os/linux/export_hci_transport.c
3293 Removing drivers/staging/ath6kl/os/linux/hci_bridge.c
3294 Removing drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
3295 Removing drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
3296 Removing drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
3297 Removing drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
3298 Removing drivers/staging/ath6kl/os/linux/include/cfg80211.h
3299 Removing drivers/staging/ath6kl/os/linux/include/config_linux.h
3300 Removing drivers/staging/ath6kl/os/linux/include/debug_linux.h
3301 Removing drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
3302 Removing drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
3303 Removing drivers/staging/ath6kl/os/linux/include/osapi_linux.h
3304 Removing drivers/staging/ath6kl/os/linux/include/wlan_config.h
3305 Removing drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
3306 Removing drivers/staging/ath6kl/os/linux/netbuf.c
3307 Removing drivers/staging/ath6kl/reorder/aggr_rx_internal.h
3308 Removing drivers/staging/ath6kl/reorder/rcv_aggr.c
3309 Removing drivers/staging/ath6kl/wlan/include/ieee80211.h
3310 Removing drivers/staging/ath6kl/wlan/include/ieee80211_node.h
3311 Removing drivers/staging/ath6kl/wlan/src/wlan_node.c
3312 Removing drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
3313 Removing drivers/staging/ath6kl/wlan/src/wlan_utils.c
3314 Removing drivers/staging/ath6kl/wmi/wmi.c
3315 Removing drivers/staging/ath6kl/wmi/wmi_host.h
3316 Auto-merging net/mac80211/cfg.c
3317 Auto-merging net/mac80211/sta_info.c
3318 Automatic merge failed; fix conflicts and then commit the result.
3319 $ git rm -f drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
3320 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c: needs merge
3321 rm 'drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c'
3322 $ git commit -v -a
3323 [master 50027d2] Merge remote-tracking branch 'wireless/master'
3324 $ git diff -M --stat --summary HEAD^..
3325  arch/mips/Kconfig                                  |    8 +-
3326  arch/mips/bcm47xx/Kconfig                          |   31 +
3327  arch/mips/bcm47xx/Makefile                         |    3 +-
3328  arch/mips/bcm47xx/gpio.c                           |   82 +-
3329  arch/mips/bcm47xx/irq.c                            |   12 +
3330  arch/mips/bcm47xx/nvram.c                          |   29 +-
3331  arch/mips/bcm47xx/serial.c                         |   46 +-
3332  arch/mips/bcm47xx/setup.c                          |   90 +-
3333  arch/mips/bcm47xx/time.c                           |   16 +-
3334  arch/mips/bcm47xx/wgt634u.c                        |   14 +-
3335  arch/mips/include/asm/mach-bcm47xx/bcm47xx.h       |   26 +-
3336  arch/mips/include/asm/mach-bcm47xx/gpio.h          |  108 +-
3337  arch/mips/pci/pci-bcm47xx.c                        |    6 +
3338  drivers/bcma/Kconfig                               |   13 +
3339  drivers/bcma/Makefile                              |    2 +
3340  drivers/bcma/bcma_private.h                        |   16 +
3341  drivers/bcma/core.c                                |    2 +
3342  drivers/bcma/driver_chipcommon.c                   |   53 +
3343  drivers/bcma/driver_chipcommon_pmu.c               |  133 +
3344  drivers/bcma/driver_mips.c                         |  256 +
3345  drivers/bcma/driver_pci.c                          |   16 +-
3346  drivers/bcma/host_soc.c                            |  183 +
3347  drivers/bcma/main.c                                |   70 +-
3348  drivers/bcma/scan.c                                |  348 +-
3349  drivers/net/wireless/ath/Kconfig                   |    1 +
3350  drivers/net/wireless/ath/Makefile                  |    1 +
3351  drivers/net/wireless/ath/ath5k/ahb.c               |    4 +-
3352  drivers/net/wireless/ath/ath5k/ani.c               |    1 -
3353  drivers/net/wireless/ath/ath5k/ani.h               |    4 +
3354  drivers/net/wireless/ath/ath5k/ath5k.h             |   98 +-
3355  drivers/net/wireless/ath/ath5k/attach.c            |   18 +-
3356  drivers/net/wireless/ath/ath5k/base.c              |   31 +-
3357  drivers/net/wireless/ath/ath5k/base.h              |   55 +-
3358  drivers/net/wireless/ath/ath5k/caps.c              |    2 +-
3359  drivers/net/wireless/ath/ath5k/debug.c             |   15 +-
3360  drivers/net/wireless/ath/ath5k/desc.c              |    1 -
3361  drivers/net/wireless/ath/ath5k/dma.c               |    1 -
3362  drivers/net/wireless/ath/ath5k/eeprom.c            |   10 +-
3363  drivers/net/wireless/ath/ath5k/gpio.c              |    1 -
3364  drivers/net/wireless/ath/ath5k/initvals.c          |    1 -
3365  drivers/net/wireless/ath/ath5k/led.c               |    1 -
3366  drivers/net/wireless/ath/ath5k/mac80211-ops.c      |    5 +-
3367  drivers/net/wireless/ath/ath5k/pci.c               |    4 +-
3368  drivers/net/wireless/ath/ath5k/pcu.c               |    5 +-
3369  drivers/net/wireless/ath/ath5k/phy.c               |   91 +-
3370  drivers/net/wireless/ath/ath5k/qcu.c               |   10 +-
3371  drivers/net/wireless/ath/ath5k/reset.c             |   79 +-
3372  drivers/net/wireless/ath/ath5k/rfkill.c            |    2 +-
3373  drivers/net/wireless/ath/ath5k/sysfs.c             |    1 -
3374  drivers/net/wireless/ath/ath5k/trace.h             |    3 +-
3375  drivers/net/wireless/ath/ath6kl/Kconfig            |   15 +
3376  drivers/net/wireless/ath/ath6kl/Makefile           |   35 +
3377  drivers/net/wireless/ath/ath6kl/bmi.c              |  692 +++
3378  drivers/net/wireless/ath/ath6kl/bmi.h              |  250 +
3379  drivers/net/wireless/ath/ath6kl/cfg80211.c         | 1538 +++++
3380  drivers/net/wireless/ath/ath6kl/cfg80211.h         |   39 +
3381  drivers/net/wireless/ath/ath6kl/common.h           |  180 +
3382  drivers/net/wireless/ath/ath6kl/core.h             |  544 ++
3383  drivers/net/wireless/ath/ath6kl/debug.c            |  150 +
3384  drivers/net/wireless/ath/ath6kl/debug.h            |  105 +
3385  drivers/net/wireless/ath/ath6kl/hif-ops.h          |   72 +
3386  drivers/net/wireless/ath/ath6kl/hif.h              |  207 +
3387  drivers/net/wireless/ath/ath6kl/htc.c              | 2457 ++++++++
3388  drivers/net/wireless/ath/ath6kl/htc.h              |  607 ++
3389  drivers/net/wireless/ath/ath6kl/htc_hif.c          |  641 ++
3390  drivers/net/wireless/ath/ath6kl/htc_hif.h          |   92 +
3391  drivers/net/wireless/ath/ath6kl/init.c             | 1303 ++++
3392  drivers/net/wireless/ath/ath6kl/main.c             | 1337 ++++
3393  drivers/net/wireless/ath/ath6kl/node.c             |  234 +
3394  drivers/net/wireless/ath/ath6kl/sdio.c             |  912 +++
3395  drivers/net/wireless/ath/ath6kl/target.h           |  331 +
3396  drivers/net/wireless/ath/ath6kl/txrx.c             | 1457 +++++
3397  drivers/net/wireless/ath/ath6kl/wmi.c              | 2743 +++++++++
3398  drivers/net/wireless/ath/ath6kl/wmi.h              | 2018 ++++++
3399  drivers/net/wireless/ath/ath9k/ahb.c               |    2 +-
3400  .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h   |  190 +-
3401  drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |  150 +-
3402  drivers/net/wireless/ath/ath9k/ar9003_mac.c        |   15 +-
3403  drivers/net/wireless/ath/ath9k/ar9003_phy.c        |    4 +-
3404  drivers/net/wireless/ath/ath9k/ath9k.h             |    6 +-
3405  drivers/net/wireless/ath/ath9k/beacon.c            |   18 +-
3406  drivers/net/wireless/ath/ath9k/calib.c             |   15 +
3407  drivers/net/wireless/ath/ath9k/calib.h             |    1 +
3408  drivers/net/wireless/ath/ath9k/debug.c             |   60 +
3409  drivers/net/wireless/ath/ath9k/eeprom.h            |    2 +
3410  drivers/net/wireless/ath/ath9k/eeprom_4k.c         |  135 +-
3411  drivers/net/wireless/ath/ath9k/eeprom_9287.c       |  122 +-
3412  drivers/net/wireless/ath/ath9k/eeprom_def.c        |  150 +-
3413  drivers/net/wireless/ath/ath9k/gpio.c              |    2 +
3414  drivers/net/wireless/ath/ath9k/htc.h               |    3 -
3415  drivers/net/wireless/ath/ath9k/htc_drv_init.c      |    1 -
3416  drivers/net/wireless/ath/ath9k/hw.c                |   10 +-
3417  drivers/net/wireless/ath/ath9k/hw.h                |    9 +-
3418  drivers/net/wireless/ath/ath9k/init.c              |    8 +-
3419  drivers/net/wireless/ath/ath9k/mac.c               |   16 +-
3420  drivers/net/wireless/ath/ath9k/main.c              |   10 +-
3421  drivers/net/wireless/ath/ath9k/pci.c               |    4 +-
3422  drivers/net/wireless/ath/ath9k/rc.c                |    4 +-
3423  drivers/net/wireless/ath/ath9k/rc.h                |    6 -
3424  drivers/net/wireless/ath/ath9k/recv.c              |   10 +-
3425  drivers/net/wireless/ath/ath9k/xmit.c              |   12 +-
3426  drivers/net/wireless/ath/regd.h                    |    2 +-
3427  drivers/net/wireless/ath/regd_common.h             |    2 +-
3428  drivers/net/wireless/b43/Kconfig                   |    6 +-
3429  drivers/net/wireless/b43/main.c                    |    2 +-
3430  drivers/net/wireless/b43legacy/b43legacy.h         |    1 -
3431  drivers/net/wireless/b43legacy/dma.c               |  374 +-
3432  drivers/net/wireless/b43legacy/dma.h               |  107 -
3433  drivers/net/wireless/b43legacy/main.c              |    4 +-
3434  drivers/net/wireless/ipw2x00/ipw2200.c             |    1 +
3435  drivers/net/wireless/iwlegacy/iwl-3945-led.c       |    1 -
3436  drivers/net/wireless/iwlegacy/iwl-3945-rs.c        |    1 -
3437  drivers/net/wireless/iwlegacy/iwl-3945.c           |    1 -
3438  drivers/net/wireless/iwlegacy/iwl-4965-led.c       |    1 -
3439  drivers/net/wireless/iwlegacy/iwl-4965-rs.c        |    1 -
3440  drivers/net/wireless/iwlegacy/iwl-4965.c           |    1 -
3441  drivers/net/wireless/iwlegacy/iwl-led.c            |    1 -
3442  drivers/net/wireless/iwlegacy/iwl3945-base.c       |    1 -
3443  drivers/net/wireless/iwlegacy/iwl4965-base.c       |    1 -
3444  drivers/net/wireless/iwlwifi/Kconfig               |   17 -
3445  drivers/net/wireless/iwlwifi/iwl-1000.c            |   16 +-
3446  drivers/net/wireless/iwlwifi/iwl-2000.c            |   24 +-
3447  drivers/net/wireless/iwlwifi/iwl-5000.c            |   13 +-
3448  drivers/net/wireless/iwlwifi/iwl-6000.c            |   20 +-
3449  drivers/net/wireless/iwlwifi/iwl-agn-calib.c       |   69 +-
3450  drivers/net/wireless/iwlwifi/iwl-agn-hw.h          |    4 +-
3451  drivers/net/wireless/iwlwifi/iwl-agn-lib.c         |   47 +-
3452  drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |    1 -
3453  drivers/net/wireless/iwlwifi/iwl-agn-rxon.c        |   23 +-
3454  drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |   30 +-
3455  drivers/net/wireless/iwlwifi/iwl-agn.c             |  388 +-
3456  drivers/net/wireless/iwlwifi/iwl-agn.h             |    1 +
3457  drivers/net/wireless/iwlwifi/iwl-commands.h        |   34 +-
3458  drivers/net/wireless/iwlwifi/iwl-core.c            |    5 +
3459  drivers/net/wireless/iwlwifi/iwl-core.h            |    5 +
3460  drivers/net/wireless/iwlwifi/iwl-dev.h             |   29 +-
3461  drivers/net/wireless/iwlwifi/iwl-led.c             |    1 -
3462  drivers/net/wireless/iwlwifi/iwl-scan.c            |   19 +-
3463  drivers/net/wireless/iwlwifi/iwl-trans.c           |   10 +-
3464  drivers/net/wireless/libertas/cfg.c                |   69 +-
3465  drivers/net/wireless/libertas/cfg.h                |    1 +
3466  drivers/net/wireless/libertas/cmd.c                |    6 +-
3467  drivers/net/wireless/libertas/decl.h               |    4 +
3468  drivers/net/wireless/libertas/dev.h                |   28 +-
3469  drivers/net/wireless/libertas/ethtool.c            |    1 +
3470  drivers/net/wireless/libertas/if_sdio.c            |  277 +-
3471  drivers/net/wireless/libertas/if_spi.c             |    4 -
3472  drivers/net/wireless/libertas/if_usb.c             |   13 +-
3473  drivers/net/wireless/libertas/main.c               |  180 +-
3474  drivers/net/wireless/libertas/mesh.c               |   77 +-
3475  drivers/net/wireless/libertas/mesh.h               |   27 +-
3476  drivers/net/wireless/libertas/rx.c                 |    1 +
3477  drivers/net/wireless/libertas/tx.c                 |    1 +
3478  drivers/net/wireless/mac80211_hwsim.c              |    6 +
3479  drivers/net/wireless/mwifiex/cfg80211.c            |  209 +-
3480  drivers/net/wireless/mwifiex/fw.h                  |   15 +-
3481  drivers/net/wireless/mwifiex/init.c                |   21 -
3482  drivers/net/wireless/mwifiex/ioctl.h               |    5 +-
3483  drivers/net/wireless/mwifiex/join.c                |   32 -
3484  drivers/net/wireless/mwifiex/main.c                |    4 +
3485  drivers/net/wireless/mwifiex/main.h                |   55 +-
3486  drivers/net/wireless/mwifiex/scan.c                | 1578 +----
3487  drivers/net/wireless/mwifiex/sta_event.c           |    9 +-
3488  drivers/net/wireless/mwifiex/sta_ioctl.c           |  230 +-
3489  drivers/net/wireless/orinoco/wext.c                |    1 +
3490  drivers/net/wireless/rndis_wlan.c                  |    2 -
3491  drivers/net/wireless/rt2x00/rt2400pci.c            |   39 +-
3492  drivers/net/wireless/rt2x00/rt2500pci.c            |   39 +-
3493  drivers/net/wireless/rt2x00/rt2800pci.c            |   46 +-
3494  drivers/net/wireless/rt2x00/rt2x00dev.c            |    1 -
3495  drivers/net/wireless/rt2x00/rt61pci.c              |   34 +-
3496  drivers/net/wireless/rtlwifi/pci.c                 |   37 +-
3497  drivers/net/wireless/rtlwifi/pci.h                 |   26 -
3498  drivers/net/wireless/wl1251/cmd.h                  |    2 +-
3499  drivers/net/wireless/wl1251/wl12xx_80211.h         |    2 +-
3500  drivers/net/wireless/wl12xx/cmd.h                  |    4 +-
3501  drivers/net/wireless/wl12xx/main.c                 |    2 +-
3502  drivers/net/wireless/wl12xx/scan.h                 |    6 +-
3503  drivers/net/wireless/wl12xx/wl12xx.h               |    4 +-
3504  drivers/net/wireless/wl12xx/wl12xx_80211.h         |    2 +-
3505  drivers/staging/Kconfig                            |    2 -
3506  drivers/staging/Makefile                           |    1 -
3507  drivers/staging/ath6kl/Kconfig                     |  158 -
3508  drivers/staging/ath6kl/Makefile                    |  122 -
3509  drivers/staging/ath6kl/TODO                        |   25 -
3510  drivers/staging/ath6kl/bmi/include/bmi_internal.h  |   54 -
3511  drivers/staging/ath6kl/bmi/src/bmi.c               | 1010 ---
3512  .../staging/ath6kl/hif/common/hif_sdio_common.h    |   87 -
3513  .../hif/sdio/linux_sdio/include/hif_internal.h     |  131 -
3514  .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c   | 1273 ----
3515  .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c   |  393 --
3516  drivers/staging/ath6kl/htc2/AR6000/ar6k.c          | 1479 -----
3517  drivers/staging/ath6kl/htc2/AR6000/ar6k.h          |  401 --
3518  drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c   |  783 ---
3519  drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c    |  755 ---
3520  .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c        | 1284 ----
3521  drivers/staging/ath6kl/htc2/htc.c                  |  575 --
3522  drivers/staging/ath6kl/htc2/htc_debug.h            |   38 -
3523  drivers/staging/ath6kl/htc2/htc_internal.h         |  211 -
3524  drivers/staging/ath6kl/htc2/htc_recv.c             | 1572 -----
3525  drivers/staging/ath6kl/htc2/htc_send.c             | 1018 ---
3526  drivers/staging/ath6kl/htc2/htc_services.c         |  450 --
3527  drivers/staging/ath6kl/include/a_config.h          |   31 -
3528  drivers/staging/ath6kl/include/a_debug.h           |  195 -
3529  drivers/staging/ath6kl/include/a_drv.h             |   32 -
3530  drivers/staging/ath6kl/include/a_drv_api.h         |  204 -
3531  drivers/staging/ath6kl/include/a_osapi.h           |   32 -
3532  drivers/staging/ath6kl/include/aggr_recv_api.h     |  140 -
3533  drivers/staging/ath6kl/include/ar3kconfig.h        |   65 -
3534  drivers/staging/ath6kl/include/ar6000_api.h        |   32 -
3535  drivers/staging/ath6kl/include/ar6000_diag.h       |   48 -
3536  drivers/staging/ath6kl/include/ar6kap_common.h     |   44 -
3537  drivers/staging/ath6kl/include/athbtfilter.h       |  135 -
3538  drivers/staging/ath6kl/include/bmi.h               |  134 -
3539  .../ath6kl/include/common/AR6002/AR6K_version.h    |   52 -
3540  .../staging/ath6kl/include/common/AR6002/addrs.h   |   90 -
3541  .../common/AR6002/hw4.0/hw/apb_athr_wlan_map.h     |   40 -
3542  .../include/common/AR6002/hw4.0/hw/apb_map.h       |   40 -
3543  .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h |   24 -
3544  .../include/common/AR6002/hw4.0/hw/mbox_reg.h      |  552 --
3545  .../common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h    |  471 --
3546  .../include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h |  589 --
3547  .../include/common/AR6002/hw4.0/hw/rtc_reg.h       |  187 -
3548  .../include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h  |  162 -
3549  .../include/common/AR6002/hw4.0/hw/uart_reg.h      |   40 -
3550  drivers/staging/ath6kl/include/common/athdefs.h    |   75 -
3551  drivers/staging/ath6kl/include/common/bmi_msg.h    |  233 -
3552  drivers/staging/ath6kl/include/common/cnxmgmt.h    |   36 -
3553  drivers/staging/ath6kl/include/common/dbglog.h     |  126 -
3554  drivers/staging/ath6kl/include/common/dbglog_id.h  |  558 --
3555  drivers/staging/ath6kl/include/common/discovery.h  |   75 -
3556  .../staging/ath6kl/include/common/epping_test.h    |  111 -
3557  drivers/staging/ath6kl/include/common/gmboxif.h    |   70 -
3558  drivers/staging/ath6kl/include/common/gpio_reg.h   |    9 -
3559  drivers/staging/ath6kl/include/common/htc.h        |  227 -
3560  .../staging/ath6kl/include/common/htc_services.h   |   52 -
3561  drivers/staging/ath6kl/include/common/pkt_log.h    |   45 -
3562  drivers/staging/ath6kl/include/common/roaming.h    |   41 -
3563  drivers/staging/ath6kl/include/common/targaddrs.h  |  395 --
3564  drivers/staging/ath6kl/include/common/testcmd.h    |  185 -
3565  drivers/staging/ath6kl/include/common/tlpm.h       |   38 -
3566  drivers/staging/ath6kl/include/common/wlan_defs.h  |   79 -
3567  drivers/staging/ath6kl/include/common/wmi.h        | 3220 ----------
3568  drivers/staging/ath6kl/include/common/wmix.h       |  271 -
3569  drivers/staging/ath6kl/include/common_drv.h        |  104 -
3570  drivers/staging/ath6kl/include/dbglog_api.h        |   52 -
3571  drivers/staging/ath6kl/include/dl_list.h           |  153 -
3572  drivers/staging/ath6kl/include/dset_api.h          |   65 -
3573  drivers/staging/ath6kl/include/hci_transport_api.h |  259 -
3574  drivers/staging/ath6kl/include/hif.h               |  456 --
3575  drivers/staging/ath6kl/include/host_version.h      |   52 -
3576  drivers/staging/ath6kl/include/htc_api.h           |  575 --
3577  drivers/staging/ath6kl/include/htc_packet.h        |  227 -
3578  drivers/staging/ath6kl/include/wlan_api.h          |  128 -
3579  drivers/staging/ath6kl/include/wmi_api.h           |  441 --
3580  drivers/staging/ath6kl/miscdrv/ar3kconfig.c        |  565 --
3581  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c   |  572 --
3582  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h   |   75 -
3583  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c   |  969 ---
3584  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h   |  113 -
3585  drivers/staging/ath6kl/miscdrv/common_drv.c        |  910 ---
3586  drivers/staging/ath6kl/miscdrv/credit_dist.c       |  417 --
3587  drivers/staging/ath6kl/miscdrv/miscdrv.h           |   42 -
3588  drivers/staging/ath6kl/os/linux/ar6000_drv.c       | 6267 -------------------
3589  drivers/staging/ath6kl/os/linux/ar6000_pm.c        |  626 --
3590  drivers/staging/ath6kl/os/linux/ar6000_raw_if.c    |  455 --
3591  drivers/staging/ath6kl/os/linux/cfg80211.c         | 1892 ------
3592  .../staging/ath6kl/os/linux/export_hci_transport.c |  124 -
3593  drivers/staging/ath6kl/os/linux/hci_bridge.c       | 1141 ----
3594  .../staging/ath6kl/os/linux/include/ar6000_drv.h   |  776 ---
3595  drivers/staging/ath6kl/os/linux/include/ar6k_pal.h |   36 -
3596  .../ath6kl/os/linux/include/ar6xapi_linux.h        |  190 -
3597  .../staging/ath6kl/os/linux/include/athdrv_linux.h | 1217 ----
3598  drivers/staging/ath6kl/os/linux/include/cfg80211.h |   61 -
3599  .../staging/ath6kl/os/linux/include/config_linux.h |   51 -
3600  .../staging/ath6kl/os/linux/include/debug_linux.h  |   50 -
3601  .../ath6kl/os/linux/include/export_hci_transport.h |   76 -
3602  .../ath6kl/os/linux/include/ieee80211_ioctl.h      |  177 -
3603  .../staging/ath6kl/os/linux/include/osapi_linux.h  |  339 -
3604  .../staging/ath6kl/os/linux/include/wlan_config.h  |  108 -
3605  .../ath6kl/os/linux/include/wmi_filter_linux.h     |  300 -
3606  drivers/staging/ath6kl/os/linux/netbuf.c           |  231 -
3607  drivers/staging/ath6kl/reorder/aggr_rx_internal.h  |  117 -
3608  drivers/staging/ath6kl/reorder/rcv_aggr.c          |  661 --
3609  drivers/staging/ath6kl/wlan/include/ieee80211.h    |  397 --
3610  .../staging/ath6kl/wlan/include/ieee80211_node.h   |   93 -
3611  drivers/staging/ath6kl/wlan/src/wlan_node.c        |  636 --
3612  drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c |  199 -
3613  drivers/staging/ath6kl/wlan/src/wlan_utils.c       |   58 -
3614  drivers/staging/ath6kl/wmi/wmi.c                   | 6444 --------------------
3615  drivers/staging/ath6kl/wmi/wmi_host.h              |  102 -
3616  drivers/watchdog/bcm47xx_wdt.c                     |   27 +-
3617  include/linux/bcma/bcma.h                          |    9 +-
3618  include/linux/bcma/bcma_driver_chipcommon.h        |   67 +
3619  include/linux/bcma/bcma_driver_mips.h              |   51 +
3620  include/linux/bcma/bcma_soc.h                      |   16 +
3621  include/linux/nl80211.h                            |   61 +-
3622  include/linux/ssb/ssb_regs.h                       |   40 +
3623  include/net/cfg80211-wext.h                        |   55 +
3624  include/net/cfg80211.h                             |  279 +-
3625  include/net/lib80211.h                             |    3 -
3626  include/net/mac80211.h                             |   11 -
3627  net/mac80211/agg-tx.c                              |   18 +-
3628  net/mac80211/cfg.c                                 |   39 -
3629  net/mac80211/driver-ops.h                          |   31 -
3630  net/mac80211/ieee80211_i.h                         |   64 -
3631  net/mac80211/main.c                                |    1 +
3632  net/mac80211/mesh_hwmp.c                           |    7 +-
3633  net/mac80211/rc80211_minstrel_ht.c                 |    8 +-
3634  net/mac80211/sta_info.c                            |    1 +
3635  net/mac80211/status.c                              |    3 -
3636  net/mac80211/tx.c                                  |   20 +
3637  net/mac80211/util.c                                |  168 +-
3638  net/wireless/lib80211.c                            |   15 +-
3639  net/wireless/nl80211.c                             |   86 +-
3640  net/wireless/reg.c                                 |   14 +-
3641  net/wireless/scan.c                                |    1 +
3642  net/wireless/util.c                                |  168 +
3643  net/wireless/wext-compat.c                         |  137 +-
3644  net/wireless/wext-compat.h                         |    8 +
3645  net/wireless/wext-sme.c                            |    3 +-
3646  321 files changed, 22561 insertions(+), 54152 deletions(-)
3647  create mode 100644 arch/mips/bcm47xx/Kconfig
3648  create mode 100644 drivers/bcma/driver_mips.c
3649  create mode 100644 drivers/bcma/host_soc.c
3650  create mode 100644 drivers/net/wireless/ath/ath6kl/Kconfig
3651  create mode 100644 drivers/net/wireless/ath/ath6kl/Makefile
3652  create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.c
3653  create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.h
3654  create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.c
3655  create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.h
3656  create mode 100644 drivers/net/wireless/ath/ath6kl/common.h
3657  create mode 100644 drivers/net/wireless/ath/ath6kl/core.h
3658  create mode 100644 drivers/net/wireless/ath/ath6kl/debug.c
3659  create mode 100644 drivers/net/wireless/ath/ath6kl/debug.h
3660  create mode 100644 drivers/net/wireless/ath/ath6kl/hif-ops.h
3661  create mode 100644 drivers/net/wireless/ath/ath6kl/hif.h
3662  create mode 100644 drivers/net/wireless/ath/ath6kl/htc.c
3663  create mode 100644 drivers/net/wireless/ath/ath6kl/htc.h
3664  create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.c
3665  create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.h
3666  create mode 100644 drivers/net/wireless/ath/ath6kl/init.c
3667  create mode 100644 drivers/net/wireless/ath/ath6kl/main.c
3668  create mode 100644 drivers/net/wireless/ath/ath6kl/node.c
3669  create mode 100644 drivers/net/wireless/ath/ath6kl/sdio.c
3670  create mode 100644 drivers/net/wireless/ath/ath6kl/target.h
3671  create mode 100644 drivers/net/wireless/ath/ath6kl/txrx.c
3672  create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.c
3673  create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.h
3674  delete mode 100644 drivers/staging/ath6kl/Kconfig
3675  delete mode 100644 drivers/staging/ath6kl/Makefile
3676  delete mode 100644 drivers/staging/ath6kl/TODO
3677  delete mode 100644 drivers/staging/ath6kl/bmi/include/bmi_internal.h
3678  delete mode 100644 drivers/staging/ath6kl/bmi/src/bmi.c
3679  delete mode 100644 drivers/staging/ath6kl/hif/common/hif_sdio_common.h
3680  delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
3681  delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
3682  delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
3683  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.c
3684  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.h
3685  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
3686  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
3687  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
3688  delete mode 100644 drivers/staging/ath6kl/htc2/htc.c
3689  delete mode 100644 drivers/staging/ath6kl/htc2/htc_debug.h
3690  delete mode 100644 drivers/staging/ath6kl/htc2/htc_internal.h
3691  delete mode 100644 drivers/staging/ath6kl/htc2/htc_recv.c
3692  delete mode 100644 drivers/staging/ath6kl/htc2/htc_send.c
3693  delete mode 100644 drivers/staging/ath6kl/htc2/htc_services.c
3694  delete mode 100644 drivers/staging/ath6kl/include/a_config.h
3695  delete mode 100644 drivers/staging/ath6kl/include/a_debug.h
3696  delete mode 100644 drivers/staging/ath6kl/include/a_drv.h
3697  delete mode 100644 drivers/staging/ath6kl/include/a_drv_api.h
3698  delete mode 100644 drivers/staging/ath6kl/include/a_osapi.h
3699  delete mode 100644 drivers/staging/ath6kl/include/aggr_recv_api.h
3700  delete mode 100644 drivers/staging/ath6kl/include/ar3kconfig.h
3701  delete mode 100644 drivers/staging/ath6kl/include/ar6000_api.h
3702  delete mode 100644 drivers/staging/ath6kl/include/ar6000_diag.h
3703  delete mode 100644 drivers/staging/ath6kl/include/ar6kap_common.h
3704  delete mode 100644 drivers/staging/ath6kl/include/athbtfilter.h
3705  delete mode 100644 drivers/staging/ath6kl/include/bmi.h
3706  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
3707  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/addrs.h
3708  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
3709  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
3710  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
3711  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
3712  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
3713  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
3714  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
3715  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
3716  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
3717  delete mode 100644 drivers/staging/ath6kl/include/common/athdefs.h
3718  delete mode 100644 drivers/staging/ath6kl/include/common/bmi_msg.h
3719  delete mode 100644 drivers/staging/ath6kl/include/common/cnxmgmt.h
3720  delete mode 100644 drivers/staging/ath6kl/include/common/dbglog.h
3721  delete mode 100644 drivers/staging/ath6kl/include/common/dbglog_id.h
3722  delete mode 100644 drivers/staging/ath6kl/include/common/discovery.h
3723  delete mode 100644 drivers/staging/ath6kl/include/common/epping_test.h
3724  delete mode 100644 drivers/staging/ath6kl/include/common/gmboxif.h
3725  delete mode 100644 drivers/staging/ath6kl/include/common/gpio_reg.h
3726  delete mode 100644 drivers/staging/ath6kl/include/common/htc.h
3727  delete mode 100644 drivers/staging/ath6kl/include/common/htc_services.h
3728  delete mode 100644 drivers/staging/ath6kl/include/common/pkt_log.h
3729  delete mode 100644 drivers/staging/ath6kl/include/common/roaming.h
3730  delete mode 100644 drivers/staging/ath6kl/include/common/targaddrs.h
3731  delete mode 100644 drivers/staging/ath6kl/include/common/testcmd.h
3732  delete mode 100644 drivers/staging/ath6kl/include/common/tlpm.h
3733  delete mode 100644 drivers/staging/ath6kl/include/common/wlan_defs.h
3734  delete mode 100644 drivers/staging/ath6kl/include/common/wmi.h
3735  delete mode 100644 drivers/staging/ath6kl/include/common/wmix.h
3736  delete mode 100644 drivers/staging/ath6kl/include/common_drv.h
3737  delete mode 100644 drivers/staging/ath6kl/include/dbglog_api.h
3738  delete mode 100644 drivers/staging/ath6kl/include/dl_list.h
3739  delete mode 100644 drivers/staging/ath6kl/include/dset_api.h
3740  delete mode 100644 drivers/staging/ath6kl/include/hci_transport_api.h
3741  delete mode 100644 drivers/staging/ath6kl/include/hif.h
3742  delete mode 100644 drivers/staging/ath6kl/include/host_version.h
3743  delete mode 100644 drivers/staging/ath6kl/include/htc_api.h
3744  delete mode 100644 drivers/staging/ath6kl/include/htc_packet.h
3745  delete mode 100644 drivers/staging/ath6kl/include/wlan_api.h
3746  delete mode 100644 drivers/staging/ath6kl/include/wmi_api.h
3747  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kconfig.c
3748  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
3749  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
3750  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
3751  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
3752  delete mode 100644 drivers/staging/ath6kl/miscdrv/common_drv.c
3753  delete mode 100644 drivers/staging/ath6kl/miscdrv/credit_dist.c
3754  delete mode 100644 drivers/staging/ath6kl/miscdrv/miscdrv.h
3755  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_drv.c
3756  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_pm.c
3757  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
3758  delete mode 100644 drivers/staging/ath6kl/os/linux/cfg80211.c
3759  delete mode 100644 drivers/staging/ath6kl/os/linux/export_hci_transport.c
3760  delete mode 100644 drivers/staging/ath6kl/os/linux/hci_bridge.c
3761  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
3762  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
3763  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
3764  delete mode 100644 drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
3765  delete mode 100644 drivers/staging/ath6kl/os/linux/include/cfg80211.h
3766  delete mode 100644 drivers/staging/ath6kl/os/linux/include/config_linux.h
3767  delete mode 100644 drivers/staging/ath6kl/os/linux/include/debug_linux.h
3768  delete mode 100644 drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
3769  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
3770  delete mode 100644 drivers/staging/ath6kl/os/linux/include/osapi_linux.h
3771  delete mode 100644 drivers/staging/ath6kl/os/linux/include/wlan_config.h
3772  delete mode 100644 drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
3773  delete mode 100644 drivers/staging/ath6kl/os/linux/netbuf.c
3774  delete mode 100644 drivers/staging/ath6kl/reorder/aggr_rx_internal.h
3775  delete mode 100644 drivers/staging/ath6kl/reorder/rcv_aggr.c
3776  delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211.h
3777  delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211_node.h
3778  delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_node.c
3779  delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
3780  delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_utils.c
3781  delete mode 100644 drivers/staging/ath6kl/wmi/wmi.c
3782  delete mode 100644 drivers/staging/ath6kl/wmi/wmi_host.h
3783  create mode 100644 include/linux/bcma/bcma_driver_mips.h
3784  create mode 100644 include/linux/bcma/bcma_soc.h
3785  create mode 100644 include/net/cfg80211-wext.h
3786 Merging bluetooth/master
3787 $ git merge bluetooth/master
3788 Merge made by recursive.
3789  drivers/bluetooth/ath3k.c     |    1 +
3790  drivers/bluetooth/btusb.c     |   16 ++-
3791  include/net/bluetooth/l2cap.h |    3 +-
3792  net/bluetooth/af_bluetooth.c  |   36 +++++-
3793  net/bluetooth/bnep/bnep.h     |    1 +
3794  net/bluetooth/bnep/core.c     |   18 ++-
3795  net/bluetooth/cmtp/capi.c     |    3 +-
3796  net/bluetooth/cmtp/cmtp.h     |    1 +
3797  net/bluetooth/cmtp/core.c     |   25 +++--
3798  net/bluetooth/hci_conn.c      |   14 +-
3799  net/bluetooth/hci_core.c      |    8 +-
3800  net/bluetooth/hidp/core.c     |   29 +++--
3801  net/bluetooth/l2cap_core.c    |  263 ++++++++++++++---------------------------
3802  net/bluetooth/l2cap_sock.c    |   30 +++---
3803  net/bluetooth/rfcomm/core.c   |   22 ++--
3804  net/bluetooth/rfcomm/sock.c   |   28 ++--
3805  net/bluetooth/sco.c           |   28 ++--
3806  17 files changed, 249 insertions(+), 277 deletions(-)
3807 Merging mtd/master
3808 $ git merge mtd/master
3809 Already up-to-date.
3810 Merging l2-mtd/master
3811 $ git merge l2-mtd/master
3812 Resolved 'drivers/mtd/maps/lantiq-flash.c' using previous resolution.
3813 Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
3814 Auto-merging arch/arm/mach-at91/board-cam60.c
3815 Auto-merging arch/arm/mach-at91/board-cap9adk.c
3816 Auto-merging arch/arm/mach-at91/board-kb9202.c
3817 Auto-merging arch/arm/mach-at91/board-neocore926.c
3818 Auto-merging arch/arm/mach-at91/board-qil-a9260.c
3819 Auto-merging arch/arm/mach-at91/board-rm9200dk.c
3820 Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
3821 Auto-merging arch/arm/mach-at91/board-sam9260ek.c
3822 Auto-merging arch/arm/mach-at91/board-sam9261ek.c
3823 Auto-merging arch/arm/mach-at91/board-sam9263ek.c
3824 Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
3825 Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
3826 Auto-merging arch/arm/mach-at91/board-sam9rlek.c
3827 Auto-merging arch/arm/mach-at91/board-usb-a9260.c
3828 Auto-merging arch/arm/mach-at91/board-usb-a9263.c
3829 Auto-merging arch/arm/mach-at91/board-yl-9200.c
3830 Auto-merging arch/arm/mach-mmp/aspenite.c
3831 Removing drivers/mtd/maps/ceiva.c
3832 Removing drivers/mtd/maps/edb7312.c
3833 Auto-merging drivers/mtd/maps/lantiq-flash.c
3834 CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
3835 Removing drivers/mtd/nand/edb7312.c
3836 Auto-merging drivers/mtd/onenand/omap2.c
3837 Automatic merge failed; fix conflicts and then commit the result.
3838 $ git commit -v -a
3839 [master 9586116] Merge remote-tracking branch 'l2-mtd/master'
3840 $ git diff -M --stat --summary HEAD^..
3841  Documentation/DocBook/mtdnand.tmpl                 |    5 +-
3842  .../devicetree/bindings/mtd/atmel-dataflash.txt    |   14 +
3843  arch/arm/mach-at91/board-afeb-9260v1.c             |    9 +-
3844  arch/arm/mach-at91/board-cam60.c                   |    9 +-
3845  arch/arm/mach-at91/board-cap9adk.c                 |    9 +-
3846  arch/arm/mach-at91/board-kb9202.c                  |    9 +-
3847  arch/arm/mach-at91/board-neocore926.c              |    9 +-
3848  arch/arm/mach-at91/board-qil-a9260.c               |    9 +-
3849  arch/arm/mach-at91/board-rm9200dk.c                |    9 +-
3850  arch/arm/mach-at91/board-sam9-l9260.c              |    9 +-
3851  arch/arm/mach-at91/board-sam9260ek.c               |    9 +-
3852  arch/arm/mach-at91/board-sam9261ek.c               |    9 +-
3853  arch/arm/mach-at91/board-sam9263ek.c               |    9 +-
3854  arch/arm/mach-at91/board-sam9g20ek.c               |    9 +-
3855  arch/arm/mach-at91/board-sam9m10g45ek.c            |    9 +-
3856  arch/arm/mach-at91/board-sam9rlek.c                |    9 +-
3857  arch/arm/mach-at91/board-snapper9260.c             |   10 +-
3858  arch/arm/mach-at91/board-usb-a9260.c               |    9 +-
3859  arch/arm/mach-at91/board-usb-a9263.c               |    9 +-
3860  arch/arm/mach-at91/board-yl-9200.c                 |    9 +-
3861  arch/arm/mach-at91/include/mach/board.h            |    3 +-
3862  arch/arm/mach-davinci/board-da830-evm.c            |    2 +-
3863  arch/arm/mach-davinci/board-da850-evm.c            |    2 +-
3864  arch/arm/mach-davinci/board-dm355-evm.c            |    2 +-
3865  arch/arm/mach-davinci/board-dm355-leopard.c        |    2 +-
3866  arch/arm/mach-davinci/board-dm365-evm.c            |    2 +-
3867  arch/arm/mach-davinci/board-dm644x-evm.c           |    2 +-
3868  arch/arm/mach-davinci/board-mityomapl138.c         |    3 +-
3869  arch/arm/mach-davinci/board-neuros-osd2.c          |    2 +-
3870  arch/arm/mach-davinci/board-tnetv107x-evm.c        |    2 +-
3871  arch/arm/mach-davinci/include/mach/nand.h          |    4 +-
3872  arch/arm/mach-ep93xx/ts72xx.c                      |   23 +-
3873  arch/arm/mach-mmp/aspenite.c                       |    5 +-
3874  arch/arm/mach-orion5x/ts78xx-setup.c               |    2 +-
3875  arch/arm/mach-pxa/cm-x300.c                        |    5 +-
3876  arch/arm/mach-pxa/colibri-pxa3xx.c                 |    5 +-
3877  arch/arm/mach-pxa/littleton.c                      |    5 +-
3878  arch/arm/mach-pxa/mxm8x10.c                        |    9 +-
3879  arch/arm/mach-pxa/raumfeld.c                       |    5 +-
3880  arch/arm/mach-pxa/zylonite.c                       |    5 +-
3881  arch/arm/plat-pxa/include/plat/pxa3xx_nand.h       |   20 +-
3882  arch/avr32/boards/atngw100/setup.c                 |    8 +-
3883  arch/avr32/boards/atstk1000/atstk1002.c            |    9 +-
3884  arch/avr32/mach-at32ap/include/mach/board.h        |    3 +-
3885  arch/cris/arch-v32/drivers/mach-a3/nandflash.c     |    2 +-
3886  arch/cris/arch-v32/drivers/mach-fs/nandflash.c     |    2 +-
3887  drivers/mtd/Kconfig                                |   16 +-
3888  drivers/mtd/Makefile                               |    2 +-
3889  drivers/mtd/afs.c                                  |    4 +-
3890  drivers/mtd/ar7part.c                              |    2 +-
3891  drivers/mtd/chips/cfi_cmdset_0002.c                |   31 +-
3892  drivers/mtd/chips/fwh_lock.h                       |    3 +-
3893  drivers/mtd/chips/jedec_probe.c                    |   34 +-
3894  drivers/mtd/cmdlinepart.c                          |    7 +-
3895  drivers/mtd/devices/doc2000.c                      |   13 +-
3896  drivers/mtd/devices/doc2001.c                      |    7 +-
3897  drivers/mtd/devices/doc2001plus.c                  |    7 +-
3898  drivers/mtd/devices/docecc.c                       |    2 +-
3899  drivers/mtd/devices/lart.c                         |   18 +-
3900  drivers/mtd/devices/m25p80.c                       |   84 +--
3901  drivers/mtd/devices/mtd_dataflash.c                |   91 +-
3902  drivers/mtd/devices/sst25l.c                       |   42 +-
3903  drivers/mtd/ftl.c                                  |   40 +-
3904  drivers/mtd/inftlcore.c                            |   59 +-
3905  drivers/mtd/inftlmount.c                           |  116 +--
3906  drivers/mtd/maps/Kconfig                           |   22 -
3907  drivers/mtd/maps/Makefile                          |    2 -
3908  drivers/mtd/maps/bfin-async-flash.c                |   16 +-
3909  drivers/mtd/maps/ceiva.c                           |  341 -------
3910  drivers/mtd/maps/dc21285.c                         |    9 +-
3911  drivers/mtd/maps/edb7312.c                         |  134 ---
3912  drivers/mtd/maps/gpio-addr-flash.c                 |   16 +-
3913  drivers/mtd/maps/h720x-flash.c                     |   23 +-
3914  drivers/mtd/maps/impa7.c                           |   28 +-
3915  drivers/mtd/maps/intel_vr_nor.c                    |    7 +-
3916  drivers/mtd/maps/ixp2000.c                         |   11 +-
3917  drivers/mtd/maps/ixp4xx.c                          |   29 +-
3918  drivers/mtd/maps/lantiq-flash.c                    |   17 +-
3919  drivers/mtd/maps/latch-addr-flash.c                |   24 +-
3920  drivers/mtd/maps/pcmciamtd.c                       |  124 +--
3921  drivers/mtd/maps/physmap.c                         |   38 +-
3922  drivers/mtd/maps/physmap_of.c                      |   80 +--
3923  drivers/mtd/maps/plat-ram.c                        |   23 +-
3924  drivers/mtd/maps/pxa2xx-flash.c                    |   20 +-
3925  drivers/mtd/maps/rbtx4939-flash.c                  |   24 +-
3926  drivers/mtd/maps/sa1100-flash.c                    |   30 +-
3927  drivers/mtd/maps/solutionengine.c                  |   30 +-
3928  drivers/mtd/maps/wr_sbc82xx_flash.c                |   33 +-
3929  drivers/mtd/mtdblock.c                             |   18 +-
3930  drivers/mtd/mtdchar.c                              |   37 +-
3931  drivers/mtd/mtdconcat.c                            |    2 +-
3932  drivers/mtd/mtdcore.c                              |   69 +-
3933  drivers/mtd/mtdcore.h                              |    3 +
3934  drivers/mtd/mtdpart.c                              |   52 +-
3935  drivers/mtd/mtdsuper.c                             |   20 +-
3936  drivers/mtd/mtdswap.c                              |    5 +-
3937  drivers/mtd/nand/Kconfig                           |   14 +-
3938  drivers/mtd/nand/Makefile                          |    1 -
3939  drivers/mtd/nand/atmel_nand.c                      |   74 +--
3940  drivers/mtd/nand/au1550nd.c                        |   29 +-
3941  drivers/mtd/nand/autcpu12.c                        |    4 +-
3942  drivers/mtd/nand/bcm_umi_nand.c                    |   24 +-
3943  drivers/mtd/nand/cafe_nand.c                       |   21 +-
3944  drivers/mtd/nand/cmx270_nand.c                     |   23 +-
3945  drivers/mtd/nand/cs553x_nand.c                     |   15 +-
3946  drivers/mtd/nand/davinci_nand.c                    |   39 +-
3947  drivers/mtd/nand/denali.c                          |    6 +-
3948  drivers/mtd/nand/diskonchip.c                      |    6 +-
3949  drivers/mtd/nand/edb7312.c                         |  203 ----
3950  drivers/mtd/nand/fsl_elbc_nand.c                   |   75 +-
3951  drivers/mtd/nand/fsl_upm.c                         |   16 +-
3952  drivers/mtd/nand/fsmc_nand.c                       |   77 +--
3953  drivers/mtd/nand/h1910.c                           |   19 +-
3954  drivers/mtd/nand/jz4740_nand.c                     |   18 +-
3955  drivers/mtd/nand/mpc5121_nfc.c                     |   22 +-
3956  drivers/mtd/nand/mxc_nand.c                        |   33 +-
3957  drivers/mtd/nand/nand_base.c                       |  996 ++++++++++----------
3958  drivers/mtd/nand/nand_bbt.c                        |  516 +++++------
3959  drivers/mtd/nand/nand_bch.c                        |    4 +-
3960  drivers/mtd/nand/nand_ecc.c                        |   10 +-
3961  drivers/mtd/nand/nandsim.c                         |    4 +-
3962  drivers/mtd/nand/ndfc.c                            |   22 +-
3963  drivers/mtd/nand/nomadik_nand.c                    |    1 +
3964  drivers/mtd/nand/nuc900_nand.c                     |    1 +
3965  drivers/mtd/nand/omap2.c                           |   22 +-
3966  drivers/mtd/nand/orion_nand.c                      |   16 +-
3967  drivers/mtd/nand/pasemi_nand.c                     |    3 +-
3968  drivers/mtd/nand/plat_nand.c                       |   24 +-
3969  drivers/mtd/nand/ppchameleonevb.c                  |   47 +-
3970  drivers/mtd/nand/pxa3xx_nand.c                     |  471 ++++++----
3971  drivers/mtd/nand/rtc_from4.c                       |    5 +-
3972  drivers/mtd/nand/s3c2410.c                         |   27 +-
3973  drivers/mtd/nand/sharpsl.c                         |   13 +-
3974  drivers/mtd/nand/socrates_nand.c                   |   28 +-
3975  drivers/mtd/nand/tmio_nand.c                       |   17 +-
3976  drivers/mtd/nand/txx9ndfmc.c                       |    8 +-
3977  drivers/mtd/nftlcore.c                             |   27 +-
3978  drivers/mtd/nftlmount.c                            |   26 +-
3979  drivers/mtd/ofpart.c                               |  112 +++-
3980  drivers/mtd/onenand/generic.c                      |   14 +-
3981  drivers/mtd/onenand/omap2.c                        |   16 +-
3982  drivers/mtd/onenand/onenand_base.c                 |   62 +-
3983  drivers/mtd/onenand/onenand_bbt.c                  |    6 +-
3984  drivers/mtd/onenand/samsung.c                      |   13 +-
3985  drivers/mtd/redboot.c                              |   13 +-
3986  drivers/mtd/sm_ftl.c                               |   18 +-
3987  drivers/mtd/ssfdc.c                                |   44 +-
3988  drivers/mtd/tests/mtd_readtest.c                   |    3 +-
3989  fs/jffs2/scan.c                                    |    4 +-
3990  fs/jffs2/wbuf.c                                    |    3 +-
3991  include/linux/mtd/bbm.h                            |   39 +-
3992  include/linux/mtd/mtd.h                            |   38 +-
3993  include/linux/mtd/nand.h                           |   76 +-
3994  include/linux/mtd/onenand.h                        |    4 +
3995  include/linux/mtd/partitions.h                     |   46 +-
3996  include/linux/mtd/physmap.h                        |   17 -
3997  156 files changed, 2090 insertions(+), 3626 deletions(-)
3998  create mode 100644 Documentation/devicetree/bindings/mtd/atmel-dataflash.txt
3999  delete mode 100644 drivers/mtd/maps/ceiva.c
4000  delete mode 100644 drivers/mtd/maps/edb7312.c
4001  delete mode 100644 drivers/mtd/nand/edb7312.c
4002 Merging crypto/master
4003 $ git merge crypto/master
4004 Merge made by recursive.
4005  .../devicetree/bindings/crypto/picochip-spacc.txt  |   23 +
4006  arch/x86/crypto/Makefile                           |    8 +
4007  arch/x86/crypto/sha1_ssse3_asm.S                   |  558 ++++++++++++++++++++
4008  arch/x86/crypto/sha1_ssse3_glue.c                  |  240 +++++++++
4009  arch/x86/include/asm/cpufeature.h                  |    3 +
4010  crypto/Kconfig                                     |   10 +
4011  crypto/sha1_generic.c                              |    9 +-
4012  drivers/crypto/n2_core.c                           |    4 +-
4013  drivers/crypto/padlock-aes.c                       |    4 +-
4014  drivers/crypto/picoxcell_crypto.c                  |  121 ++---
4015  include/crypto/sha.h                               |    5 +
4016  11 files changed, 914 insertions(+), 71 deletions(-)
4017  create mode 100644 Documentation/devicetree/bindings/crypto/picochip-spacc.txt
4018  create mode 100644 arch/x86/crypto/sha1_ssse3_asm.S
4019  create mode 100644 arch/x86/crypto/sha1_ssse3_glue.c
4020 Merging sound/for-next
4021 $ git merge sound/for-next
4022 Removing sound/pci/hda/alc268_quirks.c
4023 Removing sound/pci/hda/alc680_quirks.c
4024 Merge made by recursive.
4025  .../bindings/sound/soc/codecs/fsl-sgtl5000.txt     |   11 +
4026  Documentation/devicetree/bindings/sound/wm8731.txt |   18 +
4027  Documentation/sound/alsa/ALSA-Configuration.txt    |    5 +
4028  Documentation/sound/alsa/HD-Audio-Models.txt       |   27 +-
4029  Documentation/sound/alsa/HD-Audio.txt              |   48 ++
4030  arch/mips/alchemy/devboards/db1200/platform.c      |   16 +
4031  arch/mips/alchemy/devboards/db1x00/platform.c      |   48 ++
4032  include/linux/mfd/wm8994/registers.h               |   39 ++
4033  include/sound/soc-dapm.h                           |    2 +
4034  include/sound/soc.h                                |    9 +
4035  sound/firewire/isight.c                            |    1 -
4036  sound/mips/Kconfig                                 |    5 +-
4037  sound/pci/ac97/ac97_patch.c                        |    1 +
4038  sound/pci/hda/Makefile                             |    3 +
4039  sound/pci/hda/alc260_quirks.c                      |  304 ---------
4040  sound/pci/hda/alc262_quirks.c                      |  508 +--------------
4041  sound/pci/hda/alc268_quirks.c                      |  636 ------------------
4042  sound/pci/hda/alc269_quirks.c                      |  250 -------
4043  sound/pci/hda/alc662_quirks.c                      |  131 ----
4044  sound/pci/hda/alc680_quirks.c                      |  222 -------
4045  sound/pci/hda/alc861vd_quirks.c                    |  217 -------
4046  sound/pci/hda/hda_codec.c                          |   35 +-
4047  sound/pci/hda/hda_intel.c                          |   68 ++-
4048  sound/pci/hda/hda_local.h                          |    2 +
4049  sound/pci/hda/hda_trace.h                          |  117 ++++
4050  sound/pci/hda/patch_realtek.c                      |  152 ++---
4051  sound/pci/oxygen/xonar_pcm179x.c                   |    1 +
4052  sound/pci/rme9652/hdspm.c                          |  139 +++--
4053  sound/soc/Kconfig                                  |    3 +
4054  sound/soc/Makefile                                 |    1 +
4055  sound/soc/au1x/Kconfig                             |   28 +
4056  sound/soc/au1x/Makefile                            |   10 +
4057  sound/soc/au1x/ac97c.c                             |  365 +++++++++++
4058  sound/soc/au1x/db1000.c                            |   75 +++
4059  sound/soc/au1x/db1200.c                            |   64 ++-
4060  sound/soc/au1x/dbdma2.c                            |   91 +---
4061  sound/soc/au1x/dma.c                               |  377 +++++++++++
4062  sound/soc/au1x/i2sc.c                              |  347 ++++++++++
4063  sound/soc/au1x/psc-ac97.c                          |   48 +-
4064  sound/soc/au1x/psc-i2s.c                           |   42 +-
4065  sound/soc/au1x/psc.h                               |   16 +-
4066  sound/soc/codecs/sgtl5000.c                        |    8 +
4067  sound/soc/codecs/wm1250-ev1.c                      |   20 +-
4068  sound/soc/codecs/wm8523.c                          |    2 +-
4069  sound/soc/codecs/wm8580.c                          |    2 +-
4070  sound/soc/codecs/wm8711.c                          |    4 +-
4071  sound/soc/codecs/wm8728.c                          |    4 +-
4072  sound/soc/codecs/wm8731.c                          |   10 +
4073  sound/soc/codecs/wm8741.c                          |  126 +++-
4074  sound/soc/codecs/wm8753.c                          |    4 +-
4075  sound/soc/codecs/wm8993.c                          |    3 +-
4076  sound/soc/codecs/wm8994-tables.c                   |    4 +-
4077  sound/soc/codecs/wm8994.c                          |    6 +-
4078  sound/soc/codecs/wm_hubs.c                         |   32 +-
4079  sound/soc/codecs/wm_hubs.h                         |    3 +-
4080  sound/soc/mxs/Kconfig                              |   20 +
4081  sound/soc/mxs/Makefile                             |   10 +
4082  sound/soc/mxs/mxs-pcm.c                            |  359 +++++++++++
4083  sound/soc/mxs/mxs-pcm.h                            |   43 ++
4084  sound/soc/mxs/mxs-saif.c                           |  677 ++++++++++++++++++++
4085  sound/soc/mxs/mxs-saif.h                           |  130 ++++
4086  sound/soc/mxs/mxs-sgtl5000.c                       |  165 +++++
4087  sound/soc/samsung/smdk_wm8580.c                    |    6 +-
4088  sound/soc/samsung/smdk_wm8580pcm.c                 |    4 +-
4089  sound/soc/samsung/speyside.c                       |    5 +-
4090  sound/soc/soc-core.c                               |    4 +-
4091  sound/soc/soc-dapm.c                               |    6 +-
4092  sound/soc/soc-io.c                                 |  323 ++--------
4093  sound/usb/caiaq/audio.c                            |   31 +-
4094  sound/usb/caiaq/device.h                           |    1 +
4095  70 files changed, 3555 insertions(+), 2939 deletions(-)
4096  create mode 100644 Documentation/devicetree/bindings/sound/soc/codecs/fsl-sgtl5000.txt
4097  create mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt
4098  delete mode 100644 sound/pci/hda/alc268_quirks.c
4099  delete mode 100644 sound/pci/hda/alc680_quirks.c
4100  create mode 100644 sound/pci/hda/hda_trace.h
4101  create mode 100644 sound/soc/au1x/ac97c.c
4102  create mode 100644 sound/soc/au1x/db1000.c
4103  create mode 100644 sound/soc/au1x/dma.c
4104  create mode 100644 sound/soc/au1x/i2sc.c
4105  create mode 100644 sound/soc/mxs/Kconfig
4106  create mode 100644 sound/soc/mxs/Makefile
4107  create mode 100644 sound/soc/mxs/mxs-pcm.c
4108  create mode 100644 sound/soc/mxs/mxs-pcm.h
4109  create mode 100644 sound/soc/mxs/mxs-saif.c
4110  create mode 100644 sound/soc/mxs/mxs-saif.h
4111  create mode 100644 sound/soc/mxs/mxs-sgtl5000.c
4112 Merging sound-asoc/for-next
4113 $ git merge sound-asoc/for-next
4114 Merge made by recursive.
4115  Documentation/devicetree/bindings/sound/wm8510.txt |   18 +
4116  Documentation/devicetree/bindings/sound/wm8523.txt |   16 +
4117  Documentation/devicetree/bindings/sound/wm8580.txt |   16 +
4118  Documentation/devicetree/bindings/sound/wm8711.txt |   18 +
4119  Documentation/devicetree/bindings/sound/wm8728.txt |   18 +
4120  Documentation/devicetree/bindings/sound/wm8737.txt |   18 +
4121  Documentation/devicetree/bindings/sound/wm8741.txt |   18 +
4122  Documentation/devicetree/bindings/sound/wm8750.txt |   18 +
4123  Documentation/devicetree/bindings/sound/wm8753.txt |   18 +
4124  include/linux/mfd/wm8994/registers.h               |   45 +
4125  include/sound/adau1373.h                           |   34 +
4126  sound/soc/blackfin/Kconfig                         |   13 +
4127  sound/soc/blackfin/Makefile                        |    2 +
4128  sound/soc/blackfin/bf5xx-ad193x.c                  |    2 +-
4129  sound/soc/blackfin/bfin-eval-adau1373.c            |  202 +++
4130  sound/soc/codecs/Kconfig                           |    4 +
4131  sound/soc/codecs/Makefile                          |    2 +
4132  sound/soc/codecs/ad193x.c                          |   11 +-
4133  sound/soc/codecs/ad193x.h                          |    5 +-
4134  sound/soc/codecs/adau1373.c                        | 1414 ++++++++++++++++++++
4135  sound/soc/codecs/adau1373.h                        |   29 +
4136  sound/soc/codecs/sta32x.c                          |    9 +-
4137  sound/soc/codecs/wm1250-ev1.c                      |    2 +-
4138  sound/soc/codecs/wm8510.c                          |    8 +
4139  sound/soc/codecs/wm8523.c                          |    7 +
4140  sound/soc/codecs/wm8580.c                          |    7 +
4141  sound/soc/codecs/wm8711.c                          |    9 +
4142  sound/soc/codecs/wm8728.c                          |    9 +
4143  sound/soc/codecs/wm8737.c                          |   10 +
4144  sound/soc/codecs/wm8741.c                          |    9 +
4145  sound/soc/codecs/wm8750.c                          |   14 +-
4146  sound/soc/codecs/wm8753.c                          |    9 +
4147  sound/soc/codecs/wm8962.c                          |    8 +-
4148  sound/soc/codecs/wm8993.c                          |    4 +
4149  sound/soc/codecs/wm8994-tables.c                   |   12 +-
4150  sound/soc/codecs/wm8994.c                          |  264 +++-
4151  sound/soc/codecs/wm8994.h                          |    2 +
4152  sound/soc/codecs/wm_hubs.c                         |   16 +
4153  sound/soc/nuc900/nuc900-pcm.c                      |    1 -
4154  sound/soc/pxa/spitz.c                              |    2 +-
4155  sound/soc/pxa/z2.c                                 |    2 +-
4156  sound/soc/s6000/s6000-pcm.c                        |    1 -
4157  sound/soc/samsung/h1940_uda1380.c                  |    1 +
4158  sound/soc/samsung/jive_wm8750.c                    |    2 +-
4159  sound/soc/samsung/rx1950_uda1380.c                 |    1 +
4160  sound/soc/samsung/smartq_wm8987.c                  |    2 +-
4161  sound/soc/samsung/speyside_wm8962.c                |    4 +-
4162  sound/soc/soc-cache.c                              |    7 -
4163  sound/soc/soc-dapm.c                               |    6 +-
4164  sound/soc/soc-io.c                                 |   11 +-
4165  sound/soc/soc-jack.c                               |    2 +-
4166  sound/soc/soc-pcm.c                                |    2 -
4167  52 files changed, 2262 insertions(+), 102 deletions(-)
4168  create mode 100644 Documentation/devicetree/bindings/sound/wm8510.txt
4169  create mode 100644 Documentation/devicetree/bindings/sound/wm8523.txt
4170  create mode 100644 Documentation/devicetree/bindings/sound/wm8580.txt
4171  create mode 100644 Documentation/devicetree/bindings/sound/wm8711.txt
4172  create mode 100644 Documentation/devicetree/bindings/sound/wm8728.txt
4173  create mode 100644 Documentation/devicetree/bindings/sound/wm8737.txt
4174  create mode 100644 Documentation/devicetree/bindings/sound/wm8741.txt
4175  create mode 100644 Documentation/devicetree/bindings/sound/wm8750.txt
4176  create mode 100644 Documentation/devicetree/bindings/sound/wm8753.txt
4177  create mode 100644 include/sound/adau1373.h
4178  create mode 100644 sound/soc/blackfin/bfin-eval-adau1373.c
4179  create mode 100644 sound/soc/codecs/adau1373.c
4180  create mode 100644 sound/soc/codecs/adau1373.h
4181 Merging cpufreq/next
4182 $ git merge cpufreq/next
4183 Merge made by recursive.
4184  Documentation/cpu-freq/governors.txt |    2 +-
4185  drivers/cpufreq/cpufreq_ondemand.c   |    2 +-
4186  drivers/cpufreq/e_powersaver.c       |  135 +++++++++++++++++++++++++++++++---
4187  drivers/cpufreq/exynos4210-cpufreq.c |   23 ++++++-
4188  4 files changed, 148 insertions(+), 14 deletions(-)
4189 Merging quilt/rr
4190 $ git merge quilt/rr
4191 Merge made by recursive.
4192  arch/x86/lguest/boot.c        |   10 ++++++++++
4193  drivers/char/virtio_console.c |   10 ++++------
4194  drivers/lguest/core.c         |    2 +-
4195  drivers/net/virtio_net.c      |   14 +++++---------
4196  include/linux/virtio_config.h |    3 +++
4197  5 files changed, 23 insertions(+), 16 deletions(-)
4198 Merging input/next
4199 $ git merge input/next
4200 Auto-merging drivers/input/misc/Kconfig
4201 Auto-merging drivers/input/misc/Makefile
4202 Merge made by recursive.
4203  drivers/input/input-polldev.c        |    6 +-
4204  drivers/input/misc/Kconfig           |   45 ++-
4205  drivers/input/misc/Makefile          |    4 +-
4206  drivers/input/misc/bma150.c          |  691 ++++++++++++++++++++++++++++++++++
4207  drivers/input/misc/pm8xxx-vibrator.c |  296 +++++++++++++++
4208  include/linux/bma150.h               |   46 +++
4209  6 files changed, 1074 insertions(+), 14 deletions(-)
4210  create mode 100644 drivers/input/misc/bma150.c
4211  create mode 100644 drivers/input/misc/pm8xxx-vibrator.c
4212  create mode 100644 include/linux/bma150.h
4213 Merging input-mt/next
4214 $ git merge input-mt/next
4215 Already up-to-date.
4216 Merging lsm/for-next
4217 $ git merge lsm/for-next
4218 Already up-to-date.
4219 Merging block/for-next
4220 $ git merge block/for-next
4221 Auto-merging Documentation/kernel-parameters.txt
4222 Auto-merging block/blk-core.c
4223 Merge made by recursive.
4224  Documentation/block/cfq-iosched.txt |   71 +++++++++
4225  Documentation/kernel-parameters.txt |    9 +-
4226  block/Kconfig                       |   10 ++
4227  block/Makefile                      |    1 +
4228  block/blk-core.c                    |    8 +-
4229  block/blk-flush.c                   |   25 +++-
4230  block/blk-softirq.c                 |    8 +
4231  block/blk-throttle.c                |    4 +-
4232  block/blk.h                         |    2 +
4233  block/bsg-lib.c                     |  298 +++++++++++++++++++++++++++++++++++
4234  block/cfq-iosched.c                 |    3 +
4235  block/genhd.c                       |    8 +-
4236  drivers/block/Kconfig               |   17 ++-
4237  drivers/block/drbd/drbd_nl.c        |    4 +-
4238  drivers/block/loop.c                |  297 ++++++++++++++++++++++++-----------
4239  drivers/block/swim3.c               |    1 +
4240  drivers/block/xen-blkfront.c        |    6 +-
4241  drivers/cdrom/cdrom.c               |    8 +-
4242  include/linux/blk_types.h           |    7 +-
4243  include/linux/blkdev.h              |    5 +
4244  include/linux/blktrace_api.h        |    5 +-
4245  include/linux/bsg-lib.h             |   73 +++++++++
4246  include/linux/loop.h                |    5 +-
4247  include/linux/miscdevice.h          |    1 +
4248  include/trace/events/block.h        |   20 ++-
4249  kernel/trace/blktrace.c             |   21 ++-
4250  26 files changed, 782 insertions(+), 135 deletions(-)
4251  create mode 100644 block/bsg-lib.c
4252  create mode 100644 include/linux/bsg-lib.h
4253 Merging quilt/device-mapper
4254 $ git merge quilt/device-mapper
4255 Merge made by recursive.
4256  Documentation/device-mapper/persistent-data.txt    |   84 +
4257  Documentation/device-mapper/thin-provisioning.txt  |  275 +++
4258  drivers/md/Kconfig                                 |    9 +
4259  drivers/md/Makefile                                |    3 +
4260  drivers/md/dm-crypt.c                              |    1 +
4261  drivers/md/dm-flakey.c                             |    4 +-
4262  drivers/md/dm-kcopyd.c                             |   31 +-
4263  drivers/md/dm-raid.c                               |    2 +-
4264  drivers/md/dm-table.c                              |   84 +-
4265  drivers/md/dm-thin-metadata.c                      | 1404 ++++++++++++
4266  drivers/md/dm-thin-metadata.h                      |  168 ++
4267  drivers/md/dm-thin.c                               | 2279 ++++++++++++++++++++
4268  drivers/md/dm.c                                    |   11 +
4269  drivers/md/persistent-data/Kconfig                 |    7 +
4270  drivers/md/persistent-data/Makefile                |    9 +
4271  drivers/md/persistent-data/dm-block-manager.c      |  998 +++++++++
4272  drivers/md/persistent-data/dm-block-manager.h      |  134 ++
4273  drivers/md/persistent-data/dm-btree-internal.h     |  133 ++
4274  drivers/md/persistent-data/dm-btree-remove.c       |  571 +++++
4275  drivers/md/persistent-data/dm-btree-spine.c        |  222 ++
4276  drivers/md/persistent-data/dm-btree.c              |  861 ++++++++
4277  drivers/md/persistent-data/dm-btree.h              |  158 ++
4278  .../persistent-data/dm-persistent-data-internal.h  |   20 +
4279  drivers/md/persistent-data/dm-space-map-common.h   |   94 +
4280  drivers/md/persistent-data/dm-space-map-disk.c     |  663 ++++++
4281  drivers/md/persistent-data/dm-space-map-disk.h     |   25 +
4282  drivers/md/persistent-data/dm-space-map-metadata.c |  956 ++++++++
4283  drivers/md/persistent-data/dm-space-map-metadata.h |   33 +
4284  drivers/md/persistent-data/dm-space-map.h          |  118 +
4285  .../md/persistent-data/dm-transaction-manager.c    |  414 ++++
4286  .../md/persistent-data/dm-transaction-manager.h    |  130 ++
4287  include/linux/device-mapper.h                      |   40 +-
4288  include/linux/dm-kcopyd.h                          |    4 +
4289  33 files changed, 9924 insertions(+), 21 deletions(-)
4290  create mode 100644 Documentation/device-mapper/persistent-data.txt
4291  create mode 100644 Documentation/device-mapper/thin-provisioning.txt
4292  create mode 100644 drivers/md/dm-thin-metadata.c
4293  create mode 100644 drivers/md/dm-thin-metadata.h
4294  create mode 100644 drivers/md/dm-thin.c
4295  create mode 100644 drivers/md/persistent-data/Kconfig
4296  create mode 100644 drivers/md/persistent-data/Makefile
4297  create mode 100644 drivers/md/persistent-data/dm-block-manager.c
4298  create mode 100644 drivers/md/persistent-data/dm-block-manager.h
4299  create mode 100644 drivers/md/persistent-data/dm-btree-internal.h
4300  create mode 100644 drivers/md/persistent-data/dm-btree-remove.c
4301  create mode 100644 drivers/md/persistent-data/dm-btree-spine.c
4302  create mode 100644 drivers/md/persistent-data/dm-btree.c
4303  create mode 100644 drivers/md/persistent-data/dm-btree.h
4304  create mode 100644 drivers/md/persistent-data/dm-persistent-data-internal.h
4305  create mode 100644 drivers/md/persistent-data/dm-space-map-common.h
4306  create mode 100644 drivers/md/persistent-data/dm-space-map-disk.c
4307  create mode 100644 drivers/md/persistent-data/dm-space-map-disk.h
4308  create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.c
4309  create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.h
4310  create mode 100644 drivers/md/persistent-data/dm-space-map.h
4311  create mode 100644 drivers/md/persistent-data/dm-transaction-manager.c
4312  create mode 100644 drivers/md/persistent-data/dm-transaction-manager.h
4313 Merging embedded/master
4314 $ git merge embedded/master
4315 Already up-to-date.
4316 Merging firmware/master
4317 $ git merge firmware/master
4318 Already up-to-date.
4319 Merging pcmcia/master
4320 $ git merge pcmcia/master
4321 Already up-to-date.
4322 Merging battery/master
4323 $ git merge battery/master
4324 Already up-to-date.
4325 Merging leds/for-mm
4326 $ git merge leds/for-mm
4327 Resolved 'drivers/leds/Kconfig' using previous resolution.
4328 Auto-merging drivers/leds/Kconfig
4329 CONFLICT (content): Merge conflict in drivers/leds/Kconfig
4330 Automatic merge failed; fix conflicts and then commit the result.
4331 $ git commit -v -a
4332 [master 8c12173] Merge remote-tracking branch 'leds/for-mm'
4333 $ git diff -M --stat --summary HEAD^..
4334 Merging backlight/for-mm
4335 $ git merge backlight/for-mm
4336 Already up-to-date.
4337 Merging mmc/mmc-next
4338 $ git merge mmc/mmc-next
4339 Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c
4340 Merge made by recursive.
4341  drivers/mmc/core/host.c            |   11 ++++++++
4342  drivers/mmc/host/sdhci-esdhc-imx.c |   45 +++++++++++++++++++++++++++++++++--
4343  2 files changed, 53 insertions(+), 3 deletions(-)
4344 Merging kgdb/kgdb-next
4345 $ git merge kgdb/kgdb-next
4346 Merge made by recursive.
4347 Merging slab/for-next
4348 $ git merge slab/for-next
4349 Already up-to-date!
4350 Merge made by recursive.
4351 Merging uclinux/for-next
4352 $ git merge uclinux/for-next
4353 Already up-to-date.
4354 Merging md/for-next
4355 $ git merge md/for-next
4356 Merge made by recursive.
4357  drivers/md/md.c    |   12 +++++++++++-
4358  drivers/md/raid5.c |    6 ++----
4359  2 files changed, 13 insertions(+), 5 deletions(-)
4360 Merging mfd/for-next
4361 $ git merge mfd/for-next
4362 Already up-to-date.
4363 Merging hdlc/hdlc-next
4364 $ git merge hdlc/hdlc-next
4365 Already up-to-date.
4366 Merging drm/drm-next
4367 $ git merge drm/drm-next
4368 Already up-to-date.
4369 Merging fbdev/master
4370 $ git merge fbdev/master
4371 Auto-merging arch/powerpc/platforms/85xx/p1022_ds.c
4372 Auto-merging arch/powerpc/platforms/86xx/mpc8610_hpcd.c
4373 Auto-merging arch/powerpc/sysdev/fsl_soc.h
4374 Auto-merging drivers/staging/xgifb/XGI_main_26.c
4375 Auto-merging drivers/video/atmel_lcdfb.c
4376 Auto-merging drivers/video/backlight/adp8860_bl.c
4377 Auto-merging drivers/video/controlfb.c
4378 Auto-merging drivers/video/fb_defio.c
4379 Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
4380 Auto-merging drivers/video/platinumfb.c
4381 Auto-merging drivers/video/via/viafbdev.c
4382 Merge made by recursive.
4383  arch/powerpc/platforms/512x/mpc512x_shared.c |   22 +-
4384  arch/powerpc/platforms/85xx/p1022_ds.c       |   47 +--
4385  arch/powerpc/platforms/86xx/mpc8610_hpcd.c   |   55 ++--
4386  arch/powerpc/sysdev/fsl_soc.h                |   25 +-
4387  drivers/staging/xgifb/XGI_main_26.c          |   22 +-
4388  drivers/video/68328fb.c                      |    4 +-
4389  drivers/video/Kconfig                        |   16 +-
4390  drivers/video/Makefile                       |    1 +
4391  drivers/video/acornfb.c                      |    5 +-
4392  drivers/video/arkfb.c                        |    9 +-
4393  drivers/video/atmel_lcdfb.c                  |   15 +-
4394  drivers/video/aty/radeon_base.c              |   10 +-
4395  drivers/video/au1200fb.c                     |  297 ++++++--------
4396  drivers/video/backlight/adp8860_bl.c         |    1 -
4397  drivers/video/backlight/adp8870_bl.c         |    1 -
4398  drivers/video/controlfb.c                    |    2 +-
4399  drivers/video/da8xx-fb.c                     |  155 +++++++-
4400  drivers/video/fb-puv3.c                      |    4 +-
4401  drivers/video/fb_defio.c                     |    3 +-
4402  drivers/video/fsl-diu-fb.c                   |   74 +++-
4403  drivers/video/g364fb.c                       |    5 +-
4404  drivers/video/grvga.c                        |  579 ++++++++++++++++++++++++++
4405  drivers/video/gxt4500.c                      |    4 +-
4406  drivers/video/hgafb.c                        |    4 +-
4407  drivers/video/imsttfb.c                      |    2 +-
4408  drivers/video/intelfb/intelfbhw.c            |    6 +-
4409  drivers/video/mb862xx/mb862xxfbdrv.c         |    2 +-
4410  drivers/video/mx3fb.c                        |    6 +-
4411  drivers/video/neofb.c                        |    4 +-
4412  drivers/video/platinumfb.c                   |    2 +-
4413  drivers/video/pm2fb.c                        |    6 +-
4414  drivers/video/pm3fb.c                        |    6 +-
4415  drivers/video/pxa3xx-gcu.c                   |    2 -
4416  drivers/video/s3c-fb.c                       |    2 +-
4417  drivers/video/s3fb.c                         |    9 +-
4418  drivers/video/savage/savagefb_driver.c       |   16 +-
4419  drivers/video/sis/sis_main.c                 |   30 +-
4420  drivers/video/skeletonfb.c                   |    2 +-
4421  drivers/video/sm501fb.c                      |    6 +-
4422  drivers/video/tridentfb.c                    |    4 +-
4423  drivers/video/valkyriefb.c                   |    2 +-
4424  drivers/video/vfb.c                          |    4 +-
4425  drivers/video/vga16fb.c                      |    2 +-
4426  drivers/video/via/via_modesetting.h          |    5 +
4427  drivers/video/via/viafbdev.c                 |   16 +-
4428  drivers/video/vt8500lcdfb.c                  |    4 +-
4429  drivers/video/vt8623fb.c                     |    9 +-
4430  drivers/video/xilinxfb.c                     |    1 -
4431  48 files changed, 1110 insertions(+), 398 deletions(-)
4432  create mode 100644 drivers/video/grvga.c
4433 Merging viafb/viafb-next
4434 $ git merge viafb/viafb-next
4435 Auto-merging drivers/video/via/viafbdev.c
4436 Merge made by recursive.
4437  drivers/video/via/dvi.c             |   34 +--
4438  drivers/video/via/dvi.h             |    3 +-
4439  drivers/video/via/global.c          |    2 +
4440  drivers/video/via/global.h          |    2 +
4441  drivers/video/via/hw.c              |  544 ++++++-----------------------------
4442  drivers/video/via/hw.h              |  285 +------------------
4443  drivers/video/via/lcd.c             |   53 ++--
4444  drivers/video/via/lcd.h             |    7 +-
4445  drivers/video/via/share.h           |   23 +--
4446  drivers/video/via/via-core.c        |    2 +-
4447  drivers/video/via/via_modesetting.c |  104 +++++++
4448  drivers/video/via/via_modesetting.h |   18 ++
4449  drivers/video/via/viafbdev.c        |   40 +--
4450  drivers/video/via/viamode.c         |   60 +++-
4451  drivers/video/via/viamode.h         |    4 +-
4452  15 files changed, 323 insertions(+), 858 deletions(-)
4453 Merging omap_dss2/for-next
4454 $ git merge omap_dss2/for-next
4455 Already up-to-date.
4456 Merging voltage/for-next
4457 $ git merge voltage/for-next
4458 Merge made by recursive.
4459  drivers/regulator/88pm8607.c           |    2 +-
4460  drivers/regulator/aat2870-regulator.c  |    1 +
4461  drivers/regulator/max8649.c            |    2 +-
4462  drivers/regulator/max8952.c            |    3 ---
4463  drivers/regulator/tps65023-regulator.c |   11 +++++++++++
4464  drivers/regulator/tps6507x-regulator.c |    8 +-------
4465  drivers/regulator/tps65912-regulator.c |    2 --
4466  include/linux/regulator/consumer.h     |    2 +-
4467  8 files changed, 16 insertions(+), 15 deletions(-)
4468 Merging security/next
4469 $ git merge security/next
4470 Auto-merging Documentation/kernel-parameters.txt
4471 Auto-merging fs/gfs2/inode.c
4472 Auto-merging fs/xfs/xfs_iops.c
4473 Removing security/integrity/ima/ima_iint.c
4474 Merge made by recursive.
4475  Documentation/ABI/testing/evm       |   23 ++
4476  Documentation/kernel-parameters.txt |    6 +
4477  fs/attr.c                           |    5 +-
4478  fs/btrfs/xattr.c                    |   50 +++---
4479  fs/cifs/xattr.c                     |   40 ++--
4480  fs/ext2/xattr_security.c            |   34 ++--
4481  fs/ext3/xattr_security.c            |   36 ++--
4482  fs/ext4/xattr_security.c            |   36 ++--
4483  fs/gfs2/inode.c                     |   38 ++--
4484  fs/jffs2/security.c                 |   35 ++--
4485  fs/jfs/xattr.c                      |   57 +++---
4486  fs/ocfs2/xattr.c                    |   38 +++--
4487  fs/reiserfs/xattr_security.c        |    4 +-
4488  fs/xattr.c                          |   63 ++++++-
4489  fs/xfs/xfs_iops.c                   |   39 ++--
4490  include/linux/evm.h                 |   92 +++++++++
4491  include/linux/ima.h                 |   13 --
4492  include/linux/integrity.h           |   38 ++++
4493  include/linux/security.h            |   28 ++-
4494  include/linux/xattr.h               |   14 ++-
4495  mm/shmem.c                          |    4 +-
4496  security/Kconfig                    |    2 +-
4497  security/Makefile                   |    4 +-
4498  security/commoncap.c                |   16 +-
4499  security/integrity/Kconfig          |    7 +
4500  security/integrity/Makefile         |   12 +
4501  security/integrity/evm/Kconfig      |   14 ++
4502  security/integrity/evm/Makefile     |    6 +
4503  security/integrity/evm/evm.h        |   38 ++++
4504  security/integrity/evm/evm_crypto.c |  216 ++++++++++++++++++++
4505  security/integrity/evm/evm_main.c   |  384 +++++++++++++++++++++++++++++++++++
4506  security/integrity/evm/evm_secfs.c  |  108 ++++++++++
4507  security/integrity/iint.c           |  171 ++++++++++++++++
4508  security/integrity/ima/Kconfig      |    1 +
4509  security/integrity/ima/Makefile     |    2 +-
4510  security/integrity/ima/ima.h        |   29 +--
4511  security/integrity/ima/ima_api.c    |    7 +-
4512  security/integrity/ima/ima_iint.c   |  169 ---------------
4513  security/integrity/ima/ima_main.c   |   12 +-
4514  security/integrity/integrity.h      |   47 +++++
4515  security/security.c                 |   71 ++++++-
4516  security/tomoyo/gc.c                |    2 +-
4517  42 files changed, 1576 insertions(+), 435 deletions(-)
4518  create mode 100644 Documentation/ABI/testing/evm
4519  create mode 100644 include/linux/evm.h
4520  create mode 100644 include/linux/integrity.h
4521  create mode 100644 security/integrity/Kconfig
4522  create mode 100644 security/integrity/Makefile
4523  create mode 100644 security/integrity/evm/Kconfig
4524  create mode 100644 security/integrity/evm/Makefile
4525  create mode 100644 security/integrity/evm/evm.h
4526  create mode 100644 security/integrity/evm/evm_crypto.c
4527  create mode 100644 security/integrity/evm/evm_main.c
4528  create mode 100644 security/integrity/evm/evm_secfs.c
4529  create mode 100644 security/integrity/iint.c
4530  delete mode 100644 security/integrity/ima/ima_iint.c
4531  create mode 100644 security/integrity/integrity.h
4532 Merging selinux/master
4533 $ git merge selinux/master
4534 Already up-to-date.
4535 Merging lblnet/master
4536 $ git merge lblnet/master
4537 Already up-to-date.
4538 Merging agp/agp-next
4539 $ git merge agp/agp-next
4540 Merge made by recursive.
4541 Merging watchdog/master
4542 $ git merge watchdog/master
4543 Merge made by recursive.
4544  drivers/watchdog/hpwdt.c        |    9 +++++----
4545  drivers/watchdog/watchdog_dev.c |   14 +++++++-------
4546  2 files changed, 12 insertions(+), 11 deletions(-)
4547 Merging bdev/master
4548 $ git merge bdev/master
4549 Already up-to-date.
4550 Merging dwmw2-iommu/master
4551 $ git merge dwmw2-iommu/master
4552 Already up-to-date.
4553 Merging cputime/cputime
4554 $ git merge cputime/cputime
4555 Already up-to-date.
4556 Merging osd/linux-next
4557 $ git merge osd/linux-next
4558 Merge made by recursive.
4559  fs/exofs/exofs.h       |    3 --
4560  fs/exofs/super.c       |   57 ++++++++++++++++++-----------------------------
4561  include/scsi/osd_ore.h |    2 +
4562  3 files changed, 24 insertions(+), 38 deletions(-)
4563 Merging jc_docs/docs-next
4564 $ git merge jc_docs/docs-next
4565 Already up-to-date.
4566 Merging nommu/master
4567 $ git merge nommu/master
4568 Already up-to-date.
4569 Merging trivial/for-next
4570 $ git merge trivial/for-next
4571 Auto-merging fs/eventpoll.c
4572 Auto-merging lib/idr.c
4573 Merge made by recursive.
4574  Documentation/ABI/removed/o2cb                     |    2 +-
4575  Documentation/ABI/testing/sysfs-bus-bcma           |    8 ++++----
4576  .../testing/sysfs-class-backlight-driver-adp8870   |   16 ++++++++--------
4577  drivers/usb/serial/mos7720.c                       |    1 -
4578  drivers/usb/serial/mos7840.c                       |    1 -
4579  fs/eventpoll.c                                     |    2 +-
4580  lib/idr.c                                          |    2 +-
4581  7 files changed, 15 insertions(+), 17 deletions(-)
4582 Merging audit/for-next
4583 $ git merge audit/for-next
4584 Already up-to-date.
4585 Merging pm/linux-next
4586 $ git merge pm/linux-next
4587 Auto-merging arch/arm/mach-shmobile/setup-sh7372.c
4588 Merge made by recursive.
4589  Documentation/power/basic-pm-debugging.txt   |   24 +++
4590  Documentation/power/runtime_pm.txt           |    1 +
4591  arch/arm/mach-shmobile/include/mach/sh7372.h |    3 +
4592  arch/arm/mach-shmobile/pm-sh7372.c           |   48 +----
4593  arch/arm/mach-shmobile/setup-sh7372.c        |    3 +
4594  drivers/base/power/domain.c                  |  276 ++++++++++++++++----------
4595  drivers/base/power/main.c                    |   31 +++-
4596  drivers/base/power/runtime.c                 |   15 ++-
4597  include/linux/pm_domain.h                    |   25 ++-
4598  include/linux/suspend.h                      |   52 +++++
4599  kernel/power/Kconfig                         |    4 +
4600  kernel/power/main.c                          |  102 ++++++++++
4601  kernel/power/suspend.c                       |   17 ++-
4602  13 files changed, 433 insertions(+), 168 deletions(-)
4603 Merging apm/for-next
4604 $ git merge apm/for-next
4605 Already up-to-date.
4606 Merging fsnotify/for-next
4607 $ git merge fsnotify/for-next
4608 Auto-merging fs/cachefiles/namei.c
4609 Auto-merging fs/nfsd/vfs.c
4610 Auto-merging fs/notify/fanotify/fanotify_user.c
4611 Auto-merging fs/notify/group.c
4612 Auto-merging fs/notify/mark.c
4613 Auto-merging include/linux/fsnotify_backend.h
4614 Merge made by recursive.
4615  fs/cachefiles/namei.c              |    1 -
4616  fs/cachefiles/xattr.c              |    1 -
4617  fs/nfsd/vfs.c                      |    3 -
4618  fs/notify/dnotify/dnotify.c        |   15 +++---
4619  fs/notify/fanotify/fanotify.c      |   24 +++++----
4620  fs/notify/fanotify/fanotify_user.c |  101 +++++++++++++++++++++++++-----------
4621  fs/notify/group.c                  |    1 +
4622  fs/notify/mark.c                   |   36 +++++--------
4623  include/linux/fanotify.h           |    5 ++-
4624  include/linux/fsnotify_backend.h   |   14 ++++-
4625  10 files changed, 121 insertions(+), 80 deletions(-)
4626 Merging irda/for-next
4627 $ git merge irda/for-next
4628 Already up-to-date.
4629 Merging i7core_edac/linux_next
4630 $ git merge i7core_edac/linux_next
4631 Auto-merging drivers/edac/i7core_edac.c
4632 Merge made by recursive.
4633  drivers/edac/i7core_edac.c |   23 ++++++++++++++++++++---
4634  1 files changed, 20 insertions(+), 3 deletions(-)
4635 Merging i7300_edac/linux_next
4636 $ git merge i7300_edac/linux_next
4637 Resolved 'arch/x86/kernel/cpu/mcheck/mce.c' using previous resolution.
4638 Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
4639 CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
4640 Removing drivers/edac/edac_mce.c
4641 Auto-merging drivers/edac/i7core_edac.c
4642 Auto-merging include/linux/edac.h
4643 Removing include/linux/edac_mce.h
4644 Automatic merge failed; fix conflicts and then commit the result.
4645 $ git commit -v -a
4646 [master d4fefa7] Merge remote-tracking branch 'i7300_edac/linux_next'
4647 $ git diff -M --stat --summary HEAD^..
4648  arch/x86/kernel/cpu/mcheck/mce.c |   18 +--
4649  drivers/edac/Kconfig             |    8 +-
4650  drivers/edac/Makefile            |    1 -
4651  drivers/edac/edac_core.h         |  350 +----------------------------------
4652  drivers/edac/edac_mce.c          |   61 ------
4653  drivers/edac/i7core_edac.c       |  387 ++++++++++++++++++++++++++++++++++----
4654  include/linux/edac.h             |  350 ++++++++++++++++++++++++++++++++++
4655  include/linux/edac_mce.h         |   31 ---
4656  8 files changed, 710 insertions(+), 496 deletions(-)
4657  delete mode 100644 drivers/edac/edac_mce.c
4658  delete mode 100644 include/linux/edac_mce.h
4659 Merging devicetree/devicetree/next
4660 $ git merge devicetree/devicetree/next
4661 Resolved 'drivers/of/base.c' using previous resolution.
4662 Auto-merging drivers/of/base.c
4663 CONFLICT (content): Merge conflict in drivers/of/base.c
4664 Automatic merge failed; fix conflicts and then commit the result.
4665 $ git commit -v -a
4666 [master 7032952] Merge remote-tracking branch 'devicetree/devicetree/next'
4667 $ git diff -M --stat --summary HEAD^..
4668 Merging spi/spi/next
4669 $ git merge spi/spi/next
4670 Already up-to-date.
4671 Merging gpio/gpio/next
4672 $ git merge gpio/gpio/next
4673 Already up-to-date.
4674 Merging tip/auto-latest
4675 $ git merge tip/auto-latest
4676 Recorded preimage for 'arch/x86/mm/fault.c'
4677 Auto-merging Documentation/kernel-parameters.txt
4678 Auto-merging arch/x86/mm/fault.c
4679 CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
4680 Automatic merge failed; fix conflicts and then commit the result.
4681 $ git commit -v -a
4682 Recorded resolution for 'arch/x86/mm/fault.c'.
4683 [master fe69a8f] Merge remote-tracking branch 'tip/auto-latest'
4684 $ git diff -M --stat --summary HEAD^..
4685  Documentation/kernel-parameters.txt   |   18 ++++
4686  Documentation/x86/entry_64.txt        |    3 -
4687  arch/x86/Kconfig                      |    9 ++
4688  arch/x86/include/asm/archrandom.h     |   75 +++++++++++++++++
4689  arch/x86/include/asm/cmpxchg_32.h     |   21 +++++
4690  arch/x86/include/asm/cmpxchg_64.h     |   26 ++++++
4691  arch/x86/include/asm/elf.h            |   31 +++++++
4692  arch/x86/include/asm/pgtable_types.h  |    1 -
4693  arch/x86/include/asm/spinlock.h       |  140 +++++++++++---------------------
4694  arch/x86/include/asm/spinlock_types.h |   22 +++++-
4695  arch/x86/include/asm/x86_init.h       |   12 ---
4696  arch/x86/kernel/apic/x2apic_uv_x.c    |    1 -
4697  arch/x86/kernel/cpu/Makefile          |    1 +
4698  arch/x86/kernel/cpu/amd.c             |   47 +++++++----
4699  arch/x86/kernel/cpu/common.c          |    5 +
4700  arch/x86/kernel/cpu/cpu.h             |    1 +
4701  arch/x86/kernel/cpu/rdrand.c          |   73 ++++++++++++++++
4702  arch/x86/kernel/sys_x86_64.c          |   77 +++++++++++++++++-
4703  arch/x86/kernel/x86_init.c            |    4 -
4704  arch/x86/mm/init.c                    |  147 ++++++++++++++++++++++++---------
4705  arch/x86/mm/mmap.c                    |   20 +----
4706  arch/x86/platform/olpc/olpc.c         |    4 +-
4707  arch/x86/vdso/vma.c                   |    9 ++
4708  arch/x86/xen/mmu.c                    |   15 ----
4709  drivers/char/random.c                 |   23 +++++-
4710  drivers/rtc/interface.c               |    4 +-
4711  include/linux/irq.h                   |   11 ++-
4712  include/linux/irqdesc.h               |    1 +
4713  include/linux/random.h                |   13 +++
4714  include/linux/rtc.h                   |    3 +
4715  kernel/irq/generic-chip.c             |    4 +-
4716  kernel/irq/irqdesc.c                  |   36 ++++++---
4717  kernel/irq/manage.c                   |   18 +++-
4718  kernel/lockdep.c                      |    8 ++-
4719  34 files changed, 652 insertions(+), 231 deletions(-)
4720  create mode 100644 arch/x86/include/asm/archrandom.h
4721  create mode 100644 arch/x86/kernel/cpu/rdrand.c
4722 Merging rcu/rcu/next
4723 $ git merge rcu/rcu/next
4724 Auto-merging Documentation/RCU/NMI-RCU.txt
4725 Auto-merging include/linux/rcupdate.h
4726 Auto-merging include/linux/sched.h
4727 Auto-merging init/Kconfig
4728 Auto-merging kernel/lockdep.c
4729 Auto-merging kernel/pid.c
4730 Auto-merging kernel/rcupdate.c
4731 Auto-merging kernel/rcutorture.c
4732 Auto-merging kernel/rcutree_trace.c
4733 Auto-merging kernel/sched.c
4734 Merge made by recursive.
4735  Documentation/RCU/NMI-RCU.txt       |    2 +-
4736  Documentation/RCU/lockdep-splat.txt |  110 +++++++++
4737  Documentation/RCU/lockdep.txt       |   34 ++-
4738  Documentation/RCU/torture.txt       |  137 ++++++++---
4739  Documentation/RCU/trace.txt         |   38 ++--
4740  include/linux/lockdep.h             |    2 +-
4741  include/linux/rcupdate.h            |  300 +++++++++++-------------
4742  include/linux/rcutiny.h             |   20 ++-
4743  include/linux/rcutree.h             |    2 +
4744  include/linux/sched.h               |    4 -
4745  include/linux/types.h               |   10 +
4746  include/trace/events/rcu.h          |  459 +++++++++++++++++++++++++++++++++++
4747  init/Kconfig                        |    6 +-
4748  kernel/lockdep.c                    |   84 ++++---
4749  kernel/pid.c                        |    4 +-
4750  kernel/rcu.h                        |   85 +++++++
4751  kernel/rcupdate.c                   |   26 ++-
4752  kernel/rcutiny.c                    |  117 ++-------
4753  kernel/rcutiny_plugin.h             |  135 +++++++----
4754  kernel/rcutorture.c                 |   64 ++---
4755  kernel/rcutree.c                    |  206 ++++++++++------
4756  kernel/rcutree.h                    |   14 +-
4757  kernel/rcutree_plugin.h             |   97 +++++---
4758  kernel/rcutree_trace.c              |   13 +-
4759  kernel/sched.c                      |   13 +-
4760  kernel/time/tick-sched.c            |    6 -
4761  26 files changed, 1394 insertions(+), 594 deletions(-)
4762  create mode 100644 Documentation/RCU/lockdep-splat.txt
4763  create mode 100644 include/trace/events/rcu.h
4764  create mode 100644 kernel/rcu.h
4765 Merging kvm/linux-next
4766 $ git merge kvm/linux-next
4767 Merge made by recursive.
4768  arch/x86/kvm/Kconfig |    3 +++
4769  1 files changed, 3 insertions(+), 0 deletions(-)
4770 Merging oprofile/for-next
4771 $ git merge oprofile/for-next
4772 Already up-to-date.
4773 Merging ptrace/ptrace
4774 $ git merge ptrace/ptrace
4775 Already up-to-date.
4776 Merging xen/upstream/xen
4777 $ git merge xen/upstream/xen
4778 Resolved 'arch/x86/xen/Makefile' using previous resolution.
4779 Auto-merging arch/x86/xen/Makefile
4780 CONFLICT (content): Merge conflict in arch/x86/xen/Makefile
4781 Automatic merge failed; fix conflicts and then commit the result.
4782 $ git commit -v -a
4783 [master 842ebe3] Merge remote-tracking branch 'xen/upstream/xen'
4784 $ git diff -M --stat --summary HEAD^..
4785  arch/x86/xen/Makefile |    2 +-
4786  1 files changed, 1 insertions(+), 1 deletions(-)
4787 Merging xen-two/linux-next
4788 $ git merge xen-two/linux-next
4789 Auto-merging arch/x86/xen/mmu.c
4790 Merge made by recursive.
4791  .../ABI/testing/sysfs-bus-pci-devices-cciss        |    7 ++
4792  Documentation/blockdev/cciss.txt                   |   10 +++
4793  arch/x86/xen/Kconfig                               |    8 --
4794  arch/x86/xen/mmu.c                                 |   38 -----------
4795  drivers/block/cciss.c                              |   69 ++++++++++++++++---
4796  drivers/block/cciss.h                              |    1 +
4797  drivers/block/xen-blkback/blkback.c                |    8 +-
4798  drivers/block/xen-blkback/common.h                 |    2 +-
4799  drivers/block/xen-blkback/xenbus.c                 |   14 +++-
4800  drivers/block/xen-blkfront.c                       |    9 ++-
4801  drivers/pci/xen-pcifront.c                         |    4 +-
4802  drivers/xen/balloon.c                              |   15 ++--
4803  drivers/xen/events.c                               |    9 +--
4804  drivers/xen/gntdev.c                               |    3 +-
4805  drivers/xen/grant-table.c                          |    2 +-
4806  drivers/xen/pci.c                                  |    4 +-
4807  drivers/xen/swiotlb-xen.c                          |   42 ++++++++----
4808  drivers/xen/xen-balloon.c                          |   17 ++---
4809  drivers/xen/xen-pciback/conf_space_header.c        |    2 +-
4810  drivers/xen/xenbus/xenbus_probe.c                  |    7 +-
4811  drivers/xen/xenbus/xenbus_probe.h                  |    3 +-
4812  21 files changed, 156 insertions(+), 118 deletions(-)
4813 Merging xen-pvhvm/linux-next
4814 $ git merge xen-pvhvm/linux-next
4815 Already up-to-date.
4816 Merging edac-amd/for-next
4817 $ git merge edac-amd/for-next
4818 Merge made by recursive.
4819  drivers/edac/mce_amd.c |    4 ++--
4820  1 files changed, 2 insertions(+), 2 deletions(-)
4821 Merging percpu/for-next
4822 $ git merge percpu/for-next
4823 Merge made by recursive.
4824  mm/percpu-vm.c |    5 ++---
4825  mm/percpu.c    |   17 +++++++++--------
4826  2 files changed, 11 insertions(+), 11 deletions(-)
4827 Merging workqueues/for-next
4828 $ git merge workqueues/for-next
4829 Already up-to-date.
4830 Merging sfi/sfi-test
4831 $ git merge sfi/sfi-test
4832 Already up-to-date.
4833 Merging asm-generic/next
4834 $ git merge asm-generic/next
4835 Already up-to-date.
4836 Merging drivers-x86/linux-next
4837 $ git merge drivers-x86/linux-next
4838 Already up-to-date.
4839 Merging hwpoison/hwpoison
4840 $ git merge hwpoison/hwpoison
4841 Already up-to-date.
4842 Merging sysctl/master
4843 $ git merge sysctl/master
4844 Auto-merging fs/proc/proc_sysctl.c
4845 Merge made by recursive.
4846  fs/proc/proc_sysctl.c |   14 ++------------
4847  1 files changed, 2 insertions(+), 12 deletions(-)
4848 Merging namespace/master
4849 $ git merge namespace/master
4850 Auto-merging fs/proc/inode.c
4851 Merge made by recursive.
4852  fs/proc/inode.c      |    6 +-
4853  fs/proc/namespaces.c |  160 +++++++++++++++++++++++++++++++++++++++++++-------
4854  2 files changed, 142 insertions(+), 24 deletions(-)
4855 Merging regmap/for-next
4856 $ git merge regmap/for-next
4857 Auto-merging drivers/base/regmap/regmap-spi.c
4858 Merge made by recursive.
4859  drivers/base/regmap/Makefile         |    1 +
4860  drivers/base/regmap/internal.h       |   66 +++++++++++
4861  drivers/base/regmap/regmap-debugfs.c |  209 ++++++++++++++++++++++++++++++++++
4862  drivers/base/regmap/regmap-i2c.c     |    1 -
4863  drivers/base/regmap/regmap-spi.c     |    1 -
4864  drivers/base/regmap/regmap.c         |  139 +++++++++++++++++-----
4865  include/linux/regmap.h               |   27 ++++-
4866  include/trace/events/regmap.h        |  112 ++++++++++++++++++
4867  8 files changed, 518 insertions(+), 38 deletions(-)
4868  create mode 100644 drivers/base/regmap/internal.h
4869  create mode 100644 drivers/base/regmap/regmap-debugfs.c
4870  create mode 100644 include/trace/events/regmap.h
4871 Merging driver-core/driver-core-next
4872 $ git merge driver-core/driver-core-next
4873 Already up-to-date.
4874 Merging tty/tty-next
4875 $ git merge tty/tty-next
4876 Already up-to-date.
4877 Merging usb/usb-next
4878 $ git merge usb/usb-next
4879 Already up-to-date.
4880 Merging staging/staging-next
4881 $ git merge staging/staging-next
4882 Already up-to-date.
4883 Merging bkl-config/config
4884 $ git merge bkl-config/config
4885 Already up-to-date.
4886 Merging tmem/linux-next
4887 $ git merge tmem/linux-next
4888 Auto-merging include/linux/swap.h
4889 Auto-merging mm/Kconfig
4890 Auto-merging mm/swapfile.c
4891 Merge made by recursive.
4892  .../ABI/testing/sysfs-kernel-mm-frontswap          |   16 +
4893  Documentation/vm/frontswap.txt                     |  210 ++++++++++++
4894  include/linux/frontswap.h                          |   92 ++++++
4895  include/linux/swap.h                               |    2 +
4896  include/linux/swapfile.h                           |   13 +
4897  mm/Kconfig                                         |   17 +
4898  mm/Makefile                                        |    1 +
4899  mm/frontswap.c                                     |  335 ++++++++++++++++++++
4900  mm/page_io.c                                       |   12 +
4901  mm/swapfile.c                                      |   65 +++-
4902  10 files changed, 751 insertions(+), 12 deletions(-)
4903  create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-frontswap
4904  create mode 100644 Documentation/vm/frontswap.txt
4905  create mode 100644 include/linux/frontswap.h
4906  create mode 100644 include/linux/swapfile.h
4907  create mode 100644 mm/frontswap.c
4908 Merging writeback/next
4909 $ git merge writeback/next
4910 Already up-to-date.
4911 Merging arm-dt/devicetree/arm-next
4912 $ git merge arm-dt/devicetree/arm-next
4913 Already up-to-date.
4914 Merging scsi-post-merge/merge-base:master
4915 Merging moduleh/module.h-split
4916 $ git merge moduleh/module.h-split
4917 Recorded preimage for 'include/linux/dmaengine.h'
4918 Auto-merging arch/arm/common/scoop.c
4919 Auto-merging arch/arm/kernel/setup.c
4920 Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
4921 Auto-merging arch/arm/mach-ixp2000/core.c
4922 Auto-merging arch/arm/mach-ixp4xx/common-pci.c
4923 Auto-merging arch/arm/mach-msm/io.c
4924 Auto-merging arch/arm/mach-omap1/board-ams-delta.c
4925 Auto-merging arch/arm/mach-omap1/board-sx1.c
4926 Auto-merging arch/arm/mach-omap1/board-voiceblue.c
4927 Auto-merging arch/arm/mach-orion5x/dns323-setup.c
4928 Auto-merging arch/mips/bcm47xx/gpio.c
4929 Auto-merging arch/mips/bcm47xx/setup.c
4930 Auto-merging arch/mips/kernel/traps.c
4931 Auto-merging arch/x86/kernel/cpu/amd.c
4932 Auto-merging drivers/base/power/main.c
4933 Auto-merging drivers/base/power/runtime.c
4934 Auto-merging drivers/bcma/core.c
4935 Auto-merging drivers/bcma/driver_chipcommon.c
4936 Auto-merging drivers/bcma/driver_pci.c
4937 Auto-merging drivers/bcma/main.c
4938 Auto-merging drivers/char/virtio_console.c
4939 Auto-merging drivers/clocksource/sh_cmt.c
4940 Auto-merging drivers/firmware/google/gsmi.c
4941 Auto-merging drivers/hid/hid-axff.c
4942 Auto-merging drivers/hid/hid-debug.c
4943 Auto-merging drivers/hid/hid-sjoy.c
4944 Auto-merging drivers/hid/usbhid/hid-quirks.c
4945 Auto-merging drivers/input/input-polldev.c
4946 Auto-merging drivers/md/dm-raid.c
4947 Auto-merging drivers/md/md.c
4948 Auto-merging drivers/md/raid5.c
4949 Auto-merging drivers/mmc/core/host.c
4950 Auto-merging drivers/mmc/host/sdhci-tegra.c
4951 Auto-merging drivers/mtd/ar7part.c
4952 Auto-merging drivers/mtd/cmdlinepart.c
4953 Auto-merging drivers/mtd/mtdsuper.c
4954 Auto-merging drivers/mtd/nand/cafe_nand.c
4955 Auto-merging drivers/mtd/nand/cmx270_nand.c
4956 Auto-merging drivers/mtd/nand/diskonchip.c
4957 Auto-merging drivers/mtd/nand/nand_bbt.c
4958 Auto-merging drivers/mtd/nand/omap2.c
4959 Auto-merging drivers/mtd/onenand/onenand_bbt.c
4960 Auto-merging drivers/mtd/redboot.c
4961 Auto-merging drivers/net/ethernet/mellanox/mlx4/alloc.c
4962 Auto-merging drivers/net/ethernet/mellanox/mlx4/catas.c
4963 Auto-merging drivers/net/ethernet/mellanox/mlx4/cmd.c
4964 Auto-merging drivers/net/ethernet/mellanox/mlx4/cq.c
4965 Auto-merging drivers/net/ethernet/mellanox/mlx4/eq.c
4966 Auto-merging drivers/net/ethernet/mellanox/mlx4/fw.c
4967 Auto-merging drivers/net/ethernet/mellanox/mlx4/intf.c
4968 Auto-merging drivers/net/ethernet/mellanox/mlx4/mr.c
4969 Auto-merging drivers/net/ethernet/mellanox/mlx4/pd.c
4970 Auto-merging drivers/net/ethernet/mellanox/mlx4/port.c
4971 Auto-merging drivers/net/ethernet/mellanox/mlx4/qp.c
4972 Auto-merging drivers/net/ethernet/mellanox/mlx4/srq.c
4973 Auto-merging drivers/pci/hotplug/pcihp_slot.c
4974 Auto-merging drivers/pci/setup-res.c
4975 Auto-merging drivers/regulator/88pm8607.c
4976 Auto-merging drivers/rtc/interface.c
4977 Auto-merging drivers/s390/cio/qdio_debug.c
4978 Auto-merging drivers/video/atmel_lcdfb.c
4979 Auto-merging drivers/video/carminefb.c
4980 Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
4981 Auto-merging drivers/video/msm/mdp.c
4982 Auto-merging drivers/xen/balloon.c
4983 Auto-merging drivers/xen/swiotlb-xen.c
4984 Auto-merging drivers/xen/xen-selfballoon.c
4985 Auto-merging drivers/xen/xenbus/xenbus_probe.c
4986 Auto-merging fs/exofs/super.c
4987 Auto-merging fs/logfs/super.c
4988 Auto-merging include/linux/bcma/bcma.h
4989 Auto-merging include/linux/blkdev.h
4990 Auto-merging include/linux/dmaengine.h
4991 CONFLICT (content): Merge conflict in include/linux/dmaengine.h
4992 Auto-merging include/linux/hid.h
4993 Auto-merging include/linux/mtd/mtd.h
4994 Auto-merging include/net/lib80211.h
4995 Auto-merging kernel/lockdep.c
4996 Auto-merging kernel/pid.c
4997 Auto-merging kernel/power/main.c
4998 Auto-merging kernel/power/suspend.c
4999 Auto-merging kernel/rcupdate.c
5000 Auto-merging kernel/rcutiny.c
5001 Auto-merging kernel/rcutorture.c
5002 Auto-merging kernel/rcutree.c
5003 Auto-merging kernel/rcutree_trace.c
5004 Auto-merging kernel/sched.c
5005 Auto-merging kernel/trace/blktrace.c
5006 Auto-merging mm/swapfile.c
5007 Automatic merge failed; fix conflicts and then commit the result.
5008 $ git commit -v -a
5009 Recorded resolution for 'include/linux/dmaengine.h'.
5010 [master b160c5f] Merge remote-tracking branch 'moduleh/module.h-split'
5011 $ git diff -M --stat --summary HEAD^..
5012  arch/alpha/kernel/core_irongate.c                  |    1 +
5013  arch/alpha/kernel/pci-sysfs.c                      |    1 +
5014  arch/alpha/kernel/pci_iommu.c                      |    1 +
5015  arch/alpha/kernel/setup.c                          |    1 +
5016  arch/arm/common/it8152.c                           |    1 +
5017  arch/arm/common/scoop.c                            |    1 +
5018  arch/arm/kernel/armksyms.c                         |    2 +-
5019  arch/arm/kernel/bios32.c                           |    2 +-
5020  arch/arm/kernel/devtree.c                          |    2 +-
5021  arch/arm/kernel/elf.c                              |    2 +-
5022  arch/arm/kernel/io.c                               |    2 +-
5023  arch/arm/kernel/irq.c                              |    1 -
5024  arch/arm/kernel/leds.c                             |    3 +-
5025  arch/arm/kernel/perf_event.c                       |    2 +-
5026  arch/arm/kernel/pj4-cp0.c                          |    1 -
5027  arch/arm/kernel/process.c                          |    2 +-
5028  arch/arm/kernel/ptrace.c                           |    1 +
5029  arch/arm/kernel/return_address.c                   |    2 +-
5030  arch/arm/kernel/setup.c                            |    2 +-
5031  arch/arm/kernel/stacktrace.c                       |    2 +-
5032  arch/arm/kernel/sys_arm.c                          |    2 +-
5033  arch/arm/kernel/time.c                             |    2 +-
5034  arch/arm/kernel/unwind.c                           |    2 +-
5035  arch/arm/kernel/xscale-cp0.c                       |    1 -
5036  arch/arm/mach-at91/cpuidle.c                       |    1 +
5037  arch/arm/mach-bcmring/dma.c                        |    1 +
5038  arch/arm/mach-bcmring/mm.c                         |    1 +
5039  arch/arm/mach-davinci/board-dm644x-evm.c           |    1 +
5040  arch/arm/mach-davinci/board-dm646x-evm.c           |    1 +
5041  arch/arm/mach-davinci/cdce949.c                    |    1 +
5042  arch/arm/mach-davinci/cpufreq.c                    |    1 +
5043  arch/arm/mach-davinci/cpuidle.c                    |    1 +
5044  arch/arm/mach-ep93xx/core.c                        |    1 +
5045  arch/arm/mach-exynos4/dev-sysmmu.c                 |    1 +
5046  arch/arm/mach-footbridge/dc21285.c                 |    1 +
5047  arch/arm/mach-imx/mach-mx31lilly.c                 |    1 +
5048  arch/arm/mach-imx/mach-mx31lite.c                  |    1 +
5049  arch/arm/mach-imx/mach-mx31moboard.c               |    1 +
5050  arch/arm/mach-iop13xx/pci.c                        |    1 +
5051  arch/arm/mach-ixp2000/core.c                       |    1 +
5052  arch/arm/mach-ixp4xx/common-pci.c                  |    1 +
5053  arch/arm/mach-ixp4xx/common.c                      |    1 +
5054  arch/arm/mach-kirkwood/cpuidle.c                   |    1 +
5055  arch/arm/mach-msm/io.c                             |    1 +
5056  arch/arm/mach-netx/xc.c                            |    1 +
5057  arch/arm/mach-omap1/board-ams-delta.c              |    1 +
5058  arch/arm/mach-omap1/board-sx1.c                    |    1 +
5059  arch/arm/mach-omap1/board-voiceblue.c              |    1 +
5060  arch/arm/mach-omap1/mailbox.c                      |    1 +
5061  arch/arm/mach-omap2/board-omap3evm.c               |    1 +
5062  arch/arm/mach-omap2/clockdomain.c                  |    1 +
5063  arch/arm/mach-omap2/display.c                      |    1 +
5064  arch/arm/mach-omap2/gpmc-onenand.c                 |    1 +
5065  arch/arm/mach-omap2/pm.c                           |    1 +
5066  arch/arm/mach-omap2/prcm.c                         |    1 +
5067  arch/arm/mach-omap2/usb-tusb6010.c                 |    2 +
5068  arch/arm/mach-omap2/voltage.c                      |    1 +
5069  arch/arm/mach-orion5x/dns323-setup.c               |    2 +-
5070  arch/arm/mach-orion5x/pci.c                        |    1 +
5071  arch/arm/mach-pxa/corgi.c                          |    1 +
5072  arch/arm/mach-pxa/poodle.c                         |    1 +
5073  arch/arm/mach-pxa/spitz.c                          |    1 +
5074  arch/arm/mach-s3c2410/mach-h1940.c                 |    1 +
5075  arch/arm/mach-s3c64xx/dev-audio.c                  |    1 +
5076  arch/arm/mach-sa1100/collie.c                      |    1 +
5077  arch/arm/mach-sa1100/jornada720.c                  |    1 +
5078  arch/arm/mach-shmobile/clock.c                     |    1 +
5079  arch/arm/mach-tegra/pcie.c                         |    1 +
5080  arch/arm/mm/fault-armv.c                           |    1 -
5081  arch/arm/mm/init.c                                 |    1 +
5082  arch/arm/plat-iop/gpio.c                           |    1 +
5083  arch/arm/plat-iop/time.c                           |    1 +
5084  arch/arm/plat-omap/clock.c                         |    1 +
5085  arch/arm/plat-omap/mailbox.c                       |    1 +
5086  arch/arm/plat-s3c24xx/devs.c                       |    1 +
5087  arch/arm/plat-s5p/dev-ehci.c                       |    1 +
5088  arch/arm/plat-s5p/dev-onenand.c                    |    2 +
5089  arch/arm/plat-samsung/dev-adc.c                    |    2 +
5090  arch/arm/plat-samsung/dev-asocdma.c                |    1 +
5091  arch/arm/plat-samsung/dev-backlight.c              |    1 +
5092  arch/arm/plat-samsung/dev-ide.c                    |    2 +
5093  arch/arm/plat-samsung/dev-nand.c                   |    1 +
5094  arch/arm/plat-samsung/dev-pwm.c                    |    1 +
5095  arch/arm/plat-samsung/dev-rtc.c                    |    1 +
5096  arch/arm/plat-samsung/dev-ts.c                     |    2 +
5097  arch/arm/plat-samsung/dev-usb.c                    |    1 +
5098  arch/arm/plat-samsung/dev-wdt.c                    |    3 +
5099  arch/arm/plat-samsung/platformdata.c               |    1 +
5100  arch/arm/vfp/vfpmodule.c                           |    1 -
5101  arch/avr32/mach-at32ap/clock.c                     |    1 +
5102  arch/avr32/mach-at32ap/cpufreq.c                   |    1 +
5103  arch/avr32/mach-at32ap/intc.c                      |    1 +
5104  arch/avr32/mach-at32ap/pio.c                       |    1 +
5105  arch/avr32/mm/dma-coherent.c                       |    1 +
5106  arch/blackfin/kernel/dma-mapping.c                 |    1 +
5107  arch/blackfin/kernel/perf_event.c                  |    1 +
5108  arch/blackfin/kernel/sys_bfin.c                    |    1 +
5109  arch/blackfin/mach-bf518/boards/ezbrd.c            |    1 +
5110  arch/blackfin/mach-bf527/boards/ad7160eval.c       |    1 +
5111  arch/blackfin/mach-bf527/boards/ezkit.c            |    1 +
5112  arch/blackfin/mach-bf527/boards/tll6527m.c         |    1 +
5113  arch/blackfin/mach-bf537/boards/dnp5370.c          |    1 +
5114  arch/blackfin/mach-common/cpufreq.c                |    1 +
5115  arch/blackfin/mm/init.c                            |    1 +
5116  arch/ia64/hp/common/hwsw_iommu.c                   |    1 +
5117  arch/ia64/kernel/dma-mapping.c                     |    1 +
5118  arch/ia64/kernel/topology.c                        |    1 +
5119  arch/ia64/sn/kernel/io_init.c                      |    1 +
5120  arch/ia64/sn/pci/pcibr/pcibr_dma.c                 |    1 +
5121  arch/ia64/sn/pci/pcibr/pcibr_provider.c            |    1 +
5122  arch/ia64/sn/pci/tioca_provider.c                  |    1 +
5123  arch/m68k/atari/time.c                             |    1 +
5124  arch/m68k/kernel/dma_mm.c                          |    1 +
5125  arch/m68k/kernel/dma_no.c                          |    1 +
5126  arch/mips/bcm47xx/gpio.c                           |    1 +
5127  arch/mips/bcm47xx/setup.c                          |    1 +
5128  arch/mips/cavium-octeon/csrc-octeon.c              |    1 +
5129  arch/mips/cavium-octeon/dma-octeon.c               |    1 +
5130  arch/mips/cavium-octeon/flash_setup.c              |    1 +
5131  arch/mips/kernel/8250-platform.c                   |    1 -
5132  arch/mips/kernel/cpu-probe.c                       |    3 +-
5133  arch/mips/kernel/i8253.c                           |    2 +-
5134  arch/mips/kernel/init_task.c                       |    2 +-
5135  arch/mips/kernel/irq-msc01.c                       |    1 -
5136  arch/mips/kernel/irq.c                             |    1 -
5137  arch/mips/kernel/mips-mt.c                         |    2 +-
5138  arch/mips/kernel/mips_ksyms.c                      |    2 +-
5139  arch/mips/kernel/module.c                          |    1 -
5140  arch/mips/kernel/process.c                         |    2 +-
5141  arch/mips/kernel/prom.c                            |    2 +-
5142  arch/mips/kernel/reset.c                           |    2 +-
5143  arch/mips/kernel/rtlx.c                            |    1 -
5144  arch/mips/kernel/setup.c                           |    2 +-
5145  arch/mips/kernel/spinlock_test.c                   |    2 +-
5146  arch/mips/kernel/stacktrace.c                      |    2 +-
5147  arch/mips/kernel/time.c                            |    2 +-
5148  arch/mips/kernel/traps.c                           |    1 -
5149  arch/mips/kernel/unaligned.c                       |    1 -
5150  arch/mips/kernel/vpe.c                             |    1 -
5151  arch/mips/loongson/common/platform.c               |    1 +
5152  arch/mips/pci/pci-ip27.c                           |    1 +
5153  arch/mips/pci/pci.c                                |    1 +
5154  arch/mips/powertv/pci/fixup-powertv.c              |    1 +
5155  arch/mips/powertv/powertv-usb.c                    |    1 +
5156  arch/mips/rb532/gpio.c                             |    1 +
5157  arch/mips/rb532/setup.c                            |    1 +
5158  arch/mips/txx9/generic/spi_eeprom.c                |    1 +
5159  arch/mips/txx9/rbtx4939/setup.c                    |    1 +
5160  arch/mips/vr41xx/common/giu.c                      |    1 +
5161  arch/mips/vr41xx/common/rtc.c                      |    1 +
5162  arch/parisc/kernel/drivers.c                       |    1 +
5163  arch/parisc/kernel/pci-dma.c                       |    1 +
5164  arch/parisc/kernel/setup.c                         |    1 +
5165  arch/parisc/lib/iomap.c                            |    1 +
5166  arch/powerpc/include/asm/lv1call.h                 |    1 +
5167  arch/powerpc/include/asm/machdep.h                 |    1 +
5168  arch/powerpc/include/asm/spu.h                     |    1 +
5169  arch/powerpc/kernel/btext.c                        |    2 +-
5170  arch/powerpc/kernel/clock.c                        |    2 +-
5171  arch/powerpc/kernel/cputable.c                     |    2 +-
5172  arch/powerpc/kernel/crash.c                        |    1 +
5173  arch/powerpc/kernel/dma-iommu.c                    |    1 +
5174  arch/powerpc/kernel/dma.c                          |    1 +
5175  arch/powerpc/kernel/firmware.c                     |    3 +-
5176  arch/powerpc/kernel/hw_breakpoint.c                |    1 -
5177  arch/powerpc/kernel/ibmebus.c                      |    2 +
5178  arch/powerpc/kernel/init_task.c                    |    2 +-
5179  arch/powerpc/kernel/io-workarounds.c               |    1 +
5180  arch/powerpc/kernel/io.c                           |    2 +-
5181  arch/powerpc/kernel/iomap.c                        |    1 +
5182  arch/powerpc/kernel/irq.c                          |    2 +-
5183  arch/powerpc/kernel/isa-bridge.c                   |    1 +
5184  arch/powerpc/kernel/kvm.c                          |    1 +
5185  arch/powerpc/kernel/module.c                       |    1 -
5186  arch/powerpc/kernel/of_platform.c                  |    2 +-
5187  arch/powerpc/kernel/paca.c                         |    2 +-
5188  arch/powerpc/kernel/pci-common.c                   |    1 +
5189  arch/powerpc/kernel/pci_32.c                       |    1 +
5190  arch/powerpc/kernel/pci_64.c                       |    1 +
5191  arch/powerpc/kernel/pci_dn.c                       |    1 +
5192  arch/powerpc/kernel/pci_of_scan.c                  |    1 +
5193  arch/powerpc/kernel/pmc.c                          |    2 +-
5194  arch/powerpc/kernel/ppc_ksyms.c                    |    2 +-
5195  arch/powerpc/kernel/process.c                      |    2 +-
5196  arch/powerpc/kernel/prom.c                         |    2 +-
5197  arch/powerpc/kernel/prom_parse.c                   |    1 -
5198  arch/powerpc/kernel/ptrace.c                       |    1 -
5199  arch/powerpc/kernel/rtas.c                         |    2 +-
5200  arch/powerpc/kernel/setup-common.c                 |    2 +-
5201  arch/powerpc/kernel/setup_64.c                     |    2 +-
5202  arch/powerpc/kernel/signal_64.c                    |    1 -
5203  arch/powerpc/kernel/smp.c                          |    2 +-
5204  arch/powerpc/kernel/stacktrace.c                   |    2 +-
5205  arch/powerpc/kernel/swsusp_64.c                    |    1 +
5206  arch/powerpc/kernel/sysfs.c                        |    2 +-
5207  arch/powerpc/kernel/time.c                         |    2 +-
5208  arch/powerpc/kernel/vdso.c                         |    1 -
5209  arch/powerpc/kernel/vio.c                          |    3 +-
5210  arch/powerpc/kvm/44x.c                             |    1 +
5211  arch/powerpc/kvm/book3s.c                          |    1 +
5212  arch/powerpc/kvm/book3s_exports.c                  |    2 +-
5213  arch/powerpc/kvm/book3s_hv.c                       |    1 +
5214  arch/powerpc/kvm/book3s_hv_builtin.c               |    1 +
5215  arch/powerpc/kvm/book3s_pr.c                       |    1 +
5216  arch/powerpc/kvm/powerpc.c                         |    1 -
5217  arch/powerpc/lib/checksum_wrappers_64.c            |    2 +-
5218  arch/powerpc/lib/devres.c                          |    2 +-
5219  arch/powerpc/lib/locks.c                           |    2 +-
5220  arch/powerpc/lib/rheap.c                           |    2 +-
5221  arch/powerpc/mm/dma-noncoherent.c                  |    1 +
5222  arch/powerpc/mm/hash_utils_64.c                    |    1 +
5223  arch/powerpc/mm/mem.c                              |    2 +-
5224  arch/powerpc/mm/mmu_context_hash32.c               |    1 +
5225  arch/powerpc/mm/mmu_context_hash64.c               |    2 +-
5226  arch/powerpc/mm/numa.c                             |    2 +-
5227  arch/powerpc/mm/pgtable_64.c                       |    1 +
5228  arch/powerpc/mm/slice.c                            |    2 +-
5229  arch/powerpc/mm/tlb_hash32.c                       |    1 +
5230  arch/powerpc/mm/tlb_nohash.c                       |    1 +
5231  arch/powerpc/platforms/44x/warp.c                  |    1 +
5232  arch/powerpc/platforms/512x/clock.c                |    1 +
5233  arch/powerpc/platforms/52xx/mpc52xx_common.c       |    1 +
5234  arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c      |    1 +
5235  arch/powerpc/platforms/83xx/suspend.c              |    1 +
5236  arch/powerpc/platforms/85xx/mpc85xx_cds.c          |    1 -
5237  arch/powerpc/platforms/85xx/mpc85xx_mds.c          |    1 -
5238  arch/powerpc/platforms/85xx/sbc8548.c              |    1 -
5239  arch/powerpc/platforms/86xx/gef_gpio.c             |    1 +
5240  arch/powerpc/platforms/8xx/tqm8xx_setup.c          |    1 -
5241  arch/powerpc/platforms/cell/axon_msi.c             |    1 +
5242  arch/powerpc/platforms/cell/beat.c                 |    2 +-
5243  arch/powerpc/platforms/cell/beat_spu_priv1.c       |    2 -
5244  arch/powerpc/platforms/cell/beat_wrapper.h         |    1 +
5245  arch/powerpc/platforms/cell/cbe_cpufreq.c          |    1 +
5246  arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c      |    1 +
5247  arch/powerpc/platforms/cell/cbe_powerbutton.c      |    1 +
5248  arch/powerpc/platforms/cell/cbe_regs.c             |    2 +-
5249  arch/powerpc/platforms/cell/celleb_setup.c         |    1 +
5250  arch/powerpc/platforms/cell/cpufreq_spudemand.c    |    1 +
5251  arch/powerpc/platforms/cell/interrupt.c            |    2 +-
5252  arch/powerpc/platforms/cell/pmu.c                  |    1 +
5253  arch/powerpc/platforms/cell/qpace_setup.c          |    1 +
5254  arch/powerpc/platforms/cell/setup.c                |    1 +
5255  arch/powerpc/platforms/cell/smp.c                  |    1 -
5256  arch/powerpc/platforms/cell/spu_callbacks.c        |    2 +-
5257  arch/powerpc/platforms/cell/spu_fault.c            |    2 +-
5258  arch/powerpc/platforms/cell/spu_manage.c           |    2 +-
5259  arch/powerpc/platforms/cell/spu_notify.c           |    3 +-
5260  arch/powerpc/platforms/cell/spu_priv1_mmio.c       |    1 -
5261  arch/powerpc/platforms/cell/spufs/backing_ops.c    |    1 -
5262  arch/powerpc/platforms/cell/spufs/context.c        |    2 +-
5263  arch/powerpc/platforms/cell/spufs/coredump.c       |    1 -
5264  arch/powerpc/platforms/cell/spufs/fault.c          |    1 -
5265  arch/powerpc/platforms/cell/spufs/file.c           |    2 +-
5266  arch/powerpc/platforms/cell/spufs/hw_ops.c         |    1 -
5267  arch/powerpc/platforms/cell/spufs/sched.c          |    1 -
5268  arch/powerpc/platforms/cell/spufs/switch.c         |    2 +-
5269  arch/powerpc/platforms/cell/spufs/syscalls.c       |    2 +-
5270  arch/powerpc/platforms/embedded6xx/holly.c         |    1 +
5271  arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c  |    1 +
5272  arch/powerpc/platforms/iseries/hvlpconfig.c        |    2 +-
5273  arch/powerpc/platforms/iseries/iommu.c             |    2 +-
5274  arch/powerpc/platforms/iseries/ksyms.c             |    2 +-
5275  arch/powerpc/platforms/iseries/lpardata.c          |    1 -
5276  arch/powerpc/platforms/iseries/lpevents.c          |    2 +-
5277  arch/powerpc/platforms/iseries/mf.c                |    1 +
5278  arch/powerpc/platforms/iseries/pci.c               |    1 -
5279  arch/powerpc/platforms/iseries/setup.c             |    1 +
5280  arch/powerpc/platforms/iseries/smp.c               |    1 -
5281  arch/powerpc/platforms/iseries/vio.c               |    2 +-
5282  arch/powerpc/platforms/iseries/viopath.c           |    2 +-
5283  arch/powerpc/platforms/maple/setup.c               |    1 +
5284  arch/powerpc/platforms/pasemi/cpufreq.c            |    1 +
5285  arch/powerpc/platforms/pasemi/dma_lib.c            |    3 +-
5286  arch/powerpc/platforms/pasemi/setup.c              |    1 +
5287  arch/powerpc/platforms/powermac/backlight.c        |    1 +
5288  arch/powerpc/platforms/powermac/feature.c          |    1 +
5289  arch/powerpc/platforms/powermac/low_i2c.c          |    2 +-
5290  arch/powerpc/platforms/powermac/nvram.c            |    2 +-
5291  arch/powerpc/platforms/powermac/pic.c              |    1 -
5292  arch/powerpc/platforms/powermac/setup.c            |    1 +
5293  arch/powerpc/platforms/ps3/exports.c               |    2 -
5294  arch/powerpc/platforms/ps3/interrupt.c             |    2 +-
5295  arch/powerpc/platforms/ps3/mm.c                    |    2 +-
5296  arch/powerpc/platforms/ps3/os-area.c               |    1 +
5297  arch/powerpc/platforms/ps3/setup.c                 |    1 +
5298  arch/powerpc/platforms/ps3/spu.c                   |    1 +
5299  arch/powerpc/platforms/ps3/system-bus.c            |    2 +-
5300  arch/powerpc/platforms/pseries/eeh.c               |    2 +
5301  arch/powerpc/platforms/pseries/eeh_event.c         |    1 +
5302  arch/powerpc/platforms/pseries/eeh_sysfs.c         |    1 +
5303  arch/powerpc/platforms/pseries/hotplug-cpu.c       |    1 +
5304  arch/powerpc/platforms/pseries/hvconsole.c         |    3 +-
5305  arch/powerpc/platforms/pseries/io_event_irq.c      |    2 +-
5306  arch/powerpc/platforms/pseries/iommu.c             |    1 +
5307  arch/powerpc/platforms/pseries/lpar.c              |    1 +
5308  arch/powerpc/platforms/pseries/mobility.c          |    1 +
5309  arch/powerpc/platforms/pseries/pci_dlpar.c         |    1 +
5310  arch/powerpc/platforms/pseries/plpar_wrappers.h    |    3 +
5311  arch/powerpc/platforms/pseries/setup.c             |    2 +-
5312  arch/powerpc/platforms/pseries/smp.c               |    1 -
5313  arch/powerpc/platforms/pseries/suspend.c           |    1 +
5314  arch/powerpc/sysdev/bestcomm/sram.c                |    2 +-
5315  arch/powerpc/sysdev/cpm_common.c                   |    1 +
5316  arch/powerpc/sysdev/dcr.c                          |    1 +
5317  arch/powerpc/sysdev/fsl_gtm.c                      |    1 +
5318  arch/powerpc/sysdev/fsl_lbc.c                      |    3 +-
5319  arch/powerpc/sysdev/fsl_pmc.c                      |    1 +
5320  arch/powerpc/sysdev/fsl_rio.c                      |    2 +-
5321  arch/powerpc/sysdev/fsl_soc.c                      |    2 +-
5322  arch/powerpc/sysdev/mpc5xxx_clocks.c               |    1 +
5323  arch/powerpc/sysdev/mpc8xx_pic.c                   |    1 -
5324  arch/powerpc/sysdev/mv64x60_pci.c                  |    1 +
5325  arch/powerpc/sysdev/pmi.c                          |    1 +
5326  arch/powerpc/sysdev/ppc4xx_msi.c                   |    1 +
5327  arch/powerpc/sysdev/qe_lib/gpio.c                  |    1 +
5328  arch/powerpc/sysdev/qe_lib/ucc.c                   |    2 +-
5329  arch/powerpc/sysdev/qe_lib/ucc_fast.c              |    2 +-
5330  arch/powerpc/sysdev/qe_lib/ucc_slow.c              |    2 +-
5331  arch/powerpc/sysdev/qe_lib/usb.c                   |    1 +
5332  arch/powerpc/sysdev/rtc_cmos_setup.c               |    1 +
5333  arch/powerpc/sysdev/scom.c                         |    1 +
5334  arch/powerpc/sysdev/simple_gpio.c                  |    1 -
5335  arch/powerpc/sysdev/tsi108_dev.c                   |    2 +-
5336  arch/powerpc/xmon/xmon.c                           |    2 +-
5337  arch/s390/crypto/sha_common.c                      |    1 +
5338  arch/s390/mm/init.c                                |    1 +
5339  arch/sh/drivers/dma/dma-sysfs.c                    |    1 +
5340  arch/sh/drivers/pci/pci.c                          |    1 +
5341  arch/sh/kernel/cpu/shmobile/cpuidle.c              |    1 +
5342  arch/sh/kernel/perf_event.c                        |    1 +
5343  arch/sh/kernel/topology.c                          |    1 +
5344  arch/sh/mm/init.c                                  |    1 +
5345  arch/sparc/include/asm/termios.h                   |    1 -
5346  arch/sparc/kernel/auxio_32.c                       |    1 +
5347  arch/sparc/kernel/btext.c                          |    1 -
5348  arch/sparc/kernel/central.c                        |    1 +
5349  arch/sparc/kernel/cpu.c                            |    2 +-
5350  arch/sparc/kernel/cpumap.c                         |    2 +-
5351  arch/sparc/kernel/dma.c                            |    1 -
5352  arch/sparc/kernel/ebus.c                           |    2 +-
5353  arch/sparc/kernel/hvapi.c                          |    2 +-
5354  arch/sparc/kernel/idprom.c                         |    2 +-
5355  arch/sparc/kernel/iommu.c                          |    2 +-
5356  arch/sparc/kernel/irq_32.c                         |    1 +
5357  arch/sparc/kernel/irq_64.c                         |    1 -
5358  arch/sparc/kernel/ldc.c                            |    2 +-
5359  arch/sparc/kernel/leon_kernel.c                    |    1 -
5360  arch/sparc/kernel/leon_pci_grpci2.c                |    1 -
5361  arch/sparc/kernel/nmi.c                            |    2 +-
5362  arch/sparc/kernel/of_device_32.c                   |    1 -
5363  arch/sparc/kernel/of_device_64.c                   |    3 +-
5364  arch/sparc/kernel/of_device_common.c               |    2 +-
5365  arch/sparc/kernel/pci.c                            |    2 +-
5366  arch/sparc/kernel/pci_fire.c                       |    1 +
5367  arch/sparc/kernel/pci_psycho.c                     |    1 +
5368  arch/sparc/kernel/pci_sabre.c                      |    1 +
5369  arch/sparc/kernel/pci_schizo.c                     |    1 +
5370  arch/sparc/kernel/pci_sun4v.c                      |    1 +
5371  arch/sparc/kernel/pcic.c                           |    1 +
5372  arch/sparc/kernel/pcr.c                            |    3 +-
5373  arch/sparc/kernel/pmc.c                            |    1 +
5374  arch/sparc/kernel/power.c                          |    2 +-
5375  arch/sparc/kernel/process_64.c                     |    2 +-
5376  arch/sparc/kernel/prom_32.c                        |    1 -
5377  arch/sparc/kernel/prom_64.c                        |    1 -
5378  arch/sparc/kernel/prom_common.c                    |    2 +-
5379  arch/sparc/kernel/reboot.c                         |    2 +-
5380  arch/sparc/kernel/sbus.c                           |    1 +
5381  arch/sparc/kernel/setup_32.c                       |    1 +
5382  arch/sparc/kernel/setup_64.c                       |    1 +
5383  arch/sparc/kernel/smp_64.c                         |    2 +-
5384  arch/sparc/kernel/sparc_ksyms_64.c                 |    2 +-
5385  arch/sparc/kernel/stacktrace.c                     |    2 +-
5386  arch/sparc/kernel/sys_sparc32.c                    |    1 -
5387  arch/sparc/kernel/sys_sparc_64.c                   |    2 +-
5388  arch/sparc/kernel/time_64.c                        |    2 +-
5389  arch/sparc/kernel/traps_32.c                       |    1 +
5390  arch/sparc/kernel/unaligned_32.c                   |    1 -
5391  arch/sparc/kernel/vio.c                            |    1 +
5392  arch/sparc/kernel/viohs.c                          |    2 +-
5393  arch/sparc/mm/fault_32.c                           |    1 -
5394  arch/sparc/mm/generic_32.c                         |    1 +
5395  arch/sparc/mm/generic_64.c                         |    1 +
5396  arch/sparc/mm/highmem.c                            |    1 +
5397  arch/sparc/mm/hugetlbpage.c                        |    1 -
5398  arch/x86/crypto/aes_glue.c                         |    1 +
5399  arch/x86/crypto/aesni-intel_glue.c                 |    1 +
5400  arch/x86/kernel/cpu/amd.c                          |    1 +
5401  arch/x86/kernel/cpu/mcheck/therm_throt.c           |    1 +
5402  arch/x86/kernel/devicetree.c                       |    1 +
5403  arch/x86/kernel/e820.c                             |    1 +
5404  arch/x86/kernel/hpet.c                             |    1 +
5405  arch/x86/kernel/irq.c                              |    1 +
5406  arch/x86/kernel/pci-dma.c                          |    1 +
5407  arch/x86/kernel/probe_roms.c                       |    4 +-
5408  arch/x86/kernel/rtc.c                              |    1 +
5409  arch/x86/kernel/smp.c                              |    1 +
5410  arch/x86/kernel/time.c                             |    1 +
5411  arch/x86/kernel/topology.c                         |    1 +
5412  arch/x86/kernel/vsyscall_64.c                      |    1 +
5413  arch/x86/pci/i386.c                                |    1 +
5414  arch/x86/pci/legacy.c                              |    1 +
5415  arch/x86/platform/efi/efi.c                        |    1 +
5416  arch/x86/platform/efi/efi_32.c                     |    1 +
5417  arch/x86/platform/mrst/vrtc.c                      |    1 +
5418  arch/x86/platform/olpc/olpc-xo1-pm.c               |    1 +
5419  arch/x86/platform/uv/bios_uv.c                     |    1 +
5420  arch/x86/power/cpu.c                               |    1 +
5421  arch/x86/video/fbdev.c                             |    1 +
5422  block/blk-integrity.c                              |    1 +
5423  block/ioctl.c                                      |    1 +
5424  crypto/async_tx/async_memcpy.c                     |    1 +
5425  crypto/async_tx/async_pq.c                         |    1 +
5426  crypto/async_tx/async_raid6_recov.c                |    1 +
5427  crypto/async_tx/async_tx.c                         |    1 +
5428  crypto/async_tx/async_xor.c                        |    1 +
5429  crypto/async_tx/raid6test.c                        |    1 +
5430  crypto/crypto_wq.c                                 |    1 +
5431  crypto/md4.c                                       |    1 +
5432  crypto/proc.c                                      |    1 +
5433  crypto/vmac.c                                      |    1 +
5434  crypto/xcbc.c                                      |    1 +
5435  drivers/acpi/acpica/hwsleep.c                      |    1 +
5436  drivers/acpi/ec_sys.c                              |    1 +
5437  drivers/acpi/sbshc.c                               |    1 +
5438  drivers/acpi/sysfs.c                               |    2 +-
5439  drivers/ata/libata-eh.c                            |    1 +
5440  drivers/ata/libata-pmp.c                           |    1 +
5441  drivers/ata/libata-scsi.c                          |    1 +
5442  drivers/ata/libata-sff.c                           |    1 +
5443  drivers/base/base.h                                |    1 +
5444  drivers/base/dma-coherent.c                        |    1 +
5445  drivers/base/dma-mapping.c                         |    1 +
5446  drivers/base/hypervisor.c                          |    1 +
5447  drivers/base/power/generic_ops.c                   |    1 +
5448  drivers/base/power/main.c                          |    1 +
5449  drivers/base/power/runtime.c                       |    1 +
5450  drivers/base/power/sysfs.c                         |    1 +
5451  drivers/base/power/trace.c                         |    1 +
5452  drivers/base/power/wakeup.c                        |    1 +
5453  drivers/base/transport_class.c                     |    1 +
5454  drivers/bcma/core.c                                |    1 +
5455  drivers/bcma/driver_chipcommon.c                   |    1 +
5456  drivers/bcma/driver_pci.c                          |    1 +
5457  drivers/bcma/host_pci.c                            |    1 +
5458  drivers/bcma/main.c                                |    1 +
5459  drivers/block/aoe/aoechr.c                         |    1 +
5460  drivers/block/ps3disk.c                            |    1 +
5461  drivers/block/ps3vram.c                            |    1 +
5462  drivers/block/virtio_blk.c                         |    1 +
5463  drivers/char/hw_random/virtio-rng.c                |    1 +
5464  drivers/char/ramoops.c                             |    1 +
5465  drivers/char/ttyprintk.c                           |    1 +
5466  drivers/char/virtio_console.c                      |    1 +
5467  drivers/clocksource/sh_cmt.c                       |    1 +
5468  drivers/clocksource/sh_mtu2.c                      |    1 +
5469  drivers/clocksource/sh_tmu.c                       |    1 +
5470  drivers/cpufreq/cpufreq_stats.c                    |    1 +
5471  drivers/cpufreq/s3c64xx-cpufreq.c                  |    1 +
5472  drivers/crypto/mv_cesa.c                           |    1 +
5473  drivers/dca/dca-core.c                             |    1 +
5474  drivers/dca/dca-sysfs.c                            |    1 +
5475  drivers/dma/intel_mid_dma.c                        |    1 +
5476  drivers/dma/ipu/ipu_idmac.c                        |    1 +
5477  drivers/dma/ste_dma40.c                            |    1 +
5478  drivers/edac/mce_amd_inj.c                         |    1 +
5479  drivers/firewire/core-iso.c                        |    1 +
5480  drivers/firmware/google/gsmi.c                     |    1 +
5481  drivers/firmware/sigma.c                           |    1 +
5482  drivers/gpio/gpio-74x164.c                         |    1 +
5483  drivers/gpio/gpio-ep93xx.c                         |    1 +
5484  drivers/gpio/gpio-mc33880.c                        |    1 +
5485  drivers/gpio/gpio-mcp23s08.c                       |    1 +
5486  drivers/gpio/gpio-ml-ioh.c                         |    1 +
5487  drivers/gpio/gpio-mpc5200.c                        |    1 +
5488  drivers/gpio/gpio-mxc.c                            |    1 +
5489  drivers/gpio/gpio-mxs.c                            |    1 +
5490  drivers/gpio/gpio-pcf857x.c                        |    1 +
5491  drivers/gpio/gpio-pch.c                            |    1 +
5492  drivers/gpio/gpio-xilinx.c                         |    1 +
5493  drivers/gpu/drm/ttm/ttm_tt.c                       |    1 +
5494  drivers/hid/hid-axff.c                             |    1 +
5495  drivers/hid/hid-debug.c                            |    1 +
5496  drivers/hid/hid-dr.c                               |    1 +
5497  drivers/hid/hid-emsff.c                            |    1 +
5498  drivers/hid/hid-gaff.c                             |    1 +
5499  drivers/hid/hid-holtekff.c                         |    1 +
5500  drivers/hid/hid-picolcd.c                          |    1 +
5501  drivers/hid/hid-pl.c                               |    1 +
5502  drivers/hid/hid-roccat-common.c                    |    1 +
5503  drivers/hid/hid-roccat.c                           |    1 +
5504  drivers/hid/hid-sjoy.c                             |    1 +
5505  drivers/hid/hid-tmff.c                             |    1 +
5506  drivers/hid/hid-zpff.c                             |    1 +
5507  drivers/hid/usbhid/hid-quirks.c                    |    1 +
5508  drivers/hwmon/ultra45_env.c                        |    1 +
5509  drivers/i2c/busses/i2c-pxa-pci.c                   |    1 +
5510  drivers/i2c/busses/i2c-sh7760.c                    |    1 +
5511  drivers/i2c/busses/i2c-tegra.c                     |    1 +
5512  drivers/i2c/i2c-boardinfo.c                        |    1 +
5513  drivers/ide/buddha.c                               |    1 +
5514  drivers/ide/cmd640.c                               |    1 +
5515  drivers/ide/ide-acpi.c                             |    1 +
5516  drivers/ide/ide-atapi.c                            |    1 +
5517  drivers/ide/ide-disk_proc.c                        |    1 +
5518  drivers/ide/ide-dma-sff.c                          |    1 +
5519  drivers/ide/ide-dma.c                              |    1 +
5520  drivers/ide/ide-eh.c                               |    1 +
5521  drivers/ide/ide-floppy_proc.c                      |    1 +
5522  drivers/ide/ide-io-std.c                           |    1 +
5523  drivers/ide/ide-ioctls.c                           |    1 +
5524  drivers/ide/ide-legacy.c                           |    1 +
5525  drivers/ide/ide-lib.c                              |    1 +
5526  drivers/ide/ide-pnp.c                              |    1 +
5527  drivers/ide/ide-taskfile.c                         |    1 +
5528  drivers/ide/ide-xfer-mode.c                        |    1 +
5529  drivers/ide/macide.c                               |    1 +
5530  drivers/ide/pmac.c                                 |    1 +
5531  drivers/ide/q40ide.c                               |    1 +
5532  drivers/ide/setup-pci.c                            |    1 +
5533  drivers/ide/tc86c001.c                             |    1 +
5534  drivers/idle/intel_idle.c                          |    1 +
5535  drivers/infiniband/core/cm.c                       |    1 +
5536  drivers/infiniband/core/fmr_pool.c                 |    1 +
5537  drivers/infiniband/core/mad.c                      |    1 +
5538  drivers/infiniband/core/multicast.c                |    1 +
5539  drivers/infiniband/core/packer.c                   |    1 +
5540  drivers/infiniband/core/sysfs.c                    |    1 +
5541  drivers/infiniband/core/ud_header.c                |    1 +
5542  drivers/infiniband/core/umem.c                     |    1 +
5543  drivers/infiniband/core/uverbs_marshall.c          |    1 +
5544  drivers/infiniband/core/verbs.c                    |    1 +
5545  drivers/infiniband/hw/ipath/ipath_diag.c           |    1 +
5546  drivers/infiniband/hw/ipath/ipath_file_ops.c       |    1 +
5547  drivers/infiniband/hw/ipath/ipath_sysfs.c          |    1 +
5548  drivers/infiniband/hw/ipath/ipath_verbs.c          |    1 +
5549  drivers/infiniband/hw/mthca/mthca_catas.c          |    1 +
5550  drivers/infiniband/hw/mthca/mthca_cmd.c            |    1 +
5551  drivers/infiniband/hw/mthca/mthca_provider.c       |    2 +
5552  drivers/infiniband/hw/qib/qib_diag.c               |    1 +
5553  drivers/infiniband/hw/qib/qib_file_ops.c           |    1 +
5554  drivers/infiniband/hw/qib/qib_iba7220.c            |    1 +
5555  drivers/infiniband/hw/qib/qib_iba7322.c            |    1 +
5556  drivers/infiniband/hw/qib/qib_pcie.c               |    1 +
5557  drivers/infiniband/hw/qib/qib_sd7220.c             |    1 +
5558  drivers/infiniband/hw/qib/qib_verbs.c              |    1 +
5559  drivers/input/input-compat.c                       |    1 +
5560  drivers/input/input-mt.c                           |    1 +
5561  drivers/input/input-polldev.c                      |    1 +
5562  drivers/input/joystick/as5011.c                    |    1 +
5563  drivers/input/keyboard/nomadik-ske-keypad.c        |    1 +
5564  drivers/input/keyboard/tnetv107x-keypad.c          |    1 +
5565  drivers/input/misc/ad714x.c                        |    1 +
5566  drivers/input/misc/adxl34x.c                       |    1 +
5567  drivers/input/misc/ati_remote2.c                   |    1 +
5568  drivers/input/misc/cma3000_d0x.c                   |    1 +
5569  drivers/input/misc/dm355evm_keys.c                 |    1 +
5570  drivers/input/sparse-keymap.c                      |    1 +
5571  drivers/input/touchscreen/ad7877.c                 |    1 +
5572  drivers/input/touchscreen/ad7879-spi.c             |    1 +
5573  drivers/input/touchscreen/ad7879.c                 |    1 +
5574  drivers/input/touchscreen/ads7846.c                |    1 +
5575  drivers/input/touchscreen/bu21013_ts.c             |    1 +
5576  drivers/isdn/capi/kcapi_proc.c                     |    1 +
5577  drivers/leds/dell-led.c                            |    1 +
5578  drivers/leds/leds-88pm860x.c                       |    1 +
5579  drivers/leds/leds-asic3.c                          |    1 +
5580  drivers/leds/leds-atmel-pwm.c                      |    1 +
5581  drivers/leds/leds-cobalt-raq.c                     |    1 +
5582  drivers/leds/leds-fsg.c                            |    1 +
5583  drivers/leds/leds-gpio.c                           |    1 +
5584  drivers/leds/leds-lm3530.c                         |    1 +
5585  drivers/leds/leds-locomo.c                         |    1 +
5586  drivers/leds/leds-lt3593.c                         |    1 +
5587  drivers/leds/leds-net48xx.c                        |    1 +
5588  drivers/leds/leds-net5501.c                        |    1 +
5589  drivers/leds/leds-ns2.c                            |    1 +
5590  drivers/leds/leds-s3c24xx.c                        |    1 +
5591  drivers/leds/leds-wm831x-status.c                  |    1 +
5592  drivers/leds/leds-wm8350.c                         |    1 +
5593  drivers/leds/leds-wrap.c                           |    1 +
5594  drivers/lguest/lguest_device.c                     |    1 +
5595  drivers/md/dm-exception-store.c                    |    1 +
5596  drivers/md/dm-log-userspace-base.c                 |    1 +
5597  drivers/md/dm-path-selector.c                      |    1 +
5598  drivers/md/dm-raid.c                               |    1 +
5599  drivers/md/dm-round-robin.c                        |    1 +
5600  drivers/md/dm-service-time.c                       |    1 +
5601  drivers/md/dm-snap-persistent.c                    |    1 +
5602  drivers/md/dm-snap-transient.c                     |    1 +
5603  drivers/md/dm-uevent.c                             |    1 +
5604  drivers/md/faulty.c                                |    1 +
5605  drivers/md/linear.c                                |    1 +
5606  drivers/md/md.c                                    |    1 +
5607  drivers/md/multipath.c                             |    1 +
5608  drivers/md/raid0.c                                 |    1 +
5609  drivers/md/raid1.c                                 |    1 +
5610  drivers/md/raid10.c                                |    1 +
5611  drivers/md/raid5.c                                 |    1 +
5612  drivers/media/common/saa7146_core.c                |    1 +
5613  drivers/media/common/saa7146_fops.c                |    1 +
5614  drivers/media/common/saa7146_hlp.c                 |    1 +
5615  drivers/media/common/saa7146_video.c               |    1 +
5616  drivers/media/common/tuners/tuner-types.c          |    1 +
5617  drivers/media/dvb/frontends/dibx000_common.c       |    1 +
5618  drivers/media/dvb/siano/sms-cards.c                |    1 +
5619  drivers/media/dvb/siano/smsendian.c                |    1 +
5620  drivers/media/dvb/siano/smssdio.c                  |    1 +
5621  drivers/media/dvb/siano/smsusb.c                   |    1 +
5622  drivers/media/media-device.c                       |    1 +
5623  drivers/media/radio/radio-timb.c                   |    1 +
5624  drivers/media/radio/radio-wl1273.c                 |    1 +
5625  drivers/media/radio/si4713-i2c.c                   |    1 +
5626  drivers/media/radio/wl128x/fmdrv_v4l2.c            |    2 +
5627  drivers/media/rc/ir-jvc-decoder.c                  |    1 +
5628  drivers/media/rc/ir-lirc-codec.c                   |    1 +
5629  drivers/media/rc/ir-nec-decoder.c                  |    1 +
5630  drivers/media/rc/ir-raw.c                          |    2 +
5631  drivers/media/rc/ir-rc5-decoder.c                  |    1 +
5632  drivers/media/rc/ir-rc5-sz-decoder.c               |    1 +
5633  drivers/media/rc/ir-rc6-decoder.c                  |    1 +
5634  drivers/media/rc/ir-sony-decoder.c                 |    1 +
5635  drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c    |    1 +
5636  drivers/media/rc/keymaps/rc-alink-dtu-m.c          |    1 +
5637  drivers/media/rc/keymaps/rc-anysee.c               |    1 +
5638  drivers/media/rc/keymaps/rc-apac-viewcomp.c        |    1 +
5639  drivers/media/rc/keymaps/rc-asus-pc39.c            |    1 +
5640  drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c |    1 +
5641  drivers/media/rc/keymaps/rc-avermedia-a16d.c       |    1 +
5642  drivers/media/rc/keymaps/rc-avermedia-cardbus.c    |    1 +
5643  drivers/media/rc/keymaps/rc-avermedia-dvbt.c       |    1 +
5644  drivers/media/rc/keymaps/rc-avermedia-m135a.c      |    1 +
5645  .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c    |    1 +
5646  drivers/media/rc/keymaps/rc-avermedia-rm-ks.c      |    1 +
5647  drivers/media/rc/keymaps/rc-avermedia.c            |    1 +
5648  drivers/media/rc/keymaps/rc-avertv-303.c           |    1 +
5649  drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c   |    1 +
5650  drivers/media/rc/keymaps/rc-behold-columbus.c      |    1 +
5651  drivers/media/rc/keymaps/rc-behold.c               |    1 +
5652  drivers/media/rc/keymaps/rc-budget-ci-old.c        |    1 +
5653  drivers/media/rc/keymaps/rc-cinergy-1400.c         |    1 +
5654  drivers/media/rc/keymaps/rc-cinergy.c              |    1 +
5655  drivers/media/rc/keymaps/rc-dib0700-nec.c          |    1 +
5656  drivers/media/rc/keymaps/rc-dib0700-rc5.c          |    1 +
5657  drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c  |    1 +
5658  drivers/media/rc/keymaps/rc-digittrade.c           |    1 +
5659  drivers/media/rc/keymaps/rc-dm1105-nec.c           |    1 +
5660  drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c      |    1 +
5661  drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c   |    1 +
5662  drivers/media/rc/keymaps/rc-em-terratec.c          |    1 +
5663  drivers/media/rc/keymaps/rc-encore-enltv-fm53.c    |    1 +
5664  drivers/media/rc/keymaps/rc-encore-enltv.c         |    1 +
5665  drivers/media/rc/keymaps/rc-encore-enltv2.c        |    1 +
5666  drivers/media/rc/keymaps/rc-evga-indtube.c         |    1 +
5667  drivers/media/rc/keymaps/rc-eztv.c                 |    1 +
5668  drivers/media/rc/keymaps/rc-flydvb.c               |    1 +
5669  drivers/media/rc/keymaps/rc-flyvideo.c             |    1 +
5670  drivers/media/rc/keymaps/rc-fusionhdtv-mce.c       |    1 +
5671  drivers/media/rc/keymaps/rc-gadmei-rm008z.c        |    1 +
5672  drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c   |    1 +
5673  drivers/media/rc/keymaps/rc-gotview7135.c          |    1 +
5674  drivers/media/rc/keymaps/rc-hauppauge.c            |    1 +
5675  drivers/media/rc/keymaps/rc-imon-mce.c             |    1 +
5676  drivers/media/rc/keymaps/rc-imon-pad.c             |    1 +
5677  drivers/media/rc/keymaps/rc-iodata-bctv7e.c        |    1 +
5678  drivers/media/rc/keymaps/rc-kaiomy.c               |    1 +
5679  drivers/media/rc/keymaps/rc-kworld-315u.c          |    1 +
5680  .../media/rc/keymaps/rc-kworld-plus-tv-analog.c    |    1 +
5681  drivers/media/rc/keymaps/rc-leadtek-y04g0051.c     |    1 +
5682  drivers/media/rc/keymaps/rc-lirc.c                 |    1 +
5683  drivers/media/rc/keymaps/rc-lme2510.c              |    1 +
5684  drivers/media/rc/keymaps/rc-manli.c                |    1 +
5685  drivers/media/rc/keymaps/rc-msi-digivox-ii.c       |    1 +
5686  drivers/media/rc/keymaps/rc-msi-digivox-iii.c      |    1 +
5687  drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c  |    1 +
5688  drivers/media/rc/keymaps/rc-msi-tvanywhere.c       |    1 +
5689  drivers/media/rc/keymaps/rc-nebula.c               |    1 +
5690  .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c  |    1 +
5691  drivers/media/rc/keymaps/rc-norwood.c              |    1 +
5692  drivers/media/rc/keymaps/rc-npgtech.c              |    1 +
5693  drivers/media/rc/keymaps/rc-pctv-sedna.c           |    1 +
5694  drivers/media/rc/keymaps/rc-pinnacle-color.c       |    1 +
5695  drivers/media/rc/keymaps/rc-pinnacle-grey.c        |    1 +
5696  drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c     |    1 +
5697  drivers/media/rc/keymaps/rc-pixelview-002t.c       |    1 +
5698  drivers/media/rc/keymaps/rc-pixelview-mk12.c       |    1 +
5699  drivers/media/rc/keymaps/rc-pixelview-new.c        |    1 +
5700  drivers/media/rc/keymaps/rc-pixelview.c            |    1 +
5701  .../media/rc/keymaps/rc-powercolor-real-angel.c    |    1 +
5702  drivers/media/rc/keymaps/rc-proteus-2309.c         |    1 +
5703  drivers/media/rc/keymaps/rc-purpletv.c             |    1 +
5704  drivers/media/rc/keymaps/rc-pv951.c                |    1 +
5705  drivers/media/rc/keymaps/rc-rc6-mce.c              |    1 +
5706  .../media/rc/keymaps/rc-real-audio-220-32-keys.c   |    1 +
5707  drivers/media/rc/keymaps/rc-streamzap.c            |    1 +
5708  drivers/media/rc/keymaps/rc-tbs-nec.c              |    1 +
5709  drivers/media/rc/keymaps/rc-technisat-usb2.c       |    1 +
5710  drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c  |    1 +
5711  drivers/media/rc/keymaps/rc-terratec-slim-2.c      |    1 +
5712  drivers/media/rc/keymaps/rc-terratec-slim.c        |    1 +
5713  drivers/media/rc/keymaps/rc-tevii-nec.c            |    1 +
5714  drivers/media/rc/keymaps/rc-tivo.c                 |    1 +
5715  drivers/media/rc/keymaps/rc-total-media-in-hand.c  |    1 +
5716  drivers/media/rc/keymaps/rc-trekstor.c             |    1 +
5717  drivers/media/rc/keymaps/rc-tt-1500.c              |    1 +
5718  drivers/media/rc/keymaps/rc-twinhan1027.c          |    1 +
5719  drivers/media/rc/keymaps/rc-videomate-m1f.c        |    1 +
5720  drivers/media/rc/keymaps/rc-videomate-s350.c       |    1 +
5721  drivers/media/rc/keymaps/rc-videomate-tv-pvr.c     |    1 +
5722  drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c |    1 +
5723  drivers/media/rc/keymaps/rc-winfast.c              |    1 +
5724  drivers/media/rc/rc-main.c                         |    1 +
5725  drivers/media/video/adp1653.c                      |    1 +
5726  drivers/media/video/ak881x.c                       |    1 +
5727  drivers/media/video/cpia2/cpia2_usb.c              |    1 +
5728  drivers/media/video/cx25840/cx25840-ir.c           |    1 +
5729  drivers/media/video/davinci/dm355_ccdc.c           |    1 +
5730  drivers/media/video/davinci/dm644x_ccdc.c          |    1 +
5731  drivers/media/video/hdpvr/hdpvr-i2c.c              |    1 +
5732  drivers/media/video/hexium_gemini.c                |    1 +
5733  drivers/media/video/hexium_orion.c                 |    1 +
5734  drivers/media/video/imx074.c                       |    1 +
5735  drivers/media/video/m5mols/m5mols_core.c           |    1 +
5736  drivers/media/video/mt9m001.c                      |    1 +
5737  drivers/media/video/mt9m111.c                      |    1 +
5738  drivers/media/video/mt9t031.c                      |    1 +
5739  drivers/media/video/mt9v011.c                      |    1 +
5740  drivers/media/video/mt9v022.c                      |    1 +
5741  drivers/media/video/mt9v032.c                      |    1 +
5742  drivers/media/video/mxb.c                          |    1 +
5743  drivers/media/video/noon010pc30.c                  |    1 +
5744  drivers/media/video/omap24xxcam.c                  |    1 +
5745  drivers/media/video/ov6650.c                       |    1 +
5746  drivers/media/video/pvrusb2/pvrusb2-devattr.c      |    1 +
5747  drivers/media/video/pvrusb2/pvrusb2-hdw.c          |    1 +
5748  drivers/media/video/pvrusb2/pvrusb2-i2c-core.c     |    1 +
5749  drivers/media/video/pvrusb2/pvrusb2-v4l2.c         |    1 +
5750  drivers/media/video/rj54n1cb0c.c                   |    1 +
5751  drivers/media/video/sh_mobile_csi2.c               |    1 +
5752  drivers/media/video/sh_vou.c                       |    1 +
5753  drivers/media/video/sr030pc30.c                    |    1 +
5754  drivers/media/video/tcm825x.c                      |    1 +
5755  drivers/media/video/timblogiw.c                    |    1 +
5756  drivers/media/video/tvp514x.c                      |    1 +
5757  drivers/media/video/tvp5150.c                      |    1 +
5758  drivers/media/video/tvp7002.c                      |    1 +
5759  drivers/media/video/usbvision/usbvision-cards.c    |    1 +
5760  drivers/media/video/v4l2-ctrls.c                   |    1 +
5761  drivers/media/video/v4l2-device.c                  |    1 +
5762  drivers/media/video/v4l2-event.c                   |    1 +
5763  drivers/media/video/v4l2-fh.c                      |    1 +
5764  drivers/media/video/v4l2-int-device.c              |    1 +
5765  drivers/media/video/v4l2-subdev.c                  |    1 +
5766  drivers/memstick/core/memstick.c                   |    1 +
5767  drivers/memstick/core/mspro_block.c                |    1 +
5768  drivers/memstick/host/jmb38x_ms.c                  |    1 +
5769  drivers/memstick/host/tifm_ms.c                    |    1 +
5770  drivers/message/i2o/pci.c                          |    1 +
5771  drivers/mfd/ab3100-core.c                          |    1 +
5772  drivers/mfd/ab3550-core.c                          |    1 +
5773  drivers/mfd/ab8500-debugfs.c                       |    1 +
5774  drivers/mfd/ab8500-sysctrl.c                       |    1 +
5775  drivers/mfd/abx500-core.c                          |    1 +
5776  drivers/mfd/asic3.c                                |    1 +
5777  drivers/mfd/dm355evm_msp.c                         |    1 +
5778  drivers/mfd/max8997.c                              |    1 +
5779  drivers/mfd/mfd-core.c                             |    1 +
5780  drivers/mfd/pcf50633-irq.c                         |    1 +
5781  drivers/mfd/tmio_core.c                            |    1 +
5782  drivers/mfd/twl-core.c                             |    1 +
5783  drivers/mfd/twl6030-irq.c                          |    1 +
5784  drivers/mfd/wl1273-core.c                          |    1 +
5785  drivers/mfd/wm8400-core.c                          |    1 +
5786  drivers/misc/ab8500-pwm.c                          |    1 +
5787  drivers/misc/atmel-ssc.c                           |    1 +
5788  drivers/misc/atmel_tclib.c                         |    1 +
5789  drivers/misc/bh1780gli.c                           |    1 +
5790  drivers/misc/kgdbts.c                              |    1 +
5791  drivers/misc/ti-st/st_kim.c                        |    1 +
5792  drivers/misc/tifm_7xx1.c                           |    1 +
5793  drivers/misc/tifm_core.c                           |    1 +
5794  drivers/mmc/card/mmc_test.c                        |    1 +
5795  drivers/mmc/core/bus.c                             |    2 +
5796  drivers/mmc/core/debugfs.c                         |    1 +
5797  drivers/mmc/core/host.c                            |    1 +
5798  drivers/mmc/core/mmc.c                             |    1 +
5799  drivers/mmc/core/mmc_ops.c                         |    1 +
5800  drivers/mmc/core/quirks.c                          |    1 +
5801  drivers/mmc/core/sd.c                              |    1 +
5802  drivers/mmc/core/sd_ops.c                          |    1 +
5803  drivers/mmc/core/sdio_bus.c                        |    1 +
5804  drivers/mmc/core/sdio_io.c                         |    1 +
5805  drivers/mmc/core/sdio_irq.c                        |    1 +
5806  drivers/mmc/host/mmc_spi.c                         |    1 +
5807  drivers/mmc/host/mxs-mmc.c                         |    1 +
5808  drivers/mmc/host/sdhci-of-esdhc.c                  |    1 +
5809  drivers/mmc/host/sdhci-of-hlwd.c                   |    1 +
5810  drivers/mmc/host/sdhci-pci.c                       |    1 +
5811  drivers/mmc/host/sdhci-pltfm.c                     |    1 +
5812  drivers/mmc/host/sdhci-pxav2.c                     |    1 +
5813  drivers/mmc/host/sdhci-pxav3.c                     |    1 +
5814  drivers/mmc/host/sdhci-spear.c                     |    1 +
5815  drivers/mmc/host/sdhci-tegra.c                     |    1 +
5816  drivers/mmc/host/sdhci.c                           |    1 +
5817  drivers/mmc/host/sdricoh_cs.c                      |    1 +
5818  drivers/mmc/host/sh_mmcif.c                        |    1 +
5819  drivers/mmc/host/sh_mobile_sdhi.c                  |    1 +
5820  drivers/mmc/host/tifm_sd.c                         |    1 +
5821  drivers/mmc/host/via-sdmmc.c                       |    1 +
5822  drivers/mtd/ar7part.c                              |    1 +
5823  drivers/mtd/cmdlinepart.c                          |    1 +
5824  drivers/mtd/lpddr/lpddr_cmds.c                     |    1 +
5825  drivers/mtd/mtdblock_ro.c                          |    1 +
5826  drivers/mtd/mtdsuper.c                             |    1 +
5827  drivers/mtd/nand/cafe_nand.c                       |    1 +
5828  drivers/mtd/nand/cmx270_nand.c                     |    1 +
5829  drivers/mtd/nand/diskonchip.c                      |    1 +
5830  drivers/mtd/nand/nand_bbt.c                        |    1 +
5831  drivers/mtd/nand/omap2.c                           |    1 +
5832  drivers/mtd/nand/sm_common.c                       |    1 +
5833  drivers/mtd/onenand/onenand_bbt.c                  |    1 +
5834  drivers/mtd/redboot.c                              |    1 +
5835  drivers/mtd/rfd_ftl.c                              |    1 +
5836  drivers/mtd/ubi/vmt.c                              |    1 +
5837  drivers/net/ethernet/mellanox/mlx4/alloc.c         |    1 +
5838  drivers/net/ethernet/mellanox/mlx4/catas.c         |    1 +
5839  drivers/net/ethernet/mellanox/mlx4/cmd.c           |    1 +
5840  drivers/net/ethernet/mellanox/mlx4/cq.c            |    1 +
5841  drivers/net/ethernet/mellanox/mlx4/eq.c            |    1 +
5842  drivers/net/ethernet/mellanox/mlx4/fw.c            |    1 +
5843  drivers/net/ethernet/mellanox/mlx4/intf.c          |    1 +
5844  drivers/net/ethernet/mellanox/mlx4/mr.c            |    1 +
5845  drivers/net/ethernet/mellanox/mlx4/pd.c            |    1 +
5846  drivers/net/ethernet/mellanox/mlx4/port.c          |    1 +
5847  drivers/net/ethernet/mellanox/mlx4/qp.c            |    1 +
5848  drivers/net/ethernet/mellanox/mlx4/srq.c           |    1 +
5849  drivers/net/phy/realtek.c                          |    1 +
5850  drivers/net/wireless/b43/pcmcia.c                  |    1 +
5851  drivers/of/of_pci.c                                |    1 +
5852  drivers/of/of_pci_irq.c                            |    1 +
5853  drivers/of/of_spi.c                                |    1 +
5854  drivers/parisc/ccio-dma.c                          |    1 +
5855  drivers/parisc/sba_iommu.c                         |    1 +
5856  drivers/pci/hotplug-pci.c                          |    1 +
5857  drivers/pci/hotplug/pciehp_acpi.c                  |    1 +
5858  drivers/pci/hotplug/pcihp_slot.c                   |    1 +
5859  drivers/pci/hotplug/rpadlpar_core.c                |    1 +
5860  drivers/pci/htirq.c                                |    1 +
5861  drivers/pci/iov.c                                  |    1 +
5862  drivers/pci/irq.c                                  |    1 +
5863  drivers/pci/msi.c                                  |    1 +
5864  drivers/pci/pci-sysfs.c                            |    1 +
5865  drivers/pci/quirks.c                               |    1 +
5866  drivers/pci/rom.c                                  |    1 +
5867  drivers/pci/setup-res.c                            |    1 +
5868  drivers/pci/slot.c                                 |    1 +
5869  drivers/pci/vpd.c                                  |    1 +
5870  drivers/pcmcia/db1xxx_ss.c                         |    1 +
5871  drivers/pcmcia/pxa2xx_cm_x255.c                    |    1 +
5872  drivers/pcmcia/pxa2xx_cm_x270.c                    |    1 +
5873  drivers/platform/x86/intel_scu_ipc.c               |    1 +
5874  drivers/platform/x86/msi-wmi.c                     |    1 +
5875  drivers/platform/x86/wmi.c                         |    1 +
5876  drivers/power/max17042_battery.c                   |    1 +
5877  drivers/power/max8903_charger.c                    |    1 +
5878  drivers/power/power_supply_sysfs.c                 |    1 +
5879  drivers/ps3/ps3stor_lib.c                          |    1 +
5880  drivers/ps3/sys-manager-core.c                     |    1 +
5881  drivers/rapidio/switches/idt_gen2.c                |    1 +
5882  drivers/regulator/88pm8607.c                       |    1 +
5883  drivers/regulator/ab8500.c                         |    1 +
5884  drivers/regulator/bq24022.c                        |    1 +
5885  drivers/regulator/da903x.c                         |    1 +
5886  drivers/regulator/db8500-prcmu.c                   |    1 +
5887  drivers/regulator/dummy.c                          |    1 +
5888  drivers/regulator/fixed.c                          |    1 +
5889  drivers/regulator/lp3971.c                         |    1 +
5890  drivers/regulator/lp3972.c                         |    1 +
5891  drivers/regulator/max8925-regulator.c              |    1 +
5892  drivers/regulator/max8997.c                        |    1 +
5893  drivers/regulator/mc13783-regulator.c              |    1 +
5894  drivers/regulator/mc13892-regulator.c              |    1 +
5895  drivers/regulator/mc13xxx-regulator-core.c         |    1 +
5896  drivers/regulator/tps6586x-regulator.c             |    1 +
5897  drivers/regulator/userspace-consumer.c             |    1 +
5898  drivers/regulator/virtual.c                        |    1 +
5899  drivers/regulator/wm8400-regulator.c               |    1 +
5900  drivers/rtc/interface.c                            |    1 +
5901  drivers/rtc/rtc-dm355evm.c                         |    1 +
5902  drivers/rtc/rtc-ds1305.c                           |    1 +
5903  drivers/rtc/rtc-ds1511.c                           |    1 +
5904  drivers/rtc/rtc-ds1553.c                           |    1 +
5905  drivers/rtc/rtc-ds1672.c                           |    1 +
5906  drivers/rtc/rtc-ds1742.c                           |    1 +
5907  drivers/rtc/rtc-em3027.c                           |    1 +
5908  drivers/rtc/rtc-isl12022.c                         |    1 +
5909  drivers/rtc/rtc-mv.c                               |    1 +
5910  drivers/rtc/rtc-pcf2123.c                          |    1 +
5911  drivers/rtc/rtc-pcf8563.c                          |    1 +
5912  drivers/rtc/rtc-rs5c348.c                          |    1 +
5913  drivers/rtc/rtc-rs5c372.c                          |    1 +
5914  drivers/rtc/rtc-stk17ta8.c                         |    1 +
5915  drivers/rtc/rtc-tx4939.c                           |    1 +
5916  drivers/rtc/rtc-x1205.c                            |    1 +
5917  drivers/s390/char/fs3270.c                         |    1 +
5918  drivers/s390/char/sclp_cpi_sys.c                   |    1 +
5919  drivers/s390/char/vmur.c                           |    1 +
5920  drivers/s390/cio/chp.c                             |    2 +
5921  drivers/s390/cio/qdio_debug.c                      |    2 +
5922  drivers/s390/kvm/kvm_virtio.c                      |    1 +
5923  drivers/s390/scsi/zfcp_ccw.c                       |    1 +
5924  drivers/s390/scsi/zfcp_dbf.c                       |    1 +
5925  drivers/s390/scsi/zfcp_scsi.c                      |    1 +
5926  drivers/scsi/a2091.c                               |    1 +
5927  drivers/scsi/a3000.c                               |    1 +
5928  drivers/scsi/aacraid/aachba.c                      |    1 +
5929  drivers/scsi/bfa/bfad_debugfs.c                    |    1 +
5930  drivers/scsi/bfa/bfad_im.c                         |    2 +
5931  drivers/scsi/device_handler/scsi_dh.c              |    1 +
5932  drivers/scsi/device_handler/scsi_dh_alua.c         |    1 +
5933  drivers/scsi/device_handler/scsi_dh_emc.c          |    1 +
5934  drivers/scsi/device_handler/scsi_dh_hp_sw.c        |    1 +
5935  drivers/scsi/device_handler/scsi_dh_rdac.c         |    1 +
5936  drivers/scsi/gvp11.c                               |    1 +
5937  drivers/scsi/libfc/fc_disc.c                       |    1 +
5938  drivers/scsi/libfc/fc_elsct.c                      |    1 +
5939  drivers/scsi/libfc/fc_exch.c                       |    1 +
5940  drivers/scsi/libfc/fc_libfc.c                      |    1 +
5941  drivers/scsi/libfc/fc_lport.c                      |    1 +
5942  drivers/scsi/libfc/fc_npiv.c                       |    1 +
5943  drivers/scsi/libfc/fc_rport.c                      |    1 +
5944  drivers/scsi/libsas/sas_scsi_host.c                |    1 +
5945  drivers/scsi/libsas/sas_task.c                     |    1 +
5946  drivers/scsi/libsrp.c                              |    1 +
5947  drivers/scsi/lpfc/lpfc_attr.c                      |    1 +
5948  drivers/scsi/lpfc/lpfc_debugfs.c                   |    1 +
5949  drivers/scsi/lpfc/lpfc_init.c                      |    1 +
5950  drivers/scsi/lpfc/lpfc_scsi.c                      |    1 +
5951  drivers/scsi/mac53c94.c                            |    1 +
5952  drivers/scsi/megaraid/megaraid_mbox.c              |    1 +
5953  drivers/scsi/osd/osd_initiator.c                   |    1 +
5954  drivers/scsi/ps3rom.c                              |    1 +
5955  drivers/scsi/scsi_lib.c                            |    1 +
5956  drivers/scsi/scsi_lib_dma.c                        |    1 +
5957  drivers/scsi/scsi_pm.c                             |    1 +
5958  drivers/scsi/sr_ioctl.c                            |    1 +
5959  drivers/sfi/sfi_core.h                             |    3 +
5960  drivers/sh/intc/core.c                             |    1 +
5961  drivers/sh/intc/virq.c                             |    1 +
5962  drivers/sh/maple/maple.c                           |    1 +
5963  drivers/spi/spi-altera.c                           |    1 +
5964  drivers/spi/spi-au1550.c                           |    1 +
5965  drivers/spi/spi-bitbang.c                          |    1 +
5966  drivers/spi/spi-butterfly.c                        |    1 +
5967  drivers/spi/spi-dw-mmio.c                          |    1 +
5968  drivers/spi/spi-dw-pci.c                           |    1 +
5969  drivers/spi/spi-dw.c                               |    1 +
5970  drivers/spi/spi-gpio.c                             |    1 +
5971  drivers/spi/spi-oc-tiny.c                          |    1 +
5972  drivers/spi/spi-omap-uwire.c                       |    1 +
5973  drivers/spi/spi-orion.c                            |    1 +
5974  drivers/spi/spi-pxa2xx-pci.c                       |    1 +
5975  drivers/spi/spi-s3c24xx.c                          |    1 +
5976  drivers/spi/spi-sh-msiof.c                         |    1 +
5977  drivers/spi/spi-sh-sci.c                           |    1 +
5978  drivers/spi/spi-ti-ssp.c                           |    1 +
5979  drivers/spi/spi-tle62x0.c                          |    1 +
5980  drivers/spi/spi-txx9.c                             |    1 +
5981  drivers/spi/spi.c                                  |    1 +
5982  drivers/ssb/b43_pci_bridge.c                       |    1 +
5983  drivers/ssb/driver_chipcommon.c                    |    1 +
5984  drivers/ssb/driver_chipcommon_pmu.c                |    1 +
5985  drivers/ssb/driver_gige.c                          |    1 +
5986  drivers/ssb/driver_pcicore.c                       |    1 +
5987  drivers/ssb/embedded.c                             |    1 +
5988  drivers/ssb/main.c                                 |    1 +
5989  drivers/ssb/pcihost_wrapper.c                      |    1 +
5990  drivers/staging/altera-stapl/altera.c              |    1 +
5991  drivers/staging/brcm80211/brcmutil/wifi.c          |    1 +
5992  drivers/staging/dt3155v4l/dt3155v4l.c              |    1 +
5993  drivers/staging/iio/accel/adis16201_core.c         |    1 +
5994  drivers/staging/iio/accel/adis16203_core.c         |    1 +
5995  drivers/staging/iio/accel/adis16204_core.c         |    1 +
5996  drivers/staging/iio/accel/adis16209_core.c         |    1 +
5997  drivers/staging/iio/accel/adis16220_core.c         |    1 +
5998  drivers/staging/iio/accel/adis16240_core.c         |    1 +
5999  drivers/staging/iio/accel/kxsd9.c                  |    1 +
6000  drivers/staging/iio/accel/lis3l02dq_core.c         |    1 +
6001  drivers/staging/iio/accel/sca3000_core.c           |    1 +
6002  drivers/staging/iio/adc/ad7150.c                   |    1 +
6003  drivers/staging/iio/adc/ad7152.c                   |    1 +
6004  drivers/staging/iio/adc/ad7291.c                   |    1 +
6005  drivers/staging/iio/adc/ad7298_core.c              |    1 +
6006  drivers/staging/iio/adc/ad7314.c                   |    1 +
6007  drivers/staging/iio/adc/ad7476_core.c              |    1 +
6008  drivers/staging/iio/adc/ad7606_core.c              |    1 +
6009  drivers/staging/iio/adc/ad7745.c                   |    1 +
6010  drivers/staging/iio/adc/ad7780.c                   |    1 +
6011  drivers/staging/iio/adc/ad7816.c                   |    1 +
6012  drivers/staging/iio/adc/ad7887_core.c              |    1 +
6013  drivers/staging/iio/adc/ad799x_core.c              |    1 +
6014  drivers/staging/iio/adc/adt7310.c                  |    1 +
6015  drivers/staging/iio/adc/adt7410.c                  |    1 +
6016  drivers/staging/iio/adc/adt75.c                    |    1 +
6017  drivers/staging/iio/adc/max1363_core.c             |    1 +
6018  drivers/staging/iio/addac/adt7316-i2c.c            |    1 +
6019  drivers/staging/iio/addac/adt7316.c                |    1 +
6020  drivers/staging/iio/dac/ad5446.c                   |    1 +
6021  drivers/staging/iio/dac/ad5504.c                   |    1 +
6022  drivers/staging/iio/dac/ad5624r_spi.c              |    1 +
6023  drivers/staging/iio/dac/ad5686.c                   |    1 +
6024  drivers/staging/iio/dac/ad5791.c                   |    1 +
6025  drivers/staging/iio/dds/ad5930.c                   |    1 +
6026  drivers/staging/iio/dds/ad9832.c                   |    1 +
6027  drivers/staging/iio/dds/ad9834.c                   |    1 +
6028  drivers/staging/iio/dds/ad9850.c                   |    1 +
6029  drivers/staging/iio/dds/ad9852.c                   |    1 +
6030  drivers/staging/iio/dds/ad9910.c                   |    1 +
6031  drivers/staging/iio/dds/ad9951.c                   |    1 +
6032  drivers/staging/iio/gyro/adis16060_core.c          |    1 +
6033  drivers/staging/iio/gyro/adis16080_core.c          |    1 +
6034  drivers/staging/iio/gyro/adis16130_core.c          |    1 +
6035  drivers/staging/iio/gyro/adis16260_core.c          |    1 +
6036  drivers/staging/iio/gyro/adxrs450_core.c           |    1 +
6037  drivers/staging/iio/imu/adis16400_core.c           |    1 +
6038  drivers/staging/iio/industrialio-ring.c            |    1 +
6039  drivers/staging/iio/light/tsl2583.c                |    1 +
6040  drivers/staging/iio/meter/ade7753.c                |    1 +
6041  drivers/staging/iio/meter/ade7754.c                |    1 +
6042  drivers/staging/iio/meter/ade7758_core.c           |    1 +
6043  drivers/staging/iio/meter/ade7759.c                |    1 +
6044  drivers/staging/iio/meter/ade7854-i2c.c            |    1 +
6045  drivers/staging/iio/meter/ade7854-spi.c            |    1 +
6046  drivers/staging/iio/meter/ade7854.c                |    1 +
6047  drivers/staging/iio/resolver/ad2s120x.c            |    1 +
6048  drivers/staging/iio/resolver/ad2s1210.c            |    1 +
6049  drivers/staging/iio/resolver/ad2s90.c              |    1 +
6050  drivers/staging/iio/trigger.h                      |    1 +
6051  .../staging/intel_sst/intel_sst_drv_interface.c    |    1 +
6052  drivers/staging/line6/audio.c                      |    1 +
6053  drivers/staging/olpc_dcon/olpc_dcon.c              |    1 +
6054  drivers/staging/sm7xx/smtcfb.c                     |    2 +
6055  drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c      |    1 +
6056  drivers/staging/usbip/stub_dev.c                   |    1 +
6057  drivers/staging/usbip/stub_main.c                  |    1 +
6058  drivers/staging/usbip/usbip_event.c                |    1 +
6059  drivers/tty/hvc/hvc_iseries.c                      |    1 +
6060  drivers/tty/hvc/hvc_vio.c                          |    1 +
6061  drivers/tty/serial/jsm/jsm_driver.c                |    2 +-
6062  drivers/tty/serial/kgdboc.c                        |    1 +
6063  drivers/tty/serial/max3100.c                       |    1 +
6064  drivers/tty/serial/max3107-aava.c                  |    1 +
6065  drivers/tty/serial/max3107.c                       |    1 +
6066  drivers/tty/serial/nwpserial.c                     |    1 +
6067  drivers/tty/serial/timbuart.c                      |    1 +
6068  drivers/tty/serial/xilinx_uartps.c                 |    1 +
6069  drivers/tty/vt/vc_screen.c                         |    1 +
6070  drivers/uio/uio_pdrv.c                             |    1 +
6071  drivers/uio/uio_pdrv_genirq.c                      |    1 +
6072  drivers/usb/c67x00/c67x00-drv.c                    |    1 +
6073  drivers/usb/core/driver.c                          |    1 +
6074  drivers/usb/core/notify.c                          |    1 +
6075  drivers/usb/gadget/cdc2.c                          |    1 +
6076  drivers/usb/gadget/composite.c                     |    1 +
6077  drivers/usb/gadget/dbgp.c                          |    1 +
6078  drivers/usb/gadget/f_fs.c                          |    1 +
6079  drivers/usb/gadget/f_obex.c                        |    1 +
6080  drivers/usb/gadget/f_sourcesink.c                  |    1 +
6081  drivers/usb/gadget/file_storage.c                  |    1 +
6082  drivers/usb/gadget/fusb300_udc.c                   |    1 +
6083  drivers/usb/gadget/gmidi.c                         |    1 +
6084  drivers/usb/gadget/u_serial.c                      |    1 +
6085  drivers/usb/host/fsl-mph-dr-of.c                   |    1 +
6086  drivers/usb/host/isp1760-if.c                      |    1 +
6087  drivers/usb/host/pci-quirks.c                      |    1 +
6088  drivers/usb/host/whci/debug.c                      |    1 +
6089  drivers/usb/host/whci/hcd.c                        |    1 +
6090  drivers/usb/host/xhci-hub.c                        |    1 +
6091  drivers/usb/host/xhci-pci.c                        |    1 +
6092  drivers/usb/mon/mon_bin.c                          |    1 +
6093  drivers/usb/mon/mon_stat.c                         |    1 +
6094  drivers/usb/mon/mon_text.c                         |    1 +
6095  drivers/usb/otg/gpio_vbus.c                        |    1 +
6096  drivers/usb/otg/otg.c                              |    1 +
6097  drivers/usb/otg/ulpi.c                             |    1 +
6098  drivers/usb/serial/aircable.c                      |    1 +
6099  drivers/usb/serial/qcserial.c                      |    1 +
6100  drivers/usb/storage/option_ms.c                    |    1 +
6101  drivers/usb/storage/protocol.c                     |    1 +
6102  drivers/usb/storage/sierra_ms.c                    |    1 +
6103  drivers/usb/storage/transport.c                    |    1 +
6104  drivers/usb/storage/uas.c                          |    1 +
6105  drivers/usb/wusbcore/devconnect.c                  |    1 +
6106  drivers/usb/wusbcore/mmc.c                         |    1 +
6107  drivers/usb/wusbcore/rh.c                          |    1 +
6108  drivers/usb/wusbcore/security.c                    |    1 +
6109  drivers/usb/wusbcore/wa-hc.c                       |    1 +
6110  drivers/usb/wusbcore/wa-rpipe.c                    |    1 +
6111  drivers/usb/wusbcore/wa-xfer.c                     |    1 +
6112  drivers/uwb/est.c                                  |    1 +
6113  drivers/uwb/i1480/dfu/dfu.c                        |    1 +
6114  drivers/uwb/ie.c                                   |    1 +
6115  drivers/uwb/lc-dev.c                               |    2 +
6116  drivers/uwb/neh.c                                  |    1 +
6117  drivers/uwb/pal.c                                  |    1 +
6118  drivers/uwb/radio.c                                |    1 +
6119  drivers/uwb/reset.c                                |    1 +
6120  drivers/uwb/rsv.c                                  |    1 +
6121  drivers/uwb/scan.c                                 |    1 +
6122  drivers/uwb/umc-bus.c                              |    1 +
6123  drivers/uwb/umc-dev.c                              |    1 +
6124  drivers/uwb/umc-drv.c                              |    1 +
6125  drivers/uwb/whci.c                                 |    1 +
6126  drivers/video/atmel_lcdfb.c                        |    1 +
6127  drivers/video/backlight/88pm860x_bl.c              |    1 +
6128  drivers/video/backlight/adp5520_bl.c               |    1 +
6129  drivers/video/backlight/ams369fg06.c               |    1 +
6130  drivers/video/backlight/da903x_bl.c                |    1 +
6131  drivers/video/backlight/l4f00242t03.c              |    1 +
6132  drivers/video/backlight/ld9040.c                   |    1 +
6133  drivers/video/backlight/lms283gf05.c               |    1 +
6134  drivers/video/backlight/max8925_bl.c               |    1 +
6135  drivers/video/backlight/s6e63m0.c                  |    1 +
6136  drivers/video/backlight/wm831x_bl.c                |    1 +
6137  drivers/video/carminefb.c                          |    1 +
6138  drivers/video/cobalt_lcdfb.c                       |    1 +
6139  drivers/video/fb_ddc.c                             |    3 +-
6140  drivers/video/fb_notify.c                          |    1 +
6141  drivers/video/mb862xx/mb862xx-i2c.c                |    1 +
6142  drivers/video/mb862xx/mb862xxfbdrv.c               |    1 +
6143  drivers/video/msm/mdp.c                            |    1 +
6144  drivers/video/omap/lcd_mipid.c                     |    1 +
6145  drivers/video/omap/omapfb_main.c                   |    1 +
6146  drivers/video/omap2/dss/dispc.c                    |    1 +
6147  drivers/video/omap2/dss/dpi.c                      |    1 +
6148  drivers/video/omap2/dss/dsi.c                      |    1 +
6149  drivers/video/omap2/dss/dss.c                      |    1 +
6150  drivers/video/omap2/dss/rfbi.c                     |    1 +
6151  drivers/video/omap2/dss/sdi.c                      |    1 +
6152  drivers/video/omap2/omapfb/omapfb-ioctl.c          |    1 +
6153  drivers/video/savage/savagefb_accel.c              |    1 +
6154  drivers/video/sh_mipi_dsi.c                        |    1 +
6155  drivers/video/sh_mobile_lcdcfb.c                   |    1 +
6156  drivers/video/via/via-gpio.c                       |    1 +
6157  drivers/video/w100fb.c                             |    1 +
6158  drivers/virtio/virtio.c                            |    1 +
6159  drivers/virtio/virtio_balloon.c                    |    1 +
6160  drivers/virtio/virtio_ring.c                       |    1 +
6161  drivers/w1/w1_family.c                             |    1 +
6162  drivers/xen/balloon.c                              |    1 +
6163  drivers/xen/manage.c                               |    1 +
6164  drivers/xen/swiotlb-xen.c                          |    1 +
6165  drivers/xen/xen-pciback/conf_space.c               |    1 +
6166  drivers/xen/xen-selfballoon.c                      |    2 +
6167  drivers/xen/xenbus/xenbus_client.c                 |    1 +
6168  drivers/xen/xenbus/xenbus_probe.c                  |    1 +
6169  drivers/xen/xenbus/xenbus_probe_backend.c          |    1 +
6170  drivers/xen/xenbus/xenbus_probe_frontend.c         |    1 +
6171  drivers/zorro/proc.c                               |    1 +
6172  fs/bio-integrity.c                                 |    1 +
6173  fs/exofs/super.c                                   |    1 +
6174  fs/gfs2/ops_fstype.c                               |    1 +
6175  fs/ioprio.c                                        |    1 +
6176  fs/jfs/jfs_logmgr.c                                |    1 +
6177  fs/logfs/super.c                                   |    1 +
6178  fs/nfsd/nfssvc.c                                   |    1 +
6179  fs/proc/vmcore.c                                   |    1 +
6180  include/acpi/platform/aclinux.h                    |    2 +-
6181  include/drm/drmP.h                                 |    3 +-
6182  include/linux/bcma/bcma.h                          |    7 +-
6183  include/linux/blkdev.h                             |    2 +-
6184  include/linux/cpuidle.h                            |    3 +-
6185  include/linux/crypto.h                             |    6 --
6186  include/linux/device.h                             |   15 ++-
6187  include/linux/device_cgroup.h                      |    1 -
6188  include/linux/dmaengine.h                          |    2 +
6189  include/linux/export.h                             |   89 ++++++++++++++++++++
6190  include/linux/firmware.h                           |    2 +-
6191  include/linux/ftrace.h                             |    2 +-
6192  include/linux/gameport.h                           |   17 ++--
6193  include/linux/hid.h                                |    9 +-
6194  include/linux/i2c.h                                |   10 +-
6195  include/linux/ipmi.h                               |    3 +-
6196  include/linux/ipmi_smi.h                           |    1 -
6197  include/linux/mdio-bitbang.h                       |    3 +-
6198  include/linux/module.h                             |   68 +---------------
6199  include/linux/mtd/mtd.h                            |    3 +-
6200  include/linux/of_platform.h                        |    1 -
6201  include/linux/pci_hotplug.h                        |   10 +--
6202  include/linux/pm_runtime.h                         |    1 +
6203  include/linux/regulator/driver.h                   |    1 +
6204  include/linux/serio.h                              |   20 +++--
6205  include/linux/ssb/ssb.h                            |    7 +-
6206  include/linux/stop_machine.h                       |    1 +
6207  include/linux/sunrpc/svc_xprt.h                    |    3 +-
6208  include/linux/sysdev.h                             |    1 -
6209  include/linux/textsearch.h                         |    3 +-
6210  include/linux/uio_driver.h                         |   12 ++--
6211  include/linux/usb.h                                |    9 +-
6212  include/linux/uwb.h                                |    1 +
6213  include/linux/uwb/umc.h                            |    7 +-
6214  include/linux/vermagic.h                           |    1 -
6215  include/linux/vlynq.h                              |    3 +-
6216  include/media/saa7146.h                            |    3 +-
6217  include/media/v4l2-int-device.h                    |    3 +-
6218  include/net/inet_timewait_sock.h                   |    1 -
6219  include/net/lib80211.h                             |    3 +-
6220  include/net/sch_generic.h                          |    1 -
6221  include/net/sock.h                                 |    2 +-
6222  include/sound/core.h                               |    2 +-
6223  include/trace/define_trace.h                       |    2 +-
6224  include/trace/events/module.h                      |    2 +-
6225  include/xen/xenbus.h                               |    1 +
6226  kernel/async.c                                     |    2 +-
6227  kernel/audit.c                                     |    2 +-
6228  kernel/auditsc.c                                   |    2 +-
6229  kernel/capability.c                                |    2 +-
6230  kernel/cgroup_freezer.c                            |    2 +-
6231  kernel/compat.c                                    |    1 +
6232  kernel/cpu.c                                       |    2 +-
6233  kernel/cpuset.c                                    |    2 +-
6234  kernel/crash_dump.c                                |    2 +-
6235  kernel/cred.c                                      |    2 +-
6236  kernel/debug/kdb/kdb_debugger.c                    |    1 +
6237  kernel/dma.c                                       |    2 +-
6238  kernel/events/core.c                               |    1 +
6239  kernel/exit.c                                      |    3 +-
6240  kernel/fork.c                                      |    3 +-
6241  kernel/freezer.c                                   |    2 +-
6242  kernel/futex.c                                     |    2 +-
6243  kernel/groups.c                                    |    2 +-
6244  kernel/hrtimer.c                                   |    2 +-
6245  kernel/hung_task.c                                 |    2 +-
6246  kernel/irq_work.c                                  |    4 +-
6247  kernel/kfifo.c                                     |    2 +-
6248  kernel/kprobes.c                                   |    2 +-
6249  kernel/ksysfs.c                                    |    3 +-
6250  kernel/kthread.c                                   |    2 +-
6251  kernel/latencytop.c                                |    2 +-
6252  kernel/lockdep.c                                   |    2 +-
6253  kernel/lockdep_proc.c                              |    2 +-
6254  kernel/module.c                                    |    2 +-
6255  kernel/mutex-debug.c                               |    2 +-
6256  kernel/mutex.c                                     |    2 +-
6257  kernel/notifier.c                                  |    2 +-
6258  kernel/nsproxy.c                                   |    2 +-
6259  kernel/padata.c                                    |    2 +-
6260  kernel/params.c                                    |    4 +-
6261  kernel/pid.c                                       |    2 +-
6262  kernel/posix-timers.c                              |    2 +-
6263  kernel/power/hibernate.c                           |    1 +
6264  kernel/power/main.c                                |    1 +
6265  kernel/power/suspend.c                             |    2 +
6266  kernel/printk.c                                    |    2 +-
6267  kernel/profile.c                                   |    2 +-
6268  kernel/ptrace.c                                    |    2 +-
6269  kernel/range.c                                     |    2 +-
6270  kernel/rcupdate.c                                  |    2 +-
6271  kernel/rcutiny.c                                   |    4 +-
6272  kernel/rcutorture.c                                |    3 +-
6273  kernel/rcutree.c                                   |    2 +-
6274  kernel/rcutree_trace.c                             |    3 +-
6275  kernel/relay.c                                     |    2 +-
6276  kernel/resource.c                                  |    2 +-
6277  kernel/rtmutex-debug.c                             |    2 +-
6278  kernel/rtmutex-tester.c                            |    2 +-
6279  kernel/rtmutex.c                                   |    2 +-
6280  kernel/rwsem.c                                     |    2 +-
6281  kernel/sched.c                                     |    2 +-
6282  kernel/sched_clock.c                               |    2 +-
6283  kernel/semaphore.c                                 |    2 +-
6284  kernel/signal.c                                    |    2 +-
6285  kernel/smp.c                                       |    2 +-
6286  kernel/softirq.c                                   |    2 +-
6287  kernel/spinlock.c                                  |    2 +-
6288  kernel/srcu.c                                      |    2 +-
6289  kernel/stacktrace.c                                |    2 +-
6290  kernel/stop_machine.c                              |    2 +-
6291  kernel/sys.c                                       |    3 +-
6292  kernel/sysctl.c                                    |    2 +-
6293  kernel/time.c                                      |    2 +-
6294  kernel/time/posix-clock.c                          |    1 +
6295  kernel/timer.c                                     |    2 +-
6296  kernel/trace/blktrace.c                            |    1 +
6297  kernel/trace/ftrace.c                              |    1 +
6298  kernel/trace/trace_syscalls.c                      |    1 +
6299  kernel/up.c                                        |    2 +-
6300  kernel/user-return-notifier.c                      |    2 +-
6301  kernel/user.c                                      |    2 +-
6302  kernel/user_namespace.c                            |    2 +-
6303  kernel/utsname.c                                   |    2 +-
6304  kernel/utsname_sysctl.c                            |    2 +-
6305  kernel/wait.c                                      |    2 +-
6306  kernel/watchdog.c                                  |    3 +-
6307  kernel/workqueue.c                                 |    2 +-
6308  lib/dma-debug.c                                    |    1 +
6309  lib/raid6/algos.c                                  |    1 +
6310  lib/raid6/mktables.c                               |    1 +
6311  lib/raid6/recov.c                                  |    1 +
6312  mm/fremap.c                                        |    1 -
6313  mm/memcontrol.c                                    |    1 +
6314  mm/memory-failure.c                                |    1 +
6315  mm/mmzone.c                                        |    1 -
6316  mm/quicklist.c                                     |    1 -
6317  mm/sparse-vmemmap.c                                |    1 -
6318  mm/swap_state.c                                    |    1 -
6319  mm/swapfile.c                                      |    1 -
6320  net/caif/cfpkt_skbuff.c                            |    1 +
6321  net/netfilter/ipset/pfxlen.c                       |    1 +
6322  net/rfkill/input.c                                 |    1 +
6323  security/selinux/netlink.c                         |    1 +
6324  sound/core/control.c                               |    1 +
6325  sound/core/device.c                                |    1 +
6326  sound/core/hwdep.c                                 |    1 +
6327  sound/core/info.c                                  |    1 +
6328  sound/core/info_oss.c                              |    1 +
6329  sound/core/init.c                                  |    1 +
6330  sound/core/isadma.c                                |    1 +
6331  sound/core/jack.c                                  |    1 +
6332  sound/core/memory.c                                |    1 +
6333  sound/core/misc.c                                  |    1 +
6334  sound/core/oss/mixer_oss.c                         |    1 +
6335  sound/core/rawmidi.c                               |    1 +
6336  sound/core/seq/oss/seq_oss.c                       |    2 +-
6337  sound/core/seq/oss/seq_oss_init.c                  |    2 +-
6338  sound/core/seq/oss/seq_oss_synth.c                 |    1 +
6339  sound/core/seq/seq.c                               |    2 +-
6340  sound/core/seq/seq_clientmgr.c                     |    1 +
6341  sound/core/seq/seq_device.c                        |    1 +
6342  sound/core/seq/seq_dummy.c                         |    2 +-
6343  sound/core/seq/seq_info.c                          |    1 +
6344  sound/core/seq/seq_lock.c                          |    1 +
6345  sound/core/seq/seq_memory.c                        |    1 +
6346  sound/core/seq/seq_midi.c                          |    2 +-
6347  sound/core/seq/seq_midi_emul.c                     |    1 +
6348  sound/core/seq/seq_midi_event.c                    |    1 +
6349  sound/core/seq/seq_ports.c                         |    1 +
6350  sound/core/seq/seq_system.c                        |    1 +
6351  sound/core/seq/seq_virmidi.c                       |    1 +
6352  sound/core/sound.c                                 |    2 +-
6353  sound/core/sound_oss.c                             |    1 +
6354  sound/core/timer.c                                 |    2 +-
6355  sound/core/vmaster.c                               |    1 +
6356  sound/drivers/mpu401/mpu401.c                      |    2 +-
6357  sound/drivers/mpu401/mpu401_uart.c                 |    1 +
6358  sound/drivers/mtpav.c                              |    1 +
6359  sound/drivers/mts64.c                              |    1 +
6360  sound/drivers/opl3/opl3_lib.c                      |    1 +
6361  sound/drivers/opl3/opl3_oss.c                      |    1 +
6362  sound/drivers/opl3/opl3_seq.c                      |    1 +
6363  sound/drivers/opl3/opl3_synth.c                    |    1 +
6364  sound/drivers/opl4/opl4_lib.c                      |    1 +
6365  sound/drivers/opl4/opl4_proc.c                     |    1 +
6366  sound/drivers/opl4/opl4_seq.c                      |    1 +
6367  sound/drivers/portman2x4.c                         |    1 +
6368  sound/drivers/serial-u16550.c                      |    2 +-
6369  sound/drivers/virmidi.c                            |    2 +-
6370  sound/firewire/iso-resources.c                     |    1 +
6371  sound/firewire/packets-buffer.c                    |    1 +
6372  sound/i2c/i2c.c                                    |    1 +
6373  sound/i2c/other/ak4xxx-adda.c                      |    1 +
6374  sound/i2c/other/pt2258.c                           |    1 +
6375  sound/i2c/other/tea575x-tuner.c                    |    1 +
6376  sound/i2c/tea6330t.c                               |    1 +
6377  sound/isa/sb/emu8000.c                             |    1 +
6378  sound/isa/sb/emu8000_callback.c                    |    1 +
6379  sound/isa/sb/emu8000_patch.c                       |    1 +
6380  sound/isa/sb/emu8000_synth.c                       |    1 +
6381  sound/isa/wavefront/wavefront_fx.c                 |    1 +
6382  sound/isa/wavefront/wavefront_synth.c              |    1 +
6383  sound/pci/als4000.c                                |    2 +-
6384  sound/pci/asihpi/hpioctl.c                         |    1 +
6385  sound/pci/ctxfi/xfi.c                              |    1 +
6386  sound/pci/oxygen/oxygen_io.c                       |    1 +
6387  sound/soc/blackfin/bf5xx-sport.c                   |    1 +
6388  sound/soc/tegra/tegra_asoc_utils.c                 |    1 +
6389  sound/synth/emux/emux.c                            |    1 +
6390  sound/synth/emux/emux_oss.c                        |    1 +
6391  sound/synth/emux/emux_seq.c                        |    2 +-
6392  sound/synth/emux/emux_synth.c                      |    1 +
6393  sound/synth/emux/soundfont.c                       |    1 +
6394  sound/synth/util_mem.c                             |    1 +
6395  sound/usb/6fire/firmware.c                         |    1 +
6396  sound/usb/midi.c                                   |    1 +
6397  virt/kvm/iommu.c                                   |    2 +
6398  1386 files changed, 1518 insertions(+), 426 deletions(-)
6399  create mode 100644 include/linux/export.h
6400 $ git am -3 ../patches/0001-dm-use-export.h-instead-of-module.h-where-possible.patch
6401 Applying: dm: use export.h instead of module.h where possible
6402 $ git reset HEAD^
6403 Unstaged changes after reset:
6404 M       drivers/md/persistent-data/dm-btree-remove.c
6405 M       drivers/md/persistent-data/dm-btree.c
6406 M       drivers/md/persistent-data/dm-space-map-disk.c
6407 M       drivers/md/persistent-data/dm-transaction-manager.c
6408 $ git add .
6409 $ git commit -v -a --amend
6410 [master d20243c] Merge remote-tracking branch 'moduleh/module.h-split'
6411 $ git am -3 ../patches/0001-block-bsg-lib.c-needs-export.h-not-module.h.patch
6412 Applying: block: bsg-lib.c needs export.h not module.h
6413 $ git reset HEAD^
6414 Unstaged changes after reset:
6415 M       block/bsg-lib.c
6416 $ git add .
6417 $ git commit -v -a --amend
6418 [master 0986bf9] Merge remote-tracking branch 'moduleh/module.h-split'
6419 $ git am -3 ../patches/power__max8998_charger.c_needs_module.h.patch
6420 Applying: power: max8998_charger.c needs module.h
6421 $ git reset HEAD^
6422 Unstaged changes after reset:
6423 M       drivers/power/max8998_charger.c
6424 $ git add .
6425 $ git commit -v -a --amend
6426 [master daa087f] Merge remote-tracking branch 'moduleh/module.h-split'
6427 $ git am -3 ../patches/0001-power_supply-max8997_charger.c-need-to-include-modul.patch
6428 Applying: power_supply: max8997_charger.c need to include module.h
6429 $ git reset HEAD^
6430 Unstaged changes after reset:
6431 M       drivers/power/max8997_charger.c
6432 $ git add .
6433 $ git commit -v -a --amend
6434 [master 3d59edd] Merge remote-tracking branch 'moduleh/module.h-split'
6435 $ git clone -s -l -n -q . ../rebase-tmp
6436 $ cd ../rebase-tmp
6437 $ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm
6438 From ../next
6439  * [new branch]      quilt/akpm -> akpm
6440 $ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base
6441 From ../next
6442  * [new branch]      quilt/akpm-base -> akpm-base
6443 $ git checkout akpm
6444 Switched to branch 'akpm'
6445 $ git rebase --onto master akpm-base
6446 First, rewinding head to replay your work on top of it...
6447 Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
6448 Applying: This patch makes two changes:
6449 Applying: On thread exit shm_exit_ns() is called, it uses shm_ids(ns).rw_mutex.  It
6450 Applying: Because of x86-implement-strict-user-copy-checks-for-x86_64.patch
6451 Applying: When no floppy is found the module code can be released while a timer
6452 Applying: The parameter's origin type is long.  On an i386 architecture, it can
6453 Applying: Add support for Aspire 1410 BIOS v1.3314.  Fixes the following error:
6454 Applying: This makes the iris driver use the platform API, so it is properly exposed
6455 Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
6456 Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
6457 Applying: Cc: Ed Wildgoose <git@wildgooses.com>
6458 Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
6459 Applying: The x86 timer interrupt handler is the only handler not traced in the
6460 Applying: The current interrupt traces from irq_handler_entry and irq_handler_exit
6461 Applying: Don't allow everybody to use a modem.
6462 Applying: The address limit is already set in flush_old_exec() so this
6463 Applying: A call to va_copy() should always be followed by a call to va_end() in the
6464 Applying: Don't dereference em if it's NULL or an error pointer.
6465 Applying: Some messing with error codes to return 0 on out id's and match
6466 Applying: fb_set_suspend() must be called with the console semaphore held, which
6467 Applying: hwmon was using an idr with a NULL pointer, so convert to an
6468 Applying: A straightforward looking use of idr for a device id.
6469 Applying: The address limit is already set in flush_old_exec() so this
6470 Applying: The address limit is already set in flush_old_exec() so this
6471 Applying: Add new check (assert_init) to make sure objects are initialized and
6472 Applying: del_timer_sync() calls debug_object_assert_init() to assert that a timer
6473 Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
6474 Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
6475 Applying: The address limit is already set in flush_old_exec() so those calls to
6476 Applying: When do pci remove/rescan on system that have more iommus, got
6477 Applying: The current implementation of dmi_name_in_vendors() is an invitation to
6478 Applying: For headers that get exported to userland and make use of u32 style
6479 Applying: Fix sparse warnings of right shift bigger than source value size:
6480 Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
6481 Applying: Some mangling of errors was necessary to maintain current interface.
6482 Applying: This does involve additional use of the spin lock in idr.c.  Is this an
6483 Applying: Instead of open coding this function use kstrtoul_from_user() directly.
6484 Applying: brd_make_request() always returns 0, which doesn't make much sense.
6485 Applying: The address limit is already set in flush_old_exec() so this assignment of
6486 Applying: The basic idea behind cross memory attach is to allow MPI programs doing
6487 Applying: - Add x86_64 specific wire up
6488 Applying: acct_isolated of compaction uses page_lru_base_type which returns only
6489 Applying: Change ISOLATE_XXX macro with bitwise isolate_mode_t type.  Normally,
6490 Applying: In async mode, compaction doesn't migrate dirty or writeback pages.  So,
6491 Applying: In __zone_reclaim case, we don't want to shrink mapped page.  Nonetheless,
6492 Applying: unmap_and_move() is one a big messy function.  Clean it up.
6493 Applying: radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was
6494 Applying: per-task block plug can reduce block queue lock contention and increase
6495 Applying: The tracing ring-buffer used this function briefly, but not anymore.
6496 Applying: After selecting a task to kill, the oom killer iterates all processes and
6497 Applying: Remove PageSwapBacked (!page_is_file_cache) cases from
6498 Applying: Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
6499 Applying: The current implementation of the /dev/hpet driver couples opening the
6500 Applying: smp_call_function() only lets all other CPUs execute a specific function,
6501 Applying: auto_demotion_disable is called only for online CPUs.  For hotplugged
6502 Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:
6503 Applying: Strict user copy checks are only really supported on x86_32 even though
6504 Applying: The help text for this config is duplicated across the x86, parisc, and
6505 Applying: s/lib-/obj-/ for usercopy.o
6506 Applying: After an "unexpected" reboot, I found this Oops in my logs:
6507 Applying: In the move of the lis3 driver, the hp_accel.c file got dropped from the
6508 Applying: Add axis correction for HP EliteBook 2730p.
6509 Applying: Add axis correction for HP EliteBook 8540w.
6510 Applying: Add axis correction for HP ProBook 6555b.
6511 Applying: Adapt the help text for CONFIG_HP_ACCEL to the move of
6512 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
6513 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
6514 Applying: Change exported functions to use the device given as parameter
6515 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
6516 Applying: Add V2 of the LED driver for a single timer channel for the TPU hardware
6517 Applying: Add support for slice by 8 to existing crc32 algorithm.  Also modify
6518 Applying: don't include asm/msr.h
6519 Applying: This is the one use of an ida that doesn't retry on receiving -EAGAIN.
6520 Applying: One can get this information from minix/inode.c, but adding the
6521 Applying: Signed-off-by: Igor Mammedov <imammedo@redhat.com>
6522 Applying: Force this on for -next/mm testing purposes.
6523 Applying: Add a proc_dointvec_bool() sysctl handler for cases where the input value
6524 Applying: Use the new proc_do_intvec_bool() handler for various boolean inputs.
6525 Applying: Add a proc_dointvec_unsigned() sysctl handler for positive value cases.
6526 Applying: Cc: Alexey Dobriyan <adobriyan@gmail.com>
6527 Applying: Use the new proc_do_intvec_unsigned() handler for various unsigned inputs.
6528 Applying: A default echo function has been provided so it is no longer an error when
6529 Applying: This client driver allows you to use a GPIO pin as a source for PPS
6530 Applying: remove unneeded cast of void*
6531 Applying: Straightforward.  As an aside, the ida_init calls are not needed as far as
6532 $ cd ../next
6533 $ git fetch -f ../rebase-tmp akpm:akpm
6534 From ../rebase-tmp
6535  + 1d17b24...1589540 akpm       -> akpm  (forced update)
6536 $ rm -rf ../rebase-tmp
6537 Merging akpm
6538 $ git merge --no-ff akpm
6539 Removing arch/sparc/lib/usercopy.c
6540 Removing drivers/leds/leds-alix2.c
6541 Merge made by recursive.
6542  Documentation/DocBook/debugobjects.tmpl            |   50 ++
6543  .../trace/postprocess/trace-vmscan-postprocess.pl  |    8 +-
6544  MAINTAINERS                                        |    1 +
6545  arch/arm/include/asm/processor.h                   |    1 -
6546  arch/arm/mach-ux500/mbox-db5500.c                  |    2 +-
6547  arch/ia64/include/asm/processor.h                  |    1 -
6548  arch/parisc/Kconfig                                |    1 +
6549  arch/parisc/Kconfig.debug                          |   14 -
6550  arch/parisc/include/asm/processor.h                |    2 -
6551  arch/parisc/kernel/process.c                       |    1 -
6552  arch/powerpc/include/asm/systbl.h                  |    2 +
6553  arch/powerpc/include/asm/unistd.h                  |    4 +-
6554  arch/s390/Kconfig                                  |    1 +
6555  arch/s390/Kconfig.debug                            |   14 -
6556  arch/s390/lib/Makefile                             |    1 -
6557  arch/sparc/kernel/process_32.c                     |    3 +-
6558  arch/sparc/kernel/process_64.c                     |    3 -
6559  arch/sparc/lib/Makefile                            |    1 -
6560  arch/sparc/lib/usercopy.c                          |    8 -
6561  arch/tile/Kconfig                                  |    8 +-
6562  arch/tile/include/asm/uaccess.h                    |    7 +-
6563  arch/tile/lib/uaccess.c                            |    8 -
6564  arch/unicore32/include/asm/processor.h             |    1 -
6565  arch/x86/Kconfig                                   |   15 +
6566  arch/x86/Kconfig.debug                             |   14 -
6567  arch/x86/ia32/ia32entry.S                          |    2 +
6568  arch/x86/include/asm/irq_vectors.h                 |   50 ++
6569  arch/x86/include/asm/uaccess_64.h                  |   12 +-
6570  arch/x86/include/asm/unistd_32.h                   |    4 +-
6571  arch/x86/include/asm/unistd_64.h                   |    4 +
6572  arch/x86/kernel/apic/apic.c                        |    7 +
6573  arch/x86/kernel/cpu/mcheck/therm_throt.c           |    3 +
6574  arch/x86/kernel/cpu/mcheck/threshold.c             |    3 +
6575  arch/x86/kernel/e820.c                             |   59 +--
6576  arch/x86/kernel/irq.c                              |    6 +-
6577  arch/x86/kernel/irq_work.c                         |    3 +
6578  arch/x86/kernel/smp.c                              |    7 +
6579  arch/x86/kernel/syscall_table_32.S                 |    2 +
6580  arch/x86/kernel/time.c                             |   15 +-
6581  arch/x86/kernel/traps.c                            |    3 +
6582  arch/x86/lib/usercopy_32.c                         |    6 -
6583  arch/x86/mm/mmap.c                                 |    4 +-
6584  arch/x86/mm/tlb.c                                  |    3 +
6585  arch/x86/platform/Makefile                         |    1 +
6586  arch/x86/platform/geode/Makefile                   |    1 +
6587  arch/x86/platform/geode/alix.c                     |  142 ++++++
6588  arch/x86/platform/iris/iris.c                      |   67 +++-
6589  drivers/block/brd.c                                |    2 +-
6590  drivers/block/floppy.c                             |    8 +-
6591  drivers/char/hpet.c                                |   56 ++-
6592  drivers/firmware/dmi_scan.c                        |    6 +-
6593  drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c      |   34 +-
6594  drivers/hwmon/hwmon.c                              |   32 +-
6595  drivers/hwmon/ibmaem.c                             |   47 +--
6596  drivers/idle/intel_idle.c                          |   59 ++-
6597  drivers/iommu/dmar.c                               |    7 +-
6598  drivers/iommu/intel-iommu.c                        |  177 +++++++-
6599  drivers/leds/Kconfig                               |   20 +-
6600  drivers/leds/Makefile                              |    2 +-
6601  drivers/leds/leds-alix2.c                          |  239 ----------
6602  drivers/leds/leds-renesas-tpu.c                    |  343 ++++++++++++++
6603  drivers/misc/lis3lv02d/lis3lv02d.c                 |  389 +++++++++-------
6604  drivers/misc/lis3lv02d/lis3lv02d.h                 |    9 +-
6605  drivers/misc/lis3lv02d/lis3lv02d_i2c.c             |   11 +-
6606  drivers/misc/lis3lv02d/lis3lv02d_spi.c             |    2 +-
6607  drivers/platform/x86/Kconfig                       |    2 +-
6608  drivers/platform/x86/acerhdf.c                     |    1 +
6609  drivers/platform/x86/hp_accel.c                    |   10 +-
6610  drivers/pps/clients/Kconfig                        |    9 +
6611  drivers/pps/clients/Makefile                       |    1 +
6612  drivers/pps/clients/pps-gpio.c                     |  227 +++++++++
6613  drivers/pps/clients/pps-ktimer.c                   |   12 -
6614  drivers/pps/clients/pps_parport.c                  |    9 -
6615  drivers/pps/kapi.c                                 |   20 +-
6616  drivers/rtc/class.c                                |   32 +-
6617  drivers/scsi/aacraid/commctrl.c                    |    1 +
6618  drivers/scsi/megaraid.c                            |    8 +-
6619  drivers/scsi/osd/osd_uld.c                         |   22 +-
6620  drivers/scsi/sd.c                                  |   32 +-
6621  drivers/scsi/sg.c                                  |   25 +-
6622  drivers/video/fbmem.c                              |   24 +-
6623  drivers/w1/slaves/w1_ds2760.c                      |   48 +--
6624  drivers/w1/slaves/w1_ds2780.c                      |   48 +--
6625  fs/aio.c                                           |    4 +-
6626  fs/btrfs/inode.c                                   |    3 +-
6627  fs/compat.c                                        |    7 +-
6628  fs/ext4/ext4.h                                     |    7 +-
6629  fs/ext4/ialloc.c                                   |    4 +-
6630  fs/ocfs2/ocfs2.h                                   |   47 ++
6631  fs/ocfs2/quota_local.c                             |   10 +-
6632  fs/read_write.c                                    |    8 +-
6633  include/linux/compat.h                             |    3 +-
6634  include/linux/debugobjects.h                       |    6 +
6635  include/linux/dmar.h                               |    5 +
6636  include/linux/fs.h                                 |    7 +-
6637  include/linux/hpet.h                               |    1 +
6638  include/linux/jiffies.h                            |    2 +-
6639  include/linux/leds-renesas-tpu.h                   |   14 +
6640  include/linux/magic.h                              |   10 +-
6641  include/linux/memcontrol.h                         |    3 +-
6642  include/linux/mmzone.h                             |   12 +
6643  include/linux/pps-gpio.h                           |   32 ++
6644  include/linux/swap.h                               |    7 +-
6645  include/linux/syscalls.h                           |   13 +
6646  include/linux/sysctl.h                             |    4 +
6647  include/linux/writeback.h                          |    2 -
6648  include/scsi/scsi_netlink.h                        |    2 +-
6649  include/trace/events/irq_vectors.h                 |   56 +++
6650  include/trace/events/vmscan.h                      |    8 +-
6651  init/do_mounts.c                                   |   46 ++-
6652  ipc/msgutil.c                                      |    6 +
6653  ipc/shm.c                                          |   13 +-
6654  ipc/util.c                                         |   30 +-
6655  ipc/util.h                                         |    1 +
6656  kernel/audit.c                                     |    5 +-
6657  kernel/kprobes.c                                   |    2 +-
6658  kernel/sys_ni.c                                    |    4 +
6659  kernel/sysctl.c                                    |  103 +++--
6660  kernel/time.c                                      |    2 +-
6661  kernel/timer.c                                     |   54 ++-
6662  lib/Kconfig.debug                                  |   18 +
6663  lib/Makefile                                       |    1 +
6664  lib/crc32.c                                        |  370 +++++++++++-----
6665  lib/crc32defs.h                                    |   16 +-
6666  lib/debugobjects.c                                 |   33 ++
6667  lib/gen_crc32table.c                               |   59 ++-
6668  lib/radix-tree.c                                   |   10 +-
6669  {arch/s390/lib => lib}/usercopy.c                  |    0
6670  mm/Makefile                                        |    3 +-
6671  mm/compaction.c                                    |   24 +-
6672  mm/memcontrol.c                                    |    5 +-
6673  mm/mempolicy.c                                     |    4 +-
6674  mm/migrate.c                                       |   75 ++--
6675  mm/mincore.c                                       |    6 +
6676  mm/oom_kill.c                                      |    5 +-
6677  mm/page-writeback.c                                |  122 +++---
6678  mm/process_vm_access.c                             |  487 ++++++++++++++++++++
6679  mm/vmscan.c                                        |   63 ++-
6680  security/keys/compat.c                             |    2 +-
6681  security/keys/keyctl.c                             |    2 +-
6682  security/selinux/selinuxfs.c                       |   14 +-
6683  141 files changed, 3100 insertions(+), 1311 deletions(-)
6684  delete mode 100644 arch/sparc/lib/usercopy.c
6685  create mode 100644 arch/x86/platform/geode/Makefile
6686  create mode 100644 arch/x86/platform/geode/alix.c
6687  delete mode 100644 drivers/leds/leds-alix2.c
6688  create mode 100644 drivers/leds/leds-renesas-tpu.c
6689  create mode 100644 drivers/pps/clients/pps-gpio.c
6690  create mode 100644 include/linux/leds-renesas-tpu.h
6691  create mode 100644 include/linux/pps-gpio.h
6692  create mode 100644 include/trace/events/irq_vectors.h
6693  rename {arch/s390/lib => lib}/usercopy.c (100%)
6694  create mode 100644 mm/process_vm_access.c
6695 $ git am -3 ../patches/0001-do_mounts-remove-__init_data-from-root_wait.patch
6696 Applying: do_mounts: remove __init_data from root_wait
6697 $ git reset HEAD^
6698 Unstaged changes after reset:
6699 M       init/do_mounts.c
6700 $ git add .
6701 $ git commit -v -a --amend
6702 [master 5d5aa79] Merge branch 'akpm'
6703 $ git revert f0b182b003e2
6704 [master d56e62a] Revert "ASoC: Implement WM8994 thermal warning and shutdown interrupt support"
6705  1 files changed, 0 insertions(+), 26 deletions(-)