Next/merge.log

   1 $ date
   2 Tue Aug 23 11:10:28 EST 2011
   3 $ git checkout master
   4 Already on 'master'
   5 $ git reset --hard stable
   6 HEAD is now at 6719db6 Btrfs: fix 64 bit divide problem
   7 Merging origin/master
   8 $ git merge origin/master
   9 Updating 6719db6..fcb8ce5
  10 Fast-forward
  11  MAINTAINERS                              |    2 +-
  12  Makefile                                 |    4 ++--
  13  arch/x86/include/asm/xen/page.h          |    4 ++--
  14  arch/x86/xen/Makefile                    |    2 +-
  15  arch/x86/xen/enlighten.c                 |    4 ++--
  16  arch/x86/xen/mmu.c                       |   12 ++++++++----
  17  arch/x86/xen/smp.c                       |    4 ++--
  18  drivers/firewire/core-device.c           |   15 ++++++++++-----
  19  tools/perf/builtin-record.c              |    4 +++-
  20  tools/perf/builtin-stat.c                |    7 +++++--
  21  tools/perf/util/evlist.c                 |   11 ++++++++++-
  22  tools/perf/util/include/linux/compiler.h |    2 ++
  23  tools/perf/util/parse-events.c           |    8 +++++---
  24  13 files changed, 53 insertions(+), 26 deletions(-)
  25 Merging fixes/fixes
  26 $ git merge fixes/fixes
  27 Already up-to-date.
  28 Merging kbuild-current/rc-fixes
  29 $ git merge kbuild-current/rc-fixes
  30 Already up-to-date.
  31 Merging arm-current/master
  32 $ git merge arm-current/master
  33 Already up-to-date.
  34 Merging m68k-current/for-linus
  35 $ git merge m68k-current/for-linus
  36 Already up-to-date.
  37 Merging powerpc-merge/merge
  38 $ git merge powerpc-merge/merge
  39 Already up-to-date.
  40 Merging 52xx-and-virtex-current/powerpc/merge
  41 $ git merge 52xx-and-virtex-current/powerpc/merge
  42 Already up-to-date.
  43 Merging sparc-current/master
  44 $ git merge sparc-current/master
  45 Merge made by recursive.
  46  arch/sparc/include/asm/sigcontext.h |   14 +++
  47  arch/sparc/kernel/Makefile          |    1 +
  48  arch/sparc/kernel/signal32.c        |  184 ++++++++++++++++++++---------------
  49  arch/sparc/kernel/signal_32.c       |  172 +++++++++++++++------------------
  50  arch/sparc/kernel/signal_64.c       |  108 +++++++++------------
  51  arch/sparc/kernel/sigutil.h         |    9 ++
  52  arch/sparc/kernel/sigutil_32.c      |  120 +++++++++++++++++++++++
  53  arch/sparc/kernel/sigutil_64.c      |   93 ++++++++++++++++++
  54  8 files changed, 468 insertions(+), 233 deletions(-)
  55  create mode 100644 arch/sparc/kernel/sigutil.h
  56  create mode 100644 arch/sparc/kernel/sigutil_32.c
  57  create mode 100644 arch/sparc/kernel/sigutil_64.c
  58 Merging scsi-rc-fixes/master
  59 $ git merge scsi-rc-fixes/master
  60 Already up-to-date.
  61 Merging net-current/master
  62 $ git merge net-current/master
  63 Merge made by recursive.
  64  Documentation/networking/00-INDEX       |  116 +++++++++++++++++++++++++++++++
  65  Documentation/networking/ip-sysctl.txt  |    2 +-
  66  Documentation/networking/scaling.txt    |   23 ++++--
  67  drivers/net/bonding/bond_main.c         |   18 +++++
  68  drivers/net/can/sja1000/plx_pci.c       |    4 +-
  69  drivers/net/e1000e/e1000.h              |    4 +
  70  drivers/net/e1000e/ich8lan.c            |   65 ++++++++++++++----
  71  drivers/net/e1000e/netdev.c             |   80 ++++++++++++++++++++-
  72  drivers/net/forcedeth.c                 |    3 +-
  73  drivers/net/gianfar.c                   |    9 ++-
  74  drivers/net/gianfar_ethtool.c           |   26 ++++++--
  75  drivers/net/ixgbe/ixgbe_main.c          |    4 +-
  76  drivers/net/sh_eth.c                    |    1 +
  77  drivers/net/usb/cdc_ncm.c               |   47 ++++++++++---
  78  drivers/net/via-velocity.c              |    4 -
  79  drivers/net/vmxnet3/vmxnet3_drv.c       |   34 +++++----
  80  drivers/net/wireless/iwlwifi/iwl-pci.c  |   25 +++----
  81  drivers/net/wireless/rt2x00/rt2800usb.c |   20 ++++--
  82  drivers/net/wireless/rt2x00/rt2x00usb.c |   17 ++---
  83  drivers/net/wireless/wl12xx/acx.c       |    6 +--
  84  drivers/net/wireless/wl12xx/testmode.c  |    5 +-
  85  net/8021q/vlan_core.c                   |    2 +
  86  net/atm/br2684.c                        |    7 +-
  87  net/ipv6/ipv6_sockglue.c                |    9 ++-
  88  net/ipv6/sit.c                          |    3 +
  89  net/sched/act_mirred.c                  |    3 +-
  90  26 files changed, 428 insertions(+), 109 deletions(-)
  91 Merging sound-current/for-linus
  92 $ git merge sound-current/for-linus
  93 Already up-to-date.
  94 Merging pci-current/for-linus
  95 $ git merge pci-current/for-linus
  96 Already up-to-date.
  97 Merging wireless-current/master
  98 $ git merge wireless-current/master
  99 Merge made by recursive.
 100  drivers/bcma/main.c                            |   12 +++++++++
 101  drivers/bluetooth/ath3k.c                      |    1 +
 102  drivers/bluetooth/btusb.c                      |   13 ++++++++--
 103  drivers/net/wireless/ath/ath9k/ar9003_eeprom.c |    2 +-
 104  drivers/net/wireless/rt2x00/rt2x00usb.c        |   14 +----------
 105  include/net/cfg80211.h                         |    3 ++
 106  net/bluetooth/af_bluetooth.c                   |    6 ++--
 107  net/bluetooth/bnep/bnep.h                      |    1 +
 108  net/bluetooth/bnep/core.c                      |   13 ++++++----
 109  net/bluetooth/cmtp/capi.c                      |    3 +-
 110  net/bluetooth/cmtp/cmtp.h                      |    1 +
 111  net/bluetooth/cmtp/core.c                      |   20 +++++++++------
 112  net/bluetooth/hci_core.c                       |    8 ++++--
 113  net/bluetooth/hidp/core.c                      |   19 +++++++--------
 114  net/bluetooth/l2cap_core.c                     |    6 ++--
 115  net/bluetooth/l2cap_sock.c                     |   30 ++++++++++++------------
 116  net/bluetooth/rfcomm/core.c                    |   17 +++++--------
 117  net/bluetooth/rfcomm/sock.c                    |   28 +++++++++++-----------
 118  net/bluetooth/sco.c                            |   28 +++++++++++-----------
 119  net/mac80211/main.c                            |    2 +-
 120  net/wireless/core.c                            |    7 +++++
 121  net/wireless/sysfs.c                           |    6 +++-
 122  22 files changed, 134 insertions(+), 106 deletions(-)
 123 Merging driver-core.current/driver-core-linus
 124 $ git merge driver-core.current/driver-core-linus
 125 Merge made by recursive.
 126  drivers/base/devres.c          |    1 +
 127  drivers/base/devtmpfs.c        |    2 +-
 128  drivers/base/platform.c        |    2 +-
 129  drivers/firmware/google/gsmi.c |    2 +-
 130  drivers/misc/Kconfig           |    1 +
 131  drivers/misc/ti-st/st_core.c   |   10 +++++++++-
 132  drivers/misc/ti-st/st_kim.c    |   33 +++++++++++++++++++++++++++++++++
 133  drivers/misc/ti-st/st_ll.c     |   19 +++++++++++++++++++
 134  include/linux/ti_wilink_st.h   |   27 ++++++++++++++++++++++++++-
 135  9 files changed, 92 insertions(+), 5 deletions(-)
 136 Merging tty.current/tty-linus
 137 $ git merge tty.current/tty-linus
 138 Merge made by recursive.
 139  drivers/tty/serial/8250_pnp.c     |    3 +++
 140  drivers/tty/serial/atmel_serial.c |    8 +++++---
 141  drivers/tty/serial/pch_uart.c     |    3 ++-
 142  drivers/tty/serial/samsung.c      |    8 ++++++--
 143  drivers/tty/serial/ucc_uart.c     |    2 +-
 144  5 files changed, 17 insertions(+), 7 deletions(-)
 145 Merging usb.current/usb-linus
 146 $ git merge usb.current/usb-linus
 147 Merge made by recursive.
 148  drivers/usb/core/hcd.c           |    2 +
 149  drivers/usb/gadget/f_phonet.c    |    1 +
 150  drivers/usb/host/ehci-hub.c      |    7 +--
 151  drivers/usb/host/ehci-s5p.c      |    1 +
 152  drivers/usb/host/xhci-hub.c      |   17 +++++--
 153  drivers/usb/host/xhci-ring.c     |   90 +++++++++++++++++++++++----------
 154  drivers/usb/host/xhci.c          |   28 +++++++++--
 155  drivers/usb/musb/blackfin.c      |    1 +
 156  drivers/usb/musb/cppi_dma.c      |   26 ++++++---
 157  drivers/usb/musb/musb_core.h     |   12 +++--
 158  drivers/usb/musb/musb_gadget.c   |    4 +-
 159  drivers/usb/musb/musb_regs.h     |    6 ++-
 160  drivers/usb/musb/tusb6010.c      |    1 +
 161  drivers/usb/musb/tusb6010_omap.c |    1 +
 162  drivers/usb/musb/ux500_dma.c     |   38 ++++++++------
 163  drivers/usb/serial/option.c      |  104 ++++++++++++++++++++++++++++++++++++-
 164  16 files changed, 264 insertions(+), 75 deletions(-)
 165 Merging staging.current/staging-linus
 166 $ git merge staging.current/staging-linus
 167 Already up-to-date.
 168 Merging cpufreq-current/fixes
 169 $ git merge cpufreq-current/fixes
 170 Already up-to-date.
 171 Merging input-current/for-linus
 172 $ git merge input-current/for-linus
 173 Auto-merging drivers/input/joystick/analog.c
 174 Merge made by recursive.
 175  drivers/input/joystick/analog.c          |    2 +-
 176  drivers/input/keyboard/ep93xx_keypad.c   |    1 +
 177  drivers/input/keyboard/tegra-kbc.c       |    2 +-
 178  drivers/input/misc/ad714x-i2c.c          |   81 ++++++++++-----------
 179  drivers/input/misc/ad714x-spi.c          |   68 ++++++++++++++----
 180  drivers/input/misc/ad714x.c              |  116 +++++++++++------------------
 181  drivers/input/misc/ad714x.h              |   35 ++++++++-
 182  drivers/input/misc/mma8450.c             |    2 +-
 183  drivers/input/misc/mpu3050.c             |    2 +-
 184  drivers/input/mouse/bcm5974.c            |   40 ++++++++++
 185  drivers/input/tablet/wacom_sys.c         |   17 +++--
 186  drivers/input/tablet/wacom_wac.c         |    4 +
 187  drivers/input/touchscreen/atmel_mxt_ts.c |   12 +++
 188  drivers/input/touchscreen/max11801_ts.c  |    3 +-
 189  drivers/input/touchscreen/tnetv107x-ts.c |    1 +
 190  15 files changed, 241 insertions(+), 145 deletions(-)
 191 Merging md-current/for-linus
 192 $ git merge md-current/for-linus
 193 Already up-to-date.
 194 Merging audit-current/for-linus
 195 $ git merge audit-current/for-linus
 196 Already up-to-date.
 197 Merging crypto-current/master
 198 $ git merge crypto-current/master
 199 Already up-to-date.
 200 Merging ide-curent/master
 201 $ git merge ide-curent/master
 202 Already up-to-date.
 203 Merging dwmw2/master
 204 $ git merge dwmw2/master
 205 Already up-to-date.
 206 Merging sh-current/sh-fixes-for-linus
 207 $ git merge sh-current/sh-fixes-for-linus
 208 Merge made by recursive.
 209  arch/sh/include/asm/ptrace.h |    2 +-
 210  arch/sh/kernel/idle.c        |    2 +-
 211  drivers/clocksource/sh_cmt.c |   34 +++++++++++++++++++-
 212  drivers/sh/intc/chip.c       |    3 ++
 213  drivers/tty/serial/sh-sci.c  |   69 +++++++++++++++++++++++++++++++++++------
 214  5 files changed, 96 insertions(+), 14 deletions(-)
 215 Merging rmobile-current/rmobile-fixes-for-linus
 216 $ git merge rmobile-current/rmobile-fixes-for-linus
 217 Merge made by recursive.
 218  arch/arm/boot/compressed/mmcif-sh7372.c |    2 +-
 219  arch/arm/boot/compressed/sdhi-sh7372.c  |    2 +-
 220  arch/arm/mach-shmobile/board-ag5evm.c   |    3 ++-
 221  arch/arm/mach-shmobile/board-mackerel.c |    4 ++++
 222  arch/arm/mach-shmobile/clock-sh7372.c   |    8 ++++----
 223  arch/arm/mach-shmobile/setup-sh7372.c   |   30 +++++++++++++++---------------
 224  6 files changed, 27 insertions(+), 22 deletions(-)
 225 Merging fbdev-current/fbdev-fixes-for-linus
 226 $ git merge fbdev-current/fbdev-fixes-for-linus
 227 Auto-merging drivers/video/msm/mdp.c
 228 Auto-merging drivers/video/udlfb.c
 229 Merge made by recursive.
 230  drivers/video/carminefb.c |    6 +++---
 231  drivers/video/msm/mdp.c   |    4 +++-
 232  drivers/video/s3c2410fb.c |    1 -
 233  drivers/video/udlfb.c     |   21 +++++++++++++++------
 234  4 files changed, 21 insertions(+), 11 deletions(-)
 235 Merging devicetree-current/devicetree/merge
 236 $ git merge devicetree-current/devicetree/merge
 237 Already up-to-date.
 238 Merging spi-current/spi/merge
 239 $ git merge spi-current/spi/merge
 240 Already up-to-date.
 241 Merging arm/for-next
 242 $ git merge arm/for-next
 243 Removing arch/arm/include/asm/auxvec.h
 244 Removing arch/arm/include/asm/bitsperlong.h
 245 Removing arch/arm/include/asm/cputime.h
 246 Removing arch/arm/include/asm/emergency-restart.h
 247 Removing arch/arm/include/asm/errno.h
 248 Removing arch/arm/include/asm/ioctl.h
 249 Removing arch/arm/include/asm/irq_regs.h
 250 Removing arch/arm/include/asm/kdebug.h
 251 Removing arch/arm/include/asm/local.h
 252 Removing arch/arm/include/asm/local64.h
 253 Removing arch/arm/include/asm/percpu.h
 254 Removing arch/arm/include/asm/poll.h
 255 Removing arch/arm/include/asm/resource.h
 256 Removing arch/arm/include/asm/sections.h
 257 Removing arch/arm/include/asm/siginfo.h
 258 Removing arch/arm/include/asm/sizes.h
 259 Auto-merging arch/arm/mach-ixp2000/include/mach/gpio-ixp2000.h
 260 Auto-merging drivers/gpio/gpio-davinci.c
 261 Auto-merging drivers/gpio/gpio-ks8695.c
 262 Auto-merging drivers/gpio/gpio-lpc32xx.c
 263 Auto-merging drivers/gpio/gpio-sa1100.c
 264 Auto-merging drivers/tty/serial/atmel_serial.c
 265 Merge made by recursive.
 266  Documentation/devicetree/bindings/arm/l2cc.txt     |   42 +++
 267  arch/arm/Kconfig                                   |   55 +++-
 268  arch/arm/Makefile                                  |    3 +
 269  arch/arm/boot/Makefile                             |    9 +
 270  arch/arm/boot/compressed/Makefile                  |    8 +
 271  arch/arm/common/scoop.c                            |    2 +-
 272  arch/arm/include/asm/Kbuild                        |   17 +
 273  arch/arm/include/asm/auxvec.h                      |    4 -
 274  arch/arm/include/asm/bitsperlong.h                 |    1 -
 275  arch/arm/include/asm/cputime.h                     |    6 -
 276  arch/arm/include/asm/cputype.h                     |    6 +
 277  arch/arm/include/asm/ecard.h                       |    1 -
 278  arch/arm/include/asm/emergency-restart.h           |    6 -
 279  arch/arm/include/asm/errno.h                       |    6 -
 280  arch/arm/include/asm/gpio.h                        |   19 +
 281  arch/arm/include/asm/hardware/cache-l2x0.h         |   19 +-
 282  arch/arm/include/asm/hardware/iop3xx-gpio.h        |    2 +
 283  arch/arm/include/asm/io.h                          |   21 ++
 284  arch/arm/include/asm/ioctl.h                       |    1 -
 285  arch/arm/include/asm/irq_regs.h                    |    1 -
 286  arch/arm/include/asm/kdebug.h                      |    1 -
 287  arch/arm/include/asm/local.h                       |    1 -
 288  arch/arm/include/asm/local64.h                     |    1 -
 289  arch/arm/include/asm/memory.h                      |    7 -
 290  arch/arm/include/asm/module.h                      |    4 -
 291  arch/arm/include/asm/percpu.h                      |    6 -
 292  arch/arm/include/asm/pgalloc.h                     |    2 +-
 293  arch/arm/include/asm/pgtable.h                     |   23 +-
 294  arch/arm/include/asm/pmu.h                         |   10 +-
 295  arch/arm/include/asm/poll.h                        |    1 -
 296  arch/arm/include/asm/resource.h                    |    6 -
 297  arch/arm/include/asm/sections.h                    |    1 -
 298  arch/arm/include/asm/siginfo.h                     |    6 -
 299  arch/arm/include/asm/sizes.h                       |   21 --
 300  arch/arm/include/asm/system.h                      |    3 +-
 301  arch/arm/include/asm/tlb.h                         |    1 +
 302  arch/arm/include/asm/topology.h                    |   33 ++
 303  arch/arm/kernel/Makefile                           |    1 +
 304  arch/arm/kernel/ecard.c                            |   36 +--
 305  arch/arm/kernel/entry-armv.S                       |   44 ++-
 306  arch/arm/kernel/head.S                             |   61 +---
 307  arch/arm/kernel/pmu.c                              |   26 +-
 308  arch/arm/kernel/setup.c                            |   35 ++-
 309  arch/arm/kernel/smp.c                              |    5 +
 310  arch/arm/kernel/smp_twd.c                          |    4 +-
 311  arch/arm/kernel/topology.c                         |  148 ++++++++
 312  arch/arm/mach-at91/Makefile.boot                   |    6 +-
 313  arch/arm/mach-at91/at91cap9_devices.c              |    2 +-
 314  arch/arm/mach-at91/at91rm9200_devices.c            |    2 +-
 315  arch/arm/mach-at91/at91sam9260_devices.c           |    2 +-
 316  arch/arm/mach-at91/at91sam9261_devices.c           |    2 +-
 317  arch/arm/mach-at91/at91sam9263_devices.c           |    2 +-
 318  arch/arm/mach-at91/at91sam9g45_devices.c           |    2 +-
 319  arch/arm/mach-at91/at91sam9rl_devices.c            |    2 +-
 320  arch/arm/mach-at91/board-1arm.c                    |    2 +-
 321  arch/arm/mach-at91/board-afeb-9260v1.c             |    2 +-
 322  arch/arm/mach-at91/board-cam60.c                   |    2 +-
 323  arch/arm/mach-at91/board-cap9adk.c                 |    2 +-
 324  arch/arm/mach-at91/board-carmeva.c                 |    2 +-
 325  arch/arm/mach-at91/board-cpu9krea.c                |    2 +-
 326  arch/arm/mach-at91/board-cpuat91.c                 |    2 +-
 327  arch/arm/mach-at91/board-csb337.c                  |    2 +-
 328  arch/arm/mach-at91/board-csb637.c                  |    2 +-
 329  arch/arm/mach-at91/board-eb9200.c                  |    2 +-
 330  arch/arm/mach-at91/board-ecbat91.c                 |    2 +-
 331  arch/arm/mach-at91/board-kafa.c                    |    2 +-
 332  arch/arm/mach-at91/board-kb9202.c                  |    2 +-
 333  arch/arm/mach-at91/board-neocore926.c              |    2 +-
 334  arch/arm/mach-at91/board-picotux200.c              |    2 +-
 335  arch/arm/mach-at91/board-qil-a9260.c               |    2 +-
 336  arch/arm/mach-at91/board-rm9200dk.c                |    2 +-
 337  arch/arm/mach-at91/board-rm9200ek.c                |    2 +-
 338  arch/arm/mach-at91/board-sam9-l9260.c              |    2 +-
 339  arch/arm/mach-at91/board-sam9260ek.c               |    2 +-
 340  arch/arm/mach-at91/board-sam9261ek.c               |    2 +-
 341  arch/arm/mach-at91/board-sam9263ek.c               |    2 +-
 342  arch/arm/mach-at91/board-sam9g20ek.c               |    2 +-
 343  arch/arm/mach-at91/board-sam9m10g45ek.c            |    2 +-
 344  arch/arm/mach-at91/board-sam9rlek.c                |    2 +-
 345  arch/arm/mach-at91/board-usb-a9260.c               |    2 +-
 346  arch/arm/mach-at91/board-usb-a9263.c               |    2 +-
 347  arch/arm/mach-at91/board-yl-9200.c                 |    2 +-
 348  arch/arm/mach-at91/gpio.c                          |    4 +-
 349  arch/arm/mach-at91/include/mach/gpio.h             |    5 -
 350  arch/arm/mach-at91/leds.c                          |    2 +-
 351  arch/arm/mach-at91/pm.c                            |    2 +-
 352  arch/arm/mach-bcmring/Makefile.boot                |    2 +-
 353  arch/arm/mach-clps711x/Makefile.boot               |    2 +-
 354  arch/arm/mach-cns3xxx/Makefile.boot                |    2 +-
 355  arch/arm/mach-davinci/Makefile                     |    3 +-
 356  arch/arm/mach-davinci/Makefile.boot                |    4 +-
 357  arch/arm/mach-davinci/da830.c                      |    3 +-
 358  arch/arm/mach-davinci/da850.c                      |    3 +-
 359  arch/arm/mach-davinci/dm355.c                      |    2 +-
 360  arch/arm/mach-davinci/dm365.c                      |    3 +-
 361  arch/arm/mach-davinci/dm644x.c                     |    2 +-
 362  arch/arm/mach-davinci/dm646x.c                     |    2 +-
 363  arch/arm/mach-davinci/include/mach/gpio-davinci.h  |   91 +++++
 364  arch/arm/mach-davinci/include/mach/gpio.h          |   79 +----
 365  arch/arm/mach-davinci/tnetv107x.c                  |    3 +-
 366  arch/arm/mach-dove/Makefile.boot                   |    2 +-
 367  arch/arm/mach-ebsa110/Makefile.boot                |    2 +-
 368  arch/arm/mach-ebsa110/include/mach/io.h            |    2 -
 369  arch/arm/mach-ep93xx/Makefile.boot                 |   10 +-
 370  arch/arm/mach-ep93xx/include/mach/gpio.h           |   17 +-
 371  arch/arm/mach-ep93xx/include/mach/ts72xx.h         |   26 ++-
 372  arch/arm/mach-exynos4/Makefile.boot                |    2 +-
 373  arch/arm/mach-exynos4/include/mach/gpio.h          |    7 -
 374  arch/arm/mach-footbridge/Kconfig                   |    1 +
 375  arch/arm/mach-footbridge/Makefile.boot             |    2 +-
 376  arch/arm/mach-footbridge/include/mach/io.h         |    2 -
 377  arch/arm/mach-gemini/Makefile.boot                 |    4 +-
 378  arch/arm/mach-gemini/include/mach/gpio.h           |    5 -
 379  arch/arm/mach-h720x/Makefile.boot                  |    2 +-
 380  arch/arm/mach-imx/Makefile.boot                    |   10 +-
 381  arch/arm/mach-imx/iomux-imx31.c                    |    3 +-
 382  arch/arm/mach-imx/mach-mx27ads.c                   |    3 +-
 383  arch/arm/mach-integrator/Makefile.boot             |    2 +-
 384  arch/arm/mach-integrator/include/mach/io.h         |    2 -
 385  arch/arm/mach-iop13xx/Makefile.boot                |    2 +-
 386  arch/arm/mach-iop32x/Makefile.boot                 |    2 +-
 387  arch/arm/mach-iop33x/Makefile.boot                 |    2 +-
 388  arch/arm/mach-ixp2000/Makefile.boot                |    2 +-
 389  arch/arm/mach-ixp2000/core.c                       |    4 +-
 390  .../include/mach/{gpio.h => gpio-ixp2000.h}        |    4 +-
 391  arch/arm/mach-ixp2000/ixdp2x00.c                   |    4 +-
 392  arch/arm/mach-ixp23xx/Makefile.boot                |    2 +-
 393  arch/arm/mach-ixp4xx/Makefile.boot                 |    2 +-
 394  arch/arm/mach-ixp4xx/common-pci.c                  |    3 +-
 395  arch/arm/mach-ixp4xx/dsmg600-setup.c               |    3 +-
 396  arch/arm/mach-ixp4xx/fsg-setup.c                   |    3 +-
 397  arch/arm/mach-ixp4xx/include/mach/gpio.h           |    3 +
 398  arch/arm/mach-ixp4xx/include/mach/io.h             |    2 -
 399  arch/arm/mach-ixp4xx/nas100d-setup.c               |    3 +-
 400  arch/arm/mach-ixp4xx/nslu2-setup.c                 |    3 +-
 401  arch/arm/mach-kirkwood/Makefile.boot               |    2 +-
 402  arch/arm/mach-kirkwood/irq.c                       |    3 +-
 403  arch/arm/mach-kirkwood/mpp.c                       |    3 +-
 404  arch/arm/mach-ks8695/Makefile                      |    2 +-
 405  arch/arm/mach-ks8695/Makefile.boot                 |    2 +-
 406  arch/arm/mach-ks8695/board-acs5k.c                 |    4 +-
 407  arch/arm/mach-ks8695/board-dsm320.c                |    4 +-
 408  arch/arm/mach-ks8695/board-micrel.c                |    4 +-
 409  arch/arm/mach-ks8695/devices.c                     |    1 +
 410  arch/arm/mach-ks8695/include/mach/gpio-ks8695.h    |   39 ++
 411  arch/arm/mach-ks8695/include/mach/gpio.h           |   38 --
 412  arch/arm/mach-ks8695/leds.c                        |    4 +-
 413  arch/arm/mach-lpc32xx/Makefile                     |    2 +-
 414  arch/arm/mach-lpc32xx/Makefile.boot                |    2 +-
 415  arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h  |   50 +++
 416  arch/arm/mach-lpc32xx/include/mach/gpio.h          |   74 ----
 417  arch/arm/mach-lpc32xx/phy3250.c                    |    1 +
 418  arch/arm/mach-mmp/Makefile.boot                    |    2 +-
 419  arch/arm/mach-mmp/aspenite.c                       |    5 +-
 420  arch/arm/mach-mmp/mmp2.c                           |    3 +-
 421  arch/arm/mach-mmp/pxa168.c                         |    3 +-
 422  arch/arm/mach-mmp/pxa910.c                         |    3 +-
 423  arch/arm/mach-mmp/tavorevb.c                       |    3 +-
 424  arch/arm/mach-mmp/ttc_dkb.c                        |    2 +-
 425  arch/arm/mach-msm/Makefile.boot                    |    2 +-
 426  arch/arm/mach-msm/board-msm7x27.c                  |    3 +-
 427  arch/arm/mach-msm/board-msm7x30.c                  |   25 ++-
 428  arch/arm/mach-msm/board-msm8960.c                  |   22 ++
 429  arch/arm/mach-msm/board-msm8x60.c                  |   25 ++
 430  arch/arm/mach-msm/board-qsd8x50.c                  |    3 +-
 431  arch/arm/mach-msm/board-sapphire.c                 |    3 +-
 432  arch/arm/mach-msm/board-trout-mmc.c                |    3 +-
 433  arch/arm/mach-msm/board-trout-panel.c              |    3 +-
 434  arch/arm/mach-msm/include/mach/gpio.h              |   27 +--
 435  arch/arm/mach-msm/include/mach/memory.h            |    6 +-
 436  arch/arm/mach-mv78xx0/Makefile.boot                |    2 +-
 437  arch/arm/mach-mv78xx0/irq.c                        |    3 +-
 438  arch/arm/mach-mv78xx0/mpp.c                        |    3 +-
 439  arch/arm/mach-mx5/Makefile.boot                    |    6 +-
 440  arch/arm/mach-mxs/Makefile.boot                    |    2 +-
 441  arch/arm/mach-mxs/include/mach/gpio.h              |    8 -
 442  arch/arm/mach-netx/Makefile.boot                   |    2 +-
 443  arch/arm/mach-nomadik/Makefile.boot                |    2 +-
 444  arch/arm/mach-nomadik/board-nhk8815.c              |    1 +
 445  arch/arm/mach-nomadik/cpu-8815.c                   |    2 +-
 446  arch/arm/mach-nomadik/i2c-8815nhk.c                |    2 +-
 447  arch/arm/mach-nuc93x/Makefile.boot                 |    2 +-
 448  arch/arm/mach-omap1/Makefile.boot                  |    2 +-
 449  arch/arm/mach-omap1/board-ams-delta.c              |    3 +-
 450  arch/arm/mach-omap1/board-fsample.c                |    3 +-
 451  arch/arm/mach-omap1/board-generic.c                |    3 +-
 452  arch/arm/mach-omap1/board-h2-mmc.c                 |    3 +-
 453  arch/arm/mach-omap1/board-h2.c                     |    3 +-
 454  arch/arm/mach-omap1/board-h3-mmc.c                 |    3 +-
 455  arch/arm/mach-omap1/board-h3.c                     |    3 +-
 456  arch/arm/mach-omap1/board-htcherald.c              |    1 -
 457  arch/arm/mach-omap1/board-innovator.c              |    3 +-
 458  arch/arm/mach-omap1/board-nokia770.c               |    3 +-
 459  arch/arm/mach-omap1/board-osk.c                    |    3 +-
 460  arch/arm/mach-omap1/board-palmte.c                 |    3 +-
 461  arch/arm/mach-omap1/board-palmtt.c                 |    2 +-
 462  arch/arm/mach-omap1/board-palmz71.c                |    2 +-
 463  arch/arm/mach-omap1/board-perseus2.c               |    3 +-
 464  arch/arm/mach-omap1/board-sx1-mmc.c                |    2 +-
 465  arch/arm/mach-omap1/board-sx1.c                    |    3 +-
 466  arch/arm/mach-omap1/board-voiceblue.c              |    2 +-
 467  arch/arm/mach-omap1/devices.c                      |    2 +-
 468  arch/arm/mach-omap1/fpga.c                         |    2 +-
 469  arch/arm/mach-omap1/irq.c                          |    3 +-
 470  arch/arm/mach-omap1/leds-h2p2-debug.c              |    2 +-
 471  arch/arm/mach-omap1/leds-osk.c                     |    3 +-
 472  arch/arm/mach-omap1/leds.c                         |    2 +-
 473  arch/arm/mach-omap1/serial.c                       |    3 +-
 474  arch/arm/mach-omap2/Makefile.boot                  |    2 +-
 475  arch/arm/mach-omap2/board-generic.c                |    3 +-
 476  arch/arm/mach-omap2/board-h4.c                     |    3 +-
 477  arch/arm/mach-omap2/board-ldp.c                    |    3 +-
 478  arch/arm/mach-omap2/devices.c                      |    3 +-
 479  arch/arm/mach-orion5x/Makefile.boot                |    2 +-
 480  arch/arm/mach-orion5x/db88f5281-setup.c            |    3 +-
 481  arch/arm/mach-orion5x/dns323-setup.c               |    3 +-
 482  arch/arm/mach-orion5x/irq.c                        |    3 +-
 483  arch/arm/mach-orion5x/kurobox_pro-setup.c          |    3 +-
 484  arch/arm/mach-orion5x/mv2120-setup.c               |    3 +-
 485  arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c       |    3 +-
 486  arch/arm/mach-orion5x/rd88f5181l-ge-setup.c        |    3 +-
 487  arch/arm/mach-orion5x/rd88f5182-setup.c            |    3 +-
 488  arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c       |    3 +-
 489  arch/arm/mach-orion5x/terastation_pro2-setup.c     |    3 +-
 490  arch/arm/mach-orion5x/ts209-setup.c                |    3 +-
 491  arch/arm/mach-orion5x/ts409-setup.c                |    3 +-
 492  arch/arm/mach-orion5x/wnr854t-setup.c              |    3 +-
 493  arch/arm/mach-orion5x/wrt350n-v2-setup.c           |    3 +-
 494  arch/arm/mach-pnx4008/Makefile.boot                |    2 +-
 495  arch/arm/mach-pnx4008/gpio.c                       |    3 +-
 496  arch/arm/mach-pnx4008/serial.c                     |    3 +-
 497  arch/arm/mach-prima2/Makefile.boot                 |    2 +-
 498  arch/arm/mach-pxa/Makefile.boot                    |    2 +-
 499  arch/arm/mach-pxa/generic.c                        |    2 +-
 500  arch/arm/mach-pxa/include/mach/littleton.h         |    2 +-
 501  arch/arm/mach-pxa/irq.c                            |    3 +-
 502  arch/arm/mach-pxa/lpd270.c                         |    3 +-
 503  arch/arm/mach-pxa/lubbock.c                        |    2 +-
 504  arch/arm/mach-pxa/mainstone.c                      |    3 +-
 505  arch/arm/mach-pxa/mfp-pxa2xx.c                     |    3 +-
 506  arch/arm/mach-pxa/pcm990-baseboard.c               |    3 +-
 507  arch/arm/mach-pxa/pxa25x.c                         |    2 +-
 508  arch/arm/mach-pxa/pxa27x.c                         |    2 +-
 509  arch/arm/mach-pxa/pxa3xx.c                         |    3 +-
 510  arch/arm/mach-pxa/pxa95x.c                         |    3 +-
 511  arch/arm/mach-pxa/saar.c                           |    2 +-
 512  arch/arm/mach-pxa/saarb.c                          |    3 +-
 513  arch/arm/mach-realview/Makefile.boot               |    4 +-
 514  arch/arm/mach-realview/include/mach/gpio.h         |    7 +-
 515  arch/arm/mach-realview/include/mach/system.h       |    1 +
 516  arch/arm/mach-rpc/Makefile.boot                    |    2 +-
 517  arch/arm/mach-rpc/include/mach/hardware.h          |   25 +-
 518  arch/arm/mach-rpc/include/mach/io.h                |  193 +----------
 519  arch/arm/mach-rpc/riscpc.c                         |    2 +-
 520  arch/arm/mach-s3c2410/Makefile.boot                |    4 +-
 521  arch/arm/mach-s3c2410/include/mach/gpio.h          |    6 -
 522  arch/arm/mach-s3c2410/include/mach/h1940-latch.h   |    2 +-
 523  arch/arm/mach-s3c2410/include/mach/io.h            |    2 -
 524  arch/arm/mach-s3c64xx/Makefile.boot                |    2 +-
 525  arch/arm/mach-s3c64xx/include/mach/gpio.h          |    7 -
 526  arch/arm/mach-s5p64x0/Makefile.boot                |    2 +-
 527  arch/arm/mach-s5p64x0/include/mach/gpio.h          |    7 -
 528  arch/arm/mach-s5pc100/Makefile.boot                |    2 +-
 529  arch/arm/mach-s5pc100/include/mach/gpio.h          |    7 -
 530  arch/arm/mach-s5pv210/Makefile.boot                |    2 +-
 531  arch/arm/mach-s5pv210/include/mach/gpio.h          |    7 -
 532  arch/arm/mach-sa1100/Makefile                      |    2 +-
 533  arch/arm/mach-sa1100/Makefile.boot                 |    5 +-
 534  arch/arm/mach-sa1100/generic.c                     |    2 +-
 535  arch/arm/mach-sa1100/include/mach/gpio.h           |    4 +-
 536  arch/arm/mach-sa1100/include/mach/io.h             |    6 +-
 537  arch/arm/mach-shark/Makefile.boot                  |    2 +-
 538  arch/arm/mach-shmobile/Makefile.boot               |    2 +-
 539  arch/arm/mach-shmobile/include/mach/gpio.h         |   24 +-
 540  arch/arm/mach-spear3xx/Makefile.boot               |    2 +-
 541  arch/arm/mach-spear6xx/Makefile.boot               |    2 +-
 542  arch/arm/mach-tcc8k/Makefile.boot                  |    2 +-
 543  arch/arm/mach-tegra/Makefile.boot                  |    2 +-
 544  arch/arm/mach-tegra/board-trimslice-pinmux.c       |    3 +-
 545  arch/arm/mach-tegra/include/mach/gpio.h            |    7 +-
 546  arch/arm/mach-u300/Makefile.boot                   |    4 +-
 547  arch/arm/mach-u300/include/mach/gpio-u300.h        |  253 +++++++++++++
 548  arch/arm/mach-u300/include/mach/gpio.h             |  259 +-------------
 549  arch/arm/mach-u300/mmc.c                           |    2 +-
 550  arch/arm/mach-ux500/Makefile.boot                  |    2 +-
 551  arch/arm/mach-ux500/board-mop500-pins.c            |    2 +-
 552  arch/arm/mach-ux500/board-mop500-u8500uib.c        |    3 +-
 553  arch/arm/mach-ux500/board-mop500.c                 |    1 +
 554  arch/arm/mach-ux500/board-u5500-sdi.c              |    2 +-
 555  arch/arm/mach-ux500/board-u5500.c                  |    2 +-
 556  arch/arm/mach-ux500/cpu-db5500.c                   |    2 +-
 557  arch/arm/mach-ux500/cpu-db8500.c                   |    2 +-
 558  arch/arm/mach-ux500/devices-common.c               |    2 +-
 559  arch/arm/mach-versatile/Makefile.boot              |    2 +-
 560  arch/arm/mach-versatile/include/mach/gpio.h        |    7 +-
 561  arch/arm/mach-vexpress/Makefile.boot               |    2 +-
 562  arch/arm/mach-vexpress/include/mach/io.h           |    2 -
 563  arch/arm/mach-vt8500/Makefile.boot                 |    2 +-
 564  arch/arm/mach-vt8500/include/mach/gpio.h           |    7 +-
 565  arch/arm/mach-vt8500/include/mach/io.h             |    2 -
 566  arch/arm/mach-w90x900/Makefile.boot                |    2 +-
 567  arch/arm/mach-w90x900/include/mach/gpio.h          |    6 +-
 568  arch/arm/mach-zynq/Makefile.boot                   |    2 +-
 569  arch/arm/mm/cache-l2x0.c                           |  103 ++++++
 570  arch/arm/mm/proc-v6.S                              |   16 +
 571  arch/arm/plat-mxc/include/mach/gpio.h              |    6 -
 572  arch/arm/plat-nomadik/include/plat/gpio-nomadik.h  |   85 +++++
 573  arch/arm/plat-nomadik/include/plat/gpio.h          |   81 +-----
 574  arch/arm/plat-omap/debug-devices.c                 |    3 +-
 575  arch/arm/plat-omap/debug-leds.c                    |    3 +-
 576  arch/arm/plat-omap/devices.c                       |    3 +-
 577  arch/arm/plat-omap/include/plat/gpio.h             |   20 -
 578  arch/arm/plat-orion/include/plat/gpio.h            |    9 -
 579  arch/arm/plat-pxa/gpio.c                           |    4 +-
 580  arch/arm/plat-pxa/include/plat/gpio.h              |    2 +
 581  arch/arm/plat-spear/include/plat/gpio.h            |   25 +--
 582  arch/arm/tools/mach-types                          |  370 +++++++++++---------
 583  drivers/ata/pata_at91.c                            |    2 +-
 584  drivers/gpio/Makefile                              |    6 +-
 585  .../gpio.c => drivers/gpio/gpio-davinci.c          |    4 +-
 586  drivers/gpio/gpio-ep93xx.c                         |   19 +-
 587  .../gpio.c => drivers/gpio/gpio-ks8695.c           |    4 +-
 588  .../gpiolib.c => drivers/gpio/gpio-lpc32xx.c       |    2 +-
 589  drivers/gpio/gpio-nomadik.c                        |    3 +-
 590  drivers/gpio/gpio-omap.c                           |    2 +-
 591  .../gpio.c => drivers/gpio/gpio-sa1100.c           |    4 +-
 592  .../mach-davinci => drivers/gpio}/gpio-tnetv107x.c |    0
 593  drivers/gpio/gpio-u300.c                           |    1 +
 594  drivers/i2c/busses/i2c-ixp2000.c                   |    2 +-
 595  drivers/ide/at91_ide.c                             |    2 +-
 596  drivers/input/keyboard/omap-keypad.c               |    2 +-
 597  drivers/mfd/menelaus.c                             |    2 +-
 598  drivers/mmc/host/omap.c                            |    2 +-
 599  drivers/mmc/host/sdhci-tegra.c                     |    2 +-
 600  drivers/mtd/nand/ams-delta.c                       |    2 +-
 601  drivers/mtd/onenand/omap2.c                        |    2 +-
 602  drivers/net/arm/at91_ether.c                       |    2 +-
 603  drivers/pcmcia/pxa2xx_vpac270.c                    |    2 +-
 604  drivers/spi/spi-atmel.c                            |    2 +-
 605  drivers/tty/serial/atmel_serial.c                  |    2 +-
 606  drivers/usb/host/ohci-pnx4008.c                    |    2 +-
 607  drivers/usb/musb/davinci.c                         |    2 +-
 608  drivers/video/atmel_lcdfb.c                        |    2 +-
 609  drivers/video/omap/lcd_apollon.c                   |    2 +-
 610  drivers/video/omap/lcd_h3.c                        |    2 +-
 611  drivers/video/omap/lcd_inn1610.c                   |    2 +-
 612  drivers/video/omap/lcd_ldp.c                       |    2 +-
 613  drivers/video/omap/lcd_osk.c                       |    2 +-
 614  drivers/video/omap/lcd_overo.c                     |    2 +-
 615  drivers/video/omap/lcd_palmtt.c                    |    2 +-
 616  drivers/video/pnx4008/sdum.c                       |    2 +-
 617  tools/perf/arch/arm/util/dwarf-regs.c              |    3 +
 618  352 files changed, 1794 insertions(+), 1691 deletions(-)
 619  create mode 100644 Documentation/devicetree/bindings/arm/l2cc.txt
 620  delete mode 100644 arch/arm/include/asm/auxvec.h
 621  delete mode 100644 arch/arm/include/asm/bitsperlong.h
 622  delete mode 100644 arch/arm/include/asm/cputime.h
 623  delete mode 100644 arch/arm/include/asm/emergency-restart.h
 624  delete mode 100644 arch/arm/include/asm/errno.h
 625  delete mode 100644 arch/arm/include/asm/ioctl.h
 626  delete mode 100644 arch/arm/include/asm/irq_regs.h
 627  delete mode 100644 arch/arm/include/asm/kdebug.h
 628  delete mode 100644 arch/arm/include/asm/local.h
 629  delete mode 100644 arch/arm/include/asm/local64.h
 630  delete mode 100644 arch/arm/include/asm/percpu.h
 631  delete mode 100644 arch/arm/include/asm/poll.h
 632  delete mode 100644 arch/arm/include/asm/resource.h
 633  delete mode 100644 arch/arm/include/asm/sections.h
 634  delete mode 100644 arch/arm/include/asm/siginfo.h
 635  delete mode 100644 arch/arm/include/asm/sizes.h
 636  create mode 100644 arch/arm/kernel/topology.c
 637  create mode 100644 arch/arm/mach-davinci/include/mach/gpio-davinci.h
 638  rename arch/arm/mach-ixp2000/include/mach/{gpio.h => gpio-ixp2000.h} (95%)
 639  create mode 100644 arch/arm/mach-ks8695/include/mach/gpio-ks8695.h
 640  create mode 100644 arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h
 641  create mode 100644 arch/arm/mach-u300/include/mach/gpio-u300.h
 642  create mode 100644 arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
 643  rename arch/arm/mach-davinci/gpio.c => drivers/gpio/gpio-davinci.c (99%)
 644  rename arch/arm/mach-ks8695/gpio.c => drivers/gpio/gpio-ks8695.c (99%)
 645  rename arch/arm/mach-lpc32xx/gpiolib.c => drivers/gpio/gpio-lpc32xx.c (99%)
 646  rename arch/arm/mach-sa1100/gpio.c => drivers/gpio/gpio-sa1100.c (96%)
 647  rename {arch/arm/mach-davinci => drivers/gpio}/gpio-tnetv107x.c (100%)
 648 Merging arm-lpae/for-next
 649 $ git merge arm-lpae/for-next
 650 Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution.
 651 Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution.
 652 Resolved 'arch/arm/include/asm/tlb.h' using previous resolution.
 653 Auto-merging arch/arm/Kconfig
 654 Auto-merging arch/arm/include/asm/pgalloc.h
 655 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
 656 Auto-merging arch/arm/include/asm/pgtable.h
 657 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
 658 Auto-merging arch/arm/include/asm/tlb.h
 659 CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
 660 Auto-merging arch/arm/kernel/head.S
 661 Auto-merging arch/arm/kernel/module.c
 662 Auto-merging arch/arm/kernel/setup.c
 663 Auto-merging arch/arm/mm/alignment.c
 664 Automatic merge failed; fix conflicts and then commit the result.
 665 $ git commit -v -a
 666 [master 3caaf0f] Merge remote-tracking branch 'arm-lpae/for-next'
 667 $ git diff -M --stat --summary HEAD^..
 668  arch/arm/Kconfig                            |    2 +-
 669  arch/arm/boot/compressed/head.S             |    1 +
 670  arch/arm/include/asm/assembler.h            |   11 +
 671  arch/arm/include/asm/dma-mapping.h          |    2 +-
 672  arch/arm/include/asm/page.h                 |   44 +---
 673  arch/arm/include/asm/pgalloc.h              |   28 ++-
 674  arch/arm/include/asm/pgtable-2level-hwdef.h |   93 ++++++
 675  arch/arm/include/asm/pgtable-2level-types.h |   67 +++++
 676  arch/arm/include/asm/pgtable-2level.h       |  143 +++++++++
 677  arch/arm/include/asm/pgtable-3level-hwdef.h |   82 ++++++
 678  arch/arm/include/asm/pgtable-3level-types.h |   70 +++++
 679  arch/arm/include/asm/pgtable-3level.h       |  107 +++++++
 680  arch/arm/include/asm/pgtable-hwdef.h        |   81 +-----
 681  arch/arm/include/asm/pgtable.h              |  211 +++++---------
 682  arch/arm/include/asm/proc-fns.h             |   21 ++
 683  arch/arm/include/asm/setup.h                |    8 +
 684  arch/arm/include/asm/tlb.h                  |   11 +-
 685  arch/arm/include/asm/tlbflush.h             |    4 +-
 686  arch/arm/kernel/head.S                      |  119 ++++++---
 687  arch/arm/kernel/module.c                    |    2 +-
 688  arch/arm/kernel/setup.c                     |   10 +
 689  arch/arm/kernel/sleep.S                     |    2 +
 690  arch/arm/mm/Kconfig                         |   13 +
 691  arch/arm/mm/Makefile                        |    4 +
 692  arch/arm/mm/alignment.c                     |    8 +-
 693  arch/arm/mm/context.c                       |   19 +-
 694  arch/arm/mm/dma-mapping.c                   |    6 +-
 695  arch/arm/mm/fault.c                         |   87 ++++++
 696  arch/arm/mm/idmap.c                         |   36 +++-
 697  arch/arm/mm/ioremap.c                       |   39 ++-
 698  arch/arm/mm/mm.h                            |    4 +-
 699  arch/arm/mm/mmu.c                           |   53 +++-
 700  arch/arm/mm/pgd.c                           |   51 +++-
 701  arch/arm/mm/proc-macros.S                   |    5 +-
 702  arch/arm/mm/proc-v7lpae.S                   |  422 +++++++++++++++++++++++++++
 703  35 files changed, 1523 insertions(+), 343 deletions(-)
 704  create mode 100644 arch/arm/include/asm/pgtable-2level-hwdef.h
 705  create mode 100644 arch/arm/include/asm/pgtable-2level-types.h
 706  create mode 100644 arch/arm/include/asm/pgtable-2level.h
 707  create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h
 708  create mode 100644 arch/arm/include/asm/pgtable-3level-types.h
 709  create mode 100644 arch/arm/include/asm/pgtable-3level.h
 710  create mode 100644 arch/arm/mm/proc-v7lpae.S
 711 Merging arm-soc/for-next
 712 $ git merge arm-soc/for-next
 713 Already up-to-date.
 714 Merging at91/at91-next
 715 $ git merge at91/at91-next
 716 Already up-to-date.
 717 Merging davinci/davinci-next
 718 $ git merge davinci/davinci-next
 719 Already up-to-date.
 720 Merging i.MX/for-next
 721 $ git merge i.MX/for-next
 722 Already up-to-date.
 723 Merging linux-spec/for-next
 724 $ git merge linux-spec/for-next
 725 Already up-to-date.
 726 Merging msm/for-next
 727 $ git merge msm/for-next
 728 Resolved 'arch/arm/mach-msm/io.c' using previous resolution.
 729 Auto-merging arch/arm/mach-msm/Makefile
 730 Auto-merging arch/arm/mach-msm/acpuclock-arm11.c
 731 Auto-merging arch/arm/mach-msm/board-msm7x30.c
 732 Auto-merging arch/arm/mach-msm/board-msm8960.c
 733 Auto-merging arch/arm/mach-msm/board-msm8x60.c
 734 Auto-merging arch/arm/mach-msm/board-qsd8x50.c
 735 Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
 736 Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
 737 Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
 738 Auto-merging arch/arm/mach-msm/io.c
 739 CONFLICT (content): Merge conflict in arch/arm/mach-msm/io.c
 740 Automatic merge failed; fix conflicts and then commit the result.
 741 $ git commit -v -a
 742 [master 7b13c4c] Merge remote-tracking branch 'msm/for-next'
 743 $ git diff -M --stat --summary HEAD^..
 744  arch/arm/mach-msm/Makefile                      |    5 +-
 745  arch/arm/mach-msm/acpuclock-arm11.c             |    2 +-
 746  arch/arm/mach-msm/board-halibut.c               |    1 +
 747  arch/arm/mach-msm/board-mahimahi.c              |    1 +
 748  arch/arm/mach-msm/board-msm7x30.c               |    1 +
 749  arch/arm/mach-msm/board-msm8960.c               |   18 +
 750  arch/arm/mach-msm/board-msm8x60.c               |    9 +-
 751  arch/arm/mach-msm/board-qsd8x50.c               |    1 +
 752  arch/arm/mach-msm/board-trout.c                 |    1 +
 753  arch/arm/mach-msm/clock-dummy.c                 |   81 +++++
 754  arch/arm/mach-msm/clock.h                       |   11 +
 755  arch/arm/mach-msm/devices-msm7x00.c             |   21 ++-
 756  arch/arm/mach-msm/devices-msm7x30.c             |   21 ++-
 757  arch/arm/mach-msm/devices-msm8960.c             |  181 +++++++++++
 758  arch/arm/mach-msm/devices-msm8x60.c             |   56 ++++
 759  arch/arm/mach-msm/devices-qsd8x50.c             |   21 ++-
 760  arch/arm/mach-msm/devices.h                     |    8 +
 761  arch/arm/mach-msm/dma.c                         |  391 ++++++++++++++++++-----
 762  arch/arm/mach-msm/include/mach/dma.h            |   84 +++---
 763  arch/arm/mach-msm/include/mach/msm_iomap-7x00.h |    5 +-
 764  arch/arm/mach-msm/include/mach/msm_iomap-7x30.h |    5 +-
 765  arch/arm/mach-msm/include/mach/msm_iomap-8960.h |    3 +
 766  arch/arm/mach-msm/include/mach/msm_iomap-8x50.h |    5 +-
 767  arch/arm/mach-msm/include/mach/msm_iomap-8x60.h |    6 +
 768  arch/arm/mach-msm/io.c                          |    3 -
 769  25 files changed, 808 insertions(+), 133 deletions(-)
 770  create mode 100644 arch/arm/mach-msm/clock-dummy.c
 771  create mode 100644 arch/arm/mach-msm/devices-msm8x60.c
 772 Merging omap/for-next
 773 $ git merge omap/for-next
 774 Already up-to-date.
 775 Merging pxa/for-next
 776 $ git merge pxa/for-next
 777 Already up-to-date.
 778 Merging samsung/next-samsung
 779 $ git merge samsung/next-samsung
 780 Already up-to-date.
 781 Merging s5p/for-next
 782 $ git merge s5p/for-next
 783 Merge made by recursive.
 784  arch/arm/configs/exynos4_defconfig               |    1 +
 785  arch/arm/mach-exynos4/Kconfig                    |   16 ++
 786  arch/arm/mach-exynos4/Makefile                   |    1 +
 787  arch/arm/mach-exynos4/clock.c                    |    2 +-
 788  arch/arm/mach-exynos4/cpu.c                      |   11 ++-
 789  arch/arm/mach-exynos4/include/mach/irqs.h        |    5 +-
 790  arch/arm/mach-exynos4/include/mach/regs-pmu.h    |    2 +
 791  arch/arm/mach-exynos4/irq-eint.c                 |    7 +
 792  arch/arm/mach-exynos4/mach-nuri.c                |   34 +++++
 793  arch/arm/mach-exynos4/mach-origen.c              |  108 ++++++++++++++
 794  arch/arm/mach-exynos4/mach-smdkv310.c            |   11 ++
 795  arch/arm/mach-exynos4/mach-universal_c210.c      |   38 +++++-
 796  arch/arm/mach-exynos4/setup-usb-phy.c            |    2 +-
 797  arch/arm/mach-s3c2410/dma.c                      |   14 --
 798  arch/arm/mach-s3c2412/dma.c                      |   18 ---
 799  arch/arm/mach-s3c2440/dma.c                      |   17 --
 800  arch/arm/mach-s3c2443/dma.c                      |   27 ----
 801  arch/arm/mach-s3c64xx/Kconfig                    |    1 +
 802  arch/arm/mach-s3c64xx/Makefile                   |    2 +-
 803  arch/arm/mach-s3c64xx/include/mach/crag6410.h    |   23 +++
 804  arch/arm/mach-s3c64xx/mach-crag6410-module.c     |  173 ++++++++++++++++++++++
 805  arch/arm/mach-s3c64xx/mach-crag6410.c            |   97 ++-----------
 806  arch/arm/mach-s3c64xx/mach-mini6410.c            |    8 +-
 807  arch/arm/mach-s3c64xx/mach-real6410.c            |    8 +-
 808  arch/arm/mach-s3c64xx/mach-smdk6410.c            |   47 +------
 809  arch/arm/mach-s3c64xx/pm.c                       |    1 +
 810  arch/arm/mach-s5p64x0/irq-eint.c                 |    2 +-
 811  arch/arm/mach-s5p64x0/mach-smdk6440.c            |    8 +-
 812  arch/arm/mach-s5p64x0/mach-smdk6450.c            |    8 +-
 813  arch/arm/mach-s5pc100/mach-smdkc100.c            |    8 +-
 814  arch/arm/mach-s5pv210/Kconfig                    |    6 -
 815  arch/arm/mach-s5pv210/Makefile                   |    2 +-
 816  arch/arm/mach-s5pv210/mach-smdkv210.c            |    8 +-
 817  arch/arm/mach-s5pv210/pm.c                       |    2 +-
 818  arch/arm/plat-s5p/clock.c                        |    2 +-
 819  arch/arm/plat-s5p/irq-gpioint.c                  |    6 +
 820  arch/arm/plat-samsung/dev-hsmmc.c                |   19 +---
 821  arch/arm/plat-samsung/dev-hsmmc1.c               |   19 +---
 822  arch/arm/plat-samsung/dev-hsmmc2.c               |   19 +---
 823  arch/arm/plat-samsung/dev-hsmmc3.c               |   19 +---
 824  arch/arm/plat-samsung/dev-ts.c                   |    9 +
 825  arch/arm/plat-samsung/include/plat/backlight.h   |    2 +-
 826  arch/arm/plat-samsung/include/plat/dma-s3c24xx.h |    6 -
 827  arch/arm/plat-samsung/include/plat/sdhci.h       |    7 +
 828  arch/arm/plat-samsung/irq-vic-timer.c            |    5 +
 829  arch/arm/plat-samsung/platformdata.c             |   22 +++
 830  46 files changed, 508 insertions(+), 345 deletions(-)
 831  create mode 100644 arch/arm/mach-exynos4/mach-origen.c
 832  create mode 100644 arch/arm/mach-s3c64xx/include/mach/crag6410.h
 833  create mode 100644 arch/arm/mach-s3c64xx/mach-crag6410-module.c
 834 Merging tegra/for-next
 835 $ git merge tegra/for-next
 836 Already up-to-date.
 837 Merging ux500-core/ux500-core
 838 $ git merge ux500-core/ux500-core
 839 Already up-to-date.
 840 Merging xilinx/arm-next
 841 $ git merge xilinx/arm-next
 842 Already up-to-date.
 843 Merging blackfin/for-linus
 844 $ git merge blackfin/for-linus
 845 Removing arch/blackfin/include/asm/mutex.h
 846 Merge made by recursive.
 847  arch/blackfin/include/asm/Kbuild        |    1 +
 848  arch/blackfin/include/asm/mutex.h       |    1 -
 849  arch/blackfin/include/asm/uaccess.h     |    6 +++---
 850  arch/blackfin/mach-bf533/boards/H8606.c |    3 ++-
 851  4 files changed, 6 insertions(+), 5 deletions(-)
 852  delete mode 100644 arch/blackfin/include/asm/mutex.h
 853 Merging cris/for-next
 854 $ git merge cris/for-next
 855 Auto-merging arch/cris/arch-v32/drivers/cryptocop.c
 856 Auto-merging drivers/net/cris/eth_v10.c
 857 Merge made by recursive.
 858  Documentation/cris/README               |   62 +++++++++++++++---------------
 859  arch/cris/arch-v32/drivers/cryptocop.c  |    6 +--
 860  arch/cris/arch-v32/kernel/ptrace.c      |    2 -
 861  arch/cris/include/arch-v32/arch/cache.h |    2 +-
 862  drivers/net/cris/eth_v10.c              |    1 -
 863  5 files changed, 34 insertions(+), 39 deletions(-)
 864 Merging ia64/test
 865 $ git merge ia64/test
 866 Merge made by recursive.
 867  arch/ia64/sn/kernel/sn2/sn_hwperf.c |   12 +++--
 868  drivers/acpi/apei/erst.c            |    2 +-
 869  drivers/firmware/efivars.c          |    2 +-
 870  fs/pstore/inode.c                   |   40 +++++++++++++++--
 871  fs/pstore/internal.h                |    2 +-
 872  fs/pstore/platform.c                |   82 ++++++++++++++++++++++++++++-------
 873  include/linux/pstore.h              |    2 +-
 874  7 files changed, 114 insertions(+), 28 deletions(-)
 875 Merging m68k/for-next
 876 $ git merge m68k/for-next
 877 Merge made by recursive.
 878  arch/m68k/mac/macints.c      |    2 +-
 879  arch/m68k/mac/misc.c         |   40 +++++++++++++++++++++++-----------------
 880  drivers/zorro/zorro-driver.c |    8 ++++----
 881  3 files changed, 28 insertions(+), 22 deletions(-)
 882 Merging m68knommu/for-next
 883 $ git merge m68knommu/for-next
 884 Auto-merging arch/m68k/Kconfig.machine
 885 Removing arch/m68k/Kconfig.mmu
 886 Removing arch/m68k/Makefile_mm
 887 Removing arch/m68k/Makefile_no
 888 Removing arch/m68k/include/asm/entry_mm.h
 889 Removing arch/m68k/include/asm/entry_no.h
 890 Removing arch/m68k/kernel/Makefile_mm
 891 Removing arch/m68k/kernel/Makefile_no
 892 Removing arch/m68k/kernel/traps_mm.c
 893 Removing arch/m68k/kernel/traps_no.c
 894 Merge made by recursive.
 895  arch/m68k/Kconfig                            |  195 +----
 896  arch/m68k/Kconfig.bus                        |   55 ++
 897  arch/m68k/Kconfig.cpu                        |  429 +++++++++
 898  arch/m68k/Kconfig.devices                    |  171 ++++
 899  arch/m68k/{Kconfig.nommu => Kconfig.machine} |  543 ++++--------
 900  arch/m68k/Kconfig.mmu                        |  411 ---------
 901  arch/m68k/Makefile                           |  168 ++++-
 902  arch/m68k/Makefile_mm                        |  121 ---
 903  arch/m68k/Makefile_no                        |  124 ---
 904  arch/m68k/include/asm/entry.h                |  255 ++++++-
 905  arch/m68k/include/asm/entry_mm.h             |  128 ---
 906  arch/m68k/include/asm/entry_no.h             |  181 ----
 907  arch/m68k/include/asm/m520xsim.h             |   26 +-
 908  arch/m68k/include/asm/mcfqspi.h              |    8 +-
 909  arch/m68k/include/asm/processor.h            |    6 +
 910  arch/m68k/kernel/Makefile                    |   24 +-
 911  arch/m68k/kernel/Makefile_mm                 |   17 -
 912  arch/m68k/kernel/Makefile_no                 |   10 -
 913  arch/m68k/kernel/entry_no.S                  |    6 +-
 914  arch/m68k/kernel/traps.c                     | 1108 +++++++++++++++++++++++-
 915  arch/m68k/kernel/traps_mm.c                  | 1207 --------------------------
 916  arch/m68k/kernel/traps_no.c                  |  361 --------
 917  arch/m68k/kernel/vectors.c                   |  145 +++
 918  arch/m68k/lib/memcpy.c                       |    9 +
 919  arch/m68k/platform/520x/config.c             |    6 +-
 920  arch/m68k/platform/520x/gpio.c               |   50 +-
 921  arch/m68k/platform/68328/Makefile            |    5 +-
 922  arch/m68k/platform/68328/entry.S             |   18 +-
 923  arch/m68k/platform/68360/Makefile            |    6 +-
 924  arch/m68k/platform/68360/entry.S             |    4 +-
 925  arch/m68k/platform/coldfire/entry.S          |    6 +-
 926  31 files changed, 2642 insertions(+), 3161 deletions(-)
 927  create mode 100644 arch/m68k/Kconfig.bus
 928  create mode 100644 arch/m68k/Kconfig.cpu
 929  create mode 100644 arch/m68k/Kconfig.devices
 930  rename arch/m68k/{Kconfig.nommu => Kconfig.machine} (62%)
 931  delete mode 100644 arch/m68k/Kconfig.mmu
 932  delete mode 100644 arch/m68k/Makefile_mm
 933  delete mode 100644 arch/m68k/Makefile_no
 934  delete mode 100644 arch/m68k/include/asm/entry_mm.h
 935  delete mode 100644 arch/m68k/include/asm/entry_no.h
 936  delete mode 100644 arch/m68k/kernel/Makefile_mm
 937  delete mode 100644 arch/m68k/kernel/Makefile_no
 938  delete mode 100644 arch/m68k/kernel/traps_mm.c
 939  delete mode 100644 arch/m68k/kernel/traps_no.c
 940  create mode 100644 arch/m68k/kernel/vectors.c
 941 Merging microblaze/next
 942 $ git merge microblaze/next
 943 Already up-to-date.
 944 Merging mips/mips-for-linux-next
 945 $ git merge mips/mips-for-linux-next
 946 Removing arch/mips/nxp/pnx8550/common/pci.c
 947 Removing arch/mips/nxp/pnx8550/common/setup.c
 948 Merge made by recursive.
 949  arch/mips/Kconfig                                  |    1 +
 950  arch/mips/Makefile                                 |    2 +
 951  arch/mips/alchemy/common/platform.c                |    2 +-
 952  arch/mips/alchemy/common/power.c                   |   22 ++-
 953  arch/mips/ar7/irq.c                                |    3 +-
 954  arch/mips/bcm63xx/irq.c                            |    1 +
 955  arch/mips/cobalt/irq.c                             |    1 +
 956  arch/mips/dec/setup.c                              |    4 +
 957  arch/mips/emma/markeins/irq.c                      |    2 +-
 958  arch/mips/include/asm/cacheflush.h                 |   24 ++++
 959  arch/mips/include/asm/io.h                         |   12 +--
 960  .../asm/mach-cavium-octeon/cpu-feature-overrides.h |    1 -
 961  arch/mips/include/asm/mipsprom.h                   |    6 +-
 962  arch/mips/include/asm/prom.h                       |    6 +-
 963  arch/mips/kernel/ftrace.c                          |   39 +++---
 964  arch/mips/kernel/scall32-o32.S                     |    2 +-
 965  arch/mips/kernel/signal.c                          |    3 +
 966  arch/mips/kernel/traps.c                           |    6 +-
 967  arch/mips/lantiq/irq.c                             |    6 +-
 968  arch/mips/lasat/interrupt.c                        |    1 +
 969  arch/mips/loongson/fuloong-2e/irq.c                |    1 +
 970  arch/mips/loongson/lemote-2f/irq.c                 |    3 +-
 971  arch/mips/mm/c-octeon.c                            |    6 +
 972  arch/mips/mm/c-r3k.c                               |    7 +
 973  arch/mips/mm/c-r4k.c                               |   35 +++++
 974  arch/mips/mm/c-tx39.c                              |    7 +
 975  arch/mips/mm/cache.c                               |    5 +
 976  arch/mips/mm/tlbex.c                               |    3 +-
 977  arch/mips/mti-malta/malta-int.c                    |    6 +-
 978  arch/mips/netlogic/Platform                        |    5 +
 979  arch/mips/netlogic/xlr/setup.c                     |    4 +-
 980  arch/mips/netlogic/xlr/smp.c                       |    2 +-
 981  arch/mips/netlogic/xlr/smpboot.S                   |   16 ++-
 982  arch/mips/nxp/pnx8550/common/pci.c                 |  134 ------------------
 983  arch/mips/nxp/pnx8550/common/setup.c               |  143 --------------------
 984  arch/mips/pci/pci-lantiq.c                         |    9 +-
 985  arch/mips/pci/pci-rc32434.c                        |    2 +-
 986  arch/mips/pmc-sierra/msp71xx/msp_irq.c             |    6 +-
 987  arch/mips/pmc-sierra/msp71xx/msp_setup.c           |    1 +
 988  arch/mips/pmc-sierra/yosemite/py-console.c         |   12 +--
 989  arch/mips/pnx8550/common/int.c                     |    2 +-
 990  arch/mips/pnx8550/common/prom.c                    |    2 +-
 991  arch/mips/sgi-ip22/ip22-int.c                      |   10 +-
 992  arch/mips/sgi-ip27/ip27-irq.c                      |    4 +-
 993  arch/mips/sni/rm200.c                              |    1 +
 994  arch/mips/vr41xx/common/irq.c                      |    1 +
 995  drivers/mtd/maps/lantiq-flash.c                    |    4 +-
 996  47 files changed, 204 insertions(+), 371 deletions(-)
 997  delete mode 100644 arch/mips/nxp/pnx8550/common/pci.c
 998  delete mode 100644 arch/mips/nxp/pnx8550/common/setup.c
 999 Merging openrisc/for-upstream
1000 $ git merge openrisc/for-upstream
1001 Merge made by recursive.
1002  arch/openrisc/include/asm/sigcontext.h |    7 +------
1003  arch/openrisc/kernel/signal.c          |   21 +++++----------------
1004  2 files changed, 6 insertions(+), 22 deletions(-)
1005 Merging parisc/for-next
1006 $ git merge parisc/for-next
1007 Already up-to-date.
1008 Merging powerpc/next
1009 $ git merge powerpc/next
1010 Already up-to-date.
1011 Merging 4xx/next
1012 $ git merge 4xx/next
1013 Removing arch/powerpc/boot/dts/hcu4.dts
1014 Removing arch/powerpc/configs/40x/hcu4_defconfig
1015 Removing arch/powerpc/platforms/40x/hcu4.c
1016 Auto-merging arch/powerpc/sysdev/ppc4xx_pci.c
1017 Merge made by recursive.
1018  arch/powerpc/Kconfig                    |    2 +-
1019  arch/powerpc/boot/dts/hcu4.dts          |  168 ------------------------------
1020  arch/powerpc/boot/dts/yosemite.dts      |   36 +++++++
1021  arch/powerpc/configs/40x/hcu4_defconfig |   80 --------------
1022  arch/powerpc/configs/ppc40x_defconfig   |    1 -
1023  arch/powerpc/include/asm/kexec.h        |    2 +-
1024  arch/powerpc/kernel/misc_32.S           |  171 +++++++++++++++++++++++++++++++
1025  arch/powerpc/platforms/40x/Kconfig      |    8 --
1026  arch/powerpc/platforms/40x/Makefile     |    1 -
1027  arch/powerpc/platforms/40x/hcu4.c       |   61 -----------
1028  arch/powerpc/sysdev/ppc4xx_pci.c        |   89 +++++++++++++---
1029  arch/powerpc/sysdev/ppc4xx_pci.h        |   12 ++
1030  drivers/edac/ppc4xx_edac.c              |    2 +-
1031  13 files changed, 294 insertions(+), 339 deletions(-)
1032  delete mode 100644 arch/powerpc/boot/dts/hcu4.dts
1033  delete mode 100644 arch/powerpc/configs/40x/hcu4_defconfig
1034  delete mode 100644 arch/powerpc/platforms/40x/hcu4.c
1035 Merging 52xx-and-virtex/powerpc/next
1036 $ git merge 52xx-and-virtex/powerpc/next
1037 Merge made by recursive.
1038  arch/powerpc/boot/dts/charon.dts             |  236 ++++++++++++++++++++++++++
1039  arch/powerpc/configs/52xx/tqm5200_defconfig  |   20 ++-
1040  arch/powerpc/platforms/52xx/mpc5200_simple.c |    1 +
1041  3 files changed, 249 insertions(+), 8 deletions(-)
1042  create mode 100644 arch/powerpc/boot/dts/charon.dts
1043 Merging galak/next
1044 $ git merge galak/next
1045 Already up-to-date.
1046 Merging s390/features
1047 $ git merge s390/features
1048 Merge made by recursive.
1049  Documentation/kernel-parameters.txt |    6 +-
1050  arch/s390/Kconfig                   |   10 ++
1051  arch/s390/include/asm/ipl.h         |    1 +
1052  arch/s390/include/asm/kexec.h       |    3 +
1053  arch/s390/include/asm/setup.h       |    9 ++
1054  arch/s390/include/asm/system.h      |    2 +
1055  arch/s390/include/asm/thread_info.h |    2 +-
1056  arch/s390/kernel/Makefile           |    1 +
1057  arch/s390/kernel/crash_dump.c       |   39 ++++++
1058  arch/s390/kernel/early.c            |   14 +-
1059  arch/s390/kernel/head.S             |   16 +++
1060  arch/s390/kernel/head_kdump.S       |  116 +++++++++++++++++
1061  arch/s390/kernel/ipl.c              |    4 +
1062  arch/s390/kernel/machine_kexec.c    |  245 +++++++++++++++++++++++++++++++++++
1063  arch/s390/kernel/mem_detect.c       |   69 ++++++++++
1064  arch/s390/kernel/setup.c            |  203 +++++++++++++++++++++++++++++
1065  arch/s390/mm/maccess.c              |   57 ++++++++
1066  arch/s390/mm/vmem.c                 |    6 +
1067  drivers/s390/block/dasd_ioctl.c     |   10 +-
1068  drivers/s390/char/zcore.c           |   20 +---
1069  drivers/s390/cio/ccwreq.c           |   23 +++-
1070  include/linux/crash_dump.h          |    1 +
1071  include/linux/kexec.h               |    4 +
1072  kernel/crash_dump.c                 |   11 ++
1073  kernel/kexec.c                      |    2 +-
1074  25 files changed, 839 insertions(+), 35 deletions(-)
1075  create mode 100644 arch/s390/kernel/crash_dump.c
1076  create mode 100644 arch/s390/kernel/head_kdump.S
1077 Merging sh/sh-latest
1078 $ git merge sh/sh-latest
1079 Merge made by recursive.
1080  arch/sh/boards/mach-ecovec24/setup.c |    4 ++++
1081  1 files changed, 4 insertions(+), 0 deletions(-)
1082 Merging rmobile/rmobile-latest
1083 $ git merge rmobile/rmobile-latest
1084 Already up-to-date.
1085 Merging sparc/master
1086 $ git merge sparc/master
1087 Already up-to-date.
1088 Merging tile/master
1089 $ git merge tile/master
1090 Merge made by recursive.
1091  arch/tile/kernel/intvec_32.S  |    2 +-
1092  arch/tile/lib/atomic_asm_32.S |    2 +-
1093  fs/nfs/nfs4filelayout.c       |    6 +++---
1094  3 files changed, 5 insertions(+), 5 deletions(-)
1095 Merging unicore32/unicore32
1096 $ git merge unicore32/unicore32
1097 Auto-merging MAINTAINERS
1098 Merge made by recursive.
1099  MAINTAINERS                                |    1 +
1100  arch/unicore32/boot/compressed/Makefile    |    4 +-
1101  arch/unicore32/configs/unicore32_defconfig |    2 +-
1102  arch/unicore32/include/asm/bitops.h        |   12 +-
1103  arch/unicore32/include/asm/io.h            |    8 +-
1104  arch/unicore32/kernel/ksyms.c              |    4 +-
1105  arch/unicore32/lib/findbit.S               |   14 +-
1106  drivers/net/Kconfig                        |    5 +
1107  drivers/net/Makefile                       |    1 +
1108  drivers/net/mac-puv3.c                     | 1807 ++++++++++++++++++++++++++++
1109  10 files changed, 1834 insertions(+), 24 deletions(-)
1110  create mode 100644 drivers/net/mac-puv3.c
1111 Merging xtensa/master
1112 $ git merge xtensa/master
1113 Already up-to-date.
1114 Merging ceph/for-next
1115 $ git merge ceph/for-next
1116 Auto-merging fs/ceph/caps.c
1117 Auto-merging fs/ceph/super.h
1118 Auto-merging include/linux/ceph/libceph.h
1119 Merge made by recursive.
1120  drivers/block/rbd.c            |    2 +-
1121  fs/ceph/addr.c                 |  192 +++++++++++++++++++++++++---------------
1122  fs/ceph/caps.c                 |    2 +-
1123  fs/ceph/ioctl.h                |   55 +++++++++++-
1124  fs/ceph/mds_client.c           |   11 ++-
1125  fs/ceph/super.c                |   23 ++++--
1126  fs/ceph/super.h                |    8 +-
1127  include/linux/ceph/libceph.h   |    4 +-
1128  include/linux/ceph/messenger.h |    3 +-
1129  net/ceph/ceph_common.c         |   47 +++++-----
1130  net/ceph/messenger.c           |   16 +++-
1131  net/ceph/mon_client.c          |   71 ++++++++-------
1132  net/ceph/msgpool.c             |   42 ++++++---
1133  net/ceph/osd_client.c          |    8 +-
1134  14 files changed, 318 insertions(+), 166 deletions(-)
1135 Merging cifs/master
1136 $ git merge cifs/master
1137 Already up-to-date.
1138 Merging configfs/linux-next
1139 $ git merge configfs/linux-next
1140 Already up-to-date.
1141 Merging ecryptfs/next
1142 $ git merge ecryptfs/next
1143 Already up-to-date.
1144 Merging ext3/for_next
1145 $ git merge ext3/for_next
1146 Already up-to-date.
1147 Merging ext4/dev
1148 $ git merge ext4/dev
1149 Merge made by recursive.
1150  Documentation/filesystems/ext4.txt |    8 +-
1151  fs/ext4/balloc.c                   |  345 +++++++++++-------
1152  fs/ext4/ext4.h                     |  116 +++++--
1153  fs/ext4/ext4_extents.h             |    2 +
1154  fs/ext4/extents.c                  |  700 ++++++++++++++++++++++++++++++++----
1155  fs/ext4/ialloc.c                   |   73 ++--
1156  fs/ext4/indirect.c                 |    7 +
1157  fs/ext4/inode.c                    |  395 ++++++++++++++++++---
1158  fs/ext4/ioctl.c                    |   33 ++-
1159  fs/ext4/mballoc.c                  |  291 +++++++++------
1160  fs/ext4/mballoc.h                  |    9 +-
1161  fs/ext4/migrate.c                  |    1 -
1162  fs/ext4/move_extent.c              |    1 -
1163  fs/ext4/namei.c                    |    8 +-
1164  fs/ext4/resize.c                   |   10 +-
1165  fs/ext4/super.c                    |  197 +++++++----
1166  fs/jbd2/transaction.c              |   46 +++-
1167  include/linux/ext2_fs.h            |    4 +-
1168  include/linux/ext3_fs.h            |    4 +-
1169  include/trace/events/ext4.h        |  398 ++++++++++++++++++++-
1170  20 files changed, 2124 insertions(+), 524 deletions(-)
1171 Merging fatfs/master
1172 $ git merge fatfs/master
1173 Already up-to-date.
1174 Merging fuse/for-next
1175 $ git merge fuse/for-next
1176 Auto-merging fs/fuse/file.c
1177 Auto-merging fs/fuse/fuse_i.h
1178 Auto-merging fs/fuse/inode.c
1179 Merge made by recursive.
1180  fs/fuse/dev.c        |    4 ++
1181  fs/fuse/file.c       |   84 ++++++++------------------------------------------
1182  fs/fuse/fuse_i.h     |    8 ++++-
1183  fs/fuse/inode.c      |   10 +++++-
1184  include/linux/fuse.h |    9 +++++-
1185  5 files changed, 40 insertions(+), 75 deletions(-)
1186 Merging gfs2/master
1187 $ git merge gfs2/master
1188 Auto-merging fs/gfs2/acl.c
1189 Merge made by recursive.
1190  fs/gfs2/acl.c    |    5 +-
1191  fs/gfs2/aops.c   |    6 ---
1192  fs/gfs2/dir.c    |   42 +++++---------------
1193  fs/gfs2/file.c   |   37 +++++++++++++-----
1194  fs/gfs2/glops.c  |   29 +++++++++++---
1195  fs/gfs2/incore.h |    1 +
1196  fs/gfs2/inode.c  |   85 +++++++++++++++--------------------------
1197  fs/gfs2/inode.h  |    2 +-
1198  fs/gfs2/quota.c  |   13 +-----
1199  fs/gfs2/super.c  |  111 +++++++++++++++++++++++++++++++++++-------------------
1200  fs/gfs2/xattr.c  |    5 +-
1201  11 files changed, 171 insertions(+), 165 deletions(-)
1202 Merging hfsplus/for-next
1203 $ git merge hfsplus/for-next
1204 Already up-to-date.
1205 Merging jfs/next
1206 $ git merge jfs/next
1207 Already up-to-date.
1208 Merging logfs/master
1209 $ git merge logfs/master
1210 Auto-merging fs/logfs/logfs.h
1211 Merge made by recursive.
1212  fs/logfs/dev_mtd.c   |   26 ++++++++++++--------------
1213  fs/logfs/logfs.h     |    1 +
1214  fs/logfs/readwrite.c |    4 ++++
1215  fs/logfs/segment.c   |   14 ++++++++++----
1216  fs/logfs/super.c     |    1 +
1217  5 files changed, 28 insertions(+), 18 deletions(-)
1218 Merging nfs/linux-next
1219 $ git merge nfs/linux-next
1220 Already up-to-date.
1221 Merging nfsd/nfsd-next
1222 $ git merge nfsd/nfsd-next
1223 Merge made by recursive.
1224  fs/nfsd/nfs4proc.c |   23 ++++++++++++++++++++++-
1225  fs/nfsd/nfs4xdr.c  |   12 ++++++++++++
1226  fs/nfsd/state.h    |    6 ------
1227  3 files changed, 34 insertions(+), 7 deletions(-)
1228 Merging nilfs2/for-next
1229 $ git merge nilfs2/for-next
1230 Already up-to-date.
1231 Merging ocfs2/linux-next
1232 $ git merge ocfs2/linux-next
1233 Auto-merging fs/ocfs2/file.c
1234 Auto-merging fs/ocfs2/move_extents.c
1235 Merge made by recursive.
1236  fs/ocfs2/aops.c              |   69 +++++++++++++--
1237  fs/ocfs2/aops.h              |   14 +++
1238  fs/ocfs2/cluster/heartbeat.c |  194 ++++++++++++++++++++++++++----------------
1239  fs/ocfs2/cluster/netdebug.c  |  102 +++++++++++++++-------
1240  fs/ocfs2/cluster/tcp.c       |  138 ++++++++++++++++--------------
1241  fs/ocfs2/cluster/tcp.h       |    2 +
1242  fs/ocfs2/dir.c               |    3 +-
1243  fs/ocfs2/dlm/dlmcommon.h     |   56 +++----------
1244  fs/ocfs2/dlm/dlmdomain.c     |   44 +++++-----
1245  fs/ocfs2/dlm/dlmlock.c       |   54 ++++++------
1246  fs/ocfs2/dlm/dlmmaster.c     |  175 +++++++++++++++++++-------------------
1247  fs/ocfs2/dlm/dlmrecovery.c   |  164 ++++++++++++++++++------------------
1248  fs/ocfs2/dlm/dlmthread.c     |   16 ++--
1249  fs/ocfs2/dlmglue.c           |   21 +++--
1250  fs/ocfs2/extent_map.c        |   96 +++++++++++++++++++++
1251  fs/ocfs2/extent_map.h        |    2 +
1252  fs/ocfs2/file.c              |   93 ++++++++++++++++++++-
1253  fs/ocfs2/inode.h             |    3 +
1254  fs/ocfs2/ioctl.c             |    8 +-
1255  fs/ocfs2/journal.c           |   23 +++++-
1256  fs/ocfs2/mmap.c              |   53 +++++------
1257  fs/ocfs2/move_extents.c      |    2 +-
1258  fs/ocfs2/ocfs2.h             |    4 +-
1259  fs/ocfs2/quota_local.c       |   13 ++-
1260  fs/ocfs2/slot_map.c          |    4 +-
1261  fs/ocfs2/stack_o2cb.c        |   71 ++++++++++++++--
1262  fs/ocfs2/super.c             |   23 +++--
1263  fs/ocfs2/xattr.c             |    9 ++-
1264  28 files changed, 932 insertions(+), 524 deletions(-)
1265 Merging omfs/for-next
1266 $ git merge omfs/for-next
1267 Already up-to-date.
1268 Merging squashfs/master
1269 $ git merge squashfs/master
1270 Already up-to-date.
1271 Merging udf/for_next
1272 $ git merge udf/for_next
1273 Already up-to-date.
1274 Merging v9fs/for-next
1275 $ git merge v9fs/for-next
1276 Merge made by recursive.
1277  fs/9p/v9fs_vfs.h           |    6 +-
1278  fs/9p/vfs_dir.c            |    2 +-
1279  fs/9p/vfs_file.c           |   35 +++-
1280  fs/9p/vfs_inode.c          |  140 ++++++++++------
1281  fs/9p/vfs_inode_dotl.c     |   86 ++++++++--
1282  fs/9p/vfs_super.c          |    2 +-
1283  include/net/9p/9p.h        |   40 ++++-
1284  include/net/9p/transport.h |   10 +-
1285  net/9p/client.c            |  391 ++++++++++++++++++++++++++++++++-----------
1286  net/9p/protocol.c          |   46 +-----
1287  net/9p/protocol.h          |    1 +
1288  net/9p/trans_common.c      |   53 ++-----
1289  net/9p/trans_common.h      |   21 +--
1290  net/9p/trans_virtio.c      |  324 ++++++++++++++++++++++---------------
1291  14 files changed, 736 insertions(+), 421 deletions(-)
1292 Merging ubifs/linux-next
1293 $ git merge ubifs/linux-next
1294 Merge made by recursive.
1295  fs/ubifs/debug.h |    6 +++---
1296  1 files changed, 3 insertions(+), 3 deletions(-)
1297 Merging xfs/master
1298 $ git merge xfs/master
1299 Auto-merging fs/xfs/xfs_linux.h
1300 Auto-merging fs/xfs/xfs_quotaops.c
1301 Auto-merging fs/xfs/xfs_trace.c
1302 Merge made by recursive.
1303  fs/xfs/Makefile                       |  119 ++++++++++++++++-----------------
1304  fs/xfs/{linux-2.6 => }/kmem.c         |    0
1305  fs/xfs/{linux-2.6 => }/kmem.h         |    0
1306  fs/xfs/{linux-2.6 => }/mrlock.h       |    0
1307  fs/xfs/{linux-2.6 => }/time.h         |    0
1308  fs/xfs/{support => }/uuid.c           |    0
1309  fs/xfs/{support => }/uuid.h           |    0
1310  fs/xfs/xfs.h                          |    3 +-
1311  fs/xfs/{linux-2.6 => }/xfs_acl.c      |    0
1312  fs/xfs/{linux-2.6 => }/xfs_aops.c     |    0
1313  fs/xfs/{linux-2.6 => }/xfs_aops.h     |    0
1314  fs/xfs/{linux-2.6 => }/xfs_buf.c      |    0
1315  fs/xfs/{linux-2.6 => }/xfs_buf.h      |    0
1316  fs/xfs/{linux-2.6 => }/xfs_discard.c  |    0
1317  fs/xfs/{linux-2.6 => }/xfs_discard.h  |    0
1318  fs/xfs/{quota => }/xfs_dquot.c        |    0
1319  fs/xfs/{quota => }/xfs_dquot.h        |    0
1320  fs/xfs/{quota => }/xfs_dquot_item.c   |    0
1321  fs/xfs/{quota => }/xfs_dquot_item.h   |    0
1322  fs/xfs/{linux-2.6 => }/xfs_export.c   |    0
1323  fs/xfs/{linux-2.6 => }/xfs_export.h   |    0
1324  fs/xfs/{linux-2.6 => }/xfs_file.c     |    0
1325  fs/xfs/{linux-2.6 => }/xfs_fs_subr.c  |    0
1326  fs/xfs/{linux-2.6 => }/xfs_globals.c  |    0
1327  fs/xfs/{linux-2.6 => }/xfs_ioctl.c    |    0
1328  fs/xfs/{linux-2.6 => }/xfs_ioctl.h    |    0
1329  fs/xfs/{linux-2.6 => }/xfs_ioctl32.c  |    0
1330  fs/xfs/{linux-2.6 => }/xfs_ioctl32.h  |    0
1331  fs/xfs/{linux-2.6 => }/xfs_iops.c     |    0
1332  fs/xfs/{linux-2.6 => }/xfs_iops.h     |    0
1333  fs/xfs/{linux-2.6 => }/xfs_linux.h    |   27 ++++----
1334  fs/xfs/{linux-2.6 => }/xfs_message.c  |    0
1335  fs/xfs/{linux-2.6 => }/xfs_message.h  |    0
1336  fs/xfs/{quota => }/xfs_qm.c           |    0
1337  fs/xfs/{quota => }/xfs_qm.h           |    0
1338  fs/xfs/{quota => }/xfs_qm_bhv.c       |    0
1339  fs/xfs/{quota => }/xfs_qm_stats.c     |    0
1340  fs/xfs/{quota => }/xfs_qm_stats.h     |    0
1341  fs/xfs/{quota => }/xfs_qm_syscalls.c  |    0
1342  fs/xfs/{quota => }/xfs_quota_priv.h   |    0
1343  fs/xfs/{linux-2.6 => }/xfs_quotaops.c |    2 +-
1344  fs/xfs/{linux-2.6 => }/xfs_stats.c    |    0
1345  fs/xfs/{linux-2.6 => }/xfs_stats.h    |    0
1346  fs/xfs/{linux-2.6 => }/xfs_super.c    |    0
1347  fs/xfs/{linux-2.6 => }/xfs_super.h    |    0
1348  fs/xfs/{linux-2.6 => }/xfs_sync.c     |    0
1349  fs/xfs/{linux-2.6 => }/xfs_sync.h     |    0
1350  fs/xfs/{linux-2.6 => }/xfs_sysctl.c   |    0
1351  fs/xfs/{linux-2.6 => }/xfs_sysctl.h   |    0
1352  fs/xfs/{linux-2.6 => }/xfs_trace.c    |    4 +-
1353  fs/xfs/{linux-2.6 => }/xfs_trace.h    |    0
1354  fs/xfs/{quota => }/xfs_trans_dquot.c  |    0
1355  fs/xfs/{linux-2.6 => }/xfs_vnode.h    |    0
1356  fs/xfs/{linux-2.6 => }/xfs_xattr.c    |    0
1357  kernel/sysctl_binary.c                |    2 +-
1358  kernel/sysctl_check.c                 |    2 +-
1359  56 files changed, 78 insertions(+), 81 deletions(-)
1360  rename fs/xfs/{linux-2.6 => }/kmem.c (100%)
1361  rename fs/xfs/{linux-2.6 => }/kmem.h (100%)
1362  rename fs/xfs/{linux-2.6 => }/mrlock.h (100%)
1363  rename fs/xfs/{linux-2.6 => }/time.h (100%)
1364  rename fs/xfs/{support => }/uuid.c (100%)
1365  rename fs/xfs/{support => }/uuid.h (100%)
1366  rename fs/xfs/{linux-2.6 => }/xfs_acl.c (100%)
1367  rename fs/xfs/{linux-2.6 => }/xfs_aops.c (100%)
1368  rename fs/xfs/{linux-2.6 => }/xfs_aops.h (100%)
1369  rename fs/xfs/{linux-2.6 => }/xfs_buf.c (100%)
1370  rename fs/xfs/{linux-2.6 => }/xfs_buf.h (100%)
1371  rename fs/xfs/{linux-2.6 => }/xfs_discard.c (100%)
1372  rename fs/xfs/{linux-2.6 => }/xfs_discard.h (100%)
1373  rename fs/xfs/{quota => }/xfs_dquot.c (100%)
1374  rename fs/xfs/{quota => }/xfs_dquot.h (100%)
1375  rename fs/xfs/{quota => }/xfs_dquot_item.c (100%)
1376  rename fs/xfs/{quota => }/xfs_dquot_item.h (100%)
1377  rename fs/xfs/{linux-2.6 => }/xfs_export.c (100%)
1378  rename fs/xfs/{linux-2.6 => }/xfs_export.h (100%)
1379  rename fs/xfs/{linux-2.6 => }/xfs_file.c (100%)
1380  rename fs/xfs/{linux-2.6 => }/xfs_fs_subr.c (100%)
1381  rename fs/xfs/{linux-2.6 => }/xfs_globals.c (100%)
1382  rename fs/xfs/{linux-2.6 => }/xfs_ioctl.c (100%)
1383  rename fs/xfs/{linux-2.6 => }/xfs_ioctl.h (100%)
1384  rename fs/xfs/{linux-2.6 => }/xfs_ioctl32.c (100%)
1385  rename fs/xfs/{linux-2.6 => }/xfs_ioctl32.h (100%)
1386  rename fs/xfs/{linux-2.6 => }/xfs_iops.c (100%)
1387  rename fs/xfs/{linux-2.6 => }/xfs_iops.h (100%)
1388  rename fs/xfs/{linux-2.6 => }/xfs_linux.h (96%)
1389  rename fs/xfs/{linux-2.6 => }/xfs_message.c (100%)
1390  rename fs/xfs/{linux-2.6 => }/xfs_message.h (100%)
1391  rename fs/xfs/{quota => }/xfs_qm.c (100%)
1392  rename fs/xfs/{quota => }/xfs_qm.h (100%)
1393  rename fs/xfs/{quota => }/xfs_qm_bhv.c (100%)
1394  rename fs/xfs/{quota => }/xfs_qm_stats.c (100%)
1395  rename fs/xfs/{quota => }/xfs_qm_stats.h (100%)
1396  rename fs/xfs/{quota => }/xfs_qm_syscalls.c (100%)
1397  rename fs/xfs/{quota => }/xfs_quota_priv.h (100%)
1398  rename fs/xfs/{linux-2.6 => }/xfs_quotaops.c (99%)
1399  rename fs/xfs/{linux-2.6 => }/xfs_stats.c (100%)
1400  rename fs/xfs/{linux-2.6 => }/xfs_stats.h (100%)
1401  rename fs/xfs/{linux-2.6 => }/xfs_super.c (100%)
1402  rename fs/xfs/{linux-2.6 => }/xfs_super.h (100%)
1403  rename fs/xfs/{linux-2.6 => }/xfs_sync.c (100%)
1404  rename fs/xfs/{linux-2.6 => }/xfs_sync.h (100%)
1405  rename fs/xfs/{linux-2.6 => }/xfs_sysctl.c (100%)
1406  rename fs/xfs/{linux-2.6 => }/xfs_sysctl.h (100%)
1407  rename fs/xfs/{linux-2.6 => }/xfs_trace.c (96%)
1408  rename fs/xfs/{linux-2.6 => }/xfs_trace.h (100%)
1409  rename fs/xfs/{quota => }/xfs_trans_dquot.c (100%)
1410  rename fs/xfs/{linux-2.6 => }/xfs_vnode.h (100%)
1411  rename fs/xfs/{linux-2.6 => }/xfs_xattr.c (100%)
1412 Merging vfs/for-next
1413 $ git merge vfs/for-next
1414 Already up-to-date.
1415 Merging vfs-scale/vfs-scale-working
1416 $ git merge vfs-scale/vfs-scale-working
1417 Already up-to-date.
1418 Merging pci/linux-next
1419 $ git merge pci/linux-next
1420 Already up-to-date.
1421 Merging hid/for-next
1422 $ git merge hid/for-next
1423 Merge made by recursive.
1424  .../ABI/testing/sysfs-driver-hid-logitech-lg4ff    |    7 +
1425  drivers/hid/Kconfig                                |   19 +-
1426  drivers/hid/Makefile                               |    2 +-
1427  drivers/hid/hid-apple.c                            |    9 +
1428  drivers/hid/hid-axff.c                             |   36 ++-
1429  drivers/hid/hid-core.c                             |   50 ++-
1430  drivers/hid/hid-debug.c                            |    5 +
1431  drivers/hid/hid-ids.h                              |    7 +
1432  drivers/hid/hid-lg.c                               |   29 +-
1433  drivers/hid/hid-lg.h                               |    4 +-
1434  drivers/hid/hid-lg4ff.c                            |  403 ++++++++++++++++++--
1435  drivers/hid/hid-lgff.c                             |   13 -
1436  drivers/hid/hid-magicmouse.c                       |   56 +++-
1437  drivers/hid/hid-multitouch.c                       |   15 +
1438  drivers/hid/hid-prodikeys.c                        |    8 +-
1439  drivers/hid/hid-sjoy.c                             |   68 ++--
1440  drivers/hid/hid-zydacron.c                         |    4 +-
1441  drivers/hid/usbhid/hid-quirks.c                    |    1 -
1442  include/linux/hid.h                                |    2 +
1443  19 files changed, 615 insertions(+), 123 deletions(-)
1444  create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
1445 Merging quilt/i2c
1446 $ git merge quilt/i2c
1447 Merge made by recursive.
1448  drivers/i2c/busses/Kconfig |    2 +-
1449  1 files changed, 1 insertions(+), 1 deletions(-)
1450 Merging bjdooks-i2c/next-i2c
1451 $ git merge bjdooks-i2c/next-i2c
1452 Already up-to-date.
1453 Merging quilt/jdelvare-hwmon
1454 $ git merge quilt/jdelvare-hwmon
1455 Merge made by recursive.
1456  drivers/hwmon/Kconfig |   15 +++++++++++++--
1457  1 files changed, 13 insertions(+), 2 deletions(-)
1458 Merging hwmon-staging/hwmon-next
1459 $ git merge hwmon-staging/hwmon-next
1460 Merge made by recursive.
1461  drivers/hwmon/i5k_amb.c        |   18 +++++++----
1462  drivers/hwmon/ntc_thermistor.c |    3 +-
1463  drivers/hwmon/w83627ehf.c      |   62 ++++++++++++++++++++++++++++++++++++++++
1464  3 files changed, 74 insertions(+), 9 deletions(-)
1465 Merging quilt/kernel-doc
1466 $ git merge quilt/kernel-doc
1467 Merge made by recursive.
1468  Documentation/cgroups/cgroups.txt |    4 ++--
1469  1 files changed, 2 insertions(+), 2 deletions(-)
1470 Merging docs/docs-move
1471 $ git merge docs/docs-move
1472 Already up-to-date.
1473 Merging v4l-dvb/master
1474 $ git merge v4l-dvb/master
1475 Already up-to-date.
1476 Merging kbuild/for-next
1477 $ git merge kbuild/for-next
1478 Merge made by recursive.
1479  scripts/kconfig/Makefile             |   28 ++--------------------------
1480  scripts/kconfig/menu.c               |   13 +++++--------
1481  scripts/kconfig/nconf.c              |    2 --
1482  scripts/kconfig/streamline_config.pl |   22 +++++++++++++++++++---
1483  4 files changed, 26 insertions(+), 39 deletions(-)
1484 Merging kconfig/for-next
1485 $ git merge kconfig/for-next
1486 Already up-to-date!
1487 Merge made by recursive.
1488 Merging ide/master
1489 $ git merge ide/master
1490 Already up-to-date.
1491 Merging libata/NEXT
1492 $ git merge libata/NEXT
1493 Merge made by recursive.
1494  drivers/ata/libata-eh.c  |    5 ++---
1495  drivers/ata/sata_sil24.c |    4 ++--
1496  2 files changed, 4 insertions(+), 5 deletions(-)
1497 Merging infiniband/for-next
1498 $ git merge infiniband/for-next
1499 Already up-to-date.
1500 Merging acpi/test
1501 $ git merge acpi/test
1502 Auto-merging Documentation/kernel-parameters.txt
1503 Merge made by recursive.
1504  Documentation/kernel-parameters.txt |    9 ++++++---
1505  drivers/acpi/acpica/hwxface.c       |    3 +--
1506  drivers/acpi/apei/Kconfig           |    1 +
1507  drivers/acpi/apei/apei-base.c       |    2 +-
1508  drivers/acpi/reboot.c               |    3 +--
1509  drivers/acpi/scan.c                 |    3 +--
1510  6 files changed, 11 insertions(+), 10 deletions(-)
1511 Merging idle-test/idle-test
1512 $ git merge idle-test/idle-test
1513 Already up-to-date.
1514 Merging powertools/tools-test
1515 $ git merge powertools/tools-test
1516 Already up-to-date.
1517 Merging cpupowerutils/master
1518 $ git merge cpupowerutils/master
1519 Removing tools/power/cpupower/debug/x86_64/centrino-decode.c
1520 Removing tools/power/cpupower/debug/x86_64/powernow-k8-decode.c
1521 Merge made by recursive.
1522  tools/power/cpupower/Makefile                      |    7 +-
1523  tools/power/cpupower/debug/x86_64/Makefile         |    8 +-
1524  .../power/cpupower/debug/x86_64/centrino-decode.c  |    1 -
1525  .../cpupower/debug/x86_64/powernow-k8-decode.c     |    1 -
1526  tools/power/cpupower/man/cpupower-frequency-info.1 |    6 +-
1527  tools/power/cpupower/man/cpupower-frequency-set.1  |    8 +-
1528  tools/power/cpupower/man/cpupower.1                |   14 +-
1529  tools/power/cpupower/utils/builtin.h               |    7 -
1530  tools/power/cpupower/utils/cpufreq-info.c          |   42 +-----
1531  tools/power/cpupower/utils/cpufreq-set.c           |   29 +---
1532  tools/power/cpupower/utils/cpuidle-info.c          |   24 +---
1533  tools/power/cpupower/utils/cpupower-info.c         |   20 +--
1534  tools/power/cpupower/utils/cpupower-set.c          |   25 +---
1535  tools/power/cpupower/utils/cpupower.c              |   91 ++++++-----
1536  tools/power/cpupower/utils/helpers/helpers.h       |   12 ++
1537  tools/power/cpupower/utils/helpers/sysfs.c         |   50 ++++++
1538  tools/power/cpupower/utils/helpers/sysfs.h         |    2 +
1539  tools/power/cpupower/utils/helpers/topology.c      |    5 +-
1540  .../cpupower/utils/idle_monitor/cpuidle_sysfs.c    |    2 +-
1541  .../cpupower/utils/idle_monitor/cpupower-monitor.c |   66 ++++----
1542  .../cpupower/utils/idle_monitor/mperf_monitor.c    |  177 ++++++++++++++-----
1543  21 files changed, 308 insertions(+), 289 deletions(-)
1544  delete mode 120000 tools/power/cpupower/debug/x86_64/centrino-decode.c
1545  delete mode 120000 tools/power/cpupower/debug/x86_64/powernow-k8-decode.c
1546 Merging ieee1394/for-next
1547 $ git merge ieee1394/for-next
1548 Merge made by recursive.
1549  drivers/firewire/sbp2.c |    4 ++++
1550  1 files changed, 4 insertions(+), 0 deletions(-)
1551 Merging ubi/linux-next
1552 $ git merge ubi/linux-next
1553 Already up-to-date.
1554 Merging dlm/next
1555 $ git merge dlm/next
1556 Already up-to-date.
1557 Merging swiotlb/master
1558 $ git merge swiotlb/master
1559 Merge made by recursive.
1560 Merging ibft/master
1561 $ git merge ibft/master
1562 Merge made by recursive.
1563 Merging scsi/master
1564 $ git merge scsi/master
1565 Already up-to-date.
1566 Merging iscsi-target/for-next
1567 $ git merge iscsi-target/for-next
1568 Already up-to-date.
1569 Merging slave-dma/next
1570 $ git merge slave-dma/next
1571 Merge made by recursive.
1572  drivers/dma/at_hdmac.c      |  159 +++++++++++++++++++++++++++++++++---------
1573  drivers/dma/at_hdmac_regs.h |   24 +++++++
1574  drivers/dma/dmatest.c       |    6 ++
1575  drivers/dma/mxs-dma.c       |   45 +++++++------
1576  include/linux/dmaengine.h   |   13 +++-
1577  5 files changed, 190 insertions(+), 57 deletions(-)
1578 Merging async_tx/next
1579 $ git merge async_tx/next
1580 Already up-to-date.
1581 Merging net/master
1582 $ git merge net/master
1583 Auto-merging MAINTAINERS
1584 Auto-merging arch/mips/Kconfig
1585 Auto-merging arch/powerpc/Kconfig
1586 CONFLICT (delete/modify): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net/master. Version net/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
1587 Auto-merging arch/powerpc/configs/ppc40x_defconfig
1588 Auto-merging arch/powerpc/platforms/40x/Kconfig
1589 Auto-merging drivers/bcma/main.c
1590 Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c
1591 Auto-merging drivers/net/Kconfig
1592 CONFLICT (content): Merge conflict in drivers/net/Kconfig
1593 Auto-merging drivers/net/Makefile
1594 CONFLICT (content): Merge conflict in drivers/net/Makefile
1595 Removing drivers/net/arm/Kconfig
1596 Removing drivers/net/arm/Makefile
1597 Removing drivers/net/benet/Kconfig
1598 Removing drivers/net/bna/bfi_ctreg.h
1599 Removing drivers/net/bna/bfi_ll.h
1600 Removing drivers/net/bna/bna_ctrl.c
1601 Removing drivers/net/bna/bna_hw.h
1602 Removing drivers/net/bna/bna_txrx.c
1603 Auto-merging drivers/net/cris/eth_v10.c
1604 Auto-merging drivers/net/ethernet/3com/3c501.c
1605 Auto-merging drivers/net/ethernet/3com/3c509.c
1606 Auto-merging drivers/net/ethernet/3com/3c515.c
1607 Auto-merging drivers/net/ethernet/3com/3c574_cs.c
1608 Auto-merging drivers/net/ethernet/3com/3c589_cs.c
1609 Auto-merging drivers/net/ethernet/3com/3c59x.c
1610 Auto-merging drivers/net/ethernet/3com/typhoon.c
1611 Auto-merging drivers/net/ethernet/8390/3c503.c
1612 Auto-merging drivers/net/ethernet/8390/8390.c
1613 Auto-merging drivers/net/ethernet/8390/8390p.c
1614 Auto-merging drivers/net/ethernet/8390/ac3200.c
1615 Auto-merging drivers/net/ethernet/8390/ax88796.c
1616 Auto-merging drivers/net/ethernet/8390/axnet_cs.c
1617 Auto-merging drivers/net/ethernet/8390/e2100.c
1618 Auto-merging drivers/net/ethernet/8390/etherh.c
1619 Auto-merging drivers/net/ethernet/8390/hp-plus.c
1620 Auto-merging drivers/net/ethernet/8390/hydra.c
1621 Auto-merging drivers/net/ethernet/8390/mac8390.c
1622 Auto-merging drivers/net/ethernet/8390/ne-h8300.c
1623 Auto-merging drivers/net/ethernet/8390/ne2k-pci.c
1624 Auto-merging drivers/net/ethernet/8390/pcnet_cs.c
1625 Auto-merging drivers/net/ethernet/8390/smc-mca.c
1626 Auto-merging drivers/net/ethernet/8390/smc-ultra.c
1627 Auto-merging drivers/net/ethernet/8390/smc-ultra32.c
1628 Auto-merging drivers/net/ethernet/8390/wd.c
1629 Auto-merging drivers/net/ethernet/8390/zorro8390.c
1630 Auto-merging drivers/net/ethernet/adaptec/starfire.c
1631 Auto-merging drivers/net/ethernet/adi/bfin_mac.c
1632 Auto-merging drivers/net/ethernet/aeroflex/greth.c
1633 Auto-merging drivers/net/ethernet/alteon/acenic.c
1634 Auto-merging drivers/net/ethernet/amd/a2065.c
1635 Auto-merging drivers/net/ethernet/amd/am79c961a.c
1636 Auto-merging drivers/net/ethernet/amd/amd8111e.c
1637 Auto-merging drivers/net/ethernet/amd/ariadne.c
1638 Auto-merging drivers/net/ethernet/amd/atarilance.c
1639 Auto-merging drivers/net/ethernet/amd/au1000_eth.c
1640 Auto-merging drivers/net/ethernet/amd/declance.c
1641 Auto-merging drivers/net/ethernet/amd/depca.c
1642 Auto-merging drivers/net/ethernet/amd/hplance.c
1643 Auto-merging drivers/net/ethernet/amd/lance.c
1644 Auto-merging drivers/net/ethernet/amd/mvme147.c
1645 Auto-merging drivers/net/ethernet/amd/ni65.c
1646 Auto-merging drivers/net/ethernet/amd/nmclan_cs.c
1647 Auto-merging drivers/net/ethernet/amd/pcnet32.c
1648 Auto-merging drivers/net/ethernet/amd/sun3lance.c
1649 Auto-merging drivers/net/ethernet/amd/sunlance.c
1650 Auto-merging drivers/net/ethernet/apple/bmac.c
1651 Auto-merging drivers/net/ethernet/apple/cs89x0.c
1652 Auto-merging drivers/net/ethernet/apple/mac89x0.c
1653 Auto-merging drivers/net/ethernet/apple/mace.c
1654 Auto-merging drivers/net/ethernet/apple/macmace.c
1655 Auto-merging drivers/net/ethernet/atheros/atl1c/atl1c_main.c
1656 Auto-merging drivers/net/ethernet/atheros/atl1e/atl1e_main.c
1657 Auto-merging drivers/net/ethernet/atheros/atlx/atl1.c
1658 Auto-merging drivers/net/ethernet/atheros/atlx/atl2.c
1659 Auto-merging drivers/net/ethernet/broadcom/b44.c
1660 Auto-merging drivers/net/ethernet/broadcom/bcm63xx_enet.c
1661 Auto-merging drivers/net/ethernet/broadcom/bnx2.c
1662 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
1663 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
1664 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
1665 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
1666 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
1667 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
1668 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
1669 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
1670 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
1671 Auto-merging drivers/net/ethernet/broadcom/cnic.c
1672 Auto-merging drivers/net/ethernet/broadcom/sb1250-mac.c
1673 Auto-merging drivers/net/ethernet/broadcom/tg3.c
1674 Auto-merging drivers/net/ethernet/broadcom/tg3.h
1675 Auto-merging drivers/net/ethernet/brocade/bna/Makefile
1676 Auto-merging drivers/net/ethernet/brocade/bna/bfa_cee.c
1677 Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs.h
1678 Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
1679 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.c
1680 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.h
1681 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
1682 Auto-merging drivers/net/ethernet/brocade/bna/bfi.h
1683 Auto-merging drivers/net/ethernet/brocade/bna/bna.h
1684 Auto-merging drivers/net/ethernet/brocade/bna/bna_types.h
1685 Auto-merging drivers/net/ethernet/brocade/bna/bnad.c
1686 Auto-merging drivers/net/ethernet/brocade/bna/bnad.h
1687 Auto-merging drivers/net/ethernet/brocade/bna/bnad_ethtool.c
1688 Auto-merging drivers/net/ethernet/brocade/bna/cna.h
1689 Auto-merging drivers/net/ethernet/cadence/at91_ether.c
1690 Auto-merging drivers/net/ethernet/cadence/macb.c
1691 Auto-merging drivers/net/ethernet/chelsio/cxgb/cxgb2.c
1692 Auto-merging drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
1693 Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
1694 Auto-merging drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
1695 Auto-merging drivers/net/ethernet/cisco/enic/enic_main.c
1696 Auto-merging drivers/net/ethernet/davicom/dm9000.c
1697 Auto-merging drivers/net/ethernet/dec/ewrk3.c
1698 Auto-merging drivers/net/ethernet/dec/tulip/Kconfig
1699 Auto-merging drivers/net/ethernet/dec/tulip/de2104x.c
1700 Auto-merging drivers/net/ethernet/dec/tulip/de4x5.c
1701 Auto-merging drivers/net/ethernet/dec/tulip/dmfe.c
1702 Auto-merging drivers/net/ethernet/dec/tulip/tulip_core.c
1703 Auto-merging drivers/net/ethernet/dec/tulip/uli526x.c
1704 Auto-merging drivers/net/ethernet/dec/tulip/winbond-840.c
1705 Auto-merging drivers/net/ethernet/dlink/de620.c
1706 Auto-merging drivers/net/ethernet/dlink/dl2k.c
1707 Auto-merging drivers/net/ethernet/dlink/sundance.c
1708 Auto-merging drivers/net/ethernet/emulex/benet/be.h
1709 Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.c
1710 Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.h
1711 Auto-merging drivers/net/ethernet/emulex/benet/be_ethtool.c
1712 Auto-merging drivers/net/ethernet/emulex/benet/be_hw.h
1713 Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
1714 Auto-merging drivers/net/ethernet/ethoc.c
1715 Auto-merging drivers/net/ethernet/fealnx.c
1716 Auto-merging drivers/net/ethernet/freescale/fec.c
1717 Auto-merging drivers/net/ethernet/freescale/fec_mpc52xx.c
1718 Auto-merging drivers/net/ethernet/freescale/fs_enet/Kconfig
1719 Auto-merging drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
1720 Auto-merging drivers/net/ethernet/freescale/gianfar.c
1721 Auto-merging drivers/net/ethernet/freescale/ucc_geth.c
1722 Auto-merging drivers/net/ethernet/fujitsu/at1700.c
1723 Auto-merging drivers/net/ethernet/fujitsu/eth16i.c
1724 Auto-merging drivers/net/ethernet/fujitsu/fmvj18x_cs.c
1725 Auto-merging drivers/net/ethernet/hp/hp100.c
1726 Auto-merging drivers/net/ethernet/i825xx/3c505.c
1727 Auto-merging drivers/net/ethernet/i825xx/3c523.c
1728 Auto-merging drivers/net/ethernet/i825xx/3c527.c
1729 Auto-merging drivers/net/ethernet/i825xx/82596.c
1730 Auto-merging drivers/net/ethernet/i825xx/eepro.c
1731 Auto-merging drivers/net/ethernet/i825xx/eexpress.c
1732 Auto-merging drivers/net/ethernet/i825xx/ether1.c
1733 Auto-merging drivers/net/ethernet/i825xx/lib82596.c
1734 Auto-merging drivers/net/ethernet/i825xx/lp486e.c
1735 Auto-merging drivers/net/ethernet/i825xx/ni52.c
1736 Auto-merging drivers/net/ethernet/i825xx/sun3_82586.c
1737 Auto-merging drivers/net/ethernet/i825xx/znet.c
1738 Auto-merging drivers/net/ethernet/ibm/ehea/ehea_main.c
1739 Auto-merging drivers/net/ethernet/ibm/emac/Kconfig
1740 Auto-merging drivers/net/ethernet/ibm/emac/core.c
1741 Auto-merging drivers/net/ethernet/ibm/emac/core.h
1742 Auto-merging drivers/net/ethernet/ibm/emac/debug.h
1743 Auto-merging drivers/net/ethernet/ibm/emac/mal.c
1744 Auto-merging drivers/net/ethernet/ibm/emac/mal.h
1745 Auto-merging drivers/net/ethernet/ibm/emac/rgmii.h
1746 Auto-merging drivers/net/ethernet/ibm/emac/tah.h
1747 Auto-merging drivers/net/ethernet/ibm/emac/zmii.h
1748 Auto-merging drivers/net/ethernet/ibm/ibmveth.c
1749 Auto-merging drivers/net/ethernet/ibm/iseries_veth.c
1750 Auto-merging drivers/net/ethernet/icplus/ipg.c
1751 Auto-merging drivers/net/ethernet/intel/e100.c
1752 Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c
1753 Auto-merging drivers/net/ethernet/intel/e1000e/Makefile
1754 Auto-merging drivers/net/ethernet/intel/e1000e/e1000.h
1755 Auto-merging drivers/net/ethernet/intel/e1000e/ethtool.c
1756 Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
1757 Auto-merging drivers/net/ethernet/intel/igb/igb_main.c
1758 Auto-merging drivers/net/ethernet/intel/igbvf/netdev.c
1759 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_main.c
1760 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe.h
1761 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
1762 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
1763 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
1764 Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
1765 Auto-merging drivers/net/ethernet/jme.c
1766 Auto-merging drivers/net/ethernet/korina.c
1767 Auto-merging drivers/net/ethernet/lantiq_etop.c
1768 Auto-merging drivers/net/ethernet/marvell/mv643xx_eth.c
1769 Auto-merging drivers/net/ethernet/marvell/skge.c
1770 Auto-merging drivers/net/ethernet/marvell/sky2.c
1771 Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c
1772 Auto-merging drivers/net/ethernet/micrel/ks8695net.c
1773 Auto-merging drivers/net/ethernet/microchip/enc28j60.c
1774 Auto-merging drivers/net/ethernet/mipsnet.c
1775 Auto-merging drivers/net/ethernet/myricom/myri10ge/myri10ge.c
1776 Auto-merging drivers/net/ethernet/natsemi/ibmlana.c
1777 Auto-merging drivers/net/ethernet/natsemi/jazzsonic.c
1778 Auto-merging drivers/net/ethernet/natsemi/macsonic.c
1779 Auto-merging drivers/net/ethernet/natsemi/natsemi.c
1780 Auto-merging drivers/net/ethernet/natsemi/ns83820.c
1781 Auto-merging drivers/net/ethernet/natsemi/xtsonic.c
1782 Auto-merging drivers/net/ethernet/neterion/s2io.c
1783 Auto-merging drivers/net/ethernet/neterion/vxge/vxge-main.c
1784 Auto-merging drivers/net/ethernet/netx-eth.c
1785 Auto-merging drivers/net/ethernet/nuvoton/w90p910_ether.c
1786 Auto-merging drivers/net/ethernet/nvidia/forcedeth.c
1787 Auto-merging drivers/net/ethernet/octeon/Kconfig
1788 Auto-merging drivers/net/ethernet/octeon/octeon_mgmt.c
1789 Auto-merging drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
1790 Auto-merging drivers/net/ethernet/packetengines/hamachi.c
1791 Auto-merging drivers/net/ethernet/packetengines/yellowfin.c
1792 Auto-merging drivers/net/ethernet/pasemi/pasemi_mac.c
1793 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic.h
1794 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
1795 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
1796 Auto-merging drivers/net/ethernet/qlogic/qla3xxx.c
1797 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
1798 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
1799 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
1800 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
1801 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
1802 Auto-merging drivers/net/ethernet/qlogic/qlge/qlge_main.c
1803 Auto-merging drivers/net/ethernet/racal/ni5010.c
1804 Auto-merging drivers/net/ethernet/rdc/r6040.c
1805 Auto-merging drivers/net/ethernet/realtek/8139cp.c
1806 Auto-merging drivers/net/ethernet/realtek/8139too.c
1807 Auto-merging drivers/net/ethernet/realtek/atp.c
1808 Auto-merging drivers/net/ethernet/realtek/r8169.c
1809 Auto-merging drivers/net/ethernet/realtek/sc92031.c
1810 Auto-merging drivers/net/ethernet/renesas/sh_eth.c
1811 Auto-merging drivers/net/ethernet/seeq/ether3.c
1812 Auto-merging drivers/net/ethernet/seeq/seeq8005.c
1813 Auto-merging drivers/net/ethernet/seeq/sgiseeq.c
1814 Auto-merging drivers/net/ethernet/sfc/Kconfig
1815 Auto-merging drivers/net/ethernet/sfc/efx.c
1816 Auto-merging drivers/net/ethernet/sgi/ioc3-eth.c
1817 Auto-merging drivers/net/ethernet/sis/sis190.c
1818 Auto-merging drivers/net/ethernet/sis/sis900.c
1819 Auto-merging drivers/net/ethernet/smsc/epic100.c
1820 Auto-merging drivers/net/ethernet/smsc/smc911x.c
1821 Auto-merging drivers/net/ethernet/smsc/smc9194.c
1822 Auto-merging drivers/net/ethernet/smsc/smc91c92_cs.c
1823 Auto-merging drivers/net/ethernet/smsc/smc91x.c
1824 Auto-merging drivers/net/ethernet/smsc/smsc911x.c
1825 Auto-merging drivers/net/ethernet/smsc/smsc9420.c
1826 Auto-merging drivers/net/ethernet/stmicro/stmmac/Kconfig
1827 Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
1828 Auto-merging drivers/net/ethernet/sun/cassini.c
1829 Auto-merging drivers/net/ethernet/sun/niu.c
1830 Auto-merging drivers/net/ethernet/sun/sunbmac.c
1831 Auto-merging drivers/net/ethernet/sun/sungem.c
1832 Auto-merging drivers/net/ethernet/sun/sunhme.c
1833 Auto-merging drivers/net/ethernet/sun/sunqe.c
1834 Auto-merging drivers/net/ethernet/sun/sunvnet.c
1835 Auto-merging drivers/net/ethernet/tehuti/tehuti.c
1836 Auto-merging drivers/net/ethernet/ti/cpmac.c
1837 Auto-merging drivers/net/ethernet/ti/davinci_emac.c
1838 Auto-merging drivers/net/ethernet/ti/tlan.c
1839 Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_net.c
1840 Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
1841 Auto-merging drivers/net/ethernet/toshiba/spider_net.c
1842 Auto-merging drivers/net/ethernet/toshiba/spider_net.h
1843 Auto-merging drivers/net/ethernet/toshiba/tc35815.c
1844 Auto-merging drivers/net/ethernet/tundra/tsi108_eth.c
1845 Auto-merging drivers/net/ethernet/via/via-rhine.c
1846 Auto-merging drivers/net/ethernet/via/via-velocity.c
1847 Auto-merging drivers/net/ethernet/xilinx/ll_temac_main.c
1848 Auto-merging drivers/net/ethernet/xircom/xirc2ps_cs.c
1849 Auto-merging drivers/net/ethernet/xscale/ixp2000/Kconfig
1850 Auto-merging drivers/net/ethernet/xscale/ixp4xx_eth.c
1851 Removing drivers/net/ibm_newemac/Makefile
1852 Removing drivers/net/octeon/Makefile
1853 Removing drivers/net/pci-skeleton.c
1854 Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
1855 Removing drivers/staging/ath6kl/Kconfig
1856 Removing drivers/staging/ath6kl/Makefile
1857 Removing drivers/staging/ath6kl/TODO
1858 Removing drivers/staging/ath6kl/bmi/include/bmi_internal.h
1859 Removing drivers/staging/ath6kl/bmi/src/bmi.c
1860 Removing drivers/staging/ath6kl/hif/common/hif_sdio_common.h
1861 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
1862 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
1863 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
1864 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.c
1865 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.h
1866 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
1867 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
1868 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
1869 Removing drivers/staging/ath6kl/htc2/htc.c
1870 Removing drivers/staging/ath6kl/htc2/htc_debug.h
1871 Removing drivers/staging/ath6kl/htc2/htc_internal.h
1872 Removing drivers/staging/ath6kl/htc2/htc_recv.c
1873 Removing drivers/staging/ath6kl/htc2/htc_send.c
1874 Removing drivers/staging/ath6kl/htc2/htc_services.c
1875 Removing drivers/staging/ath6kl/include/a_config.h
1876 Removing drivers/staging/ath6kl/include/a_debug.h
1877 Removing drivers/staging/ath6kl/include/a_drv.h
1878 Removing drivers/staging/ath6kl/include/a_drv_api.h
1879 Removing drivers/staging/ath6kl/include/a_osapi.h
1880 Removing drivers/staging/ath6kl/include/aggr_recv_api.h
1881 Removing drivers/staging/ath6kl/include/ar3kconfig.h
1882 Removing drivers/staging/ath6kl/include/ar6000_api.h
1883 Removing drivers/staging/ath6kl/include/ar6000_diag.h
1884 Removing drivers/staging/ath6kl/include/ar6kap_common.h
1885 Removing drivers/staging/ath6kl/include/athbtfilter.h
1886 Removing drivers/staging/ath6kl/include/bmi.h
1887 Removing drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
1888 Removing drivers/staging/ath6kl/include/common/AR6002/addrs.h
1889 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
1890 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
1891 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
1892 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
1893 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
1894 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
1895 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
1896 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
1897 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
1898 Removing drivers/staging/ath6kl/include/common/athdefs.h
1899 Removing drivers/staging/ath6kl/include/common/bmi_msg.h
1900 Removing drivers/staging/ath6kl/include/common/cnxmgmt.h
1901 Removing drivers/staging/ath6kl/include/common/dbglog.h
1902 Removing drivers/staging/ath6kl/include/common/dbglog_id.h
1903 Removing drivers/staging/ath6kl/include/common/discovery.h
1904 Removing drivers/staging/ath6kl/include/common/epping_test.h
1905 Removing drivers/staging/ath6kl/include/common/gmboxif.h
1906 Removing drivers/staging/ath6kl/include/common/gpio_reg.h
1907 Removing drivers/staging/ath6kl/include/common/htc.h
1908 Removing drivers/staging/ath6kl/include/common/htc_services.h
1909 Removing drivers/staging/ath6kl/include/common/pkt_log.h
1910 Removing drivers/staging/ath6kl/include/common/roaming.h
1911 Removing drivers/staging/ath6kl/include/common/targaddrs.h
1912 Removing drivers/staging/ath6kl/include/common/testcmd.h
1913 Removing drivers/staging/ath6kl/include/common/tlpm.h
1914 Removing drivers/staging/ath6kl/include/common/wlan_defs.h
1915 Removing drivers/staging/ath6kl/include/common/wmi.h
1916 Removing drivers/staging/ath6kl/include/common/wmix.h
1917 Removing drivers/staging/ath6kl/include/common_drv.h
1918 Removing drivers/staging/ath6kl/include/dbglog_api.h
1919 Removing drivers/staging/ath6kl/include/dl_list.h
1920 Removing drivers/staging/ath6kl/include/dset_api.h
1921 Removing drivers/staging/ath6kl/include/hci_transport_api.h
1922 Removing drivers/staging/ath6kl/include/hif.h
1923 Removing drivers/staging/ath6kl/include/host_version.h
1924 Removing drivers/staging/ath6kl/include/htc_api.h
1925 Removing drivers/staging/ath6kl/include/htc_packet.h
1926 Removing drivers/staging/ath6kl/include/wlan_api.h
1927 Removing drivers/staging/ath6kl/include/wmi_api.h
1928 Removing drivers/staging/ath6kl/miscdrv/ar3kconfig.c
1929 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
1930 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
1931 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
1932 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
1933 Removing drivers/staging/ath6kl/miscdrv/common_drv.c
1934 Removing drivers/staging/ath6kl/miscdrv/credit_dist.c
1935 Removing drivers/staging/ath6kl/miscdrv/miscdrv.h
1936 Removing drivers/staging/ath6kl/os/linux/ar6000_drv.c
1937 Removing drivers/staging/ath6kl/os/linux/ar6000_pm.c
1938 Removing drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
1939 Removing drivers/staging/ath6kl/os/linux/cfg80211.c
1940 Removing drivers/staging/ath6kl/os/linux/export_hci_transport.c
1941 Removing drivers/staging/ath6kl/os/linux/hci_bridge.c
1942 Removing drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
1943 Removing drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
1944 Removing drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
1945 Removing drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
1946 Removing drivers/staging/ath6kl/os/linux/include/cfg80211.h
1947 Removing drivers/staging/ath6kl/os/linux/include/config_linux.h
1948 Removing drivers/staging/ath6kl/os/linux/include/debug_linux.h
1949 Removing drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
1950 Removing drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
1951 Removing drivers/staging/ath6kl/os/linux/include/osapi_linux.h
1952 Removing drivers/staging/ath6kl/os/linux/include/wlan_config.h
1953 Removing drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
1954 Removing drivers/staging/ath6kl/os/linux/netbuf.c
1955 Removing drivers/staging/ath6kl/reorder/aggr_rx_internal.h
1956 Removing drivers/staging/ath6kl/reorder/rcv_aggr.c
1957 Removing drivers/staging/ath6kl/wlan/include/ieee80211.h
1958 Removing drivers/staging/ath6kl/wlan/include/ieee80211_node.h
1959 Removing drivers/staging/ath6kl/wlan/src/wlan_node.c
1960 Removing drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
1961 Removing drivers/staging/ath6kl/wlan/src/wlan_utils.c
1962 Removing drivers/staging/ath6kl/wmi/wmi.c
1963 Removing drivers/staging/ath6kl/wmi/wmi_host.h
1964 Auto-merging include/linux/sungem_phy.h
1965 Auto-merging include/net/cfg80211.h
1966 Auto-merging net/mac8021Resolved 'drivers/net/Kconfig' using previous resolution.
1967 Resolved 'drivers/net/Makefile' using previous resolution.
1968 1/main.c
1969 Automatic merge failed; fix conflicts and then commit the result.
1970 $ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
1971 arch/powerpc/configs/40x/hcu4_defconfig: needs merge
1972 drivers/net/Kconfig: needs merge
1973 drivers/net/Makefile: needs merge
1974 rm 'arch/powerpc/configs/40x/hcu4_defconfig'
1975 $ git commit -v -a
1976 [master 48a78f2] Merge remote-tracking branch 'net/master'
1977 $ git diff -M --stat --summary HEAD^..
1978  .../devicetree/bindings/net/can/fsl-flexcan.txt    |   63 +-
1979  Documentation/devicetree/bindings/net/smsc911x.txt |   38 +
1980  Documentation/networking/netdevices.txt            |    4 +-
1981  MAINTAINERS                                        |  164 +-
1982  arch/ia64/hp/sim/simeth.c                          |    2 +-
1983  arch/mips/Kconfig                                  |    8 +-
1984  arch/mips/bcm47xx/Kconfig                          |   31 +
1985  arch/mips/bcm47xx/Makefile                         |    3 +-
1986  arch/mips/bcm47xx/gpio.c                           |   82 +-
1987  arch/mips/bcm47xx/irq.c                            |   12 +
1988  arch/mips/bcm47xx/nvram.c                          |   29 +-
1989  arch/mips/bcm47xx/serial.c                         |   46 +-
1990  arch/mips/bcm47xx/setup.c                          |   90 +-
1991  arch/mips/bcm47xx/time.c                           |   16 +-
1992  arch/mips/bcm47xx/wgt634u.c                        |   14 +-
1993  arch/mips/include/asm/mach-bcm47xx/bcm47xx.h       |   26 +-
1994  arch/mips/include/asm/mach-bcm47xx/gpio.h          |  108 +-
1995  arch/mips/pci/pci-bcm47xx.c                        |    6 +
1996  arch/powerpc/Kconfig                               |    2 +
1997  arch/powerpc/boot/dts/p1010rdb.dts                 |   10 +-
1998  arch/powerpc/boot/dts/p1010si.dtsi                 |   10 +-
1999  arch/powerpc/configs/40x/acadia_defconfig          |   11 +-
2000  arch/powerpc/configs/40x/ep405_defconfig           |    5 +-
2001  arch/powerpc/configs/40x/kilauea_defconfig         |    9 +-
2002  arch/powerpc/configs/40x/makalu_defconfig          |    9 +-
2003  arch/powerpc/configs/40x/walnut_defconfig          |    5 +-
2004  arch/powerpc/configs/44x/arches_defconfig          |    9 +-
2005  arch/powerpc/configs/44x/bamboo_defconfig          |    5 +-
2006  arch/powerpc/configs/44x/bluestone_defconfig       |    9 +-
2007  arch/powerpc/configs/44x/canyonlands_defconfig     |    9 +-
2008  arch/powerpc/configs/44x/ebony_defconfig           |    5 +-
2009  arch/powerpc/configs/44x/eiger_defconfig           |    9 +-
2010  arch/powerpc/configs/44x/icon_defconfig            |    5 +-
2011  arch/powerpc/configs/44x/katmai_defconfig          |    5 +-
2012  arch/powerpc/configs/44x/redwood_defconfig         |   11 +-
2013  arch/powerpc/configs/44x/sam440ep_defconfig        |    5 +-
2014  arch/powerpc/configs/44x/sequoia_defconfig         |    5 +-
2015  arch/powerpc/configs/44x/taishan_defconfig         |    5 +-
2016  arch/powerpc/configs/44x/warp_defconfig            |    5 +-
2017  arch/powerpc/configs/ppc40x_defconfig              |    5 +-
2018  arch/powerpc/configs/ppc44x_defconfig              |    5 +-
2019  arch/powerpc/platforms/40x/Kconfig                 |   12 +-
2020  arch/powerpc/platforms/44x/Kconfig                 |   54 +-
2021  arch/powerpc/platforms/cell/Kconfig                |    8 +-
2022  arch/s390/include/asm/qdio.h                       |   78 +-
2023  arch/um/drivers/net_kern.c                         |    2 +-
2024  arch/xtensa/platforms/iss/network.c                |    2 +-
2025  drivers/bcma/Kconfig                               |   13 +
2026  drivers/bcma/Makefile                              |    2 +
2027  drivers/bcma/bcma_private.h                        |   16 +
2028  drivers/bcma/core.c                                |    2 +
2029  drivers/bcma/driver_chipcommon.c                   |   53 +
2030  drivers/bcma/driver_chipcommon_pmu.c               |  133 +
2031  drivers/bcma/driver_mips.c                         |  256 +
2032  drivers/bcma/driver_pci.c                          |   16 +-
2033  drivers/bcma/host_soc.c                            |  183 +
2034  drivers/bcma/main.c                                |   70 +-
2035  drivers/bcma/scan.c                                |  348 +-
2036  drivers/infiniband/hw/cxgb3/Makefile               |    2 +-
2037  drivers/infiniband/hw/cxgb4/Makefile               |    2 +-
2038  drivers/infiniband/hw/mlx4/Kconfig                 |    3 +-
2039  drivers/infiniband/hw/nes/nes_nic.c                |    2 +-
2040  drivers/infiniband/ulp/ipoib/ipoib_main.c          |    2 +-
2041  drivers/media/dvb/dvb-core/dvb_net.c               |    2 +-
2042  drivers/net/Kconfig                                | 2826 +---------
2043  drivers/net/Makefile                               |  235 +-
2044  drivers/net/appletalk/cops.c                       |    2 +-
2045  drivers/net/appletalk/ltpc.c                       |    2 +-
2046  drivers/net/arcnet/com20020.c                      |    2 +-
2047  drivers/net/arm/Kconfig                            |   74 -
2048  drivers/net/arm/Makefile                           |   14 -
2049  drivers/net/benet/Kconfig                          |    6 -
2050  drivers/net/bna/bfi_ctreg.h                        |  646 --
2051  drivers/net/bna/bfi_ll.h                           |  438 --
2052  drivers/net/bna/bna_ctrl.c                         | 3076 ----------
2053  drivers/net/bna/bna_hw.h                           | 1490 -----
2054  drivers/net/bna/bna_txrx.c                         | 4185 -------------
2055  drivers/net/bonding/bond_main.c                    |   55 +-
2056  drivers/net/bonding/bonding.h                      |    1 -
2057  drivers/net/can/flexcan.c                          |  189 +-
2058  drivers/net/can/mscan/mscan.c                      |   26 +-
2059  drivers/net/cris/eth_v10.c                         |    2 +-
2060  drivers/net/defxx.c                                |    2 +-
2061  drivers/net/dummy.c                                |    2 +-
2062  drivers/net/{ => ethernet/3com}/3c501.c            |    2 +-
2063  drivers/net/{ => ethernet/3com}/3c501.h            |    0
2064  drivers/net/{ => ethernet/3com}/3c509.c            |    2 +-
2065  drivers/net/{ => ethernet/3com}/3c515.c            |    2 +-
2066  drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c   |    2 +-
2067  drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c   |    2 +-
2068  drivers/net/{ => ethernet/3com}/3c59x.c            |    4 +-
2069  drivers/net/ethernet/3com/Kconfig                  |  120 +
2070  drivers/net/ethernet/3com/Makefile                 |   11 +
2071  drivers/net/{ => ethernet/3com}/typhoon.c          |    2 +-
2072  drivers/net/{ => ethernet/3com}/typhoon.h          |    0
2073  drivers/net/{ => ethernet/8390}/3c503.c            |    2 +-
2074  drivers/net/{ => ethernet/8390}/3c503.h            |    0
2075  drivers/net/{ => ethernet/8390}/8390.c             |    2 +-
2076  drivers/net/{ => ethernet/8390}/8390.h             |    0
2077  drivers/net/{ => ethernet/8390}/8390p.c            |    2 +-
2078  drivers/net/ethernet/8390/Kconfig                  |  336 +
2079  drivers/net/ethernet/8390/Makefile                 |   29 +
2080  drivers/net/{ => ethernet/8390}/ac3200.c           |    2 +-
2081  drivers/net/{ => ethernet/8390}/apne.c             |    0
2082  drivers/net/{ => ethernet/8390}/ax88796.c          |    2 +-
2083  drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c   |    4 +-
2084  drivers/net/{ => ethernet/8390}/e2100.c            |    2 +-
2085  drivers/net/{ => ethernet/8390}/es3210.c           |    0
2086  drivers/net/{arm => ethernet/8390}/etherh.c        |    4 +-
2087  drivers/net/{ => ethernet/8390}/hp-plus.c          |    2 +-
2088  drivers/net/{ => ethernet/8390}/hp.c               |    0
2089  drivers/net/{ => ethernet/8390}/hydra.c            |    2 +-
2090  drivers/net/{ => ethernet/8390}/lib8390.c          |    0
2091  drivers/net/{ => ethernet/8390}/lne390.c           |    0
2092  drivers/net/{ => ethernet/8390}/mac8390.c          |    2 +-
2093  drivers/net/{ => ethernet/8390}/ne-h8300.c         |    2 +-
2094  drivers/net/{ => ethernet/8390}/ne.c               |    0
2095  drivers/net/{ => ethernet/8390}/ne2.c              |    0
2096  drivers/net/{ => ethernet/8390}/ne2k-pci.c         |    2 +-
2097  drivers/net/{ => ethernet/8390}/ne3210.c           |    0
2098  drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c   |    4 +-
2099  drivers/net/{ => ethernet/8390}/smc-mca.c          |    2 +-
2100  drivers/net/{ => ethernet/8390}/smc-ultra.c        |    2 +-
2101  drivers/net/{ => ethernet/8390}/smc-ultra32.c      |    2 +-
2102  drivers/net/{ => ethernet/8390}/stnic.c            |    0
2103  drivers/net/{ => ethernet/8390}/wd.c               |    2 +-
2104  drivers/net/{ => ethernet/8390}/zorro8390.c        |    2 +-
2105  drivers/net/ethernet/Kconfig                       |  173 +
2106  drivers/net/ethernet/Makefile                      |   74 +
2107  drivers/net/ethernet/adaptec/Kconfig               |   34 +
2108  drivers/net/ethernet/adaptec/Makefile              |    5 +
2109  drivers/net/{ => ethernet/adaptec}/starfire.c      |    2 +-
2110  drivers/net/ethernet/adi/Kconfig                   |   68 +
2111  drivers/net/ethernet/adi/Makefile                  |    5 +
2112  drivers/net/{ => ethernet/adi}/bfin_mac.c          |    2 +-
2113  drivers/net/{ => ethernet/adi}/bfin_mac.h          |    0
2114  drivers/net/ethernet/aeroflex/Kconfig              |   11 +
2115  drivers/net/ethernet/aeroflex/Makefile             |    5 +
2116  drivers/net/{ => ethernet/aeroflex}/greth.c        |    2 +-
2117  drivers/net/{ => ethernet/aeroflex}/greth.h        |    0
2118  drivers/net/ethernet/alteon/Kconfig                |   47 +
2119  drivers/net/ethernet/alteon/Makefile               |    5 +
2120  drivers/net/{ => ethernet/alteon}/acenic.c         |    2 +-
2121  drivers/net/{ => ethernet/alteon}/acenic.h         |    0
2122  drivers/net/{ => ethernet/amd}/7990.c              |    0
2123  drivers/net/{ => ethernet/amd}/7990.h              |    0
2124  drivers/net/ethernet/amd/Kconfig                   |  192 +
2125  drivers/net/ethernet/amd/Makefile                  |   20 +
2126  drivers/net/{ => ethernet/amd}/a2065.c             |    2 +-
2127  drivers/net/{ => ethernet/amd}/a2065.h             |    0
2128  drivers/net/{arm => ethernet/amd}/am79c961a.c      |    2 +-
2129  drivers/net/{arm => ethernet/amd}/am79c961a.h      |    0
2130  drivers/net/{ => ethernet/amd}/amd8111e.c          |    2 +-
2131  drivers/net/{ => ethernet/amd}/amd8111e.h          |    0
2132  drivers/net/{ => ethernet/amd}/ariadne.c           |    2 +-
2133  drivers/net/{ => ethernet/amd}/ariadne.h           |    0
2134  drivers/net/{ => ethernet/amd}/atarilance.c        |    2 +-
2135  drivers/net/{ => ethernet/amd}/au1000_eth.c        |    2 +-
2136  drivers/net/{ => ethernet/amd}/au1000_eth.h        |    0
2137  drivers/net/{ => ethernet/amd}/declance.c          |    2 +-
2138  drivers/net/{ => ethernet/amd}/depca.c             |    2 +-
2139  drivers/net/{ => ethernet/amd}/depca.h             |    0
2140  drivers/net/{ => ethernet/amd}/hplance.c           |    2 +-
2141  drivers/net/{ => ethernet/amd}/hplance.h           |    0
2142  drivers/net/{ => ethernet/amd}/lance.c             |    2 +-
2143  drivers/net/{ => ethernet/amd}/mvme147.c           |    2 +-
2144  drivers/net/{ => ethernet/amd}/ni65.c              |    2 +-
2145  drivers/net/{ => ethernet/amd}/ni65.h              |    0
2146  drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c   |    2 +-
2147  drivers/net/{ => ethernet/amd}/pcnet32.c           |    2 +-
2148  drivers/net/{ => ethernet/amd}/sun3lance.c         |    2 +-
2149  drivers/net/{ => ethernet/amd}/sunlance.c          |    2 +-
2150  drivers/net/ethernet/apple/Kconfig                 |   96 +
2151  drivers/net/ethernet/apple/Makefile                |    9 +
2152  drivers/net/{ => ethernet/apple}/bmac.c            |    2 +-
2153  drivers/net/{ => ethernet/apple}/bmac.h            |    0
2154  drivers/net/{ => ethernet/apple}/cs89x0.c          |    2 +-
2155  drivers/net/{ => ethernet/apple}/cs89x0.h          |    0
2156  drivers/net/{ => ethernet/apple}/mac89x0.c         |    2 +-
2157  drivers/net/{ => ethernet/apple}/mace.c            |    2 +-
2158  drivers/net/{ => ethernet/apple}/mace.h            |    0
2159  drivers/net/{ => ethernet/apple}/macmace.c         |    2 +-
2160  drivers/net/ethernet/atheros/Kconfig               |   65 +
2161  drivers/net/ethernet/atheros/Makefile              |    8 +
2162  drivers/net/{ => ethernet/atheros}/atl1c/Makefile  |    0
2163  drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h   |    0
2164  .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c   |    0
2165  .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c    |    0
2166  .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h    |    0
2167  .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c  |    2 +-
2168  drivers/net/{ => ethernet/atheros}/atl1e/Makefile  |    0
2169  drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h   |    0
2170  .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c   |    0
2171  .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c    |    0
2172  .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h    |    0
2173  .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c  |    2 +-
2174  .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c |    0
2175  drivers/net/{ => ethernet/atheros}/atlx/Makefile   |    0
2176  drivers/net/{ => ethernet/atheros}/atlx/atl1.c     |    2 +-
2177  drivers/net/{ => ethernet/atheros}/atlx/atl1.h     |    0
2178  drivers/net/{ => ethernet/atheros}/atlx/atl2.c     |    2 +-
2179  drivers/net/{ => ethernet/atheros}/atlx/atl2.h     |    0
2180  drivers/net/{ => ethernet/atheros}/atlx/atlx.c     |    0
2181  drivers/net/{ => ethernet/atheros}/atlx/atlx.h     |    0
2182  drivers/net/ethernet/broadcom/Kconfig              |  119 +
2183  drivers/net/ethernet/broadcom/Makefile             |   11 +
2184  drivers/net/{ => ethernet/broadcom}/b44.c          |    2 +-
2185  drivers/net/{ => ethernet/broadcom}/b44.h          |    0
2186  drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c |    2 +-
2187  drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h |    0
2188  drivers/net/{ => ethernet/broadcom}/bnx2.c         |    2 +
2189  drivers/net/{ => ethernet/broadcom}/bnx2.h         |    0
2190  drivers/net/{ => ethernet/broadcom}/bnx2_fw.h      |    0
2191  drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile |    0
2192  drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h  |   67 +-
2193  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c  |   48 +-
2194  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h  |    8 +-
2195  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c  |    5 +-
2196  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h  |    0
2197  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h |    0
2198  .../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c  |   23 +-
2199  .../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h  |    0
2200  .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h            |    0
2201  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h  |    0
2202  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h |    0
2203  .../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h |    0
2204  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c |  153 +-
2205  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h |    0
2206  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c |   75 +-
2207  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h  |    0
2208  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c   |   67 +-
2209  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h   |    0
2210  .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c    |   46 +-
2211  .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h    |    0
2212  drivers/net/{ => ethernet/broadcom}/cnic.c         |    4 +-
2213  drivers/net/{ => ethernet/broadcom}/cnic.h         |    0
2214  drivers/net/{ => ethernet/broadcom}/cnic_defs.h    |    0
2215  drivers/net/{ => ethernet/broadcom}/cnic_if.h      |    0
2216  drivers/net/{ => ethernet/broadcom}/sb1250-mac.c   |    2 +-
2217  drivers/net/{ => ethernet/broadcom}/tg3.c          |  414 +-
2218  drivers/net/{ => ethernet/broadcom}/tg3.h          |    3 +
2219  drivers/net/ethernet/brocade/Kconfig               |   22 +
2220  drivers/net/ethernet/brocade/Makefile              |    5 +
2221  drivers/net/ethernet/brocade/bna/Kconfig           |   17 +
2222  drivers/net/{ => ethernet/brocade}/bna/Makefile    |    5 +-
2223  drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c   |    3 -
2224  drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h   |    0
2225  drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h    |    0
2226  drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h  |   25 +-
2227  .../net/{ => ethernet/brocade}/bna/bfa_defs_cna.h  |    0
2228  .../{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h |   28 +-
2229  .../{ => ethernet/brocade}/bna/bfa_defs_status.h   |    0
2230  drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c   |  405 +-
2231  drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h   |   45 +-
2232  .../net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c    |  157 +-
2233  drivers/net/ethernet/brocade/bna/bfa_msgq.c        |  669 ++
2234  drivers/net/ethernet/brocade/bna/bfa_msgq.h        |  130 +
2235  drivers/net/{ => ethernet/brocade}/bna/bfi.h       |  195 +-
2236  drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h   |    0
2237  drivers/net/ethernet/brocade/bna/bfi_enet.h        |  901 +++
2238  drivers/net/ethernet/brocade/bna/bfi_reg.h         |  452 ++
2239  drivers/net/{ => ethernet/brocade}/bna/bna.h       |  337 +-
2240  drivers/net/ethernet/brocade/bna/bna_enet.c        | 2129 +++++++
2241  drivers/net/ethernet/brocade/bna/bna_hw_defs.h     |  413 ++
2242  drivers/net/ethernet/brocade/bna/bna_tx_rx.c       | 3787 ++++++++++++
2243  drivers/net/{ => ethernet/brocade}/bna/bna_types.h |  654 +--
2244  drivers/net/{ => ethernet/brocade}/bna/bnad.c      |  644 ++-
2245  drivers/net/{ => ethernet/brocade}/bna/bnad.h      |   38 +-
2246  .../net/{ => ethernet/brocade}/bna/bnad_ethtool.c  |  384 +--
2247  drivers/net/{ => ethernet/brocade}/bna/cna.h       |   31 +-
2248  drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c |    0
2249  drivers/net/ethernet/cadence/Kconfig               |   44 +
2250  drivers/net/ethernet/cadence/Makefile              |    6 +
2251  drivers/net/{arm => ethernet/cadence}/at91_ether.c |    2 +-
2252  drivers/net/{arm => ethernet/cadence}/at91_ether.h |    0
2253  drivers/net/{ => ethernet/cadence}/macb.c          |    2 +-
2254  drivers/net/{ => ethernet/cadence}/macb.h          |    0
2255  drivers/net/ethernet/chelsio/Kconfig               |  106 +
2256  drivers/net/ethernet/chelsio/Makefile              |    8 +
2257  .../{chelsio => ethernet/chelsio/cxgb}/Makefile    |    0
2258  .../{chelsio => ethernet/chelsio/cxgb}/common.h    |    0
2259  .../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h  |    0
2260  .../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h  |    0
2261  .../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c |    2 +-
2262  .../{chelsio => ethernet/chelsio/cxgb}/elmer0.h    |    0
2263  .../net/{chelsio => ethernet/chelsio/cxgb}/espi.c  |    0
2264  .../net/{chelsio => ethernet/chelsio/cxgb}/espi.h  |    0
2265  .../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h |    0
2266  .../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h  |    0
2267  .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c |    0
2268  .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h |    0
2269  .../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c |    0
2270  .../{chelsio => ethernet/chelsio/cxgb}/my3126.c    |    0
2271  .../{chelsio => ethernet/chelsio/cxgb}/pm3393.c    |    0
2272  .../net/{chelsio => ethernet/chelsio/cxgb}/regs.h  |    0
2273  .../net/{chelsio => ethernet/chelsio/cxgb}/sge.c   |    0
2274  .../net/{chelsio => ethernet/chelsio/cxgb}/sge.h   |    0
2275  .../net/{chelsio => ethernet/chelsio/cxgb}/subr.c  |    0
2276  .../chelsio/cxgb}/suni1x10gexp_regs.h              |    0
2277  .../net/{chelsio => ethernet/chelsio/cxgb}/tp.c    |    0
2278  .../net/{chelsio => ethernet/chelsio/cxgb}/tp.h    |    0
2279  .../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c   |    0
2280  .../chelsio/cxgb}/vsc7326_reg.h                    |    0
2281  drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile  |    0
2282  drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h |    0
2283  drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c |    0
2284  drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c  |    0
2285  drivers/net/{ => ethernet/chelsio}/cxgb3/common.h  |    0
2286  .../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h  |    0
2287  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h  |    0
2288  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h |    0
2289  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c  |    2 +-
2290  .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c   |    0
2291  .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h   |    0
2292  .../chelsio}/cxgb3/firmware_exports.h              |    0
2293  drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c     |    0
2294  drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h     |    0
2295  drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c     |    0
2296  drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h    |    0
2297  drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c     |    0
2298  .../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h    |    0
2299  drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h  |    0
2300  drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c   |    0
2301  drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h  |    0
2302  drivers/net/{ => ethernet/chelsio}/cxgb3/version.h |    0
2303  drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c |    0
2304  drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c   |    0
2305  drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile  |    0
2306  drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h   |    0
2307  .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c  |    3 +
2308  .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h   |    0
2309  drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c     |    0
2310  drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h     |    0
2311  drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c     |    0
2312  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c   |    0
2313  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h   |    0
2314  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h  |    0
2315  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h |    0
2316  .../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h    |    0
2317  .../net/{ => ethernet/chelsio}/cxgb4vf/Makefile    |    0
2318  .../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h   |    0
2319  .../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c  |    2 +
2320  drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c   |    0
2321  .../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h   |    0
2322  .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h |    0
2323  .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c   |    0
2324  drivers/net/ethernet/cirrus/Kconfig                |   28 +
2325  drivers/net/ethernet/cirrus/Makefile               |    5 +
2326  drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c  |    0
2327  drivers/net/ethernet/cisco/Kconfig                 |   22 +
2328  drivers/net/ethernet/cisco/Makefile                |    5 +
2329  drivers/net/ethernet/cisco/enic/Kconfig            |    9 +
2330  drivers/net/{ => ethernet/cisco}/enic/Makefile     |    0
2331  drivers/net/{ => ethernet/cisco}/enic/cq_desc.h    |    0
2332  .../net/{ => ethernet/cisco}/enic/cq_enet_desc.h   |    0
2333  drivers/net/{ => ethernet/cisco}/enic/enic.h       |    0
2334  drivers/net/{ => ethernet/cisco}/enic/enic_dev.c   |    0
2335  drivers/net/{ => ethernet/cisco}/enic/enic_dev.h   |    0
2336  drivers/net/{ => ethernet/cisco}/enic/enic_main.c  |    5 +-
2337  drivers/net/{ => ethernet/cisco}/enic/enic_pp.c    |    0
2338  drivers/net/{ => ethernet/cisco}/enic/enic_pp.h    |    0
2339  drivers/net/{ => ethernet/cisco}/enic/enic_res.c   |    0
2340  drivers/net/{ => ethernet/cisco}/enic/enic_res.h   |    0
2341  .../net/{ => ethernet/cisco}/enic/rq_enet_desc.h   |    0
2342  drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c    |    0
2343  drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h    |    0
2344  drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c   |    0
2345  drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h   |    0
2346  .../net/{ => ethernet/cisco}/enic/vnic_devcmd.h    |    0
2347  drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h  |    0
2348  drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c  |    0
2349  drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h  |    0
2350  drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h   |    0
2351  .../net/{ => ethernet/cisco}/enic/vnic_resource.h  |    0
2352  drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c    |    0
2353  drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h    |    0
2354  drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h   |    0
2355  drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h |    0
2356  drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c   |    0
2357  drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h   |    0
2358  drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c    |    0
2359  drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h    |    0
2360  .../net/{ => ethernet/cisco}/enic/wq_enet_desc.h   |    0
2361  drivers/net/ethernet/davicom/Kconfig               |   23 +
2362  drivers/net/ethernet/davicom/Makefile              |    5 +
2363  drivers/net/{ => ethernet/davicom}/dm9000.c        |   13 +-
2364  drivers/net/{ => ethernet/davicom}/dm9000.h        |    0
2365  drivers/net/ethernet/dec/Kconfig                   |   36 +
2366  drivers/net/ethernet/dec/Makefile                  |    6 +
2367  drivers/net/{ => ethernet/dec}/ewrk3.c             |    2 +-
2368  drivers/net/{ => ethernet/dec}/ewrk3.h             |    0
2369  drivers/net/{ => ethernet/dec}/tulip/21142.c       |    0
2370  drivers/net/{ => ethernet/dec}/tulip/Kconfig       |   20 +-
2371  drivers/net/{ => ethernet/dec}/tulip/Makefile      |    0
2372  drivers/net/{ => ethernet/dec}/tulip/de2104x.c     |    2 +-
2373  drivers/net/{ => ethernet/dec}/tulip/de4x5.c       |    2 +-
2374  drivers/net/{ => ethernet/dec}/tulip/de4x5.h       |    0
2375  drivers/net/{ => ethernet/dec}/tulip/dmfe.c        |    2 +-
2376  drivers/net/{ => ethernet/dec}/tulip/eeprom.c      |    0
2377  drivers/net/{ => ethernet/dec}/tulip/interrupt.c   |    0
2378  drivers/net/{ => ethernet/dec}/tulip/media.c       |    0
2379  drivers/net/{ => ethernet/dec}/tulip/pnic.c        |    0
2380  drivers/net/{ => ethernet/dec}/tulip/pnic2.c       |    0
2381  drivers/net/{ => ethernet/dec}/tulip/timer.c       |    0
2382  drivers/net/{ => ethernet/dec}/tulip/tulip.h       |    0
2383  drivers/net/{ => ethernet/dec}/tulip/tulip_core.c  |    2 +-
2384  drivers/net/{ => ethernet/dec}/tulip/uli526x.c     |    2 +-
2385  drivers/net/{ => ethernet/dec}/tulip/winbond-840.c |    2 +-
2386  drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c   |    0
2387  drivers/net/ethernet/dlink/Kconfig                 |   84 +
2388  drivers/net/ethernet/dlink/Makefile                |    8 +
2389  drivers/net/{ => ethernet/dlink}/de600.c           |    0
2390  drivers/net/{ => ethernet/dlink}/de600.h           |    0
2391  drivers/net/{ => ethernet/dlink}/de620.c           |    2 +-
2392  drivers/net/{ => ethernet/dlink}/de620.h           |    0
2393  drivers/net/{ => ethernet/dlink}/dl2k.c            |    2 +-
2394  drivers/net/{ => ethernet/dlink}/dl2k.h            |    0
2395  drivers/net/{ => ethernet/dlink}/sundance.c        |    2 +-
2396  drivers/net/{ => ethernet}/dnet.c                  |    0
2397  drivers/net/{ => ethernet}/dnet.h                  |    0
2398  drivers/net/ethernet/emulex/Kconfig                |   22 +
2399  drivers/net/ethernet/emulex/Makefile               |    5 +
2400  drivers/net/ethernet/emulex/benet/Kconfig          |    6 +
2401  drivers/net/{ => ethernet/emulex}/benet/Makefile   |    0
2402  drivers/net/{ => ethernet/emulex}/benet/be.h       |  123 +-
2403  drivers/net/{ => ethernet/emulex}/benet/be_cmds.c  |  162 +-
2404  drivers/net/{ => ethernet/emulex}/benet/be_cmds.h  |   91 +-
2405  .../net/{ => ethernet/emulex}/benet/be_ethtool.c   |  154 +-
2406  drivers/net/{ => ethernet/emulex}/benet/be_hw.h    |   21 +-
2407  drivers/net/{ => ethernet/emulex}/benet/be_main.c  |  484 +-
2408  drivers/net/{ => ethernet}/ethoc.c                 |    2 +-
2409  drivers/net/ethernet/faraday/Kconfig               |   38 +
2410  drivers/net/ethernet/faraday/Makefile              |    6 +
2411  drivers/net/{ => ethernet/faraday}/ftgmac100.c     |    0
2412  drivers/net/{ => ethernet/faraday}/ftgmac100.h     |    0
2413  drivers/net/{ => ethernet/faraday}/ftmac100.c      |    0
2414  drivers/net/{ => ethernet/faraday}/ftmac100.h      |    0
2415  drivers/net/{ => ethernet}/fealnx.c                |    2 +-
2416  drivers/net/ethernet/freescale/Kconfig             |   88 +
2417  drivers/net/ethernet/freescale/Makefile            |   18 +
2418  drivers/net/{ => ethernet/freescale}/fec.c         |    2 +-
2419  drivers/net/{ => ethernet/freescale}/fec.h         |    0
2420  drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c |    2 +-
2421  drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h |    0
2422  .../net/{ => ethernet/freescale}/fec_mpc52xx_phy.c |    0
2423  .../net/{ => ethernet/freescale}/fs_enet/Kconfig   |    2 +-
2424  .../net/{ => ethernet/freescale}/fs_enet/Makefile  |    0
2425  drivers/net/{ => ethernet/freescale}/fs_enet/fec.h |    0
2426  .../freescale}/fs_enet/fs_enet-main.c              |    2 +-
2427  .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h |    0
2428  .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c |    0
2429  .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c |    0
2430  .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c |    0
2431  .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c |    0
2432  .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c |    0
2433  drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c |    0
2434  drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h |    0
2435  drivers/net/{ => ethernet/freescale}/gianfar.c     |    2 +-
2436  drivers/net/{ => ethernet/freescale}/gianfar.h     |    0
2437  .../net/{ => ethernet/freescale}/gianfar_ethtool.c |    0
2438  drivers/net/{ => ethernet/freescale}/gianfar_ptp.c |    0
2439  .../net/{ => ethernet/freescale}/gianfar_sysfs.c   |    0
2440  drivers/net/{ => ethernet/freescale}/ucc_geth.c    |   12 +-
2441  drivers/net/{ => ethernet/freescale}/ucc_geth.h    |    0
2442  .../{ => ethernet/freescale}/ucc_geth_ethtool.c    |    0
2443  drivers/net/ethernet/fujitsu/Kconfig               |   53 +
2444  drivers/net/ethernet/fujitsu/Makefile              |    7 +
2445  drivers/net/{ => ethernet/fujitsu}/at1700.c        |    2 +-
2446  drivers/net/{ => ethernet/fujitsu}/eth16i.c        |    2 +-
2447  .../net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c  |    2 +-
2448  drivers/net/ethernet/hp/Kconfig                    |   31 +
2449  drivers/net/ethernet/hp/Makefile                   |    5 +
2450  drivers/net/{ => ethernet/hp}/hp100.c              |    4 +-
2451  drivers/net/{ => ethernet/hp}/hp100.h              |    0
2452  drivers/net/{ => ethernet/i825xx}/3c505.c          |    2 +-
2453  drivers/net/{ => ethernet/i825xx}/3c505.h          |    0
2454  drivers/net/{ => ethernet/i825xx}/3c507.c          |    0
2455  drivers/net/{ => ethernet/i825xx}/3c523.c          |    2 +-
2456  drivers/net/{ => ethernet/i825xx}/3c523.h          |    0
2457  drivers/net/{ => ethernet/i825xx}/3c527.c          |    2 +-
2458  drivers/net/{ => ethernet/i825xx}/3c527.h          |    0
2459  drivers/net/{ => ethernet/i825xx}/82596.c          |    2 +-
2460  drivers/net/ethernet/i825xx/Kconfig                |  182 +
2461  drivers/net/ethernet/i825xx/Makefile               |   20 +
2462  drivers/net/{ => ethernet/i825xx}/eepro.c          |    2 +-
2463  drivers/net/{ => ethernet/i825xx}/eexpress.c       |    2 +-
2464  drivers/net/{ => ethernet/i825xx}/eexpress.h       |    0
2465  drivers/net/{arm => ethernet/i825xx}/ether1.c      |    2 +-
2466  drivers/net/{arm => ethernet/i825xx}/ether1.h      |    0
2467  drivers/net/{ => ethernet/i825xx}/lasi_82596.c     |    0
2468  drivers/net/{ => ethernet/i825xx}/lib82596.c       |    2 +-
2469  drivers/net/{ => ethernet/i825xx}/lp486e.c         |    2 +-
2470  drivers/net/{ => ethernet/i825xx}/ni52.c           |    2 +-
2471  drivers/net/{ => ethernet/i825xx}/ni52.h           |    0
2472  drivers/net/{ => ethernet/i825xx}/sni_82596.c      |    0
2473  drivers/net/{ => ethernet/i825xx}/sun3_82586.c     |    2 +-
2474  drivers/net/{ => ethernet/i825xx}/sun3_82586.h     |    0
2475  drivers/net/{ => ethernet/i825xx}/znet.c           |    2 +-
2476  drivers/net/ethernet/ibm/Kconfig                   |   47 +
2477  drivers/net/ethernet/ibm/Makefile                  |    8 +
2478  drivers/net/{ => ethernet/ibm}/ehea/Makefile       |    0
2479  drivers/net/{ => ethernet/ibm}/ehea/ehea.h         |    0
2480  drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c |    0
2481  drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h      |    0
2482  drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c    |    2 +-
2483  drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c    |    0
2484  drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h    |    0
2485  drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c     |    0
2486  drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h     |    0
2487  .../net/{ibm_newemac => ethernet/ibm/emac}/Kconfig |   40 +-
2488  drivers/net/ethernet/ibm/emac/Makefile             |   11 +
2489  .../net/{ibm_newemac => ethernet/ibm/emac}/core.c  |   16 +-
2490  .../net/{ibm_newemac => ethernet/ibm/emac}/core.h  |   16 +-
2491  .../net/{ibm_newemac => ethernet/ibm/emac}/debug.c |    0
2492  .../net/{ibm_newemac => ethernet/ibm/emac}/debug.h |    2 +-
2493  .../net/{ibm_newemac => ethernet/ibm/emac}/emac.h  |    0
2494  .../net/{ibm_newemac => ethernet/ibm/emac}/mal.c   |    6 +-
2495  .../net/{ibm_newemac => ethernet/ibm/emac}/mal.h   |    4 +-
2496  .../net/{ibm_newemac => ethernet/ibm/emac}/phy.c   |    0
2497  .../net/{ibm_newemac => ethernet/ibm/emac}/phy.h   |    0
2498  .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c |    0
2499  .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h |    4 +-
2500  .../net/{ibm_newemac => ethernet/ibm/emac}/tah.c   |    0
2501  .../net/{ibm_newemac => ethernet/ibm/emac}/tah.h   |    4 +-
2502  .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.c  |    0
2503  .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.h  |    4 +-
2504  drivers/net/{ => ethernet/ibm}/ibmveth.c           |    2 +-
2505  drivers/net/{ => ethernet/ibm}/ibmveth.h           |    0
2506  drivers/net/{ => ethernet/ibm}/iseries_veth.c      |    2 +-
2507  drivers/net/ethernet/icplus/Kconfig                |   13 +
2508  drivers/net/ethernet/icplus/Makefile               |    5 +
2509  drivers/net/{ => ethernet/icplus}/ipg.c            |  199 +-
2510  drivers/net/{ => ethernet/icplus}/ipg.h            |    0
2511  drivers/net/ethernet/intel/Kconfig                 |  220 +
2512  drivers/net/ethernet/intel/Makefile                |   12 +
2513  drivers/net/{ => ethernet/intel}/e100.c            |    2 +-
2514  drivers/net/{ => ethernet/intel}/e1000/Makefile    |    0
2515  drivers/net/{ => ethernet/intel}/e1000/e1000.h     |    0
2516  .../net/{ => ethernet/intel}/e1000/e1000_ethtool.c |    0
2517  drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c  |    0
2518  drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h  |    0
2519  .../net/{ => ethernet/intel}/e1000/e1000_main.c    |    2 +
2520  .../net/{ => ethernet/intel}/e1000/e1000_osdep.h   |    0
2521  .../net/{ => ethernet/intel}/e1000/e1000_param.c   |    0
2522  .../intel/e1000e/80003es2lan.c}                    |    0
2523  drivers/net/{ => ethernet/intel}/e1000e/82571.c    |    0
2524  drivers/net/{ => ethernet/intel}/e1000e/Makefile   |    2 +-
2525  drivers/net/{ => ethernet/intel}/e1000e/defines.h  |    0
2526  drivers/net/{ => ethernet/intel}/e1000e/e1000.h    |    3 +-
2527  drivers/net/{ => ethernet/intel}/e1000e/ethtool.c  |    9 +-
2528  drivers/net/{ => ethernet/intel}/e1000e/hw.h       |    0
2529  drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c  |    0
2530  drivers/net/{ => ethernet/intel}/e1000e/lib.c      |    0
2531  drivers/net/{ => ethernet/intel}/e1000e/netdev.c   |  201 +-
2532  drivers/net/{ => ethernet/intel}/e1000e/param.c    |    0
2533  drivers/net/{ => ethernet/intel}/e1000e/phy.c      |    0
2534  drivers/net/{ => ethernet/intel}/igb/Makefile      |    0
2535  drivers/net/{ => ethernet/intel}/igb/e1000_82575.c |    0
2536  drivers/net/{ => ethernet/intel}/igb/e1000_82575.h |    0
2537  .../net/{ => ethernet/intel}/igb/e1000_defines.h   |    0
2538  drivers/net/{ => ethernet/intel}/igb/e1000_hw.h    |    0
2539  drivers/net/{ => ethernet/intel}/igb/e1000_mac.c   |    0
2540  drivers/net/{ => ethernet/intel}/igb/e1000_mac.h   |    0
2541  drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c   |    0
2542  drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h   |    0
2543  drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c   |    0
2544  drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h   |    0
2545  drivers/net/{ => ethernet/intel}/igb/e1000_phy.c   |    0
2546  drivers/net/{ => ethernet/intel}/igb/e1000_phy.h   |    0
2547  drivers/net/{ => ethernet/intel}/igb/e1000_regs.h  |    0
2548  drivers/net/{ => ethernet/intel}/igb/igb.h         |    0
2549  drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c |    0
2550  drivers/net/{ => ethernet/intel}/igb/igb_main.c    |    4 +-
2551  drivers/net/{ => ethernet/intel}/igbvf/Makefile    |    0
2552  drivers/net/{ => ethernet/intel}/igbvf/defines.h   |    0
2553  drivers/net/{ => ethernet/intel}/igbvf/ethtool.c   |    0
2554  drivers/net/{ => ethernet/intel}/igbvf/igbvf.h     |    0
2555  drivers/net/{ => ethernet/intel}/igbvf/mbx.c       |    0
2556  drivers/net/{ => ethernet/intel}/igbvf/mbx.h       |    0
2557  drivers/net/{ => ethernet/intel}/igbvf/netdev.c    |    2 +-
2558  drivers/net/{ => ethernet/intel}/igbvf/regs.h      |    0
2559  drivers/net/{ => ethernet/intel}/igbvf/vf.c        |    0
2560  drivers/net/{ => ethernet/intel}/igbvf/vf.h        |    0
2561  drivers/net/{ => ethernet/intel}/ixgb/Makefile     |    0
2562  drivers/net/{ => ethernet/intel}/ixgb/ixgb.h       |    0
2563  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c    |    0
2564  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h    |    0
2565  .../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c   |    0
2566  drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c    |    0
2567  drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h    |    0
2568  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h   |    0
2569  drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c  |    2 +-
2570  drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h |    0
2571  drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c |    0
2572  drivers/net/{ => ethernet/intel}/ixgbe/Makefile    |    0
2573  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h     |   27 +-
2574  .../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c   |    0
2575  .../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c   |    0
2576  .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c  |    0
2577  .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h  |    0
2578  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c |    0
2579  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h |    0
2580  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c   |    0
2581  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h   |    0
2582  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c   |    0
2583  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h   |    0
2584  .../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c  |    2 +-
2585  .../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c |    0
2586  .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c    |   10 +-
2587  .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h    |    0
2588  .../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c    |  558 +-
2589  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c |    0
2590  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h |    0
2591  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c |    0
2592  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h |    0
2593  .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c   |    0
2594  .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h   |    0
2595  .../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h    |    0
2596  .../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c    |    0
2597  drivers/net/{ => ethernet/intel}/ixgbevf/Makefile  |    0
2598  drivers/net/{ => ethernet/intel}/ixgbevf/defines.h |    0
2599  drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c |    0
2600  drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h |    0
2601  .../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c    |    4 +-
2602  drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c     |    0
2603  drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h     |    0
2604  drivers/net/{ => ethernet/intel}/ixgbevf/regs.h    |    0
2605  drivers/net/{ => ethernet/intel}/ixgbevf/vf.c      |    0
2606  drivers/net/{ => ethernet/intel}/ixgbevf/vf.h      |    0
2607  drivers/net/{ => ethernet}/jme.c                   |    2 +-
2608  drivers/net/{ => ethernet}/jme.h                   |    0
2609  drivers/net/{ => ethernet}/korina.c                |    3 +-
2610  drivers/net/{ => ethernet}/lantiq_etop.c           |    2 +-
2611  drivers/net/ethernet/marvell/Kconfig               |  110 +
2612  drivers/net/ethernet/marvell/Makefile              |    8 +
2613  drivers/net/{ => ethernet/marvell}/mv643xx_eth.c   |    2 +
2614  drivers/net/{ => ethernet/marvell}/pxa168_eth.c    |    0
2615  drivers/net/{ => ethernet/marvell}/skge.c          |    2 +-
2616  drivers/net/{ => ethernet/marvell}/skge.h          |    0
2617  drivers/net/{ => ethernet/marvell}/sky2.c          |    4 +-
2618  drivers/net/{ => ethernet/marvell}/sky2.h          |    0
2619  drivers/net/ethernet/mellanox/Kconfig              |   22 +
2620  drivers/net/ethernet/mellanox/Makefile             |    5 +
2621  drivers/net/ethernet/mellanox/mlx4/Kconfig         |   27 +
2622  drivers/net/{ => ethernet/mellanox}/mlx4/Makefile  |    0
2623  drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c   |    0
2624  drivers/net/{ => ethernet/mellanox}/mlx4/catas.c   |    0
2625  drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c     |    0
2626  drivers/net/{ => ethernet/mellanox}/mlx4/cq.c      |    0
2627  drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c   |    0
2628  .../net/{ => ethernet/mellanox}/mlx4/en_ethtool.c  |    0
2629  drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c |    0
2630  .../net/{ => ethernet/mellanox}/mlx4/en_netdev.c   |    2 +-
2631  drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c |    0
2632  drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h |    0
2633  .../{ => ethernet/mellanox}/mlx4/en_resources.c    |    0
2634  drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c   |    0
2635  .../net/{ => ethernet/mellanox}/mlx4/en_selftest.c |    0
2636  drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c   |    0
2637  drivers/net/{ => ethernet/mellanox}/mlx4/eq.c      |    0
2638  drivers/net/{ => ethernet/mellanox}/mlx4/fw.c      |    0
2639  drivers/net/{ => ethernet/mellanox}/mlx4/fw.h      |    0
2640  drivers/net/{ => ethernet/mellanox}/mlx4/icm.c     |    0
2641  drivers/net/{ => ethernet/mellanox}/mlx4/icm.h     |    0
2642  drivers/net/{ => ethernet/mellanox}/mlx4/intf.c    |    0
2643  drivers/net/{ => ethernet/mellanox}/mlx4/main.c    |    0
2644  drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c     |    0
2645  drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h    |    0
2646  drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h |    0
2647  drivers/net/{ => ethernet/mellanox}/mlx4/mr.c      |    0
2648  drivers/net/{ => ethernet/mellanox}/mlx4/pd.c      |    0
2649  drivers/net/{ => ethernet/mellanox}/mlx4/port.c    |    0
2650  drivers/net/{ => ethernet/mellanox}/mlx4/profile.c |    0
2651  drivers/net/{ => ethernet/mellanox}/mlx4/qp.c      |    0
2652  drivers/net/{ => ethernet/mellanox}/mlx4/reset.c   |    0
2653  drivers/net/{ => ethernet/mellanox}/mlx4/sense.c   |    0
2654  drivers/net/{ => ethernet/mellanox}/mlx4/srq.c     |    0
2655  drivers/net/ethernet/micrel/Kconfig                |   64 +
2656  drivers/net/ethernet/micrel/Makefile               |    9 +
2657  drivers/net/{arm => ethernet/micrel}/ks8695net.c   |    2 +-
2658  drivers/net/{arm => ethernet/micrel}/ks8695net.h   |    0
2659  drivers/net/{ => ethernet/micrel}/ks8842.c         |    0
2660  drivers/net/{ => ethernet/micrel}/ks8851.c         |    0
2661  drivers/net/{ => ethernet/micrel}/ks8851.h         |    0
2662  drivers/net/{ => ethernet/micrel}/ks8851_mll.c     |    0
2663  drivers/net/{ => ethernet/micrel}/ksz884x.c        |    0
2664  drivers/net/ethernet/microchip/Kconfig             |   37 +
2665  drivers/net/ethernet/microchip/Makefile            |    5 +
2666  drivers/net/{ => ethernet/microchip}/enc28j60.c    |    2 +-
2667  drivers/net/{ => ethernet/microchip}/enc28j60_hw.h |    0
2668  drivers/net/{ => ethernet}/mipsnet.c               |    2 +-
2669  drivers/net/ethernet/myricom/Kconfig               |   46 +
2670  drivers/net/ethernet/myricom/Makefile              |    5 +
2671  .../net/{ => ethernet/myricom}/myri10ge/Makefile   |    0
2672  .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c |    2 +-
2673  .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h |    0
2674  .../myricom}/myri10ge/myri10ge_mcp_gen_header.h    |    0
2675  drivers/net/ethernet/natsemi/Kconfig               |   82 +
2676  drivers/net/ethernet/natsemi/Makefile              |   10 +
2677  drivers/net/{ => ethernet/natsemi}/ibmlana.c       |    2 +-
2678  drivers/net/{ => ethernet/natsemi}/ibmlana.h       |    0
2679  drivers/net/{ => ethernet/natsemi}/jazzsonic.c     |    2 +-
2680  drivers/net/{ => ethernet/natsemi}/macsonic.c      |    2 +-
2681  drivers/net/{ => ethernet/natsemi}/natsemi.c       |    2 +-
2682  drivers/net/{ => ethernet/natsemi}/ns83820.c       |    2 +-
2683  drivers/net/{ => ethernet/natsemi}/sonic.c         |    0
2684  drivers/net/{ => ethernet/natsemi}/sonic.h         |    0
2685  drivers/net/{ => ethernet/natsemi}/xtsonic.c       |    2 +-
2686  drivers/net/ethernet/neterion/Kconfig              |   54 +
2687  drivers/net/ethernet/neterion/Makefile             |    6 +
2688  drivers/net/{ => ethernet/neterion}/s2io-regs.h    |    0
2689  drivers/net/{ => ethernet/neterion}/s2io.c         |    2 +-
2690  drivers/net/{ => ethernet/neterion}/s2io.h         |    0
2691  drivers/net/{ => ethernet/neterion}/vxge/Makefile  |    0
2692  .../net/{ => ethernet/neterion}/vxge/vxge-config.c |    0
2693  .../net/{ => ethernet/neterion}/vxge/vxge-config.h |    0
2694  .../{ => ethernet/neterion}/vxge/vxge-ethtool.c    |    0
2695  .../{ => ethernet/neterion}/vxge/vxge-ethtool.h    |    0
2696  .../net/{ => ethernet/neterion}/vxge/vxge-main.c   |    2 +-
2697  .../net/{ => ethernet/neterion}/vxge/vxge-main.h   |    0
2698  .../net/{ => ethernet/neterion}/vxge/vxge-reg.h    |    0
2699  .../{ => ethernet/neterion}/vxge/vxge-traffic.c    |    0
2700  .../{ => ethernet/neterion}/vxge/vxge-traffic.h    |    0
2701  .../{ => ethernet/neterion}/vxge/vxge-version.h    |    0
2702  drivers/net/{ => ethernet}/netx-eth.c              |    2 +-
2703  drivers/net/ethernet/nuvoton/Kconfig               |   29 +
2704  drivers/net/ethernet/nuvoton/Makefile              |    5 +
2705  .../net/{arm => ethernet/nuvoton}/w90p910_ether.c  |    2 +-
2706  drivers/net/ethernet/nvidia/Kconfig                |   31 +
2707  drivers/net/ethernet/nvidia/Makefile               |    5 +
2708  drivers/net/{ => ethernet/nvidia}/forcedeth.c      |    4 +-
2709  drivers/net/{ => ethernet}/octeon/Kconfig          |    6 +-
2710  drivers/net/ethernet/octeon/Makefile               |    5 +
2711  drivers/net/{ => ethernet}/octeon/octeon_mgmt.c    |    4 +-
2712  drivers/net/ethernet/oki-semi/Kconfig              |   22 +
2713  drivers/net/ethernet/oki-semi/Makefile             |    5 +
2714  drivers/net/ethernet/oki-semi/pch_gbe/Kconfig      |   20 +
2715  .../net/{ => ethernet/oki-semi}/pch_gbe/Makefile   |    0
2716  .../net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h  |    0
2717  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c  |    0
2718  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h  |    0
2719  .../oki-semi}/pch_gbe/pch_gbe_ethtool.c            |    0
2720  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c |    2 +-
2721  .../oki-semi}/pch_gbe/pch_gbe_param.c              |    0
2722  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c  |    0
2723  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h  |    0
2724  drivers/net/ethernet/packetengines/Kconfig         |   46 +
2725  drivers/net/ethernet/packetengines/Makefile        |    6 +
2726  drivers/net/{ => ethernet/packetengines}/hamachi.c |    2 +-
2727  .../net/{ => ethernet/packetengines}/yellowfin.c   |    2 +-
2728  drivers/net/ethernet/pasemi/Kconfig                |   29 +
2729  drivers/net/ethernet/pasemi/Makefile               |    5 +
2730  drivers/net/{ => ethernet/pasemi}/pasemi_mac.c     |    2 +-
2731  drivers/net/{ => ethernet/pasemi}/pasemi_mac.h     |    0
2732  .../net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c |    0
2733  drivers/net/ethernet/qlogic/Kconfig                |   53 +
2734  drivers/net/ethernet/qlogic/Makefile               |    8 +
2735  drivers/net/{ => ethernet/qlogic}/netxen/Makefile  |    0
2736  .../net/{ => ethernet/qlogic}/netxen/netxen_nic.h  |    6 +
2737  .../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c  |    0
2738  .../qlogic}/netxen/netxen_nic_ethtool.c            |    0
2739  .../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h  |    0
2740  .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c   |    0
2741  .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h   |    0
2742  .../{ => ethernet/qlogic}/netxen/netxen_nic_init.c |    8 +-
2743  .../{ => ethernet/qlogic}/netxen/netxen_nic_main.c |  105 +-
2744  drivers/net/{ => ethernet/qlogic}/qla3xxx.c        |    3 +-
2745  drivers/net/{ => ethernet/qlogic}/qla3xxx.h        |    0
2746  drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile  |    0
2747  drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h  |    6 +-
2748  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c  |    0
2749  .../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c  |   22 +-
2750  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h  |    0
2751  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c   |    4 +-
2752  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c |    3 +-
2753  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c |   42 +-
2754  drivers/net/{ => ethernet/qlogic}/qlge/Makefile    |    0
2755  drivers/net/{ => ethernet/qlogic}/qlge/qlge.h      |    0
2756  drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c  |    0
2757  .../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c  |    0
2758  drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c |    2 +-
2759  drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c  |    0
2760  drivers/net/ethernet/racal/Kconfig                 |   32 +
2761  drivers/net/ethernet/racal/Makefile                |    5 +
2762  drivers/net/{ => ethernet/racal}/ni5010.c          |    2 +-
2763  drivers/net/{ => ethernet/racal}/ni5010.h          |    0
2764  drivers/net/ethernet/rdc/Kconfig                   |   33 +
2765  drivers/net/ethernet/rdc/Makefile                  |    5 +
2766  drivers/net/{ => ethernet/rdc}/r6040.c             |    2 +-
2767  drivers/net/{ => ethernet/realtek}/8139cp.c        |    2 +-
2768  drivers/net/{ => ethernet/realtek}/8139too.c       |    2 +-
2769  drivers/net/ethernet/realtek/Kconfig               |  126 +
2770  drivers/net/ethernet/realtek/Makefile              |    9 +
2771  drivers/net/{ => ethernet/realtek}/atp.c           |    2 +-
2772  drivers/net/{ => ethernet/realtek}/atp.h           |    0
2773  drivers/net/{ => ethernet/realtek}/r8169.c         |    2 +-
2774  drivers/net/{ => ethernet/realtek}/sc92031.c       |    2 +-
2775  drivers/net/ethernet/renesas/Kconfig               |   18 +
2776  drivers/net/ethernet/renesas/Makefile              |    5 +
2777  drivers/net/{ => ethernet/renesas}/sh_eth.c        |    2 +-
2778  drivers/net/{ => ethernet/renesas}/sh_eth.h        |    0
2779  drivers/net/{ => ethernet}/s6gmac.c                |    0
2780  drivers/net/ethernet/seeq/Kconfig                  |   45 +
2781  drivers/net/ethernet/seeq/Makefile                 |    7 +
2782  drivers/net/{arm => ethernet/seeq}/ether3.c        |    2 +-
2783  drivers/net/{arm => ethernet/seeq}/ether3.h        |    0
2784  drivers/net/{ => ethernet/seeq}/seeq8005.c         |    2 +-
2785  drivers/net/{ => ethernet/seeq}/seeq8005.h         |    0
2786  drivers/net/{ => ethernet/seeq}/sgiseeq.c          |    2 +-
2787  drivers/net/{ => ethernet/seeq}/sgiseeq.h          |    0
2788  drivers/net/{ => ethernet}/sfc/Kconfig             |    4 +-
2789  drivers/net/{ => ethernet}/sfc/Makefile            |    0
2790  drivers/net/{ => ethernet}/sfc/bitfield.h          |    0
2791  drivers/net/{ => ethernet}/sfc/efx.c               |    2 +-
2792  drivers/net/{ => ethernet}/sfc/efx.h               |    0
2793  drivers/net/{ => ethernet}/sfc/enum.h              |    0
2794  drivers/net/{ => ethernet}/sfc/ethtool.c           |    0
2795  drivers/net/{ => ethernet}/sfc/falcon.c            |    0
2796  drivers/net/{ => ethernet}/sfc/falcon_boards.c     |    0
2797  drivers/net/{ => ethernet}/sfc/falcon_xmac.c       |    0
2798  drivers/net/{ => ethernet}/sfc/filter.c            |    0
2799  drivers/net/{ => ethernet}/sfc/filter.h            |    0
2800  drivers/net/{ => ethernet}/sfc/io.h                |    0
2801  drivers/net/{ => ethernet}/sfc/mac.h               |    0
2802  drivers/net/{ => ethernet}/sfc/mcdi.c              |    0
2803  drivers/net/{ => ethernet}/sfc/mcdi.h              |    0
2804  drivers/net/{ => ethernet}/sfc/mcdi_mac.c          |    0
2805  drivers/net/{ => ethernet}/sfc/mcdi_pcol.h         |    0
2806  drivers/net/{ => ethernet}/sfc/mcdi_phy.c          |    0
2807  drivers/net/{ => ethernet}/sfc/mdio_10g.c          |    0
2808  drivers/net/{ => ethernet}/sfc/mdio_10g.h          |    0
2809  drivers/net/{ => ethernet}/sfc/mtd.c               |    0
2810  drivers/net/{ => ethernet}/sfc/net_driver.h        |    0
2811  drivers/net/{ => ethernet}/sfc/nic.c               |    0
2812  drivers/net/{ => ethernet}/sfc/nic.h               |    0
2813  drivers/net/{ => ethernet}/sfc/phy.h               |    0
2814  drivers/net/{ => ethernet}/sfc/qt202x_phy.c        |    0
2815  drivers/net/{ => ethernet}/sfc/regs.h              |    0
2816  drivers/net/{ => ethernet}/sfc/rx.c                |    0
2817  drivers/net/{ => ethernet}/sfc/selftest.c          |    0
2818  drivers/net/{ => ethernet}/sfc/selftest.h          |    0
2819  drivers/net/{ => ethernet}/sfc/siena.c             |    0
2820  drivers/net/{ => ethernet}/sfc/spi.h               |    0
2821  drivers/net/{ => ethernet}/sfc/tenxpress.c         |    0
2822  drivers/net/{ => ethernet}/sfc/tx.c                |    0
2823  drivers/net/{ => ethernet}/sfc/txc43128_phy.c      |    0
2824  drivers/net/{ => ethernet}/sfc/workarounds.h       |    0
2825  drivers/net/ethernet/sgi/Kconfig                   |   34 +
2826  drivers/net/ethernet/sgi/Makefile                  |    6 +
2827  drivers/net/{ => ethernet/sgi}/ioc3-eth.c          |    2 +-
2828  drivers/net/{ => ethernet/sgi}/meth.c              |    0
2829  drivers/net/{ => ethernet/sgi}/meth.h              |    0
2830  drivers/net/ethernet/sis/Kconfig                   |   50 +
2831  drivers/net/ethernet/sis/Makefile                  |    6 +
2832  drivers/net/{ => ethernet/sis}/sis190.c            |    2 +-
2833  drivers/net/{ => ethernet/sis}/sis900.c            |    2 +-
2834  drivers/net/{ => ethernet/sis}/sis900.h            |    0
2835  drivers/net/ethernet/smsc/Kconfig                  |  131 +
2836  drivers/net/ethernet/smsc/Makefile                 |   11 +
2837  drivers/net/{ => ethernet/smsc}/epic100.c          |    2 +-
2838  drivers/net/{ => ethernet/smsc}/smc911x.c          |    2 +-
2839  drivers/net/{ => ethernet/smsc}/smc911x.h          |    0
2840  drivers/net/{ => ethernet/smsc}/smc9194.c          |    2 +-
2841  drivers/net/{ => ethernet/smsc}/smc9194.h          |    0
2842  .../net/{pcmcia => ethernet/smsc}/smc91c92_cs.c    |    2 +-
2843  drivers/net/{ => ethernet/smsc}/smc91x.c           |    2 +-
2844  drivers/net/{ => ethernet/smsc}/smc91x.h           |    0
2845  drivers/net/{ => ethernet/smsc}/smsc911x.c         |   87 +-
2846  drivers/net/{ => ethernet/smsc}/smsc911x.h         |    0
2847  drivers/net/{ => ethernet/smsc}/smsc9420.c         |    2 +-
2848  drivers/net/{ => ethernet/smsc}/smsc9420.h         |    0
2849  drivers/net/ethernet/stmicro/Kconfig               |   22 +
2850  drivers/net/ethernet/stmicro/Makefile              |    5 +
2851  drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig  |   14 +-
2852  drivers/net/{ => ethernet/stmicro}/stmmac/Makefile |    0
2853  drivers/net/{ => ethernet/stmicro}/stmmac/common.h |    0
2854  drivers/net/{ => ethernet/stmicro}/stmmac/descs.h  |    0
2855  .../net/{ => ethernet/stmicro}/stmmac/dwmac100.h   |    0
2856  .../net/{ => ethernet/stmicro}/stmmac/dwmac1000.h  |    0
2857  .../{ => ethernet/stmicro}/stmmac/dwmac1000_core.c |    0
2858  .../{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c  |    0
2859  .../{ => ethernet/stmicro}/stmmac/dwmac100_core.c  |    0
2860  .../{ => ethernet/stmicro}/stmmac/dwmac100_dma.c   |    0
2861  .../net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h  |    0
2862  .../net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c  |    0
2863  .../net/{ => ethernet/stmicro}/stmmac/enh_desc.c   |    0
2864  .../net/{ => ethernet/stmicro}/stmmac/norm_desc.c  |    0
2865  drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h |    0
2866  .../{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c |    0
2867  .../{ => ethernet/stmicro}/stmmac/stmmac_main.c    |   13 +-
2868  .../{ => ethernet/stmicro}/stmmac/stmmac_mdio.c    |    0
2869  .../{ => ethernet/stmicro}/stmmac/stmmac_timer.c   |    0
2870  .../{ => ethernet/stmicro}/stmmac/stmmac_timer.h   |    0
2871  drivers/net/ethernet/sun/Kconfig                   |   87 +
2872  drivers/net/ethernet/sun/Makefile                  |   11 +
2873  drivers/net/{ => ethernet/sun}/cassini.c           |    2 +-
2874  drivers/net/{ => ethernet/sun}/cassini.h           |    0
2875  drivers/net/{ => ethernet/sun}/niu.c               |    5 +-
2876  drivers/net/{ => ethernet/sun}/niu.h               |    0
2877  drivers/net/{ => ethernet/sun}/sunbmac.c           |    2 +-
2878  drivers/net/{ => ethernet/sun}/sunbmac.h           |    0
2879  drivers/net/{ => ethernet/sun}/sungem.c            |    6 +-
2880  drivers/net/{ => ethernet/sun}/sungem.h            |    0
2881  drivers/net/{ => ethernet/sun}/sunhme.c            |    2 +-
2882  drivers/net/{ => ethernet/sun}/sunhme.h            |    0
2883  drivers/net/{ => ethernet/sun}/sunqe.c             |    2 +-
2884  drivers/net/{ => ethernet/sun}/sunqe.h             |    0
2885  drivers/net/{ => ethernet/sun}/sunvnet.c           |    2 +-
2886  drivers/net/{ => ethernet/sun}/sunvnet.h           |    0
2887  drivers/net/ethernet/tehuti/Kconfig                |   26 +
2888  drivers/net/ethernet/tehuti/Makefile               |    5 +
2889  drivers/net/{ => ethernet/tehuti}/tehuti.c         |    2 +-
2890  drivers/net/{ => ethernet/tehuti}/tehuti.h         |    0
2891  drivers/net/ethernet/ti/Kconfig                    |   76 +
2892  drivers/net/ethernet/ti/Makefile                   |    9 +
2893  drivers/net/{ => ethernet/ti}/cpmac.c              |    2 +-
2894  drivers/net/{ => ethernet/ti}/davinci_cpdma.c      |    0
2895  drivers/net/{ => ethernet/ti}/davinci_cpdma.h      |    0
2896  drivers/net/{ => ethernet/ti}/davinci_emac.c       |    2 +-
2897  drivers/net/{ => ethernet/ti}/davinci_mdio.c       |    0
2898  drivers/net/{ => ethernet/ti}/tlan.c               |    2 +-
2899  drivers/net/{ => ethernet/ti}/tlan.h               |    0
2900  drivers/net/ethernet/tile/Kconfig                  |   15 +
2901  drivers/net/{ => ethernet}/tile/Makefile           |    0
2902  drivers/net/{ => ethernet}/tile/tilepro.c          |    0
2903  drivers/net/ethernet/toshiba/Kconfig               |   56 +
2904  drivers/net/ethernet/toshiba/Makefile              |   10 +
2905  drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c |    2 +-
2906  drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h |    0
2907  .../{ => ethernet/toshiba}/ps3_gelic_wireless.c    |    2 +-
2908  .../{ => ethernet/toshiba}/ps3_gelic_wireless.h    |    0
2909  drivers/net/{ => ethernet/toshiba}/spider_net.c    |    6 +-
2910  drivers/net/{ => ethernet/toshiba}/spider_net.h    |    2 +-
2911  .../{ => ethernet/toshiba}/spider_net_ethtool.c    |    0
2912  drivers/net/{ => ethernet/toshiba}/tc35815.c       |    2 +-
2913  drivers/net/ethernet/tundra/Kconfig                |   28 +
2914  drivers/net/ethernet/tundra/Makefile               |    5 +
2915  drivers/net/{ => ethernet/tundra}/tsi108_eth.c     |    2 +-
2916  drivers/net/{ => ethernet/tundra}/tsi108_eth.h     |    0
2917  drivers/net/ethernet/via/Kconfig                   |   56 +
2918  drivers/net/ethernet/via/Makefile                  |    6 +
2919  drivers/net/{ => ethernet/via}/via-rhine.c         |    2 +-
2920  drivers/net/{ => ethernet/via}/via-velocity.c      |  148 +-
2921  drivers/net/{ => ethernet/via}/via-velocity.h      |    0
2922  drivers/net/ethernet/xilinx/Kconfig                |   35 +
2923  drivers/net/ethernet/xilinx/Makefile               |    7 +
2924  drivers/net/{ => ethernet/xilinx}/ll_temac.h       |    0
2925  drivers/net/{ => ethernet/xilinx}/ll_temac_main.c  |    1 -
2926  drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c  |    0
2927  .../net/{ => ethernet/xilinx}/xilinx_emaclite.c    |    0
2928  drivers/net/ethernet/xircom/Kconfig                |   30 +
2929  drivers/net/ethernet/xircom/Makefile               |    5 +
2930  .../net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c   |    2 +-
2931  drivers/net/ethernet/xscale/Kconfig                |   31 +
2932  drivers/net/ethernet/xscale/Makefile               |    6 +
2933  drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig  |    2 +-
2934  drivers/net/{ => ethernet/xscale}/ixp2000/Makefile |    0
2935  drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c  |    0
2936  drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h  |    0
2937  .../net/{ => ethernet/xscale}/ixp2000/enp2611.c    |    0
2938  .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.c    |    0
2939  .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.h    |    0
2940  .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc    |    0
2941  .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode |    0
2942  .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc    |    0
2943  .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode |    0
2944  drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c |    0
2945  drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h |    0
2946  .../{ => ethernet/xscale}/ixp2000/ixpdev_priv.h    |    0
2947  drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c |    0
2948  drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h |    0
2949  drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c  |    2 +-
2950  drivers/net/ibm_newemac/Makefile                   |   11 -
2951  drivers/net/macvlan.c                              |    2 +-
2952  drivers/net/octeon/Makefile                        |    2 -
2953  drivers/net/pci-skeleton.c                         | 1923 ------
2954  drivers/net/pcmcia/Kconfig                         |   78 -
2955  drivers/net/pcmcia/Makefile                        |    8 -
2956  drivers/net/skfp/skfddi.c                          |    2 +-
2957  drivers/net/slip.c                                 |   29 +-
2958  drivers/net/slip.h                                 |    9 -
2959  drivers/net/sungem_phy.c                           |    7 +-
2960  drivers/net/tokenring/3c359.c                      |    2 +-
2961  drivers/net/tokenring/ibmtr.c                      |    2 +-
2962  drivers/net/tokenring/lanstreamer.c                |    2 +-
2963  drivers/net/tokenring/olympic.c                    |    2 +-
2964  drivers/net/tokenring/smctr.c                      |    2 +-
2965  drivers/net/tokenring/tms380tr.c                   |    2 +-
2966  drivers/net/tun.c                                  |    2 +-
2967  drivers/net/usb/asix.c                             |    6 +-
2968  drivers/net/usb/catc.c                             |    2 +-
2969  drivers/net/usb/dm9601.c                           |    2 +-
2970  drivers/net/usb/int51x1.c                          |    2 +-
2971  drivers/net/usb/kaweth.c                           |    2 +-
2972  drivers/net/usb/lg-vl600.c                         |   19 +
2973  drivers/net/usb/mcs7830.c                          |    2 +-
2974  drivers/net/usb/pegasus.c                          |    2 +-
2975  drivers/net/usb/rtl8150.c                          |    2 +-
2976  drivers/net/usb/smsc75xx.c                         |    2 +-
2977  drivers/net/usb/smsc95xx.c                         |    2 +-
2978  drivers/net/virtio_net.c                           |    1 +
2979  drivers/net/vmxnet3/vmxnet3_drv.c                  |    2 +-
2980  drivers/net/wan/hdlc_ppp.c                         |   14 +-
2981  drivers/net/wan/sbni.c                             |    2 +-
2982  drivers/net/wireless/airo.c                        |    4 +-
2983  drivers/net/wireless/ath/Kconfig                   |    1 +
2984  drivers/net/wireless/ath/Makefile                  |    1 +
2985  drivers/net/wireless/ath/ath5k/ahb.c               |    4 +-
2986  drivers/net/wireless/ath/ath5k/ani.c               |    1 -
2987  drivers/net/wireless/ath/ath5k/ani.h               |    4 +
2988  drivers/net/wireless/ath/ath5k/ath5k.h             |   98 +-
2989  drivers/net/wireless/ath/ath5k/attach.c            |   18 +-
2990  drivers/net/wireless/ath/ath5k/base.c              |   31 +-
2991  drivers/net/wireless/ath/ath5k/base.h              |   55 +-
2992  drivers/net/wireless/ath/ath5k/caps.c              |    2 +-
2993  drivers/net/wireless/ath/ath5k/debug.c             |   15 +-
2994  drivers/net/wireless/ath/ath5k/desc.c              |    1 -
2995  drivers/net/wireless/ath/ath5k/dma.c               |    1 -
2996  drivers/net/wireless/ath/ath5k/eeprom.c            |   10 +-
2997  drivers/net/wireless/ath/ath5k/gpio.c              |    1 -
2998  drivers/net/wireless/ath/ath5k/initvals.c          |    1 -
2999  drivers/net/wireless/ath/ath5k/led.c               |    1 -
3000  drivers/net/wireless/ath/ath5k/mac80211-ops.c      |    5 +-
3001  drivers/net/wireless/ath/ath5k/pci.c               |    4 +-
3002  drivers/net/wireless/ath/ath5k/pcu.c               |    5 +-
3003  drivers/net/wireless/ath/ath5k/phy.c               |   91 +-
3004  drivers/net/wireless/ath/ath5k/qcu.c               |   10 +-
3005  drivers/net/wireless/ath/ath5k/reset.c             |   79 +-
3006  drivers/net/wireless/ath/ath5k/rfkill.c            |    2 +-
3007  drivers/net/wireless/ath/ath5k/sysfs.c             |    1 -
3008  drivers/net/wireless/ath/ath5k/trace.h             |    3 +-
3009  drivers/net/wireless/ath/ath6kl/Kconfig            |   15 +
3010  drivers/net/wireless/ath/ath6kl/Makefile           |   35 +
3011  drivers/net/wireless/ath/ath6kl/bmi.c              |  692 +++
3012  drivers/net/wireless/ath/ath6kl/bmi.h              |  250 +
3013  drivers/net/wireless/ath/ath6kl/cfg80211.c         | 1538 +++++
3014  drivers/net/wireless/ath/ath6kl/cfg80211.h         |   39 +
3015  drivers/net/wireless/ath/ath6kl/common.h           |  180 +
3016  drivers/net/wireless/ath/ath6kl/core.h             |  544 ++
3017  drivers/net/wireless/ath/ath6kl/debug.c            |  150 +
3018  drivers/net/wireless/ath/ath6kl/debug.h            |  105 +
3019  drivers/net/wireless/ath/ath6kl/hif-ops.h          |   72 +
3020  drivers/net/wireless/ath/ath6kl/hif.h              |  207 +
3021  drivers/net/wireless/ath/ath6kl/htc.c              | 2457 ++++++++
3022  drivers/net/wireless/ath/ath6kl/htc.h              |  607 ++
3023  drivers/net/wireless/ath/ath6kl/htc_hif.c          |  641 ++
3024  drivers/net/wireless/ath/ath6kl/htc_hif.h          |   92 +
3025  drivers/net/wireless/ath/ath6kl/init.c             | 1303 ++++
3026  drivers/net/wireless/ath/ath6kl/main.c             | 1337 ++++
3027  drivers/net/wireless/ath/ath6kl/node.c             |  234 +
3028  drivers/net/wireless/ath/ath6kl/sdio.c             |  912 +++
3029  drivers/net/wireless/ath/ath6kl/target.h           |  331 +
3030  drivers/net/wireless/ath/ath6kl/txrx.c             | 1457 +++++
3031  drivers/net/wireless/ath/ath6kl/wmi.c              | 2743 +++++++++
3032  drivers/net/wireless/ath/ath6kl/wmi.h              | 2018 ++++++
3033  drivers/net/wireless/ath/ath9k/ahb.c               |    2 +-
3034  .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h   |  190 +-
3035  drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |  150 +-
3036  drivers/net/wireless/ath/ath9k/ar9003_mac.c        |   15 +-
3037  drivers/net/wireless/ath/ath9k/ar9003_phy.c        |    4 +-
3038  drivers/net/wireless/ath/ath9k/ath9k.h             |    6 +-
3039  drivers/net/wireless/ath/ath9k/beacon.c            |   18 +-
3040  drivers/net/wireless/ath/ath9k/calib.c             |   15 +
3041  drivers/net/wireless/ath/ath9k/calib.h             |    1 +
3042  drivers/net/wireless/ath/ath9k/debug.c             |   60 +
3043  drivers/net/wireless/ath/ath9k/eeprom.h            |    2 +
3044  drivers/net/wireless/ath/ath9k/eeprom_4k.c         |  135 +-
3045  drivers/net/wireless/ath/ath9k/eeprom_9287.c       |  122 +-
3046  drivers/net/wireless/ath/ath9k/eeprom_def.c        |  150 +-
3047  drivers/net/wireless/ath/ath9k/gpio.c              |    2 +
3048  drivers/net/wireless/ath/ath9k/htc.h               |    3 -
3049  drivers/net/wireless/ath/ath9k/htc_drv_init.c      |    1 -
3050  drivers/net/wireless/ath/ath9k/hw.c                |   10 +-
3051  drivers/net/wireless/ath/ath9k/hw.h                |    9 +-
3052  drivers/net/wireless/ath/ath9k/init.c              |    8 +-
3053  drivers/net/wireless/ath/ath9k/mac.c               |   16 +-
3054  drivers/net/wireless/ath/ath9k/main.c              |   10 +-
3055  drivers/net/wireless/ath/ath9k/pci.c               |    4 +-
3056  drivers/net/wireless/ath/ath9k/rc.c                |    4 +-
3057  drivers/net/wireless/ath/ath9k/rc.h                |    6 -
3058  drivers/net/wireless/ath/ath9k/recv.c              |   10 +-
3059  drivers/net/wireless/ath/ath9k/xmit.c              |   12 +-
3060  drivers/net/wireless/ath/regd.h                    |    2 +-
3061  drivers/net/wireless/ath/regd_common.h             |    2 +-
3062  drivers/net/wireless/b43/Kconfig                   |    6 +-
3063  drivers/net/wireless/b43/main.c                    |    2 +-
3064  drivers/net/wireless/b43legacy/b43legacy.h         |    1 -
3065  drivers/net/wireless/b43legacy/dma.c               |  374 +-
3066  drivers/net/wireless/b43legacy/dma.h               |  107 -
3067  drivers/net/wireless/b43legacy/main.c              |    4 +-
3068  drivers/net/wireless/hostap/hostap_main.c          |    6 +-
3069  drivers/net/wireless/ipw2x00/ipw2200.c             |    3 +-
3070  drivers/net/wireless/iwlegacy/iwl-3945-led.c       |    1 -
3071  drivers/net/wireless/iwlegacy/iwl-3945-rs.c        |    1 -
3072  drivers/net/wireless/iwlegacy/iwl-3945.c           |    1 -
3073  drivers/net/wireless/iwlegacy/iwl-4965-led.c       |    1 -
3074  drivers/net/wireless/iwlegacy/iwl-4965-rs.c        |    1 -
3075  drivers/net/wireless/iwlegacy/iwl-4965.c           |    1 -
3076  drivers/net/wireless/iwlegacy/iwl-led.c            |    1 -
3077  drivers/net/wireless/iwlegacy/iwl3945-base.c       |    1 -
3078  drivers/net/wireless/iwlegacy/iwl4965-base.c       |    1 -
3079  drivers/net/wireless/iwlwifi/Kconfig               |   17 -
3080  drivers/net/wireless/iwlwifi/iwl-1000.c            |   16 +-
3081  drivers/net/wireless/iwlwifi/iwl-2000.c            |   24 +-
3082  drivers/net/wireless/iwlwifi/iwl-5000.c            |   13 +-
3083  drivers/net/wireless/iwlwifi/iwl-6000.c            |   20 +-
3084  drivers/net/wireless/iwlwifi/iwl-agn-calib.c       |   69 +-
3085  drivers/net/wireless/iwlwifi/iwl-agn-hw.h          |    4 +-
3086  drivers/net/wireless/iwlwifi/iwl-agn-lib.c         |   47 +-
3087  drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |    1 -
3088  drivers/net/wireless/iwlwifi/iwl-agn-rxon.c        |   23 +-
3089  drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |   30 +-
3090  drivers/net/wireless/iwlwifi/iwl-agn.c             |  388 +-
3091  drivers/net/wireless/iwlwifi/iwl-agn.h             |    1 +
3092  drivers/net/wireless/iwlwifi/iwl-commands.h        |   34 +-
3093  drivers/net/wireless/iwlwifi/iwl-core.c            |    5 +
3094  drivers/net/wireless/iwlwifi/iwl-core.h            |    5 +
3095  drivers/net/wireless/iwlwifi/iwl-dev.h             |   29 +-
3096  drivers/net/wireless/iwlwifi/iwl-led.c             |    1 -
3097  drivers/net/wireless/iwlwifi/iwl-scan.c            |   19 +-
3098  drivers/net/wireless/iwlwifi/iwl-trans.c           |   10 +-
3099  drivers/net/wireless/libertas/cfg.c                |   69 +-
3100  drivers/net/wireless/libertas/cfg.h                |    1 +
3101  drivers/net/wireless/libertas/cmd.c                |    6 +-
3102  drivers/net/wireless/libertas/decl.h               |    4 +
3103  drivers/net/wireless/libertas/dev.h                |   28 +-
3104  drivers/net/wireless/libertas/ethtool.c            |    1 +
3105  drivers/net/wireless/libertas/if_sdio.c            |  277 +-
3106  drivers/net/wireless/libertas/if_spi.c             |    4 -
3107  drivers/net/wireless/libertas/if_usb.c             |   13 +-
3108  drivers/net/wireless/libertas/main.c               |  182 +-
3109  drivers/net/wireless/libertas/mesh.c               |   79 +-
3110  drivers/net/wireless/libertas/mesh.h               |   27 +-
3111  drivers/net/wireless/libertas/rx.c                 |    1 +
3112  drivers/net/wireless/libertas/tx.c                 |    1 +
3113  drivers/net/wireless/mac80211_hwsim.c              |    6 +
3114  drivers/net/wireless/mwifiex/cfg80211.c            |  209 +-
3115  drivers/net/wireless/mwifiex/fw.h                  |   15 +-
3116  drivers/net/wireless/mwifiex/init.c                |   21 -
3117  drivers/net/wireless/mwifiex/ioctl.h               |    5 +-
3118  drivers/net/wireless/mwifiex/join.c                |   32 -
3119  drivers/net/wireless/mwifiex/main.c                |    6 +-
3120  drivers/net/wireless/mwifiex/main.h                |   55 +-
3121  drivers/net/wireless/mwifiex/scan.c                | 1578 +----
3122  drivers/net/wireless/mwifiex/sta_event.c           |    9 +-
3123  drivers/net/wireless/mwifiex/sta_ioctl.c           |  230 +-
3124  drivers/net/wireless/orinoco/main.c                |    2 +-
3125  drivers/net/wireless/orinoco/orinoco_usb.c         |    2 +-
3126  drivers/net/wireless/orinoco/wext.c                |    1 +
3127  drivers/net/wireless/ray_cs.c                      |    2 +-
3128  drivers/net/wireless/rndis_wlan.c                  |    4 +-
3129  drivers/net/wireless/rt2x00/rt2400pci.c            |   39 +-
3130  drivers/net/wireless/rt2x00/rt2500pci.c            |   39 +-
3131  drivers/net/wireless/rt2x00/rt2800pci.c            |   46 +-
3132  drivers/net/wireless/rt2x00/rt2x00dev.c            |    1 -
3133  drivers/net/wireless/rt2x00/rt61pci.c              |   34 +-
3134  drivers/net/wireless/rtlwifi/pci.c                 |   37 +-
3135  drivers/net/wireless/rtlwifi/pci.h                 |   26 -
3136  drivers/net/wireless/wl1251/cmd.h                  |    2 +-
3137  drivers/net/wireless/wl1251/wl12xx_80211.h         |    2 +-
3138  drivers/net/wireless/wl12xx/cmd.h                  |    4 +-
3139  drivers/net/wireless/wl12xx/main.c                 |    2 +-
3140  drivers/net/wireless/wl12xx/scan.h                 |    6 +-
3141  drivers/net/wireless/wl12xx/wl12xx.h               |    4 +-
3142  drivers/net/wireless/wl12xx/wl12xx_80211.h         |    2 +-
3143  drivers/net/wireless/zd1201.c                      |    2 +-
3144  drivers/s390/cio/qdio.h                            |   38 +-
3145  drivers/s390/cio/qdio_debug.c                      |    3 +
3146  drivers/s390/cio/qdio_main.c                       |  208 +-
3147  drivers/s390/cio/qdio_setup.c                      |   83 +-
3148  drivers/s390/cio/qdio_thinint.c                    |   88 +-
3149  drivers/s390/net/lcs.c                             |    2 +-
3150  drivers/s390/net/qeth_core.h                       |   50 +-
3151  drivers/s390/net/qeth_core_main.c                  |  777 ++-
3152  drivers/s390/net/qeth_l2_main.c                    |    4 +-
3153  drivers/s390/net/qeth_l3.h                         |    4 +
3154  drivers/s390/net/qeth_l3_main.c                    |   92 +-
3155  drivers/s390/net/qeth_l3_sys.c                     |  110 +-
3156  drivers/scsi/bnx2fc/Kconfig                        |    3 +-
3157  drivers/scsi/bnx2fc/bnx2fc.h                       |    2 +-
3158  drivers/scsi/bnx2i/Kconfig                         |    3 +-
3159  drivers/scsi/bnx2i/bnx2i.h                         |    2 +-
3160  drivers/scsi/cxgbi/cxgb3i/Kbuild                   |    2 +-
3161  drivers/scsi/cxgbi/cxgb3i/Kconfig                  |    3 +-
3162  drivers/scsi/cxgbi/cxgb4i/Kbuild                   |    2 +-
3163  drivers/scsi/cxgbi/cxgb4i/Kconfig                  |    3 +-
3164  drivers/staging/Kconfig                            |    2 -
3165  drivers/staging/Makefile                           |    1 -
3166  drivers/staging/ath6kl/Kconfig                     |  158 -
3167  drivers/staging/ath6kl/Makefile                    |  122 -
3168  drivers/staging/ath6kl/TODO                        |   25 -
3169  drivers/staging/ath6kl/bmi/include/bmi_internal.h  |   54 -
3170  drivers/staging/ath6kl/bmi/src/bmi.c               | 1010 ---
3171  .../staging/ath6kl/hif/common/hif_sdio_common.h    |   87 -
3172  .../hif/sdio/linux_sdio/include/hif_internal.h     |  131 -
3173  .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c   | 1273 ----
3174  .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c   |  393 --
3175  drivers/staging/ath6kl/htc2/AR6000/ar6k.c          | 1479 -----
3176  drivers/staging/ath6kl/htc2/AR6000/ar6k.h          |  401 --
3177  drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c   |  783 ---
3178  drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c    |  755 ---
3179  .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c        | 1284 ----
3180  drivers/staging/ath6kl/htc2/htc.c                  |  575 --
3181  drivers/staging/ath6kl/htc2/htc_debug.h            |   38 -
3182  drivers/staging/ath6kl/htc2/htc_internal.h         |  211 -
3183  drivers/staging/ath6kl/htc2/htc_recv.c             | 1572 -----
3184  drivers/staging/ath6kl/htc2/htc_send.c             | 1018 ---
3185  drivers/staging/ath6kl/htc2/htc_services.c         |  450 --
3186  drivers/staging/ath6kl/include/a_config.h          |   31 -
3187  drivers/staging/ath6kl/include/a_debug.h           |  195 -
3188  drivers/staging/ath6kl/include/a_drv.h             |   32 -
3189  drivers/staging/ath6kl/include/a_drv_api.h         |  204 -
3190  drivers/staging/ath6kl/include/a_osapi.h           |   32 -
3191  drivers/staging/ath6kl/include/aggr_recv_api.h     |  140 -
3192  drivers/staging/ath6kl/include/ar3kconfig.h        |   65 -
3193  drivers/staging/ath6kl/include/ar6000_api.h        |   32 -
3194  drivers/staging/ath6kl/include/ar6000_diag.h       |   48 -
3195  drivers/staging/ath6kl/include/ar6kap_common.h     |   44 -
3196  drivers/staging/ath6kl/include/athbtfilter.h       |  135 -
3197  drivers/staging/ath6kl/include/bmi.h               |  134 -
3198  .../ath6kl/include/common/AR6002/AR6K_version.h    |   52 -
3199  .../staging/ath6kl/include/common/AR6002/addrs.h   |   90 -
3200  .../common/AR6002/hw4.0/hw/apb_athr_wlan_map.h     |   40 -
3201  .../include/common/AR6002/hw4.0/hw/apb_map.h       |   40 -
3202  .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h |   24 -
3203  .../include/common/AR6002/hw4.0/hw/mbox_reg.h      |  552 --
3204  .../common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h    |  471 --
3205  .../include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h |  589 --
3206  .../include/common/AR6002/hw4.0/hw/rtc_reg.h       |  187 -
3207  .../include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h  |  162 -
3208  .../include/common/AR6002/hw4.0/hw/uart_reg.h      |   40 -
3209  drivers/staging/ath6kl/include/common/athdefs.h    |   75 -
3210  drivers/staging/ath6kl/include/common/bmi_msg.h    |  233 -
3211  drivers/staging/ath6kl/include/common/cnxmgmt.h    |   36 -
3212  drivers/staging/ath6kl/include/common/dbglog.h     |  126 -
3213  drivers/staging/ath6kl/include/common/dbglog_id.h  |  558 --
3214  drivers/staging/ath6kl/include/common/discovery.h  |   75 -
3215  .../staging/ath6kl/include/common/epping_test.h    |  111 -
3216  drivers/staging/ath6kl/include/common/gmboxif.h    |   70 -
3217  drivers/staging/ath6kl/include/common/gpio_reg.h   |    9 -
3218  drivers/staging/ath6kl/include/common/htc.h        |  227 -
3219  .../staging/ath6kl/include/common/htc_services.h   |   52 -
3220  drivers/staging/ath6kl/include/common/pkt_log.h    |   45 -
3221  drivers/staging/ath6kl/include/common/roaming.h    |   41 -
3222  drivers/staging/ath6kl/include/common/targaddrs.h  |  395 --
3223  drivers/staging/ath6kl/include/common/testcmd.h    |  185 -
3224  drivers/staging/ath6kl/include/common/tlpm.h       |   38 -
3225  drivers/staging/ath6kl/include/common/wlan_defs.h  |   79 -
3226  drivers/staging/ath6kl/include/common/wmi.h        | 3220 ----------
3227  drivers/staging/ath6kl/include/common/wmix.h       |  271 -
3228  drivers/staging/ath6kl/include/common_drv.h        |  104 -
3229  drivers/staging/ath6kl/include/dbglog_api.h        |   52 -
3230  drivers/staging/ath6kl/include/dl_list.h           |  153 -
3231  drivers/staging/ath6kl/include/dset_api.h          |   65 -
3232  drivers/staging/ath6kl/include/hci_transport_api.h |  259 -
3233  drivers/staging/ath6kl/include/hif.h               |  456 --
3234  drivers/staging/ath6kl/include/host_version.h      |   52 -
3235  drivers/staging/ath6kl/include/htc_api.h           |  575 --
3236  drivers/staging/ath6kl/include/htc_packet.h        |  227 -
3237  drivers/staging/ath6kl/include/wlan_api.h          |  128 -
3238  drivers/staging/ath6kl/include/wmi_api.h           |  441 --
3239  drivers/staging/ath6kl/miscdrv/ar3kconfig.c        |  565 --
3240  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c   |  572 --
3241  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h   |   75 -
3242  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c   |  969 ---
3243  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h   |  113 -
3244  drivers/staging/ath6kl/miscdrv/common_drv.c        |  910 ---
3245  drivers/staging/ath6kl/miscdrv/credit_dist.c       |  417 --
3246  drivers/staging/ath6kl/miscdrv/miscdrv.h           |   42 -
3247  drivers/staging/ath6kl/os/linux/ar6000_drv.c       | 6267 -------------------
3248  drivers/staging/ath6kl/os/linux/ar6000_pm.c        |  626 --
3249  drivers/staging/ath6kl/os/linux/ar6000_raw_if.c    |  455 --
3250  drivers/staging/ath6kl/os/linux/cfg80211.c         | 1892 ------
3251  .../staging/ath6kl/os/linux/export_hci_transport.c |  124 -
3252  drivers/staging/ath6kl/os/linux/hci_bridge.c       | 1141 ----
3253  .../staging/ath6kl/os/linux/include/ar6000_drv.h   |  776 ---
3254  drivers/staging/ath6kl/os/linux/include/ar6k_pal.h |   36 -
3255  .../ath6kl/os/linux/include/ar6xapi_linux.h        |  190 -
3256  .../staging/ath6kl/os/linux/include/athdrv_linux.h | 1217 ----
3257  drivers/staging/ath6kl/os/linux/include/cfg80211.h |   61 -
3258  .../staging/ath6kl/os/linux/include/config_linux.h |   51 -
3259  .../staging/ath6kl/os/linux/include/debug_linux.h  |   50 -
3260  .../ath6kl/os/linux/include/export_hci_transport.h |   76 -
3261  .../ath6kl/os/linux/include/ieee80211_ioctl.h      |  177 -
3262  .../staging/ath6kl/os/linux/include/osapi_linux.h  |  339 -
3263  .../staging/ath6kl/os/linux/include/wlan_config.h  |  108 -
3264  .../ath6kl/os/linux/include/wmi_filter_linux.h     |  300 -
3265  drivers/staging/ath6kl/os/linux/netbuf.c           |  231 -
3266  drivers/staging/ath6kl/reorder/aggr_rx_internal.h  |  117 -
3267  drivers/staging/ath6kl/reorder/rcv_aggr.c          |  661 --
3268  drivers/staging/ath6kl/wlan/include/ieee80211.h    |  397 --
3269  .../staging/ath6kl/wlan/include/ieee80211_node.h   |   93 -
3270  drivers/staging/ath6kl/wlan/src/wlan_node.c        |  636 --
3271  drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c |  199 -
3272  drivers/staging/ath6kl/wlan/src/wlan_utils.c       |   58 -
3273  drivers/staging/ath6kl/wmi/wmi.c                   | 6444 --------------------
3274  drivers/staging/ath6kl/wmi/wmi_host.h              |  102 -
3275  drivers/staging/brcm80211/brcmfmac/dhd_linux.c     |    2 +-
3276  drivers/staging/et131x/et131x_netdev.c             |    2 +-
3277  drivers/staging/hv/netvsc_drv.c                    |    2 +-
3278  drivers/staging/octeon/ethernet.c                  |   12 +-
3279  drivers/staging/rtl8187se/r8180_core.c             |    2 +-
3280  drivers/staging/rtl8192e/r8192E_core.c             |    2 +-
3281  drivers/staging/rtl8192u/r8192U_core.c             |    2 +-
3282  drivers/staging/slicoss/slicoss.c                  |    2 +-
3283  drivers/staging/vt6655/device_main.c               |    2 +-
3284  drivers/staging/vt6656/main_usb.c                  |    2 +-
3285  drivers/staging/wlags49_h2/wl_netdev.c             |    2 +-
3286  drivers/staging/wlan-ng/p80211netdev.c             |    2 +-
3287  drivers/watchdog/bcm47xx_wdt.c                     |   27 +-
3288  include/linux/bcma/bcma.h                          |    9 +-
3289  include/linux/bcma/bcma_driver_chipcommon.h        |   67 +
3290  include/linux/bcma/bcma_driver_mips.h              |   51 +
3291  include/linux/bcma/bcma_soc.h                      |   16 +
3292  include/linux/ethtool.h                            |  144 +-
3293  include/linux/if.h                                 |    1 +
3294  include/linux/if_ether.h                           |    1 +
3295  include/linux/netdevice.h                          |    6 +-
3296  include/linux/nl80211.h                            |   61 +-
3297  include/linux/skbuff.h                             |  177 +-
3298  include/linux/ssb/ssb_regs.h                       |   40 +
3299  {drivers/net => include/linux}/sungem_phy.h        |    2 +-
3300  include/net/addrconf.h                             |    2 +-
3301  include/net/cfg80211-wext.h                        |   55 +
3302  include/net/cfg80211.h                             |  279 +-
3303  include/net/dst.h                                  |    9 +-
3304  include/net/if_inet6.h                             |    1 +
3305  include/net/iucv/af_iucv.h                         |   52 +
3306  include/net/iucv/iucv.h                            |   36 +-
3307  include/net/lib80211.h                             |    3 -
3308  include/net/mac80211.h                             |   11 -
3309  include/net/sock.h                                 |   15 +-
3310  net/802/garp.c                                     |    4 +-
3311  net/802/stp.c                                      |    4 +-
3312  net/8021q/vlan.c                                   |    2 +-
3313  net/8021q/vlan_dev.c                               |    1 -
3314  net/atm/lec.c                                      |    2 +-
3315  net/bluetooth/bnep/netdev.c                        |    2 +-
3316  net/bridge/br_device.c                             |    2 +-
3317  net/bridge/netfilter/ebtable_broute.c              |    4 +-
3318  net/caif/cfmuxl.c                                  |    6 +-
3319  net/can/af_can.c                                   |    4 +-
3320  net/core/dev.c                                     |  102 +-
3321  net/core/dev_addr_lists.c                          |    4 +-
3322  net/core/dst.c                                     |   15 +-
3323  net/core/fib_rules.c                               |    4 +-
3324  net/core/filter.c                                  |    2 +-
3325  net/core/neighbour.c                               |   40 +-
3326  net/core/net-sysfs.c                               |    8 +-
3327  net/core/netpoll.c                                 |    4 +-
3328  net/core/rtnetlink.c                               |    1 -
3329  net/core/skbuff.c                                  |    2 +
3330  net/core/sock.c                                    |    4 +-
3331  net/dccp/ccids/ccid2.c                             |   84 +-
3332  net/dccp/ccids/ccid2.h                             |    6 +
3333  net/dccp/dccp.h                                    |    1 +
3334  net/dccp/feat.c                                    |  202 +-
3335  net/dccp/feat.h                                    |    1 +
3336  net/dccp/proto.c                                   |    1 -
3337  net/decnet/dn_dev.c                                |    6 +-
3338  net/dsa/slave.c                                    |    3 -
3339  net/ipv4/devinet.c                                 |    6 +-
3340  net/ipv4/fib_trie.c                                |   12 +-
3341  net/ipv4/gre.c                                     |    4 +-
3342  net/ipv4/igmp.c                                    |   12 +-
3343  net/ipv4/ipip.c                                    |   10 +-
3344  net/ipv4/ipmr.c                                    |    8 +-
3345  net/ipv4/netfilter/nf_nat_amanda.c                 |    4 +-
3346  net/ipv4/netfilter/nf_nat_core.c                   |   24 +-
3347  net/ipv4/netfilter/nf_nat_ftp.c                    |    4 +-
3348  net/ipv4/netfilter/nf_nat_h323.c                   |   36 +-
3349  net/ipv4/netfilter/nf_nat_irc.c                    |    4 +-
3350  net/ipv4/netfilter/nf_nat_pptp.c                   |   16 +-
3351  net/ipv4/netfilter/nf_nat_sip.c                    |   28 +-
3352  net/ipv4/netfilter/nf_nat_snmp_basic.c             |    4 +-
3353  net/ipv4/netfilter/nf_nat_standalone.c             |    6 +-
3354  net/ipv4/netfilter/nf_nat_tftp.c                   |    4 +-
3355  net/ipv4/route.c                                   |    6 +-
3356  net/ipv4/tcp_ipv4.c                                |    6 +-
3357  net/ipv4/udp.c                                     |   11 +-
3358  net/ipv6/addrconf.c                                |   73 +-
3359  net/ipv6/exthdrs.c                                 |    7 +-
3360  net/ipv6/icmp.c                                    |   25 +-
3361  net/ipv6/inet6_connection_sock.c                   |    9 +-
3362  net/ipv6/ip6_tunnel.c                              |   37 +-
3363  net/ipv6/ndisc.c                                   |   31 +-
3364  net/ipv6/raw.c                                     |    8 +-
3365  net/ipv6/sit.c                                     |   12 +-
3366  net/ipv6/tcp_ipv6.c                                |    6 +-
3367  net/ipv6/udp.c                                     |    4 +-
3368  net/irda/irlan/irlan_eth.c                         |    2 +-
3369  net/iucv/Kconfig                                   |   14 +-
3370  net/iucv/af_iucv.c                                 |  868 +++-
3371  net/iucv/iucv.c                                    |   23 +
3372  net/mac80211/agg-rx.c                              |    4 +-
3373  net/mac80211/agg-tx.c                              |   18 +-
3374  net/mac80211/cfg.c                                 |   47 +-
3375  net/mac80211/driver-ops.h                          |   31 -
3376  net/mac80211/ibss.c                                |    6 +-
3377  net/mac80211/ieee80211_i.h                         |   64 -
3378  net/mac80211/iface.c                               |    6 +-
3379  net/mac80211/main.c                                |    1 +
3380  net/mac80211/mesh_hwmp.c                           |    7 +-
3381  net/mac80211/mesh_pathtbl.c                        |    4 +-
3382  net/mac80211/rc80211_minstrel_ht.c                 |    8 +-
3383  net/mac80211/sta_info.c                            |    9 +-
3384  net/mac80211/status.c                              |    3 -
3385  net/mac80211/tx.c                                  |   20 +
3386  net/mac80211/util.c                                |  168 +-
3387  net/netfilter/core.c                               |    4 +-
3388  net/netfilter/nf_conntrack_core.c                  |   12 +-
3389  net/netfilter/nf_conntrack_ecache.c                |    8 +-
3390  net/netfilter/nf_conntrack_extend.c                |    4 +-
3391  net/netfilter/nf_conntrack_helper.c                |    6 +-
3392  net/netfilter/nf_conntrack_netlink.c               |    6 +-
3393  net/netfilter/nf_log.c                             |   10 +-
3394  net/netfilter/nf_queue.c                           |    6 +-
3395  net/netfilter/nfnetlink.c                          |    6 +-
3396  net/netlabel/netlabel_domainhash.c                 |    6 +-
3397  net/netlabel/netlabel_unlabeled.c                  |    6 +-
3398  net/netlink/af_netlink.c                           |    2 +-
3399  net/phonet/af_phonet.c                             |    4 +-
3400  net/phonet/pn_dev.c                                |    6 +-
3401  net/phonet/socket.c                                |    6 +-
3402  net/socket.c                                       |    4 +-
3403  net/sunrpc/auth_gss/auth_gss.c                     |    4 +-
3404  net/wireless/lib80211.c                            |   15 +-
3405  net/wireless/nl80211.c                             |   86 +-
3406  net/wireless/reg.c                                 |   14 +-
3407  net/wireless/scan.c                                |    1 +
3408  net/wireless/util.c                                |  168 +
3409  net/wireless/wext-compat.c                         |  137 +-
3410  net/wireless/wext-compat.h                         |    8 +
3411  net/wireless/wext-sme.c                            |    3 +-
3412  net/xfrm/xfrm_user.c                               |    4 +-
3413  1435 files changed, 42875 insertions(+), 73716 deletions(-)
3414  create mode 100644 Documentation/devicetree/bindings/net/smsc911x.txt
3415  create mode 100644 arch/mips/bcm47xx/Kconfig
3416  create mode 100644 drivers/bcma/driver_mips.c
3417  create mode 100644 drivers/bcma/host_soc.c
3418  delete mode 100644 drivers/net/arm/Kconfig
3419  delete mode 100644 drivers/net/arm/Makefile
3420  delete mode 100644 drivers/net/benet/Kconfig
3421  delete mode 100644 drivers/net/bna/bfi_ctreg.h
3422  delete mode 100644 drivers/net/bna/bfi_ll.h
3423  delete mode 100644 drivers/net/bna/bna_ctrl.c
3424  delete mode 100644 drivers/net/bna/bna_hw.h
3425  delete mode 100644 drivers/net/bna/bna_txrx.c
3426  rename drivers/net/{ => ethernet/3com}/3c501.c (99%)
3427  rename drivers/net/{ => ethernet/3com}/3c501.h (100%)
3428  rename drivers/net/{ => ethernet/3com}/3c509.c (99%)
3429  rename drivers/net/{ => ethernet/3com}/3c515.c (99%)
3430  rename drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c (99%)
3431  rename drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c (99%)
3432  rename drivers/net/{ => ethernet/3com}/3c59x.c (99%)
3433  create mode 100644 drivers/net/ethernet/3com/Kconfig
3434  create mode 100644 drivers/net/ethernet/3com/Makefile
3435  rename drivers/net/{ => ethernet/3com}/typhoon.c (99%)
3436  rename drivers/net/{ => ethernet/3com}/typhoon.h (100%)
3437  rename drivers/net/{ => ethernet/8390}/3c503.c (99%)
3438  rename drivers/net/{ => ethernet/8390}/3c503.h (100%)
3439  rename drivers/net/{ => ethernet/8390}/8390.c (97%)
3440  rename drivers/net/{ => ethernet/8390}/8390.h (100%)
3441  rename drivers/net/{ => ethernet/8390}/8390p.c (97%)
3442  create mode 100644 drivers/net/ethernet/8390/Kconfig
3443  create mode 100644 drivers/net/ethernet/8390/Makefile
3444  rename drivers/net/{ => ethernet/8390}/ac3200.c (99%)
3445  rename drivers/net/{ => ethernet/8390}/apne.c (100%)
3446  rename drivers/net/{ => ethernet/8390}/ax88796.c (99%)
3447  rename drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c (99%)
3448  rename drivers/net/{ => ethernet/8390}/e2100.c (99%)
3449  rename drivers/net/{ => ethernet/8390}/es3210.c (100%)
3450  rename drivers/net/{arm => ethernet/8390}/etherh.c (99%)
3451  rename drivers/net/{ => ethernet/8390}/hp-plus.c (99%)
3452  rename drivers/net/{ => ethernet/8390}/hp.c (100%)
3453  rename drivers/net/{ => ethernet/8390}/hydra.c (99%)
3454  rename drivers/net/{ => ethernet/8390}/lib8390.c (100%)
3455  rename drivers/net/{ => ethernet/8390}/lne390.c (100%)
3456  rename drivers/net/{ => ethernet/8390}/mac8390.c (99%)
3457  rename drivers/net/{ => ethernet/8390}/ne-h8300.c (99%)
3458  rename drivers/net/{ => ethernet/8390}/ne.c (100%)
3459  rename drivers/net/{ => ethernet/8390}/ne2.c (100%)
3460  rename drivers/net/{ => ethernet/8390}/ne2k-pci.c (99%)
3461  rename drivers/net/{ => ethernet/8390}/ne3210.c (100%)
3462  rename drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c (99%)
3463  rename drivers/net/{ => ethernet/8390}/smc-mca.c (99%)
3464  rename drivers/net/{ => ethernet/8390}/smc-ultra.c (99%)
3465  rename drivers/net/{ => ethernet/8390}/smc-ultra32.c (99%)
3466  rename drivers/net/{ => ethernet/8390}/stnic.c (100%)
3467  rename drivers/net/{ => ethernet/8390}/wd.c (99%)
3468  rename drivers/net/{ => ethernet/8390}/zorro8390.c (99%)
3469  create mode 100644 drivers/net/ethernet/Kconfig
3470  create mode 100644 drivers/net/ethernet/Makefile
3471  create mode 100644 drivers/net/ethernet/adaptec/Kconfig
3472  create mode 100644 drivers/net/ethernet/adaptec/Makefile
3473  rename drivers/net/{ => ethernet/adaptec}/starfire.c (99%)
3474  create mode 100644 drivers/net/ethernet/adi/Kconfig
3475  create mode 100644 drivers/net/ethernet/adi/Makefile
3476  rename drivers/net/{ => ethernet/adi}/bfin_mac.c (99%)
3477  rename drivers/net/{ => ethernet/adi}/bfin_mac.h (100%)
3478  create mode 100644 drivers/net/ethernet/aeroflex/Kconfig
3479  create mode 100644 drivers/net/ethernet/aeroflex/Makefile
3480  rename drivers/net/{ => ethernet/aeroflex}/greth.c (99%)
3481  rename drivers/net/{ => ethernet/aeroflex}/greth.h (100%)
3482  create mode 100644 drivers/net/ethernet/alteon/Kconfig
3483  create mode 100644 drivers/net/ethernet/alteon/Makefile
3484  rename drivers/net/{ => ethernet/alteon}/acenic.c (99%)
3485  rename drivers/net/{ => ethernet/alteon}/acenic.h (100%)
3486  rename drivers/net/{ => ethernet/amd}/7990.c (100%)
3487  rename drivers/net/{ => ethernet/amd}/7990.h (100%)
3488  create mode 100644 drivers/net/ethernet/amd/Kconfig
3489  create mode 100644 drivers/net/ethernet/amd/Makefile
3490  rename drivers/net/{ => ethernet/amd}/a2065.c (99%)
3491  rename drivers/net/{ => ethernet/amd}/a2065.h (100%)
3492  rename drivers/net/{arm => ethernet/amd}/am79c961a.c (99%)
3493  rename drivers/net/{arm => ethernet/amd}/am79c961a.h (100%)
3494  rename drivers/net/{ => ethernet/amd}/amd8111e.c (99%)
3495  rename drivers/net/{ => ethernet/amd}/amd8111e.h (100%)
3496  rename drivers/net/{ => ethernet/amd}/ariadne.c (99%)
3497  rename drivers/net/{ => ethernet/amd}/ariadne.h (100%)
3498  rename drivers/net/{ => ethernet/amd}/atarilance.c (99%)
3499  rename drivers/net/{ => ethernet/amd}/au1000_eth.c (99%)
3500  rename drivers/net/{ => ethernet/amd}/au1000_eth.h (100%)
3501  rename drivers/net/{ => ethernet/amd}/declance.c (99%)
3502  rename drivers/net/{ => ethernet/amd}/depca.c (99%)
3503  rename drivers/net/{ => ethernet/amd}/depca.h (100%)
3504  rename drivers/net/{ => ethernet/amd}/hplance.c (99%)
3505  rename drivers/net/{ => ethernet/amd}/hplance.h (100%)
3506  rename drivers/net/{ => ethernet/amd}/lance.c (99%)
3507  rename drivers/net/{ => ethernet/amd}/mvme147.c (99%)
3508  rename drivers/net/{ => ethernet/amd}/ni65.c (99%)
3509  rename drivers/net/{ => ethernet/amd}/ni65.h (100%)
3510  rename drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c (99%)
3511  rename drivers/net/{ => ethernet/amd}/pcnet32.c (99%)
3512  rename drivers/net/{ => ethernet/amd}/sun3lance.c (99%)
3513  rename drivers/net/{ => ethernet/amd}/sunlance.c (99%)
3514  create mode 100644 drivers/net/ethernet/apple/Kconfig
3515  create mode 100644 drivers/net/ethernet/apple/Makefile
3516  rename drivers/net/{ => ethernet/apple}/bmac.c (99%)
3517  rename drivers/net/{ => ethernet/apple}/bmac.h (100%)
3518  rename drivers/net/{ => ethernet/apple}/cs89x0.c (99%)
3519  rename drivers/net/{ => ethernet/apple}/cs89x0.h (100%)
3520  rename drivers/net/{ => ethernet/apple}/mac89x0.c (99%)
3521  rename drivers/net/{ => ethernet/apple}/mace.c (99%)
3522  rename drivers/net/{ => ethernet/apple}/mace.h (100%)
3523  rename drivers/net/{ => ethernet/apple}/macmace.c (99%)
3524  create mode 100644 drivers/net/ethernet/atheros/Kconfig
3525  create mode 100644 drivers/net/ethernet/atheros/Makefile
3526  rename drivers/net/{ => ethernet/atheros}/atl1c/Makefile (100%)
3527  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h (100%)
3528  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_ethtool.c (100%)
3529  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.c (100%)
3530  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.h (100%)
3531  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_main.c (99%)
3532  rename drivers/net/{ => ethernet/atheros}/atl1e/Makefile (100%)
3533  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h (100%)
3534  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_ethtool.c (100%)
3535  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.c (100%)
3536  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.h (100%)
3537  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_main.c (99%)
3538  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_param.c (100%)
3539  rename drivers/net/{ => ethernet/atheros}/atlx/Makefile (100%)
3540  rename drivers/net/{ => ethernet/atheros}/atlx/atl1.c (99%)
3541  rename drivers/net/{ => ethernet/atheros}/atlx/atl1.h (100%)
3542  rename drivers/net/{ => ethernet/atheros}/atlx/atl2.c (99%)
3543  rename drivers/net/{ => ethernet/atheros}/atlx/atl2.h (100%)
3544  rename drivers/net/{ => ethernet/atheros}/atlx/atlx.c (100%)
3545  rename drivers/net/{ => ethernet/atheros}/atlx/atlx.h (100%)
3546  create mode 100644 drivers/net/ethernet/broadcom/Kconfig
3547  create mode 100644 drivers/net/ethernet/broadcom/Makefile
3548  rename drivers/net/{ => ethernet/broadcom}/b44.c (99%)
3549  rename drivers/net/{ => ethernet/broadcom}/b44.h (100%)
3550  rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c (99%)
3551  rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h (100%)
3552  rename drivers/net/{ => ethernet/broadcom}/bnx2.c (99%)
3553  rename drivers/net/{ => ethernet/broadcom}/bnx2.h (100%)
3554  rename drivers/net/{ => ethernet/broadcom}/bnx2_fw.h (100%)
3555  rename drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile (100%)
3556  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h (98%)
3557  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c (98%)
3558  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h (99%)
3559  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c (99%)
3560  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h (100%)
3561  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h (100%)
3562  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c (99%)
3563  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h (100%)
3564  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_file_hdr.h (100%)
3565  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h (100%)
3566  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h (100%)
3567  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h (100%)
3568  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c (99%)
3569  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h (100%)
3570  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c (99%)
3571  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h (100%)
3572  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c (98%)
3573  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h (100%)
3574  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c (98%)
3575  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h (100%)
3576  rename drivers/net/{ => ethernet/broadcom}/cnic.c (99%)
3577  rename drivers/net/{ => ethernet/broadcom}/cnic.h (100%)
3578  rename drivers/net/{ => ethernet/broadcom}/cnic_defs.h (100%)
3579  rename drivers/net/{ => ethernet/broadcom}/cnic_if.h (100%)
3580  rename drivers/net/{ => ethernet/broadcom}/sb1250-mac.c (99%)
3581  rename drivers/net/{ => ethernet/broadcom}/tg3.c (98%)
3582  rename drivers/net/{ => ethernet/broadcom}/tg3.h (99%)
3583  create mode 100644 drivers/net/ethernet/brocade/Kconfig
3584  create mode 100644 drivers/net/ethernet/brocade/Makefile
3585  create mode 100644 drivers/net/ethernet/brocade/bna/Kconfig
3586  rename drivers/net/{ => ethernet/brocade}/bna/Makefile (52%)
3587  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c (98%)
3588  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h (100%)
3589  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h (100%)
3590  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h (92%)
3591  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_cna.h (100%)
3592  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h (89%)
3593  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_status.h (100%)
3594  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c (87%)
3595  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h (88%)
3596  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c (76%)
3597  create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.c
3598  create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.h
3599  rename drivers/net/{ => ethernet/brocade}/bna/bfi.h (70%)
3600  rename drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h (100%)
3601  create mode 100644 drivers/net/ethernet/brocade/bna/bfi_enet.h
3602  create mode 100644 drivers/net/ethernet/brocade/bna/bfi_reg.h
3603  rename drivers/net/{ => ethernet/brocade}/bna/bna.h (67%)
3604  create mode 100644 drivers/net/ethernet/brocade/bna/bna_enet.c
3605  create mode 100644 drivers/net/ethernet/brocade/bna/bna_hw_defs.h
3606  create mode 100644 drivers/net/ethernet/brocade/bna/bna_tx_rx.c
3607  rename drivers/net/{ => ethernet/brocade}/bna/bna_types.h (58%)
3608  rename drivers/net/{ => ethernet/brocade}/bna/bnad.c (85%)
3609  rename drivers/net/{ => ethernet/brocade}/bna/bnad.h (89%)
3610  rename drivers/net/{ => ethernet/brocade}/bna/bnad_ethtool.c (67%)
3611  rename drivers/net/{ => ethernet/brocade}/bna/cna.h (68%)
3612  rename drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c (100%)
3613  create mode 100644 drivers/net/ethernet/cadence/Kconfig
3614  create mode 100644 drivers/net/ethernet/cadence/Makefile
3615  rename drivers/net/{arm => ethernet/cadence}/at91_ether.c (99%)
3616  rename drivers/net/{arm => ethernet/cadence}/at91_ether.h (100%)
3617  rename drivers/net/{ => ethernet/cadence}/macb.c (99%)
3618  rename drivers/net/{ => ethernet/cadence}/macb.h (100%)
3619  create mode 100644 drivers/net/ethernet/chelsio/Kconfig
3620  create mode 100644 drivers/net/ethernet/chelsio/Makefile
3621  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/Makefile (100%)
3622  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/common.h (100%)
3623  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cphy.h (100%)
3624  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h (100%)
3625  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c (99%)
3626  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/elmer0.h (100%)
3627  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.c (100%)
3628  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.h (100%)
3629  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h (100%)
3630  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/gmac.h (100%)
3631  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c (100%)
3632  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h (100%)
3633  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c (100%)
3634  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/my3126.c (100%)
3635  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/pm3393.c (100%)
3636  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/regs.h (100%)
3637  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.c (100%)
3638  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.h (100%)
3639  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/subr.c (100%)
3640  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/suni1x10gexp_regs.h (100%)
3641  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.c (100%)
3642  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.h (100%)
3643  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326.c (100%)
3644  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326_reg.h (100%)
3645  rename drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile (100%)
3646  rename drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h (100%)
3647  rename drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c (100%)
3648  rename drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c (100%)
3649  rename drivers/net/{ => ethernet/chelsio}/cxgb3/common.h (100%)
3650  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h (100%)
3651  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h (100%)
3652  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h (100%)
3653  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c (99%)
3654  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c (100%)
3655  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h (100%)
3656  rename drivers/net/{ => ethernet/chelsio}/cxgb3/firmware_exports.h (100%)
3657  rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c (100%)
3658  rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h (100%)
3659  rename drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c (100%)
3660  rename drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h (100%)
3661  rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c (100%)
3662  rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge_defs.h (100%)
3663  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h (100%)
3664  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c (100%)
3665  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h (100%)
3666  rename drivers/net/{ => ethernet/chelsio}/cxgb3/version.h (100%)
3667  rename drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c (100%)
3668  rename drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c (100%)
3669  rename drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile (100%)
3670  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h (100%)
3671  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c (99%)
3672  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h (100%)
3673  rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c (100%)
3674  rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h (100%)
3675  rename drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c (100%)
3676  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c (100%)
3677  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h (100%)
3678  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h (100%)
3679  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h (100%)
3680  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h (100%)
3681  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/Makefile (100%)
3682  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/adapter.h (100%)
3683  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c (99%)
3684  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c (100%)
3685  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h (100%)
3686  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h (100%)
3687  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c (100%)
3688  create mode 100644 drivers/net/ethernet/cirrus/Kconfig
3689  create mode 100644 drivers/net/ethernet/cirrus/Makefile
3690  rename drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c (100%)
3691  create mode 100644 drivers/net/ethernet/cisco/Kconfig
3692  create mode 100644 drivers/net/ethernet/cisco/Makefile
3693  create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig
3694  rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%)
3695  rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%)
3696  rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%)
3697  rename drivers/net/{ => ethernet/cisco}/enic/enic.h (100%)
3698  rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%)
3699  rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (100%)
3700  rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (99%)
3701  rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (100%)
3702  rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (100%)
3703  rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%)
3704  rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%)
3705  rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%)
3706  rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%)
3707  rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%)
3708  rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (100%)
3709  rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (100%)
3710  rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%)
3711  rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%)
3712  rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%)
3713  rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%)
3714  rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%)
3715  rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%)
3716  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%)
3717  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%)
3718  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%)
3719  rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%)
3720  rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%)
3721  rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%)
3722  rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%)
3723  rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%)
3724  rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%)
3725  create mode 100644 drivers/net/ethernet/davicom/Kconfig
3726  create mode 100644 drivers/net/ethernet/davicom/Makefile
3727  rename drivers/net/{ => ethernet/davicom}/dm9000.c (99%)
3728  rename drivers/net/{ => ethernet/davicom}/dm9000.h (100%)
3729  create mode 100644 drivers/net/ethernet/dec/Kconfig
3730  create mode 100644 drivers/net/ethernet/dec/Makefile
3731  rename drivers/net/{ => ethernet/dec}/ewrk3.c (99%)
3732  rename drivers/net/{ => ethernet/dec}/ewrk3.h (100%)
3733  rename drivers/net/{ => ethernet/dec}/tulip/21142.c (100%)
3734  rename drivers/net/{ => ethernet/dec}/tulip/Kconfig (96%)
3735  rename drivers/net/{ => ethernet/dec}/tulip/Makefile (100%)
3736  rename drivers/net/{ => ethernet/dec}/tulip/de2104x.c (99%)
3737  rename drivers/net/{ => ethernet/dec}/tulip/de4x5.c (99%)
3738  rename drivers/net/{ => ethernet/dec}/tulip/de4x5.h (100%)
3739  rename drivers/net/{ => ethernet/dec}/tulip/dmfe.c (99%)
3740  rename drivers/net/{ => ethernet/dec}/tulip/eeprom.c (100%)
3741  rename drivers/net/{ => ethernet/dec}/tulip/interrupt.c (100%)
3742  rename drivers/net/{ => ethernet/dec}/tulip/media.c (100%)
3743  rename drivers/net/{ => ethernet/dec}/tulip/pnic.c (100%)
3744  rename drivers/net/{ => ethernet/dec}/tulip/pnic2.c (100%)
3745  rename drivers/net/{ => ethernet/dec}/tulip/timer.c (100%)
3746  rename drivers/net/{ => ethernet/dec}/tulip/tulip.h (100%)
3747  rename drivers/net/{ => ethernet/dec}/tulip/tulip_core.c (99%)
3748  rename drivers/net/{ => ethernet/dec}/tulip/uli526x.c (99%)
3749  rename drivers/net/{ => ethernet/dec}/tulip/winbond-840.c (99%)
3750  rename drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c (100%)
3751  create mode 100644 drivers/net/ethernet/dlink/Kconfig
3752  create mode 100644 drivers/net/ethernet/dlink/Makefile
3753  rename drivers/net/{ => ethernet/dlink}/de600.c (100%)
3754  rename drivers/net/{ => ethernet/dlink}/de600.h (100%)
3755  rename drivers/net/{ => ethernet/dlink}/de620.c (99%)
3756  rename drivers/net/{ => ethernet/dlink}/de620.h (100%)
3757  rename drivers/net/{ => ethernet/dlink}/dl2k.c (99%)
3758  rename drivers/net/{ => ethernet/dlink}/dl2k.h (100%)
3759  rename drivers/net/{ => ethernet/dlink}/sundance.c (99%)
3760  rename drivers/net/{ => ethernet}/dnet.c (100%)
3761  rename drivers/net/{ => ethernet}/dnet.h (100%)
3762  create mode 100644 drivers/net/ethernet/emulex/Kconfig
3763  create mode 100644 drivers/net/ethernet/emulex/Makefile
3764  create mode 100644 drivers/net/ethernet/emulex/benet/Kconfig
3765  rename drivers/net/{ => ethernet/emulex}/benet/Makefile (100%)
3766  rename drivers/net/{ => ethernet/emulex}/benet/be.h (85%)
3767  rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.c (94%)
3768  rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.h (95%)
3769  rename drivers/net/{ => ethernet/emulex}/benet/be_ethtool.c (85%)
3770  rename drivers/net/{ => ethernet/emulex}/benet/be_hw.h (94%)
3771  rename drivers/net/{ => ethernet/emulex}/benet/be_main.c (91%)
3772  rename drivers/net/{ => ethernet}/ethoc.c (99%)
3773  create mode 100644 drivers/net/ethernet/faraday/Kconfig
3774  create mode 100644 drivers/net/ethernet/faraday/Makefile
3775  rename drivers/net/{ => ethernet/faraday}/ftgmac100.c (100%)
3776  rename drivers/net/{ => ethernet/faraday}/ftgmac100.h (100%)
3777  rename drivers/net/{ => ethernet/faraday}/ftmac100.c (100%)
3778  rename drivers/net/{ => ethernet/faraday}/ftmac100.h (100%)
3779  rename drivers/net/{ => ethernet}/fealnx.c (99%)
3780  create mode 100644 drivers/net/ethernet/freescale/Kconfig
3781  create mode 100644 drivers/net/ethernet/freescale/Makefile
3782  rename drivers/net/{ => ethernet/freescale}/fec.c (99%)
3783  rename drivers/net/{ => ethernet/freescale}/fec.h (100%)
3784  rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c (99%)
3785  rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h (100%)
3786  rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx_phy.c (100%)
3787  rename drivers/net/{ => ethernet/freescale}/fs_enet/Kconfig (91%)
3788  rename drivers/net/{ => ethernet/freescale}/fs_enet/Makefile (100%)
3789  rename drivers/net/{ => ethernet/freescale}/fs_enet/fec.h (100%)
3790  rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet-main.c (99%)
3791  rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet.h (100%)
3792  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fcc.c (100%)
3793  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fec.c (100%)
3794  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-scc.c (100%)
3795  rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-bitbang.c (100%)
3796  rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-fec.c (100%)
3797  rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c (100%)
3798  rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h (100%)
3799  rename drivers/net/{ => ethernet/freescale}/gianfar.c (99%)
3800  rename drivers/net/{ => ethernet/freescale}/gianfar.h (100%)
3801  rename drivers/net/{ => ethernet/freescale}/gianfar_ethtool.c (100%)
3802  rename drivers/net/{ => ethernet/freescale}/gianfar_ptp.c (100%)
3803  rename drivers/net/{ => ethernet/freescale}/gianfar_sysfs.c (100%)
3804  rename drivers/net/{ => ethernet/freescale}/ucc_geth.c (99%)
3805  rename drivers/net/{ => ethernet/freescale}/ucc_geth.h (100%)
3806  rename drivers/net/{ => ethernet/freescale}/ucc_geth_ethtool.c (100%)
3807  create mode 100644 drivers/net/ethernet/fujitsu/Kconfig
3808  create mode 100644 drivers/net/ethernet/fujitsu/Makefile
3809  rename drivers/net/{ => ethernet/fujitsu}/at1700.c (99%)
3810  rename drivers/net/{ => ethernet/fujitsu}/eth16i.c (99%)
3811  rename drivers/net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c (99%)
3812  create mode 100644 drivers/net/ethernet/hp/Kconfig
3813  create mode 100644 drivers/net/ethernet/hp/Makefile
3814  rename drivers/net/{ => ethernet/hp}/hp100.c (99%)
3815  rename drivers/net/{ => ethernet/hp}/hp100.h (100%)
3816  rename drivers/net/{ => ethernet/i825xx}/3c505.c (99%)
3817  rename drivers/net/{ => ethernet/i825xx}/3c505.h (100%)
3818  rename drivers/net/{ => ethernet/i825xx}/3c507.c (100%)
3819  rename drivers/net/{ => ethernet/i825xx}/3c523.c (99%)
3820  rename drivers/net/{ => ethernet/i825xx}/3c523.h (100%)
3821  rename drivers/net/{ => ethernet/i825xx}/3c527.c (99%)
3822  rename drivers/net/{ => ethernet/i825xx}/3c527.h (100%)
3823  rename drivers/net/{ => ethernet/i825xx}/82596.c (99%)
3824  create mode 100644 drivers/net/ethernet/i825xx/Kconfig
3825  create mode 100644 drivers/net/ethernet/i825xx/Makefile
3826  rename drivers/net/{ => ethernet/i825xx}/eepro.c (99%)
3827  rename drivers/net/{ => ethernet/i825xx}/eexpress.c (99%)
3828  rename drivers/net/{ => ethernet/i825xx}/eexpress.h (100%)
3829  rename drivers/net/{arm => ethernet/i825xx}/ether1.c (99%)
3830  rename drivers/net/{arm => ethernet/i825xx}/ether1.h (100%)
3831  rename drivers/net/{ => ethernet/i825xx}/lasi_82596.c (100%)
3832  rename drivers/net/{ => ethernet/i825xx}/lib82596.c (99%)
3833  rename drivers/net/{ => ethernet/i825xx}/lp486e.c (99%)
3834  rename drivers/net/{ => ethernet/i825xx}/ni52.c (99%)
3835  rename drivers/net/{ => ethernet/i825xx}/ni52.h (100%)
3836  rename drivers/net/{ => ethernet/i825xx}/sni_82596.c (100%)
3837  rename drivers/net/{ => ethernet/i825xx}/sun3_82586.c (99%)
3838  rename drivers/net/{ => ethernet/i825xx}/sun3_82586.h (100%)
3839  rename drivers/net/{ => ethernet/i825xx}/znet.c (99%)
3840  create mode 100644 drivers/net/ethernet/ibm/Kconfig
3841  create mode 100644 drivers/net/ethernet/ibm/Makefile
3842  rename drivers/net/{ => ethernet/ibm}/ehea/Makefile (100%)
3843  rename drivers/net/{ => ethernet/ibm}/ehea/ehea.h (100%)
3844  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c (100%)
3845  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h (100%)
3846  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c (99%)
3847  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c (100%)
3848  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h (100%)
3849  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c (100%)
3850  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h (100%)
3851  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Kconfig (63%)
3852  create mode 100644 drivers/net/ethernet/ibm/emac/Makefile
3853  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.c (99%)
3854  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.h (97%)
3855  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.c (100%)
3856  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.h (98%)
3857  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/emac.h (100%)
3858  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.c (99%)
3859  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.h (99%)
3860  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.c (100%)
3861  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.h (100%)
3862  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c (100%)
3863  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h (96%)
3864  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.c (100%)
3865  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.h (97%)
3866  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.c (100%)
3867  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.h (96%)
3868  rename drivers/net/{ => ethernet/ibm}/ibmveth.c (99%)
3869  rename drivers/net/{ => ethernet/ibm}/ibmveth.h (100%)
3870  rename drivers/net/{ => ethernet/ibm}/iseries_veth.c (99%)
3871  create mode 100644 drivers/net/ethernet/icplus/Kconfig
3872  create mode 100644 drivers/net/ethernet/icplus/Makefile
3873  rename drivers/net/{ => ethernet/icplus}/ipg.c (92%)
3874  rename drivers/net/{ => ethernet/icplus}/ipg.h (100%)
3875  create mode 100644 drivers/net/ethernet/intel/Kconfig
3876  create mode 100644 drivers/net/ethernet/intel/Makefile
3877  rename drivers/net/{ => ethernet/intel}/e100.c (99%)
3878  rename drivers/net/{ => ethernet/intel}/e1000/Makefile (100%)
3879  rename drivers/net/{ => ethernet/intel}/e1000/e1000.h (100%)
3880  rename drivers/net/{ => ethernet/intel}/e1000/e1000_ethtool.c (100%)
3881  rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c (100%)
3882  rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h (100%)
3883  rename drivers/net/{ => ethernet/intel}/e1000/e1000_main.c (99%)
3884  rename drivers/net/{ => ethernet/intel}/e1000/e1000_osdep.h (100%)
3885  rename drivers/net/{ => ethernet/intel}/e1000/e1000_param.c (100%)
3886  rename drivers/net/{e1000e/es2lan.c => ethernet/intel/e1000e/80003es2lan.c} (100%)
3887  rename drivers/net/{ => ethernet/intel}/e1000e/82571.c (100%)
3888  rename drivers/net/{ => ethernet/intel}/e1000e/Makefile (96%)
3889  rename drivers/net/{ => ethernet/intel}/e1000e/defines.h (100%)
3890  rename drivers/net/{ => ethernet/intel}/e1000e/e1000.h (99%)
3891  rename drivers/net/{ => ethernet/intel}/e1000e/ethtool.c (99%)
3892  rename drivers/net/{ => ethernet/intel}/e1000e/hw.h (100%)
3893  rename drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c (100%)
3894  rename drivers/net/{ => ethernet/intel}/e1000e/lib.c (100%)
3895  rename drivers/net/{ => ethernet/intel}/e1000e/netdev.c (97%)
3896  rename drivers/net/{ => ethernet/intel}/e1000e/param.c (100%)
3897  rename drivers/net/{ => ethernet/intel}/e1000e/phy.c (100%)
3898  rename drivers/net/{ => ethernet/intel}/igb/Makefile (100%)
3899  rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.c (100%)
3900  rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.h (100%)
3901  rename drivers/net/{ => ethernet/intel}/igb/e1000_defines.h (100%)
3902  rename drivers/net/{ => ethernet/intel}/igb/e1000_hw.h (100%)
3903  rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.c (100%)
3904  rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.h (100%)
3905  rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c (100%)
3906  rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h (100%)
3907  rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c (100%)
3908  rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h (100%)
3909  rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.c (100%)
3910  rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.h (100%)
3911  rename drivers/net/{ => ethernet/intel}/igb/e1000_regs.h (100%)
3912  rename drivers/net/{ => ethernet/intel}/igb/igb.h (100%)
3913  rename drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c (100%)
3914  rename drivers/net/{ => ethernet/intel}/igb/igb_main.c (99%)
3915  rename drivers/net/{ => ethernet/intel}/igbvf/Makefile (100%)
3916  rename drivers/net/{ => ethernet/intel}/igbvf/defines.h (100%)
3917  rename drivers/net/{ => ethernet/intel}/igbvf/ethtool.c (100%)
3918  rename drivers/net/{ => ethernet/intel}/igbvf/igbvf.h (100%)
3919  rename drivers/net/{ => ethernet/intel}/igbvf/mbx.c (100%)
3920  rename drivers/net/{ => ethernet/intel}/igbvf/mbx.h (100%)
3921  rename drivers/net/{ => ethernet/intel}/igbvf/netdev.c (99%)
3922  rename drivers/net/{ => ethernet/intel}/igbvf/regs.h (100%)
3923  rename drivers/net/{ => ethernet/intel}/igbvf/vf.c (100%)
3924  rename drivers/net/{ => ethernet/intel}/igbvf/vf.h (100%)
3925  rename drivers/net/{ => ethernet/intel}/ixgb/Makefile (100%)
3926  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb.h (100%)
3927  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c (100%)
3928  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h (100%)
3929  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c (100%)
3930  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c (100%)
3931  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h (100%)
3932  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h (100%)
3933  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c (99%)
3934  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h (100%)
3935  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c (100%)
3936  rename drivers/net/{ => ethernet/intel}/ixgbe/Makefile (100%)
3937  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h (97%)
3938  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c (100%)
3939  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c (100%)
3940  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.c (100%)
3941  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.h (100%)
3942  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c (100%)
3943  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h (100%)
3944  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c (100%)
3945  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h (100%)
3946  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c (100%)
3947  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h (100%)
3948  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c (99%)
3949  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c (100%)
3950  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c (99%)
3951  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h (100%)
3952  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_main.c (96%)
3953  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c (100%)
3954  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h (100%)
3955  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c (100%)
3956  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h (100%)
3957  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c (100%)
3958  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h (100%)
3959  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_type.h (100%)
3960  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c (100%)
3961  rename drivers/net/{ => ethernet/intel}/ixgbevf/Makefile (100%)
3962  rename drivers/net/{ => ethernet/intel}/ixgbevf/defines.h (100%)
3963  rename drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c (100%)
3964  rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h (100%)
3965  rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf_main.c (99%)
3966  rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c (100%)
3967  rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h (100%)
3968  rename drivers/net/{ => ethernet/intel}/ixgbevf/regs.h (100%)
3969  rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.c (100%)
3970  rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.h (100%)
3971  rename drivers/net/{ => ethernet}/jme.c (99%)
3972  rename drivers/net/{ => ethernet}/jme.h (100%)
3973  rename drivers/net/{ => ethernet}/korina.c (99%)
3974  rename drivers/net/{ => ethernet}/lantiq_etop.c (99%)
3975  create mode 100644 drivers/net/ethernet/marvell/Kconfig
3976  create mode 100644 drivers/net/ethernet/marvell/Makefile
3977  rename drivers/net/{ => ethernet/marvell}/mv643xx_eth.c (99%)
3978  rename drivers/net/{ => ethernet/marvell}/pxa168_eth.c (100%)
3979  rename drivers/net/{ => ethernet/marvell}/skge.c (99%)
3980  rename drivers/net/{ => ethernet/marvell}/skge.h (100%)
3981  rename drivers/net/{ => ethernet/marvell}/sky2.c (99%)
3982  rename drivers/net/{ => ethernet/marvell}/sky2.h (100%)
3983  create mode 100644 drivers/net/ethernet/mellanox/Kconfig
3984  create mode 100644 drivers/net/ethernet/mellanox/Makefile
3985  create mode 100644 drivers/net/ethernet/mellanox/mlx4/Kconfig
3986  rename drivers/net/{ => ethernet/mellanox}/mlx4/Makefile (100%)
3987  rename drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c (100%)
3988  rename drivers/net/{ => ethernet/mellanox}/mlx4/catas.c (100%)
3989  rename drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c (100%)
3990  rename drivers/net/{ => ethernet/mellanox}/mlx4/cq.c (100%)
3991  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c (100%)
3992  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_ethtool.c (100%)
3993  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c (100%)
3994  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_netdev.c (99%)
3995  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c (100%)
3996  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h (100%)
3997  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_resources.c (100%)
3998  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c (100%)
3999  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_selftest.c (100%)
4000  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c (100%)
4001  rename drivers/net/{ => ethernet/mellanox}/mlx4/eq.c (100%)
4002  rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.c (100%)
4003  rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.h (100%)
4004  rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.c (100%)
4005  rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.h (100%)
4006  rename drivers/net/{ => ethernet/mellanox}/mlx4/intf.c (100%)
4007  rename drivers/net/{ => ethernet/mellanox}/mlx4/main.c (100%)
4008  rename drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c (100%)
4009  rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h (100%)
4010  rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h (100%)
4011  rename drivers/net/{ => ethernet/mellanox}/mlx4/mr.c (100%)
4012  rename drivers/net/{ => ethernet/mellanox}/mlx4/pd.c (100%)
4013  rename drivers/net/{ => ethernet/mellanox}/mlx4/port.c (100%)
4014  rename drivers/net/{ => ethernet/mellanox}/mlx4/profile.c (100%)
4015  rename drivers/net/{ => ethernet/mellanox}/mlx4/qp.c (100%)
4016  rename drivers/net/{ => ethernet/mellanox}/mlx4/reset.c (100%)
4017  rename drivers/net/{ => ethernet/mellanox}/mlx4/sense.c (100%)
4018  rename drivers/net/{ => ethernet/mellanox}/mlx4/srq.c (100%)
4019  create mode 100644 drivers/net/ethernet/micrel/Kconfig
4020  create mode 100644 drivers/net/ethernet/micrel/Makefile
4021  rename drivers/net/{arm => ethernet/micrel}/ks8695net.c (99%)
4022  rename drivers/net/{arm => ethernet/micrel}/ks8695net.h (100%)
4023  rename drivers/net/{ => ethernet/micrel}/ks8842.c (100%)
4024  rename drivers/net/{ => ethernet/micrel}/ks8851.c (100%)
4025  rename drivers/net/{ => ethernet/micrel}/ks8851.h (100%)
4026  rename drivers/net/{ => ethernet/micrel}/ks8851_mll.c (100%)
4027  rename drivers/net/{ => ethernet/micrel}/ksz884x.c (100%)
4028  create mode 100644 drivers/net/ethernet/microchip/Kconfig
4029  create mode 100644 drivers/net/ethernet/microchip/Makefile
4030  rename drivers/net/{ => ethernet/microchip}/enc28j60.c (99%)
4031  rename drivers/net/{ => ethernet/microchip}/enc28j60_hw.h (100%)
4032  rename drivers/net/{ => ethernet}/mipsnet.c (99%)
4033  create mode 100644 drivers/net/ethernet/myricom/Kconfig
4034  create mode 100644 drivers/net/ethernet/myricom/Makefile
4035  rename drivers/net/{ => ethernet/myricom}/myri10ge/Makefile (100%)
4036  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge.c (99%)
4037  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h (100%)
4038  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp_gen_header.h (100%)
4039  create mode 100644 drivers/net/ethernet/natsemi/Kconfig
4040  create mode 100644 drivers/net/ethernet/natsemi/Makefile
4041  rename drivers/net/{ => ethernet/natsemi}/ibmlana.c (99%)
4042  rename drivers/net/{ => ethernet/natsemi}/ibmlana.h (100%)
4043  rename drivers/net/{ => ethernet/natsemi}/jazzsonic.c (99%)
4044  rename drivers/net/{ => ethernet/natsemi}/macsonic.c (99%)
4045  rename drivers/net/{ => ethernet/natsemi}/natsemi.c (99%)
4046  rename drivers/net/{ => ethernet/natsemi}/ns83820.c (99%)
4047  rename drivers/net/{ => ethernet/natsemi}/sonic.c (100%)
4048  rename drivers/net/{ => ethernet/natsemi}/sonic.h (100%)
4049  rename drivers/net/{ => ethernet/natsemi}/xtsonic.c (99%)
4050  create mode 100644 drivers/net/ethernet/neterion/Kconfig
4051  create mode 100644 drivers/net/ethernet/neterion/Makefile
4052  rename drivers/net/{ => ethernet/neterion}/s2io-regs.h (100%)
4053  rename drivers/net/{ => ethernet/neterion}/s2io.c (99%)
4054  rename drivers/net/{ => ethernet/neterion}/s2io.h (100%)
4055  rename drivers/net/{ => ethernet/neterion}/vxge/Makefile (100%)
4056  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.c (100%)
4057  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.h (100%)
4058  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.c (100%)
4059  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.h (100%)
4060  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.c (99%)
4061  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.h (100%)
4062  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-reg.h (100%)
4063  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.c (100%)
4064  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.h (100%)
4065  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-version.h (100%)
4066  rename drivers/net/{ => ethernet}/netx-eth.c (99%)
4067  create mode 100644 drivers/net/ethernet/nuvoton/Kconfig
4068  create mode 100644 drivers/net/ethernet/nuvoton/Makefile
4069  rename drivers/net/{arm => ethernet/nuvoton}/w90p910_ether.c (99%)
4070  create mode 100644 drivers/net/ethernet/nvidia/Kconfig
4071  create mode 100644 drivers/net/ethernet/nvidia/Makefile
4072  rename drivers/net/{ => ethernet/nvidia}/forcedeth.c (99%)
4073  rename drivers/net/{ => ethernet}/octeon/Kconfig (85%)
4074  create mode 100644 drivers/net/ethernet/octeon/Makefile
4075  rename drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (99%)
4076  create mode 100644 drivers/net/ethernet/oki-semi/Kconfig
4077  create mode 100644 drivers/net/ethernet/oki-semi/Makefile
4078  create mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
4079  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/Makefile (100%)
4080  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h (100%)
4081  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c (100%)
4082  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h (100%)
4083  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_ethtool.c (100%)
4084  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c (99%)
4085  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_param.c (100%)
4086  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c (100%)
4087  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h (100%)
4088  create mode 100644 drivers/net/ethernet/packetengines/Kconfig
4089  create mode 100644 drivers/net/ethernet/packetengines/Makefile
4090  rename drivers/net/{ => ethernet/packetengines}/hamachi.c (99%)
4091  rename drivers/net/{ => ethernet/packetengines}/yellowfin.c (99%)
4092  create mode 100644 drivers/net/ethernet/pasemi/Kconfig
4093  create mode 100644 drivers/net/ethernet/pasemi/Makefile
4094  rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.c (99%)
4095  rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.h (100%)
4096  rename drivers/net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c (100%)
4097  create mode 100644 drivers/net/ethernet/qlogic/Kconfig
4098  create mode 100644 drivers/net/ethernet/qlogic/Makefile
4099  rename drivers/net/{ => ethernet/qlogic}/netxen/Makefile (100%)
4100  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic.h (99%)
4101  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c (100%)
4102  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ethtool.c (100%)
4103  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h (100%)
4104  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.c (100%)
4105  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.h (100%)
4106  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_init.c (99%)
4107  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_main.c (96%)
4108  rename drivers/net/{ => ethernet/qlogic}/qla3xxx.c (99%)
4109  rename drivers/net/{ => ethernet/qlogic}/qla3xxx.h (100%)
4110  rename drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile (100%)
4111  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h (99%)
4112  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c (100%)
4113  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c (98%)
4114  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h (100%)
4115  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c (99%)
4116  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c (99%)
4117  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c (98%)
4118  rename drivers/net/{ => ethernet/qlogic}/qlge/Makefile (100%)
4119  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge.h (100%)
4120  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c (100%)
4121  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c (100%)
4122  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c (99%)
4123  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c (100%)
4124  create mode 100644 drivers/net/ethernet/racal/Kconfig
4125  create mode 100644 drivers/net/ethernet/racal/Makefile
4126  rename drivers/net/{ => ethernet/racal}/ni5010.c (99%)
4127  rename drivers/net/{ => ethernet/racal}/ni5010.h (100%)
4128  create mode 100644 drivers/net/ethernet/rdc/Kconfig
4129  create mode 100644 drivers/net/ethernet/rdc/Makefile
4130  rename drivers/net/{ => ethernet/rdc}/r6040.c (99%)
4131  rename drivers/net/{ => ethernet/realtek}/8139cp.c (99%)
4132  rename drivers/net/{ => ethernet/realtek}/8139too.c (99%)
4133  create mode 100644 drivers/net/ethernet/realtek/Kconfig
4134  create mode 100644 drivers/net/ethernet/realtek/Makefile
4135  rename drivers/net/{ => ethernet/realtek}/atp.c (99%)
4136  rename drivers/net/{ => ethernet/realtek}/atp.h (100%)
4137  rename drivers/net/{ => ethernet/realtek}/r8169.c (99%)
4138  rename drivers/net/{ => ethernet/realtek}/sc92031.c (99%)
4139  create mode 100644 drivers/net/ethernet/renesas/Kconfig
4140  create mode 100644 drivers/net/ethernet/renesas/Makefile
4141  rename drivers/net/{ => ethernet/renesas}/sh_eth.c (99%)
4142  rename drivers/net/{ => ethernet/renesas}/sh_eth.h (100%)
4143  rename drivers/net/{ => ethernet}/s6gmac.c (100%)
4144  create mode 100644 drivers/net/ethernet/seeq/Kconfig
4145  create mode 100644 drivers/net/ethernet/seeq/Makefile
4146  rename drivers/net/{arm => ethernet/seeq}/ether3.c (99%)
4147  rename drivers/net/{arm => ethernet/seeq}/ether3.h (100%)
4148  rename drivers/net/{ => ethernet/seeq}/seeq8005.c (99%)
4149  rename drivers/net/{ => ethernet/seeq}/seeq8005.h (100%)
4150  rename drivers/net/{ => ethernet/seeq}/sgiseeq.c (99%)
4151  rename drivers/net/{ => ethernet/seeq}/sgiseeq.h (100%)
4152  rename drivers/net/{ => ethernet}/sfc/Kconfig (96%)
4153  rename drivers/net/{ => ethernet}/sfc/Makefile (100%)
4154  rename drivers/net/{ => ethernet}/sfc/bitfield.h (100%)
4155  rename drivers/net/{ => ethernet}/sfc/efx.c (99%)
4156  rename drivers/net/{ => ethernet}/sfc/efx.h (100%)
4157  rename drivers/net/{ => ethernet}/sfc/enum.h (100%)
4158  rename drivers/net/{ => ethernet}/sfc/ethtool.c (100%)
4159  rename drivers/net/{ => ethernet}/sfc/falcon.c (100%)
4160  rename drivers/net/{ => ethernet}/sfc/falcon_boards.c (100%)
4161  rename drivers/net/{ => ethernet}/sfc/falcon_xmac.c (100%)
4162  rename drivers/net/{ => ethernet}/sfc/filter.c (100%)
4163  rename drivers/net/{ => ethernet}/sfc/filter.h (100%)
4164  rename drivers/net/{ => ethernet}/sfc/io.h (100%)
4165  rename drivers/net/{ => ethernet}/sfc/mac.h (100%)
4166  rename drivers/net/{ => ethernet}/sfc/mcdi.c (100%)
4167  rename drivers/net/{ => ethernet}/sfc/mcdi.h (100%)
4168  rename drivers/net/{ => ethernet}/sfc/mcdi_mac.c (100%)
4169  rename drivers/net/{ => ethernet}/sfc/mcdi_pcol.h (100%)
4170  rename drivers/net/{ => ethernet}/sfc/mcdi_phy.c (100%)
4171  rename drivers/net/{ => ethernet}/sfc/mdio_10g.c (100%)
4172  rename drivers/net/{ => ethernet}/sfc/mdio_10g.h (100%)
4173  rename drivers/net/{ => ethernet}/sfc/mtd.c (100%)
4174  rename drivers/net/{ => ethernet}/sfc/net_driver.h (100%)
4175  rename drivers/net/{ => ethernet}/sfc/nic.c (100%)
4176  rename drivers/net/{ => ethernet}/sfc/nic.h (100%)
4177  rename drivers/net/{ => ethernet}/sfc/phy.h (100%)
4178  rename drivers/net/{ => ethernet}/sfc/qt202x_phy.c (100%)
4179  rename drivers/net/{ => ethernet}/sfc/regs.h (100%)
4180  rename drivers/net/{ => ethernet}/sfc/rx.c (100%)
4181  rename drivers/net/{ => ethernet}/sfc/selftest.c (100%)
4182  rename drivers/net/{ => ethernet}/sfc/selftest.h (100%)
4183  rename drivers/net/{ => ethernet}/sfc/siena.c (100%)
4184  rename drivers/net/{ => ethernet}/sfc/spi.h (100%)
4185  rename drivers/net/{ => ethernet}/sfc/tenxpress.c (100%)
4186  rename drivers/net/{ => ethernet}/sfc/tx.c (100%)
4187  rename drivers/net/{ => ethernet}/sfc/txc43128_phy.c (100%)
4188  rename drivers/net/{ => ethernet}/sfc/workarounds.h (100%)
4189  create mode 100644 drivers/net/ethernet/sgi/Kconfig
4190  create mode 100644 drivers/net/ethernet/sgi/Makefile
4191  rename drivers/net/{ => ethernet/sgi}/ioc3-eth.c (99%)
4192  rename drivers/net/{ => ethernet/sgi}/meth.c (100%)
4193  rename drivers/net/{ => ethernet/sgi}/meth.h (100%)
4194  create mode 100644 drivers/net/ethernet/sis/Kconfig
4195  create mode 100644 drivers/net/ethernet/sis/Makefile
4196  rename drivers/net/{ => ethernet/sis}/sis190.c (99%)
4197  rename drivers/net/{ => ethernet/sis}/sis900.c (99%)
4198  rename drivers/net/{ => ethernet/sis}/sis900.h (100%)
4199  create mode 100644 drivers/net/ethernet/smsc/Kconfig
4200  create mode 100644 drivers/net/ethernet/smsc/Makefile
4201  rename drivers/net/{ => ethernet/smsc}/epic100.c (99%)
4202  rename drivers/net/{ => ethernet/smsc}/smc911x.c (99%)
4203  rename drivers/net/{ => ethernet/smsc}/smc911x.h (100%)
4204  rename drivers/net/{ => ethernet/smsc}/smc9194.c (99%)
4205  rename drivers/net/{ => ethernet/smsc}/smc9194.h (100%)
4206  rename drivers/net/{pcmcia => ethernet/smsc}/smc91c92_cs.c (99%)
4207  rename drivers/net/{ => ethernet/smsc}/smc91x.c (99%)
4208  rename drivers/net/{ => ethernet/smsc}/smc91x.h (100%)
4209  rename drivers/net/{ => ethernet/smsc}/smsc911x.c (97%)
4210  rename drivers/net/{ => ethernet/smsc}/smsc911x.h (100%)
4211  rename drivers/net/{ => ethernet/smsc}/smsc9420.c (99%)
4212  rename drivers/net/{ => ethernet/smsc}/smsc9420.h (100%)
4213  create mode 100644 drivers/net/ethernet/stmicro/Kconfig
4214  create mode 100644 drivers/net/ethernet/stmicro/Makefile
4215  rename drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig (93%)
4216  rename drivers/net/{ => ethernet/stmicro}/stmmac/Makefile (100%)
4217  rename drivers/net/{ => ethernet/stmicro}/stmmac/common.h (100%)
4218  rename drivers/net/{ => ethernet/stmicro}/stmmac/descs.h (100%)
4219  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100.h (100%)
4220  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000.h (100%)
4221  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_core.c (100%)
4222  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c (100%)
4223  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_core.c (100%)
4224  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_dma.c (100%)
4225  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h (100%)
4226  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c (100%)
4227  rename drivers/net/{ => ethernet/stmicro}/stmmac/enh_desc.c (100%)
4228  rename drivers/net/{ => ethernet/stmicro}/stmmac/norm_desc.c (100%)
4229  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h (100%)
4230  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c (100%)
4231  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_main.c (99%)
4232  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_mdio.c (100%)
4233  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.c (100%)
4234  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.h (100%)
4235  create mode 100644 drivers/net/ethernet/sun/Kconfig
4236  create mode 100644 drivers/net/ethernet/sun/Makefile
4237  rename drivers/net/{ => ethernet/sun}/cassini.c (99%)
4238  rename drivers/net/{ => ethernet/sun}/cassini.h (100%)
4239  rename drivers/net/{ => ethernet/sun}/niu.c (99%)
4240  rename drivers/net/{ => ethernet/sun}/niu.h (100%)
4241  rename drivers/net/{ => ethernet/sun}/sunbmac.c (99%)
4242  rename drivers/net/{ => ethernet/sun}/sunbmac.h (100%)
4243  rename drivers/net/{ => ethernet/sun}/sungem.c (99%)
4244  rename drivers/net/{ => ethernet/sun}/sungem.h (100%)
4245  rename drivers/net/{ => ethernet/sun}/sunhme.c (99%)
4246  rename drivers/net/{ => ethernet/sun}/sunhme.h (100%)
4247  rename drivers/net/{ => ethernet/sun}/sunqe.c (99%)
4248  rename drivers/net/{ => ethernet/sun}/sunqe.h (100%)
4249  rename drivers/net/{ => ethernet/sun}/sunvnet.c (99%)
4250  rename drivers/net/{ => ethernet/sun}/sunvnet.h (100%)
4251  create mode 100644 drivers/net/ethernet/tehuti/Kconfig
4252  create mode 100644 drivers/net/ethernet/tehuti/Makefile
4253  rename drivers/net/{ => ethernet/tehuti}/tehuti.c (99%)
4254  rename drivers/net/{ => ethernet/tehuti}/tehuti.h (100%)
4255  create mode 100644 drivers/net/ethernet/ti/Kconfig
4256  create mode 100644 drivers/net/ethernet/ti/Makefile
4257  rename drivers/net/{ => ethernet/ti}/cpmac.c (99%)
4258  rename drivers/net/{ => ethernet/ti}/davinci_cpdma.c (100%)
4259  rename drivers/net/{ => ethernet/ti}/davinci_cpdma.h (100%)
4260  rename drivers/net/{ => ethernet/ti}/davinci_emac.c (99%)
4261  rename drivers/net/{ => ethernet/ti}/davinci_mdio.c (100%)
4262  rename drivers/net/{ => ethernet/ti}/tlan.c (99%)
4263  rename drivers/net/{ => ethernet/ti}/tlan.h (100%)
4264  create mode 100644 drivers/net/ethernet/tile/Kconfig
4265  rename drivers/net/{ => ethernet}/tile/Makefile (100%)
4266  rename drivers/net/{ => ethernet}/tile/tilepro.c (100%)
4267  create mode 100644 drivers/net/ethernet/toshiba/Kconfig
4268  create mode 100644 drivers/net/ethernet/toshiba/Makefile
4269  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c (99%)
4270  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h (100%)
4271  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.c (99%)
4272  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.h (100%)
4273  rename drivers/net/{ => ethernet/toshiba}/spider_net.c (99%)
4274  rename drivers/net/{ => ethernet/toshiba}/spider_net.h (99%)
4275  rename drivers/net/{ => ethernet/toshiba}/spider_net_ethtool.c (100%)
4276  rename drivers/net/{ => ethernet/toshiba}/tc35815.c (99%)
4277  create mode 100644 drivers/net/ethernet/tundra/Kconfig
4278  create mode 100644 drivers/net/ethernet/tundra/Makefile
4279  rename drivers/net/{ => ethernet/tundra}/tsi108_eth.c (99%)
4280  rename drivers/net/{ => ethernet/tundra}/tsi108_eth.h (100%)
4281  create mode 100644 drivers/net/ethernet/via/Kconfig
4282  create mode 100644 drivers/net/ethernet/via/Makefile
4283  rename drivers/net/{ => ethernet/via}/via-rhine.c (99%)
4284  rename drivers/net/{ => ethernet/via}/via-velocity.c (97%)
4285  rename drivers/net/{ => ethernet/via}/via-velocity.h (100%)
4286  create mode 100644 drivers/net/ethernet/xilinx/Kconfig
4287  create mode 100644 drivers/net/ethernet/xilinx/Makefile
4288  rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%)
4289  rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (99%)
4290  rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%)
4291  rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%)
4292  create mode 100644 drivers/net/ethernet/xircom/Kconfig
4293  create mode 100644 drivers/net/ethernet/xircom/Makefile
4294  rename drivers/net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c (99%)
4295  create mode 100644 drivers/net/ethernet/xscale/Kconfig
4296  create mode 100644 drivers/net/ethernet/xscale/Makefile
4297  rename drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig (94%)
4298  rename drivers/net/{ => ethernet/xscale}/ixp2000/Makefile (100%)
4299  rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c (100%)
4300  rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h (100%)
4301  rename drivers/net/{ => ethernet/xscale}/ixp2000/enp2611.c (100%)
4302  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.c (100%)
4303  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.h (100%)
4304  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc (100%)
4305  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode (100%)
4306  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc (100%)
4307  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode (100%)
4308  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c (100%)
4309  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h (100%)
4310  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev_priv.h (100%)
4311  rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c (100%)
4312  rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h (100%)
4313  rename drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c (99%)
4314  delete mode 100644 drivers/net/ibm_newemac/Makefile
4315  delete mode 100644 drivers/net/octeon/Makefile
4316  delete mode 100644 drivers/net/pci-skeleton.c
4317  create mode 100644 drivers/net/wireless/ath/ath6kl/Kconfig
4318  create mode 100644 drivers/net/wireless/ath/ath6kl/Makefile
4319  create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.c
4320  create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.h
4321  create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.c
4322  create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.h
4323  create mode 100644 drivers/net/wireless/ath/ath6kl/common.h
4324  create mode 100644 drivers/net/wireless/ath/ath6kl/core.h
4325  create mode 100644 drivers/net/wireless/ath/ath6kl/debug.c
4326  create mode 100644 drivers/net/wireless/ath/ath6kl/debug.h
4327  create mode 100644 drivers/net/wireless/ath/ath6kl/hif-ops.h
4328  create mode 100644 drivers/net/wireless/ath/ath6kl/hif.h
4329  create mode 100644 drivers/net/wireless/ath/ath6kl/htc.c
4330  create mode 100644 drivers/net/wireless/ath/ath6kl/htc.h
4331  create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.c
4332  create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.h
4333  create mode 100644 drivers/net/wireless/ath/ath6kl/init.c
4334  create mode 100644 drivers/net/wireless/ath/ath6kl/main.c
4335  create mode 100644 drivers/net/wireless/ath/ath6kl/node.c
4336  create mode 100644 drivers/net/wireless/ath/ath6kl/sdio.c
4337  create mode 100644 drivers/net/wireless/ath/ath6kl/target.h
4338  create mode 100644 drivers/net/wireless/ath/ath6kl/txrx.c
4339  create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.c
4340  create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.h
4341  delete mode 100644 drivers/staging/ath6kl/Kconfig
4342  delete mode 100644 drivers/staging/ath6kl/Makefile
4343  delete mode 100644 drivers/staging/ath6kl/TODO
4344  delete mode 100644 drivers/staging/ath6kl/bmi/include/bmi_internal.h
4345  delete mode 100644 drivers/staging/ath6kl/bmi/src/bmi.c
4346  delete mode 100644 drivers/staging/ath6kl/hif/common/hif_sdio_common.h
4347  delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
4348  delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
4349  delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
4350  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.c
4351  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.h
4352  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
4353  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
4354  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
4355  delete mode 100644 drivers/staging/ath6kl/htc2/htc.c
4356  delete mode 100644 drivers/staging/ath6kl/htc2/htc_debug.h
4357  delete mode 100644 drivers/staging/ath6kl/htc2/htc_internal.h
4358  delete mode 100644 drivers/staging/ath6kl/htc2/htc_recv.c
4359  delete mode 100644 drivers/staging/ath6kl/htc2/htc_send.c
4360  delete mode 100644 drivers/staging/ath6kl/htc2/htc_services.c
4361  delete mode 100644 drivers/staging/ath6kl/include/a_config.h
4362  delete mode 100644 drivers/staging/ath6kl/include/a_debug.h
4363  delete mode 100644 drivers/staging/ath6kl/include/a_drv.h
4364  delete mode 100644 drivers/staging/ath6kl/include/a_drv_api.h
4365  delete mode 100644 drivers/staging/ath6kl/include/a_osapi.h
4366  delete mode 100644 drivers/staging/ath6kl/include/aggr_recv_api.h
4367  delete mode 100644 drivers/staging/ath6kl/include/ar3kconfig.h
4368  delete mode 100644 drivers/staging/ath6kl/include/ar6000_api.h
4369  delete mode 100644 drivers/staging/ath6kl/include/ar6000_diag.h
4370  delete mode 100644 drivers/staging/ath6kl/include/ar6kap_common.h
4371  delete mode 100644 drivers/staging/ath6kl/include/athbtfilter.h
4372  delete mode 100644 drivers/staging/ath6kl/include/bmi.h
4373  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
4374  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/addrs.h
4375  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
4376  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
4377  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
4378  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
4379  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
4380  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
4381  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
4382  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
4383  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
4384  delete mode 100644 drivers/staging/ath6kl/include/common/athdefs.h
4385  delete mode 100644 drivers/staging/ath6kl/include/common/bmi_msg.h
4386  delete mode 100644 drivers/staging/ath6kl/include/common/cnxmgmt.h
4387  delete mode 100644 drivers/staging/ath6kl/include/common/dbglog.h
4388  delete mode 100644 drivers/staging/ath6kl/include/common/dbglog_id.h
4389  delete mode 100644 drivers/staging/ath6kl/include/common/discovery.h
4390  delete mode 100644 drivers/staging/ath6kl/include/common/epping_test.h
4391  delete mode 100644 drivers/staging/ath6kl/include/common/gmboxif.h
4392  delete mode 100644 drivers/staging/ath6kl/include/common/gpio_reg.h
4393  delete mode 100644 drivers/staging/ath6kl/include/common/htc.h
4394  delete mode 100644 drivers/staging/ath6kl/include/common/htc_services.h
4395  delete mode 100644 drivers/staging/ath6kl/include/common/pkt_log.h
4396  delete mode 100644 drivers/staging/ath6kl/include/common/roaming.h
4397  delete mode 100644 drivers/staging/ath6kl/include/common/targaddrs.h
4398  delete mode 100644 drivers/staging/ath6kl/include/common/testcmd.h
4399  delete mode 100644 drivers/staging/ath6kl/include/common/tlpm.h
4400  delete mode 100644 drivers/staging/ath6kl/include/common/wlan_defs.h
4401  delete mode 100644 drivers/staging/ath6kl/include/common/wmi.h
4402  delete mode 100644 drivers/staging/ath6kl/include/common/wmix.h
4403  delete mode 100644 drivers/staging/ath6kl/include/common_drv.h
4404  delete mode 100644 drivers/staging/ath6kl/include/dbglog_api.h
4405  delete mode 100644 drivers/staging/ath6kl/include/dl_list.h
4406  delete mode 100644 drivers/staging/ath6kl/include/dset_api.h
4407  delete mode 100644 drivers/staging/ath6kl/include/hci_transport_api.h
4408  delete mode 100644 drivers/staging/ath6kl/include/hif.h
4409  delete mode 100644 drivers/staging/ath6kl/include/host_version.h
4410  delete mode 100644 drivers/staging/ath6kl/include/htc_api.h
4411  delete mode 100644 drivers/staging/ath6kl/include/htc_packet.h
4412  delete mode 100644 drivers/staging/ath6kl/include/wlan_api.h
4413  delete mode 100644 drivers/staging/ath6kl/include/wmi_api.h
4414  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kconfig.c
4415  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
4416  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
4417  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
4418  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
4419  delete mode 100644 drivers/staging/ath6kl/miscdrv/common_drv.c
4420  delete mode 100644 drivers/staging/ath6kl/miscdrv/credit_dist.c
4421  delete mode 100644 drivers/staging/ath6kl/miscdrv/miscdrv.h
4422  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_drv.c
4423  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_pm.c
4424  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
4425  delete mode 100644 drivers/staging/ath6kl/os/linux/cfg80211.c
4426  delete mode 100644 drivers/staging/ath6kl/os/linux/export_hci_transport.c
4427  delete mode 100644 drivers/staging/ath6kl/os/linux/hci_bridge.c
4428  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
4429  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
4430  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
4431  delete mode 100644 drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
4432  delete mode 100644 drivers/staging/ath6kl/os/linux/include/cfg80211.h
4433  delete mode 100644 drivers/staging/ath6kl/os/linux/include/config_linux.h
4434  delete mode 100644 drivers/staging/ath6kl/os/linux/include/debug_linux.h
4435  delete mode 100644 drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
4436  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
4437  delete mode 100644 drivers/staging/ath6kl/os/linux/include/osapi_linux.h
4438  delete mode 100644 drivers/staging/ath6kl/os/linux/include/wlan_config.h
4439  delete mode 100644 drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
4440  delete mode 100644 drivers/staging/ath6kl/os/linux/netbuf.c
4441  delete mode 100644 drivers/staging/ath6kl/reorder/aggr_rx_internal.h
4442  delete mode 100644 drivers/staging/ath6kl/reorder/rcv_aggr.c
4443  delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211.h
4444  delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211_node.h
4445  delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_node.c
4446  delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
4447  delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_utils.c
4448  delete mode 100644 drivers/staging/ath6kl/wmi/wmi.c
4449  delete mode 100644 drivers/staging/ath6kl/wmi/wmi_host.h
4450  create mode 100644 include/linux/bcma/bcma_driver_mips.h
4451  create mode 100644 include/linux/bcma/bcma_soc.h
4452  rename {drivers/net => include/linux}/sungem_phy.h (98%)
4453  create mode 100644 include/net/cfg80211-wext.h
4454 $ git am -3 ../patches/0001-powerpc-update-ppc64_defconfig-for-net-device-moveme.patch
4455 Applying: powerpc: update ppc64_defconfig for net device movement
4456 $ git reset HEAD^
4457 Unstaged changes after reset:
4458 M       arch/powerpc/configs/ppc64_defconfig
4459 $ git add .
4460 $ git commit -v -a --amend
4461 [master 72c308e] Merge remote-tracking branch 'net/master'
4462 $ git am -3 ../patches/0001-sparc-update-sparc32_defconfig-for-net-device-moveme.patch
4463 Applying: sparc: update sparc32_defconfig for net device movement
4464 $ git reset HEAD^
4465 Unstaged changes after reset:
4466 M       arch/sparc/configs/sparc32_defconfig
4467 $ git add .
4468 $ git commit -v -a --amend
4469 [master 0d54c5d] Merge remote-tracking branch 'net/master'
4470 $ git am -3 ../patches/0001-sparc-update-sparc64_defconfig-for-net-device-moveme.patch
4471 Applying: sparc: update sparc64_defconfig for net device movement
4472 $ git reset HEAD^
4473 Unstaged changes after reset:
4474 M       arch/sparc/configs/sparc64_defconfig
4475 $ git add .
4476 $ git commit -v -a --amend
4477 [master b1bc49e] Merge remote-tracking branch 'net/master'
4478 Merging wireless/master
4479 $ git merge wireless/master
4480 Auto-merging drivers/net/wireless/b43/dma.c
4481 Auto-merging include/net/cfg80211.h
4482 Auto-merging net/mac80211/mesh_pathtbl.c
4483 Merge made by recursive.
4484  drivers/bcma/driver_chipcommon_pmu.c        |   20 ++-
4485  drivers/bcma/sprom.c                        |    6 +
4486  drivers/net/wireless/ath/ath9k/ar9002_hw.c  |    8 +-
4487  drivers/net/wireless/ath/ath9k/ar9003_hw.c  |    8 +-
4488  drivers/net/wireless/ath/ath9k/hw-ops.h     |    8 +-
4489  drivers/net/wireless/ath/ath9k/hw.c         |    8 +-
4490  drivers/net/wireless/ath/ath9k/hw.h         |    7 +-
4491  drivers/net/wireless/ath/ath9k/main.c       |    8 +-
4492  drivers/net/wireless/ath/ath9k/pci.c        |   47 +++--
4493  drivers/net/wireless/b43/b43.h              |   11 +-
4494  drivers/net/wireless/b43/dma.c              |   13 ++-
4495  drivers/net/wireless/b43/dma.h              |    7 +-
4496  drivers/net/wireless/b43/main.c             |   51 +++++-
4497  drivers/net/wireless/b43/phy_common.c       |   32 ++++
4498  drivers/net/wireless/b43/phy_common.h       |    2 +
4499  drivers/net/wireless/b43/phy_ht.c           |  180 +++++++++++++++++++
4500  drivers/net/wireless/b43/phy_ht.h           |    4 +
4501  drivers/net/wireless/b43/phy_n.c            |   40 +----
4502  drivers/net/wireless/b43/pio.c              |   10 +-
4503  drivers/net/wireless/b43/tables_phy_ht.c    |   39 ++++
4504  drivers/net/wireless/b43/tables_phy_ht.h    |    3 +
4505  drivers/net/wireless/b43/xmit.c             |  120 +++++++++----
4506  drivers/net/wireless/b43/xmit.h             |   62 +++++--
4507  drivers/net/wireless/mwl8k.c                |    3 -
4508  drivers/net/wireless/rtlwifi/debug.c        |    6 +-
4509  include/linux/bcma/bcma_driver_chipcommon.h |   18 ++
4510  include/linux/ieee80211.h                   |   55 ++++---
4511  include/net/cfg80211.h                      |    4 +-
4512  net/mac80211/agg-tx.c                       |    2 +-
4513  net/mac80211/mesh.c                         |  253 ++++++++++++++++++++-------
4514  net/mac80211/mesh.h                         |   26 ++-
4515  net/mac80211/mesh_hwmp.c                    |   61 ++++---
4516  net/mac80211/mesh_pathtbl.c                 |    8 +-
4517  net/mac80211/mesh_plink.c                   |  241 +++++++++++++------------
4518  net/mac80211/rx.c                           |   23 ++-
4519  net/mac80211/status.c                       |   18 ++
4520  net/mac80211/tx.c                           |   14 ++-
4521  net/wireless/util.c                         |    6 +-
4522  38 files changed, 1027 insertions(+), 405 deletions(-)
4523 Merging bluetooth/master
4524 $ git merge bluetooth/master
4525 Merge made by recursive.
4526  drivers/bluetooth/btusb.c     |    3 +-
4527  include/net/bluetooth/l2cap.h |    3 +-
4528  net/bluetooth/af_bluetooth.c  |   30 +++++-
4529  net/bluetooth/bnep/core.c     |    5 +-
4530  net/bluetooth/cmtp/core.c     |    5 +-
4531  net/bluetooth/hci_conn.c      |   14 +-
4532  net/bluetooth/hidp/core.c     |   10 ++-
4533  net/bluetooth/l2cap_core.c    |  257 ++++++++++++++---------------------------
4534  net/bluetooth/rfcomm/core.c   |    5 +-
4535  9 files changed, 144 insertions(+), 188 deletions(-)
4536 Merging mtd/master
4537 $ git merge mtd/master
4538 Already up-to-date.
4539 Merging l2-mtd/master
4540 $ git merge l2-mtd/master
4541 Resolved 'drivers/mtd/maps/lantiq-flash.c' using previous resolution.
4542 Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
4543 Auto-merging arch/arm/mach-at91/board-cam60.c
4544 Auto-merging arch/arm/mach-at91/board-cap9adk.c
4545 Auto-merging arch/arm/mach-at91/board-kb9202.c
4546 Auto-merging arch/arm/mach-at91/board-neocore926.c
4547 Auto-merging arch/arm/mach-at91/board-qil-a9260.c
4548 Auto-merging arch/arm/mach-at91/board-rm9200dk.c
4549 Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
4550 Auto-merging arch/arm/mach-at91/board-sam9260ek.c
4551 Auto-merging arch/arm/mach-at91/board-sam9261ek.c
4552 Auto-merging arch/arm/mach-at91/board-sam9263ek.c
4553 Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
4554 Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
4555 Auto-merging arch/arm/mach-at91/board-sam9rlek.c
4556 Auto-merging arch/arm/mach-at91/board-usb-a9260.c
4557 Auto-merging arch/arm/mach-at91/board-usb-a9263.c
4558 Auto-merging arch/arm/mach-at91/board-yl-9200.c
4559 Auto-merging arch/arm/mach-mmp/aspenite.c
4560 Removing drivers/mtd/maps/ceiva.c
4561 Removing drivers/mtd/maps/edb7312.c
4562 Auto-merging drivers/mtd/maps/lantiq-flash.c
4563 CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
4564 Removing drivers/mtd/nand/edb7312.c
4565 Auto-merging drivers/mtd/onenand/omap2.c
4566 Automatic merge failed; fix conflicts and then commit the result.
4567 $ git commit -v -a
4568 [master 7958263] Merge remote-tracking branch 'l2-mtd/master'
4569 $ git diff -M --stat --summary HEAD^..
4570  Documentation/DocBook/mtdnand.tmpl                 |    5 +-
4571  .../devicetree/bindings/mtd/atmel-dataflash.txt    |   14 +
4572  arch/arm/mach-at91/board-afeb-9260v1.c             |    9 +-
4573  arch/arm/mach-at91/board-cam60.c                   |    9 +-
4574  arch/arm/mach-at91/board-cap9adk.c                 |    9 +-
4575  arch/arm/mach-at91/board-kb9202.c                  |    9 +-
4576  arch/arm/mach-at91/board-neocore926.c              |    9 +-
4577  arch/arm/mach-at91/board-qil-a9260.c               |    9 +-
4578  arch/arm/mach-at91/board-rm9200dk.c                |    9 +-
4579  arch/arm/mach-at91/board-sam9-l9260.c              |    9 +-
4580  arch/arm/mach-at91/board-sam9260ek.c               |    9 +-
4581  arch/arm/mach-at91/board-sam9261ek.c               |    9 +-
4582  arch/arm/mach-at91/board-sam9263ek.c               |    9 +-
4583  arch/arm/mach-at91/board-sam9g20ek.c               |    9 +-
4584  arch/arm/mach-at91/board-sam9m10g45ek.c            |    9 +-
4585  arch/arm/mach-at91/board-sam9rlek.c                |    9 +-
4586  arch/arm/mach-at91/board-snapper9260.c             |   10 +-
4587  arch/arm/mach-at91/board-usb-a9260.c               |    9 +-
4588  arch/arm/mach-at91/board-usb-a9263.c               |    9 +-
4589  arch/arm/mach-at91/board-yl-9200.c                 |    9 +-
4590  arch/arm/mach-at91/include/mach/board.h            |    3 +-
4591  arch/arm/mach-davinci/board-da830-evm.c            |    2 +-
4592  arch/arm/mach-davinci/board-da850-evm.c            |    2 +-
4593  arch/arm/mach-davinci/board-dm355-evm.c            |    2 +-
4594  arch/arm/mach-davinci/board-dm355-leopard.c        |    2 +-
4595  arch/arm/mach-davinci/board-dm365-evm.c            |    2 +-
4596  arch/arm/mach-davinci/board-dm644x-evm.c           |    2 +-
4597  arch/arm/mach-davinci/board-mityomapl138.c         |    3 +-
4598  arch/arm/mach-davinci/board-neuros-osd2.c          |    2 +-
4599  arch/arm/mach-davinci/board-tnetv107x-evm.c        |    2 +-
4600  arch/arm/mach-davinci/include/mach/nand.h          |    4 +-
4601  arch/arm/mach-ep93xx/ts72xx.c                      |   23 +-
4602  arch/arm/mach-mmp/aspenite.c                       |    5 +-
4603  arch/arm/mach-orion5x/ts78xx-setup.c               |    2 +-
4604  arch/arm/mach-pxa/cm-x300.c                        |    5 +-
4605  arch/arm/mach-pxa/colibri-pxa3xx.c                 |    5 +-
4606  arch/arm/mach-pxa/littleton.c                      |    5 +-
4607  arch/arm/mach-pxa/mxm8x10.c                        |    9 +-
4608  arch/arm/mach-pxa/raumfeld.c                       |    5 +-
4609  arch/arm/mach-pxa/zylonite.c                       |    5 +-
4610  arch/arm/plat-pxa/include/plat/pxa3xx_nand.h       |   20 +-
4611  arch/avr32/boards/atngw100/setup.c                 |    8 +-
4612  arch/avr32/boards/atstk1000/atstk1002.c            |    9 +-
4613  arch/avr32/mach-at32ap/include/mach/board.h        |    3 +-
4614  arch/cris/arch-v32/drivers/mach-a3/nandflash.c     |    2 +-
4615  arch/cris/arch-v32/drivers/mach-fs/nandflash.c     |    2 +-
4616  drivers/mtd/Kconfig                                |   16 +-
4617  drivers/mtd/Makefile                               |    2 +-
4618  drivers/mtd/afs.c                                  |    4 +-
4619  drivers/mtd/ar7part.c                              |    2 +-
4620  drivers/mtd/chips/cfi_cmdset_0002.c                |   31 +-
4621  drivers/mtd/chips/fwh_lock.h                       |    3 +-
4622  drivers/mtd/chips/jedec_probe.c                    |   34 +-
4623  drivers/mtd/cmdlinepart.c                          |    7 +-
4624  drivers/mtd/devices/doc2000.c                      |   13 +-
4625  drivers/mtd/devices/doc2001.c                      |    7 +-
4626  drivers/mtd/devices/doc2001plus.c                  |    7 +-
4627  drivers/mtd/devices/docecc.c                       |    2 +-
4628  drivers/mtd/devices/lart.c                         |   18 +-
4629  drivers/mtd/devices/m25p80.c                       |   84 +--
4630  drivers/mtd/devices/mtd_dataflash.c                |   91 +-
4631  drivers/mtd/devices/sst25l.c                       |   42 +-
4632  drivers/mtd/ftl.c                                  |   40 +-
4633  drivers/mtd/inftlcore.c                            |   59 +-
4634  drivers/mtd/inftlmount.c                           |  116 +--
4635  drivers/mtd/maps/Kconfig                           |   22 -
4636  drivers/mtd/maps/Makefile                          |    2 -
4637  drivers/mtd/maps/bfin-async-flash.c                |   16 +-
4638  drivers/mtd/maps/ceiva.c                           |  341 -------
4639  drivers/mtd/maps/dc21285.c                         |    9 +-
4640  drivers/mtd/maps/edb7312.c                         |  134 ---
4641  drivers/mtd/maps/gpio-addr-flash.c                 |   16 +-
4642  drivers/mtd/maps/h720x-flash.c                     |   23 +-
4643  drivers/mtd/maps/impa7.c                           |   28 +-
4644  drivers/mtd/maps/intel_vr_nor.c                    |    7 +-
4645  drivers/mtd/maps/ixp2000.c                         |   11 +-
4646  drivers/mtd/maps/ixp4xx.c                          |   29 +-
4647  drivers/mtd/maps/lantiq-flash.c                    |   17 +-
4648  drivers/mtd/maps/latch-addr-flash.c                |   24 +-
4649  drivers/mtd/maps/pcmciamtd.c                       |  124 +--
4650  drivers/mtd/maps/physmap.c                         |   38 +-
4651  drivers/mtd/maps/physmap_of.c                      |   80 +--
4652  drivers/mtd/maps/plat-ram.c                        |   23 +-
4653  drivers/mtd/maps/pxa2xx-flash.c                    |   20 +-
4654  drivers/mtd/maps/rbtx4939-flash.c                  |   24 +-
4655  drivers/mtd/maps/sa1100-flash.c                    |   30 +-
4656  drivers/mtd/maps/solutionengine.c                  |   30 +-
4657  drivers/mtd/maps/wr_sbc82xx_flash.c                |   33 +-
4658  drivers/mtd/mtdblock.c                             |   18 +-
4659  drivers/mtd/mtdchar.c                              |   37 +-
4660  drivers/mtd/mtdconcat.c                            |    2 +-
4661  drivers/mtd/mtdcore.c                              |   69 +-
4662  drivers/mtd/mtdcore.h                              |    3 +
4663  drivers/mtd/mtdpart.c                              |   52 +-
4664  drivers/mtd/mtdsuper.c                             |   20 +-
4665  drivers/mtd/mtdswap.c                              |    5 +-
4666  drivers/mtd/nand/Kconfig                           |   14 +-
4667  drivers/mtd/nand/Makefile                          |    1 -
4668  drivers/mtd/nand/atmel_nand.c                      |   74 +--
4669  drivers/mtd/nand/au1550nd.c                        |   29 +-
4670  drivers/mtd/nand/autcpu12.c                        |    4 +-
4671  drivers/mtd/nand/bcm_umi_nand.c                    |   57 +-
4672  drivers/mtd/nand/cafe_nand.c                       |   21 +-
4673  drivers/mtd/nand/cmx270_nand.c                     |   23 +-
4674  drivers/mtd/nand/cs553x_nand.c                     |   15 +-
4675  drivers/mtd/nand/davinci_nand.c                    |   39 +-
4676  drivers/mtd/nand/denali.c                          |    6 +-
4677  drivers/mtd/nand/diskonchip.c                      |    6 +-
4678  drivers/mtd/nand/edb7312.c                         |  203 ----
4679  drivers/mtd/nand/fsl_elbc_nand.c                   |   75 +-
4680  drivers/mtd/nand/fsl_upm.c                         |   16 +-
4681  drivers/mtd/nand/fsmc_nand.c                       |   77 +--
4682  drivers/mtd/nand/h1910.c                           |   19 +-
4683  drivers/mtd/nand/jz4740_nand.c                     |   18 +-
4684  drivers/mtd/nand/mpc5121_nfc.c                     |   22 +-
4685  drivers/mtd/nand/mxc_nand.c                        |   35 +-
4686  drivers/mtd/nand/nand_base.c                       |  996 ++++++++++----------
4687  drivers/mtd/nand/nand_bbt.c                        |  516 +++++------
4688  drivers/mtd/nand/nand_bch.c                        |    4 +-
4689  drivers/mtd/nand/nand_ecc.c                        |   10 +-
4690  drivers/mtd/nand/nandsim.c                         |    4 +-
4691  drivers/mtd/nand/ndfc.c                            |   22 +-
4692  drivers/mtd/nand/nomadik_nand.c                    |    1 +
4693  drivers/mtd/nand/nuc900_nand.c                     |    1 +
4694  drivers/mtd/nand/omap2.c                           |   22 +-
4695  drivers/mtd/nand/orion_nand.c                      |   16 +-
4696  drivers/mtd/nand/pasemi_nand.c                     |    3 +-
4697  drivers/mtd/nand/plat_nand.c                       |   25 +-
4698  drivers/mtd/nand/ppchameleonevb.c                  |   47 +-
4699  drivers/mtd/nand/pxa3xx_nand.c                     |  471 ++++++----
4700  drivers/mtd/nand/rtc_from4.c                       |    5 +-
4701  drivers/mtd/nand/s3c2410.c                         |   27 +-
4702  drivers/mtd/nand/sharpsl.c                         |   13 +-
4703  drivers/mtd/nand/socrates_nand.c                   |   28 +-
4704  drivers/mtd/nand/tmio_nand.c                       |   17 +-
4705  drivers/mtd/nand/txx9ndfmc.c                       |    8 +-
4706  drivers/mtd/nftlcore.c                             |   27 +-
4707  drivers/mtd/nftlmount.c                            |   26 +-
4708  drivers/mtd/ofpart.c                               |  112 +++-
4709  drivers/mtd/onenand/generic.c                      |   14 +-
4710  drivers/mtd/onenand/omap2.c                        |   16 +-
4711  drivers/mtd/onenand/onenand_base.c                 |   62 +-
4712  drivers/mtd/onenand/onenand_bbt.c                  |    6 +-
4713  drivers/mtd/onenand/samsung.c                      |   13 +-
4714  drivers/mtd/redboot.c                              |   13 +-
4715  drivers/mtd/sm_ftl.c                               |   18 +-
4716  drivers/mtd/ssfdc.c                                |   44 +-
4717  drivers/mtd/tests/mtd_readtest.c                   |    3 +-
4718  fs/jffs2/scan.c                                    |    4 +-
4719  fs/jffs2/wbuf.c                                    |    3 +-
4720  include/linux/mtd/bbm.h                            |   39 +-
4721  include/linux/mtd/mtd.h                            |   38 +-
4722  include/linux/mtd/nand.h                           |   78 +-
4723  include/linux/mtd/onenand.h                        |    4 +
4724  include/linux/mtd/partitions.h                     |   46 +-
4725  include/linux/mtd/physmap.h                        |   17 -
4726  156 files changed, 2112 insertions(+), 3642 deletions(-)
4727  create mode 100644 Documentation/devicetree/bindings/mtd/atmel-dataflash.txt
4728  delete mode 100644 drivers/mtd/maps/ceiva.c
4729  delete mode 100644 drivers/mtd/maps/edb7312.c
4730  delete mode 100644 drivers/mtd/nand/edb7312.c
4731 Merging crypto/master
4732 $ git merge crypto/master
4733 Merge made by recursive.
4734  .../devicetree/bindings/crypto/picochip-spacc.txt  |   23 +
4735  arch/x86/crypto/Makefile                           |    8 +
4736  arch/x86/crypto/sha1_ssse3_asm.S                   |  558 ++++++++++++++++++++
4737  arch/x86/crypto/sha1_ssse3_glue.c                  |  240 +++++++++
4738  arch/x86/include/asm/cpufeature.h                  |    3 +
4739  crypto/Kconfig                                     |   10 +
4740  crypto/cryptd.c                                    |    2 +-
4741  crypto/sha1_generic.c                              |    9 +-
4742  drivers/crypto/n2_core.c                           |    4 +-
4743  drivers/crypto/padlock-aes.c                       |    4 +-
4744  drivers/crypto/picoxcell_crypto.c                  |  121 ++---
4745  include/crypto/sha.h                               |    5 +
4746  12 files changed, 915 insertions(+), 72 deletions(-)
4747  create mode 100644 Documentation/devicetree/bindings/crypto/picochip-spacc.txt
4748  create mode 100644 arch/x86/crypto/sha1_ssse3_asm.S
4749  create mode 100644 arch/x86/crypto/sha1_ssse3_glue.c
4750 Merging sound/for-next
4751 $ git merge sound/for-next
4752 Removing sound/pci/hda/alc268_quirks.c
4753 Removing sound/pci/hda/alc680_quirks.c
4754 Merge made by recursive.
4755  .../bindings/sound/soc/codecs/fsl-sgtl5000.txt     |   11 +
4756  Documentation/devicetree/bindings/sound/wm8510.txt |   18 +
4757  Documentation/devicetree/bindings/sound/wm8523.txt |   16 +
4758  Documentation/devicetree/bindings/sound/wm8580.txt |   16 +
4759  Documentation/devicetree/bindings/sound/wm8711.txt |   18 +
4760  Documentation/devicetree/bindings/sound/wm8728.txt |   18 +
4761  Documentation/devicetree/bindings/sound/wm8731.txt |   18 +
4762  Documentation/devicetree/bindings/sound/wm8737.txt |   18 +
4763  Documentation/devicetree/bindings/sound/wm8741.txt |   18 +
4764  Documentation/devicetree/bindings/sound/wm8750.txt |   18 +
4765  Documentation/devicetree/bindings/sound/wm8753.txt |   18 +
4766  Documentation/sound/alsa/ALSA-Configuration.txt    |    5 +
4767  Documentation/sound/alsa/HD-Audio-Models.txt       |   41 +-
4768  Documentation/sound/alsa/HD-Audio.txt              |   48 +
4769  arch/mips/alchemy/devboards/db1200/platform.c      |   16 +
4770  arch/mips/alchemy/devboards/db1x00/platform.c      |   48 +
4771  include/linux/mfd/wm8994/registers.h               |   84 ++
4772  include/sound/adau1373.h                           |   34 +
4773  include/sound/soc-dapm.h                           |    2 +
4774  include/sound/soc.h                                |    9 +
4775  sound/firewire/isight.c                            |    1 -
4776  sound/mips/Kconfig                                 |    5 +-
4777  sound/pci/hda/Makefile                             |    3 +
4778  sound/pci/hda/alc260_quirks.c                      |  304 -----
4779  sound/pci/hda/alc262_quirks.c                      |  508 +-------
4780  sound/pci/hda/alc268_quirks.c                      |  636 ---------
4781  sound/pci/hda/alc269_quirks.c                      |  250 ----
4782  sound/pci/hda/alc662_quirks.c                      |  244 ----
4783  sound/pci/hda/alc680_quirks.c                      |  222 ---
4784  sound/pci/hda/alc861_quirks.c                      |  329 -----
4785  sound/pci/hda/alc861vd_quirks.c                    |  243 ----
4786  sound/pci/hda/hda_codec.c                          |   47 +-
4787  sound/pci/hda/hda_intel.c                          |   68 +-
4788  sound/pci/hda/hda_local.h                          |    2 +
4789  sound/pci/hda/hda_trace.h                          |  117 ++
4790  sound/pci/hda/patch_realtek.c                      |  361 ++++--
4791  sound/pci/oxygen/xonar_pcm179x.c                   |    1 +
4792  sound/pci/rme9652/hdspm.c                          |  139 +-
4793  sound/soc/Kconfig                                  |    3 +
4794  sound/soc/Makefile                                 |    1 +
4795  sound/soc/au1x/Kconfig                             |   28 +
4796  sound/soc/au1x/Makefile                            |   10 +
4797  sound/soc/au1x/ac97c.c                             |  363 +++++
4798  sound/soc/au1x/db1000.c                            |   75 +
4799  sound/soc/au1x/db1200.c                            |   64 +-
4800  sound/soc/au1x/dbdma2.c                            |   91 +-
4801  sound/soc/au1x/dma.c                               |  377 ++++++
4802  sound/soc/au1x/i2sc.c                              |  346 +++++
4803  sound/soc/au1x/psc-ac97.c                          |   48 +-
4804  sound/soc/au1x/psc-i2s.c                           |   42 +-
4805  sound/soc/au1x/psc.h                               |   16 +-
4806  sound/soc/blackfin/Kconfig                         |   13 +
4807  sound/soc/blackfin/Makefile                        |    2 +
4808  sound/soc/blackfin/bf5xx-ad193x.c                  |    2 +-
4809  sound/soc/blackfin/bfin-eval-adau1373.c            |  202 +++
4810  sound/soc/codecs/Kconfig                           |    4 +
4811  sound/soc/codecs/Makefile                          |    2 +
4812  sound/soc/codecs/ad193x.c                          |   11 +-
4813  sound/soc/codecs/ad193x.h                          |    5 +-
4814  sound/soc/codecs/adau1373.c                        | 1414 ++++++++++++++++++++
4815  sound/soc/codecs/adau1373.h                        |   29 +
4816  sound/soc/codecs/sgtl5000.c                        |    8 +
4817  sound/soc/codecs/sta32x.c                          |   22 +-
4818  sound/soc/codecs/wm1250-ev1.c                      |   20 +-
4819  sound/soc/codecs/wm8510.c                          |    8 +
4820  sound/soc/codecs/wm8523.c                          |    9 +-
4821  sound/soc/codecs/wm8580.c                          |    9 +-
4822  sound/soc/codecs/wm8711.c                          |   13 +-
4823  sound/soc/codecs/wm8728.c                          |   13 +-
4824  sound/soc/codecs/wm8731.c                          |   10 +
4825  sound/soc/codecs/wm8737.c                          |   10 +
4826  sound/soc/codecs/wm8741.c                          |  135 ++-
4827  sound/soc/codecs/wm8750.c                          |   14 +-
4828  sound/soc/codecs/wm8753.c                          |   13 +-
4829  sound/soc/codecs/wm8962.c                          |    8 +-
4830  sound/soc/codecs/wm8993.c                          |    7 +-
4831  sound/soc/codecs/wm8994-tables.c                   |   16 +-
4832  sound/soc/codecs/wm8994.c                          |  270 +++-
4833  sound/soc/codecs/wm8994.h                          |    2 +
4834  sound/soc/codecs/wm_hubs.c                         |   48 +-
4835  sound/soc/codecs/wm_hubs.h                         |    3 +-
4836  sound/soc/fsl/fsl_dma.c                            |    1 -
4837  sound/soc/fsl/fsl_ssi.c                            |   61 +-
4838  sound/soc/mxs/Kconfig                              |   20 +
4839  sound/soc/mxs/Makefile                             |   10 +
4840  sound/soc/mxs/mxs-pcm.c                            |  359 +++++
4841  sound/soc/mxs/mxs-pcm.h                            |   43 +
4842  sound/soc/mxs/mxs-saif.c                           |  677 ++++++++++
4843  sound/soc/mxs/mxs-saif.h                           |  130 ++
4844  sound/soc/mxs/mxs-sgtl5000.c                       |  165 +++
4845  sound/soc/nuc900/nuc900-pcm.c                      |    1 -
4846  sound/soc/omap/ams-delta.c                         |    6 +-
4847  sound/soc/pxa/spitz.c                              |    2 +-
4848  sound/soc/pxa/z2.c                                 |    2 +-
4849  sound/soc/s6000/s6000-pcm.c                        |    1 -
4850  sound/soc/samsung/h1940_uda1380.c                  |    1 +
4851  sound/soc/samsung/jive_wm8750.c                    |    2 +-
4852  sound/soc/samsung/rx1950_uda1380.c                 |    1 +
4853  sound/soc/samsung/smartq_wm8987.c                  |    2 +-
4854  sound/soc/samsung/smdk_wm8580.c                    |    6 +-
4855  sound/soc/samsung/smdk_wm8580pcm.c                 |    4 +-
4856  sound/soc/samsung/speyside.c                       |    5 +-
4857  sound/soc/samsung/speyside_wm8962.c                |    4 +-
4858  sound/soc/soc-cache.c                              |    7 -
4859  sound/soc/soc-core.c                               |    4 +-
4860  sound/soc/soc-dapm.c                               |   12 +-
4861  sound/soc/soc-io.c                                 |  334 +----
4862  sound/soc/soc-jack.c                               |    2 +-
4863  sound/soc/soc-pcm.c                                |    5 +-
4864  sound/usb/mixer.c                                  |   13 +-
4865  110 files changed, 6022 insertions(+), 3598 deletions(-)
4866  create mode 100644 Documentation/devicetree/bindings/sound/soc/codecs/fsl-sgtl5000.txt
4867  create mode 100644 Documentation/devicetree/bindings/sound/wm8510.txt
4868  create mode 100644 Documentation/devicetree/bindings/sound/wm8523.txt
4869  create mode 100644 Documentation/devicetree/bindings/sound/wm8580.txt
4870  create mode 100644 Documentation/devicetree/bindings/sound/wm8711.txt
4871  create mode 100644 Documentation/devicetree/bindings/sound/wm8728.txt
4872  create mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt
4873  create mode 100644 Documentation/devicetree/bindings/sound/wm8737.txt
4874  create mode 100644 Documentation/devicetree/bindings/sound/wm8741.txt
4875  create mode 100644 Documentation/devicetree/bindings/sound/wm8750.txt
4876  create mode 100644 Documentation/devicetree/bindings/sound/wm8753.txt
4877  create mode 100644 include/sound/adau1373.h
4878  delete mode 100644 sound/pci/hda/alc268_quirks.c
4879  delete mode 100644 sound/pci/hda/alc680_quirks.c
4880  create mode 100644 sound/pci/hda/hda_trace.h
4881  create mode 100644 sound/soc/au1x/ac97c.c
4882  create mode 100644 sound/soc/au1x/db1000.c
4883  create mode 100644 sound/soc/au1x/dma.c
4884  create mode 100644 sound/soc/au1x/i2sc.c
4885  create mode 100644 sound/soc/blackfin/bfin-eval-adau1373.c
4886  create mode 100644 sound/soc/codecs/adau1373.c
4887  create mode 100644 sound/soc/codecs/adau1373.h
4888  create mode 100644 sound/soc/mxs/Kconfig
4889  create mode 100644 sound/soc/mxs/Makefile
4890  create mode 100644 sound/soc/mxs/mxs-pcm.c
4891  create mode 100644 sound/soc/mxs/mxs-pcm.h
4892  create mode 100644 sound/soc/mxs/mxs-saif.c
4893  create mode 100644 sound/soc/mxs/mxs-saif.h
4894  create mode 100644 sound/soc/mxs/mxs-sgtl5000.c
4895 Merging sound-asoc/for-next
4896 $ git merge sound-asoc/for-next
4897 Merge made by recursive.
4898  include/sound/soc.h                 |    1 +
4899  sound/soc/codecs/wm8523.c           |   26 ++---
4900  sound/soc/codecs/wm8962.c           |  191 ++++++++++++++++++++++++++++++++++-
4901  sound/soc/codecs/wm8996.c           |   38 +++++---
4902  sound/soc/ep93xx/ep93xx-i2s.c       |    5 +-
4903  sound/soc/fsl/fsl_dma.c             |    2 +
4904  sound/soc/fsl/mpc8610_hpcd.c        |   18 ++--
4905  sound/soc/fsl/p1022_ds.c            |    4 +-
4906  sound/soc/kirkwood/kirkwood-i2s.c   |    2 +-
4907  sound/soc/mxs/mxs-saif.c            |   27 +++--
4908  sound/soc/mxs/mxs-sgtl5000.c        |   10 ++-
4909  sound/soc/samsung/speyside_wm8962.c |    6 +
4910  sound/soc/soc-core.c                |    4 +-
4911  13 files changed, 274 insertions(+), 60 deletions(-)
4912 Merging cpufreq/next
4913 $ git merge cpufreq/next
4914 Merge made by recursive.
4915  Documentation/cpu-freq/governors.txt |    2 +-
4916  drivers/cpufreq/cpufreq_ondemand.c   |    2 +-
4917  drivers/cpufreq/e_powersaver.c       |  135 +++++++++++++++++++++++++++++++---
4918  drivers/cpufreq/exynos4210-cpufreq.c |   23 ++++++-
4919  4 files changed, 148 insertions(+), 14 deletions(-)
4920 Merging quilt/rr
4921 $ git merge quilt/rr
4922 Auto-merging drivers/net/virtio_net.c
4923 Merge made by recursive.
4924  arch/x86/lguest/boot.c        |   10 ++++++++++
4925  drivers/char/virtio_console.c |   10 ++++------
4926  drivers/lguest/core.c         |    2 +-
4927  drivers/net/virtio_net.c      |   14 +++++---------
4928  include/linux/virtio_config.h |    3 +++
4929  5 files changed, 23 insertions(+), 16 deletions(-)
4930 Merging input/next
4931 $ git merge input/next
4932 Auto-merging drivers/input/misc/Kconfig
4933 Auto-merging drivers/input/misc/Makefile
4934 Merge made by recursive.
4935  drivers/input/input-polldev.c        |    6 +-
4936  drivers/input/misc/Kconfig           |   45 ++-
4937  drivers/input/misc/Makefile          |    4 +-
4938  drivers/input/misc/bma150.c          |  691 ++++++++++++++++++++++++++++++++++
4939  drivers/input/misc/pm8xxx-vibrator.c |  296 +++++++++++++++
4940  include/linux/bma150.h               |   46 +++
4941  6 files changed, 1074 insertions(+), 14 deletions(-)
4942  create mode 100644 drivers/input/misc/bma150.c
4943  create mode 100644 drivers/input/misc/pm8xxx-vibrator.c
4944  create mode 100644 include/linux/bma150.h
4945 Merging input-mt/next
4946 $ git merge input-mt/next
4947 Already up-to-date.
4948 Merging lsm/for-next
4949 $ git merge lsm/for-next
4950 Already up-to-date.
4951 Merging block/for-next
4952 $ git merge block/for-next
4953 Already up-to-date.
4954 Merging quilt/device-mapper
4955 $ git merge quilt/device-mapper
4956 Merge made by recursive.
4957  Documentation/device-mapper/persistent-data.txt    |   84 +
4958  Documentation/device-mapper/thin-provisioning.txt  |  275 +++
4959  drivers/md/Kconfig                                 |    9 +
4960  drivers/md/Makefile                                |    3 +
4961  drivers/md/dm-crypt.c                              |    1 +
4962  drivers/md/dm-flakey.c                             |    4 +-
4963  drivers/md/dm-kcopyd.c                             |   31 +-
4964  drivers/md/dm-raid.c                               |    2 +-
4965  drivers/md/dm-table.c                              |   84 +-
4966  drivers/md/dm-thin-metadata.c                      | 1406 ++++++++++++
4967  drivers/md/dm-thin-metadata.h                      |  168 ++
4968  drivers/md/dm-thin.c                               | 2280 ++++++++++++++++++++
4969  drivers/md/dm.c                                    |   12 +-
4970  drivers/md/persistent-data/Kconfig                 |    7 +
4971  drivers/md/persistent-data/Makefile                |    9 +
4972  drivers/md/persistent-data/dm-block-manager.c      |  998 +++++++++
4973  drivers/md/persistent-data/dm-block-manager.h      |  134 ++
4974  drivers/md/persistent-data/dm-btree-internal.h     |  133 ++
4975  drivers/md/persistent-data/dm-btree-remove.c       |  571 +++++
4976  drivers/md/persistent-data/dm-btree-spine.c        |  222 ++
4977  drivers/md/persistent-data/dm-btree.c              |  861 ++++++++
4978  drivers/md/persistent-data/dm-btree.h              |  158 ++
4979  .../persistent-data/dm-persistent-data-internal.h  |   20 +
4980  drivers/md/persistent-data/dm-space-map-common.h   |   94 +
4981  drivers/md/persistent-data/dm-space-map-disk.c     |  663 ++++++
4982  drivers/md/persistent-data/dm-space-map-disk.h     |   25 +
4983  drivers/md/persistent-data/dm-space-map-metadata.c |  956 ++++++++
4984  drivers/md/persistent-data/dm-space-map-metadata.h |   33 +
4985  drivers/md/persistent-data/dm-space-map.h          |  118 +
4986  .../md/persistent-data/dm-transaction-manager.c    |  414 ++++
4987  .../md/persistent-data/dm-transaction-manager.h    |  130 ++
4988  include/linux/device-mapper.h                      |   40 +-
4989  include/linux/dm-kcopyd.h                          |    4 +
4990  33 files changed, 9927 insertions(+), 22 deletions(-)
4991  create mode 100644 Documentation/device-mapper/persistent-data.txt
4992  create mode 100644 Documentation/device-mapper/thin-provisioning.txt
4993  create mode 100644 drivers/md/dm-thin-metadata.c
4994  create mode 100644 drivers/md/dm-thin-metadata.h
4995  create mode 100644 drivers/md/dm-thin.c
4996  create mode 100644 drivers/md/persistent-data/Kconfig
4997  create mode 100644 drivers/md/persistent-data/Makefile
4998  create mode 100644 drivers/md/persistent-data/dm-block-manager.c
4999  create mode 100644 drivers/md/persistent-data/dm-block-manager.h
5000  create mode 100644 drivers/md/persistent-data/dm-btree-internal.h
5001  create mode 100644 drivers/md/persistent-data/dm-btree-remove.c
5002  create mode 100644 drivers/md/persistent-data/dm-btree-spine.c
5003  create mode 100644 drivers/md/persistent-data/dm-btree.c
5004  create mode 100644 drivers/md/persistent-data/dm-btree.h
5005  create mode 100644 drivers/md/persistent-data/dm-persistent-data-internal.h
5006  create mode 100644 drivers/md/persistent-data/dm-space-map-common.h
5007  create mode 100644 drivers/md/persistent-data/dm-space-map-disk.c
5008  create mode 100644 drivers/md/persistent-data/dm-space-map-disk.h
5009  create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.c
5010  create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.h
5011  create mode 100644 drivers/md/persistent-data/dm-space-map.h
5012  create mode 100644 drivers/md/persistent-data/dm-transaction-manager.c
5013  create mode 100644 drivers/md/persistent-data/dm-transaction-manager.h
5014 Merging embedded/master
5015 $ git merge embedded/master
5016 Already up-to-date.
5017 Merging firmware/master
5018 $ git merge firmware/master
5019 Already up-to-date.
5020 Merging pcmcia/master
5021 $ git merge pcmcia/master
5022 Already up-to-date.
5023 Merging battery/master
5024 $ git merge battery/master
5025 Merge made by recursive.
5026  .../bindings/power_supply/olpc_battery.txt         |    5 +
5027  drivers/power/ds2780_battery.c                     |    2 +-
5028  drivers/power/max17042_battery.c                   |   17 ++--
5029  drivers/power/max8903_charger.c                    |    2 +-
5030  drivers/power/max8997_charger.c                    |    2 +
5031  drivers/power/max8998_charger.c                    |    3 +
5032  drivers/power/olpc_battery.c                       |   79 ++++++++++++++-----
5033  drivers/power/pda_power.c                          |   71 +++++++++++++++---
5034  drivers/power/power_supply_sysfs.c                 |    4 +-
5035  drivers/power/s3c_adc_battery.c                    |    1 +
5036  drivers/power/wm831x_power.c                       |   44 +++++++----
5037  drivers/power/z2_battery.c                         |    2 +-
5038  include/linux/pda_power.h                          |    2 +
5039  13 files changed, 171 insertions(+), 63 deletions(-)
5040  create mode 100644 Documentation/devicetree/bindings/power_supply/olpc_battery.txt
5041 Merging leds/for-mm
5042 $ git merge leds/for-mm
5043 Resolved 'drivers/leds/Kconfig' using previous resolution.
5044 Auto-merging drivers/leds/Kconfig
5045 CONFLICT (content): Merge conflict in drivers/leds/Kconfig
5046 Automatic merge failed; fix conflicts and then commit the result.
5047 $ git commit -v -a
5048 [master 5a16c48] Merge remote-tracking branch 'leds/for-mm'
5049 $ git diff -M --stat --summary HEAD^..
5050 Merging backlight/for-mm
5051 $ git merge backlight/for-mm
5052 Already up-to-date.
5053 Merging mmc/mmc-next
5054 $ git merge mmc/mmc-next
5055 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
5056 Auto-merging drivers/mmc/core/core.c
5057 Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c
5058 Auto-merging include/linux/mmc/host.h
5059 Merge made by recursive.
5060  Documentation/fault-injection/fault-injection.txt |    8 +-
5061  arch/arm/mach-at91/at91sam9260_devices.c          |    2 +-
5062  drivers/mmc/core/core.c                           |   76 ++-
5063  drivers/mmc/core/debugfs.c                        |   25 +
5064  drivers/mmc/core/host.c                           |   23 +-
5065  drivers/mmc/core/host.h                           |    8 +-
5066  drivers/mmc/host/at91_mci.c                       |    6 +-
5067  drivers/mmc/host/atmel-mci-regs.h                 |  220 +++---
5068  drivers/mmc/host/atmel-mci.c                      |  823 ++++++++++++++-------
5069  drivers/mmc/host/sdhci-esdhc-imx.c                |   45 +-
5070  drivers/mmc/host/sh_mobile_sdhi.c                 |    4 +-
5071  include/linux/atmel-mci.h                         |    4 +-
5072  include/linux/atmel_pdc.h                         |    2 +
5073  include/linux/mmc/host.h                          |    5 +
5074  lib/Kconfig.debug                                 |   11 +
5075  lib/fault-inject.c                                |    2 +
5076  16 files changed, 872 insertions(+), 392 deletions(-)
5077 Merging kgdb/kgdb-next
5078 $ git merge kgdb/kgdb-next
5079 Merge made by recursive.
5080 Merging slab/for-next
5081 $ git merge slab/for-next
5082 Already up-to-date!
5083 Merge made by recursive.
5084 Merging uclinux/for-next
5085 $ git merge uclinux/for-next
5086 Already up-to-date.
5087 Merging md/for-next
5088 $ git merge md/for-next
5089 Merge made by recursive.
5090  drivers/md/md.c    |   12 +++++++++++-
5091  drivers/md/raid5.c |    6 ++----
5092  2 files changed, 13 insertions(+), 5 deletions(-)
5093 Merging mfd/for-next
5094 $ git merge mfd/for-next
5095 Merge made by recursive.
5096  arch/arm/mach-omap2/board-omap3beagle.c |    9 +-
5097  drivers/leds/leds-asic3.c               |   35 +++-
5098  drivers/mfd/Kconfig                     |    1 +
5099  drivers/mfd/ab3550-core.c               |   10 +-
5100  drivers/mfd/ab8500-gpadc.c              |   56 ++++--
5101  drivers/mfd/asic3.c                     |   26 ++-
5102  drivers/mfd/max8997.c                   |   32 +++-
5103  drivers/mfd/omap-usb-host.c             |    2 +-
5104  drivers/mfd/pcf50633-core.c             |  114 +++-------
5105  drivers/mfd/tc3589x.c                   |    2 +
5106  drivers/mfd/timberdale.c                |    9 +-
5107  drivers/mfd/tps65910-irq.c              |    2 +
5108  drivers/mfd/twl4030-irq.c               |  342 ++++++++++++-------------------
5109  drivers/mfd/twl4030-madc.c              |   27 +++-
5110  drivers/mfd/twl6030-irq.c               |   18 +-
5111  drivers/mfd/wm831x-irq.c                |    2 -
5112  drivers/mfd/wm8350-gpio.c               |    4 +-
5113  drivers/mfd/wm8994-core.c               |   53 +++++
5114  drivers/rtc/rtc-twl.c                   |   10 +-
5115  include/linux/i2c/twl4030-madc.h        |    4 +
5116  include/linux/mfd/ab8500/gpadc.h        |    5 +-
5117  include/linux/mfd/max8997-private.h     |    1 -
5118  include/linux/mfd/pcf50633/core.h       |    3 +-
5119  include/linux/mfd/wm8994/core.h         |    2 +
5120  include/linux/mfd/wm8994/pdata.h        |    9 +-
5121  25 files changed, 433 insertions(+), 345 deletions(-)
5122 Merging hdlc/hdlc-next
5123 $ git merge hdlc/hdlc-next
5124 Already up-to-date.
5125 Merging drm/drm-next
5126 $ git merge drm/drm-next
5127 Already up-to-date.
5128 Merging fbdev/master
5129 $ git merge fbdev/master
5130 Auto-merging arch/powerpc/platforms/85xx/p1022_ds.c
5131 Auto-merging arch/powerpc/platforms/86xx/mpc8610_hpcd.c
5132 Auto-merging arch/powerpc/sysdev/fsl_soc.h
5133 Auto-merging drivers/staging/xgifb/XGI_main_26.c
5134 Auto-merging drivers/video/atmel_lcdfb.c
5135 Auto-merging drivers/video/backlight/adp8860_bl.c
5136 Auto-merging drivers/video/controlfb.c
5137 Auto-merging drivers/video/fb_defio.c
5138 Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
5139 Auto-merging drivers/video/platinumfb.c
5140 Auto-merging drivers/video/via/viafbdev.c
5141 Merge made by recursive.
5142  arch/powerpc/platforms/512x/mpc512x_shared.c |   22 +-
5143  arch/powerpc/platforms/85xx/p1022_ds.c       |   47 +--
5144  arch/powerpc/platforms/86xx/mpc8610_hpcd.c   |   55 ++--
5145  arch/powerpc/sysdev/fsl_soc.h                |   25 +-
5146  drivers/staging/xgifb/XGI_main_26.c          |   22 +-
5147  drivers/video/68328fb.c                      |    4 +-
5148  drivers/video/Kconfig                        |   16 +-
5149  drivers/video/Makefile                       |    1 +
5150  drivers/video/acornfb.c                      |    5 +-
5151  drivers/video/arkfb.c                        |    9 +-
5152  drivers/video/atmel_lcdfb.c                  |   15 +-
5153  drivers/video/aty/radeon_base.c              |   10 +-
5154  drivers/video/au1200fb.c                     |  297 ++++++--------
5155  drivers/video/backlight/adp8860_bl.c         |    1 -
5156  drivers/video/backlight/adp8870_bl.c         |    1 -
5157  drivers/video/controlfb.c                    |    2 +-
5158  drivers/video/da8xx-fb.c                     |  155 +++++++-
5159  drivers/video/fb-puv3.c                      |    4 +-
5160  drivers/video/fb_defio.c                     |    3 +-
5161  drivers/video/fsl-diu-fb.c                   |   74 +++-
5162  drivers/video/g364fb.c                       |    5 +-
5163  drivers/video/grvga.c                        |  579 ++++++++++++++++++++++++++
5164  drivers/video/gxt4500.c                      |    4 +-
5165  drivers/video/hgafb.c                        |    4 +-
5166  drivers/video/imsttfb.c                      |    2 +-
5167  drivers/video/intelfb/intelfbhw.c            |    6 +-
5168  drivers/video/mb862xx/mb862xxfbdrv.c         |    2 +-
5169  drivers/video/mx3fb.c                        |    6 +-
5170  drivers/video/neofb.c                        |    4 +-
5171  drivers/video/platinumfb.c                   |    2 +-
5172  drivers/video/pm2fb.c                        |    6 +-
5173  drivers/video/pm3fb.c                        |    6 +-
5174  drivers/video/pxa3xx-gcu.c                   |    2 -
5175  drivers/video/s3c-fb.c                       |    2 +-
5176  drivers/video/s3fb.c                         |    9 +-
5177  drivers/video/savage/savagefb_driver.c       |   16 +-
5178  drivers/video/sis/sis_main.c                 |   30 +-
5179  drivers/video/skeletonfb.c                   |    2 +-
5180  drivers/video/sm501fb.c                      |    6 +-
5181  drivers/video/tridentfb.c                    |    4 +-
5182  drivers/video/valkyriefb.c                   |    2 +-
5183  drivers/video/vfb.c                          |    4 +-
5184  drivers/video/vga16fb.c                      |    2 +-
5185  drivers/video/via/via_modesetting.h          |    5 +
5186  drivers/video/via/viafbdev.c                 |   16 +-
5187  drivers/video/vt8500lcdfb.c                  |    4 +-
5188  drivers/video/vt8623fb.c                     |    9 +-
5189  drivers/video/xilinxfb.c                     |    1 -
5190  48 files changed, 1110 insertions(+), 398 deletions(-)
5191  create mode 100644 drivers/video/grvga.c
5192 Merging viafb/viafb-next
5193 $ git merge viafb/viafb-next
5194 Merge made by recursive.
5195  drivers/video/via/dvi.c             |   34 +--
5196  drivers/video/via/dvi.h             |    3 +-
5197  drivers/video/via/global.c          |    2 +
5198  drivers/video/via/global.h          |    2 +
5199  drivers/video/via/hw.c              |  544 ++++++-----------------------------
5200  drivers/video/via/hw.h              |  285 +------------------
5201  drivers/video/via/lcd.c             |   53 ++--
5202  drivers/video/via/lcd.h             |    7 +-
5203  drivers/video/via/share.h           |   23 +--
5204  drivers/video/via/via-core.c        |    2 +-
5205  drivers/video/via/via_modesetting.c |  104 +++++++
5206  drivers/video/via/via_modesetting.h |   18 ++
5207  drivers/video/via/viafbdev.c        |  166 ++++++------
5208  drivers/video/via/viamode.c         |   60 +++-
5209  drivers/video/via/viamode.h         |    4 +-
5210  15 files changed, 391 insertions(+), 916 deletions(-)
5211 Merging omap_dss2/for-next
5212 $ git merge omap_dss2/for-next
5213 Already up-to-date.
5214 Merging voltage/for-next
5215 $ git merge voltage/for-next
5216 Merge made by recursive.
5217  drivers/regulator/88pm8607.c           |    2 +-
5218  drivers/regulator/aat2870-regulator.c  |    1 +
5219  drivers/regulator/max8649.c            |    2 +-
5220  drivers/regulator/max8952.c            |    3 ---
5221  drivers/regulator/tps65023-regulator.c |   11 +++++++++++
5222  drivers/regulator/tps6507x-regulator.c |    8 +-------
5223  drivers/regulator/tps65912-regulator.c |    2 --
5224  include/linux/regulator/consumer.h     |    2 +-
5225  8 files changed, 16 insertions(+), 15 deletions(-)
5226 Merging security/next
5227 $ git merge security/next
5228 Recorded preimage for 'fs/ocfs2/xattr.c'
5229 Auto-merging Documentation/kernel-parameters.txt
5230 Auto-merging MAINTAINERS
5231 Auto-merging fs/gfs2/inode.c
5232 Auto-merging fs/ocfs2/xattr.c
5233 CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
5234 Auto-merging fs/xfs/xfs_iops.c
5235 Auto-merging kernel/cred.c
5236 Removing security/integrity/ima/ima_iint.c
5237 Automatic merge failed; fix conflicts and then commit the result.
5238 $ git commit -v -a
5239 Recorded resolution for 'fs/ocfs2/xattr.c'.
5240 [master 0703110] Merge remote-tracking branch 'security/next'
5241 $ git diff -M --stat --summary HEAD^..
5242  Documentation/ABI/testing/evm       |   23 ++
5243  Documentation/kernel-parameters.txt |    6 +
5244  MAINTAINERS                         |    5 +
5245  fs/attr.c                           |    5 +-
5246  fs/btrfs/xattr.c                    |   50 +++---
5247  fs/cifs/xattr.c                     |   40 ++--
5248  fs/ext2/xattr_security.c            |   34 ++--
5249  fs/ext3/xattr_security.c            |   36 ++--
5250  fs/ext4/xattr_security.c            |   36 ++--
5251  fs/gfs2/inode.c                     |   38 ++--
5252  fs/jffs2/security.c                 |   35 ++--
5253  fs/jfs/xattr.c                      |   57 +++---
5254  fs/ocfs2/xattr.c                    |   41 +++--
5255  fs/reiserfs/xattr_security.c        |    4 +-
5256  fs/xattr.c                          |   63 ++++++-
5257  fs/xfs/xfs_iops.c                   |   39 ++--
5258  include/linux/evm.h                 |   92 +++++++++
5259  include/linux/ima.h                 |   13 --
5260  include/linux/integrity.h           |   38 ++++
5261  include/linux/security.h            |   28 ++-
5262  include/linux/xattr.h               |   14 ++-
5263  kernel/cred.c                       |   16 ++-
5264  mm/shmem.c                          |    4 +-
5265  security/Kconfig                    |    2 +-
5266  security/Makefile                   |    4 +-
5267  security/commoncap.c                |   16 +-
5268  security/integrity/Kconfig          |    7 +
5269  security/integrity/Makefile         |   12 +
5270  security/integrity/evm/Kconfig      |   14 ++
5271  security/integrity/evm/Makefile     |    6 +
5272  security/integrity/evm/evm.h        |   38 ++++
5273  security/integrity/evm/evm_crypto.c |  216 +++++++++++++++++++
5274  security/integrity/evm/evm_main.c   |  384 ++++++++++++++++++++++++++++++++++
5275  security/integrity/evm/evm_secfs.c  |  108 ++++++++++
5276  security/integrity/iint.c           |  171 ++++++++++++++++
5277  security/integrity/ima/Kconfig      |    1 +
5278  security/integrity/ima/Makefile     |    2 +-
5279  security/integrity/ima/ima.h        |   29 +--
5280  security/integrity/ima/ima_api.c    |    7 +-
5281  security/integrity/ima/ima_iint.c   |  169 ---------------
5282  security/integrity/ima/ima_main.c   |   12 +-
5283  security/integrity/integrity.h      |   47 +++++
5284  security/keys/gc.c                  |  386 +++++++++++++++++++++++++----------
5285  security/keys/internal.h            |    4 +
5286  security/keys/key.c                 |  121 +-----------
5287  security/keys/keyring.c             |    3 +-
5288  security/keys/process_keys.c        |   16 ++-
5289  security/security.c                 |   71 ++++++-
5290  security/tomoyo/gc.c                |    2 +-
5291  49 files changed, 1894 insertions(+), 671 deletions(-)
5292  create mode 100644 Documentation/ABI/testing/evm
5293  create mode 100644 include/linux/evm.h
5294  create mode 100644 include/linux/integrity.h
5295  create mode 100644 security/integrity/Kconfig
5296  create mode 100644 security/integrity/Makefile
5297  create mode 100644 security/integrity/evm/Kconfig
5298  create mode 100644 security/integrity/evm/Makefile
5299  create mode 100644 security/integrity/evm/evm.h
5300  create mode 100644 security/integrity/evm/evm_crypto.c
5301  create mode 100644 security/integrity/evm/evm_main.c
5302  create mode 100644 security/integrity/evm/evm_secfs.c
5303  create mode 100644 security/integrity/iint.c
5304  delete mode 100644 security/integrity/ima/ima_iint.c
5305  create mode 100644 security/integrity/integrity.h
5306 Merging selinux/master
5307 $ git merge selinux/master
5308 Already up-to-date.
5309 Merging lblnet/master
5310 $ git merge lblnet/master
5311 Already up-to-date.
5312 Merging agp/agp-next
5313 $ git merge agp/agp-next
5314 Merge made by recursive.
5315 Merging watchdog/master
5316 $ git merge watchdog/master
5317 Merge made by recursive.
5318  drivers/watchdog/hpwdt.c        |    9 +++++----
5319  drivers/watchdog/watchdog_dev.c |   14 +++++++-------
5320  2 files changed, 12 insertions(+), 11 deletions(-)
5321 Merging bdev/master
5322 $ git merge bdev/master
5323 Already up-to-date.
5324 Merging dwmw2-iommu/master
5325 $ git merge dwmw2-iommu/master
5326 Already up-to-date.
5327 Merging cputime/cputime
5328 $ git merge cputime/cputime
5329 Already up-to-date.
5330 Merging osd/linux-next
5331 $ git merge osd/linux-next
5332 Merge made by recursive.
5333  fs/exofs/exofs.h       |    3 --
5334  fs/exofs/super.c       |   57 ++++++++++++++++++-----------------------------
5335  include/scsi/osd_ore.h |    2 +
5336  3 files changed, 24 insertions(+), 38 deletions(-)
5337 Merging jc_docs/docs-next
5338 $ git merge jc_docs/docs-next
5339 Already up-to-date.
5340 Merging nommu/master
5341 $ git merge nommu/master
5342 Already up-to-date.
5343 Merging trivial/for-next
5344 $ git merge trivial/for-next
5345 Auto-merging fs/eventpoll.c
5346 Auto-merging lib/idr.c
5347 Merge made by recursive.
5348  Documentation/ABI/removed/o2cb                     |    2 +-
5349  Documentation/ABI/testing/sysfs-bus-bcma           |    8 ++++----
5350  .../testing/sysfs-class-backlight-driver-adp8870   |   16 ++++++++--------
5351  drivers/usb/serial/mos7720.c                       |    1 -
5352  drivers/usb/serial/mos7840.c                       |    1 -
5353  fs/eventpoll.c                                     |    2 +-
5354  lib/idr.c                                          |    2 +-
5355  7 files changed, 15 insertions(+), 17 deletions(-)
5356 Merging audit/for-next
5357 $ git merge audit/for-next
5358 Already up-to-date.
5359 Merging pm/linux-next
5360 $ git merge pm/linux-next
5361 Recorded preimage for 'drivers/mfd/twl4030-irq.c'
5362 Resolved 'arch/s390/include/asm/thread_info.h' using previous resolution.
5363 Auto-merging arch/arm/mach-shmobile/board-mackerel.c
5364 Auto-merging arch/arm/mach-shmobile/setup-sh7372.c
5365 Auto-merging arch/s390/Kconfig
5366 Auto-merging arch/s390/include/asm/thread_info.h
5367 CONFLICT (content): Merge conflict in arch/s390/include/asm/thread_info.h
5368 Auto-merging drivers/bluetooth/btusb.c
5369 Auto-merging drivers/mfd/twl4030-irq.c
5370 CONFLICT (content): Merge conflict in drivers/mfd/twl4030-irq.c
5371 Auto-merging drivers/mfd/twl6030-irq.c
5372 Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
5373 Auto-merging drivers/usb/core/hcd.c
5374 Auto-merging fs/ext4/super.c
5375 Auto-merging fs/gfs2/quota.c
5376 Auto-merging fs/xfs/xfs_buf.c
5377 Auto-merging include/linux/netdevice.h
5378 Removing include/linux/pm_qos_params.h
5379 Auto-merging kernel/power/qos.c
5380 Auto-merging net/mac80211/main.c
5381 Automatic merge failed; fix conflicts and then commit the result.
5382 $ git commit -v -a
5383 Recorded resolution for 'drivers/mfd/twl4030-irq.c'.
5384 [master 7d76f11] Merge remote-tracking branch 'pm/linux-next'
5385 $ git diff -M --stat --summary HEAD^..
5386  Documentation/power/basic-pm-debugging.txt   |   24 ++
5387  Documentation/power/freezing-of-tasks.txt    |   14 +-
5388  Documentation/power/runtime_pm.txt           |    1 +
5389  Documentation/usb/power-management.txt       |    8 +-
5390  arch/alpha/include/asm/thread_info.h         |    2 -
5391  arch/arm/include/asm/thread_info.h           |    2 -
5392  arch/arm/mach-msm/clock.c                    |    2 +-
5393  arch/arm/mach-omap1/pm_bus.c                 |    1 +
5394  arch/arm/mach-shmobile/board-ap4evb.c        |    1 +
5395  arch/arm/mach-shmobile/board-mackerel.c      |    2 +-
5396  arch/arm/mach-shmobile/include/mach/sh7372.h |    3 +
5397  arch/arm/mach-shmobile/pm-sh7372.c           |   56 +---
5398  arch/arm/mach-shmobile/pm_runtime.c          |    1 +
5399  arch/arm/mach-shmobile/setup-sh7372.c        |    3 +
5400  arch/avr32/include/asm/thread_info.h         |    2 -
5401  arch/blackfin/include/asm/thread_info.h      |    2 -
5402  arch/cris/include/asm/thread_info.h          |    2 -
5403  arch/frv/include/asm/thread_info.h           |    2 -
5404  arch/h8300/include/asm/thread_info.h         |    2 -
5405  arch/ia64/include/asm/thread_info.h          |    2 -
5406  arch/m32r/include/asm/thread_info.h          |    2 -
5407  arch/m68k/include/asm/thread_info.h          |    1 -
5408  arch/microblaze/include/asm/thread_info.h    |    2 -
5409  arch/mips/include/asm/thread_info.h          |    2 -
5410  arch/mn10300/include/asm/thread_info.h       |    2 -
5411  arch/parisc/include/asm/thread_info.h        |    2 -
5412  arch/powerpc/include/asm/thread_info.h       |    2 -
5413  arch/s390/Kconfig                            |    1 +
5414  arch/s390/include/asm/thread_info.h          |    2 -
5415  arch/s390/kernel/suspend.c                   |  118 ++++++++
5416  arch/s390/kernel/swsusp_asm64.S              |    3 +
5417  arch/sh/include/asm/thread_info.h            |    2 -
5418  arch/sparc/include/asm/thread_info_32.h      |    2 -
5419  arch/sparc/include/asm/thread_info_64.h      |    2 -
5420  arch/um/include/asm/thread_info.h            |    2 -
5421  arch/unicore32/include/asm/thread_info.h     |    2 -
5422  arch/x86/include/asm/thread_info.h           |    2 -
5423  arch/xtensa/include/asm/thread_info.h        |    2 -
5424  drivers/acpi/processor_idle.c                |    2 +-
5425  drivers/base/power/Makefile                  |    4 +-
5426  drivers/base/power/clock_ops.c               |  122 ++++-----
5427  drivers/base/power/common.c                  |   86 ++++++
5428  drivers/base/power/domain.c                  |  331 ++++++++++++----------
5429  drivers/base/power/main.c                    |   34 ++-
5430  drivers/base/power/qos.c                     |  399 ++++++++++++++++++++++++++
5431  drivers/base/power/runtime.c                 |   15 +-
5432  drivers/bluetooth/btmrvl_main.c              |    2 -
5433  drivers/bluetooth/btusb.c                    |    2 +-
5434  drivers/cpuidle/cpuidle.c                    |    2 +-
5435  drivers/cpuidle/governors/ladder.c           |    2 +-
5436  drivers/cpuidle/governors/menu.c             |    2 +-
5437  drivers/hid/hid-picolcd.c                    |    2 +-
5438  drivers/hid/usbhid/hid-core.c                |    7 +-
5439  drivers/media/video/via-camera.c             |    4 +-
5440  drivers/mfd/twl6030-irq.c                    |    2 -
5441  drivers/net/ethernet/intel/e1000e/netdev.c   |    2 +-
5442  drivers/net/irda/stir4200.c                  |    2 +-
5443  drivers/net/usb/usbnet.c                     |    2 +-
5444  drivers/net/wimax/i2400m/usb.c               |    4 +-
5445  drivers/net/wireless/ipw2x00/ipw2100.c       |    4 +-
5446  drivers/platform/x86/thinkpad_acpi.c         |   15 +-
5447  drivers/staging/rts_pstor/rtsx.c             |    2 -
5448  drivers/usb/class/cdc-acm.c                  |    2 +-
5449  drivers/usb/class/cdc-wdm.c                  |    6 +-
5450  drivers/usb/core/driver.c                    |    9 +-
5451  drivers/usb/core/hcd.c                       |    4 +-
5452  drivers/usb/core/hub.c                       |   10 +-
5453  drivers/usb/serial/sierra.c                  |    2 +-
5454  drivers/usb/serial/usb_wwan.c                |    2 +-
5455  fs/btrfs/async-thread.c                      |    2 +-
5456  fs/btrfs/disk-io.c                           |    8 +-
5457  fs/ext4/super.c                              |    3 +-
5458  fs/fs-writeback.c                            |    4 +-
5459  fs/gfs2/log.c                                |    4 +-
5460  fs/gfs2/quota.c                              |    4 +-
5461  fs/jbd/journal.c                             |    2 +-
5462  fs/jbd2/journal.c                            |    2 +-
5463  fs/jfs/jfs_logmgr.c                          |    2 +-
5464  fs/jfs/jfs_txnmgr.c                          |    4 +-
5465  fs/nilfs2/segment.c                          |    2 +-
5466  fs/xfs/xfs_buf.c                             |    2 +-
5467  include/linux/device.h                       |    5 +
5468  include/linux/freezer.h                      |   78 ++---
5469  include/linux/kthread.h                      |    1 +
5470  include/linux/netdevice.h                    |    4 +-
5471  include/linux/pm.h                           |   33 ++-
5472  include/linux/pm_clock.h                     |   71 +++++
5473  include/linux/pm_domain.h                    |   17 +-
5474  include/linux/pm_qos.h                       |  147 ++++++++++
5475  include/linux/pm_qos_params.h                |   38 ---
5476  include/linux/pm_runtime.h                   |   42 ---
5477  include/linux/sched.h                        |    3 +-
5478  include/linux/suspend.h                      |   86 ++++++
5479  include/sound/pcm.h                          |    4 +-
5480  kernel/Makefile                              |    2 +-
5481  kernel/cgroup_freezer.c                      |   51 ++--
5482  kernel/exit.c                                |    8 +-
5483  kernel/fork.c                                |    1 -
5484  kernel/freezer.c                             |  179 +++++++-----
5485  kernel/kthread.c                             |   25 ++
5486  kernel/power/Kconfig                         |    3 +
5487  kernel/power/Makefile                        |    2 +-
5488  kernel/power/hibernate.c                     |   15 +-
5489  kernel/power/main.c                          |  102 +++++++
5490  kernel/power/process.c                       |   65 ++---
5491  kernel/{pm_qos_params.c => power/qos.c}      |  273 +++++++++---------
5492  kernel/power/snapshot.c                      |   18 ++
5493  kernel/power/suspend.c                       |   17 +-
5494  kernel/power/user.c                          |    4 +-
5495  mm/backing-dev.c                             |    8 +-
5496  net/mac80211/main.c                          |    2 +-
5497  net/mac80211/mlme.c                          |    2 +-
5498  net/mac80211/scan.c                          |    2 +-
5499  sound/core/pcm_native.c                      |    2 +-
5500  sound/usb/card.c                             |    2 +-
5501  115 files changed, 1858 insertions(+), 860 deletions(-)
5502  create mode 100644 drivers/base/power/common.c
5503  create mode 100644 drivers/base/power/qos.c
5504  create mode 100644 include/linux/pm_clock.h
5505  create mode 100644 include/linux/pm_qos.h
5506  delete mode 100644 include/linux/pm_qos_params.h
5507  rename kernel/{pm_qos_params.c => power/qos.c} (71%)
5508 Merging apm/for-next
5509 $ git merge apm/for-next
5510 Already up-to-date.
5511 Merging fsnotify/for-next
5512 $ git merge fsnotify/for-next
5513 Auto-merging fs/cachefiles/namei.c
5514 Auto-merging fs/nfsd/vfs.c
5515 Auto-merging fs/notify/fanotify/fanotify_user.c
5516 Auto-merging fs/notify/group.c
5517 Auto-merging fs/notify/mark.c
5518 Auto-merging include/linux/fsnotify_backend.h
5519 Merge made by recursive.
5520  fs/cachefiles/namei.c              |    1 -
5521  fs/cachefiles/xattr.c              |    1 -
5522  fs/nfsd/vfs.c                      |    3 -
5523  fs/notify/dnotify/dnotify.c        |   15 +++---
5524  fs/notify/fanotify/fanotify.c      |   24 +++++----
5525  fs/notify/fanotify/fanotify_user.c |  101 +++++++++++++++++++++++++-----------
5526  fs/notify/group.c                  |    1 +
5527  fs/notify/mark.c                   |   36 +++++--------
5528  include/linux/fanotify.h           |    5 ++-
5529  include/linux/fsnotify_backend.h   |   14 ++++-
5530  10 files changed, 121 insertions(+), 80 deletions(-)
5531 Merging irda/for-next
5532 $ git merge irda/for-next
5533 Already up-to-date.
5534 Merging i7core_edac/linux_next
5535 $ git merge i7core_edac/linux_next
5536 Auto-merging drivers/edac/i7core_edac.c
5537 Merge made by recursive.
5538  drivers/edac/i7core_edac.c |   23 ++++++++++++++++++++---
5539  1 files changed, 20 insertions(+), 3 deletions(-)
5540 Merging i7300_edac/linux_next
5541 $ git merge i7300_edac/linux_next
5542 Resolved 'arch/x86/kernel/cpu/mcheck/mce.c' using previous resolution.
5543 Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
5544 CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
5545 Removing drivers/edac/edac_mce.c
5546 Auto-merging drivers/edac/i7core_edac.c
5547 Auto-merging include/linux/edac.h
5548 Removing include/linux/edac_mce.h
5549 Automatic merge failed; fix conflicts and then commit the result.
5550 $ git commit -v -a
5551 [master ba07686] Merge remote-tracking branch 'i7300_edac/linux_next'
5552 $ git diff -M --stat --summary HEAD^..
5553  arch/x86/kernel/cpu/mcheck/mce.c |   18 +--
5554  drivers/edac/Kconfig             |    8 +-
5555  drivers/edac/Makefile            |    1 -
5556  drivers/edac/edac_core.h         |  350 +----------------------------------
5557  drivers/edac/edac_mce.c          |   61 ------
5558  drivers/edac/i7core_edac.c       |  385 ++++++++++++++++++++++++++++++++++----
5559  include/linux/edac.h             |  350 ++++++++++++++++++++++++++++++++++
5560  include/linux/edac_mce.h         |   31 ---
5561  8 files changed, 709 insertions(+), 495 deletions(-)
5562  delete mode 100644 drivers/edac/edac_mce.c
5563  delete mode 100644 include/linux/edac_mce.h
5564 Merging devicetree/devicetree/next
5565 $ git merge devicetree/devicetree/next
5566 Resolved 'drivers/of/base.c' using previous resolution.
5567 Auto-merging drivers/of/base.c
5568 CONFLICT (content): Merge conflict in drivers/of/base.c
5569 Automatic merge failed; fix conflicts and then commit the result.
5570 $ git commit -v -a
5571 [master 60ddcfb] Merge remote-tracking branch 'devicetree/devicetree/next'
5572 $ git diff -M --stat --summary HEAD^..
5573 Merging spi/spi/next
5574 $ git merge spi/spi/next
5575 Already up-to-date.
5576 Merging gpio/gpio/next
5577 $ git merge gpio/gpio/next
5578 Already up-to-date.
5579 Merging tip/auto-latest
5580 $ git merge tip/auto-latest
5581 Resolved 'arch/x86/mm/fault.c' using previous resolution.
5582 Auto-merging Documentation/kernel-parameters.txt
5583 Auto-merging arch/x86/mm/fault.c
5584 CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
5585 Auto-merging arch/x86/xen/mmu.c
5586 Automatic merge failed; fix conflicts and then commit the result.
5587 $ git commit -v -a
5588 [master 17ab545] Merge remote-tracking branch 'tip/auto-latest'
5589 $ git diff -M --stat --summary HEAD^..
5590  Documentation/kernel-parameters.txt   |   18 ++++
5591  Documentation/x86/entry_64.txt        |    3 -
5592  arch/x86/Kconfig                      |    9 ++
5593  arch/x86/include/asm/archrandom.h     |   75 +++++++++++++++++
5594  arch/x86/include/asm/cmpxchg_32.h     |   21 +++++
5595  arch/x86/include/asm/cmpxchg_64.h     |   26 ++++++
5596  arch/x86/include/asm/elf.h            |   31 +++++++
5597  arch/x86/include/asm/pgtable_types.h  |    1 -
5598  arch/x86/include/asm/spinlock.h       |  140 +++++++++++---------------------
5599  arch/x86/include/asm/spinlock_types.h |   22 +++++-
5600  arch/x86/include/asm/x86_init.h       |   12 ---
5601  arch/x86/kernel/apic/x2apic_uv_x.c    |    1 -
5602  arch/x86/kernel/cpu/Makefile          |    1 +
5603  arch/x86/kernel/cpu/amd.c             |   47 +++++++----
5604  arch/x86/kernel/cpu/common.c          |    5 +
5605  arch/x86/kernel/cpu/cpu.h             |    1 +
5606  arch/x86/kernel/cpu/rdrand.c          |   73 ++++++++++++++++
5607  arch/x86/kernel/sys_x86_64.c          |   77 +++++++++++++++++-
5608  arch/x86/kernel/x86_init.c            |    4 -
5609  arch/x86/mm/fault.c                   |    2 +-
5610  arch/x86/mm/init.c                    |  147 ++++++++++++++++++++++++---------
5611  arch/x86/mm/mmap.c                    |   20 +----
5612  arch/x86/platform/olpc/olpc.c         |    4 +-
5613  arch/x86/vdso/vma.c                   |    9 ++
5614  arch/x86/xen/mmu.c                    |   15 ----
5615  drivers/char/random.c                 |   23 +++++-
5616  include/linux/random.h                |   13 +++
5617  27 files changed, 590 insertions(+), 210 deletions(-)
5618  create mode 100644 arch/x86/include/asm/archrandom.h
5619  create mode 100644 arch/x86/kernel/cpu/rdrand.c
5620 Merging rcu/rcu/next
5621 $ git merge rcu/rcu/next
5622 Auto-merging Documentation/RCU/NMI-RCU.txt
5623 Auto-merging include/linux/rcupdate.h
5624 Auto-merging include/linux/sched.h
5625 Auto-merging init/Kconfig
5626 Auto-merging kernel/lockdep.c
5627 Auto-merging kernel/pid.c
5628 Auto-merging kernel/rcupdate.c
5629 Auto-merging kernel/rcutorture.c
5630 Auto-merging kernel/rcutree_trace.c
5631 Auto-merging kernel/rtmutex.c
5632 Auto-merging kernel/sched.c
5633 Merge made by recursive.
5634  Documentation/RCU/NMI-RCU.txt       |    2 +-
5635  Documentation/RCU/lockdep-splat.txt |  110 +++++++++
5636  Documentation/RCU/lockdep.txt       |   34 ++-
5637  Documentation/RCU/torture.txt       |  137 ++++++++---
5638  Documentation/RCU/trace.txt         |   38 ++--
5639  include/linux/lockdep.h             |    2 +-
5640  include/linux/rcupdate.h            |  300 +++++++++++-------------
5641  include/linux/rcutiny.h             |   20 ++-
5642  include/linux/rcutree.h             |    2 +
5643  include/linux/sched.h               |    4 -
5644  include/linux/types.h               |   10 +
5645  include/trace/events/rcu.h          |  459 +++++++++++++++++++++++++++++++++++
5646  init/Kconfig                        |    6 +-
5647  kernel/lockdep.c                    |   84 ++++---
5648  kernel/pid.c                        |    4 +-
5649  kernel/rcu.h                        |   85 +++++++
5650  kernel/rcupdate.c                   |   26 ++-
5651  kernel/rcutiny.c                    |  117 ++-------
5652  kernel/rcutiny_plugin.h             |  135 +++++++----
5653  kernel/rcutorture.c                 |   74 +++----
5654  kernel/rcutree.c                    |  226 +++++++++++-------
5655  kernel/rcutree.h                    |   16 +-
5656  kernel/rcutree_plugin.h             |  116 ++++++---
5657  kernel/rcutree_trace.c              |   13 +-
5658  kernel/rtmutex.c                    |    7 +
5659  kernel/sched.c                      |   13 +-
5660  kernel/time/tick-sched.c            |    6 -
5661  27 files changed, 1438 insertions(+), 608 deletions(-)
5662  create mode 100644 Documentation/RCU/lockdep-splat.txt
5663  create mode 100644 include/trace/events/rcu.h
5664  create mode 100644 kernel/rcu.h
5665 Merging kvm/linux-next
5666 $ git merge kvm/linux-next
5667 Already up-to-date.
5668 Merging oprofile/for-next
5669 $ git merge oprofile/for-next
5670 Already up-to-date.
5671 Merging ptrace/ptrace
5672 $ git merge ptrace/ptrace
5673 Auto-merging include/linux/sched.h
5674 Auto-merging kernel/fork.c
5675 Merge made by recursive.
5676  arch/x86/kernel/signal.c |    6 +----
5677  fs/exec.c                |   18 +------------
5678  include/linux/sched.h    |    3 +-
5679  include/linux/signal.h   |    1 +
5680  kernel/fork.c            |   61 +++++++++++++++++++++++++++++----------------
5681  kernel/signal.c          |   21 ++++++++++++++++
5682  6 files changed, 65 insertions(+), 45 deletions(-)
5683 Merging xen/upstream/xen
5684 $ git merge xen/upstream/xen
5685 Merge made by recursive.
5686 Merging xen-two/linux-next
5687 $ git merge xen-two/linux-next
5688 Auto-merging arch/x86/xen/mmu.c
5689 Merge made by recursive.
5690  .../ABI/testing/sysfs-bus-pci-devices-cciss        |    7 ++
5691  Documentation/blockdev/cciss.txt                   |   10 +++
5692  arch/x86/xen/Kconfig                               |    8 --
5693  arch/x86/xen/mmu.c                                 |   38 -----------
5694  drivers/block/cciss.c                              |   69 ++++++++++++++++---
5695  drivers/block/cciss.h                              |    1 +
5696  drivers/block/xen-blkback/blkback.c                |    8 +-
5697  drivers/block/xen-blkback/common.h                 |    2 +-
5698  drivers/block/xen-blkback/xenbus.c                 |   14 +++-
5699  drivers/block/xen-blkfront.c                       |    9 ++-
5700  drivers/pci/xen-pcifront.c                         |    4 +-
5701  drivers/xen/balloon.c                              |   15 ++--
5702  drivers/xen/events.c                               |    9 +--
5703  drivers/xen/gntdev.c                               |    3 +-
5704  drivers/xen/grant-table.c                          |    2 +-
5705  drivers/xen/pci.c                                  |    4 +-
5706  drivers/xen/swiotlb-xen.c                          |   42 ++++++++----
5707  drivers/xen/xen-balloon.c                          |   17 ++---
5708  drivers/xen/xen-pciback/conf_space_header.c        |    2 +-
5709  drivers/xen/xenbus/xenbus_probe.c                  |    7 +-
5710  drivers/xen/xenbus/xenbus_probe.h                  |    3 +-
5711  21 files changed, 156 insertions(+), 118 deletions(-)
5712 Merging xen-pvhvm/linux-next
5713 $ git merge xen-pvhvm/linux-next
5714 Already up-to-date.
5715 Merging edac-amd/for-next
5716 $ git merge edac-amd/for-next
5717 Merge made by recursive.
5718  drivers/edac/mce_amd.c |    4 ++--
5719  1 files changed, 2 insertions(+), 2 deletions(-)
5720 Merging percpu/for-next
5721 $ git merge percpu/for-next
5722 Merge made by recursive.
5723  mm/percpu-vm.c |    5 ++---
5724  mm/percpu.c    |   17 +++++++++--------
5725  2 files changed, 11 insertions(+), 11 deletions(-)
5726 Merging workqueues/for-next
5727 $ git merge workqueues/for-next
5728 Already up-to-date.
5729 Merging sfi/sfi-test
5730 $ git merge sfi/sfi-test
5731 Already up-to-date.
5732 Merging asm-generic/next
5733 $ git merge asm-generic/next
5734 Already up-to-date.
5735 Merging drivers-x86/linux-next
5736 $ git merge drivers-x86/linux-next
5737 Already up-to-date.
5738 Merging hwpoison/hwpoison
5739 $ git merge hwpoison/hwpoison
5740 Already up-to-date.
5741 Merging sysctl/master
5742 $ git merge sysctl/master
5743 Auto-merging fs/proc/proc_sysctl.c
5744 Merge made by recursive.
5745  fs/proc/proc_sysctl.c |   14 ++------------
5746  1 files changed, 2 insertions(+), 12 deletions(-)
5747 Merging namespace/master
5748 $ git merge namespace/master
5749 Auto-merging fs/proc/inode.c
5750 Merge made by recursive.
5751  fs/proc/inode.c      |    6 +-
5752  fs/proc/namespaces.c |  160 +++++++++++++++++++++++++++++++++++++++++++-------
5753  2 files changed, 142 insertions(+), 24 deletions(-)
5754 Merging regmap/for-next
5755 $ git merge regmap/for-next
5756 Auto-merging drivers/base/regmap/regmap-spi.c
5757 Auto-merging drivers/mfd/Kconfig
5758 Auto-merging drivers/mfd/wm8994-core.c
5759 Auto-merging include/linux/mfd/wm8994/core.h
5760 Merge made by recursive.
5761  drivers/base/regmap/Makefile         |    1 +
5762  drivers/base/regmap/internal.h       |   66 ++++++
5763  drivers/base/regmap/regmap-debugfs.c |  209 +++++++++++++++++
5764  drivers/base/regmap/regmap-i2c.c     |    1 -
5765  drivers/base/regmap/regmap-spi.c     |    1 -
5766  drivers/base/regmap/regmap.c         |  139 +++++++++---
5767  drivers/mfd/Kconfig                  |    3 +
5768  drivers/mfd/wm831x-core.c            |  424 +++++++++++++++++++++++++++++-----
5769  drivers/mfd/wm831x-i2c.c             |   68 +-----
5770  drivers/mfd/wm831x-spi.c             |  196 +++-------------
5771  drivers/mfd/wm8400-core.c            |  106 +++------
5772  drivers/mfd/wm8994-core.c            |  178 +++------------
5773  include/linux/mfd/wm831x/core.h      |    9 +-
5774  include/linux/mfd/wm8400-private.h   |    7 +-
5775  include/linux/mfd/wm8994/core.h      |    9 +-
5776  include/linux/regmap.h               |   47 ++++-
5777  include/trace/events/regmap.h        |  112 +++++++++
5778  17 files changed, 1025 insertions(+), 551 deletions(-)
5779  create mode 100644 drivers/base/regmap/internal.h
5780  create mode 100644 drivers/base/regmap/regmap-debugfs.c
5781  create mode 100644 include/trace/events/regmap.h
5782 Merging driver-core/driver-core-next
5783 $ git merge driver-core/driver-core-next
5784 Auto-merging drivers/base/platform.c
5785 Merge made by recursive.
5786  Documentation/filesystems/sysfs.txt |   10 ++-
5787  drivers/base/platform.c             |    2 +-
5788  drivers/misc/pch_phub.c             |   10 ++-
5789  drivers/uio/uio.c                   |    7 +-
5790  drivers/uio/uio_pci_generic.c       |    5 -
5791  drivers/uio/uio_pdrv_genirq.c       |    2 +-
5792  fs/debugfs/inode.c                  |    2 +-
5793  fs/sysfs/dir.c                      |  167 +++++++++++++++++++++++------------
5794  fs/sysfs/inode.c                    |   14 +---
5795  fs/sysfs/sysfs.h                    |   17 +++-
5796  10 files changed, 149 insertions(+), 87 deletions(-)
5797 Merging tty/tty-next
5798 $ git merge tty/tty-next
5799 Already up-to-date.
5800 Merging usb/usb-next
5801 $ git merge usb/usb-next
5802 Auto-merging MAINTAINERS
5803 Auto-merging arch/arm/mach-mmp/pxa168.c
5804 Auto-merging drivers/usb/core/hub.c
5805 Auto-merging drivers/usb/host/ehci-hub.c
5806 Auto-merging drivers/usb/host/ehci-s5p.c
5807 Merge made by recursive.
5808  Documentation/usb/dwc3.txt              |   53 +
5809  MAINTAINERS                             |    8 +
5810  arch/arm/mach-mmp/include/mach/pxa168.h |    7 +
5811  arch/arm/mach-mmp/pxa168.c              |   46 +
5812  drivers/usb/Kconfig                     |    3 +
5813  drivers/usb/Makefile                    |    2 +
5814  drivers/usb/core/hub.c                  |    5 -
5815  drivers/usb/dwc3/Kconfig                |   25 +
5816  drivers/usb/dwc3/Makefile               |   36 +
5817  drivers/usb/dwc3/core.c                 |  467 +++++++
5818  drivers/usb/dwc3/core.h                 |  709 +++++++++++
5819  drivers/usb/dwc3/debug.h                |   51 +
5820  drivers/usb/dwc3/debugfs.c              |  534 ++++++++
5821  drivers/usb/dwc3/dwc3-omap.c            |  410 ++++++
5822  drivers/usb/dwc3/dwc3-pci.c             |  219 ++++
5823  drivers/usb/dwc3/ep0.c                  |  782 ++++++++++++
5824  drivers/usb/dwc3/gadget.c               | 2063 +++++++++++++++++++++++++++++++
5825  drivers/usb/dwc3/gadget.h               |  292 +++++
5826  drivers/usb/dwc3/io.h                   |   55 +
5827  drivers/usb/gadget/Kconfig              |   12 +
5828  drivers/usb/gadget/gadget_chips.h       |    3 +
5829  drivers/usb/gadget/s3c-hsudc.c          |   49 +-
5830  drivers/usb/host/Kconfig                |    7 +
5831  drivers/usb/host/ehci-au1xxx.c          |    2 +-
5832  drivers/usb/host/ehci-dbg.c             |   17 +-
5833  drivers/usb/host/ehci-fsl.c             |    4 +-
5834  drivers/usb/host/ehci-hcd.c             |   30 +-
5835  drivers/usb/host/ehci-hub.c             |   10 +-
5836  drivers/usb/host/ehci-pci.c             |    2 +-
5837  drivers/usb/host/ehci-pxa168.c          |  363 ++++++
5838  drivers/usb/host/ehci-q.c               |   22 +-
5839  drivers/usb/host/ehci-s5p.c             |    2 +-
5840  drivers/usb/host/ehci-sched.c           |   11 +-
5841  drivers/usb/host/ehci-xls.c             |  161 +++
5842  drivers/usb/host/ehci.h                 |    7 +
5843  drivers/usb/host/isp1362-hcd.c          |    6 +-
5844  drivers/usb/host/isp1760-hcd.c          |  401 ++++---
5845  drivers/usb/host/isp1760-hcd.h          |    3 +-
5846  drivers/usb/host/ohci-hcd.c             |    5 +
5847  drivers/usb/host/ohci-omap3.c           |    2 +-
5848  drivers/usb/host/ohci-xls.c             |  151 +++
5849  drivers/usb/misc/usblcd.c               |  127 ++-
5850  drivers/usb/misc/usbled.c               |   25 +-
5851  drivers/usb/otg/twl6030-usb.c           |   16 -
5852  drivers/usb/renesas_usbhs/pipe.c        |    2 +-
5853  drivers/usb/serial/ipw.c                |   33 +-
5854  drivers/usb/storage/usb.c               |   16 +-
5855  include/linux/usb/ch9.h                 |   17 +
5856  48 files changed, 6972 insertions(+), 301 deletions(-)
5857  create mode 100644 Documentation/usb/dwc3.txt
5858  create mode 100644 drivers/usb/dwc3/Kconfig
5859  create mode 100644 drivers/usb/dwc3/Makefile
5860  create mode 100644 drivers/usb/dwc3/core.c
5861  create mode 100644 drivers/usb/dwc3/core.h
5862  create mode 100644 drivers/usb/dwc3/debug.h
5863  create mode 100644 drivers/usb/dwc3/debugfs.c
5864  create mode 100644 drivers/usb/dwc3/dwc3-omap.c
5865  create mode 100644 drivers/usb/dwc3/dwc3-pci.c
5866  create mode 100644 drivers/usb/dwc3/ep0.c
5867  create mode 100644 drivers/usb/dwc3/gadget.c
5868  create mode 100644 drivers/usb/dwc3/gadget.h
5869  create mode 100644 drivers/usb/dwc3/io.h
5870  create mode 100644 drivers/usb/host/ehci-pxa168.c
5871  create mode 100644 drivers/usb/host/ehci-xls.c
5872  create mode 100644 drivers/usb/host/ohci-xls.c
5873 Merging staging/staging-next
5874 $ git merge staging/staging-next
5875 Already up-to-date.
5876 Merging bkl-config/config
5877 $ git merge bkl-config/config
5878 Already up-to-date.
5879 Merging tmem/linux-next
5880 $ git merge tmem/linux-next
5881 Auto-merging include/linux/swap.h
5882 Auto-merging mm/Kconfig
5883 Auto-merging mm/swapfile.c
5884 Merge made by recursive.
5885  .../ABI/testing/sysfs-kernel-mm-frontswap          |   16 +
5886  Documentation/vm/frontswap.txt                     |  210 ++++++++++++
5887  include/linux/frontswap.h                          |   92 ++++++
5888  include/linux/swap.h                               |    2 +
5889  include/linux/swapfile.h                           |   13 +
5890  mm/Kconfig                                         |   17 +
5891  mm/Makefile                                        |    1 +
5892  mm/frontswap.c                                     |  335 ++++++++++++++++++++
5893  mm/page_io.c                                       |   12 +
5894  mm/swapfile.c                                      |   65 +++-
5895  10 files changed, 751 insertions(+), 12 deletions(-)
5896  create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-frontswap
5897  create mode 100644 Documentation/vm/frontswap.txt
5898  create mode 100644 include/linux/frontswap.h
5899  create mode 100644 include/linux/swapfile.h
5900  create mode 100644 mm/frontswap.c
5901 Merging writeback/next
5902 $ git merge writeback/next
5903 Merge made by recursive.
5904  include/linux/writeback.h |   11 -----------
5905  mm/page-writeback.c       |   15 ++-------------
5906  2 files changed, 2 insertions(+), 24 deletions(-)
5907 Merging arm-dt/devicetree/arm-next
5908 $ git merge arm-dt/devicetree/arm-next
5909 Already up-to-date.
5910 Merging moduleh/module.h-split
5911 $ git merge moduleh/module.h-split
5912 Auto-merging arch/arm/common/scoop.c
5913 Auto-merging arch/arm/kernel/setup.c
5914 Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
5915 Auto-merging arch/arm/mach-ixp2000/core.c
5916 Auto-merging arch/arm/mach-ixp4xx/common-pci.c
5917 Auto-merging arch/arm/mach-msm/io.c
5918 Auto-merging arch/arm/mach-omap1/board-ams-delta.c
5919 Auto-merging arch/arm/mach-omap1/board-sx1.c
5920 Auto-merging arch/arm/mach-omap1/board-voiceblue.c
5921 Auto-merging arch/arm/mach-orion5x/dns323-setup.c
5922 Auto-merging arch/arm/plat-samsung/dev-ts.c
5923 Auto-merging arch/arm/plat-samsung/platformdata.c
5924 Auto-merging arch/mips/bcm47xx/gpio.c
5925 Auto-merging arch/mips/bcm47xx/setup.c
5926 Auto-merging arch/mips/kernel/traps.c
5927 Auto-merging arch/sparc/kernel/pcic.c
5928 Auto-merging arch/x86/kernel/cpu/amd.c
5929 Auto-merging drivers/ata/libata-eh.c
5930 Auto-merging drivers/base/power/main.c
5931 Auto-merging drivers/base/power/runtime.c
5932 Auto-merging drivers/bcma/core.c
5933 Auto-merging drivers/bcma/driver_chipcommon.c
5934 Auto-merging drivers/bcma/driver_pci.c
5935 Auto-merging drivers/bcma/main.c
5936 Auto-merging drivers/char/virtio_console.c
5937 Auto-merging drivers/clocksource/sh_cmt.c
5938 Auto-merging drivers/firmware/google/gsmi.c
5939 Auto-merging drivers/gpio/gpio-ep93xx.c
5940 Auto-merging drivers/hid/hid-axff.c
5941 Auto-merging drivers/hid/hid-debug.c
5942 Auto-merging drivers/hid/hid-picolcd.c
5943 Auto-merging drivers/hid/hid-sjoy.c
5944 Auto-merging drivers/hid/usbhid/hid-quirks.c
5945 Auto-merging drivers/input/input-polldev.c
5946 Auto-merging drivers/input/misc/ad714x.c
5947 Auto-merging drivers/leds/leds-asic3.c
5948 Auto-merging drivers/md/dm-raid.c
5949 Auto-merging drivers/md/md.c
5950 Auto-merging drivers/md/raid5.c
5951 Auto-merging drivers/mfd/ab3550-core.c
5952 Auto-merging drivers/mfd/asic3.c
5953 Auto-merging drivers/mfd/max8997.c
5954 Auto-merging drivers/mfd/twl6030-irq.c
5955 Auto-merging drivers/mfd/wm8400-core.c
5956 Auto-merging drivers/misc/ti-st/st_kim.c
5957 Auto-merging drivers/mmc/core/debugfs.c
5958 Auto-merging drivers/mmc/core/host.c
5959 Auto-merging drivers/mmc/host/sdhci-tegra.c
5960 Auto-merging drivers/mmc/host/sh_mobile_sdhi.c
5961 Auto-merging drivers/mtd/ar7part.c
5962 Auto-merging drivers/mtd/cmdlinepart.c
5963 Auto-merging drivers/mtd/mtdsuper.c
5964 Auto-merging drivers/mtd/nand/cafe_nand.c
5965 Auto-merging drivers/mtd/nand/cmx270_nand.c
5966 Auto-merging drivers/mtd/nand/diskonchip.c
5967 Auto-merging drivers/mtd/nand/nand_bbt.c
5968 Auto-merging drivers/mtd/nand/omap2.c
5969 Auto-merging drivers/mtd/onenand/onenand_bbt.c
5970 Auto-merging drivers/mtd/redboot.c
5971 Auto-merging drivers/net/ethernet/mellanox/mlx4/alloc.c
5972 Auto-merging drivers/net/ethernet/mellanox/mlx4/catas.c
5973 Auto-merging drivers/net/ethernet/mellanox/mlx4/cmd.c
5974 Auto-merging drivers/net/ethernet/mellanox/mlx4/cq.c
5975 Auto-merging drivers/net/ethernet/mellanox/mlx4/eq.c
5976 Auto-merging drivers/net/ethernet/mellanox/mlx4/fw.c
5977 Auto-merging drivers/net/ethernet/mellanox/mlx4/intf.c
5978 Auto-merging drivers/net/ethernet/mellanox/mlx4/mr.c
5979 Auto-merging drivers/net/ethernet/mellanox/mlx4/pd.c
5980 Auto-merging drivers/net/ethernet/mellanox/mlx4/port.c
5981 Auto-merging drivers/net/ethernet/mellanox/mlx4/qp.c
5982 Auto-merging drivers/net/ethernet/mellanox/mlx4/srq.c
5983 Auto-merging drivers/pci/hotplug/pcihp_slot.c
5984 Auto-merging drivers/pci/setup-res.c
5985 Auto-merging drivers/power/max17042_battery.c
5986 Auto-merging drivers/power/max8903_charger.c
5987 Auto-merging drivers/power/max8997_charger.c
5988 Auto-merging drivers/power/max8998_charger.c
5989 Auto-merging drivers/power/power_supply_sysfs.c
5990 Auto-merging drivers/regulator/88pm8607.c
5991 Auto-merging drivers/rtc/interface.c
5992 Auto-merging drivers/s390/cio/qdio_debug.c
5993 Auto-merging drivers/uio/uio_pdrv_genirq.c
5994 Auto-merging drivers/usb/core/driver.c
5995 Auto-merging drivers/usb/host/xhci-hub.c
5996 Auto-merging drivers/video/atmel_lcdfb.c
5997 Auto-merging drivers/video/carminefb.c
5998 Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
5999 Auto-merging drivers/video/msm/mdp.c
6000 Auto-merging drivers/xen/balloon.c
6001 Auto-merging drivers/xen/swiotlb-xen.c
6002 Auto-merging drivers/xen/xen-selfballoon.c
6003 Auto-merging drivers/xen/xenbus/xenbus_probe.c
6004 Auto-merging fs/exofs/super.c
6005 Auto-merging fs/jfs/jfs_logmgr.c
6006 Auto-merging fs/logfs/super.c
6007 Auto-merging include/linux/bcma/bcma.h
6008 Auto-merging include/linux/blkdev.h
6009 Auto-merging Resolved 'include/linux/dmaengine.h' using previous resolution.
6010 include/linux/device.h
6011 Auto-merging include/linux/dmaengine.h
6012 CONFLICT (content): Merge conflict in include/linux/dmaengine.h
6013 Auto-merging include/linux/hid.h
6014 Auto-merging include/linux/mtd/mtd.h
6015 Auto-merging include/linux/pm_runtime.h
6016 Auto-merging include/net/lib80211.h
6017 Auto-merging include/net/sock.h
6018 Auto-merging kernel/cgroup_freezer.c
6019 Auto-merging kernel/crash_dump.c
6020 Auto-merging kernel/cred.c
6021 Auto-merging kernel/exit.c
6022 Auto-merging kernel/fork.c
6023 Auto-merging kernel/freezer.c
6024 Auto-merging kernel/kthread.c
6025 Auto-merging kernel/lockdep.c
6026 Auto-merging kernel/pid.c
6027 Auto-merging kernel/power/hibernate.c
6028 Auto-merging kernel/power/main.c
6029 Auto-merging kernel/power/suspend.c
6030 Auto-merging kernel/rcupdate.c
6031 Auto-merging kernel/rcutiny.c
6032 Auto-merging kernel/rcutorture.c
6033 Auto-merging kernel/rcutree.c
6034 Auto-merging kernel/rcutree_trace.c
6035 Auto-merging kernel/rtmutex.c
6036 Auto-merging kernel/sched.c
6037 Auto-merging kernel/signal.c
6038 Auto-merging kernel/trace/blktrace.c
6039 Auto-merging mm/swapfile.c
6040 Automatic merge failed; fix conflicts and then commit the result.
6041 $ git commit -v -a
6042 [master e9023b4] Merge remote-tracking branch 'moduleh/module.h-split'
6043 $ git diff -M --stat --summary HEAD^..
6044  arch/alpha/kernel/core_irongate.c                  |    1 +
6045  arch/alpha/kernel/pci-sysfs.c                      |    1 +
6046  arch/alpha/kernel/pci_iommu.c                      |    1 +
6047  arch/alpha/kernel/setup.c                          |    1 +
6048  arch/arm/common/it8152.c                           |    1 +
6049  arch/arm/common/scoop.c                            |    1 +
6050  arch/arm/kernel/armksyms.c                         |    2 +-
6051  arch/arm/kernel/bios32.c                           |    2 +-
6052  arch/arm/kernel/devtree.c                          |    2 +-
6053  arch/arm/kernel/elf.c                              |    2 +-
6054  arch/arm/kernel/io.c                               |    2 +-
6055  arch/arm/kernel/irq.c                              |    1 -
6056  arch/arm/kernel/leds.c                             |    3 +-
6057  arch/arm/kernel/perf_event.c                       |    2 +-
6058  arch/arm/kernel/pj4-cp0.c                          |    1 -
6059  arch/arm/kernel/process.c                          |    2 +-
6060  arch/arm/kernel/ptrace.c                           |    1 +
6061  arch/arm/kernel/return_address.c                   |    2 +-
6062  arch/arm/kernel/setup.c                            |    2 +-
6063  arch/arm/kernel/stacktrace.c                       |    2 +-
6064  arch/arm/kernel/sys_arm.c                          |    2 +-
6065  arch/arm/kernel/time.c                             |    2 +-
6066  arch/arm/kernel/unwind.c                           |    2 +-
6067  arch/arm/kernel/xscale-cp0.c                       |    1 -
6068  arch/arm/mach-at91/cpuidle.c                       |    1 +
6069  arch/arm/mach-bcmring/dma.c                        |    1 +
6070  arch/arm/mach-bcmring/mm.c                         |    1 +
6071  arch/arm/mach-davinci/board-dm644x-evm.c           |    1 +
6072  arch/arm/mach-davinci/board-dm646x-evm.c           |    1 +
6073  arch/arm/mach-davinci/cdce949.c                    |    1 +
6074  arch/arm/mach-davinci/cpufreq.c                    |    1 +
6075  arch/arm/mach-davinci/cpuidle.c                    |    1 +
6076  arch/arm/mach-ep93xx/core.c                        |    1 +
6077  arch/arm/mach-exynos4/dev-sysmmu.c                 |    1 +
6078  arch/arm/mach-footbridge/dc21285.c                 |    1 +
6079  arch/arm/mach-imx/mach-mx31lilly.c                 |    1 +
6080  arch/arm/mach-imx/mach-mx31lite.c                  |    1 +
6081  arch/arm/mach-imx/mach-mx31moboard.c               |    1 +
6082  arch/arm/mach-iop13xx/pci.c                        |    1 +
6083  arch/arm/mach-ixp2000/core.c                       |    1 +
6084  arch/arm/mach-ixp4xx/common-pci.c                  |    1 +
6085  arch/arm/mach-ixp4xx/common.c                      |    1 +
6086  arch/arm/mach-kirkwood/cpuidle.c                   |    1 +
6087  arch/arm/mach-msm/io.c                             |    1 +
6088  arch/arm/mach-netx/xc.c                            |    1 +
6089  arch/arm/mach-omap1/board-ams-delta.c              |    1 +
6090  arch/arm/mach-omap1/board-sx1.c                    |    1 +
6091  arch/arm/mach-omap1/board-voiceblue.c              |    1 +
6092  arch/arm/mach-omap1/mailbox.c                      |    1 +
6093  arch/arm/mach-omap2/board-omap3evm.c               |    1 +
6094  arch/arm/mach-omap2/clockdomain.c                  |    1 +
6095  arch/arm/mach-omap2/display.c                      |    1 +
6096  arch/arm/mach-omap2/gpmc-onenand.c                 |    1 +
6097  arch/arm/mach-omap2/pm.c                           |    1 +
6098  arch/arm/mach-omap2/prcm.c                         |    1 +
6099  arch/arm/mach-omap2/usb-tusb6010.c                 |    2 +
6100  arch/arm/mach-omap2/voltage.c                      |    1 +
6101  arch/arm/mach-orion5x/dns323-setup.c               |    2 +-
6102  arch/arm/mach-orion5x/pci.c                        |    1 +
6103  arch/arm/mach-pxa/corgi.c                          |    1 +
6104  arch/arm/mach-pxa/poodle.c                         |    1 +
6105  arch/arm/mach-pxa/spitz.c                          |    1 +
6106  arch/arm/mach-s3c2410/mach-h1940.c                 |    1 +
6107  arch/arm/mach-s3c64xx/dev-audio.c                  |    1 +
6108  arch/arm/mach-sa1100/collie.c                      |    1 +
6109  arch/arm/mach-sa1100/jornada720.c                  |    1 +
6110  arch/arm/mach-shmobile/clock.c                     |    1 +
6111  arch/arm/mach-tegra/pcie.c                         |    1 +
6112  arch/arm/mm/fault-armv.c                           |    1 -
6113  arch/arm/mm/init.c                                 |    1 +
6114  arch/arm/plat-iop/gpio.c                           |    1 +
6115  arch/arm/plat-iop/time.c                           |    1 +
6116  arch/arm/plat-omap/clock.c                         |    1 +
6117  arch/arm/plat-omap/mailbox.c                       |    1 +
6118  arch/arm/plat-s3c24xx/devs.c                       |    1 +
6119  arch/arm/plat-s5p/dev-ehci.c                       |    1 +
6120  arch/arm/plat-s5p/dev-onenand.c                    |    2 +
6121  arch/arm/plat-samsung/dev-adc.c                    |    2 +
6122  arch/arm/plat-samsung/dev-asocdma.c                |    1 +
6123  arch/arm/plat-samsung/dev-backlight.c              |    1 +
6124  arch/arm/plat-samsung/dev-ide.c                    |    2 +
6125  arch/arm/plat-samsung/dev-nand.c                   |    1 +
6126  arch/arm/plat-samsung/dev-pwm.c                    |    1 +
6127  arch/arm/plat-samsung/dev-rtc.c                    |    1 +
6128  arch/arm/plat-samsung/dev-ts.c                     |    2 +
6129  arch/arm/plat-samsung/dev-usb.c                    |    1 +
6130  arch/arm/plat-samsung/dev-wdt.c                    |    3 +
6131  arch/arm/plat-samsung/platformdata.c               |    1 +
6132  arch/arm/vfp/vfpmodule.c                           |    1 -
6133  arch/avr32/mach-at32ap/clock.c                     |    1 +
6134  arch/avr32/mach-at32ap/cpufreq.c                   |    1 +
6135  arch/avr32/mach-at32ap/intc.c                      |    1 +
6136  arch/avr32/mach-at32ap/pio.c                       |    1 +
6137  arch/avr32/mm/dma-coherent.c                       |    1 +
6138  arch/blackfin/kernel/dma-mapping.c                 |    1 +
6139  arch/blackfin/kernel/perf_event.c                  |    1 +
6140  arch/blackfin/kernel/sys_bfin.c                    |    1 +
6141  arch/blackfin/mach-bf518/boards/ezbrd.c            |    1 +
6142  arch/blackfin/mach-bf527/boards/ad7160eval.c       |    1 +
6143  arch/blackfin/mach-bf527/boards/ezkit.c            |    1 +
6144  arch/blackfin/mach-bf527/boards/tll6527m.c         |    1 +
6145  arch/blackfin/mach-bf537/boards/dnp5370.c          |    1 +
6146  arch/blackfin/mach-common/cpufreq.c                |    1 +
6147  arch/blackfin/mm/init.c                            |    1 +
6148  arch/ia64/hp/common/hwsw_iommu.c                   |    1 +
6149  arch/ia64/kernel/dma-mapping.c                     |    1 +
6150  arch/ia64/kernel/topology.c                        |    1 +
6151  arch/ia64/sn/kernel/io_init.c                      |    1 +
6152  arch/ia64/sn/pci/pcibr/pcibr_dma.c                 |    1 +
6153  arch/ia64/sn/pci/pcibr/pcibr_provider.c            |    1 +
6154  arch/ia64/sn/pci/tioca_provider.c                  |    1 +
6155  arch/m68k/atari/time.c                             |    1 +
6156  arch/m68k/kernel/dma_mm.c                          |    1 +
6157  arch/m68k/kernel/dma_no.c                          |    1 +
6158  arch/mips/bcm47xx/gpio.c                           |    1 +
6159  arch/mips/bcm47xx/setup.c                          |    1 +
6160  arch/mips/cavium-octeon/csrc-octeon.c              |    1 +
6161  arch/mips/cavium-octeon/dma-octeon.c               |    1 +
6162  arch/mips/cavium-octeon/flash_setup.c              |    1 +
6163  arch/mips/kernel/8250-platform.c                   |    1 -
6164  arch/mips/kernel/cpu-probe.c                       |    3 +-
6165  arch/mips/kernel/i8253.c                           |    2 +-
6166  arch/mips/kernel/init_task.c                       |    2 +-
6167  arch/mips/kernel/irq-msc01.c                       |    1 -
6168  arch/mips/kernel/irq.c                             |    1 -
6169  arch/mips/kernel/mips-mt.c                         |    2 +-
6170  arch/mips/kernel/mips_ksyms.c                      |    2 +-
6171  arch/mips/kernel/module.c                          |    1 -
6172  arch/mips/kernel/process.c                         |    2 +-
6173  arch/mips/kernel/prom.c                            |    2 +-
6174  arch/mips/kernel/reset.c                           |    2 +-
6175  arch/mips/kernel/rtlx.c                            |    1 -
6176  arch/mips/kernel/setup.c                           |    2 +-
6177  arch/mips/kernel/spinlock_test.c                   |    2 +-
6178  arch/mips/kernel/stacktrace.c                      |    2 +-
6179  arch/mips/kernel/time.c                            |    2 +-
6180  arch/mips/kernel/traps.c                           |    1 -
6181  arch/mips/kernel/unaligned.c                       |    1 -
6182  arch/mips/kernel/vpe.c                             |    1 -
6183  arch/mips/loongson/common/platform.c               |    1 +
6184  arch/mips/pci/pci-ip27.c                           |    1 +
6185  arch/mips/pci/pci.c                                |    1 +
6186  arch/mips/powertv/pci/fixup-powertv.c              |    1 +
6187  arch/mips/powertv/powertv-usb.c                    |    1 +
6188  arch/mips/rb532/gpio.c                             |    1 +
6189  arch/mips/rb532/setup.c                            |    1 +
6190  arch/mips/txx9/generic/spi_eeprom.c                |    1 +
6191  arch/mips/txx9/rbtx4939/setup.c                    |    1 +
6192  arch/mips/vr41xx/common/giu.c                      |    1 +
6193  arch/mips/vr41xx/common/rtc.c                      |    1 +
6194  arch/parisc/kernel/drivers.c                       |    1 +
6195  arch/parisc/kernel/pci-dma.c                       |    1 +
6196  arch/parisc/kernel/setup.c                         |    1 +
6197  arch/parisc/lib/iomap.c                            |    1 +
6198  arch/powerpc/include/asm/lv1call.h                 |    1 +
6199  arch/powerpc/include/asm/machdep.h                 |    1 +
6200  arch/powerpc/include/asm/spu.h                     |    1 +
6201  arch/powerpc/kernel/btext.c                        |    2 +-
6202  arch/powerpc/kernel/clock.c                        |    2 +-
6203  arch/powerpc/kernel/cputable.c                     |    2 +-
6204  arch/powerpc/kernel/crash.c                        |    1 +
6205  arch/powerpc/kernel/dma-iommu.c                    |    1 +
6206  arch/powerpc/kernel/dma.c                          |    1 +
6207  arch/powerpc/kernel/firmware.c                     |    3 +-
6208  arch/powerpc/kernel/hw_breakpoint.c                |    1 -
6209  arch/powerpc/kernel/ibmebus.c                      |    2 +
6210  arch/powerpc/kernel/init_task.c                    |    2 +-
6211  arch/powerpc/kernel/io-workarounds.c               |    1 +
6212  arch/powerpc/kernel/io.c                           |    2 +-
6213  arch/powerpc/kernel/iomap.c                        |    1 +
6214  arch/powerpc/kernel/irq.c                          |    2 +-
6215  arch/powerpc/kernel/isa-bridge.c                   |    1 +
6216  arch/powerpc/kernel/kvm.c                          |    1 +
6217  arch/powerpc/kernel/module.c                       |    1 -
6218  arch/powerpc/kernel/of_platform.c                  |    2 +-
6219  arch/powerpc/kernel/paca.c                         |    2 +-
6220  arch/powerpc/kernel/pci-common.c                   |    1 +
6221  arch/powerpc/kernel/pci_32.c                       |    1 +
6222  arch/powerpc/kernel/pci_64.c                       |    1 +
6223  arch/powerpc/kernel/pci_dn.c                       |    1 +
6224  arch/powerpc/kernel/pci_of_scan.c                  |    1 +
6225  arch/powerpc/kernel/pmc.c                          |    2 +-
6226  arch/powerpc/kernel/ppc_ksyms.c                    |    2 +-
6227  arch/powerpc/kernel/process.c                      |    2 +-
6228  arch/powerpc/kernel/prom.c                         |    2 +-
6229  arch/powerpc/kernel/prom_parse.c                   |    1 -
6230  arch/powerpc/kernel/ptrace.c                       |    1 -
6231  arch/powerpc/kernel/rtas.c                         |    2 +-
6232  arch/powerpc/kernel/setup-common.c                 |    2 +-
6233  arch/powerpc/kernel/setup_64.c                     |    2 +-
6234  arch/powerpc/kernel/signal_64.c                    |    1 -
6235  arch/powerpc/kernel/smp.c                          |    2 +-
6236  arch/powerpc/kernel/stacktrace.c                   |    2 +-
6237  arch/powerpc/kernel/swsusp_64.c                    |    1 +
6238  arch/powerpc/kernel/sysfs.c                        |    2 +-
6239  arch/powerpc/kernel/time.c                         |    2 +-
6240  arch/powerpc/kernel/vdso.c                         |    1 -
6241  arch/powerpc/kernel/vio.c                          |    3 +-
6242  arch/powerpc/kvm/44x.c                             |    1 +
6243  arch/powerpc/kvm/book3s.c                          |    1 +
6244  arch/powerpc/kvm/book3s_exports.c                  |    2 +-
6245  arch/powerpc/kvm/book3s_hv.c                       |    1 +
6246  arch/powerpc/kvm/book3s_hv_builtin.c               |    1 +
6247  arch/powerpc/kvm/book3s_pr.c                       |    1 +
6248  arch/powerpc/kvm/powerpc.c                         |    1 -
6249  arch/powerpc/lib/checksum_wrappers_64.c            |    2 +-
6250  arch/powerpc/lib/devres.c                          |    2 +-
6251  arch/powerpc/lib/locks.c                           |    2 +-
6252  arch/powerpc/lib/rheap.c                           |    2 +-
6253  arch/powerpc/mm/dma-noncoherent.c                  |    1 +
6254  arch/powerpc/mm/hash_utils_64.c                    |    1 +
6255  arch/powerpc/mm/mem.c                              |    2 +-
6256  arch/powerpc/mm/mmu_context_hash32.c               |    1 +
6257  arch/powerpc/mm/mmu_context_hash64.c               |    2 +-
6258  arch/powerpc/mm/numa.c                             |    2 +-
6259  arch/powerpc/mm/pgtable_64.c                       |    1 +
6260  arch/powerpc/mm/slice.c                            |    2 +-
6261  arch/powerpc/mm/tlb_hash32.c                       |    1 +
6262  arch/powerpc/mm/tlb_nohash.c                       |    1 +
6263  arch/powerpc/platforms/44x/warp.c                  |    1 +
6264  arch/powerpc/platforms/512x/clock.c                |    1 +
6265  arch/powerpc/platforms/52xx/mpc52xx_common.c       |    1 +
6266  arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c      |    1 +
6267  arch/powerpc/platforms/83xx/suspend.c              |    1 +
6268  arch/powerpc/platforms/85xx/mpc85xx_cds.c          |    1 -
6269  arch/powerpc/platforms/85xx/mpc85xx_mds.c          |    1 -
6270  arch/powerpc/platforms/85xx/sbc8548.c              |    1 -
6271  arch/powerpc/platforms/86xx/gef_gpio.c             |    1 +
6272  arch/powerpc/platforms/8xx/tqm8xx_setup.c          |    1 -
6273  arch/powerpc/platforms/cell/axon_msi.c             |    1 +
6274  arch/powerpc/platforms/cell/beat.c                 |    2 +-
6275  arch/powerpc/platforms/cell/beat_spu_priv1.c       |    2 -
6276  arch/powerpc/platforms/cell/beat_wrapper.h         |    1 +
6277  arch/powerpc/platforms/cell/cbe_cpufreq.c          |    1 +
6278  arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c      |    1 +
6279  arch/powerpc/platforms/cell/cbe_powerbutton.c      |    1 +
6280  arch/powerpc/platforms/cell/cbe_regs.c             |    2 +-
6281  arch/powerpc/platforms/cell/celleb_setup.c         |    1 +
6282  arch/powerpc/platforms/cell/cpufreq_spudemand.c    |    1 +
6283  arch/powerpc/platforms/cell/interrupt.c            |    2 +-
6284  arch/powerpc/platforms/cell/pmu.c                  |    1 +
6285  arch/powerpc/platforms/cell/qpace_setup.c          |    1 +
6286  arch/powerpc/platforms/cell/setup.c                |    1 +
6287  arch/powerpc/platforms/cell/smp.c                  |    1 -
6288  arch/powerpc/platforms/cell/spu_callbacks.c        |    2 +-
6289  arch/powerpc/platforms/cell/spu_fault.c            |    2 +-
6290  arch/powerpc/platforms/cell/spu_manage.c           |    2 +-
6291  arch/powerpc/platforms/cell/spu_notify.c           |    3 +-
6292  arch/powerpc/platforms/cell/spu_priv1_mmio.c       |    1 -
6293  arch/powerpc/platforms/cell/spufs/backing_ops.c    |    1 -
6294  arch/powerpc/platforms/cell/spufs/context.c        |    2 +-
6295  arch/powerpc/platforms/cell/spufs/coredump.c       |    1 -
6296  arch/powerpc/platforms/cell/spufs/fault.c          |    1 -
6297  arch/powerpc/platforms/cell/spufs/file.c           |    2 +-
6298  arch/powerpc/platforms/cell/spufs/hw_ops.c         |    1 -
6299  arch/powerpc/platforms/cell/spufs/sched.c          |    1 -
6300  arch/powerpc/platforms/cell/spufs/switch.c         |    2 +-
6301  arch/powerpc/platforms/cell/spufs/syscalls.c       |    2 +-
6302  arch/powerpc/platforms/embedded6xx/holly.c         |    1 +
6303  arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c  |    1 +
6304  arch/powerpc/platforms/iseries/hvlpconfig.c        |    2 +-
6305  arch/powerpc/platforms/iseries/iommu.c             |    2 +-
6306  arch/powerpc/platforms/iseries/ksyms.c             |    2 +-
6307  arch/powerpc/platforms/iseries/lpardata.c          |    1 -
6308  arch/powerpc/platforms/iseries/lpevents.c          |    2 +-
6309  arch/powerpc/platforms/iseries/mf.c                |    1 +
6310  arch/powerpc/platforms/iseries/pci.c               |    1 -
6311  arch/powerpc/platforms/iseries/setup.c             |    1 +
6312  arch/powerpc/platforms/iseries/smp.c               |    1 -
6313  arch/powerpc/platforms/iseries/vio.c               |    2 +-
6314  arch/powerpc/platforms/iseries/viopath.c           |    2 +-
6315  arch/powerpc/platforms/maple/setup.c               |    1 +
6316  arch/powerpc/platforms/pasemi/cpufreq.c            |    1 +
6317  arch/powerpc/platforms/pasemi/dma_lib.c            |    3 +-
6318  arch/powerpc/platforms/pasemi/setup.c              |    1 +
6319  arch/powerpc/platforms/powermac/backlight.c        |    1 +
6320  arch/powerpc/platforms/powermac/feature.c          |    1 +
6321  arch/powerpc/platforms/powermac/low_i2c.c          |    2 +-
6322  arch/powerpc/platforms/powermac/nvram.c            |    2 +-
6323  arch/powerpc/platforms/powermac/pic.c              |    1 -
6324  arch/powerpc/platforms/powermac/setup.c            |    1 +
6325  arch/powerpc/platforms/ps3/exports.c               |    2 -
6326  arch/powerpc/platforms/ps3/interrupt.c             |    2 +-
6327  arch/powerpc/platforms/ps3/mm.c                    |    2 +-
6328  arch/powerpc/platforms/ps3/os-area.c               |    1 +
6329  arch/powerpc/platforms/ps3/setup.c                 |    1 +
6330  arch/powerpc/platforms/ps3/spu.c                   |    1 +
6331  arch/powerpc/platforms/ps3/system-bus.c            |    2 +-
6332  arch/powerpc/platforms/pseries/eeh.c               |    2 +
6333  arch/powerpc/platforms/pseries/eeh_event.c         |    1 +
6334  arch/powerpc/platforms/pseries/eeh_sysfs.c         |    1 +
6335  arch/powerpc/platforms/pseries/hotplug-cpu.c       |    1 +
6336  arch/powerpc/platforms/pseries/hvconsole.c         |    3 +-
6337  arch/powerpc/platforms/pseries/io_event_irq.c      |    2 +-
6338  arch/powerpc/platforms/pseries/iommu.c             |    1 +
6339  arch/powerpc/platforms/pseries/lpar.c              |    1 +
6340  arch/powerpc/platforms/pseries/mobility.c          |    1 +
6341  arch/powerpc/platforms/pseries/pci_dlpar.c         |    1 +
6342  arch/powerpc/platforms/pseries/plpar_wrappers.h    |    3 +
6343  arch/powerpc/platforms/pseries/setup.c             |    2 +-
6344  arch/powerpc/platforms/pseries/smp.c               |    1 -
6345  arch/powerpc/platforms/pseries/suspend.c           |    1 +
6346  arch/powerpc/sysdev/bestcomm/sram.c                |    2 +-
6347  arch/powerpc/sysdev/cpm_common.c                   |    1 +
6348  arch/powerpc/sysdev/dcr.c                          |    1 +
6349  arch/powerpc/sysdev/fsl_gtm.c                      |    1 +
6350  arch/powerpc/sysdev/fsl_lbc.c                      |    3 +-
6351  arch/powerpc/sysdev/fsl_pmc.c                      |    1 +
6352  arch/powerpc/sysdev/fsl_rio.c                      |    2 +-
6353  arch/powerpc/sysdev/fsl_soc.c                      |    2 +-
6354  arch/powerpc/sysdev/mpc5xxx_clocks.c               |    1 +
6355  arch/powerpc/sysdev/mpc8xx_pic.c                   |    1 -
6356  arch/powerpc/sysdev/mv64x60_pci.c                  |    1 +
6357  arch/powerpc/sysdev/pmi.c                          |    1 +
6358  arch/powerpc/sysdev/ppc4xx_msi.c                   |    1 +
6359  arch/powerpc/sysdev/qe_lib/gpio.c                  |    1 +
6360  arch/powerpc/sysdev/qe_lib/ucc.c                   |    2 +-
6361  arch/powerpc/sysdev/qe_lib/ucc_fast.c              |    2 +-
6362  arch/powerpc/sysdev/qe_lib/ucc_slow.c              |    2 +-
6363  arch/powerpc/sysdev/qe_lib/usb.c                   |    1 +
6364  arch/powerpc/sysdev/rtc_cmos_setup.c               |    1 +
6365  arch/powerpc/sysdev/scom.c                         |    1 +
6366  arch/powerpc/sysdev/simple_gpio.c                  |    1 -
6367  arch/powerpc/sysdev/tsi108_dev.c                   |    2 +-
6368  arch/powerpc/xmon/xmon.c                           |    2 +-
6369  arch/s390/crypto/sha_common.c                      |    1 +
6370  arch/s390/mm/init.c                                |    1 +
6371  arch/sh/drivers/dma/dma-sysfs.c                    |    1 +
6372  arch/sh/drivers/pci/pci.c                          |    1 +
6373  arch/sh/kernel/cpu/shmobile/cpuidle.c              |    1 +
6374  arch/sh/kernel/perf_event.c                        |    1 +
6375  arch/sh/kernel/topology.c                          |    1 +
6376  arch/sh/mm/init.c                                  |    1 +
6377  arch/sparc/include/asm/termios.h                   |    1 -
6378  arch/sparc/kernel/auxio_32.c                       |    1 +
6379  arch/sparc/kernel/btext.c                          |    1 -
6380  arch/sparc/kernel/central.c                        |    1 +
6381  arch/sparc/kernel/cpu.c                            |    2 +-
6382  arch/sparc/kernel/cpumap.c                         |    2 +-
6383  arch/sparc/kernel/dma.c                            |    1 -
6384  arch/sparc/kernel/ebus.c                           |    2 +-
6385  arch/sparc/kernel/hvapi.c                          |    2 +-
6386  arch/sparc/kernel/idprom.c                         |    2 +-
6387  arch/sparc/kernel/iommu.c                          |    2 +-
6388  arch/sparc/kernel/irq_32.c                         |    1 +
6389  arch/sparc/kernel/irq_64.c                         |    1 -
6390  arch/sparc/kernel/ldc.c                            |    2 +-
6391  arch/sparc/kernel/leon_kernel.c                    |    1 -
6392  arch/sparc/kernel/leon_pci_grpci2.c                |    1 -
6393  arch/sparc/kernel/nmi.c                            |    2 +-
6394  arch/sparc/kernel/of_device_32.c                   |    1 -
6395  arch/sparc/kernel/of_device_64.c                   |    3 +-
6396  arch/sparc/kernel/of_device_common.c               |    2 +-
6397  arch/sparc/kernel/pci.c                            |    2 +-
6398  arch/sparc/kernel/pci_fire.c                       |    1 +
6399  arch/sparc/kernel/pci_psycho.c                     |    1 +
6400  arch/sparc/kernel/pci_sabre.c                      |    1 +
6401  arch/sparc/kernel/pci_schizo.c                     |    1 +
6402  arch/sparc/kernel/pci_sun4v.c                      |    1 +
6403  arch/sparc/kernel/pcic.c                           |    1 +
6404  arch/sparc/kernel/pcr.c                            |    3 +-
6405  arch/sparc/kernel/pmc.c                            |    1 +
6406  arch/sparc/kernel/power.c                          |    2 +-
6407  arch/sparc/kernel/process_64.c                     |    2 +-
6408  arch/sparc/kernel/prom_32.c                        |    1 -
6409  arch/sparc/kernel/prom_64.c                        |    1 -
6410  arch/sparc/kernel/prom_common.c                    |    2 +-
6411  arch/sparc/kernel/reboot.c                         |    2 +-
6412  arch/sparc/kernel/sbus.c                           |    1 +
6413  arch/sparc/kernel/setup_32.c                       |    1 +
6414  arch/sparc/kernel/setup_64.c                       |    1 +
6415  arch/sparc/kernel/smp_64.c                         |    2 +-
6416  arch/sparc/kernel/sparc_ksyms_64.c                 |    2 +-
6417  arch/sparc/kernel/stacktrace.c                     |    2 +-
6418  arch/sparc/kernel/sys_sparc32.c                    |    1 -
6419  arch/sparc/kernel/sys_sparc_64.c                   |    2 +-
6420  arch/sparc/kernel/time_64.c                        |    2 +-
6421  arch/sparc/kernel/traps_32.c                       |    1 +
6422  arch/sparc/kernel/unaligned_32.c                   |    1 -
6423  arch/sparc/kernel/vio.c                            |    1 +
6424  arch/sparc/kernel/viohs.c                          |    2 +-
6425  arch/sparc/mm/fault_32.c                           |    1 -
6426  arch/sparc/mm/generic_32.c                         |    1 +
6427  arch/sparc/mm/generic_64.c                         |    1 +
6428  arch/sparc/mm/highmem.c                            |    1 +
6429  arch/sparc/mm/hugetlbpage.c                        |    1 -
6430  arch/x86/crypto/aes_glue.c                         |    1 +
6431  arch/x86/crypto/aesni-intel_glue.c                 |    1 +
6432  arch/x86/kernel/cpu/amd.c                          |    1 +
6433  arch/x86/kernel/cpu/mcheck/therm_throt.c           |    1 +
6434  arch/x86/kernel/devicetree.c                       |    1 +
6435  arch/x86/kernel/e820.c                             |    1 +
6436  arch/x86/kernel/hpet.c                             |    1 +
6437  arch/x86/kernel/irq.c                              |    1 +
6438  arch/x86/kernel/pci-dma.c                          |    1 +
6439  arch/x86/kernel/probe_roms.c                       |    4 +-
6440  arch/x86/kernel/rtc.c                              |    1 +
6441  arch/x86/kernel/smp.c                              |    1 +
6442  arch/x86/kernel/time.c                             |    1 +
6443  arch/x86/kernel/topology.c                         |    1 +
6444  arch/x86/kernel/vsyscall_64.c                      |    1 +
6445  arch/x86/pci/i386.c                                |    1 +
6446  arch/x86/pci/legacy.c                              |    1 +
6447  arch/x86/platform/efi/efi.c                        |    1 +
6448  arch/x86/platform/efi/efi_32.c                     |    1 +
6449  arch/x86/platform/mrst/vrtc.c                      |    1 +
6450  arch/x86/platform/olpc/olpc-xo1-pm.c               |    1 +
6451  arch/x86/platform/uv/bios_uv.c                     |    1 +
6452  arch/x86/power/cpu.c                               |    1 +
6453  arch/x86/video/fbdev.c                             |    1 +
6454  block/blk-integrity.c                              |    1 +
6455  block/ioctl.c                                      |    1 +
6456  crypto/async_tx/async_memcpy.c                     |    1 +
6457  crypto/async_tx/async_pq.c                         |    1 +
6458  crypto/async_tx/async_raid6_recov.c                |    1 +
6459  crypto/async_tx/async_tx.c                         |    1 +
6460  crypto/async_tx/async_xor.c                        |    1 +
6461  crypto/async_tx/raid6test.c                        |    1 +
6462  crypto/crypto_wq.c                                 |    1 +
6463  crypto/md4.c                                       |    1 +
6464  crypto/proc.c                                      |    1 +
6465  crypto/vmac.c                                      |    1 +
6466  crypto/xcbc.c                                      |    1 +
6467  drivers/acpi/acpica/hwsleep.c                      |    1 +
6468  drivers/acpi/ec_sys.c                              |    1 +
6469  drivers/acpi/sbshc.c                               |    1 +
6470  drivers/acpi/sysfs.c                               |    2 +-
6471  drivers/ata/libata-eh.c                            |    1 +
6472  drivers/ata/libata-pmp.c                           |    1 +
6473  drivers/ata/libata-scsi.c                          |    1 +
6474  drivers/ata/libata-sff.c                           |    1 +
6475  drivers/base/base.h                                |    1 +
6476  drivers/base/dma-coherent.c                        |    1 +
6477  drivers/base/dma-mapping.c                         |    1 +
6478  drivers/base/hypervisor.c                          |    1 +
6479  drivers/base/power/generic_ops.c                   |    1 +
6480  drivers/base/power/main.c                          |    1 +
6481  drivers/base/power/runtime.c                       |    1 +
6482  drivers/base/power/sysfs.c                         |    1 +
6483  drivers/base/power/trace.c                         |    1 +
6484  drivers/base/power/wakeup.c                        |    1 +
6485  drivers/base/transport_class.c                     |    1 +
6486  drivers/bcma/core.c                                |    1 +
6487  drivers/bcma/driver_chipcommon.c                   |    1 +
6488  drivers/bcma/driver_pci.c                          |    1 +
6489  drivers/bcma/host_pci.c                            |    1 +
6490  drivers/bcma/main.c                                |    1 +
6491  drivers/block/aoe/aoechr.c                         |    1 +
6492  drivers/block/ps3disk.c                            |    1 +
6493  drivers/block/ps3vram.c                            |    1 +
6494  drivers/block/virtio_blk.c                         |    1 +
6495  drivers/char/hw_random/virtio-rng.c                |    1 +
6496  drivers/char/ramoops.c                             |    1 +
6497  drivers/char/ttyprintk.c                           |    1 +
6498  drivers/char/virtio_console.c                      |    1 +
6499  drivers/clocksource/sh_cmt.c                       |    1 +
6500  drivers/clocksource/sh_mtu2.c                      |    1 +
6501  drivers/clocksource/sh_tmu.c                       |    1 +
6502  drivers/cpufreq/cpufreq_stats.c                    |    1 +
6503  drivers/cpufreq/s3c64xx-cpufreq.c                  |    1 +
6504  drivers/crypto/mv_cesa.c                           |    1 +
6505  drivers/dca/dca-core.c                             |    1 +
6506  drivers/dca/dca-sysfs.c                            |    1 +
6507  drivers/dma/intel_mid_dma.c                        |    1 +
6508  drivers/dma/ipu/ipu_idmac.c                        |    1 +
6509  drivers/dma/ste_dma40.c                            |    1 +
6510  drivers/edac/mce_amd_inj.c                         |    1 +
6511  drivers/firewire/core-iso.c                        |    1 +
6512  drivers/firmware/google/gsmi.c                     |    1 +
6513  drivers/firmware/sigma.c                           |    1 +
6514  drivers/gpio/gpio-74x164.c                         |    1 +
6515  drivers/gpio/gpio-ep93xx.c                         |    1 +
6516  drivers/gpio/gpio-mc33880.c                        |    1 +
6517  drivers/gpio/gpio-mcp23s08.c                       |    1 +
6518  drivers/gpio/gpio-ml-ioh.c                         |    1 +
6519  drivers/gpio/gpio-mpc5200.c                        |    1 +
6520  drivers/gpio/gpio-mxc.c                            |    1 +
6521  drivers/gpio/gpio-mxs.c                            |    1 +
6522  drivers/gpio/gpio-pcf857x.c                        |    1 +
6523  drivers/gpio/gpio-pch.c                            |    1 +
6524  drivers/gpio/gpio-xilinx.c                         |    1 +
6525  drivers/gpu/drm/ttm/ttm_tt.c                       |    1 +
6526  drivers/hid/hid-axff.c                             |    1 +
6527  drivers/hid/hid-debug.c                            |    1 +
6528  drivers/hid/hid-dr.c                               |    1 +
6529  drivers/hid/hid-emsff.c                            |    1 +
6530  drivers/hid/hid-gaff.c                             |    1 +
6531  drivers/hid/hid-holtekff.c                         |    1 +
6532  drivers/hid/hid-picolcd.c                          |    1 +
6533  drivers/hid/hid-pl.c                               |    1 +
6534  drivers/hid/hid-roccat-common.c                    |    1 +
6535  drivers/hid/hid-roccat.c                           |    1 +
6536  drivers/hid/hid-sjoy.c                             |    1 +
6537  drivers/hid/hid-tmff.c                             |    1 +
6538  drivers/hid/hid-zpff.c                             |    1 +
6539  drivers/hid/usbhid/hid-quirks.c                    |    1 +
6540  drivers/hwmon/ultra45_env.c                        |    1 +
6541  drivers/i2c/busses/i2c-pxa-pci.c                   |    1 +
6542  drivers/i2c/busses/i2c-sh7760.c                    |    1 +
6543  drivers/i2c/busses/i2c-tegra.c                     |    1 +
6544  drivers/i2c/i2c-boardinfo.c                        |    1 +
6545  drivers/ide/buddha.c                               |    1 +
6546  drivers/ide/cmd640.c                               |    1 +
6547  drivers/ide/ide-acpi.c                             |    1 +
6548  drivers/ide/ide-atapi.c                            |    1 +
6549  drivers/ide/ide-disk_proc.c                        |    1 +
6550  drivers/ide/ide-dma-sff.c                          |    1 +
6551  drivers/ide/ide-dma.c                              |    1 +
6552  drivers/ide/ide-eh.c                               |    1 +
6553  drivers/ide/ide-floppy_proc.c                      |    1 +
6554  drivers/ide/ide-io-std.c                           |    1 +
6555  drivers/ide/ide-ioctls.c                           |    1 +
6556  drivers/ide/ide-legacy.c                           |    1 +
6557  drivers/ide/ide-lib.c                              |    1 +
6558  drivers/ide/ide-pnp.c                              |    1 +
6559  drivers/ide/ide-taskfile.c                         |    1 +
6560  drivers/ide/ide-xfer-mode.c                        |    1 +
6561  drivers/ide/macide.c                               |    1 +
6562  drivers/ide/pmac.c                                 |    1 +
6563  drivers/ide/q40ide.c                               |    1 +
6564  drivers/ide/setup-pci.c                            |    1 +
6565  drivers/ide/tc86c001.c                             |    1 +
6566  drivers/idle/intel_idle.c                          |    1 +
6567  drivers/infiniband/core/cm.c                       |    1 +
6568  drivers/infiniband/core/fmr_pool.c                 |    1 +
6569  drivers/infiniband/core/mad.c                      |    1 +
6570  drivers/infiniband/core/multicast.c                |    1 +
6571  drivers/infiniband/core/packer.c                   |    1 +
6572  drivers/infiniband/core/sysfs.c                    |    1 +
6573  drivers/infiniband/core/ud_header.c                |    1 +
6574  drivers/infiniband/core/umem.c                     |    1 +
6575  drivers/infiniband/core/uverbs_marshall.c          |    1 +
6576  drivers/infiniband/core/verbs.c                    |    1 +
6577  drivers/infiniband/hw/ipath/ipath_diag.c           |    1 +
6578  drivers/infiniband/hw/ipath/ipath_file_ops.c       |    1 +
6579  drivers/infiniband/hw/ipath/ipath_sysfs.c          |    1 +
6580  drivers/infiniband/hw/ipath/ipath_verbs.c          |    1 +
6581  drivers/infiniband/hw/mthca/mthca_catas.c          |    1 +
6582  drivers/infiniband/hw/mthca/mthca_cmd.c            |    1 +
6583  drivers/infiniband/hw/mthca/mthca_provider.c       |    2 +
6584  drivers/infiniband/hw/qib/qib_diag.c               |    1 +
6585  drivers/infiniband/hw/qib/qib_file_ops.c           |    1 +
6586  drivers/infiniband/hw/qib/qib_iba7220.c            |    1 +
6587  drivers/infiniband/hw/qib/qib_iba7322.c            |    1 +
6588  drivers/infiniband/hw/qib/qib_pcie.c               |    1 +
6589  drivers/infiniband/hw/qib/qib_sd7220.c             |    1 +
6590  drivers/infiniband/hw/qib/qib_verbs.c              |    1 +
6591  drivers/input/input-compat.c                       |    1 +
6592  drivers/input/input-mt.c                           |    1 +
6593  drivers/input/input-polldev.c                      |    1 +
6594  drivers/input/joystick/as5011.c                    |    1 +
6595  drivers/input/keyboard/nomadik-ske-keypad.c        |    1 +
6596  drivers/input/keyboard/tnetv107x-keypad.c          |    1 +
6597  drivers/input/misc/ad714x.c                        |    1 +
6598  drivers/input/misc/adxl34x.c                       |    1 +
6599  drivers/input/misc/ati_remote2.c                   |    1 +
6600  drivers/input/misc/cma3000_d0x.c                   |    1 +
6601  drivers/input/misc/dm355evm_keys.c                 |    1 +
6602  drivers/input/sparse-keymap.c                      |    1 +
6603  drivers/input/touchscreen/ad7877.c                 |    1 +
6604  drivers/input/touchscreen/ad7879-spi.c             |    1 +
6605  drivers/input/touchscreen/ad7879.c                 |    1 +
6606  drivers/input/touchscreen/ads7846.c                |    1 +
6607  drivers/input/touchscreen/bu21013_ts.c             |    1 +
6608  drivers/isdn/capi/kcapi_proc.c                     |    1 +
6609  drivers/leds/dell-led.c                            |    1 +
6610  drivers/leds/leds-88pm860x.c                       |    1 +
6611  drivers/leds/leds-asic3.c                          |    1 +
6612  drivers/leds/leds-atmel-pwm.c                      |    1 +
6613  drivers/leds/leds-cobalt-raq.c                     |    1 +
6614  drivers/leds/leds-fsg.c                            |    1 +
6615  drivers/leds/leds-gpio.c                           |    1 +
6616  drivers/leds/leds-lm3530.c                         |    1 +
6617  drivers/leds/leds-locomo.c                         |    1 +
6618  drivers/leds/leds-lt3593.c                         |    1 +
6619  drivers/leds/leds-net48xx.c                        |    1 +
6620  drivers/leds/leds-net5501.c                        |    1 +
6621  drivers/leds/leds-ns2.c                            |    1 +
6622  drivers/leds/leds-s3c24xx.c                        |    1 +
6623  drivers/leds/leds-wm831x-status.c                  |    1 +
6624  drivers/leds/leds-wm8350.c                         |    1 +
6625  drivers/leds/leds-wrap.c                           |    1 +
6626  drivers/lguest/lguest_device.c                     |    1 +
6627  drivers/md/dm-exception-store.c                    |    1 +
6628  drivers/md/dm-log-userspace-base.c                 |    1 +
6629  drivers/md/dm-path-selector.c                      |    1 +
6630  drivers/md/dm-raid.c                               |    1 +
6631  drivers/md/dm-round-robin.c                        |    1 +
6632  drivers/md/dm-service-time.c                       |    1 +
6633  drivers/md/dm-snap-persistent.c                    |    1 +
6634  drivers/md/dm-snap-transient.c                     |    1 +
6635  drivers/md/dm-uevent.c                             |    1 +
6636  drivers/md/faulty.c                                |    1 +
6637  drivers/md/linear.c                                |    1 +
6638  drivers/md/md.c                                    |    1 +
6639  drivers/md/multipath.c                             |    1 +
6640  drivers/md/raid0.c                                 |    1 +
6641  drivers/md/raid1.c                                 |    1 +
6642  drivers/md/raid10.c                                |    1 +
6643  drivers/md/raid5.c                                 |    1 +
6644  drivers/media/common/saa7146_core.c                |    1 +
6645  drivers/media/common/saa7146_fops.c                |    1 +
6646  drivers/media/common/saa7146_hlp.c                 |    1 +
6647  drivers/media/common/saa7146_video.c               |    1 +
6648  drivers/media/common/tuners/tuner-types.c          |    1 +
6649  drivers/media/dvb/frontends/dibx000_common.c       |    1 +
6650  drivers/media/dvb/siano/sms-cards.c                |    1 +
6651  drivers/media/dvb/siano/smsendian.c                |    1 +
6652  drivers/media/dvb/siano/smssdio.c                  |    1 +
6653  drivers/media/dvb/siano/smsusb.c                   |    1 +
6654  drivers/media/media-device.c                       |    1 +
6655  drivers/media/radio/radio-timb.c                   |    1 +
6656  drivers/media/radio/radio-wl1273.c                 |    1 +
6657  drivers/media/radio/si4713-i2c.c                   |    1 +
6658  drivers/media/radio/wl128x/fmdrv_v4l2.c            |    2 +
6659  drivers/media/rc/ir-jvc-decoder.c                  |    1 +
6660  drivers/media/rc/ir-lirc-codec.c                   |    1 +
6661  drivers/media/rc/ir-nec-decoder.c                  |    1 +
6662  drivers/media/rc/ir-raw.c                          |    2 +
6663  drivers/media/rc/ir-rc5-decoder.c                  |    1 +
6664  drivers/media/rc/ir-rc5-sz-decoder.c               |    1 +
6665  drivers/media/rc/ir-rc6-decoder.c                  |    1 +
6666  drivers/media/rc/ir-sony-decoder.c                 |    1 +
6667  drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c    |    1 +
6668  drivers/media/rc/keymaps/rc-alink-dtu-m.c          |    1 +
6669  drivers/media/rc/keymaps/rc-anysee.c               |    1 +
6670  drivers/media/rc/keymaps/rc-apac-viewcomp.c        |    1 +
6671  drivers/media/rc/keymaps/rc-asus-pc39.c            |    1 +
6672  drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c |    1 +
6673  drivers/media/rc/keymaps/rc-avermedia-a16d.c       |    1 +
6674  drivers/media/rc/keymaps/rc-avermedia-cardbus.c    |    1 +
6675  drivers/media/rc/keymaps/rc-avermedia-dvbt.c       |    1 +
6676  drivers/media/rc/keymaps/rc-avermedia-m135a.c      |    1 +
6677  .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c    |    1 +
6678  drivers/media/rc/keymaps/rc-avermedia-rm-ks.c      |    1 +
6679  drivers/media/rc/keymaps/rc-avermedia.c            |    1 +
6680  drivers/media/rc/keymaps/rc-avertv-303.c           |    1 +
6681  drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c   |    1 +
6682  drivers/media/rc/keymaps/rc-behold-columbus.c      |    1 +
6683  drivers/media/rc/keymaps/rc-behold.c               |    1 +
6684  drivers/media/rc/keymaps/rc-budget-ci-old.c        |    1 +
6685  drivers/media/rc/keymaps/rc-cinergy-1400.c         |    1 +
6686  drivers/media/rc/keymaps/rc-cinergy.c              |    1 +
6687  drivers/media/rc/keymaps/rc-dib0700-nec.c          |    1 +
6688  drivers/media/rc/keymaps/rc-dib0700-rc5.c          |    1 +
6689  drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c  |    1 +
6690  drivers/media/rc/keymaps/rc-digittrade.c           |    1 +
6691  drivers/media/rc/keymaps/rc-dm1105-nec.c           |    1 +
6692  drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c      |    1 +
6693  drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c   |    1 +
6694  drivers/media/rc/keymaps/rc-em-terratec.c          |    1 +
6695  drivers/media/rc/keymaps/rc-encore-enltv-fm53.c    |    1 +
6696  drivers/media/rc/keymaps/rc-encore-enltv.c         |    1 +
6697  drivers/media/rc/keymaps/rc-encore-enltv2.c        |    1 +
6698  drivers/media/rc/keymaps/rc-evga-indtube.c         |    1 +
6699  drivers/media/rc/keymaps/rc-eztv.c                 |    1 +
6700  drivers/media/rc/keymaps/rc-flydvb.c               |    1 +
6701  drivers/media/rc/keymaps/rc-flyvideo.c             |    1 +
6702  drivers/media/rc/keymaps/rc-fusionhdtv-mce.c       |    1 +
6703  drivers/media/rc/keymaps/rc-gadmei-rm008z.c        |    1 +
6704  drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c   |    1 +
6705  drivers/media/rc/keymaps/rc-gotview7135.c          |    1 +
6706  drivers/media/rc/keymaps/rc-hauppauge.c            |    1 +
6707  drivers/media/rc/keymaps/rc-imon-mce.c             |    1 +
6708  drivers/media/rc/keymaps/rc-imon-pad.c             |    1 +
6709  drivers/media/rc/keymaps/rc-iodata-bctv7e.c        |    1 +
6710  drivers/media/rc/keymaps/rc-kaiomy.c               |    1 +
6711  drivers/media/rc/keymaps/rc-kworld-315u.c          |    1 +
6712  .../media/rc/keymaps/rc-kworld-plus-tv-analog.c    |    1 +
6713  drivers/media/rc/keymaps/rc-leadtek-y04g0051.c     |    1 +
6714  drivers/media/rc/keymaps/rc-lirc.c                 |    1 +
6715  drivers/media/rc/keymaps/rc-lme2510.c              |    1 +
6716  drivers/media/rc/keymaps/rc-manli.c                |    1 +
6717  drivers/media/rc/keymaps/rc-msi-digivox-ii.c       |    1 +
6718  drivers/media/rc/keymaps/rc-msi-digivox-iii.c      |    1 +
6719  drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c  |    1 +
6720  drivers/media/rc/keymaps/rc-msi-tvanywhere.c       |    1 +
6721  drivers/media/rc/keymaps/rc-nebula.c               |    1 +
6722  .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c  |    1 +
6723  drivers/media/rc/keymaps/rc-norwood.c              |    1 +
6724  drivers/media/rc/keymaps/rc-npgtech.c              |    1 +
6725  drivers/media/rc/keymaps/rc-pctv-sedna.c           |    1 +
6726  drivers/media/rc/keymaps/rc-pinnacle-color.c       |    1 +
6727  drivers/media/rc/keymaps/rc-pinnacle-grey.c        |    1 +
6728  drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c     |    1 +
6729  drivers/media/rc/keymaps/rc-pixelview-002t.c       |    1 +
6730  drivers/media/rc/keymaps/rc-pixelview-mk12.c       |    1 +
6731  drivers/media/rc/keymaps/rc-pixelview-new.c        |    1 +
6732  drivers/media/rc/keymaps/rc-pixelview.c            |    1 +
6733  .../media/rc/keymaps/rc-powercolor-real-angel.c    |    1 +
6734  drivers/media/rc/keymaps/rc-proteus-2309.c         |    1 +
6735  drivers/media/rc/keymaps/rc-purpletv.c             |    1 +
6736  drivers/media/rc/keymaps/rc-pv951.c                |    1 +
6737  drivers/media/rc/keymaps/rc-rc6-mce.c              |    1 +
6738  .../media/rc/keymaps/rc-real-audio-220-32-keys.c   |    1 +
6739  drivers/media/rc/keymaps/rc-streamzap.c            |    1 +
6740  drivers/media/rc/keymaps/rc-tbs-nec.c              |    1 +
6741  drivers/media/rc/keymaps/rc-technisat-usb2.c       |    1 +
6742  drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c  |    1 +
6743  drivers/media/rc/keymaps/rc-terratec-slim-2.c      |    1 +
6744  drivers/media/rc/keymaps/rc-terratec-slim.c        |    1 +
6745  drivers/media/rc/keymaps/rc-tevii-nec.c            |    1 +
6746  drivers/media/rc/keymaps/rc-tivo.c                 |    1 +
6747  drivers/media/rc/keymaps/rc-total-media-in-hand.c  |    1 +
6748  drivers/media/rc/keymaps/rc-trekstor.c             |    1 +
6749  drivers/media/rc/keymaps/rc-tt-1500.c              |    1 +
6750  drivers/media/rc/keymaps/rc-twinhan1027.c          |    1 +
6751  drivers/media/rc/keymaps/rc-videomate-m1f.c        |    1 +
6752  drivers/media/rc/keymaps/rc-videomate-s350.c       |    1 +
6753  drivers/media/rc/keymaps/rc-videomate-tv-pvr.c     |    1 +
6754  drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c |    1 +
6755  drivers/media/rc/keymaps/rc-winfast.c              |    1 +
6756  drivers/media/rc/rc-main.c                         |    1 +
6757  drivers/media/video/adp1653.c                      |    1 +
6758  drivers/media/video/ak881x.c                       |    1 +
6759  drivers/media/video/cpia2/cpia2_usb.c              |    1 +
6760  drivers/media/video/cx25840/cx25840-ir.c           |    1 +
6761  drivers/media/video/davinci/dm355_ccdc.c           |    1 +
6762  drivers/media/video/davinci/dm644x_ccdc.c          |    1 +
6763  drivers/media/video/hdpvr/hdpvr-i2c.c              |    1 +
6764  drivers/media/video/hexium_gemini.c                |    1 +
6765  drivers/media/video/hexium_orion.c                 |    1 +
6766  drivers/media/video/imx074.c                       |    1 +
6767  drivers/media/video/m5mols/m5mols_core.c           |    1 +
6768  drivers/media/video/mt9m001.c                      |    1 +
6769  drivers/media/video/mt9m111.c                      |    1 +
6770  drivers/media/video/mt9t031.c                      |    1 +
6771  drivers/media/video/mt9v011.c                      |    1 +
6772  drivers/media/video/mt9v022.c                      |    1 +
6773  drivers/media/video/mt9v032.c                      |    1 +
6774  drivers/media/video/mxb.c                          |    1 +
6775  drivers/media/video/noon010pc30.c                  |    1 +
6776  drivers/media/video/omap24xxcam.c                  |    1 +
6777  drivers/media/video/ov6650.c                       |    1 +
6778  drivers/media/video/pvrusb2/pvrusb2-devattr.c      |    1 +
6779  drivers/media/video/pvrusb2/pvrusb2-hdw.c          |    1 +
6780  drivers/media/video/pvrusb2/pvrusb2-i2c-core.c     |    1 +
6781  drivers/media/video/pvrusb2/pvrusb2-v4l2.c         |    1 +
6782  drivers/media/video/rj54n1cb0c.c                   |    1 +
6783  drivers/media/video/sh_mobile_csi2.c               |    1 +
6784  drivers/media/video/sh_vou.c                       |    1 +
6785  drivers/media/video/sr030pc30.c                    |    1 +
6786  drivers/media/video/tcm825x.c                      |    1 +
6787  drivers/media/video/timblogiw.c                    |    1 +
6788  drivers/media/video/tvp514x.c                      |    1 +
6789  drivers/media/video/tvp5150.c                      |    1 +
6790  drivers/media/video/tvp7002.c                      |    1 +
6791  drivers/media/video/usbvision/usbvision-cards.c    |    1 +
6792  drivers/media/video/v4l2-ctrls.c                   |    1 +
6793  drivers/media/video/v4l2-device.c                  |    1 +
6794  drivers/media/video/v4l2-event.c                   |    1 +
6795  drivers/media/video/v4l2-fh.c                      |    1 +
6796  drivers/media/video/v4l2-int-device.c              |    1 +
6797  drivers/media/video/v4l2-subdev.c                  |    1 +
6798  drivers/memstick/core/memstick.c                   |    1 +
6799  drivers/memstick/core/mspro_block.c                |    1 +
6800  drivers/memstick/host/jmb38x_ms.c                  |    1 +
6801  drivers/memstick/host/tifm_ms.c                    |    1 +
6802  drivers/message/i2o/pci.c                          |    1 +
6803  drivers/mfd/ab3100-core.c                          |    1 +
6804  drivers/mfd/ab3550-core.c                          |    1 +
6805  drivers/mfd/ab8500-debugfs.c                       |    1 +
6806  drivers/mfd/ab8500-sysctrl.c                       |    1 +
6807  drivers/mfd/abx500-core.c                          |    1 +
6808  drivers/mfd/asic3.c                                |    1 +
6809  drivers/mfd/dm355evm_msp.c                         |    1 +
6810  drivers/mfd/max8997.c                              |    1 +
6811  drivers/mfd/mfd-core.c                             |    1 +
6812  drivers/mfd/pcf50633-irq.c                         |    1 +
6813  drivers/mfd/tmio_core.c                            |    1 +
6814  drivers/mfd/twl-core.c                             |    1 +
6815  drivers/mfd/twl6030-irq.c                          |    1 +
6816  drivers/mfd/wl1273-core.c                          |    1 +
6817  drivers/mfd/wm8400-core.c                          |    1 +
6818  drivers/misc/ab8500-pwm.c                          |    1 +
6819  drivers/misc/atmel-ssc.c                           |    1 +
6820  drivers/misc/atmel_tclib.c                         |    1 +
6821  drivers/misc/bh1780gli.c                           |    1 +
6822  drivers/misc/kgdbts.c                              |    1 +
6823  drivers/misc/ti-st/st_kim.c                        |    1 +
6824  drivers/misc/tifm_7xx1.c                           |    1 +
6825  drivers/misc/tifm_core.c                           |    1 +
6826  drivers/mmc/card/mmc_test.c                        |    1 +
6827  drivers/mmc/core/bus.c                             |    2 +
6828  drivers/mmc/core/debugfs.c                         |    1 +
6829  drivers/mmc/core/host.c                            |    1 +
6830  drivers/mmc/core/mmc.c                             |    1 +
6831  drivers/mmc/core/mmc_ops.c                         |    1 +
6832  drivers/mmc/core/quirks.c                          |    1 +
6833  drivers/mmc/core/sd.c                              |    1 +
6834  drivers/mmc/core/sd_ops.c                          |    1 +
6835  drivers/mmc/core/sdio_bus.c                        |    1 +
6836  drivers/mmc/core/sdio_io.c                         |    1 +
6837  drivers/mmc/core/sdio_irq.c                        |    1 +
6838  drivers/mmc/host/mmc_spi.c                         |    1 +
6839  drivers/mmc/host/mxs-mmc.c                         |    1 +
6840  drivers/mmc/host/sdhci-of-esdhc.c                  |    1 +
6841  drivers/mmc/host/sdhci-of-hlwd.c                   |    1 +
6842  drivers/mmc/host/sdhci-pci.c                       |    1 +
6843  drivers/mmc/host/sdhci-pltfm.c                     |    1 +
6844  drivers/mmc/host/sdhci-pxav2.c                     |    1 +
6845  drivers/mmc/host/sdhci-pxav3.c                     |    1 +
6846  drivers/mmc/host/sdhci-spear.c                     |    1 +
6847  drivers/mmc/host/sdhci-tegra.c                     |    1 +
6848  drivers/mmc/host/sdhci.c                           |    1 +
6849  drivers/mmc/host/sdricoh_cs.c                      |    1 +
6850  drivers/mmc/host/sh_mmcif.c                        |    1 +
6851  drivers/mmc/host/sh_mobile_sdhi.c                  |    1 +
6852  drivers/mmc/host/tifm_sd.c                         |    1 +
6853  drivers/mmc/host/via-sdmmc.c                       |    1 +
6854  drivers/mtd/ar7part.c                              |    1 +
6855  drivers/mtd/cmdlinepart.c                          |    1 +
6856  drivers/mtd/lpddr/lpddr_cmds.c                     |    1 +
6857  drivers/mtd/mtdblock_ro.c                          |    1 +
6858  drivers/mtd/mtdsuper.c                             |    1 +
6859  drivers/mtd/nand/cafe_nand.c                       |    1 +
6860  drivers/mtd/nand/cmx270_nand.c                     |    1 +
6861  drivers/mtd/nand/diskonchip.c                      |    1 +
6862  drivers/mtd/nand/nand_bbt.c                        |    1 +
6863  drivers/mtd/nand/omap2.c                           |    1 +
6864  drivers/mtd/nand/sm_common.c                       |    1 +
6865  drivers/mtd/onenand/onenand_bbt.c                  |    1 +
6866  drivers/mtd/redboot.c                              |    1 +
6867  drivers/mtd/rfd_ftl.c                              |    1 +
6868  drivers/mtd/ubi/vmt.c                              |    1 +
6869  drivers/net/ethernet/mellanox/mlx4/alloc.c         |    1 +
6870  drivers/net/ethernet/mellanox/mlx4/catas.c         |    1 +
6871  drivers/net/ethernet/mellanox/mlx4/cmd.c           |    1 +
6872  drivers/net/ethernet/mellanox/mlx4/cq.c            |    1 +
6873  drivers/net/ethernet/mellanox/mlx4/eq.c            |    1 +
6874  drivers/net/ethernet/mellanox/mlx4/fw.c            |    1 +
6875  drivers/net/ethernet/mellanox/mlx4/intf.c          |    1 +
6876  drivers/net/ethernet/mellanox/mlx4/mr.c            |    1 +
6877  drivers/net/ethernet/mellanox/mlx4/pd.c            |    1 +
6878  drivers/net/ethernet/mellanox/mlx4/port.c          |    1 +
6879  drivers/net/ethernet/mellanox/mlx4/qp.c            |    1 +
6880  drivers/net/ethernet/mellanox/mlx4/srq.c           |    1 +
6881  drivers/net/phy/realtek.c                          |    1 +
6882  drivers/net/wireless/b43/pcmcia.c                  |    1 +
6883  drivers/of/of_pci.c                                |    1 +
6884  drivers/of/of_pci_irq.c                            |    1 +
6885  drivers/of/of_spi.c                                |    1 +
6886  drivers/parisc/ccio-dma.c                          |    1 +
6887  drivers/parisc/sba_iommu.c                         |    1 +
6888  drivers/pci/hotplug-pci.c                          |    1 +
6889  drivers/pci/hotplug/pciehp_acpi.c                  |    1 +
6890  drivers/pci/hotplug/pcihp_slot.c                   |    1 +
6891  drivers/pci/hotplug/rpadlpar_core.c                |    1 +
6892  drivers/pci/htirq.c                                |    1 +
6893  drivers/pci/iov.c                                  |    1 +
6894  drivers/pci/irq.c                                  |    1 +
6895  drivers/pci/msi.c                                  |    1 +
6896  drivers/pci/pci-sysfs.c                            |    1 +
6897  drivers/pci/quirks.c                               |    1 +
6898  drivers/pci/rom.c                                  |    1 +
6899  drivers/pci/setup-res.c                            |    1 +
6900  drivers/pci/slot.c                                 |    1 +
6901  drivers/pci/vpd.c                                  |    1 +
6902  drivers/pcmcia/db1xxx_ss.c                         |    1 +
6903  drivers/pcmcia/pxa2xx_cm_x255.c                    |    1 +
6904  drivers/pcmcia/pxa2xx_cm_x270.c                    |    1 +
6905  drivers/platform/x86/intel_scu_ipc.c               |    1 +
6906  drivers/platform/x86/msi-wmi.c                     |    1 +
6907  drivers/platform/x86/wmi.c                         |    1 +
6908  drivers/power/max17042_battery.c                   |    1 +
6909  drivers/power/max8903_charger.c                    |    1 +
6910  drivers/power/max8997_charger.c                    |    1 +
6911  drivers/power/max8998_charger.c                    |    1 +
6912  drivers/power/power_supply_sysfs.c                 |    1 +
6913  drivers/ps3/ps3stor_lib.c                          |    1 +
6914  drivers/ps3/sys-manager-core.c                     |    1 +
6915  drivers/rapidio/switches/idt_gen2.c                |    1 +
6916  drivers/regulator/88pm8607.c                       |    1 +
6917  drivers/regulator/ab8500.c                         |    1 +
6918  drivers/regulator/bq24022.c                        |    1 +
6919  drivers/regulator/da903x.c                         |    1 +
6920  drivers/regulator/db8500-prcmu.c                   |    1 +
6921  drivers/regulator/dummy.c                          |    1 +
6922  drivers/regulator/fixed.c                          |    1 +
6923  drivers/regulator/lp3971.c                         |    1 +
6924  drivers/regulator/lp3972.c                         |    1 +
6925  drivers/regulator/max8925-regulator.c              |    1 +
6926  drivers/regulator/max8997.c                        |    1 +
6927  drivers/regulator/mc13783-regulator.c              |    1 +
6928  drivers/regulator/mc13892-regulator.c              |    1 +
6929  drivers/regulator/mc13xxx-regulator-core.c         |    1 +
6930  drivers/regulator/tps6586x-regulator.c             |    1 +
6931  drivers/regulator/userspace-consumer.c             |    1 +
6932  drivers/regulator/virtual.c                        |    1 +
6933  drivers/regulator/wm8400-regulator.c               |    1 +
6934  drivers/rtc/interface.c                            |    1 +
6935  drivers/rtc/rtc-dm355evm.c                         |    1 +
6936  drivers/rtc/rtc-ds1305.c                           |    1 +
6937  drivers/rtc/rtc-ds1511.c                           |    1 +
6938  drivers/rtc/rtc-ds1553.c                           |    1 +
6939  drivers/rtc/rtc-ds1672.c                           |    1 +
6940  drivers/rtc/rtc-ds1742.c                           |    1 +
6941  drivers/rtc/rtc-em3027.c                           |    1 +
6942  drivers/rtc/rtc-isl12022.c                         |    1 +
6943  drivers/rtc/rtc-mv.c                               |    1 +
6944  drivers/rtc/rtc-pcf2123.c                          |    1 +
6945  drivers/rtc/rtc-pcf8563.c                          |    1 +
6946  drivers/rtc/rtc-rs5c348.c                          |    1 +
6947  drivers/rtc/rtc-rs5c372.c                          |    1 +
6948  drivers/rtc/rtc-stk17ta8.c                         |    1 +
6949  drivers/rtc/rtc-tx4939.c                           |    1 +
6950  drivers/rtc/rtc-x1205.c                            |    1 +
6951  drivers/s390/char/fs3270.c                         |    1 +
6952  drivers/s390/char/sclp_cpi_sys.c                   |    1 +
6953  drivers/s390/char/vmur.c                           |    1 +
6954  drivers/s390/cio/chp.c                             |    2 +
6955  drivers/s390/cio/qdio_debug.c                      |    2 +
6956  drivers/s390/kvm/kvm_virtio.c                      |    1 +
6957  drivers/s390/scsi/zfcp_ccw.c                       |    1 +
6958  drivers/s390/scsi/zfcp_dbf.c                       |    1 +
6959  drivers/s390/scsi/zfcp_scsi.c                      |    1 +
6960  drivers/scsi/a2091.c                               |    1 +
6961  drivers/scsi/a3000.c                               |    1 +
6962  drivers/scsi/aacraid/aachba.c                      |    1 +
6963  drivers/scsi/bfa/bfad_debugfs.c                    |    1 +
6964  drivers/scsi/bfa/bfad_im.c                         |    2 +
6965  drivers/scsi/device_handler/scsi_dh.c              |    1 +
6966  drivers/scsi/device_handler/scsi_dh_alua.c         |    1 +
6967  drivers/scsi/device_handler/scsi_dh_emc.c          |    1 +
6968  drivers/scsi/device_handler/scsi_dh_hp_sw.c        |    1 +
6969  drivers/scsi/device_handler/scsi_dh_rdac.c         |    1 +
6970  drivers/scsi/gvp11.c                               |    1 +
6971  drivers/scsi/libfc/fc_disc.c                       |    1 +
6972  drivers/scsi/libfc/fc_elsct.c                      |    1 +
6973  drivers/scsi/libfc/fc_exch.c                       |    1 +
6974  drivers/scsi/libfc/fc_libfc.c                      |    1 +
6975  drivers/scsi/libfc/fc_lport.c                      |    1 +
6976  drivers/scsi/libfc/fc_npiv.c                       |    1 +
6977  drivers/scsi/libfc/fc_rport.c                      |    1 +
6978  drivers/scsi/libsas/sas_scsi_host.c                |    1 +
6979  drivers/scsi/libsas/sas_task.c                     |    1 +
6980  drivers/scsi/libsrp.c                              |    1 +
6981  drivers/scsi/lpfc/lpfc_attr.c                      |    1 +
6982  drivers/scsi/lpfc/lpfc_debugfs.c                   |    1 +
6983  drivers/scsi/lpfc/lpfc_init.c                      |    1 +
6984  drivers/scsi/lpfc/lpfc_scsi.c                      |    1 +
6985  drivers/scsi/mac53c94.c                            |    1 +
6986  drivers/scsi/megaraid/megaraid_mbox.c              |    1 +
6987  drivers/scsi/osd/osd_initiator.c                   |    1 +
6988  drivers/scsi/ps3rom.c                              |    1 +
6989  drivers/scsi/scsi_lib.c                            |    1 +
6990  drivers/scsi/scsi_lib_dma.c                        |    1 +
6991  drivers/scsi/scsi_pm.c                             |    1 +
6992  drivers/scsi/sr_ioctl.c                            |    1 +
6993  drivers/sfi/sfi_core.h                             |    3 +
6994  drivers/sh/intc/core.c                             |    1 +
6995  drivers/sh/intc/virq.c                             |    1 +
6996  drivers/sh/maple/maple.c                           |    1 +
6997  drivers/spi/spi-altera.c                           |    1 +
6998  drivers/spi/spi-au1550.c                           |    1 +
6999  drivers/spi/spi-bitbang.c                          |    1 +
7000  drivers/spi/spi-butterfly.c                        |    1 +
7001  drivers/spi/spi-dw-mmio.c                          |    1 +
7002  drivers/spi/spi-dw-pci.c                           |    1 +
7003  drivers/spi/spi-dw.c                               |    1 +
7004  drivers/spi/spi-gpio.c                             |    1 +
7005  drivers/spi/spi-oc-tiny.c                          |    1 +
7006  drivers/spi/spi-omap-uwire.c                       |    1 +
7007  drivers/spi/spi-orion.c                            |    1 +
7008  drivers/spi/spi-pxa2xx-pci.c                       |    1 +
7009  drivers/spi/spi-s3c24xx.c                          |    1 +
7010  drivers/spi/spi-sh-msiof.c                         |    1 +
7011  drivers/spi/spi-sh-sci.c                           |    1 +
7012  drivers/spi/spi-ti-ssp.c                           |    1 +
7013  drivers/spi/spi-tle62x0.c                          |    1 +
7014  drivers/spi/spi-txx9.c                             |    1 +
7015  drivers/spi/spi.c                                  |    1 +
7016  drivers/ssb/b43_pci_bridge.c                       |    1 +
7017  drivers/ssb/driver_chipcommon.c                    |    1 +
7018  drivers/ssb/driver_chipcommon_pmu.c                |    1 +
7019  drivers/ssb/driver_gige.c                          |    1 +
7020  drivers/ssb/driver_pcicore.c                       |    1 +
7021  drivers/ssb/embedded.c                             |    1 +
7022  drivers/ssb/main.c                                 |    1 +
7023  drivers/ssb/pcihost_wrapper.c                      |    1 +
7024  drivers/staging/altera-stapl/altera.c              |    1 +
7025  drivers/staging/brcm80211/brcmutil/wifi.c          |    1 +
7026  drivers/staging/dt3155v4l/dt3155v4l.c              |    1 +
7027  drivers/staging/iio/accel/adis16201_core.c         |    1 +
7028  drivers/staging/iio/accel/adis16203_core.c         |    1 +
7029  drivers/staging/iio/accel/adis16204_core.c         |    1 +
7030  drivers/staging/iio/accel/adis16209_core.c         |    1 +
7031  drivers/staging/iio/accel/adis16220_core.c         |    1 +
7032  drivers/staging/iio/accel/adis16240_core.c         |    1 +
7033  drivers/staging/iio/accel/kxsd9.c                  |    1 +
7034  drivers/staging/iio/accel/lis3l02dq_core.c         |    1 +
7035  drivers/staging/iio/accel/sca3000_core.c           |    1 +
7036  drivers/staging/iio/adc/ad7150.c                   |    1 +
7037  drivers/staging/iio/adc/ad7152.c                   |    1 +
7038  drivers/staging/iio/adc/ad7291.c                   |    1 +
7039  drivers/staging/iio/adc/ad7298_core.c              |    1 +
7040  drivers/staging/iio/adc/ad7314.c                   |    1 +
7041  drivers/staging/iio/adc/ad7476_core.c              |    1 +
7042  drivers/staging/iio/adc/ad7606_core.c              |    1 +
7043  drivers/staging/iio/adc/ad7745.c                   |    1 +
7044  drivers/staging/iio/adc/ad7780.c                   |    1 +
7045  drivers/staging/iio/adc/ad7816.c                   |    1 +
7046  drivers/staging/iio/adc/ad7887_core.c              |    1 +
7047  drivers/staging/iio/adc/ad799x_core.c              |    1 +
7048  drivers/staging/iio/adc/adt7310.c                  |    1 +
7049  drivers/staging/iio/adc/adt7410.c                  |    1 +
7050  drivers/staging/iio/adc/adt75.c                    |    1 +
7051  drivers/staging/iio/adc/max1363_core.c             |    1 +
7052  drivers/staging/iio/addac/adt7316-i2c.c            |    1 +
7053  drivers/staging/iio/addac/adt7316.c                |    1 +
7054  drivers/staging/iio/dac/ad5446.c                   |    1 +
7055  drivers/staging/iio/dac/ad5504.c                   |    1 +
7056  drivers/staging/iio/dac/ad5624r_spi.c              |    1 +
7057  drivers/staging/iio/dac/ad5686.c                   |    1 +
7058  drivers/staging/iio/dac/ad5791.c                   |    1 +
7059  drivers/staging/iio/dds/ad5930.c                   |    1 +
7060  drivers/staging/iio/dds/ad9832.c                   |    1 +
7061  drivers/staging/iio/dds/ad9834.c                   |    1 +
7062  drivers/staging/iio/dds/ad9850.c                   |    1 +
7063  drivers/staging/iio/dds/ad9852.c                   |    1 +
7064  drivers/staging/iio/dds/ad9910.c                   |    1 +
7065  drivers/staging/iio/dds/ad9951.c                   |    1 +
7066  drivers/staging/iio/gyro/adis16060_core.c          |    1 +
7067  drivers/staging/iio/gyro/adis16080_core.c          |    1 +
7068  drivers/staging/iio/gyro/adis16130_core.c          |    1 +
7069  drivers/staging/iio/gyro/adis16260_core.c          |    1 +
7070  drivers/staging/iio/gyro/adxrs450_core.c           |    1 +
7071  drivers/staging/iio/imu/adis16400_core.c           |    1 +
7072  drivers/staging/iio/industrialio-ring.c            |    1 +
7073  drivers/staging/iio/light/tsl2583.c                |    1 +
7074  drivers/staging/iio/meter/ade7753.c                |    1 +
7075  drivers/staging/iio/meter/ade7754.c                |    1 +
7076  drivers/staging/iio/meter/ade7758_core.c           |    1 +
7077  drivers/staging/iio/meter/ade7759.c                |    1 +
7078  drivers/staging/iio/meter/ade7854-i2c.c            |    1 +
7079  drivers/staging/iio/meter/ade7854-spi.c            |    1 +
7080  drivers/staging/iio/meter/ade7854.c                |    1 +
7081  drivers/staging/iio/resolver/ad2s120x.c            |    1 +
7082  drivers/staging/iio/resolver/ad2s1210.c            |    1 +
7083  drivers/staging/iio/resolver/ad2s90.c              |    1 +
7084  drivers/staging/iio/trigger.h                      |    1 +
7085  .../staging/intel_sst/intel_sst_drv_interface.c    |    1 +
7086  drivers/staging/line6/audio.c                      |    1 +
7087  drivers/staging/olpc_dcon/olpc_dcon.c              |    1 +
7088  drivers/staging/sm7xx/smtcfb.c                     |    2 +
7089  drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c      |    1 +
7090  drivers/staging/usbip/stub_dev.c                   |    1 +
7091  drivers/staging/usbip/stub_main.c                  |    1 +
7092  drivers/staging/usbip/usbip_event.c                |    1 +
7093  drivers/tty/hvc/hvc_iseries.c                      |    1 +
7094  drivers/tty/hvc/hvc_vio.c                          |    1 +
7095  drivers/tty/serial/jsm/jsm_driver.c                |    2 +-
7096  drivers/tty/serial/kgdboc.c                        |    1 +
7097  drivers/tty/serial/max3100.c                       |    1 +
7098  drivers/tty/serial/max3107-aava.c                  |    1 +
7099  drivers/tty/serial/max3107.c                       |    1 +
7100  drivers/tty/serial/nwpserial.c                     |    1 +
7101  drivers/tty/serial/timbuart.c                      |    1 +
7102  drivers/tty/serial/xilinx_uartps.c                 |    1 +
7103  drivers/tty/vt/vc_screen.c                         |    1 +
7104  drivers/uio/uio_pdrv.c                             |    1 +
7105  drivers/uio/uio_pdrv_genirq.c                      |    1 +
7106  drivers/usb/c67x00/c67x00-drv.c                    |    1 +
7107  drivers/usb/core/driver.c                          |    1 +
7108  drivers/usb/core/notify.c                          |    1 +
7109  drivers/usb/gadget/cdc2.c                          |    1 +
7110  drivers/usb/gadget/composite.c                     |    1 +
7111  drivers/usb/gadget/dbgp.c                          |    1 +
7112  drivers/usb/gadget/f_fs.c                          |    1 +
7113  drivers/usb/gadget/f_obex.c                        |    1 +
7114  drivers/usb/gadget/f_sourcesink.c                  |    1 +
7115  drivers/usb/gadget/file_storage.c                  |    1 +
7116  drivers/usb/gadget/fusb300_udc.c                   |    1 +
7117  drivers/usb/gadget/gmidi.c                         |    1 +
7118  drivers/usb/gadget/u_serial.c                      |    1 +
7119  drivers/usb/host/fsl-mph-dr-of.c                   |    1 +
7120  drivers/usb/host/isp1760-if.c                      |    1 +
7121  drivers/usb/host/pci-quirks.c                      |    1 +
7122  drivers/usb/host/whci/debug.c                      |    1 +
7123  drivers/usb/host/whci/hcd.c                        |    1 +
7124  drivers/usb/host/xhci-hub.c                        |    1 +
7125  drivers/usb/host/xhci-pci.c                        |    1 +
7126  drivers/usb/mon/mon_bin.c                          |    1 +
7127  drivers/usb/mon/mon_stat.c                         |    1 +
7128  drivers/usb/mon/mon_text.c                         |    1 +
7129  drivers/usb/otg/gpio_vbus.c                        |    1 +
7130  drivers/usb/otg/otg.c                              |    1 +
7131  drivers/usb/otg/ulpi.c                             |    1 +
7132  drivers/usb/serial/aircable.c                      |    1 +
7133  drivers/usb/serial/qcserial.c                      |    1 +
7134  drivers/usb/storage/option_ms.c                    |    1 +
7135  drivers/usb/storage/protocol.c                     |    1 +
7136  drivers/usb/storage/sierra_ms.c                    |    1 +
7137  drivers/usb/storage/transport.c                    |    1 +
7138  drivers/usb/storage/uas.c                          |    1 +
7139  drivers/usb/wusbcore/devconnect.c                  |    1 +
7140  drivers/usb/wusbcore/mmc.c                         |    1 +
7141  drivers/usb/wusbcore/rh.c                          |    1 +
7142  drivers/usb/wusbcore/security.c                    |    1 +
7143  drivers/usb/wusbcore/wa-hc.c                       |    1 +
7144  drivers/usb/wusbcore/wa-rpipe.c                    |    1 +
7145  drivers/usb/wusbcore/wa-xfer.c                     |    1 +
7146  drivers/uwb/est.c                                  |    1 +
7147  drivers/uwb/i1480/dfu/dfu.c                        |    1 +
7148  drivers/uwb/ie.c                                   |    1 +
7149  drivers/uwb/lc-dev.c                               |    2 +
7150  drivers/uwb/neh.c                                  |    1 +
7151  drivers/uwb/pal.c                                  |    1 +
7152  drivers/uwb/radio.c                                |    1 +
7153  drivers/uwb/reset.c                                |    1 +
7154  drivers/uwb/rsv.c                                  |    1 +
7155  drivers/uwb/scan.c                                 |    1 +
7156  drivers/uwb/umc-bus.c                              |    1 +
7157  drivers/uwb/umc-dev.c                              |    1 +
7158  drivers/uwb/umc-drv.c                              |    1 +
7159  drivers/uwb/whci.c                                 |    1 +
7160  drivers/video/atmel_lcdfb.c                        |    1 +
7161  drivers/video/backlight/88pm860x_bl.c              |    1 +
7162  drivers/video/backlight/adp5520_bl.c               |    1 +
7163  drivers/video/backlight/ams369fg06.c               |    1 +
7164  drivers/video/backlight/da903x_bl.c                |    1 +
7165  drivers/video/backlight/l4f00242t03.c              |    1 +
7166  drivers/video/backlight/ld9040.c                   |    1 +
7167  drivers/video/backlight/lms283gf05.c               |    1 +
7168  drivers/video/backlight/max8925_bl.c               |    1 +
7169  drivers/video/backlight/s6e63m0.c                  |    1 +
7170  drivers/video/backlight/wm831x_bl.c                |    1 +
7171  drivers/video/carminefb.c                          |    1 +
7172  drivers/video/cobalt_lcdfb.c                       |    1 +
7173  drivers/video/fb_ddc.c                             |    3 +-
7174  drivers/video/fb_notify.c                          |    1 +
7175  drivers/video/mb862xx/mb862xx-i2c.c                |    1 +
7176  drivers/video/mb862xx/mb862xxfbdrv.c               |    1 +
7177  drivers/video/msm/mdp.c                            |    1 +
7178  drivers/video/omap/lcd_mipid.c                     |    1 +
7179  drivers/video/omap/omapfb_main.c                   |    1 +
7180  drivers/video/omap2/dss/dispc.c                    |    1 +
7181  drivers/video/omap2/dss/dpi.c                      |    1 +
7182  drivers/video/omap2/dss/dsi.c                      |    1 +
7183  drivers/video/omap2/dss/dss.c                      |    1 +
7184  drivers/video/omap2/dss/rfbi.c                     |    1 +
7185  drivers/video/omap2/dss/sdi.c                      |    1 +
7186  drivers/video/omap2/omapfb/omapfb-ioctl.c          |    1 +
7187  drivers/video/savage/savagefb_accel.c              |    1 +
7188  drivers/video/sh_mipi_dsi.c                        |    1 +
7189  drivers/video/sh_mobile_lcdcfb.c                   |    1 +
7190  drivers/video/via/via-gpio.c                       |    1 +
7191  drivers/video/w100fb.c                             |    1 +
7192  drivers/virtio/virtio.c                            |    1 +
7193  drivers/virtio/virtio_balloon.c                    |    1 +
7194  drivers/virtio/virtio_ring.c                       |    1 +
7195  drivers/w1/w1_family.c                             |    1 +
7196  drivers/xen/balloon.c                              |    1 +
7197  drivers/xen/manage.c                               |    1 +
7198  drivers/xen/swiotlb-xen.c                          |    1 +
7199  drivers/xen/xen-pciback/conf_space.c               |    1 +
7200  drivers/xen/xen-selfballoon.c                      |    2 +
7201  drivers/xen/xenbus/xenbus_client.c                 |    1 +
7202  drivers/xen/xenbus/xenbus_probe.c                  |    1 +
7203  drivers/xen/xenbus/xenbus_probe_backend.c          |    1 +
7204  drivers/xen/xenbus/xenbus_probe_frontend.c         |    1 +
7205  drivers/zorro/proc.c                               |    1 +
7206  fs/bio-integrity.c                                 |    1 +
7207  fs/exofs/super.c                                   |    1 +
7208  fs/gfs2/ops_fstype.c                               |    1 +
7209  fs/ioprio.c                                        |    1 +
7210  fs/jfs/jfs_logmgr.c                                |    1 +
7211  fs/logfs/super.c                                   |    1 +
7212  fs/nfsd/nfssvc.c                                   |    1 +
7213  fs/proc/vmcore.c                                   |    1 +
7214  include/acpi/platform/aclinux.h                    |    2 +-
7215  include/drm/drmP.h                                 |    3 +-
7216  include/linux/bcma/bcma.h                          |    7 +-
7217  include/linux/blkdev.h                             |    2 +-
7218  include/linux/cpuidle.h                            |    3 +-
7219  include/linux/crypto.h                             |    6 --
7220  include/linux/device.h                             |   15 ++-
7221  include/linux/device_cgroup.h                      |    1 -
7222  include/linux/dmaengine.h                          |    2 +
7223  include/linux/export.h                             |   89 ++++++++++++++++++++
7224  include/linux/firmware.h                           |    2 +-
7225  include/linux/ftrace.h                             |    2 +-
7226  include/linux/gameport.h                           |   17 ++--
7227  include/linux/hid.h                                |    9 +-
7228  include/linux/i2c.h                                |   10 +-
7229  include/linux/ipmi.h                               |    3 +-
7230  include/linux/ipmi_smi.h                           |    1 -
7231  include/linux/mdio-bitbang.h                       |    3 +-
7232  include/linux/module.h                             |   68 +---------------
7233  include/linux/mtd/mtd.h                            |    3 +-
7234  include/linux/of_platform.h                        |    1 -
7235  include/linux/pci_hotplug.h                        |   10 +--
7236  include/linux/pm_runtime.h                         |    1 +
7237  include/linux/regulator/driver.h                   |    1 +
7238  include/linux/serio.h                              |   20 +++--
7239  include/linux/ssb/ssb.h                            |    7 +-
7240  include/linux/stop_machine.h                       |    1 +
7241  include/linux/sunrpc/svc_xprt.h                    |    3 +-
7242  include/linux/sysdev.h                             |    1 -
7243  include/linux/textsearch.h                         |    3 +-
7244  include/linux/uio_driver.h                         |   12 ++--
7245  include/linux/usb.h                                |    9 +-
7246  include/linux/uwb.h                                |    1 +
7247  include/linux/uwb/umc.h                            |    7 +-
7248  include/linux/vermagic.h                           |    1 -
7249  include/linux/vlynq.h                              |    3 +-
7250  include/media/saa7146.h                            |    3 +-
7251  include/media/v4l2-int-device.h                    |    3 +-
7252  include/net/inet_timewait_sock.h                   |    1 -
7253  include/net/lib80211.h                             |    3 +-
7254  include/net/sch_generic.h                          |    1 -
7255  include/net/sock.h                                 |    2 +-
7256  include/sound/core.h                               |    2 +-
7257  include/trace/define_trace.h                       |    2 +-
7258  include/trace/events/module.h                      |    2 +-
7259  include/xen/xenbus.h                               |    1 +
7260  kernel/async.c                                     |    2 +-
7261  kernel/audit.c                                     |    2 +-
7262  kernel/auditsc.c                                   |    2 +-
7263  kernel/capability.c                                |    2 +-
7264  kernel/cgroup_freezer.c                            |    2 +-
7265  kernel/compat.c                                    |    1 +
7266  kernel/cpu.c                                       |    2 +-
7267  kernel/cpuset.c                                    |    2 +-
7268  kernel/crash_dump.c                                |    2 +-
7269  kernel/cred.c                                      |    2 +-
7270  kernel/debug/kdb/kdb_debugger.c                    |    1 +
7271  kernel/dma.c                                       |    2 +-
7272  kernel/events/core.c                               |    1 +
7273  kernel/exit.c                                      |    3 +-
7274  kernel/fork.c                                      |    3 +-
7275  kernel/freezer.c                                   |    2 +-
7276  kernel/futex.c                                     |    2 +-
7277  kernel/groups.c                                    |    2 +-
7278  kernel/hrtimer.c                                   |    2 +-
7279  kernel/hung_task.c                                 |    2 +-
7280  kernel/irq_work.c                                  |    4 +-
7281  kernel/kfifo.c                                     |    2 +-
7282  kernel/kprobes.c                                   |    2 +-
7283  kernel/ksysfs.c                                    |    3 +-
7284  kernel/kthread.c                                   |    2 +-
7285  kernel/latencytop.c                                |    2 +-
7286  kernel/lockdep.c                                   |    2 +-
7287  kernel/lockdep_proc.c                              |    2 +-
7288  kernel/module.c                                    |    2 +-
7289  kernel/mutex-debug.c                               |    2 +-
7290  kernel/mutex.c                                     |    2 +-
7291  kernel/notifier.c                                  |    2 +-
7292  kernel/nsproxy.c                                   |    2 +-
7293  kernel/padata.c                                    |    2 +-
7294  kernel/params.c                                    |    4 +-
7295  kernel/pid.c                                       |    2 +-
7296  kernel/posix-timers.c                              |    2 +-
7297  kernel/power/hibernate.c                           |    1 +
7298  kernel/power/main.c                                |    1 +
7299  kernel/power/suspend.c                             |    2 +
7300  kernel/printk.c                                    |    2 +-
7301  kernel/profile.c                                   |    2 +-
7302  kernel/ptrace.c                                    |    2 +-
7303  kernel/range.c                                     |    2 +-
7304  kernel/rcupdate.c                                  |    2 +-
7305  kernel/rcutiny.c                                   |    4 +-
7306  kernel/rcutorture.c                                |    3 +-
7307  kernel/rcutree.c                                   |    2 +-
7308  kernel/rcutree_trace.c                             |    3 +-
7309  kernel/relay.c                                     |    2 +-
7310  kernel/resource.c                                  |    2 +-
7311  kernel/rtmutex-debug.c                             |    2 +-
7312  kernel/rtmutex-tester.c                            |    2 +-
7313  kernel/rtmutex.c                                   |    2 +-
7314  kernel/rwsem.c                                     |    2 +-
7315  kernel/sched.c                                     |    2 +-
7316  kernel/sched_clock.c                               |    2 +-
7317  kernel/semaphore.c                                 |    2 +-
7318  kernel/signal.c                                    |    2 +-
7319  kernel/smp.c                                       |    2 +-
7320  kernel/softirq.c                                   |    2 +-
7321  kernel/spinlock.c                                  |    2 +-
7322  kernel/srcu.c                                      |    2 +-
7323  kernel/stacktrace.c                                |    2 +-
7324  kernel/stop_machine.c                              |    2 +-
7325  kernel/sys.c                                       |    3 +-
7326  kernel/sysctl.c                                    |    2 +-
7327  kernel/time.c                                      |    2 +-
7328  kernel/time/posix-clock.c                          |    1 +
7329  kernel/timer.c                                     |    2 +-
7330  kernel/trace/blktrace.c                            |    1 +
7331  kernel/trace/ftrace.c                              |    1 +
7332  kernel/trace/trace_syscalls.c                      |    1 +
7333  kernel/up.c                                        |    2 +-
7334  kernel/user-return-notifier.c                      |    2 +-
7335  kernel/user.c                                      |    2 +-
7336  kernel/user_namespace.c                            |    2 +-
7337  kernel/utsname.c                                   |    2 +-
7338  kernel/utsname_sysctl.c                            |    2 +-
7339  kernel/wait.c                                      |    2 +-
7340  kernel/watchdog.c                                  |    3 +-
7341  kernel/workqueue.c                                 |    2 +-
7342  lib/dma-debug.c                                    |    1 +
7343  lib/raid6/algos.c                                  |    1 +
7344  lib/raid6/mktables.c                               |    1 +
7345  lib/raid6/recov.c                                  |    1 +
7346  mm/fremap.c                                        |    1 -
7347  mm/memcontrol.c                                    |    1 +
7348  mm/memory-failure.c                                |    1 +
7349  mm/mmzone.c                                        |    1 -
7350  mm/quicklist.c                                     |    1 -
7351  mm/sparse-vmemmap.c                                |    1 -
7352  mm/swap_state.c                                    |    1 -
7353  mm/swapfile.c                                      |    1 -
7354  net/caif/cfpkt_skbuff.c                            |    1 +
7355  net/netfilter/ipset/pfxlen.c                       |    1 +
7356  net/rfkill/input.c                                 |    1 +
7357  security/selinux/netlink.c                         |    1 +
7358  sound/core/control.c                               |    1 +
7359  sound/core/device.c                                |    1 +
7360  sound/core/hwdep.c                                 |    1 +
7361  sound/core/info.c                                  |    1 +
7362  sound/core/info_oss.c                              |    1 +
7363  sound/core/init.c                                  |    1 +
7364  sound/core/isadma.c                                |    1 +
7365  sound/core/jack.c                                  |    1 +
7366  sound/core/memory.c                                |    1 +
7367  sound/core/misc.c                                  |    1 +
7368  sound/core/oss/mixer_oss.c                         |    1 +
7369  sound/core/rawmidi.c                               |    1 +
7370  sound/core/seq/oss/seq_oss.c                       |    2 +-
7371  sound/core/seq/oss/seq_oss_init.c                  |    2 +-
7372  sound/core/seq/oss/seq_oss_synth.c                 |    1 +
7373  sound/core/seq/seq.c                               |    2 +-
7374  sound/core/seq/seq_clientmgr.c                     |    1 +
7375  sound/core/seq/seq_device.c                        |    1 +
7376  sound/core/seq/seq_dummy.c                         |    2 +-
7377  sound/core/seq/seq_info.c                          |    1 +
7378  sound/core/seq/seq_lock.c                          |    1 +
7379  sound/core/seq/seq_memory.c                        |    1 +
7380  sound/core/seq/seq_midi.c                          |    2 +-
7381  sound/core/seq/seq_midi_emul.c                     |    1 +
7382  sound/core/seq/seq_midi_event.c                    |    1 +
7383  sound/core/seq/seq_ports.c                         |    1 +
7384  sound/core/seq/seq_system.c                        |    1 +
7385  sound/core/seq/seq_virmidi.c                       |    1 +
7386  sound/core/sound.c                                 |    2 +-
7387  sound/core/sound_oss.c                             |    1 +
7388  sound/core/timer.c                                 |    2 +-
7389  sound/core/vmaster.c                               |    1 +
7390  sound/drivers/mpu401/mpu401.c                      |    2 +-
7391  sound/drivers/mpu401/mpu401_uart.c                 |    1 +
7392  sound/drivers/mtpav.c                              |    1 +
7393  sound/drivers/mts64.c                              |    1 +
7394  sound/drivers/opl3/opl3_lib.c                      |    1 +
7395  sound/drivers/opl3/opl3_oss.c                      |    1 +
7396  sound/drivers/opl3/opl3_seq.c                      |    1 +
7397  sound/drivers/opl3/opl3_synth.c                    |    1 +
7398  sound/drivers/opl4/opl4_lib.c                      |    1 +
7399  sound/drivers/opl4/opl4_proc.c                     |    1 +
7400  sound/drivers/opl4/opl4_seq.c                      |    1 +
7401  sound/drivers/portman2x4.c                         |    1 +
7402  sound/drivers/serial-u16550.c                      |    2 +-
7403  sound/drivers/virmidi.c                            |    2 +-
7404  sound/firewire/iso-resources.c                     |    1 +
7405  sound/firewire/packets-buffer.c                    |    1 +
7406  sound/i2c/i2c.c                                    |    1 +
7407  sound/i2c/other/ak4xxx-adda.c                      |    1 +
7408  sound/i2c/other/pt2258.c                           |    1 +
7409  sound/i2c/other/tea575x-tuner.c                    |    1 +
7410  sound/i2c/tea6330t.c                               |    1 +
7411  sound/isa/sb/emu8000.c                             |    1 +
7412  sound/isa/sb/emu8000_callback.c                    |    1 +
7413  sound/isa/sb/emu8000_patch.c                       |    1 +
7414  sound/isa/sb/emu8000_synth.c                       |    1 +
7415  sound/isa/wavefront/wavefront_fx.c                 |    1 +
7416  sound/isa/wavefront/wavefront_synth.c              |    1 +
7417  sound/pci/als4000.c                                |    2 +-
7418  sound/pci/asihpi/hpioctl.c                         |    1 +
7419  sound/pci/ctxfi/xfi.c                              |    1 +
7420  sound/pci/oxygen/oxygen_io.c                       |    1 +
7421  sound/soc/blackfin/bf5xx-sport.c                   |    1 +
7422  sound/soc/tegra/tegra_asoc_utils.c                 |    1 +
7423  sound/synth/emux/emux.c                            |    1 +
7424  sound/synth/emux/emux_oss.c                        |    1 +
7425  sound/synth/emux/emux_seq.c                        |    2 +-
7426  sound/synth/emux/emux_synth.c                      |    1 +
7427  sound/synth/emux/soundfont.c                       |    1 +
7428  sound/synth/util_mem.c                             |    1 +
7429  sound/usb/6fire/firmware.c                         |    1 +
7430  sound/usb/midi.c                                   |    1 +
7431  virt/kvm/iommu.c                                   |    2 +
7432  1388 files changed, 1520 insertions(+), 426 deletions(-)
7433  create mode 100644 include/linux/export.h
7434 $ git am -3 ../patches/0001-dm-use-export.h-instead-of-module.h-where-possible.patch
7435 Applying: dm: use export.h instead of module.h where possible
7436 $ git reset HEAD^
7437 Unstaged changes after reset:
7438 M       drivers/md/persistent-data/dm-btree-remove.c
7439 M       drivers/md/persistent-data/dm-btree.c
7440 M       drivers/md/persistent-data/dm-space-map-disk.c
7441 M       drivers/md/persistent-data/dm-transaction-manager.c
7442 $ git add .
7443 $ git commit -v -a --amend
7444 [master cb79afb] Merge remote-tracking branch 'moduleh/module.h-split'
7445 $ git am -3 ../patches/0001-block-bsg-lib.c-needs-export.h-not-module.h.patch
7446 Applying: block: bsg-lib.c needs export.h not module.h
7447 $ git reset HEAD^
7448 Unstaged changes after reset:
7449 M       block/bsg-lib.c
7450 $ git add .
7451 $ git commit -v -a --amend
7452 [master 4ce3ae2] Merge remote-tracking branch 'moduleh/module.h-split'
7453 $ git am -3 ../patches/0001-PM-EXPORT_SYMBOL-needs-export.h.patch
7454 Applying: PM: EXPORT_SYMBOL needs export.h
7455 $ git reset HEAD^
7456 Unstaged changes after reset:
7457 M       drivers/base/power/common.c
7458 $ git add .
7459 $ git commit -v -a --amend
7460 [master 523058a] Merge remote-tracking branch 'moduleh/module.h-split'
7461 $ git am -3 ../patches/0001-usb-include-module.h-in-the-DesignWare-USB3-DRD-driv.patch
7462 Applying: usb: include module.h in the DesignWare USB3 DRD driver
7463 $ git reset HEAD^
7464 Unstaged changes after reset:
7465 M       drivers/usb/dwc3/dwc3-pci.c
7466 $ git add .
7467 $ git commit -v -a --amend
7468 [master c2229ad] Merge remote-tracking branch 'moduleh/module.h-split'
7469 Merging scsi-post-merge/merge-base:master
7470 $ git clone -s -l -n -q . ../rebase-tmp
7471 $ cd ../rebase-tmp
7472 $ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm
7473 From ../next
7474  * [new branch]      quilt/akpm -> akpm
7475 $ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base
7476 From ../next
7477  * [new branch]      quilt/akpm-base -> akpm-base
7478 $ git checkout akpm
7479 Switched to branch 'akpm'
7480 $ git rebase --onto master akpm-base
7481 First, rewinding head to replay your work on top of it...
7482 Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
7483 Applying: This patch makes two changes:
7484 Applying: On thread exit shm_exit_ns() is called, it uses shm_ids(ns).rw_mutex.  It
7485 Applying: Because of x86-implement-strict-user-copy-checks-for-x86_64.patch
7486 Applying: When no floppy is found the module code can be released while a timer
7487 Applying: The parameter's origin type is long.  On an i386 architecture, it can
7488 Applying: Add support for Aspire 1410 BIOS v1.3314.  Fixes the following error:
7489 Applying: This makes the iris driver use the platform API, so it is properly exposed
7490 Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
7491 Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
7492 Applying: Cc: Ed Wildgoose <git@wildgooses.com>
7493 Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
7494 Applying: The x86 timer interrupt handler is the only handler not traced in the
7495 Applying: The current interrupt traces from irq_handler_entry and irq_handler_exit
7496 Applying: Don't allow everybody to use a modem.
7497 Applying: The address limit is already set in flush_old_exec() so this
7498 Applying: A call to va_copy() should always be followed by a call to va_end() in the
7499 Applying: Don't dereference em if it's NULL or an error pointer.
7500 Applying: Some messing with error codes to return 0 on out id's and match
7501 Applying: fb_set_suspend() must be called with the console semaphore held, which
7502 Applying: hwmon was using an idr with a NULL pointer, so convert to an
7503 Applying: A straightforward looking use of idr for a device id.
7504 Applying: The address limit is already set in flush_old_exec() so this
7505 Applying: The address limit is already set in flush_old_exec() so this
7506 Applying: Add new check (assert_init) to make sure objects are initialized and
7507 Applying: del_timer_sync() calls debug_object_assert_init() to assert that a timer
7508 Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
7509 Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
7510 Applying: The address limit is already set in flush_old_exec() so those calls to
7511 Applying: When do pci remove/rescan on system that have more iommus, got
7512 Applying: The current implementation of dmi_name_in_vendors() is an invitation to
7513 Applying: For headers that get exported to userland and make use of u32 style
7514 Applying: Fix sparse warnings of right shift bigger than source value size:
7515 Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
7516 Applying: Some mangling of errors was necessary to maintain current interface.
7517 Applying: This does involve additional use of the spin lock in idr.c.  Is this an
7518 Applying: Instead of open coding this function use kstrtoul_from_user() directly.
7519 Applying: brd_make_request() always returns 0, which doesn't make much sense.
7520 Applying: The address limit is already set in flush_old_exec() so this assignment of
7521 Applying: The basic idea behind cross memory attach is to allow MPI programs doing
7522 Applying: - Add x86_64 specific wire up
7523 Applying: acct_isolated of compaction uses page_lru_base_type which returns only
7524 Applying: Change ISOLATE_XXX macro with bitwise isolate_mode_t type.  Normally,
7525 Applying: In async mode, compaction doesn't migrate dirty or writeback pages.  So,
7526 Applying: In __zone_reclaim case, we don't want to shrink mapped page.  Nonetheless,
7527 Applying: unmap_and_move() is one a big messy function.  Clean it up.
7528 Applying: radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was
7529 Applying: per-task block plug can reduce block queue lock contention and increase
7530 Applying: The tracing ring-buffer used this function briefly, but not anymore.
7531 Applying: After selecting a task to kill, the oom killer iterates all processes and
7532 Applying: Remove PageSwapBacked (!page_is_file_cache) cases from
7533 Applying: Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
7534 Applying: The current implementation of the /dev/hpet driver couples opening the
7535 Applying: smp_call_function() only lets all other CPUs execute a specific function,
7536 Applying: auto_demotion_disable is called only for online CPUs.  For hotplugged
7537 Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:
7538 Applying: Strict user copy checks are only really supported on x86_32 even though
7539 Applying: The help text for this config is duplicated across the x86, parisc, and
7540 Applying: s/lib-/obj-/ for usercopy.o
7541 Applying: After an "unexpected" reboot, I found this Oops in my logs:
7542 Applying: In the move of the lis3 driver, the hp_accel.c file got dropped from the
7543 Applying: Add axis correction for HP EliteBook 2730p.
7544 Applying: Add axis correction for HP EliteBook 8540w.
7545 Applying: Add axis correction for HP ProBook 6555b.
7546 Applying: Adapt the help text for CONFIG_HP_ACCEL to the move of
7547 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
7548 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
7549 Applying: Change exported functions to use the device given as parameter
7550 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
7551 Applying: Add V2 of the LED driver for a single timer channel for the TPU hardware
7552 Applying: Add support for slice by 8 to existing crc32 algorithm.  Also modify
7553 Applying: don't include asm/msr.h
7554 Applying: This is the one use of an ida that doesn't retry on receiving -EAGAIN.
7555 Applying: One can get this information from minix/inode.c, but adding the
7556 Applying: Signed-off-by: Igor Mammedov <imammedo@redhat.com>
7557 Applying: Force this on for -next/mm testing purposes.
7558 Applying: Add a proc_dointvec_bool() sysctl handler for cases where the input value
7559 Applying: Use the new proc_do_intvec_bool() handler for various boolean inputs.
7560 Applying: Add a proc_dointvec_unsigned() sysctl handler for positive value cases.
7561 Applying: Cc: Alexey Dobriyan <adobriyan@gmail.com>
7562 Applying: Use the new proc_do_intvec_unsigned() handler for various unsigned inputs.
7563 Applying: A default echo function has been provided so it is no longer an error when
7564 Applying: This client driver allows you to use a GPIO pin as a source for PPS
7565 Applying: remove unneeded cast of void*
7566 Applying: Straightforward.  As an aside, the ida_init calls are not needed as far as
7567 $ cd ../next
7568 $ git fetch -f ../rebase-tmp akpm:akpm
7569 From ../rebase-tmp
7570  + 68f1d29...1e25afc akpm       -> akpm  (forced update)
7571 $ rm -rf ../rebase-tmp
7572 Merging akpm
7573 $ git merge --no-ff akpm
7574 Removing arch/sparc/lib/usercopy.c
7575 Removing drivers/leds/leds-alix2.c
7576 Merge made by recursive.
7577  Documentation/DocBook/debugobjects.tmpl            |   50 ++
7578  .../trace/postprocess/trace-vmscan-postprocess.pl  |    8 +-
7579  MAINTAINERS                                        |    1 +
7580  arch/arm/include/asm/processor.h                   |    1 -
7581  arch/arm/mach-ux500/mbox-db5500.c                  |    2 +-
7582  arch/ia64/include/asm/processor.h                  |    1 -
7583  arch/parisc/Kconfig                                |    1 +
7584  arch/parisc/Kconfig.debug                          |   14 -
7585  arch/parisc/include/asm/processor.h                |    2 -
7586  arch/parisc/kernel/process.c                       |    1 -
7587  arch/powerpc/include/asm/systbl.h                  |    2 +
7588  arch/powerpc/include/asm/unistd.h                  |    4 +-
7589  arch/s390/Kconfig                                  |    1 +
7590  arch/s390/Kconfig.debug                            |   14 -
7591  arch/s390/lib/Makefile                             |    1 -
7592  arch/sparc/kernel/process_32.c                     |    3 +-
7593  arch/sparc/kernel/process_64.c                     |    3 -
7594  arch/sparc/lib/Makefile                            |    1 -
7595  arch/sparc/lib/usercopy.c                          |    8 -
7596  arch/tile/Kconfig                                  |    8 +-
7597  arch/tile/include/asm/uaccess.h                    |    7 +-
7598  arch/tile/lib/uaccess.c                            |    8 -
7599  arch/unicore32/include/asm/processor.h             |    1 -
7600  arch/x86/Kconfig                                   |   15 +
7601  arch/x86/Kconfig.debug                             |   14 -
7602  arch/x86/ia32/ia32entry.S                          |    2 +
7603  arch/x86/include/asm/irq_vectors.h                 |   50 ++
7604  arch/x86/include/asm/uaccess_64.h                  |   12 +-
7605  arch/x86/include/asm/unistd_32.h                   |    4 +-
7606  arch/x86/include/asm/unistd_64.h                   |    4 +
7607  arch/x86/kernel/apic/apic.c                        |    7 +
7608  arch/x86/kernel/cpu/mcheck/therm_throt.c           |    3 +
7609  arch/x86/kernel/cpu/mcheck/threshold.c             |    3 +
7610  arch/x86/kernel/e820.c                             |   59 +--
7611  arch/x86/kernel/irq.c                              |    6 +-
7612  arch/x86/kernel/irq_work.c                         |    3 +
7613  arch/x86/kernel/smp.c                              |    7 +
7614  arch/x86/kernel/syscall_table_32.S                 |    2 +
7615  arch/x86/kernel/time.c                             |   15 +-
7616  arch/x86/kernel/traps.c                            |    3 +
7617  arch/x86/lib/usercopy_32.c                         |    6 -
7618  arch/x86/mm/mmap.c                                 |    4 +-
7619  arch/x86/mm/tlb.c                                  |    3 +
7620  arch/x86/platform/Makefile                         |    1 +
7621  arch/x86/platform/geode/Makefile                   |    1 +
7622  arch/x86/platform/geode/alix.c                     |  142 ++++++
7623  arch/x86/platform/iris/iris.c                      |   67 +++-
7624  drivers/block/brd.c                                |    2 +-
7625  drivers/block/floppy.c                             |    8 +-
7626  drivers/char/hpet.c                                |   56 ++-
7627  drivers/firmware/dmi_scan.c                        |    6 +-
7628  drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c      |   34 +-
7629  drivers/hwmon/hwmon.c                              |   32 +-
7630  drivers/hwmon/ibmaem.c                             |   47 +--
7631  drivers/idle/intel_idle.c                          |   59 ++-
7632  drivers/iommu/dmar.c                               |    7 +-
7633  drivers/iommu/intel-iommu.c                        |  177 +++++++-
7634  drivers/leds/Kconfig                               |   20 +-
7635  drivers/leds/Makefile                              |    2 +-
7636  drivers/leds/leds-alix2.c                          |  239 ----------
7637  drivers/leds/leds-renesas-tpu.c                    |  343 ++++++++++++++
7638  drivers/misc/lis3lv02d/lis3lv02d.c                 |  389 +++++++++-------
7639  drivers/misc/lis3lv02d/lis3lv02d.h                 |    9 +-
7640  drivers/misc/lis3lv02d/lis3lv02d_i2c.c             |   11 +-
7641  drivers/misc/lis3lv02d/lis3lv02d_spi.c             |    2 +-
7642  drivers/platform/x86/Kconfig                       |    2 +-
7643  drivers/platform/x86/acerhdf.c                     |    1 +
7644  drivers/platform/x86/hp_accel.c                    |   10 +-
7645  drivers/pps/clients/Kconfig                        |    9 +
7646  drivers/pps/clients/Makefile                       |    1 +
7647  drivers/pps/clients/pps-gpio.c                     |  227 +++++++++
7648  drivers/pps/clients/pps-ktimer.c                   |   12 -
7649  drivers/pps/clients/pps_parport.c                  |    9 -
7650  drivers/pps/kapi.c                                 |   20 +-
7651  drivers/rtc/class.c                                |   32 +-
7652  drivers/scsi/aacraid/commctrl.c                    |    1 +
7653  drivers/scsi/megaraid.c                            |    8 +-
7654  drivers/scsi/osd/osd_uld.c                         |   22 +-
7655  drivers/scsi/sd.c                                  |   32 +-
7656  drivers/scsi/sg.c                                  |   25 +-
7657  drivers/video/fbmem.c                              |   24 +-
7658  drivers/w1/slaves/w1_ds2760.c                      |   48 +--
7659  drivers/w1/slaves/w1_ds2780.c                      |   48 +--
7660  fs/aio.c                                           |    4 +-
7661  fs/btrfs/inode.c                                   |    3 +-
7662  fs/compat.c                                        |    7 +-
7663  fs/ext4/ext4.h                                     |    7 +-
7664  fs/ext4/ialloc.c                                   |    4 +-
7665  fs/ocfs2/ocfs2.h                                   |   47 ++
7666  fs/ocfs2/quota_local.c                             |   10 +-
7667  fs/read_write.c                                    |    8 +-
7668  include/linux/compat.h                             |    3 +-
7669  include/linux/debugobjects.h                       |    6 +
7670  include/linux/dmar.h                               |    5 +
7671  include/linux/fs.h                                 |    7 +-
7672  include/linux/hpet.h                               |    1 +
7673  include/linux/jiffies.h                            |    2 +-
7674  include/linux/leds-renesas-tpu.h                   |   14 +
7675  include/linux/magic.h                              |   10 +-
7676  include/linux/memcontrol.h                         |    3 +-
7677  include/linux/mmzone.h                             |   12 +
7678  include/linux/pps-gpio.h                           |   32 ++
7679  include/linux/swap.h                               |    7 +-
7680  include/linux/syscalls.h                           |   13 +
7681  include/linux/sysctl.h                             |    4 +
7682  include/linux/writeback.h                          |    2 -
7683  include/scsi/scsi_netlink.h                        |    2 +-
7684  include/trace/events/irq_vectors.h                 |   56 +++
7685  include/trace/events/vmscan.h                      |    8 +-
7686  init/do_mounts.c                                   |   46 ++-
7687  ipc/msgutil.c                                      |    6 +
7688  ipc/shm.c                                          |   13 +-
7689  ipc/util.c                                         |   30 +-
7690  ipc/util.h                                         |    1 +
7691  kernel/audit.c                                     |    5 +-
7692  kernel/kprobes.c                                   |    2 +-
7693  kernel/sys_ni.c                                    |    4 +
7694  kernel/sysctl.c                                    |  103 +++--
7695  kernel/time.c                                      |    2 +-
7696  kernel/timer.c                                     |   54 ++-
7697  lib/Kconfig.debug                                  |   18 +
7698  lib/Makefile                                       |    1 +
7699  lib/crc32.c                                        |  370 +++++++++++-----
7700  lib/crc32defs.h                                    |   16 +-
7701  lib/debugobjects.c                                 |   33 ++
7702  lib/gen_crc32table.c                               |   59 ++-
7703  lib/radix-tree.c                                   |   10 +-
7704  {arch/s390/lib => lib}/usercopy.c                  |    0
7705  mm/Makefile                                        |    3 +-
7706  mm/compaction.c                                    |   24 +-
7707  mm/memcontrol.c                                    |    5 +-
7708  mm/mempolicy.c                                     |    4 +-
7709  mm/migrate.c                                       |   75 ++--
7710  mm/mincore.c                                       |    6 +
7711  mm/oom_kill.c                                      |    5 +-
7712  mm/page-writeback.c                                |  122 +++---
7713  mm/process_vm_access.c                             |  487 ++++++++++++++++++++
7714  mm/vmscan.c                                        |   63 ++-
7715  security/keys/compat.c                             |    2 +-
7716  security/keys/keyctl.c                             |    2 +-
7717  security/selinux/selinuxfs.c                       |   14 +-
7718  141 files changed, 3100 insertions(+), 1311 deletions(-)
7719  delete mode 100644 arch/sparc/lib/usercopy.c
7720  create mode 100644 arch/x86/platform/geode/Makefile
7721  create mode 100644 arch/x86/platform/geode/alix.c
7722  delete mode 100644 drivers/leds/leds-alix2.c
7723  create mode 100644 drivers/leds/leds-renesas-tpu.c
7724  create mode 100644 drivers/pps/clients/pps-gpio.c
7725  create mode 100644 include/linux/leds-renesas-tpu.h
7726  create mode 100644 include/linux/pps-gpio.h
7727  create mode 100644 include/trace/events/irq_vectors.h
7728  rename {arch/s390/lib => lib}/usercopy.c (100%)
7729  create mode 100644 mm/process_vm_access.c
7730 $ git am -3 ../patches/0001-do_mounts-remove-__init_data-from-root_wait.patch
7731 Applying: do_mounts: remove __init_data from root_wait
7732 $ git reset HEAD^
7733 Unstaged changes after reset:
7734 M       init/do_mounts.c
7735 $ git add .
7736 $ git commit -v -a --amend
7737 [master aea357f] Merge branch 'akpm'