Next/merge.log

   1 $ date
   2 Wed Aug 24 11:37:00 EST 2011
   3 $ git checkout master
   4 Already on 'master'
   5 $ git reset --hard stable
   6 HEAD is now at fcb8ce5 Linux 3.1-rc3
   7 Merging origin/master
   8 $ git merge origin/master
   9 Updating fcb8ce5..ba8f318
  10 Fast-forward
  11  arch/m68k/include/asm/page_mm.h            |    2 +-
  12  drivers/gpu/drm/radeon/radeon_connectors.c |   10 +++
  13  drivers/gpu/drm/radeon/radeon_device.c     |    2 +
  14  drivers/gpu/drm/radeon/radeon_test.c       |   34 ++++++--
  15  drivers/gpu/drm/radeon/radeon_ttm.c        |   23 ++++++
  16  drivers/gpu/drm/ttm/ttm_bo.c               |   14 ++-
  17  drivers/gpu/drm/ttm/ttm_bo_util.c          |    2 +-
  18  drivers/power/max8997_charger.c            |    1 +
  19  drivers/power/max8998_charger.c            |    1 +
  20  drivers/power/s3c_adc_battery.c            |    1 +
  21  fs/xfs/Makefile                            |  119 ++++++++++++++--------------
  22  fs/xfs/{linux-2.6 => }/kmem.c              |    0
  23  fs/xfs/{linux-2.6 => }/kmem.h              |    0
  24  fs/xfs/{linux-2.6 => }/mrlock.h            |    0
  25  fs/xfs/{linux-2.6 => }/time.h              |    0
  26  fs/xfs/{support => }/uuid.c                |    0
  27  fs/xfs/{support => }/uuid.h                |    0
  28  fs/xfs/xfs.h                               |    3 +-
  29  fs/xfs/{linux-2.6 => }/xfs_acl.c           |    0
  30  fs/xfs/{linux-2.6 => }/xfs_aops.c          |    0
  31  fs/xfs/{linux-2.6 => }/xfs_aops.h          |    0
  32  fs/xfs/{linux-2.6 => }/xfs_buf.c           |    0
  33  fs/xfs/{linux-2.6 => }/xfs_buf.h           |    0
  34  fs/xfs/{linux-2.6 => }/xfs_discard.c       |    0
  35  fs/xfs/{linux-2.6 => }/xfs_discard.h       |    0
  36  fs/xfs/{quota => }/xfs_dquot.c             |    0
  37  fs/xfs/{quota => }/xfs_dquot.h             |    0
  38  fs/xfs/{quota => }/xfs_dquot_item.c        |    0
  39  fs/xfs/{quota => }/xfs_dquot_item.h        |    0
  40  fs/xfs/{linux-2.6 => }/xfs_export.c        |    0
  41  fs/xfs/{linux-2.6 => }/xfs_export.h        |    0
  42  fs/xfs/{linux-2.6 => }/xfs_file.c          |    0
  43  fs/xfs/{linux-2.6 => }/xfs_fs_subr.c       |    0
  44  fs/xfs/{linux-2.6 => }/xfs_globals.c       |    0
  45  fs/xfs/{linux-2.6 => }/xfs_ioctl.c         |    0
  46  fs/xfs/{linux-2.6 => }/xfs_ioctl.h         |    0
  47  fs/xfs/{linux-2.6 => }/xfs_ioctl32.c       |    0
  48  fs/xfs/{linux-2.6 => }/xfs_ioctl32.h       |    0
  49  fs/xfs/{linux-2.6 => }/xfs_iops.c          |    0
  50  fs/xfs/{linux-2.6 => }/xfs_iops.h          |    0
  51  fs/xfs/{linux-2.6 => }/xfs_linux.h         |   27 +++---
  52  fs/xfs/{linux-2.6 => }/xfs_message.c       |    0
  53  fs/xfs/{linux-2.6 => }/xfs_message.h       |    0
  54  fs/xfs/{quota => }/xfs_qm.c                |    0
  55  fs/xfs/{quota => }/xfs_qm.h                |    0
  56  fs/xfs/{quota => }/xfs_qm_bhv.c            |    0
  57  fs/xfs/{quota => }/xfs_qm_stats.c          |    0
  58  fs/xfs/{quota => }/xfs_qm_stats.h          |    0
  59  fs/xfs/{quota => }/xfs_qm_syscalls.c       |    0
  60  fs/xfs/{quota => }/xfs_quota_priv.h        |    0
  61  fs/xfs/{linux-2.6 => }/xfs_quotaops.c      |    2 +-
  62  fs/xfs/{linux-2.6 => }/xfs_stats.c         |    0
  63  fs/xfs/{linux-2.6 => }/xfs_stats.h         |    0
  64  fs/xfs/{linux-2.6 => }/xfs_super.c         |    0
  65  fs/xfs/{linux-2.6 => }/xfs_super.h         |    0
  66  fs/xfs/{linux-2.6 => }/xfs_sync.c          |    0
  67  fs/xfs/{linux-2.6 => }/xfs_sync.h          |    0
  68  fs/xfs/{linux-2.6 => }/xfs_sysctl.c        |    0
  69  fs/xfs/{linux-2.6 => }/xfs_sysctl.h        |    0
  70  fs/xfs/{linux-2.6 => }/xfs_trace.c         |    4 +-
  71  fs/xfs/{linux-2.6 => }/xfs_trace.h         |    0
  72  fs/xfs/{quota => }/xfs_trans_dquot.c       |    0
  73  fs/xfs/{linux-2.6 => }/xfs_vnode.h         |    0
  74  fs/xfs/{linux-2.6 => }/xfs_xattr.c         |    0
  75  kernel/irq/manage.c                        |    1 -
  76  kernel/sysctl_binary.c                     |    2 +-
  77  kernel/sysctl_check.c                      |    2 +-
  78  67 files changed, 152 insertions(+), 98 deletions(-)
  79  rename fs/xfs/{linux-2.6 => }/kmem.c (100%)
  80  rename fs/xfs/{linux-2.6 => }/kmem.h (100%)
  81  rename fs/xfs/{linux-2.6 => }/mrlock.h (100%)
  82  rename fs/xfs/{linux-2.6 => }/time.h (100%)
  83  rename fs/xfs/{support => }/uuid.c (100%)
  84  rename fs/xfs/{support => }/uuid.h (100%)
  85  rename fs/xfs/{linux-2.6 => }/xfs_acl.c (100%)
  86  rename fs/xfs/{linux-2.6 => }/xfs_aops.c (100%)
  87  rename fs/xfs/{linux-2.6 => }/xfs_aops.h (100%)
  88  rename fs/xfs/{linux-2.6 => }/xfs_buf.c (100%)
  89  rename fs/xfs/{linux-2.6 => }/xfs_buf.h (100%)
  90  rename fs/xfs/{linux-2.6 => }/xfs_discard.c (100%)
  91  rename fs/xfs/{linux-2.6 => }/xfs_discard.h (100%)
  92  rename fs/xfs/{quota => }/xfs_dquot.c (100%)
  93  rename fs/xfs/{quota => }/xfs_dquot.h (100%)
  94  rename fs/xfs/{quota => }/xfs_dquot_item.c (100%)
  95  rename fs/xfs/{quota => }/xfs_dquot_item.h (100%)
  96  rename fs/xfs/{linux-2.6 => }/xfs_export.c (100%)
  97  rename fs/xfs/{linux-2.6 => }/xfs_export.h (100%)
  98  rename fs/xfs/{linux-2.6 => }/xfs_file.c (100%)
  99  rename fs/xfs/{linux-2.6 => }/xfs_fs_subr.c (100%)
 100  rename fs/xfs/{linux-2.6 => }/xfs_globals.c (100%)
 101  rename fs/xfs/{linux-2.6 => }/xfs_ioctl.c (100%)
 102  rename fs/xfs/{linux-2.6 => }/xfs_ioctl.h (100%)
 103  rename fs/xfs/{linux-2.6 => }/xfs_ioctl32.c (100%)
 104  rename fs/xfs/{linux-2.6 => }/xfs_ioctl32.h (100%)
 105  rename fs/xfs/{linux-2.6 => }/xfs_iops.c (100%)
 106  rename fs/xfs/{linux-2.6 => }/xfs_iops.h (100%)
 107  rename fs/xfs/{linux-2.6 => }/xfs_linux.h (96%)
 108  rename fs/xfs/{linux-2.6 => }/xfs_message.c (100%)
 109  rename fs/xfs/{linux-2.6 => }/xfs_message.h (100%)
 110  rename fs/xfs/{quota => }/xfs_qm.c (100%)
 111  rename fs/xfs/{quota => }/xfs_qm.h (100%)
 112  rename fs/xfs/{quota => }/xfs_qm_bhv.c (100%)
 113  rename fs/xfs/{quota => }/xfs_qm_stats.c (100%)
 114  rename fs/xfs/{quota => }/xfs_qm_stats.h (100%)
 115  rename fs/xfs/{quota => }/xfs_qm_syscalls.c (100%)
 116  rename fs/xfs/{quota => }/xfs_quota_priv.h (100%)
 117  rename fs/xfs/{linux-2.6 => }/xfs_quotaops.c (99%)
 118  rename fs/xfs/{linux-2.6 => }/xfs_stats.c (100%)
 119  rename fs/xfs/{linux-2.6 => }/xfs_stats.h (100%)
 120  rename fs/xfs/{linux-2.6 => }/xfs_super.c (100%)
 121  rename fs/xfs/{linux-2.6 => }/xfs_super.h (100%)
 122  rename fs/xfs/{linux-2.6 => }/xfs_sync.c (100%)
 123  rename fs/xfs/{linux-2.6 => }/xfs_sync.h (100%)
 124  rename fs/xfs/{linux-2.6 => }/xfs_sysctl.c (100%)
 125  rename fs/xfs/{linux-2.6 => }/xfs_sysctl.h (100%)
 126  rename fs/xfs/{linux-2.6 => }/xfs_trace.c (96%)
 127  rename fs/xfs/{linux-2.6 => }/xfs_trace.h (100%)
 128  rename fs/xfs/{quota => }/xfs_trans_dquot.c (100%)
 129  rename fs/xfs/{linux-2.6 => }/xfs_vnode.h (100%)
 130  rename fs/xfs/{linux-2.6 => }/xfs_xattr.c (100%)
 131 Merging fixes/fixes
 132 $ git merge fixes/fixes
 133 Already up-to-date.
 134 Merging kbuild-current/rc-fixes
 135 $ git merge kbuild-current/rc-fixes
 136 Already up-to-date.
 137 Merging arm-current/master
 138 $ git merge arm-current/master
 139 Already up-to-date.
 140 Merging m68k-current/for-linus
 141 $ git merge m68k-current/for-linus
 142 Already up-to-date.
 143 Merging powerpc-merge/merge
 144 $ git merge powerpc-merge/merge
 145 Already up-to-date.
 146 Merging 52xx-and-virtex-current/powerpc/merge
 147 $ git merge 52xx-and-virtex-current/powerpc/merge
 148 Already up-to-date.
 149 Merging sparc-current/master
 150 $ git merge sparc-current/master
 151 Merge made by recursive.
 152  arch/sparc/include/asm/sigcontext.h |   14 +++
 153  arch/sparc/kernel/Makefile          |    1 +
 154  arch/sparc/kernel/signal32.c        |  184 ++++++++++++++++++++---------------
 155  arch/sparc/kernel/signal_32.c       |  172 +++++++++++++++------------------
 156  arch/sparc/kernel/signal_64.c       |  108 +++++++++------------
 157  arch/sparc/kernel/sigutil.h         |    9 ++
 158  arch/sparc/kernel/sigutil_32.c      |  120 +++++++++++++++++++++++
 159  arch/sparc/kernel/sigutil_64.c      |   93 ++++++++++++++++++
 160  8 files changed, 468 insertions(+), 233 deletions(-)
 161  create mode 100644 arch/sparc/kernel/sigutil.h
 162  create mode 100644 arch/sparc/kernel/sigutil_32.c
 163  create mode 100644 arch/sparc/kernel/sigutil_64.c
 164 Merging scsi-rc-fixes/master
 165 $ git merge scsi-rc-fixes/master
 166 Already up-to-date.
 167 Merging net-current/master
 168 $ git merge net-current/master
 169 Merge made by recursive.
 170  Documentation/networking/00-INDEX       |  116 +++++++++++++++++++++++++++++++
 171  Documentation/networking/ip-sysctl.txt  |    2 +-
 172  Documentation/networking/scaling.txt    |   23 ++++--
 173  drivers/net/bonding/bond_main.c         |   18 +++++
 174  drivers/net/can/sja1000/plx_pci.c       |    4 +-
 175  drivers/net/e1000e/e1000.h              |    4 +
 176  drivers/net/e1000e/ich8lan.c            |   65 ++++++++++++++----
 177  drivers/net/e1000e/netdev.c             |   80 ++++++++++++++++++++-
 178  drivers/net/forcedeth.c                 |    3 +-
 179  drivers/net/gianfar.c                   |    9 ++-
 180  drivers/net/gianfar_ethtool.c           |   26 ++++++--
 181  drivers/net/ixgbe/ixgbe_main.c          |    4 +-
 182  drivers/net/sh_eth.c                    |    1 +
 183  drivers/net/usb/cdc_ncm.c               |   47 ++++++++++---
 184  drivers/net/via-velocity.c              |    4 -
 185  drivers/net/vmxnet3/vmxnet3_drv.c       |   34 +++++----
 186  drivers/net/wireless/iwlwifi/iwl-pci.c  |   25 +++----
 187  drivers/net/wireless/rt2x00/rt2800usb.c |   20 ++++--
 188  drivers/net/wireless/rt2x00/rt2x00usb.c |   17 ++---
 189  drivers/net/wireless/wl12xx/acx.c       |    6 +--
 190  drivers/net/wireless/wl12xx/testmode.c  |    5 +-
 191  net/8021q/vlan_core.c                   |    2 +
 192  net/atm/br2684.c                        |    7 +-
 193  net/ipv6/ipv6_sockglue.c                |    9 ++-
 194  net/ipv6/sit.c                          |    3 +
 195  net/sched/act_mirred.c                  |    3 +-
 196  26 files changed, 428 insertions(+), 109 deletions(-)
 197 Merging sound-current/for-linus
 198 $ git merge sound-current/for-linus
 199 Already up-to-date.
 200 Merging pci-current/for-linus
 201 $ git merge pci-current/for-linus
 202 Already up-to-date.
 203 Merging wireless-current/master
 204 $ git merge wireless-current/master
 205 Merge made by recursive.
 206  drivers/bcma/main.c                            |   12 ++++++
 207  drivers/bluetooth/ath3k.c                      |    1 +
 208  drivers/bluetooth/btusb.c                      |   13 +++++--
 209  drivers/net/wireless/ath/ath9k/ar9003_eeprom.c |    2 +-
 210  drivers/net/wireless/rt2x00/rt2x00usb.c        |   14 +-------
 211  drivers/net/wireless/wl12xx/main.c             |    1 +
 212  drivers/net/wireless/wl12xx/sdio.c             |    2 +-
 213  drivers/net/wireless/wl12xx/testmode.c         |   45 ------------------------
 214  include/net/cfg80211.h                         |    3 ++
 215  net/bluetooth/af_bluetooth.c                   |    6 ++--
 216  net/bluetooth/bnep/bnep.h                      |    1 +
 217  net/bluetooth/bnep/core.c                      |   13 ++++---
 218  net/bluetooth/cmtp/capi.c                      |    3 +-
 219  net/bluetooth/cmtp/cmtp.h                      |    1 +
 220  net/bluetooth/cmtp/core.c                      |   20 ++++++----
 221  net/bluetooth/hci_core.c                       |    8 +++--
 222  net/bluetooth/hidp/core.c                      |   19 +++++-----
 223  net/bluetooth/l2cap_core.c                     |    6 ++--
 224  net/bluetooth/l2cap_sock.c                     |   30 ++++++++--------
 225  net/bluetooth/rfcomm/core.c                    |   17 ++++-----
 226  net/bluetooth/rfcomm/sock.c                    |   28 +++++++-------
 227  net/bluetooth/sco.c                            |   28 +++++++-------
 228  net/mac80211/main.c                            |    2 +-
 229  net/wireless/core.c                            |    7 ++++
 230  net/wireless/sysfs.c                           |    6 ++-
 231  25 files changed, 136 insertions(+), 152 deletions(-)
 232 Merging driver-core.current/driver-core-linus
 233 $ git merge driver-core.current/driver-core-linus
 234 Merge made by recursive.
 235  drivers/base/devres.c          |    1 +
 236  drivers/base/devtmpfs.c        |    2 +-
 237  drivers/base/platform.c        |    2 +-
 238  drivers/firmware/google/gsmi.c |    2 +-
 239  drivers/misc/Kconfig           |    1 +
 240  drivers/misc/ti-st/st_core.c   |   10 +++++++++-
 241  drivers/misc/ti-st/st_kim.c    |   33 +++++++++++++++++++++++++++++++++
 242  drivers/misc/ti-st/st_ll.c     |   19 +++++++++++++++++++
 243  include/linux/ti_wilink_st.h   |   27 ++++++++++++++++++++++++++-
 244  9 files changed, 92 insertions(+), 5 deletions(-)
 245 Merging tty.current/tty-linus
 246 $ git merge tty.current/tty-linus
 247 Merge made by recursive.
 248  drivers/tty/pty.c                 |   17 +++++++++++++++--
 249  drivers/tty/serial/8250.c         |    8 +++++---
 250  drivers/tty/serial/8250_pci.c     |   11 +++++------
 251  drivers/tty/serial/8250_pnp.c     |    3 +++
 252  drivers/tty/serial/atmel_serial.c |    8 +++++---
 253  drivers/tty/serial/max3107-aava.c |    2 +-
 254  drivers/tty/serial/max3107.c      |    2 +-
 255  drivers/tty/serial/mrst_max3110.c |    2 +-
 256  drivers/tty/serial/omap-serial.c  |    3 +--
 257  drivers/tty/serial/pch_uart.c     |    3 ++-
 258  drivers/tty/serial/samsung.c      |    8 ++++++--
 259  drivers/tty/serial/serial_core.c  |    5 +++++
 260  drivers/tty/serial/ucc_uart.c     |    2 +-
 261  drivers/tty/tty_io.c              |    3 +--
 262  include/linux/tty.h               |    2 ++
 263  include/linux/tty_driver.h        |    3 +++
 264  16 files changed, 57 insertions(+), 25 deletions(-)
 265 Merging usb.current/usb-linus
 266 $ git merge usb.current/usb-linus
 267 Merge made by recursive.
 268  drivers/usb/core/hcd.c           |    2 +
 269  drivers/usb/gadget/f_phonet.c    |    1 +
 270  drivers/usb/host/ehci-hub.c      |    7 +--
 271  drivers/usb/host/ehci-s5p.c      |    1 +
 272  drivers/usb/host/xhci-hub.c      |   17 +++++--
 273  drivers/usb/host/xhci-ring.c     |   90 +++++++++++++++++++++++----------
 274  drivers/usb/host/xhci.c          |   28 +++++++++--
 275  drivers/usb/musb/blackfin.c      |    1 +
 276  drivers/usb/musb/cppi_dma.c      |   26 ++++++---
 277  drivers/usb/musb/musb_core.h     |   12 +++--
 278  drivers/usb/musb/musb_gadget.c   |    4 +-
 279  drivers/usb/musb/musb_regs.h     |    6 ++-
 280  drivers/usb/musb/tusb6010.c      |    1 +
 281  drivers/usb/musb/tusb6010_omap.c |    1 +
 282  drivers/usb/musb/ux500_dma.c     |   38 ++++++++------
 283  drivers/usb/serial/option.c      |  104 ++++++++++++++++++++++++++++++++++++-
 284  16 files changed, 264 insertions(+), 75 deletions(-)
 285 Merging staging.current/staging-linus
 286 $ git merge staging.current/staging-linus
 287 Merge made by recursive.
 288  drivers/staging/brcm80211/brcmsmac/otp.c   |    1 +
 289  drivers/staging/brcm80211/brcmsmac/types.h |    1 +
 290  drivers/staging/octeon/ethernet-rgmii.c    |    1 +
 291  drivers/staging/octeon/ethernet-spi.c      |    1 +
 292  drivers/staging/zcache/tmem.c              |    2 +-
 293  drivers/staging/zcache/zcache-main.c       |    8 ++++----
 294  6 files changed, 9 insertions(+), 5 deletions(-)
 295 Merging cpufreq-current/fixes
 296 $ git merge cpufreq-current/fixes
 297 Already up-to-date.
 298 Merging input-current/for-linus
 299 $ git merge input-current/for-linus
 300 Auto-merging drivers/input/joystick/analog.c
 301 Merge made by recursive.
 302  drivers/input/joystick/analog.c          |    2 +-
 303  drivers/input/keyboard/ep93xx_keypad.c   |    1 +
 304  drivers/input/keyboard/tegra-kbc.c       |    2 +-
 305  drivers/input/misc/ad714x-i2c.c          |   81 ++++++++++-----------
 306  drivers/input/misc/ad714x-spi.c          |   68 ++++++++++++++----
 307  drivers/input/misc/ad714x.c              |  116 +++++++++++------------------
 308  drivers/input/misc/ad714x.h              |   35 ++++++++-
 309  drivers/input/misc/mma8450.c             |    2 +-
 310  drivers/input/misc/mpu3050.c             |    2 +-
 311  drivers/input/mouse/bcm5974.c            |   40 ++++++++++
 312  drivers/input/tablet/wacom_sys.c         |   17 +++--
 313  drivers/input/tablet/wacom_wac.c         |    4 +
 314  drivers/input/touchscreen/atmel_mxt_ts.c |   12 +++
 315  drivers/input/touchscreen/max11801_ts.c  |    3 +-
 316  drivers/input/touchscreen/tnetv107x-ts.c |    1 +
 317  15 files changed, 241 insertions(+), 145 deletions(-)
 318 Merging md-current/for-linus
 319 $ git merge md-current/for-linus
 320 Already up-to-date.
 321 Merging audit-current/for-linus
 322 $ git merge audit-current/for-linus
 323 Already up-to-date.
 324 Merging crypto-current/master
 325 $ git merge crypto-current/master
 326 Already up-to-date.
 327 Merging ide-curent/master
 328 $ git merge ide-curent/master
 329 Already up-to-date.
 330 Merging dwmw2/master
 331 $ git merge dwmw2/master
 332 Already up-to-date.
 333 Merging sh-current/sh-fixes-for-linus
 334 $ git merge sh-current/sh-fixes-for-linus
 335 Merge made by recursive.
 336  arch/sh/include/asm/ptrace.h |    2 +-
 337  arch/sh/kernel/idle.c        |    2 +-
 338  drivers/clocksource/sh_cmt.c |   34 +++++++++++++++++++-
 339  drivers/sh/intc/chip.c       |    3 ++
 340  drivers/tty/serial/sh-sci.c  |   69 +++++++++++++++++++++++++++++++++++------
 341  5 files changed, 96 insertions(+), 14 deletions(-)
 342 Merging rmobile-current/rmobile-fixes-for-linus
 343 $ git merge rmobile-current/rmobile-fixes-for-linus
 344 Merge made by recursive.
 345  arch/arm/boot/compressed/mmcif-sh7372.c |    2 +-
 346  arch/arm/boot/compressed/sdhi-sh7372.c  |    2 +-
 347  arch/arm/mach-shmobile/board-ag5evm.c   |    3 ++-
 348  arch/arm/mach-shmobile/board-mackerel.c |    4 ++++
 349  arch/arm/mach-shmobile/clock-sh7372.c   |    8 ++++----
 350  arch/arm/mach-shmobile/setup-sh7372.c   |   30 +++++++++++++++---------------
 351  6 files changed, 27 insertions(+), 22 deletions(-)
 352 Merging fbdev-current/fbdev-fixes-for-linus
 353 $ git merge fbdev-current/fbdev-fixes-for-linus
 354 Auto-merging drivers/video/msm/mdp.c
 355 Auto-merging drivers/video/udlfb.c
 356 Merge made by recursive.
 357  drivers/video/carminefb.c |    6 +++---
 358  drivers/video/msm/mdp.c   |    4 +++-
 359  drivers/video/s3c2410fb.c |    1 -
 360  drivers/video/udlfb.c     |   21 +++++++++++++++------
 361  4 files changed, 21 insertions(+), 11 deletions(-)
 362 Merging devicetree-current/devicetree/merge
 363 $ git merge devicetree-current/devicetree/merge
 364 Already up-to-date.
 365 Merging spi-current/spi/merge
 366 $ git merge spi-current/spi/merge
 367 Already up-to-date.
 368 Merging arm/for-next
 369 $ git merge arm/for-next
 370 Removing arch/arm/include/asm/auxvec.h
 371 Removing arch/arm/include/asm/bitsperlong.h
 372 Removing arch/arm/include/asm/cputime.h
 373 Removing arch/arm/include/asm/emergency-restart.h
 374 Removing arch/arm/include/asm/errno.h
 375 Removing arch/arm/include/asm/ioctl.h
 376 Removing arch/arm/include/asm/irq_regs.h
 377 Removing arch/arm/include/asm/kdebug.h
 378 Removing arch/arm/include/asm/local.h
 379 Removing arch/arm/include/asm/local64.h
 380 Removing arch/arm/include/asm/percpu.h
 381 Removing arch/arm/include/asm/poll.h
 382 Removing arch/arm/include/asm/resource.h
 383 Removing arch/arm/include/asm/sections.h
 384 Removing arch/arm/include/asm/siginfo.h
 385 Removing arch/arm/include/asm/sizes.h
 386 Auto-merging arch/arm/mach-ixp2000/include/mach/gpio-ixp2000.h
 387 Auto-merging drivers/gpio/gpio-davinci.c
 388 Auto-merging drivers/gpio/gpio-ks8695.c
 389 Auto-merging drivers/gpio/gpio-lpc32xx.c
 390 Auto-merging drivers/gpio/gpio-sa1100.c
 391 Auto-merging drivers/tty/serial/atmel_serial.c
 392 Merge made by recursive.
 393  Documentation/devicetree/bindings/arm/l2cc.txt     |   42 +++
 394  arch/arm/Kconfig                                   |   55 +++-
 395  arch/arm/Makefile                                  |    3 +
 396  arch/arm/boot/Makefile                             |    9 +
 397  arch/arm/boot/compressed/Makefile                  |    8 +
 398  arch/arm/common/scoop.c                            |    2 +-
 399  arch/arm/include/asm/Kbuild                        |   17 +
 400  arch/arm/include/asm/auxvec.h                      |    4 -
 401  arch/arm/include/asm/bitsperlong.h                 |    1 -
 402  arch/arm/include/asm/cputime.h                     |    6 -
 403  arch/arm/include/asm/cputype.h                     |    6 +
 404  arch/arm/include/asm/ecard.h                       |    1 -
 405  arch/arm/include/asm/emergency-restart.h           |    6 -
 406  arch/arm/include/asm/errno.h                       |    6 -
 407  arch/arm/include/asm/gpio.h                        |   19 +
 408  arch/arm/include/asm/hardware/cache-l2x0.h         |   19 +-
 409  arch/arm/include/asm/hardware/iop3xx-gpio.h        |    2 +
 410  arch/arm/include/asm/io.h                          |   21 ++
 411  arch/arm/include/asm/ioctl.h                       |    1 -
 412  arch/arm/include/asm/irq_regs.h                    |    1 -
 413  arch/arm/include/asm/kdebug.h                      |    1 -
 414  arch/arm/include/asm/local.h                       |    1 -
 415  arch/arm/include/asm/local64.h                     |    1 -
 416  arch/arm/include/asm/memory.h                      |    7 -
 417  arch/arm/include/asm/module.h                      |    4 -
 418  arch/arm/include/asm/percpu.h                      |    6 -
 419  arch/arm/include/asm/pgalloc.h                     |    2 +-
 420  arch/arm/include/asm/pgtable.h                     |   23 +-
 421  arch/arm/include/asm/pmu.h                         |   10 +-
 422  arch/arm/include/asm/poll.h                        |    1 -
 423  arch/arm/include/asm/resource.h                    |    6 -
 424  arch/arm/include/asm/sections.h                    |    1 -
 425  arch/arm/include/asm/siginfo.h                     |    6 -
 426  arch/arm/include/asm/sizes.h                       |   21 --
 427  arch/arm/include/asm/system.h                      |    3 +-
 428  arch/arm/include/asm/tlb.h                         |    1 +
 429  arch/arm/include/asm/topology.h                    |   33 ++
 430  arch/arm/kernel/Makefile                           |    1 +
 431  arch/arm/kernel/ecard.c                            |   36 +--
 432  arch/arm/kernel/entry-armv.S                       |   44 ++-
 433  arch/arm/kernel/head.S                             |   61 +---
 434  arch/arm/kernel/pmu.c                              |   26 +-
 435  arch/arm/kernel/setup.c                            |   35 ++-
 436  arch/arm/kernel/smp.c                              |    5 +
 437  arch/arm/kernel/smp_twd.c                          |    4 +-
 438  arch/arm/kernel/topology.c                         |  148 ++++++++
 439  arch/arm/mach-at91/Makefile.boot                   |    6 +-
 440  arch/arm/mach-at91/at91cap9_devices.c              |    2 +-
 441  arch/arm/mach-at91/at91rm9200_devices.c            |    2 +-
 442  arch/arm/mach-at91/at91sam9260_devices.c           |    2 +-
 443  arch/arm/mach-at91/at91sam9261_devices.c           |    2 +-
 444  arch/arm/mach-at91/at91sam9263_devices.c           |    2 +-
 445  arch/arm/mach-at91/at91sam9g45_devices.c           |    2 +-
 446  arch/arm/mach-at91/at91sam9rl_devices.c            |    2 +-
 447  arch/arm/mach-at91/board-1arm.c                    |    2 +-
 448  arch/arm/mach-at91/board-afeb-9260v1.c             |    2 +-
 449  arch/arm/mach-at91/board-cam60.c                   |    2 +-
 450  arch/arm/mach-at91/board-cap9adk.c                 |    2 +-
 451  arch/arm/mach-at91/board-carmeva.c                 |    2 +-
 452  arch/arm/mach-at91/board-cpu9krea.c                |    2 +-
 453  arch/arm/mach-at91/board-cpuat91.c                 |    2 +-
 454  arch/arm/mach-at91/board-csb337.c                  |    2 +-
 455  arch/arm/mach-at91/board-csb637.c                  |    2 +-
 456  arch/arm/mach-at91/board-eb9200.c                  |    2 +-
 457  arch/arm/mach-at91/board-ecbat91.c                 |    2 +-
 458  arch/arm/mach-at91/board-kafa.c                    |    2 +-
 459  arch/arm/mach-at91/board-kb9202.c                  |    2 +-
 460  arch/arm/mach-at91/board-neocore926.c              |    2 +-
 461  arch/arm/mach-at91/board-picotux200.c              |    2 +-
 462  arch/arm/mach-at91/board-qil-a9260.c               |    2 +-
 463  arch/arm/mach-at91/board-rm9200dk.c                |    2 +-
 464  arch/arm/mach-at91/board-rm9200ek.c                |    2 +-
 465  arch/arm/mach-at91/board-sam9-l9260.c              |    2 +-
 466  arch/arm/mach-at91/board-sam9260ek.c               |    2 +-
 467  arch/arm/mach-at91/board-sam9261ek.c               |    2 +-
 468  arch/arm/mach-at91/board-sam9263ek.c               |    2 +-
 469  arch/arm/mach-at91/board-sam9g20ek.c               |    2 +-
 470  arch/arm/mach-at91/board-sam9m10g45ek.c            |    2 +-
 471  arch/arm/mach-at91/board-sam9rlek.c                |    2 +-
 472  arch/arm/mach-at91/board-usb-a9260.c               |    2 +-
 473  arch/arm/mach-at91/board-usb-a9263.c               |    2 +-
 474  arch/arm/mach-at91/board-yl-9200.c                 |    2 +-
 475  arch/arm/mach-at91/gpio.c                          |    4 +-
 476  arch/arm/mach-at91/include/mach/gpio.h             |    5 -
 477  arch/arm/mach-at91/leds.c                          |    2 +-
 478  arch/arm/mach-at91/pm.c                            |    2 +-
 479  arch/arm/mach-bcmring/Makefile.boot                |    2 +-
 480  arch/arm/mach-clps711x/Makefile.boot               |    2 +-
 481  arch/arm/mach-cns3xxx/Makefile.boot                |    2 +-
 482  arch/arm/mach-davinci/Makefile                     |    3 +-
 483  arch/arm/mach-davinci/Makefile.boot                |    4 +-
 484  arch/arm/mach-davinci/da830.c                      |    3 +-
 485  arch/arm/mach-davinci/da850.c                      |    3 +-
 486  arch/arm/mach-davinci/dm355.c                      |    2 +-
 487  arch/arm/mach-davinci/dm365.c                      |    3 +-
 488  arch/arm/mach-davinci/dm644x.c                     |    2 +-
 489  arch/arm/mach-davinci/dm646x.c                     |    2 +-
 490  arch/arm/mach-davinci/include/mach/gpio-davinci.h  |   91 +++++
 491  arch/arm/mach-davinci/include/mach/gpio.h          |   79 +----
 492  arch/arm/mach-davinci/tnetv107x.c                  |    3 +-
 493  arch/arm/mach-dove/Makefile.boot                   |    2 +-
 494  arch/arm/mach-ebsa110/Makefile.boot                |    2 +-
 495  arch/arm/mach-ebsa110/include/mach/io.h            |    2 -
 496  arch/arm/mach-ep93xx/Makefile.boot                 |   10 +-
 497  arch/arm/mach-ep93xx/include/mach/gpio.h           |   17 +-
 498  arch/arm/mach-ep93xx/include/mach/ts72xx.h         |   26 ++-
 499  arch/arm/mach-exynos4/Makefile.boot                |    2 +-
 500  arch/arm/mach-exynos4/include/mach/gpio.h          |    7 -
 501  arch/arm/mach-footbridge/Kconfig                   |    1 +
 502  arch/arm/mach-footbridge/Makefile.boot             |    2 +-
 503  arch/arm/mach-footbridge/include/mach/io.h         |    2 -
 504  arch/arm/mach-gemini/Makefile.boot                 |    4 +-
 505  arch/arm/mach-gemini/include/mach/gpio.h           |    5 -
 506  arch/arm/mach-h720x/Makefile.boot                  |    2 +-
 507  arch/arm/mach-imx/Makefile.boot                    |   10 +-
 508  arch/arm/mach-imx/iomux-imx31.c                    |    3 +-
 509  arch/arm/mach-imx/mach-mx27ads.c                   |    3 +-
 510  arch/arm/mach-integrator/Makefile.boot             |    2 +-
 511  arch/arm/mach-integrator/include/mach/io.h         |    2 -
 512  arch/arm/mach-iop13xx/Makefile.boot                |    2 +-
 513  arch/arm/mach-iop32x/Makefile.boot                 |    2 +-
 514  arch/arm/mach-iop33x/Makefile.boot                 |    2 +-
 515  arch/arm/mach-ixp2000/Makefile.boot                |    2 +-
 516  arch/arm/mach-ixp2000/core.c                       |    4 +-
 517  .../include/mach/{gpio.h => gpio-ixp2000.h}        |    4 +-
 518  arch/arm/mach-ixp2000/ixdp2x00.c                   |    4 +-
 519  arch/arm/mach-ixp23xx/Makefile.boot                |    2 +-
 520  arch/arm/mach-ixp4xx/Makefile.boot                 |    2 +-
 521  arch/arm/mach-ixp4xx/common-pci.c                  |    3 +-
 522  arch/arm/mach-ixp4xx/dsmg600-setup.c               |    3 +-
 523  arch/arm/mach-ixp4xx/fsg-setup.c                   |    3 +-
 524  arch/arm/mach-ixp4xx/include/mach/gpio.h           |    3 +
 525  arch/arm/mach-ixp4xx/include/mach/io.h             |    2 -
 526  arch/arm/mach-ixp4xx/nas100d-setup.c               |    3 +-
 527  arch/arm/mach-ixp4xx/nslu2-setup.c                 |    3 +-
 528  arch/arm/mach-kirkwood/Makefile.boot               |    2 +-
 529  arch/arm/mach-kirkwood/irq.c                       |    3 +-
 530  arch/arm/mach-kirkwood/mpp.c                       |    3 +-
 531  arch/arm/mach-ks8695/Makefile                      |    2 +-
 532  arch/arm/mach-ks8695/Makefile.boot                 |    2 +-
 533  arch/arm/mach-ks8695/board-acs5k.c                 |    4 +-
 534  arch/arm/mach-ks8695/board-dsm320.c                |    4 +-
 535  arch/arm/mach-ks8695/board-micrel.c                |    4 +-
 536  arch/arm/mach-ks8695/devices.c                     |    1 +
 537  arch/arm/mach-ks8695/include/mach/gpio-ks8695.h    |   39 ++
 538  arch/arm/mach-ks8695/include/mach/gpio.h           |   38 --
 539  arch/arm/mach-ks8695/leds.c                        |    4 +-
 540  arch/arm/mach-lpc32xx/Makefile                     |    2 +-
 541  arch/arm/mach-lpc32xx/Makefile.boot                |    2 +-
 542  arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h  |   50 +++
 543  arch/arm/mach-lpc32xx/include/mach/gpio.h          |   74 ----
 544  arch/arm/mach-lpc32xx/phy3250.c                    |    1 +
 545  arch/arm/mach-mmp/Makefile.boot                    |    2 +-
 546  arch/arm/mach-mmp/aspenite.c                       |    5 +-
 547  arch/arm/mach-mmp/mmp2.c                           |    3 +-
 548  arch/arm/mach-mmp/pxa168.c                         |    3 +-
 549  arch/arm/mach-mmp/pxa910.c                         |    3 +-
 550  arch/arm/mach-mmp/tavorevb.c                       |    3 +-
 551  arch/arm/mach-mmp/ttc_dkb.c                        |    2 +-
 552  arch/arm/mach-msm/Makefile.boot                    |    2 +-
 553  arch/arm/mach-msm/board-msm7x27.c                  |    3 +-
 554  arch/arm/mach-msm/board-msm7x30.c                  |   25 ++-
 555  arch/arm/mach-msm/board-msm8960.c                  |   22 ++
 556  arch/arm/mach-msm/board-msm8x60.c                  |   25 ++
 557  arch/arm/mach-msm/board-qsd8x50.c                  |    3 +-
 558  arch/arm/mach-msm/board-sapphire.c                 |    3 +-
 559  arch/arm/mach-msm/board-trout-mmc.c                |    3 +-
 560  arch/arm/mach-msm/board-trout-panel.c              |    3 +-
 561  arch/arm/mach-msm/include/mach/gpio.h              |   27 +--
 562  arch/arm/mach-msm/include/mach/memory.h            |    6 +-
 563  arch/arm/mach-mv78xx0/Makefile.boot                |    2 +-
 564  arch/arm/mach-mv78xx0/irq.c                        |    3 +-
 565  arch/arm/mach-mv78xx0/mpp.c                        |    3 +-
 566  arch/arm/mach-mx5/Makefile.boot                    |    6 +-
 567  arch/arm/mach-mxs/Makefile.boot                    |    2 +-
 568  arch/arm/mach-mxs/include/mach/gpio.h              |    8 -
 569  arch/arm/mach-netx/Makefile.boot                   |    2 +-
 570  arch/arm/mach-nomadik/Makefile.boot                |    2 +-
 571  arch/arm/mach-nomadik/board-nhk8815.c              |    1 +
 572  arch/arm/mach-nomadik/cpu-8815.c                   |    2 +-
 573  arch/arm/mach-nomadik/i2c-8815nhk.c                |    2 +-
 574  arch/arm/mach-nuc93x/Makefile.boot                 |    2 +-
 575  arch/arm/mach-omap1/Makefile.boot                  |    2 +-
 576  arch/arm/mach-omap1/board-ams-delta.c              |    3 +-
 577  arch/arm/mach-omap1/board-fsample.c                |    3 +-
 578  arch/arm/mach-omap1/board-generic.c                |    3 +-
 579  arch/arm/mach-omap1/board-h2-mmc.c                 |    3 +-
 580  arch/arm/mach-omap1/board-h2.c                     |    3 +-
 581  arch/arm/mach-omap1/board-h3-mmc.c                 |    3 +-
 582  arch/arm/mach-omap1/board-h3.c                     |    3 +-
 583  arch/arm/mach-omap1/board-htcherald.c              |    1 -
 584  arch/arm/mach-omap1/board-innovator.c              |    3 +-
 585  arch/arm/mach-omap1/board-nokia770.c               |    3 +-
 586  arch/arm/mach-omap1/board-osk.c                    |    3 +-
 587  arch/arm/mach-omap1/board-palmte.c                 |    3 +-
 588  arch/arm/mach-omap1/board-palmtt.c                 |    2 +-
 589  arch/arm/mach-omap1/board-palmz71.c                |    2 +-
 590  arch/arm/mach-omap1/board-perseus2.c               |    3 +-
 591  arch/arm/mach-omap1/board-sx1-mmc.c                |    2 +-
 592  arch/arm/mach-omap1/board-sx1.c                    |    3 +-
 593  arch/arm/mach-omap1/board-voiceblue.c              |    2 +-
 594  arch/arm/mach-omap1/devices.c                      |    2 +-
 595  arch/arm/mach-omap1/fpga.c                         |    2 +-
 596  arch/arm/mach-omap1/irq.c                          |    3 +-
 597  arch/arm/mach-omap1/leds-h2p2-debug.c              |    2 +-
 598  arch/arm/mach-omap1/leds-osk.c                     |    3 +-
 599  arch/arm/mach-omap1/leds.c                         |    2 +-
 600  arch/arm/mach-omap1/serial.c                       |    3 +-
 601  arch/arm/mach-omap2/Makefile.boot                  |    2 +-
 602  arch/arm/mach-omap2/board-generic.c                |    3 +-
 603  arch/arm/mach-omap2/board-h4.c                     |    3 +-
 604  arch/arm/mach-omap2/board-ldp.c                    |    3 +-
 605  arch/arm/mach-omap2/devices.c                      |    3 +-
 606  arch/arm/mach-orion5x/Makefile.boot                |    2 +-
 607  arch/arm/mach-orion5x/db88f5281-setup.c            |    3 +-
 608  arch/arm/mach-orion5x/dns323-setup.c               |    3 +-
 609  arch/arm/mach-orion5x/irq.c                        |    3 +-
 610  arch/arm/mach-orion5x/kurobox_pro-setup.c          |    3 +-
 611  arch/arm/mach-orion5x/mv2120-setup.c               |    3 +-
 612  arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c       |    3 +-
 613  arch/arm/mach-orion5x/rd88f5181l-ge-setup.c        |    3 +-
 614  arch/arm/mach-orion5x/rd88f5182-setup.c            |    3 +-
 615  arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c       |    3 +-
 616  arch/arm/mach-orion5x/terastation_pro2-setup.c     |    3 +-
 617  arch/arm/mach-orion5x/ts209-setup.c                |    3 +-
 618  arch/arm/mach-orion5x/ts409-setup.c                |    3 +-
 619  arch/arm/mach-orion5x/wnr854t-setup.c              |    3 +-
 620  arch/arm/mach-orion5x/wrt350n-v2-setup.c           |    3 +-
 621  arch/arm/mach-pnx4008/Makefile.boot                |    2 +-
 622  arch/arm/mach-pnx4008/gpio.c                       |    3 +-
 623  arch/arm/mach-pnx4008/serial.c                     |    3 +-
 624  arch/arm/mach-prima2/Makefile.boot                 |    2 +-
 625  arch/arm/mach-pxa/Makefile.boot                    |    2 +-
 626  arch/arm/mach-pxa/generic.c                        |    2 +-
 627  arch/arm/mach-pxa/include/mach/littleton.h         |    2 +-
 628  arch/arm/mach-pxa/irq.c                            |    3 +-
 629  arch/arm/mach-pxa/lpd270.c                         |    3 +-
 630  arch/arm/mach-pxa/lubbock.c                        |    2 +-
 631  arch/arm/mach-pxa/mainstone.c                      |    3 +-
 632  arch/arm/mach-pxa/mfp-pxa2xx.c                     |    3 +-
 633  arch/arm/mach-pxa/pcm990-baseboard.c               |    3 +-
 634  arch/arm/mach-pxa/pxa25x.c                         |    2 +-
 635  arch/arm/mach-pxa/pxa27x.c                         |    2 +-
 636  arch/arm/mach-pxa/pxa3xx.c                         |    3 +-
 637  arch/arm/mach-pxa/pxa95x.c                         |    3 +-
 638  arch/arm/mach-pxa/saar.c                           |    2 +-
 639  arch/arm/mach-pxa/saarb.c                          |    3 +-
 640  arch/arm/mach-realview/Makefile.boot               |    4 +-
 641  arch/arm/mach-realview/include/mach/gpio.h         |    7 +-
 642  arch/arm/mach-realview/include/mach/system.h       |    1 +
 643  arch/arm/mach-rpc/Makefile.boot                    |    2 +-
 644  arch/arm/mach-rpc/include/mach/hardware.h          |   25 +-
 645  arch/arm/mach-rpc/include/mach/io.h                |  193 +----------
 646  arch/arm/mach-rpc/riscpc.c                         |    2 +-
 647  arch/arm/mach-s3c2410/Makefile.boot                |    4 +-
 648  arch/arm/mach-s3c2410/include/mach/gpio.h          |    6 -
 649  arch/arm/mach-s3c2410/include/mach/h1940-latch.h   |    2 +-
 650  arch/arm/mach-s3c2410/include/mach/io.h            |    2 -
 651  arch/arm/mach-s3c64xx/Makefile.boot                |    2 +-
 652  arch/arm/mach-s3c64xx/include/mach/gpio.h          |    7 -
 653  arch/arm/mach-s5p64x0/Makefile.boot                |    2 +-
 654  arch/arm/mach-s5p64x0/include/mach/gpio.h          |    7 -
 655  arch/arm/mach-s5pc100/Makefile.boot                |    2 +-
 656  arch/arm/mach-s5pc100/include/mach/gpio.h          |    7 -
 657  arch/arm/mach-s5pv210/Makefile.boot                |    2 +-
 658  arch/arm/mach-s5pv210/include/mach/gpio.h          |    7 -
 659  arch/arm/mach-sa1100/Makefile                      |    2 +-
 660  arch/arm/mach-sa1100/Makefile.boot                 |    5 +-
 661  arch/arm/mach-sa1100/generic.c                     |    2 +-
 662  arch/arm/mach-sa1100/include/mach/gpio.h           |    4 +-
 663  arch/arm/mach-sa1100/include/mach/io.h             |    6 +-
 664  arch/arm/mach-shark/Makefile.boot                  |    2 +-
 665  arch/arm/mach-shmobile/Makefile.boot               |    2 +-
 666  arch/arm/mach-shmobile/include/mach/gpio.h         |   24 +-
 667  arch/arm/mach-spear3xx/Makefile.boot               |    2 +-
 668  arch/arm/mach-spear6xx/Makefile.boot               |    2 +-
 669  arch/arm/mach-tcc8k/Makefile.boot                  |    2 +-
 670  arch/arm/mach-tegra/Makefile.boot                  |    2 +-
 671  arch/arm/mach-tegra/board-trimslice-pinmux.c       |    3 +-
 672  arch/arm/mach-tegra/include/mach/gpio.h            |    7 +-
 673  arch/arm/mach-u300/Makefile.boot                   |    4 +-
 674  arch/arm/mach-u300/include/mach/gpio-u300.h        |  253 +++++++++++++
 675  arch/arm/mach-u300/include/mach/gpio.h             |  259 +-------------
 676  arch/arm/mach-u300/mmc.c                           |    2 +-
 677  arch/arm/mach-ux500/Makefile.boot                  |    2 +-
 678  arch/arm/mach-ux500/board-mop500-pins.c            |    2 +-
 679  arch/arm/mach-ux500/board-mop500-u8500uib.c        |    3 +-
 680  arch/arm/mach-ux500/board-mop500.c                 |    1 +
 681  arch/arm/mach-ux500/board-u5500-sdi.c              |    2 +-
 682  arch/arm/mach-ux500/board-u5500.c                  |    2 +-
 683  arch/arm/mach-ux500/cpu-db5500.c                   |    2 +-
 684  arch/arm/mach-ux500/cpu-db8500.c                   |    2 +-
 685  arch/arm/mach-ux500/devices-common.c               |    2 +-
 686  arch/arm/mach-versatile/Makefile.boot              |    2 +-
 687  arch/arm/mach-versatile/include/mach/gpio.h        |    7 +-
 688  arch/arm/mach-vexpress/Makefile.boot               |    2 +-
 689  arch/arm/mach-vexpress/include/mach/io.h           |    2 -
 690  arch/arm/mach-vt8500/Makefile.boot                 |    2 +-
 691  arch/arm/mach-vt8500/include/mach/gpio.h           |    7 +-
 692  arch/arm/mach-vt8500/include/mach/io.h             |    2 -
 693  arch/arm/mach-w90x900/Makefile.boot                |    2 +-
 694  arch/arm/mach-w90x900/include/mach/gpio.h          |    6 +-
 695  arch/arm/mach-zynq/Makefile.boot                   |    2 +-
 696  arch/arm/mm/cache-l2x0.c                           |  103 ++++++
 697  arch/arm/mm/proc-v6.S                              |   16 +
 698  arch/arm/plat-mxc/include/mach/gpio.h              |    6 -
 699  arch/arm/plat-nomadik/include/plat/gpio-nomadik.h  |   85 +++++
 700  arch/arm/plat-nomadik/include/plat/gpio.h          |   81 +-----
 701  arch/arm/plat-omap/debug-devices.c                 |    3 +-
 702  arch/arm/plat-omap/debug-leds.c                    |    3 +-
 703  arch/arm/plat-omap/devices.c                       |    3 +-
 704  arch/arm/plat-omap/include/plat/gpio.h             |   20 -
 705  arch/arm/plat-orion/include/plat/gpio.h            |    9 -
 706  arch/arm/plat-pxa/gpio.c                           |    4 +-
 707  arch/arm/plat-pxa/include/plat/gpio.h              |    2 +
 708  arch/arm/plat-spear/include/plat/gpio.h            |   25 +--
 709  arch/arm/tools/mach-types                          |  370 +++++++++++---------
 710  drivers/ata/pata_at91.c                            |    2 +-
 711  drivers/gpio/Makefile                              |    6 +-
 712  .../gpio.c => drivers/gpio/gpio-davinci.c          |    4 +-
 713  drivers/gpio/gpio-ep93xx.c                         |   19 +-
 714  .../gpio.c => drivers/gpio/gpio-ks8695.c           |    4 +-
 715  .../gpiolib.c => drivers/gpio/gpio-lpc32xx.c       |    2 +-
 716  drivers/gpio/gpio-nomadik.c                        |    3 +-
 717  drivers/gpio/gpio-omap.c                           |    2 +-
 718  .../gpio.c => drivers/gpio/gpio-sa1100.c           |    4 +-
 719  .../mach-davinci => drivers/gpio}/gpio-tnetv107x.c |    0
 720  drivers/gpio/gpio-u300.c                           |    1 +
 721  drivers/i2c/busses/i2c-ixp2000.c                   |    2 +-
 722  drivers/ide/at91_ide.c                             |    2 +-
 723  drivers/input/keyboard/omap-keypad.c               |    2 +-
 724  drivers/mfd/menelaus.c                             |    2 +-
 725  drivers/mmc/host/omap.c                            |    2 +-
 726  drivers/mmc/host/sdhci-tegra.c                     |    2 +-
 727  drivers/mtd/nand/ams-delta.c                       |    2 +-
 728  drivers/mtd/onenand/omap2.c                        |    2 +-
 729  drivers/net/arm/at91_ether.c                       |    2 +-
 730  drivers/pcmcia/pxa2xx_vpac270.c                    |    2 +-
 731  drivers/spi/spi-atmel.c                            |    2 +-
 732  drivers/tty/serial/atmel_serial.c                  |    2 +-
 733  drivers/usb/host/ohci-pnx4008.c                    |    2 +-
 734  drivers/usb/musb/davinci.c                         |    2 +-
 735  drivers/video/atmel_lcdfb.c                        |    2 +-
 736  drivers/video/omap/lcd_apollon.c                   |    2 +-
 737  drivers/video/omap/lcd_h3.c                        |    2 +-
 738  drivers/video/omap/lcd_inn1610.c                   |    2 +-
 739  drivers/video/omap/lcd_ldp.c                       |    2 +-
 740  drivers/video/omap/lcd_osk.c                       |    2 +-
 741  drivers/video/omap/lcd_overo.c                     |    2 +-
 742  drivers/video/omap/lcd_palmtt.c                    |    2 +-
 743  drivers/video/pnx4008/sdum.c                       |    2 +-
 744  tools/perf/arch/arm/util/dwarf-regs.c              |    3 +
 745  352 files changed, 1794 insertions(+), 1691 deletions(-)
 746  create mode 100644 Documentation/devicetree/bindings/arm/l2cc.txt
 747  delete mode 100644 arch/arm/include/asm/auxvec.h
 748  delete mode 100644 arch/arm/include/asm/bitsperlong.h
 749  delete mode 100644 arch/arm/include/asm/cputime.h
 750  delete mode 100644 arch/arm/include/asm/emergency-restart.h
 751  delete mode 100644 arch/arm/include/asm/errno.h
 752  delete mode 100644 arch/arm/include/asm/ioctl.h
 753  delete mode 100644 arch/arm/include/asm/irq_regs.h
 754  delete mode 100644 arch/arm/include/asm/kdebug.h
 755  delete mode 100644 arch/arm/include/asm/local.h
 756  delete mode 100644 arch/arm/include/asm/local64.h
 757  delete mode 100644 arch/arm/include/asm/percpu.h
 758  delete mode 100644 arch/arm/include/asm/poll.h
 759  delete mode 100644 arch/arm/include/asm/resource.h
 760  delete mode 100644 arch/arm/include/asm/sections.h
 761  delete mode 100644 arch/arm/include/asm/siginfo.h
 762  delete mode 100644 arch/arm/include/asm/sizes.h
 763  create mode 100644 arch/arm/kernel/topology.c
 764  create mode 100644 arch/arm/mach-davinci/include/mach/gpio-davinci.h
 765  rename arch/arm/mach-ixp2000/include/mach/{gpio.h => gpio-ixp2000.h} (95%)
 766  create mode 100644 arch/arm/mach-ks8695/include/mach/gpio-ks8695.h
 767  create mode 100644 arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h
 768  create mode 100644 arch/arm/mach-u300/include/mach/gpio-u300.h
 769  create mode 100644 arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
 770  rename arch/arm/mach-davinci/gpio.c => drivers/gpio/gpio-davinci.c (99%)
 771  rename arch/arm/mach-ks8695/gpio.c => drivers/gpio/gpio-ks8695.c (99%)
 772  rename arch/arm/mach-lpc32xx/gpiolib.c => drivers/gpio/gpio-lpc32xx.c (99%)
 773  rename arch/arm/mach-sa1100/gpio.c => drivers/gpio/gpio-sa1100.c (96%)
 774  rename {arch/arm/mach-davinci => drivers/gpio}/gpio-tnetv107x.c (100%)
 775 Merging arm-lpae/for-next
 776 $ git merge arm-lpae/for-next
 777 Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution.
 778 Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution.
 779 Resolved 'arch/arm/include/asm/tlb.h' using previous resolution.
 780 Auto-merging arch/arm/Kconfig
 781 Auto-merging arch/arm/include/asm/pgalloc.h
 782 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
 783 Auto-merging arch/arm/include/asm/pgtable.h
 784 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
 785 Auto-merging arch/arm/include/asm/system.h
 786 Auto-merging arch/arm/include/asm/tlb.h
 787 CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
 788 Auto-merging arch/arm/kernel/head.S
 789 Auto-merging arch/arm/kernel/setup.c
 790 Automatic merge failed; fix conflicts and then commit the result.
 791 $ git commit -v -a
 792 [master cbb68b6] Merge remote-tracking branch 'arm-lpae/for-next'
 793 $ git diff -M --stat --summary HEAD^..
 794  arch/arm/Kconfig                            |    2 +-
 795  arch/arm/boot/compressed/head.S             |    1 +
 796  arch/arm/include/asm/assembler.h            |   11 +
 797  arch/arm/include/asm/dma-mapping.h          |    2 +-
 798  arch/arm/include/asm/page.h                 |   44 +---
 799  arch/arm/include/asm/pgalloc.h              |   28 ++-
 800  arch/arm/include/asm/pgtable-2level-hwdef.h |   93 ++++++
 801  arch/arm/include/asm/pgtable-2level-types.h |   67 +++++
 802  arch/arm/include/asm/pgtable-2level.h       |  143 +++++++++
 803  arch/arm/include/asm/pgtable-3level-hwdef.h |   82 ++++++
 804  arch/arm/include/asm/pgtable-3level-types.h |   70 +++++
 805  arch/arm/include/asm/pgtable-3level.h       |  107 +++++++
 806  arch/arm/include/asm/pgtable-hwdef.h        |   81 +-----
 807  arch/arm/include/asm/pgtable.h              |  211 +++++---------
 808  arch/arm/include/asm/proc-fns.h             |   21 ++
 809  arch/arm/include/asm/setup.h                |    8 +
 810  arch/arm/include/asm/system.h               |    8 +
 811  arch/arm/include/asm/tlb.h                  |   11 +-
 812  arch/arm/include/asm/tlbflush.h             |    4 +-
 813  arch/arm/kernel/head.S                      |  119 ++++++---
 814  arch/arm/kernel/hw_breakpoint.c             |    8 +-
 815  arch/arm/kernel/module.c                    |    2 +-
 816  arch/arm/kernel/setup.c                     |   10 +
 817  arch/arm/kernel/sleep.S                     |    2 +
 818  arch/arm/mm/Kconfig                         |   13 +
 819  arch/arm/mm/Makefile                        |    4 +
 820  arch/arm/mm/alignment.c                     |    2 +-
 821  arch/arm/mm/context.c                       |   19 +-
 822  arch/arm/mm/dma-mapping.c                   |    6 +-
 823  arch/arm/mm/fault.c                         |   87 ++++++
 824  arch/arm/mm/idmap.c                         |   36 +++-
 825  arch/arm/mm/ioremap.c                       |   39 ++-
 826  arch/arm/mm/mm.h                            |    4 +-
 827  arch/arm/mm/mmu.c                           |   53 +++-
 828  arch/arm/mm/pgd.c                           |   51 +++-
 829  arch/arm/mm/proc-macros.S                   |    5 +-
 830  arch/arm/mm/proc-v7lpae.S                   |  422 +++++++++++++++++++++++++++
 831  37 files changed, 1529 insertions(+), 347 deletions(-)
 832  create mode 100644 arch/arm/include/asm/pgtable-2level-hwdef.h
 833  create mode 100644 arch/arm/include/asm/pgtable-2level-types.h
 834  create mode 100644 arch/arm/include/asm/pgtable-2level.h
 835  create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h
 836  create mode 100644 arch/arm/include/asm/pgtable-3level-types.h
 837  create mode 100644 arch/arm/include/asm/pgtable-3level.h
 838  create mode 100644 arch/arm/mm/proc-v7lpae.S
 839 Merging arm-soc/for-next
 840 $ git merge arm-soc/for-next
 841 Already up-to-date.
 842 Merging at91/at91-next
 843 $ git merge at91/at91-next
 844 Already up-to-date.
 845 Merging davinci/davinci-next
 846 $ git merge davinci/davinci-next
 847 Already up-to-date.
 848 Merging i.MX/for-next
 849 $ git merge i.MX/for-next
 850 Already up-to-date.
 851 Merging linux-spec/for-next
 852 $ git merge linux-spec/for-next
 853 Already up-to-date.
 854 Merging msm/for-next
 855 $ git merge msm/for-next
 856 Resolved 'arch/arm/mach-msm/io.c' using previous resolution.
 857 Auto-merging arch/arm/mach-msm/Makefile
 858 Auto-merging arch/arm/mach-msm/acpuclock-arm11.c
 859 Auto-merging arch/arm/mach-msm/board-msm7x30.c
 860 Auto-merging arch/arm/mach-msm/board-msm8960.c
 861 Auto-merging arch/arm/mach-msm/board-msm8x60.c
 862 Auto-merging arch/arm/mach-msm/board-qsd8x50.c
 863 Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
 864 Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
 865 Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
 866 Auto-merging arch/arm/mach-msm/io.c
 867 CONFLICT (content): Merge conflict in arch/arm/mach-msm/io.c
 868 Automatic merge failed; fix conflicts and then commit the result.
 869 $ git commit -v -a
 870 [master b82cb99] Merge remote-tracking branch 'msm/for-next'
 871 $ git diff -M --stat --summary HEAD^..
 872  arch/arm/mach-msm/Makefile                      |    5 +-
 873  arch/arm/mach-msm/acpuclock-arm11.c             |    2 +-
 874  arch/arm/mach-msm/board-halibut.c               |    1 +
 875  arch/arm/mach-msm/board-mahimahi.c              |    1 +
 876  arch/arm/mach-msm/board-msm7x30.c               |    1 +
 877  arch/arm/mach-msm/board-msm8960.c               |   18 +
 878  arch/arm/mach-msm/board-msm8x60.c               |    9 +-
 879  arch/arm/mach-msm/board-qsd8x50.c               |    1 +
 880  arch/arm/mach-msm/board-trout.c                 |    1 +
 881  arch/arm/mach-msm/clock-dummy.c                 |   81 +++++
 882  arch/arm/mach-msm/clock.h                       |   11 +
 883  arch/arm/mach-msm/devices-msm7x00.c             |   21 ++-
 884  arch/arm/mach-msm/devices-msm7x30.c             |   21 ++-
 885  arch/arm/mach-msm/devices-msm8960.c             |  181 +++++++++++
 886  arch/arm/mach-msm/devices-msm8x60.c             |   56 ++++
 887  arch/arm/mach-msm/devices-qsd8x50.c             |   21 ++-
 888  arch/arm/mach-msm/devices.h                     |    8 +
 889  arch/arm/mach-msm/dma.c                         |  391 ++++++++++++++++++-----
 890  arch/arm/mach-msm/include/mach/dma.h            |   84 +++---
 891  arch/arm/mach-msm/include/mach/msm_iomap-7x00.h |    5 +-
 892  arch/arm/mach-msm/include/mach/msm_iomap-7x30.h |    5 +-
 893  arch/arm/mach-msm/include/mach/msm_iomap-8960.h |    3 +
 894  arch/arm/mach-msm/include/mach/msm_iomap-8x50.h |    5 +-
 895  arch/arm/mach-msm/include/mach/msm_iomap-8x60.h |    6 +
 896  arch/arm/mach-msm/io.c                          |    3 -
 897  25 files changed, 808 insertions(+), 133 deletions(-)
 898  create mode 100644 arch/arm/mach-msm/clock-dummy.c
 899  create mode 100644 arch/arm/mach-msm/devices-msm8x60.c
 900 Merging omap/for-next
 901 $ git merge omap/for-next
 902 Already up-to-date.
 903 Merging pxa/for-next
 904 $ git merge pxa/for-next
 905 Already up-to-date.
 906 Merging samsung/next-samsung
 907 $ git merge samsung/next-samsung
 908 Already up-to-date.
 909 Merging s5p/for-next
 910 $ git merge s5p/for-next
 911 Merge made by recursive.
 912  arch/arm/configs/exynos4_defconfig               |    1 +
 913  arch/arm/mach-exynos4/Kconfig                    |   16 ++
 914  arch/arm/mach-exynos4/Makefile                   |    1 +
 915  arch/arm/mach-exynos4/clock.c                    |    2 +-
 916  arch/arm/mach-exynos4/cpu.c                      |   11 ++-
 917  arch/arm/mach-exynos4/include/mach/irqs.h        |    5 +-
 918  arch/arm/mach-exynos4/include/mach/regs-pmu.h    |    2 +
 919  arch/arm/mach-exynos4/irq-eint.c                 |    7 +
 920  arch/arm/mach-exynos4/mach-nuri.c                |   34 +++++
 921  arch/arm/mach-exynos4/mach-origen.c              |  108 ++++++++++++++
 922  arch/arm/mach-exynos4/mach-smdkv310.c            |   11 ++
 923  arch/arm/mach-exynos4/mach-universal_c210.c      |   38 +++++-
 924  arch/arm/mach-exynos4/setup-usb-phy.c            |    2 +-
 925  arch/arm/mach-s3c2410/dma.c                      |   14 --
 926  arch/arm/mach-s3c2412/dma.c                      |   18 ---
 927  arch/arm/mach-s3c2440/dma.c                      |   17 --
 928  arch/arm/mach-s3c2443/dma.c                      |   27 ----
 929  arch/arm/mach-s3c64xx/Kconfig                    |    1 +
 930  arch/arm/mach-s3c64xx/Makefile                   |    2 +-
 931  arch/arm/mach-s3c64xx/include/mach/crag6410.h    |   23 +++
 932  arch/arm/mach-s3c64xx/mach-crag6410-module.c     |  173 ++++++++++++++++++++++
 933  arch/arm/mach-s3c64xx/mach-crag6410.c            |   97 ++-----------
 934  arch/arm/mach-s3c64xx/mach-mini6410.c            |    8 +-
 935  arch/arm/mach-s3c64xx/mach-real6410.c            |    8 +-
 936  arch/arm/mach-s3c64xx/mach-smdk6410.c            |   47 +------
 937  arch/arm/mach-s3c64xx/pm.c                       |    1 +
 938  arch/arm/mach-s5p64x0/irq-eint.c                 |    2 +-
 939  arch/arm/mach-s5p64x0/mach-smdk6440.c            |    8 +-
 940  arch/arm/mach-s5p64x0/mach-smdk6450.c            |    8 +-
 941  arch/arm/mach-s5pc100/mach-smdkc100.c            |    8 +-
 942  arch/arm/mach-s5pv210/Kconfig                    |    6 -
 943  arch/arm/mach-s5pv210/Makefile                   |    2 +-
 944  arch/arm/mach-s5pv210/mach-smdkv210.c            |    8 +-
 945  arch/arm/mach-s5pv210/pm.c                       |    2 +-
 946  arch/arm/plat-s5p/clock.c                        |    2 +-
 947  arch/arm/plat-s5p/irq-gpioint.c                  |    6 +
 948  arch/arm/plat-samsung/dev-hsmmc.c                |   19 +---
 949  arch/arm/plat-samsung/dev-hsmmc1.c               |   19 +---
 950  arch/arm/plat-samsung/dev-hsmmc2.c               |   19 +---
 951  arch/arm/plat-samsung/dev-hsmmc3.c               |   19 +---
 952  arch/arm/plat-samsung/dev-ts.c                   |    9 +
 953  arch/arm/plat-samsung/include/plat/backlight.h   |    2 +-
 954  arch/arm/plat-samsung/include/plat/dma-s3c24xx.h |    6 -
 955  arch/arm/plat-samsung/include/plat/sdhci.h       |    7 +
 956  arch/arm/plat-samsung/irq-vic-timer.c            |    5 +
 957  arch/arm/plat-samsung/platformdata.c             |   22 +++
 958  46 files changed, 508 insertions(+), 345 deletions(-)
 959  create mode 100644 arch/arm/mach-exynos4/mach-origen.c
 960  create mode 100644 arch/arm/mach-s3c64xx/include/mach/crag6410.h
 961  create mode 100644 arch/arm/mach-s3c64xx/mach-crag6410-module.c
 962 Merging tegra/for-next
 963 $ git merge tegra/for-next
 964 Already up-to-date.
 965 Merging ux500-core/ux500-core
 966 $ git merge ux500-core/ux500-core
 967 Already up-to-date.
 968 Merging xilinx/arm-next
 969 $ git merge xilinx/arm-next
 970 Already up-to-date.
 971 Merging blackfin/for-linus
 972 $ git merge blackfin/for-linus
 973 Removing arch/blackfin/include/asm/mutex.h
 974 Merge made by recursive.
 975  arch/blackfin/include/asm/Kbuild        |    1 +
 976  arch/blackfin/include/asm/mutex.h       |    1 -
 977  arch/blackfin/include/asm/uaccess.h     |    6 +++---
 978  arch/blackfin/mach-bf533/boards/H8606.c |    3 ++-
 979  4 files changed, 6 insertions(+), 5 deletions(-)
 980  delete mode 100644 arch/blackfin/include/asm/mutex.h
 981 Merging cris/for-next
 982 $ git merge cris/for-next
 983 Auto-merging arch/cris/arch-v32/drivers/cryptocop.c
 984 Auto-merging drivers/net/cris/eth_v10.c
 985 Merge made by recursive.
 986  Documentation/cris/README               |   62 +++++++++++++++---------------
 987  arch/cris/arch-v32/drivers/cryptocop.c  |    6 +--
 988  arch/cris/arch-v32/kernel/ptrace.c      |    2 -
 989  arch/cris/include/arch-v32/arch/cache.h |    2 +-
 990  drivers/net/cris/eth_v10.c              |    1 -
 991  5 files changed, 34 insertions(+), 39 deletions(-)
 992 Merging ia64/test
 993 $ git merge ia64/test
 994 Merge made by recursive.
 995  arch/ia64/sn/kernel/sn2/sn_hwperf.c |   12 +++--
 996  drivers/acpi/apei/erst.c            |    2 +-
 997  drivers/char/agp/hp-agp.c           |    6 ++-
 998  drivers/firmware/efivars.c          |    2 +-
 999  fs/pstore/inode.c                   |   40 +++++++++++++++--
1000  fs/pstore/internal.h                |    2 +-
1001  fs/pstore/platform.c                |   82 ++++++++++++++++++++++++++++-------
1002  include/linux/pstore.h              |    2 +-
1003  8 files changed, 118 insertions(+), 30 deletions(-)
1004 Merging m68k/for-next
1005 $ git merge m68k/for-next
1006 Merge made by recursive.
1007  arch/m68k/mac/macints.c      |    2 +-
1008  arch/m68k/mac/misc.c         |   40 +++++++++++++++++++++++-----------------
1009  drivers/zorro/zorro-driver.c |    8 ++++----
1010  3 files changed, 28 insertions(+), 22 deletions(-)
1011 Merging m68knommu/for-next
1012 $ git merge m68knommu/for-next
1013 Auto-merging arch/m68k/Kconfig.machine
1014 Removing arch/m68k/Kconfig.mmu
1015 Removing arch/m68k/Makefile_mm
1016 Removing arch/m68k/Makefile_no
1017 Removing arch/m68k/include/asm/entry_mm.h
1018 Removing arch/m68k/include/asm/entry_no.h
1019 Removing arch/m68k/kernel/Makefile_mm
1020 Removing arch/m68k/kernel/Makefile_no
1021 Removing arch/m68k/kernel/traps_mm.c
1022 Removing arch/m68k/kernel/traps_no.c
1023 Merge made by recursive.
1024  arch/m68k/Kconfig                            |  195 +----
1025  arch/m68k/Kconfig.bus                        |   55 ++
1026  arch/m68k/Kconfig.cpu                        |  429 +++++++++
1027  arch/m68k/Kconfig.devices                    |  171 ++++
1028  arch/m68k/{Kconfig.nommu => Kconfig.machine} |  543 ++++--------
1029  arch/m68k/Kconfig.mmu                        |  411 ---------
1030  arch/m68k/Makefile                           |  168 ++++-
1031  arch/m68k/Makefile_mm                        |  121 ---
1032  arch/m68k/Makefile_no                        |  124 ---
1033  arch/m68k/include/asm/entry.h                |  255 ++++++-
1034  arch/m68k/include/asm/entry_mm.h             |  128 ---
1035  arch/m68k/include/asm/entry_no.h             |  181 ----
1036  arch/m68k/include/asm/m520xsim.h             |   26 +-
1037  arch/m68k/include/asm/mcfqspi.h              |    8 +-
1038  arch/m68k/include/asm/page_no.h              |    3 +
1039  arch/m68k/include/asm/processor.h            |    6 +
1040  arch/m68k/include/asm/sections.h             |    2 +
1041  arch/m68k/kernel/Makefile                    |   24 +-
1042  arch/m68k/kernel/Makefile_mm                 |   17 -
1043  arch/m68k/kernel/Makefile_no                 |   10 -
1044  arch/m68k/kernel/entry_no.S                  |    6 +-
1045  arch/m68k/kernel/setup_no.c                  |    4 +-
1046  arch/m68k/kernel/traps.c                     | 1108 +++++++++++++++++++++++-
1047  arch/m68k/kernel/traps_mm.c                  | 1207 --------------------------
1048  arch/m68k/kernel/traps_no.c                  |  361 --------
1049  arch/m68k/kernel/vectors.c                   |  145 +++
1050  arch/m68k/lib/memcpy.c                       |    9 +
1051  arch/m68k/mm/init_no.c                       |   21 +-
1052  arch/m68k/platform/520x/config.c             |    6 +-
1053  arch/m68k/platform/520x/gpio.c               |   50 +-
1054  arch/m68k/platform/68328/Makefile            |    5 +-
1055  arch/m68k/platform/68328/entry.S             |   18 +-
1056  arch/m68k/platform/68360/Makefile            |    6 +-
1057  arch/m68k/platform/68360/entry.S             |    4 +-
1058  arch/m68k/platform/coldfire/entry.S          |    6 +-
1059  35 files changed, 2656 insertions(+), 3177 deletions(-)
1060  create mode 100644 arch/m68k/Kconfig.bus
1061  create mode 100644 arch/m68k/Kconfig.cpu
1062  create mode 100644 arch/m68k/Kconfig.devices
1063  rename arch/m68k/{Kconfig.nommu => Kconfig.machine} (62%)
1064  delete mode 100644 arch/m68k/Kconfig.mmu
1065  delete mode 100644 arch/m68k/Makefile_mm
1066  delete mode 100644 arch/m68k/Makefile_no
1067  delete mode 100644 arch/m68k/include/asm/entry_mm.h
1068  delete mode 100644 arch/m68k/include/asm/entry_no.h
1069  delete mode 100644 arch/m68k/kernel/Makefile_mm
1070  delete mode 100644 arch/m68k/kernel/Makefile_no
1071  delete mode 100644 arch/m68k/kernel/traps_mm.c
1072  delete mode 100644 arch/m68k/kernel/traps_no.c
1073  create mode 100644 arch/m68k/kernel/vectors.c
1074 Merging microblaze/next
1075 $ git merge microblaze/next
1076 Already up-to-date.
1077 Merging mips/mips-for-linux-next
1078 $ git merge mips/mips-for-linux-next
1079 Removing arch/mips/nxp/pnx8550/common/pci.c
1080 Removing arch/mips/nxp/pnx8550/common/setup.c
1081 Merge made by recursive.
1082  arch/mips/Kconfig                                  |    1 +
1083  arch/mips/Makefile                                 |    2 +
1084  arch/mips/alchemy/common/platform.c                |    2 +-
1085  arch/mips/alchemy/common/power.c                   |   22 ++-
1086  arch/mips/ar7/irq.c                                |    3 +-
1087  arch/mips/bcm63xx/irq.c                            |    1 +
1088  arch/mips/cobalt/irq.c                             |    1 +
1089  arch/mips/dec/setup.c                              |    4 +
1090  arch/mips/emma/markeins/irq.c                      |    2 +-
1091  arch/mips/include/asm/cacheflush.h                 |   24 ++++
1092  arch/mips/include/asm/io.h                         |   12 +--
1093  .../asm/mach-cavium-octeon/cpu-feature-overrides.h |    1 -
1094  arch/mips/include/asm/mipsprom.h                   |    6 +-
1095  arch/mips/include/asm/prom.h                       |    6 +-
1096  arch/mips/kernel/ftrace.c                          |   39 +++---
1097  arch/mips/kernel/scall32-o32.S                     |    2 +-
1098  arch/mips/kernel/signal.c                          |    3 +
1099  arch/mips/kernel/traps.c                           |    6 +-
1100  arch/mips/lantiq/irq.c                             |    6 +-
1101  arch/mips/lasat/interrupt.c                        |    1 +
1102  arch/mips/loongson/fuloong-2e/irq.c                |    1 +
1103  arch/mips/loongson/lemote-2f/irq.c                 |    3 +-
1104  arch/mips/mm/c-octeon.c                            |    6 +
1105  arch/mips/mm/c-r3k.c                               |    7 +
1106  arch/mips/mm/c-r4k.c                               |   35 +++++
1107  arch/mips/mm/c-tx39.c                              |    7 +
1108  arch/mips/mm/cache.c                               |    5 +
1109  arch/mips/mm/tlbex.c                               |    3 +-
1110  arch/mips/mti-malta/malta-int.c                    |    6 +-
1111  arch/mips/netlogic/Platform                        |    5 +
1112  arch/mips/netlogic/xlr/setup.c                     |    4 +-
1113  arch/mips/netlogic/xlr/smp.c                       |    2 +-
1114  arch/mips/netlogic/xlr/smpboot.S                   |   16 ++-
1115  arch/mips/nxp/pnx8550/common/pci.c                 |  134 ------------------
1116  arch/mips/nxp/pnx8550/common/setup.c               |  143 --------------------
1117  arch/mips/pci/pci-lantiq.c                         |    9 +-
1118  arch/mips/pci/pci-rc32434.c                        |    2 +-
1119  arch/mips/pmc-sierra/msp71xx/msp_irq.c             |    6 +-
1120  arch/mips/pmc-sierra/msp71xx/msp_setup.c           |    1 +
1121  arch/mips/pmc-sierra/yosemite/py-console.c         |   12 +--
1122  arch/mips/pnx8550/common/int.c                     |    2 +-
1123  arch/mips/pnx8550/common/prom.c                    |    2 +-
1124  arch/mips/sgi-ip22/ip22-int.c                      |   10 +-
1125  arch/mips/sgi-ip27/ip27-irq.c                      |    4 +-
1126  arch/mips/sni/rm200.c                              |    1 +
1127  arch/mips/vr41xx/common/irq.c                      |    1 +
1128  drivers/mtd/maps/lantiq-flash.c                    |    4 +-
1129  47 files changed, 204 insertions(+), 371 deletions(-)
1130  delete mode 100644 arch/mips/nxp/pnx8550/common/pci.c
1131  delete mode 100644 arch/mips/nxp/pnx8550/common/setup.c
1132 Merging openrisc/for-upstream
1133 $ git merge openrisc/for-upstream
1134 Merge made by recursive.
1135  arch/openrisc/include/asm/sigcontext.h |    7 +------
1136  arch/openrisc/kernel/signal.c          |   21 +++++----------------
1137  2 files changed, 6 insertions(+), 22 deletions(-)
1138 Merging parisc/for-next
1139 $ git merge parisc/for-next
1140 Already up-to-date.
1141 Merging powerpc/next
1142 $ git merge powerpc/next
1143 Already up-to-date.
1144 Merging 4xx/next
1145 $ git merge 4xx/next
1146 Removing arch/powerpc/boot/dts/hcu4.dts
1147 Removing arch/powerpc/configs/40x/hcu4_defconfig
1148 Removing arch/powerpc/platforms/40x/hcu4.c
1149 Auto-merging arch/powerpc/sysdev/ppc4xx_pci.c
1150 Merge made by recursive.
1151  arch/powerpc/Kconfig                    |    2 +-
1152  arch/powerpc/boot/dts/hcu4.dts          |  168 ------------------------------
1153  arch/powerpc/boot/dts/yosemite.dts      |   36 +++++++
1154  arch/powerpc/configs/40x/hcu4_defconfig |   80 --------------
1155  arch/powerpc/configs/ppc40x_defconfig   |    1 -
1156  arch/powerpc/include/asm/kexec.h        |    2 +-
1157  arch/powerpc/kernel/misc_32.S           |  171 +++++++++++++++++++++++++++++++
1158  arch/powerpc/platforms/40x/Kconfig      |    8 --
1159  arch/powerpc/platforms/40x/Makefile     |    1 -
1160  arch/powerpc/platforms/40x/hcu4.c       |   61 -----------
1161  arch/powerpc/sysdev/ppc4xx_pci.c        |   89 +++++++++++++---
1162  arch/powerpc/sysdev/ppc4xx_pci.h        |   12 ++
1163  drivers/edac/ppc4xx_edac.c              |    2 +-
1164  13 files changed, 294 insertions(+), 339 deletions(-)
1165  delete mode 100644 arch/powerpc/boot/dts/hcu4.dts
1166  delete mode 100644 arch/powerpc/configs/40x/hcu4_defconfig
1167  delete mode 100644 arch/powerpc/platforms/40x/hcu4.c
1168 Merging 52xx-and-virtex/powerpc/next
1169 $ git merge 52xx-and-virtex/powerpc/next
1170 Merge made by recursive.
1171  arch/powerpc/boot/dts/charon.dts             |  236 ++++++++++++++++++++++++++
1172  arch/powerpc/configs/52xx/tqm5200_defconfig  |   20 ++-
1173  arch/powerpc/platforms/52xx/mpc5200_simple.c |    1 +
1174  3 files changed, 249 insertions(+), 8 deletions(-)
1175  create mode 100644 arch/powerpc/boot/dts/charon.dts
1176 Merging galak/next
1177 $ git merge galak/next
1178 Already up-to-date.
1179 Merging s390/features
1180 $ git merge s390/features
1181 Merge made by recursive.
1182  Documentation/kernel-parameters.txt |    6 +-
1183  arch/s390/Kconfig                   |   10 ++
1184  arch/s390/include/asm/ipl.h         |    1 +
1185  arch/s390/include/asm/kexec.h       |    3 +
1186  arch/s390/include/asm/setup.h       |    9 ++
1187  arch/s390/include/asm/system.h      |    2 +
1188  arch/s390/include/asm/thread_info.h |    2 +-
1189  arch/s390/kernel/Makefile           |    1 +
1190  arch/s390/kernel/crash_dump.c       |   39 ++++++
1191  arch/s390/kernel/early.c            |   14 +-
1192  arch/s390/kernel/head.S             |   16 +++
1193  arch/s390/kernel/head_kdump.S       |  116 +++++++++++++++++
1194  arch/s390/kernel/ipl.c              |    6 +-
1195  arch/s390/kernel/machine_kexec.c    |  245 +++++++++++++++++++++++++++++++++++
1196  arch/s390/kernel/mem_detect.c       |   69 ++++++++++
1197  arch/s390/kernel/setup.c            |  203 +++++++++++++++++++++++++++++
1198  arch/s390/mm/maccess.c              |   57 ++++++++
1199  arch/s390/mm/vmem.c                 |    6 +
1200  drivers/s390/block/dasd_ioctl.c     |   10 +-
1201  drivers/s390/char/zcore.c           |   20 +---
1202  drivers/s390/cio/ccwreq.c           |   23 +++-
1203  include/linux/crash_dump.h          |    1 +
1204  include/linux/kexec.h               |    4 +
1205  kernel/crash_dump.c                 |   11 ++
1206  kernel/kexec.c                      |    2 +-
1207  25 files changed, 840 insertions(+), 36 deletions(-)
1208  create mode 100644 arch/s390/kernel/crash_dump.c
1209  create mode 100644 arch/s390/kernel/head_kdump.S
1210 Merging sh/sh-latest
1211 $ git merge sh/sh-latest
1212 Merge made by recursive.
1213  arch/sh/boards/mach-ecovec24/setup.c |    4 ++++
1214  1 files changed, 4 insertions(+), 0 deletions(-)
1215 Merging rmobile/rmobile-latest
1216 $ git merge rmobile/rmobile-latest
1217 Already up-to-date.
1218 Merging sparc/master
1219 $ git merge sparc/master
1220 Already up-to-date.
1221 Merging tile/master
1222 $ git merge tile/master
1223 Merge made by recursive.
1224  arch/tile/kernel/intvec_32.S  |    2 +-
1225  arch/tile/lib/atomic_asm_32.S |    2 +-
1226  fs/nfs/nfs4filelayout.c       |    6 +++---
1227  3 files changed, 5 insertions(+), 5 deletions(-)
1228 Merging unicore32/unicore32
1229 $ git merge unicore32/unicore32
1230 Auto-merging MAINTAINERS
1231 Merge made by recursive.
1232  MAINTAINERS                                |    1 +
1233  arch/unicore32/boot/compressed/Makefile    |    4 +-
1234  arch/unicore32/configs/unicore32_defconfig |    2 +-
1235  arch/unicore32/include/asm/bitops.h        |   12 +-
1236  arch/unicore32/include/asm/io.h            |    8 +-
1237  arch/unicore32/kernel/ksyms.c              |    4 +-
1238  arch/unicore32/lib/findbit.S               |   14 +-
1239  drivers/net/Kconfig                        |    5 +
1240  drivers/net/Makefile                       |    1 +
1241  drivers/net/mac-puv3.c                     | 1807 ++++++++++++++++++++++++++++
1242  10 files changed, 1834 insertions(+), 24 deletions(-)
1243  create mode 100644 drivers/net/mac-puv3.c
1244 Merging xtensa/master
1245 $ git merge xtensa/master
1246 Already up-to-date.
1247 Merging ceph/for-next
1248 $ git merge ceph/for-next
1249 Auto-merging fs/ceph/caps.c
1250 Auto-merging fs/ceph/super.h
1251 Auto-merging include/linux/ceph/libceph.h
1252 Merge made by recursive.
1253  drivers/block/rbd.c            |    2 +-
1254  fs/ceph/addr.c                 |  192 +++++++++++++++++++++++++---------------
1255  fs/ceph/caps.c                 |    2 +-
1256  fs/ceph/ioctl.h                |   55 +++++++++++-
1257  fs/ceph/mds_client.c           |   11 ++-
1258  fs/ceph/super.c                |   23 ++++--
1259  fs/ceph/super.h                |    8 +-
1260  include/linux/ceph/libceph.h   |    4 +-
1261  include/linux/ceph/messenger.h |    3 +-
1262  net/ceph/ceph_common.c         |   47 +++++-----
1263  net/ceph/messenger.c           |   16 +++-
1264  net/ceph/mon_client.c          |   71 ++++++++-------
1265  net/ceph/msgpool.c             |   42 ++++++---
1266  net/ceph/osd_client.c          |    8 +-
1267  14 files changed, 318 insertions(+), 166 deletions(-)
1268 Merging cifs/master
1269 $ git merge cifs/master
1270 Merge made by recursive.
1271  fs/cifs/cifssmb.c |    3 ++-
1272  1 files changed, 2 insertions(+), 1 deletions(-)
1273 Merging configfs/linux-next
1274 $ git merge configfs/linux-next
1275 Already up-to-date.
1276 Merging ecryptfs/next
1277 $ git merge ecryptfs/next
1278 Already up-to-date.
1279 Merging ext3/for_next
1280 $ git merge ext3/for_next
1281 Already up-to-date.
1282 Merging ext4/dev
1283 $ git merge ext4/dev
1284 Merge made by recursive.
1285  Documentation/filesystems/ext4.txt |    8 +-
1286  fs/ext4/ext4.h                     |   17 +++-
1287  fs/ext4/extents.c                  |   90 +++++++++++++-----
1288  fs/ext4/inode.c                    |  181 ++++++++++++++++++++++++++++++++++++
1289  fs/ext4/namei.c                    |    8 +-
1290  fs/ext4/super.c                    |   46 ++++++----
1291  fs/jbd2/transaction.c              |   46 ++++++++-
1292  include/linux/ext2_fs.h            |    4 +-
1293  include/linux/ext3_fs.h            |    4 +-
1294  9 files changed, 343 insertions(+), 61 deletions(-)
1295 Merging fatfs/master
1296 $ git merge fatfs/master
1297 Already up-to-date.
1298 Merging fuse/for-next
1299 $ git merge fuse/for-next
1300 Auto-merging fs/fuse/file.c
1301 Auto-merging fs/fuse/fuse_i.h
1302 Auto-merging fs/fuse/inode.c
1303 Merge made by recursive.
1304  fs/fuse/dev.c        |    4 ++
1305  fs/fuse/file.c       |   84 ++++++++------------------------------------------
1306  fs/fuse/fuse_i.h     |    8 ++++-
1307  fs/fuse/inode.c      |   10 +++++-
1308  include/linux/fuse.h |    9 +++++-
1309  5 files changed, 40 insertions(+), 75 deletions(-)
1310 Merging gfs2/master
1311 $ git merge gfs2/master
1312 Auto-merging fs/gfs2/acl.c
1313 Merge made by recursive.
1314  fs/gfs2/acl.c    |    5 +-
1315  fs/gfs2/aops.c   |    6 ---
1316  fs/gfs2/dir.c    |   42 +++++---------------
1317  fs/gfs2/file.c   |   50 ++++++++++++++++++------
1318  fs/gfs2/glops.c  |   29 +++++++++++---
1319  fs/gfs2/incore.h |    1 +
1320  fs/gfs2/inode.c  |   85 +++++++++++++++--------------------------
1321  fs/gfs2/inode.h  |    2 +-
1322  fs/gfs2/quota.c  |   13 +-----
1323  fs/gfs2/super.c  |  111 +++++++++++++++++++++++++++++++++++-------------------
1324  fs/gfs2/xattr.c  |    5 +-
1325  11 files changed, 182 insertions(+), 167 deletions(-)
1326 Merging hfsplus/for-next
1327 $ git merge hfsplus/for-next
1328 Already up-to-date.
1329 Merging jfs/next
1330 $ git merge jfs/next
1331 Already up-to-date.
1332 Merging logfs/master
1333 $ git merge logfs/master
1334 Auto-merging fs/logfs/logfs.h
1335 Merge made by recursive.
1336  fs/logfs/dev_mtd.c   |   26 ++++++++++++--------------
1337  fs/logfs/logfs.h     |    1 +
1338  fs/logfs/readwrite.c |    4 ++++
1339  fs/logfs/segment.c   |   14 ++++++++++----
1340  fs/logfs/super.c     |    1 +
1341  5 files changed, 28 insertions(+), 18 deletions(-)
1342 Merging nfs/linux-next
1343 $ git merge nfs/linux-next
1344 Already up-to-date.
1345 Merging nfsd/nfsd-next
1346 $ git merge nfsd/nfsd-next
1347 Merge made by recursive.
1348  fs/nfsd/nfs4proc.c |   23 ++++++++++++++++++++++-
1349  fs/nfsd/nfs4xdr.c  |   12 ++++++++++++
1350  fs/nfsd/state.h    |    6 ------
1351  3 files changed, 34 insertions(+), 7 deletions(-)
1352 Merging nilfs2/for-next
1353 $ git merge nilfs2/for-next
1354 Already up-to-date.
1355 Merging ocfs2/linux-next
1356 $ git merge ocfs2/linux-next
1357 Auto-merging fs/ocfs2/file.c
1358 Auto-merging fs/ocfs2/move_extents.c
1359 Merge made by recursive.
1360  fs/ocfs2/aops.c              |   69 +++++++++++++--
1361  fs/ocfs2/aops.h              |   14 +++
1362  fs/ocfs2/cluster/heartbeat.c |  194 ++++++++++++++++++++++++++----------------
1363  fs/ocfs2/cluster/netdebug.c  |  102 +++++++++++++++-------
1364  fs/ocfs2/cluster/tcp.c       |  138 ++++++++++++++++--------------
1365  fs/ocfs2/cluster/tcp.h       |    2 +
1366  fs/ocfs2/dir.c               |    3 +-
1367  fs/ocfs2/dlm/dlmcommon.h     |   56 +++----------
1368  fs/ocfs2/dlm/dlmdomain.c     |   44 +++++-----
1369  fs/ocfs2/dlm/dlmlock.c       |   54 ++++++------
1370  fs/ocfs2/dlm/dlmmaster.c     |  175 +++++++++++++++++++-------------------
1371  fs/ocfs2/dlm/dlmrecovery.c   |  164 ++++++++++++++++++------------------
1372  fs/ocfs2/dlm/dlmthread.c     |   16 ++--
1373  fs/ocfs2/dlmglue.c           |   21 +++--
1374  fs/ocfs2/extent_map.c        |   96 +++++++++++++++++++++
1375  fs/ocfs2/extent_map.h        |    2 +
1376  fs/ocfs2/file.c              |   93 ++++++++++++++++++++-
1377  fs/ocfs2/inode.h             |    3 +
1378  fs/ocfs2/ioctl.c             |    8 +-
1379  fs/ocfs2/journal.c           |   23 +++++-
1380  fs/ocfs2/mmap.c              |   53 +++++------
1381  fs/ocfs2/move_extents.c      |    2 +-
1382  fs/ocfs2/ocfs2.h             |    4 +-
1383  fs/ocfs2/quota_local.c       |   13 ++-
1384  fs/ocfs2/slot_map.c          |    4 +-
1385  fs/ocfs2/stack_o2cb.c        |   71 ++++++++++++++--
1386  fs/ocfs2/super.c             |   23 +++--
1387  fs/ocfs2/xattr.c             |    9 ++-
1388  28 files changed, 932 insertions(+), 524 deletions(-)
1389 Merging omfs/for-next
1390 $ git merge omfs/for-next
1391 Already up-to-date.
1392 Merging squashfs/master
1393 $ git merge squashfs/master
1394 Already up-to-date.
1395 Merging udf/for_next
1396 $ git merge udf/for_next
1397 Already up-to-date.
1398 Merging v9fs/for-next
1399 $ git merge v9fs/for-next
1400 Merge made by recursive.
1401  fs/9p/v9fs_vfs.h           |    6 +-
1402  fs/9p/vfs_dir.c            |    2 +-
1403  fs/9p/vfs_file.c           |   35 +++-
1404  fs/9p/vfs_inode.c          |  140 ++++++++++------
1405  fs/9p/vfs_inode_dotl.c     |   86 ++++++++--
1406  fs/9p/vfs_super.c          |    2 +-
1407  include/net/9p/9p.h        |   40 ++++-
1408  include/net/9p/transport.h |   10 +-
1409  net/9p/client.c            |  391 ++++++++++++++++++++++++++++++++-----------
1410  net/9p/protocol.c          |   46 +-----
1411  net/9p/protocol.h          |    1 +
1412  net/9p/trans_common.c      |   53 ++-----
1413  net/9p/trans_common.h      |   21 +--
1414  net/9p/trans_virtio.c      |  324 ++++++++++++++++++++++---------------
1415  14 files changed, 736 insertions(+), 421 deletions(-)
1416 Merging ubifs/linux-next
1417 $ git merge ubifs/linux-next
1418 Merge made by recursive.
1419  fs/ubifs/debug.h |    6 +++---
1420  1 files changed, 3 insertions(+), 3 deletions(-)
1421 Merging xfs/master
1422 $ git merge xfs/master
1423 Already up-to-date.
1424 Merging vfs/for-next
1425 $ git merge vfs/for-next
1426 Already up-to-date.
1427 Merging vfs-scale/vfs-scale-working
1428 $ git merge vfs-scale/vfs-scale-working
1429 Already up-to-date.
1430 Merging pci/linux-next
1431 $ git merge pci/linux-next
1432 Already up-to-date.
1433 Merging hid/for-next
1434 $ git merge hid/for-next
1435 Merge made by recursive.
1436  .../ABI/testing/sysfs-driver-hid-logitech-lg4ff    |    7 +
1437  drivers/hid/Kconfig                                |   19 +-
1438  drivers/hid/Makefile                               |    2 +-
1439  drivers/hid/hid-apple.c                            |    9 +
1440  drivers/hid/hid-axff.c                             |   36 ++-
1441  drivers/hid/hid-core.c                             |   50 ++-
1442  drivers/hid/hid-debug.c                            |    5 +
1443  drivers/hid/hid-ids.h                              |    7 +
1444  drivers/hid/hid-lg.c                               |   29 +-
1445  drivers/hid/hid-lg.h                               |    4 +-
1446  drivers/hid/hid-lg4ff.c                            |  403 ++++++++++++++++++--
1447  drivers/hid/hid-lgff.c                             |   13 -
1448  drivers/hid/hid-magicmouse.c                       |   56 +++-
1449  drivers/hid/hid-multitouch.c                       |   15 +
1450  drivers/hid/hid-prodikeys.c                        |    8 +-
1451  drivers/hid/hid-sjoy.c                             |   68 ++--
1452  drivers/hid/hid-zydacron.c                         |    4 +-
1453  drivers/hid/usbhid/hid-quirks.c                    |    1 -
1454  include/linux/hid.h                                |    2 +
1455  19 files changed, 615 insertions(+), 123 deletions(-)
1456  create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
1457 Merging quilt/i2c
1458 $ git merge quilt/i2c
1459 Merge made by recursive.
1460  drivers/i2c/busses/Kconfig |    2 +-
1461  1 files changed, 1 insertions(+), 1 deletions(-)
1462 Merging bjdooks-i2c/next-i2c
1463 $ git merge bjdooks-i2c/next-i2c
1464 Already up-to-date.
1465 Merging quilt/jdelvare-hwmon
1466 $ git merge quilt/jdelvare-hwmon
1467 Merge made by recursive.
1468  drivers/hwmon/Kconfig  |   15 ++++++++++-
1469  drivers/hwmon/ibmaem.c |   60 +++++++++++++++++++++++++++--------------------
1470  2 files changed, 47 insertions(+), 28 deletions(-)
1471 Merging hwmon-staging/hwmon-next
1472 $ git merge hwmon-staging/hwmon-next
1473 Merge made by recursive.
1474  drivers/hwmon/ntc_thermistor.c |    3 +-
1475  drivers/hwmon/w83627ehf.c      |   62 ++++++++++++++++++++++++++++++++++++++++
1476  2 files changed, 63 insertions(+), 2 deletions(-)
1477 Merging quilt/kernel-doc
1478 $ git merge quilt/kernel-doc
1479 Merge made by recursive.
1480  Documentation/cgroups/cgroups.txt |    4 ++--
1481  1 files changed, 2 insertions(+), 2 deletions(-)
1482 Merging docs/docs-move
1483 $ git merge docs/docs-move
1484 Already up-to-date.
1485 Merging v4l-dvb/master
1486 $ git merge v4l-dvb/master
1487 Already up-to-date.
1488 Merging kbuild/for-next
1489 $ git merge kbuild/for-next
1490 Merge made by recursive.
1491  scripts/kconfig/Makefile             |   28 ++--------------------------
1492  scripts/kconfig/menu.c               |   13 +++++--------
1493  scripts/kconfig/nconf.c              |    2 --
1494  scripts/kconfig/streamline_config.pl |   22 +++++++++++++++++++---
1495  4 files changed, 26 insertions(+), 39 deletions(-)
1496 Merging kconfig/for-next
1497 $ git merge kconfig/for-next
1498 Already up-to-date!
1499 Merge made by recursive.
1500 Merging ide/master
1501 $ git merge ide/master
1502 Already up-to-date.
1503 Merging libata/NEXT
1504 $ git merge libata/NEXT
1505 Merge made by recursive.
1506  drivers/ata/libata-eh.c  |    5 ++---
1507  drivers/ata/sata_sil24.c |    4 ++--
1508  2 files changed, 4 insertions(+), 5 deletions(-)
1509 Merging infiniband/for-next
1510 $ git merge infiniband/for-next
1511 Already up-to-date.
1512 Merging acpi/test
1513 $ git merge acpi/test
1514 Auto-merging Documentation/kernel-parameters.txt
1515 Merge made by recursive.
1516  Documentation/kernel-parameters.txt |    9 ++++++---
1517  drivers/acpi/acpica/hwxface.c       |    3 +--
1518  drivers/acpi/apei/Kconfig           |    1 +
1519  drivers/acpi/apei/apei-base.c       |    2 +-
1520  drivers/acpi/reboot.c               |    3 +--
1521  drivers/acpi/scan.c                 |    3 +--
1522  6 files changed, 11 insertions(+), 10 deletions(-)
1523 Merging idle-test/idle-test
1524 $ git merge idle-test/idle-test
1525 Already up-to-date.
1526 Merging powertools/tools-test
1527 $ git merge powertools/tools-test
1528 Already up-to-date.
1529 Merging cpupowerutils/master
1530 $ git merge cpupowerutils/master
1531 Removing tools/power/cpupower/debug/x86_64/centrino-decode.c
1532 Removing tools/power/cpupower/debug/x86_64/powernow-k8-decode.c
1533 Merge made by recursive.
1534  tools/power/cpupower/Makefile                      |    7 +-
1535  tools/power/cpupower/debug/x86_64/Makefile         |    8 +-
1536  .../power/cpupower/debug/x86_64/centrino-decode.c  |    1 -
1537  .../cpupower/debug/x86_64/powernow-k8-decode.c     |    1 -
1538  tools/power/cpupower/man/cpupower-frequency-info.1 |    6 +-
1539  tools/power/cpupower/man/cpupower-frequency-set.1  |    8 +-
1540  tools/power/cpupower/man/cpupower.1                |   14 +-
1541  tools/power/cpupower/utils/builtin.h               |    7 -
1542  tools/power/cpupower/utils/cpufreq-info.c          |   42 +-----
1543  tools/power/cpupower/utils/cpufreq-set.c           |   29 +---
1544  tools/power/cpupower/utils/cpuidle-info.c          |   24 +---
1545  tools/power/cpupower/utils/cpupower-info.c         |   20 +--
1546  tools/power/cpupower/utils/cpupower-set.c          |   25 +---
1547  tools/power/cpupower/utils/cpupower.c              |   91 ++++++-----
1548  tools/power/cpupower/utils/helpers/helpers.h       |   12 ++
1549  tools/power/cpupower/utils/helpers/sysfs.c         |   50 ++++++
1550  tools/power/cpupower/utils/helpers/sysfs.h         |    2 +
1551  tools/power/cpupower/utils/helpers/topology.c      |    5 +-
1552  .../cpupower/utils/idle_monitor/cpuidle_sysfs.c    |    2 +-
1553  .../cpupower/utils/idle_monitor/cpupower-monitor.c |   66 ++++----
1554  .../cpupower/utils/idle_monitor/mperf_monitor.c    |  177 ++++++++++++++-----
1555  21 files changed, 308 insertions(+), 289 deletions(-)
1556  delete mode 120000 tools/power/cpupower/debug/x86_64/centrino-decode.c
1557  delete mode 120000 tools/power/cpupower/debug/x86_64/powernow-k8-decode.c
1558 Merging ieee1394/for-next
1559 $ git merge ieee1394/for-next
1560 Merge made by recursive.
1561  drivers/firewire/sbp2.c |    4 ++++
1562  1 files changed, 4 insertions(+), 0 deletions(-)
1563 Merging ubi/linux-next
1564 $ git merge ubi/linux-next
1565 Already up-to-date.
1566 Merging dlm/next
1567 $ git merge dlm/next
1568 Already up-to-date.
1569 Merging swiotlb/master
1570 $ git merge swiotlb/master
1571 Merge made by recursive.
1572 Merging ibft/master
1573 $ git merge ibft/master
1574 Merge made by recursive.
1575 Merging scsi/master
1576 $ git merge scsi/master
1577 Already up-to-date.
1578 Merging iscsi-target/for-next
1579 $ git merge iscsi-target/for-next
1580 Already up-to-date.
1581 Merging slave-dma/next
1582 $ git merge slave-dma/next
1583 Merge made by recursive.
1584  drivers/dma/at_hdmac.c      |  159 +++++++++++++++++++++++++++++++++---------
1585  drivers/dma/at_hdmac_regs.h |   24 +++++++
1586  drivers/dma/dmatest.c       |    6 ++
1587  drivers/dma/mxs-dma.c       |   45 +++++++------
1588  include/linux/dmaengine.h   |   13 +++-
1589  5 files changed, 190 insertions(+), 57 deletions(-)
1590 Merging async_tx/next
1591 $ git merge async_tx/next
1592 Already up-to-date.
1593 Merging net/master
1594 $ git merge net/master
1595 Auto-merging MAINTAINERS
1596 Auto-merging arch/mips/Kconfig
1597 Auto-merging arch/powerpc/Kconfig
1598 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.
1599 Auto-merging arch/powerpc/configs/ppc40x_defconfig
1600 Auto-merging arch/powerpc/platforms/40x/Kconfig
1601 Auto-merging drivers/bcma/main.c
1602 Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c
1603 Auto-merging drivers/net/Kconfig
1604 CONFLICT (content): Merge conflict in drivers/net/Kconfig
1605 Auto-merging drivers/net/Makefile
1606 CONFLICT (content): Merge conflict in drivers/net/Makefile
1607 Removing drivers/net/arm/Kconfig
1608 Removing drivers/net/arm/Makefile
1609 Removing drivers/net/benet/Kconfig
1610 Removing drivers/net/bna/bfi_ctreg.h
1611 Removing drivers/net/bna/bfi_ll.h
1612 Removing drivers/net/bna/bna_ctrl.c
1613 Removing drivers/net/bna/bna_hw.h
1614 Removing drivers/net/bna/bna_txrx.c
1615 Auto-merging drivers/net/cris/eth_v10.c
1616 Auto-merging drivers/net/ethernet/3com/3c501.c
1617 Auto-merging drivers/net/ethernet/3com/3c509.c
1618 Auto-merging drivers/net/ethernet/3com/3c515.c
1619 Auto-merging drivers/net/ethernet/3com/3c574_cs.c
1620 Auto-merging drivers/net/ethernet/3com/3c589_cs.c
1621 Auto-merging drivers/net/ethernet/3com/3c59x.c
1622 Auto-merging drivers/net/ethernet/3com/typhoon.c
1623 Auto-merging drivers/net/ethernet/8390/3c503.c
1624 Auto-merging drivers/net/ethernet/8390/8390.c
1625 Auto-merging drivers/net/ethernet/8390/8390p.c
1626 Auto-merging drivers/net/ethernet/8390/ac3200.c
1627 Auto-merging drivers/net/ethernet/8390/ax88796.c
1628 Auto-merging drivers/net/ethernet/8390/axnet_cs.c
1629 Auto-merging drivers/net/ethernet/8390/e2100.c
1630 Auto-merging drivers/net/ethernet/8390/etherh.c
1631 Auto-merging drivers/net/ethernet/8390/hp-plus.c
1632 Auto-merging drivers/net/ethernet/8390/hydra.c
1633 Auto-merging drivers/net/ethernet/8390/mac8390.c
1634 Auto-merging drivers/net/ethernet/8390/ne-h8300.c
1635 Auto-merging drivers/net/ethernet/8390/ne2k-pci.c
1636 Auto-merging drivers/net/ethernet/8390/pcnet_cs.c
1637 Auto-merging drivers/net/ethernet/8390/smc-mca.c
1638 Auto-merging drivers/net/ethernet/8390/smc-ultra.c
1639 Auto-merging drivers/net/ethernet/8390/smc-ultra32.c
1640 Auto-merging drivers/net/ethernet/8390/wd.c
1641 Auto-merging drivers/net/ethernet/8390/zorro8390.c
1642 Auto-merging drivers/net/ethernet/adaptec/starfire.c
1643 Auto-merging drivers/net/ethernet/adi/bfin_mac.c
1644 Auto-merging drivers/net/ethernet/aeroflex/greth.c
1645 Auto-merging drivers/net/ethernet/alteon/acenic.c
1646 Auto-merging drivers/net/ethernet/amd/a2065.c
1647 Auto-merging drivers/net/ethernet/amd/am79c961a.c
1648 Auto-merging drivers/net/ethernet/amd/amd8111e.c
1649 Auto-merging drivers/net/ethernet/amd/ariadne.c
1650 Auto-merging drivers/net/ethernet/amd/atarilance.c
1651 Auto-merging drivers/net/ethernet/amd/au1000_eth.c
1652 Auto-merging drivers/net/ethernet/amd/declance.c
1653 Auto-merging drivers/net/ethernet/amd/depca.c
1654 Auto-merging drivers/net/ethernet/amd/hplance.c
1655 Auto-merging drivers/net/ethernet/amd/lance.c
1656 Auto-merging drivers/net/ethernet/amd/mvme147.c
1657 Auto-merging drivers/net/ethernet/amd/ni65.c
1658 Auto-merging drivers/net/ethernet/amd/nmclan_cs.c
1659 Auto-merging drivers/net/ethernet/amd/pcnet32.c
1660 Auto-merging drivers/net/ethernet/amd/sun3lance.c
1661 Auto-merging drivers/net/ethernet/amd/sunlance.c
1662 Auto-merging drivers/net/ethernet/apple/bmac.c
1663 Auto-merging drivers/net/ethernet/apple/cs89x0.c
1664 Auto-merging drivers/net/ethernet/apple/mac89x0.c
1665 Auto-merging drivers/net/ethernet/apple/mace.c
1666 Auto-merging drivers/net/ethernet/apple/macmace.c
1667 Auto-merging drivers/net/ethernet/atheros/atl1c/atl1c_main.c
1668 Auto-merging drivers/net/ethernet/atheros/atl1e/atl1e_main.c
1669 Auto-merging drivers/net/ethernet/atheros/atlx/atl1.c
1670 Auto-merging drivers/net/ethernet/atheros/atlx/atl2.c
1671 Auto-merging drivers/net/ethernet/broadcom/b44.c
1672 Auto-merging drivers/net/ethernet/broadcom/bcm63xx_enet.c
1673 Auto-merging drivers/net/ethernet/broadcom/bnx2.c
1674 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
1675 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
1676 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
1677 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
1678 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
1679 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
1680 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
1681 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
1682 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
1683 Auto-merging drivers/net/ethernet/broadcom/cnic.c
1684 Auto-merging drivers/net/ethernet/broadcom/sb1250-mac.c
1685 Auto-merging drivers/net/ethernet/broadcom/tg3.c
1686 Auto-merging drivers/net/ethernet/broadcom/tg3.h
1687 Auto-merging drivers/net/ethernet/brocade/bna/Makefile
1688 Auto-merging drivers/net/ethernet/brocade/bna/bfa_cee.c
1689 Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs.h
1690 Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
1691 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.c
1692 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.h
1693 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
1694 Auto-merging drivers/net/ethernet/brocade/bna/bfi.h
1695 Auto-merging drivers/net/ethernet/brocade/bna/bna.h
1696 Auto-merging drivers/net/ethernet/brocade/bna/bna_types.h
1697 Auto-merging drivers/net/ethernet/brocade/bna/bnad.c
1698 Auto-merging drivers/net/ethernet/brocade/bna/bnad.h
1699 Auto-merging drivers/net/ethernet/brocade/bna/bnad_ethtool.c
1700 Auto-merging drivers/net/ethernet/brocade/bna/cna.h
1701 Auto-merging drivers/net/ethernet/cadence/at91_ether.c
1702 Auto-merging drivers/net/ethernet/cadence/macb.c
1703 Auto-merging drivers/net/ethernet/chelsio/cxgb/cxgb2.c
1704 Auto-merging drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
1705 Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
1706 Auto-merging drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
1707 Auto-merging drivers/net/ethernet/cisco/enic/enic_main.c
1708 Auto-merging drivers/net/ethernet/davicom/dm9000.c
1709 Auto-merging drivers/net/ethernet/dec/ewrk3.c
1710 Auto-merging drivers/net/ethernet/dec/tulip/Kconfig
1711 Auto-merging drivers/net/ethernet/dec/tulip/de2104x.c
1712 Auto-merging drivers/net/ethernet/dec/tulip/de4x5.c
1713 Auto-merging drivers/net/ethernet/dec/tulip/dmfe.c
1714 Auto-merging drivers/net/ethernet/dec/tulip/tulip_core.c
1715 Auto-merging drivers/net/ethernet/dec/tulip/uli526x.c
1716 Auto-merging drivers/net/ethernet/dec/tulip/winbond-840.c
1717 Auto-merging drivers/net/ethernet/dlink/de620.c
1718 Auto-merging drivers/net/ethernet/dlink/dl2k.c
1719 Auto-merging drivers/net/ethernet/dlink/sundance.c
1720 Auto-merging drivers/net/ethernet/emulex/benet/be.h
1721 Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.c
1722 Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.h
1723 Auto-merging drivers/net/ethernet/emulex/benet/be_ethtool.c
1724 Auto-merging drivers/net/ethernet/emulex/benet/be_hw.h
1725 Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
1726 Auto-merging drivers/net/ethernet/ethoc.c
1727 Auto-merging drivers/net/ethernet/fealnx.c
1728 Auto-merging drivers/net/ethernet/freescale/fec.c
1729 Auto-merging drivers/net/ethernet/freescale/fec_mpc52xx.c
1730 Auto-merging drivers/net/ethernet/freescale/fs_enet/Kconfig
1731 Auto-merging drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
1732 Auto-merging drivers/net/ethernet/freescale/gianfar.c
1733 Auto-merging drivers/net/ethernet/freescale/ucc_geth.c
1734 Auto-merging drivers/net/ethernet/fujitsu/at1700.c
1735 Auto-merging drivers/net/ethernet/fujitsu/eth16i.c
1736 Auto-merging drivers/net/ethernet/fujitsu/fmvj18x_cs.c
1737 Auto-merging drivers/net/ethernet/hp/hp100.c
1738 Auto-merging drivers/net/ethernet/i825xx/3c505.c
1739 Auto-merging drivers/net/ethernet/i825xx/3c523.c
1740 Auto-merging drivers/net/ethernet/i825xx/3c527.c
1741 Auto-merging drivers/net/ethernet/i825xx/82596.c
1742 Auto-merging drivers/net/ethernet/i825xx/eepro.c
1743 Auto-merging drivers/net/ethernet/i825xx/eexpress.c
1744 Auto-merging drivers/net/ethernet/i825xx/ether1.c
1745 Auto-merging drivers/net/ethernet/i825xx/lib82596.c
1746 Auto-merging drivers/net/ethernet/i825xx/lp486e.c
1747 Auto-merging drivers/net/ethernet/i825xx/ni52.c
1748 Auto-merging drivers/net/ethernet/i825xx/sun3_82586.c
1749 Auto-merging drivers/net/ethernet/i825xx/znet.c
1750 Auto-merging drivers/net/ethernet/ibm/ehea/ehea_main.c
1751 Auto-merging drivers/net/ethernet/ibm/emac/Kconfig
1752 Auto-merging drivers/net/ethernet/ibm/emac/core.c
1753 Auto-merging drivers/net/ethernet/ibm/emac/core.h
1754 Auto-merging drivers/net/ethernet/ibm/emac/debug.h
1755 Auto-merging drivers/net/ethernet/ibm/emac/mal.c
1756 Auto-merging drivers/net/ethernet/ibm/emac/mal.h
1757 Auto-merging drivers/net/ethernet/ibm/emac/rgmii.h
1758 Auto-merging drivers/net/ethernet/ibm/emac/tah.h
1759 Auto-merging drivers/net/ethernet/ibm/emac/zmii.h
1760 Auto-merging drivers/net/ethernet/ibm/ibmveth.c
1761 Auto-merging drivers/net/ethernet/ibm/iseries_veth.c
1762 Auto-merging drivers/net/ethernet/icplus/ipg.c
1763 Auto-merging drivers/net/ethernet/intel/e100.c
1764 Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c
1765 Auto-merging drivers/net/ethernet/intel/e1000e/Makefile
1766 Auto-merging drivers/net/ethernet/intel/e1000e/e1000.h
1767 Auto-merging drivers/net/ethernet/intel/e1000e/ethtool.c
1768 Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
1769 Auto-merging drivers/net/ethernet/intel/igb/igb_main.c
1770 Auto-merging drivers/net/ethernet/intel/igbvf/netdev.c
1771 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_main.c
1772 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe.h
1773 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
1774 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
1775 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
1776 Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
1777 Auto-merging drivers/net/ethernet/jme.c
1778 Auto-merging drivers/net/ethernet/korina.c
1779 Auto-merging drivers/net/ethernet/lantiq_etop.c
1780 Auto-merging drivers/net/ethernet/marvell/mv643xx_eth.c
1781 Auto-merging drivers/net/ethernet/marvell/skge.c
1782 Auto-merging drivers/net/ethernet/marvell/sky2.c
1783 Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c
1784 Auto-merging drivers/net/ethernet/micrel/ks8695net.c
1785 Auto-merging drivers/net/ethernet/microchip/enc28j60.c
1786 Auto-merging drivers/net/ethernet/mipsnet.c
1787 Auto-merging drivers/net/ethernet/myricom/myri10ge/myri10ge.c
1788 Auto-merging drivers/net/ethernet/natsemi/ibmlana.c
1789 Auto-merging drivers/net/ethernet/natsemi/jazzsonic.c
1790 Auto-merging drivers/net/ethernet/natsemi/macsonic.c
1791 Auto-merging drivers/net/ethernet/natsemi/natsemi.c
1792 Auto-merging drivers/net/ethernet/natsemi/ns83820.c
1793 Auto-merging drivers/net/ethernet/natsemi/xtsonic.c
1794 Auto-merging drivers/net/ethernet/neterion/s2io.c
1795 Auto-merging drivers/net/ethernet/neterion/vxge/vxge-main.c
1796 Auto-merging drivers/net/ethernet/netx-eth.c
1797 Auto-merging drivers/net/ethernet/nuvoton/w90p910_ether.c
1798 Auto-merging drivers/net/ethernet/nvidia/forcedeth.c
1799 Auto-merging drivers/net/ethernet/octeon/Kconfig
1800 Auto-merging drivers/net/ethernet/octeon/octeon_mgmt.c
1801 Auto-merging drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
1802 Auto-merging drivers/net/ethernet/packetengines/hamachi.c
1803 Auto-merging drivers/net/ethernet/packetengines/yellowfin.c
1804 Auto-merging drivers/net/ethernet/pasemi/pasemi_mac.c
1805 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic.h
1806 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
1807 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
1808 Auto-merging drivers/net/ethernet/qlogic/qla3xxx.c
1809 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
1810 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
1811 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
1812 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
1813 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
1814 Auto-merging drivers/net/ethernet/qlogic/qlge/qlge_main.c
1815 Auto-merging drivers/net/ethernet/racal/ni5010.c
1816 Auto-merging drivers/net/ethernet/rdc/r6040.c
1817 Auto-merging drivers/net/ethernet/realtek/8139cp.c
1818 Auto-merging drivers/net/ethernet/realtek/8139too.c
1819 Auto-merging drivers/net/ethernet/realtek/atp.c
1820 Auto-merging drivers/net/ethernet/realtek/r8169.c
1821 Auto-merging drivers/net/ethernet/realtek/sc92031.c
1822 Auto-merging drivers/net/ethernet/renesas/sh_eth.c
1823 Auto-merging drivers/net/ethernet/seeq/ether3.c
1824 Auto-merging drivers/net/ethernet/seeq/seeq8005.c
1825 Auto-merging drivers/net/ethernet/seeq/sgiseeq.c
1826 Auto-merging drivers/net/ethernet/sfc/Kconfig
1827 Auto-merging drivers/net/ethernet/sfc/efx.c
1828 Auto-merging drivers/net/ethernet/sgi/ioc3-eth.c
1829 Auto-merging drivers/net/ethernet/sis/sis190.c
1830 Auto-merging drivers/net/ethernet/sis/sis900.c
1831 Auto-merging drivers/net/ethernet/smsc/epic100.c
1832 Auto-merging drivers/net/ethernet/smsc/smc911x.c
1833 Auto-merging drivers/net/ethernet/smsc/smc9194.c
1834 Auto-merging drivers/net/ethernet/smsc/smc91c92_cs.c
1835 Auto-merging drivers/net/ethernet/smsc/smc91x.c
1836 Auto-merging drivers/net/ethernet/smsc/smsc911x.c
1837 Auto-merging drivers/net/ethernet/smsc/smsc9420.c
1838 Auto-merging drivers/net/ethernet/stmicro/stmmac/Kconfig
1839 Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
1840 Auto-merging drivers/net/ethernet/sun/cassini.c
1841 Auto-merging drivers/net/ethernet/sun/niu.c
1842 Auto-merging drivers/net/ethernet/sun/sunbmac.c
1843 Auto-merging drivers/net/ethernet/sun/sungem.c
1844 Auto-merging drivers/net/ethernet/sun/sunhme.c
1845 Auto-merging drivers/net/ethernet/sun/sunqe.c
1846 Auto-merging drivers/net/ethernet/sun/sunvnet.c
1847 Auto-merging drivers/net/ethernet/tehuti/tehuti.c
1848 Auto-merging drivers/net/ethernet/ti/cpmac.c
1849 Auto-merging drivers/net/ethernet/ti/davinci_emac.c
1850 Auto-merging drivers/net/ethernet/ti/tlan.c
1851 Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_net.c
1852 Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
1853 Auto-merging drivers/net/ethernet/toshiba/spider_net.c
1854 Auto-merging drivers/net/ethernet/toshiba/spider_net.h
1855 Auto-merging drivers/net/ethernet/toshiba/tc35815.c
1856 Auto-merging drivers/net/ethernet/tundra/tsi108_eth.c
1857 Auto-merging drivers/net/ethernet/via/via-rhine.c
1858 Auto-merging drivers/net/ethernet/via/via-velocity.c
1859 Auto-merging drivers/net/ethernet/xilinx/ll_temac_main.c
1860 Auto-merging drivers/net/ethernet/xircom/xirc2ps_cs.c
1861 Auto-merging drivers/net/ethernet/xscale/ixp2000/Kconfig
1862 Auto-merging drivers/net/ethernet/xscale/ixp4xx_eth.c
1863 Removing drivers/net/ibm_newemac/Makefile
1864 Removing drivers/net/octeon/Makefile
1865 Removing drivers/net/pci-skeleton.c
1866 Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
1867 Auto-merging drivers/net/wireless/wl12xx/main.c
1868 Removing drivers/staging/ath6kl/Kconfig
1869 Removing drivers/staging/ath6kl/Makefile
1870 Removing drivers/staging/ath6kl/TODO
1871 Removing drivers/staging/ath6kl/bmi/include/bmi_internal.h
1872 Removing drivers/staging/ath6kl/bmi/src/bmi.c
1873 Removing drivers/staging/ath6kl/hif/common/hif_sdio_common.h
1874 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
1875 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
1876 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
1877 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.c
1878 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.h
1879 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
1880 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
1881 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
1882 Removing drivers/staging/ath6kl/htc2/htc.c
1883 Removing drivers/staging/ath6kl/htc2/htc_debug.h
1884 Removing drivers/staging/ath6kl/htc2/htc_internal.h
1885 Removing drivers/staging/ath6kl/htc2/htc_recv.c
1886 Removing drivers/staging/ath6kl/htc2/htc_send.c
1887 Removing drivers/staging/ath6kl/htc2/htc_services.c
1888 Removing drivers/staging/ath6kl/include/a_config.h
1889 Removing drivers/staging/ath6kl/include/a_debug.h
1890 Removing drivers/staging/ath6kl/include/a_drv.h
1891 Removing drivers/staging/ath6kl/include/a_drv_api.h
1892 Removing drivers/staging/ath6kl/include/a_osapi.h
1893 Removing drivers/staging/ath6kl/include/aggr_recv_api.h
1894 Removing drivers/staging/ath6kl/include/ar3kconfig.h
1895 Removing drivers/staging/ath6kl/include/ar6000_api.h
1896 Removing drivers/staging/ath6kl/include/ar6000_diag.h
1897 Removing drivers/staging/ath6kl/include/ar6kap_common.h
1898 Removing drivers/staging/ath6kl/include/athbtfilter.h
1899 Removing drivers/staging/ath6kl/include/bmi.h
1900 Removing drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
1901 Removing drivers/staging/ath6kl/include/common/AR6002/addrs.h
1902 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
1903 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
1904 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
1905 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
1906 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
1907 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
1908 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
1909 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
1910 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
1911 Removing drivers/staging/ath6kl/include/common/athdefs.h
1912 Removing drivers/staging/ath6kl/include/common/bmi_msg.h
1913 Removing drivers/staging/ath6kl/include/common/cnxmgmt.h
1914 Removing drivers/staging/ath6kl/include/common/dbglog.h
1915 Removing drivers/staging/ath6kl/include/common/dbglog_id.h
1916 Removing drivers/staging/ath6kl/include/common/discovery.h
1917 Removing drivers/staging/ath6kl/include/common/epping_test.h
1918 Removing drivers/staging/ath6kl/include/common/gmboxif.h
1919 Removing drivers/staging/ath6kl/include/common/gpio_reg.h
1920 Removing drivers/staging/ath6kl/include/common/htc.h
1921 Removing drivers/staging/ath6kl/include/common/htc_services.h
1922 Removing drivers/staging/ath6kl/include/common/pkt_log.h
1923 Removing drivers/staging/ath6kl/include/common/roaming.h
1924 Removing drivers/staging/ath6kl/include/common/targaddrs.h
1925 Removing drivers/staging/ath6kl/include/common/testcmd.h
1926 Removing drivers/staging/ath6kl/include/common/tlpm.h
1927 Removing drivers/staging/ath6kl/include/common/wlan_defs.h
1928 Removing drivers/staging/ath6kl/include/common/wmi.h
1929 Removing drivers/staging/ath6kl/include/common/wmix.h
1930 Removing drivers/staging/ath6kl/include/common_drv.h
1931 Removing drivers/staging/ath6kl/include/dbglog_api.h
1932 Removing drivers/staging/ath6kl/include/dl_list.h
1933 Removing drivers/staging/ath6kl/include/dset_api.h
1934 Removing drivers/staging/ath6kl/include/hci_transport_api.h
1935 Removing drivers/staging/ath6kl/include/hif.h
1936 Removing drivers/staging/ath6kl/include/host_version.h
1937 Removing drivers/staging/ath6kl/include/htc_api.h
1938 Removing drivers/staging/ath6kl/include/htc_packet.h
1939 Removing drivers/staging/ath6kl/include/wlan_api.h
1940 Removing drivers/staging/ath6kl/include/wmi_api.h
1941 Removing drivers/staging/ath6kl/miscdrv/ar3kconfig.c
1942 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
1943 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
1944 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
1945 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
1946 Removing drivers/staging/ath6kl/miscdrv/common_drv.c
1947 Removing drivers/staging/ath6kl/miscdrv/credit_dist.c
1948 Removing drivers/staging/ath6kl/miscdrv/miscdrv.h
1949 Removing drivers/staging/ath6kl/os/linux/ar6000_drv.c
1950 Removing drivers/staging/ath6kl/os/linux/ar6000_pm.c
1951 Removing drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
1952 Removing drivers/staging/ath6kl/os/linux/cfg80211.c
1953 Removing drivers/staging/ath6kl/os/linux/export_hci_transport.c
1954 Removing drivers/staging/ath6kl/os/linux/hci_bridge.c
1955 Removing drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
1956 Removing drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
1957 Removing drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
1958 Removing drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
1959 Removing drivers/staging/ath6kl/os/linux/include/cfg80211.h
1960 Removing drivers/staging/ath6kl/os/linux/include/config_linux.h
1961 Removing drivers/staging/ath6kl/os/linux/include/debug_linux.h
1962 Removing drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
1963 Removing drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
1964 Removing drivers/staging/ath6kl/os/linux/include/osapi_linux.h
1965 Removing drivers/staging/ath6kl/os/linux/include/wlan_config.h
1966 Removing drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
1967 Removing drivers/staging/ath6kl/os/linux/netbuf.c
1968 Removing drivers/staging/ath6kl/reorder/aggr_rx_internal.h
1969 Removing drivers/staging/ath6kl/reorder/rcv_aggr.c
1970 Removing drivers/staging/ath6kl/wlan/include/ieee80211.h
1971 Removing drivers/staging/ath6kl/wlan/include/ieee80211_node.h
1972 Removing drivers/staging/ath6kl/wlan/src/wlan_node.c
1973 Removing drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
1974 Removing drivers/staging/ath6kl/wlan/src/wlan_utils.c
1975 Removing drivers/staging/ath6kl/wmi/wmi.c
1976 Removing drivers/staging/ath6kl/wmi/wmi_host.h
1977 Auto-merging include/linux/sungem_phy.h
1978 Auto-mergingResolved 'drivers/net/Kconfig' using previous resolution.
1979 Resolved 'drivers/net/Makefile' using previous resolution.
1980  include/net/cfg80211.h
1981 Auto-merging net/mac80211/main.c
1982 Automatic merge failed; fix conflicts and then commit the result.
1983 $ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
1984 arch/powerpc/configs/40x/hcu4_defconfig: needs merge
1985 drivers/net/Kconfig: needs merge
1986 drivers/net/Makefile: needs merge
1987 rm 'arch/powerpc/configs/40x/hcu4_defconfig'
1988 $ git commit -v -a
1989 [master e87ed46] Merge remote-tracking branch 'net/master'
1990 $ git diff -M --stat --summary HEAD^..
1991  .../devicetree/bindings/net/can/fsl-flexcan.txt    |   63 +-
1992  Documentation/devicetree/bindings/net/smsc911x.txt |   38 +
1993  Documentation/networking/netdevices.txt            |    4 +-
1994  MAINTAINERS                                        |  164 +-
1995  arch/ia64/hp/sim/simeth.c                          |    2 +-
1996  arch/mips/Kconfig                                  |    8 +-
1997  arch/mips/bcm47xx/Kconfig                          |   31 +
1998  arch/mips/bcm47xx/Makefile                         |    3 +-
1999  arch/mips/bcm47xx/gpio.c                           |   82 +-
2000  arch/mips/bcm47xx/irq.c                            |   12 +
2001  arch/mips/bcm47xx/nvram.c                          |   29 +-
2002  arch/mips/bcm47xx/serial.c                         |   46 +-
2003  arch/mips/bcm47xx/setup.c                          |   90 +-
2004  arch/mips/bcm47xx/time.c                           |   16 +-
2005  arch/mips/bcm47xx/wgt634u.c                        |   14 +-
2006  arch/mips/include/asm/mach-bcm47xx/bcm47xx.h       |   26 +-
2007  arch/mips/include/asm/mach-bcm47xx/gpio.h          |  108 +-
2008  arch/mips/pci/pci-bcm47xx.c                        |    6 +
2009  arch/powerpc/Kconfig                               |    2 +
2010  arch/powerpc/boot/dts/p1010rdb.dts                 |   10 +-
2011  arch/powerpc/boot/dts/p1010si.dtsi                 |   10 +-
2012  arch/powerpc/configs/40x/acadia_defconfig          |   11 +-
2013  arch/powerpc/configs/40x/ep405_defconfig           |    5 +-
2014  arch/powerpc/configs/40x/kilauea_defconfig         |    9 +-
2015  arch/powerpc/configs/40x/makalu_defconfig          |    9 +-
2016  arch/powerpc/configs/40x/walnut_defconfig          |    5 +-
2017  arch/powerpc/configs/44x/arches_defconfig          |    9 +-
2018  arch/powerpc/configs/44x/bamboo_defconfig          |    5 +-
2019  arch/powerpc/configs/44x/bluestone_defconfig       |    9 +-
2020  arch/powerpc/configs/44x/canyonlands_defconfig     |    9 +-
2021  arch/powerpc/configs/44x/ebony_defconfig           |    5 +-
2022  arch/powerpc/configs/44x/eiger_defconfig           |    9 +-
2023  arch/powerpc/configs/44x/icon_defconfig            |    5 +-
2024  arch/powerpc/configs/44x/katmai_defconfig          |    5 +-
2025  arch/powerpc/configs/44x/redwood_defconfig         |   11 +-
2026  arch/powerpc/configs/44x/sam440ep_defconfig        |    5 +-
2027  arch/powerpc/configs/44x/sequoia_defconfig         |    5 +-
2028  arch/powerpc/configs/44x/taishan_defconfig         |    5 +-
2029  arch/powerpc/configs/44x/warp_defconfig            |    5 +-
2030  arch/powerpc/configs/ppc40x_defconfig              |    5 +-
2031  arch/powerpc/configs/ppc44x_defconfig              |    5 +-
2032  arch/powerpc/platforms/40x/Kconfig                 |   12 +-
2033  arch/powerpc/platforms/44x/Kconfig                 |   54 +-
2034  arch/powerpc/platforms/cell/Kconfig                |    8 +-
2035  arch/s390/include/asm/qdio.h                       |   78 +-
2036  arch/um/drivers/net_kern.c                         |    2 +-
2037  arch/xtensa/platforms/iss/network.c                |    2 +-
2038  drivers/bcma/Kconfig                               |   13 +
2039  drivers/bcma/Makefile                              |    2 +
2040  drivers/bcma/bcma_private.h                        |   16 +
2041  drivers/bcma/core.c                                |    2 +
2042  drivers/bcma/driver_chipcommon.c                   |   53 +
2043  drivers/bcma/driver_chipcommon_pmu.c               |  133 +
2044  drivers/bcma/driver_mips.c                         |  256 +
2045  drivers/bcma/driver_pci.c                          |   16 +-
2046  drivers/bcma/host_soc.c                            |  183 +
2047  drivers/bcma/main.c                                |   70 +-
2048  drivers/bcma/scan.c                                |  348 +-
2049  drivers/infiniband/hw/cxgb3/Makefile               |    2 +-
2050  drivers/infiniband/hw/cxgb4/Makefile               |    2 +-
2051  drivers/infiniband/hw/mlx4/Kconfig                 |    3 +-
2052  drivers/infiniband/hw/nes/nes_nic.c                |    2 +-
2053  drivers/infiniband/ulp/ipoib/ipoib_main.c          |    2 +-
2054  drivers/media/dvb/dvb-core/dvb_net.c               |    2 +-
2055  drivers/net/Kconfig                                | 2826 +---------
2056  drivers/net/Makefile                               |  235 +-
2057  drivers/net/appletalk/cops.c                       |    2 +-
2058  drivers/net/appletalk/ltpc.c                       |    2 +-
2059  drivers/net/arcnet/com20020.c                      |    2 +-
2060  drivers/net/arm/Kconfig                            |   74 -
2061  drivers/net/arm/Makefile                           |   14 -
2062  drivers/net/benet/Kconfig                          |    6 -
2063  drivers/net/bna/bfi_ctreg.h                        |  646 --
2064  drivers/net/bna/bfi_ll.h                           |  438 --
2065  drivers/net/bna/bna_ctrl.c                         | 3076 ----------
2066  drivers/net/bna/bna_hw.h                           | 1490 -----
2067  drivers/net/bna/bna_txrx.c                         | 4185 -------------
2068  drivers/net/bonding/bond_main.c                    |   55 +-
2069  drivers/net/bonding/bonding.h                      |    1 -
2070  drivers/net/can/flexcan.c                          |  189 +-
2071  drivers/net/can/mscan/mscan.c                      |   26 +-
2072  drivers/net/cris/eth_v10.c                         |    2 +-
2073  drivers/net/defxx.c                                |    2 +-
2074  drivers/net/dummy.c                                |    2 +-
2075  drivers/net/{ => ethernet/3com}/3c501.c            |    2 +-
2076  drivers/net/{ => ethernet/3com}/3c501.h            |    0
2077  drivers/net/{ => ethernet/3com}/3c509.c            |    2 +-
2078  drivers/net/{ => ethernet/3com}/3c515.c            |    2 +-
2079  drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c   |    2 +-
2080  drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c   |    2 +-
2081  drivers/net/{ => ethernet/3com}/3c59x.c            |    4 +-
2082  drivers/net/ethernet/3com/Kconfig                  |  120 +
2083  drivers/net/ethernet/3com/Makefile                 |   11 +
2084  drivers/net/{ => ethernet/3com}/typhoon.c          |    2 +-
2085  drivers/net/{ => ethernet/3com}/typhoon.h          |    0
2086  drivers/net/{ => ethernet/8390}/3c503.c            |    2 +-
2087  drivers/net/{ => ethernet/8390}/3c503.h            |    0
2088  drivers/net/{ => ethernet/8390}/8390.c             |    2 +-
2089  drivers/net/{ => ethernet/8390}/8390.h             |    0
2090  drivers/net/{ => ethernet/8390}/8390p.c            |    2 +-
2091  drivers/net/ethernet/8390/Kconfig                  |  336 +
2092  drivers/net/ethernet/8390/Makefile                 |   29 +
2093  drivers/net/{ => ethernet/8390}/ac3200.c           |    2 +-
2094  drivers/net/{ => ethernet/8390}/apne.c             |    0
2095  drivers/net/{ => ethernet/8390}/ax88796.c          |    2 +-
2096  drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c   |    4 +-
2097  drivers/net/{ => ethernet/8390}/e2100.c            |    2 +-
2098  drivers/net/{ => ethernet/8390}/es3210.c           |    0
2099  drivers/net/{arm => ethernet/8390}/etherh.c        |    4 +-
2100  drivers/net/{ => ethernet/8390}/hp-plus.c          |    2 +-
2101  drivers/net/{ => ethernet/8390}/hp.c               |    0
2102  drivers/net/{ => ethernet/8390}/hydra.c            |    2 +-
2103  drivers/net/{ => ethernet/8390}/lib8390.c          |    0
2104  drivers/net/{ => ethernet/8390}/lne390.c           |    0
2105  drivers/net/{ => ethernet/8390}/mac8390.c          |    2 +-
2106  drivers/net/{ => ethernet/8390}/ne-h8300.c         |    2 +-
2107  drivers/net/{ => ethernet/8390}/ne.c               |    0
2108  drivers/net/{ => ethernet/8390}/ne2.c              |    0
2109  drivers/net/{ => ethernet/8390}/ne2k-pci.c         |    2 +-
2110  drivers/net/{ => ethernet/8390}/ne3210.c           |    0
2111  drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c   |    4 +-
2112  drivers/net/{ => ethernet/8390}/smc-mca.c          |    2 +-
2113  drivers/net/{ => ethernet/8390}/smc-ultra.c        |    2 +-
2114  drivers/net/{ => ethernet/8390}/smc-ultra32.c      |    2 +-
2115  drivers/net/{ => ethernet/8390}/stnic.c            |    0
2116  drivers/net/{ => ethernet/8390}/wd.c               |    2 +-
2117  drivers/net/{ => ethernet/8390}/zorro8390.c        |    2 +-
2118  drivers/net/ethernet/Kconfig                       |  173 +
2119  drivers/net/ethernet/Makefile                      |   74 +
2120  drivers/net/ethernet/adaptec/Kconfig               |   34 +
2121  drivers/net/ethernet/adaptec/Makefile              |    5 +
2122  drivers/net/{ => ethernet/adaptec}/starfire.c      |    2 +-
2123  drivers/net/ethernet/adi/Kconfig                   |   68 +
2124  drivers/net/ethernet/adi/Makefile                  |    5 +
2125  drivers/net/{ => ethernet/adi}/bfin_mac.c          |    2 +-
2126  drivers/net/{ => ethernet/adi}/bfin_mac.h          |    0
2127  drivers/net/ethernet/aeroflex/Kconfig              |   11 +
2128  drivers/net/ethernet/aeroflex/Makefile             |    5 +
2129  drivers/net/{ => ethernet/aeroflex}/greth.c        |    2 +-
2130  drivers/net/{ => ethernet/aeroflex}/greth.h        |    0
2131  drivers/net/ethernet/alteon/Kconfig                |   47 +
2132  drivers/net/ethernet/alteon/Makefile               |    5 +
2133  drivers/net/{ => ethernet/alteon}/acenic.c         |    2 +-
2134  drivers/net/{ => ethernet/alteon}/acenic.h         |    0
2135  drivers/net/{ => ethernet/amd}/7990.c              |    0
2136  drivers/net/{ => ethernet/amd}/7990.h              |    0
2137  drivers/net/ethernet/amd/Kconfig                   |  192 +
2138  drivers/net/ethernet/amd/Makefile                  |   20 +
2139  drivers/net/{ => ethernet/amd}/a2065.c             |    2 +-
2140  drivers/net/{ => ethernet/amd}/a2065.h             |    0
2141  drivers/net/{arm => ethernet/amd}/am79c961a.c      |    2 +-
2142  drivers/net/{arm => ethernet/amd}/am79c961a.h      |    0
2143  drivers/net/{ => ethernet/amd}/amd8111e.c          |    2 +-
2144  drivers/net/{ => ethernet/amd}/amd8111e.h          |    0
2145  drivers/net/{ => ethernet/amd}/ariadne.c           |    2 +-
2146  drivers/net/{ => ethernet/amd}/ariadne.h           |    0
2147  drivers/net/{ => ethernet/amd}/atarilance.c        |    2 +-
2148  drivers/net/{ => ethernet/amd}/au1000_eth.c        |    2 +-
2149  drivers/net/{ => ethernet/amd}/au1000_eth.h        |    0
2150  drivers/net/{ => ethernet/amd}/declance.c          |    2 +-
2151  drivers/net/{ => ethernet/amd}/depca.c             |    2 +-
2152  drivers/net/{ => ethernet/amd}/depca.h             |    0
2153  drivers/net/{ => ethernet/amd}/hplance.c           |    2 +-
2154  drivers/net/{ => ethernet/amd}/hplance.h           |    0
2155  drivers/net/{ => ethernet/amd}/lance.c             |    2 +-
2156  drivers/net/{ => ethernet/amd}/mvme147.c           |    2 +-
2157  drivers/net/{ => ethernet/amd}/ni65.c              |    2 +-
2158  drivers/net/{ => ethernet/amd}/ni65.h              |    0
2159  drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c   |    2 +-
2160  drivers/net/{ => ethernet/amd}/pcnet32.c           |    2 +-
2161  drivers/net/{ => ethernet/amd}/sun3lance.c         |    2 +-
2162  drivers/net/{ => ethernet/amd}/sunlance.c          |    2 +-
2163  drivers/net/ethernet/apple/Kconfig                 |   96 +
2164  drivers/net/ethernet/apple/Makefile                |    9 +
2165  drivers/net/{ => ethernet/apple}/bmac.c            |    2 +-
2166  drivers/net/{ => ethernet/apple}/bmac.h            |    0
2167  drivers/net/{ => ethernet/apple}/cs89x0.c          |    2 +-
2168  drivers/net/{ => ethernet/apple}/cs89x0.h          |    0
2169  drivers/net/{ => ethernet/apple}/mac89x0.c         |    2 +-
2170  drivers/net/{ => ethernet/apple}/mace.c            |    2 +-
2171  drivers/net/{ => ethernet/apple}/mace.h            |    0
2172  drivers/net/{ => ethernet/apple}/macmace.c         |    2 +-
2173  drivers/net/ethernet/atheros/Kconfig               |   65 +
2174  drivers/net/ethernet/atheros/Makefile              |    8 +
2175  drivers/net/{ => ethernet/atheros}/atl1c/Makefile  |    0
2176  drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h   |    0
2177  .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c   |    0
2178  .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c    |    0
2179  .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h    |    0
2180  .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c  |    2 +-
2181  drivers/net/{ => ethernet/atheros}/atl1e/Makefile  |    0
2182  drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h   |    0
2183  .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c   |    0
2184  .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c    |    0
2185  .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h    |    0
2186  .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c  |    2 +-
2187  .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c |    0
2188  drivers/net/{ => ethernet/atheros}/atlx/Makefile   |    0
2189  drivers/net/{ => ethernet/atheros}/atlx/atl1.c     |    2 +-
2190  drivers/net/{ => ethernet/atheros}/atlx/atl1.h     |    0
2191  drivers/net/{ => ethernet/atheros}/atlx/atl2.c     |    2 +-
2192  drivers/net/{ => ethernet/atheros}/atlx/atl2.h     |    0
2193  drivers/net/{ => ethernet/atheros}/atlx/atlx.c     |    0
2194  drivers/net/{ => ethernet/atheros}/atlx/atlx.h     |    0
2195  drivers/net/ethernet/broadcom/Kconfig              |  119 +
2196  drivers/net/ethernet/broadcom/Makefile             |   11 +
2197  drivers/net/{ => ethernet/broadcom}/b44.c          |    2 +-
2198  drivers/net/{ => ethernet/broadcom}/b44.h          |    0
2199  drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c |    2 +-
2200  drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h |    0
2201  drivers/net/{ => ethernet/broadcom}/bnx2.c         |    2 +
2202  drivers/net/{ => ethernet/broadcom}/bnx2.h         |    0
2203  drivers/net/{ => ethernet/broadcom}/bnx2_fw.h      |    0
2204  drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile |    0
2205  drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h  |   67 +-
2206  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c  |   48 +-
2207  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h  |    8 +-
2208  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c  |    5 +-
2209  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h  |    0
2210  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h |    0
2211  .../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c  |   23 +-
2212  .../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h  |    0
2213  .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h            |    0
2214  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h  |    0
2215  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h |    0
2216  .../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h |    0
2217  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c |  153 +-
2218  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h |    0
2219  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c |   75 +-
2220  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h  |    0
2221  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c   |   67 +-
2222  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h   |    0
2223  .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c    |   46 +-
2224  .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h    |    0
2225  drivers/net/{ => ethernet/broadcom}/cnic.c         |    4 +-
2226  drivers/net/{ => ethernet/broadcom}/cnic.h         |    0
2227  drivers/net/{ => ethernet/broadcom}/cnic_defs.h    |    0
2228  drivers/net/{ => ethernet/broadcom}/cnic_if.h      |    0
2229  drivers/net/{ => ethernet/broadcom}/sb1250-mac.c   |    2 +-
2230  drivers/net/{ => ethernet/broadcom}/tg3.c          |  414 +-
2231  drivers/net/{ => ethernet/broadcom}/tg3.h          |    3 +
2232  drivers/net/ethernet/brocade/Kconfig               |   22 +
2233  drivers/net/ethernet/brocade/Makefile              |    5 +
2234  drivers/net/ethernet/brocade/bna/Kconfig           |   17 +
2235  drivers/net/{ => ethernet/brocade}/bna/Makefile    |    5 +-
2236  drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c   |    3 -
2237  drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h   |    0
2238  drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h    |    0
2239  drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h  |   25 +-
2240  .../net/{ => ethernet/brocade}/bna/bfa_defs_cna.h  |    0
2241  .../{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h |   28 +-
2242  .../{ => ethernet/brocade}/bna/bfa_defs_status.h   |    0
2243  drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c   |  405 +-
2244  drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h   |   45 +-
2245  .../net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c    |  157 +-
2246  drivers/net/ethernet/brocade/bna/bfa_msgq.c        |  669 ++
2247  drivers/net/ethernet/brocade/bna/bfa_msgq.h        |  130 +
2248  drivers/net/{ => ethernet/brocade}/bna/bfi.h       |  195 +-
2249  drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h   |    0
2250  drivers/net/ethernet/brocade/bna/bfi_enet.h        |  901 +++
2251  drivers/net/ethernet/brocade/bna/bfi_reg.h         |  452 ++
2252  drivers/net/{ => ethernet/brocade}/bna/bna.h       |  337 +-
2253  drivers/net/ethernet/brocade/bna/bna_enet.c        | 2129 +++++++
2254  drivers/net/ethernet/brocade/bna/bna_hw_defs.h     |  413 ++
2255  drivers/net/ethernet/brocade/bna/bna_tx_rx.c       | 3787 ++++++++++++
2256  drivers/net/{ => ethernet/brocade}/bna/bna_types.h |  654 +--
2257  drivers/net/{ => ethernet/brocade}/bna/bnad.c      |  644 ++-
2258  drivers/net/{ => ethernet/brocade}/bna/bnad.h      |   38 +-
2259  .../net/{ => ethernet/brocade}/bna/bnad_ethtool.c  |  384 +--
2260  drivers/net/{ => ethernet/brocade}/bna/cna.h       |   31 +-
2261  drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c |    0
2262  drivers/net/ethernet/cadence/Kconfig               |   44 +
2263  drivers/net/ethernet/cadence/Makefile              |    6 +
2264  drivers/net/{arm => ethernet/cadence}/at91_ether.c |    2 +-
2265  drivers/net/{arm => ethernet/cadence}/at91_ether.h |    0
2266  drivers/net/{ => ethernet/cadence}/macb.c          |    2 +-
2267  drivers/net/{ => ethernet/cadence}/macb.h          |    0
2268  drivers/net/ethernet/chelsio/Kconfig               |  106 +
2269  drivers/net/ethernet/chelsio/Makefile              |    8 +
2270  .../{chelsio => ethernet/chelsio/cxgb}/Makefile    |    0
2271  .../{chelsio => ethernet/chelsio/cxgb}/common.h    |    0
2272  .../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h  |    0
2273  .../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h  |    0
2274  .../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c |    2 +-
2275  .../{chelsio => ethernet/chelsio/cxgb}/elmer0.h    |    0
2276  .../net/{chelsio => ethernet/chelsio/cxgb}/espi.c  |    0
2277  .../net/{chelsio => ethernet/chelsio/cxgb}/espi.h  |    0
2278  .../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h |    0
2279  .../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h  |    0
2280  .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c |    0
2281  .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h |    0
2282  .../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c |    0
2283  .../{chelsio => ethernet/chelsio/cxgb}/my3126.c    |    0
2284  .../{chelsio => ethernet/chelsio/cxgb}/pm3393.c    |    0
2285  .../net/{chelsio => ethernet/chelsio/cxgb}/regs.h  |    0
2286  .../net/{chelsio => ethernet/chelsio/cxgb}/sge.c   |    0
2287  .../net/{chelsio => ethernet/chelsio/cxgb}/sge.h   |    0
2288  .../net/{chelsio => ethernet/chelsio/cxgb}/subr.c  |    0
2289  .../chelsio/cxgb}/suni1x10gexp_regs.h              |    0
2290  .../net/{chelsio => ethernet/chelsio/cxgb}/tp.c    |    0
2291  .../net/{chelsio => ethernet/chelsio/cxgb}/tp.h    |    0
2292  .../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c   |    0
2293  .../chelsio/cxgb}/vsc7326_reg.h                    |    0
2294  drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile  |    0
2295  drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h |    0
2296  drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c |    0
2297  drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c  |    0
2298  drivers/net/{ => ethernet/chelsio}/cxgb3/common.h  |    0
2299  .../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h  |    0
2300  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h  |    0
2301  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h |    0
2302  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c  |    2 +-
2303  .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c   |    0
2304  .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h   |    0
2305  .../chelsio}/cxgb3/firmware_exports.h              |    0
2306  drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c     |    0
2307  drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h     |    0
2308  drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c     |    0
2309  drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h    |    0
2310  drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c     |    0
2311  .../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h    |    0
2312  drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h  |    0
2313  drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c   |    0
2314  drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h  |    0
2315  drivers/net/{ => ethernet/chelsio}/cxgb3/version.h |    0
2316  drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c |    0
2317  drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c   |    0
2318  drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile  |    0
2319  drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h   |    0
2320  .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c  |    3 +
2321  .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h   |    0
2322  drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c     |    0
2323  drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h     |    0
2324  drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c     |    0
2325  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c   |    0
2326  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h   |    0
2327  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h  |    0
2328  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h |    0
2329  .../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h    |    0
2330  .../net/{ => ethernet/chelsio}/cxgb4vf/Makefile    |    0
2331  .../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h   |    0
2332  .../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c  |    2 +
2333  drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c   |    0
2334  .../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h   |    0
2335  .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h |    0
2336  .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c   |    0
2337  drivers/net/ethernet/cirrus/Kconfig                |   28 +
2338  drivers/net/ethernet/cirrus/Makefile               |    5 +
2339  drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c  |    0
2340  drivers/net/ethernet/cisco/Kconfig                 |   22 +
2341  drivers/net/ethernet/cisco/Makefile                |    5 +
2342  drivers/net/ethernet/cisco/enic/Kconfig            |    9 +
2343  drivers/net/{ => ethernet/cisco}/enic/Makefile     |    0
2344  drivers/net/{ => ethernet/cisco}/enic/cq_desc.h    |    0
2345  .../net/{ => ethernet/cisco}/enic/cq_enet_desc.h   |    0
2346  drivers/net/{ => ethernet/cisco}/enic/enic.h       |    0
2347  drivers/net/{ => ethernet/cisco}/enic/enic_dev.c   |    0
2348  drivers/net/{ => ethernet/cisco}/enic/enic_dev.h   |    0
2349  drivers/net/{ => ethernet/cisco}/enic/enic_main.c  |    5 +-
2350  drivers/net/{ => ethernet/cisco}/enic/enic_pp.c    |    0
2351  drivers/net/{ => ethernet/cisco}/enic/enic_pp.h    |    0
2352  drivers/net/{ => ethernet/cisco}/enic/enic_res.c   |    0
2353  drivers/net/{ => ethernet/cisco}/enic/enic_res.h   |    0
2354  .../net/{ => ethernet/cisco}/enic/rq_enet_desc.h   |    0
2355  drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c    |    0
2356  drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h    |    0
2357  drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c   |    0
2358  drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h   |    0
2359  .../net/{ => ethernet/cisco}/enic/vnic_devcmd.h    |    0
2360  drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h  |    0
2361  drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c  |    0
2362  drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h  |    0
2363  drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h   |    0
2364  .../net/{ => ethernet/cisco}/enic/vnic_resource.h  |    0
2365  drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c    |    0
2366  drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h    |    0
2367  drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h   |    0
2368  drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h |    0
2369  drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c   |    0
2370  drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h   |    0
2371  drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c    |    0
2372  drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h    |    0
2373  .../net/{ => ethernet/cisco}/enic/wq_enet_desc.h   |    0
2374  drivers/net/ethernet/davicom/Kconfig               |   23 +
2375  drivers/net/ethernet/davicom/Makefile              |    5 +
2376  drivers/net/{ => ethernet/davicom}/dm9000.c        |   13 +-
2377  drivers/net/{ => ethernet/davicom}/dm9000.h        |    0
2378  drivers/net/ethernet/dec/Kconfig                   |   36 +
2379  drivers/net/ethernet/dec/Makefile                  |    6 +
2380  drivers/net/{ => ethernet/dec}/ewrk3.c             |    2 +-
2381  drivers/net/{ => ethernet/dec}/ewrk3.h             |    0
2382  drivers/net/{ => ethernet/dec}/tulip/21142.c       |    0
2383  drivers/net/{ => ethernet/dec}/tulip/Kconfig       |   20 +-
2384  drivers/net/{ => ethernet/dec}/tulip/Makefile      |    0
2385  drivers/net/{ => ethernet/dec}/tulip/de2104x.c     |    2 +-
2386  drivers/net/{ => ethernet/dec}/tulip/de4x5.c       |    2 +-
2387  drivers/net/{ => ethernet/dec}/tulip/de4x5.h       |    0
2388  drivers/net/{ => ethernet/dec}/tulip/dmfe.c        |    2 +-
2389  drivers/net/{ => ethernet/dec}/tulip/eeprom.c      |    0
2390  drivers/net/{ => ethernet/dec}/tulip/interrupt.c   |    0
2391  drivers/net/{ => ethernet/dec}/tulip/media.c       |    0
2392  drivers/net/{ => ethernet/dec}/tulip/pnic.c        |    0
2393  drivers/net/{ => ethernet/dec}/tulip/pnic2.c       |    0
2394  drivers/net/{ => ethernet/dec}/tulip/timer.c       |    0
2395  drivers/net/{ => ethernet/dec}/tulip/tulip.h       |    0
2396  drivers/net/{ => ethernet/dec}/tulip/tulip_core.c  |    2 +-
2397  drivers/net/{ => ethernet/dec}/tulip/uli526x.c     |    2 +-
2398  drivers/net/{ => ethernet/dec}/tulip/winbond-840.c |    2 +-
2399  drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c   |    0
2400  drivers/net/ethernet/dlink/Kconfig                 |   84 +
2401  drivers/net/ethernet/dlink/Makefile                |    8 +
2402  drivers/net/{ => ethernet/dlink}/de600.c           |    0
2403  drivers/net/{ => ethernet/dlink}/de600.h           |    0
2404  drivers/net/{ => ethernet/dlink}/de620.c           |    2 +-
2405  drivers/net/{ => ethernet/dlink}/de620.h           |    0
2406  drivers/net/{ => ethernet/dlink}/dl2k.c            |    2 +-
2407  drivers/net/{ => ethernet/dlink}/dl2k.h            |    0
2408  drivers/net/{ => ethernet/dlink}/sundance.c        |    2 +-
2409  drivers/net/{ => ethernet}/dnet.c                  |    0
2410  drivers/net/{ => ethernet}/dnet.h                  |    0
2411  drivers/net/ethernet/emulex/Kconfig                |   22 +
2412  drivers/net/ethernet/emulex/Makefile               |    5 +
2413  drivers/net/ethernet/emulex/benet/Kconfig          |    6 +
2414  drivers/net/{ => ethernet/emulex}/benet/Makefile   |    0
2415  drivers/net/{ => ethernet/emulex}/benet/be.h       |  123 +-
2416  drivers/net/{ => ethernet/emulex}/benet/be_cmds.c  |  162 +-
2417  drivers/net/{ => ethernet/emulex}/benet/be_cmds.h  |   91 +-
2418  .../net/{ => ethernet/emulex}/benet/be_ethtool.c   |  154 +-
2419  drivers/net/{ => ethernet/emulex}/benet/be_hw.h    |   21 +-
2420  drivers/net/{ => ethernet/emulex}/benet/be_main.c  |  484 +-
2421  drivers/net/{ => ethernet}/ethoc.c                 |    2 +-
2422  drivers/net/ethernet/faraday/Kconfig               |   38 +
2423  drivers/net/ethernet/faraday/Makefile              |    6 +
2424  drivers/net/{ => ethernet/faraday}/ftgmac100.c     |    0
2425  drivers/net/{ => ethernet/faraday}/ftgmac100.h     |    0
2426  drivers/net/{ => ethernet/faraday}/ftmac100.c      |    0
2427  drivers/net/{ => ethernet/faraday}/ftmac100.h      |    0
2428  drivers/net/{ => ethernet}/fealnx.c                |    2 +-
2429  drivers/net/ethernet/freescale/Kconfig             |   88 +
2430  drivers/net/ethernet/freescale/Makefile            |   18 +
2431  drivers/net/{ => ethernet/freescale}/fec.c         |    2 +-
2432  drivers/net/{ => ethernet/freescale}/fec.h         |    0
2433  drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c |    2 +-
2434  drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h |    0
2435  .../net/{ => ethernet/freescale}/fec_mpc52xx_phy.c |    0
2436  .../net/{ => ethernet/freescale}/fs_enet/Kconfig   |    2 +-
2437  .../net/{ => ethernet/freescale}/fs_enet/Makefile  |    0
2438  drivers/net/{ => ethernet/freescale}/fs_enet/fec.h |    0
2439  .../freescale}/fs_enet/fs_enet-main.c              |    2 +-
2440  .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h |    0
2441  .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c |    0
2442  .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c |    0
2443  .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c |    0
2444  .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c |    0
2445  .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c |    0
2446  drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c |    0
2447  drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h |    0
2448  drivers/net/{ => ethernet/freescale}/gianfar.c     |    2 +-
2449  drivers/net/{ => ethernet/freescale}/gianfar.h     |    0
2450  .../net/{ => ethernet/freescale}/gianfar_ethtool.c |    0
2451  drivers/net/{ => ethernet/freescale}/gianfar_ptp.c |    0
2452  .../net/{ => ethernet/freescale}/gianfar_sysfs.c   |    0
2453  drivers/net/{ => ethernet/freescale}/ucc_geth.c    |   12 +-
2454  drivers/net/{ => ethernet/freescale}/ucc_geth.h    |    0
2455  .../{ => ethernet/freescale}/ucc_geth_ethtool.c    |    0
2456  drivers/net/ethernet/fujitsu/Kconfig               |   53 +
2457  drivers/net/ethernet/fujitsu/Makefile              |    7 +
2458  drivers/net/{ => ethernet/fujitsu}/at1700.c        |    2 +-
2459  drivers/net/{ => ethernet/fujitsu}/eth16i.c        |    2 +-
2460  .../net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c  |    2 +-
2461  drivers/net/ethernet/hp/Kconfig                    |   31 +
2462  drivers/net/ethernet/hp/Makefile                   |    5 +
2463  drivers/net/{ => ethernet/hp}/hp100.c              |    4 +-
2464  drivers/net/{ => ethernet/hp}/hp100.h              |    0
2465  drivers/net/{ => ethernet/i825xx}/3c505.c          |    2 +-
2466  drivers/net/{ => ethernet/i825xx}/3c505.h          |    0
2467  drivers/net/{ => ethernet/i825xx}/3c507.c          |    0
2468  drivers/net/{ => ethernet/i825xx}/3c523.c          |    2 +-
2469  drivers/net/{ => ethernet/i825xx}/3c523.h          |    0
2470  drivers/net/{ => ethernet/i825xx}/3c527.c          |    2 +-
2471  drivers/net/{ => ethernet/i825xx}/3c527.h          |    0
2472  drivers/net/{ => ethernet/i825xx}/82596.c          |    2 +-
2473  drivers/net/ethernet/i825xx/Kconfig                |  182 +
2474  drivers/net/ethernet/i825xx/Makefile               |   20 +
2475  drivers/net/{ => ethernet/i825xx}/eepro.c          |    2 +-
2476  drivers/net/{ => ethernet/i825xx}/eexpress.c       |    2 +-
2477  drivers/net/{ => ethernet/i825xx}/eexpress.h       |    0
2478  drivers/net/{arm => ethernet/i825xx}/ether1.c      |    2 +-
2479  drivers/net/{arm => ethernet/i825xx}/ether1.h      |    0
2480  drivers/net/{ => ethernet/i825xx}/lasi_82596.c     |    0
2481  drivers/net/{ => ethernet/i825xx}/lib82596.c       |    2 +-
2482  drivers/net/{ => ethernet/i825xx}/lp486e.c         |    2 +-
2483  drivers/net/{ => ethernet/i825xx}/ni52.c           |    2 +-
2484  drivers/net/{ => ethernet/i825xx}/ni52.h           |    0
2485  drivers/net/{ => ethernet/i825xx}/sni_82596.c      |    0
2486  drivers/net/{ => ethernet/i825xx}/sun3_82586.c     |    2 +-
2487  drivers/net/{ => ethernet/i825xx}/sun3_82586.h     |    0
2488  drivers/net/{ => ethernet/i825xx}/znet.c           |    2 +-
2489  drivers/net/ethernet/ibm/Kconfig                   |   47 +
2490  drivers/net/ethernet/ibm/Makefile                  |    8 +
2491  drivers/net/{ => ethernet/ibm}/ehea/Makefile       |    0
2492  drivers/net/{ => ethernet/ibm}/ehea/ehea.h         |    0
2493  drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c |    0
2494  drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h      |    0
2495  drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c    |    2 +-
2496  drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c    |    0
2497  drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h    |    0
2498  drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c     |    0
2499  drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h     |    0
2500  .../net/{ibm_newemac => ethernet/ibm/emac}/Kconfig |   40 +-
2501  drivers/net/ethernet/ibm/emac/Makefile             |   11 +
2502  .../net/{ibm_newemac => ethernet/ibm/emac}/core.c  |   16 +-
2503  .../net/{ibm_newemac => ethernet/ibm/emac}/core.h  |   16 +-
2504  .../net/{ibm_newemac => ethernet/ibm/emac}/debug.c |    0
2505  .../net/{ibm_newemac => ethernet/ibm/emac}/debug.h |    2 +-
2506  .../net/{ibm_newemac => ethernet/ibm/emac}/emac.h  |    0
2507  .../net/{ibm_newemac => ethernet/ibm/emac}/mal.c   |    6 +-
2508  .../net/{ibm_newemac => ethernet/ibm/emac}/mal.h   |    4 +-
2509  .../net/{ibm_newemac => ethernet/ibm/emac}/phy.c   |    0
2510  .../net/{ibm_newemac => ethernet/ibm/emac}/phy.h   |    0
2511  .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c |    0
2512  .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h |    4 +-
2513  .../net/{ibm_newemac => ethernet/ibm/emac}/tah.c   |    0
2514  .../net/{ibm_newemac => ethernet/ibm/emac}/tah.h   |    4 +-
2515  .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.c  |    0
2516  .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.h  |    4 +-
2517  drivers/net/{ => ethernet/ibm}/ibmveth.c           |    2 +-
2518  drivers/net/{ => ethernet/ibm}/ibmveth.h           |    0
2519  drivers/net/{ => ethernet/ibm}/iseries_veth.c      |    2 +-
2520  drivers/net/ethernet/icplus/Kconfig                |   13 +
2521  drivers/net/ethernet/icplus/Makefile               |    5 +
2522  drivers/net/{ => ethernet/icplus}/ipg.c            |  199 +-
2523  drivers/net/{ => ethernet/icplus}/ipg.h            |    0
2524  drivers/net/ethernet/intel/Kconfig                 |  220 +
2525  drivers/net/ethernet/intel/Makefile                |   12 +
2526  drivers/net/{ => ethernet/intel}/e100.c            |    2 +-
2527  drivers/net/{ => ethernet/intel}/e1000/Makefile    |    0
2528  drivers/net/{ => ethernet/intel}/e1000/e1000.h     |    0
2529  .../net/{ => ethernet/intel}/e1000/e1000_ethtool.c |    0
2530  drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c  |    0
2531  drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h  |    0
2532  .../net/{ => ethernet/intel}/e1000/e1000_main.c    |    2 +
2533  .../net/{ => ethernet/intel}/e1000/e1000_osdep.h   |    0
2534  .../net/{ => ethernet/intel}/e1000/e1000_param.c   |    0
2535  .../intel/e1000e/80003es2lan.c}                    |    0
2536  drivers/net/{ => ethernet/intel}/e1000e/82571.c    |    0
2537  drivers/net/{ => ethernet/intel}/e1000e/Makefile   |    2 +-
2538  drivers/net/{ => ethernet/intel}/e1000e/defines.h  |    0
2539  drivers/net/{ => ethernet/intel}/e1000e/e1000.h    |    3 +-
2540  drivers/net/{ => ethernet/intel}/e1000e/ethtool.c  |    9 +-
2541  drivers/net/{ => ethernet/intel}/e1000e/hw.h       |    0
2542  drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c  |    0
2543  drivers/net/{ => ethernet/intel}/e1000e/lib.c      |    0
2544  drivers/net/{ => ethernet/intel}/e1000e/netdev.c   |  201 +-
2545  drivers/net/{ => ethernet/intel}/e1000e/param.c    |    0
2546  drivers/net/{ => ethernet/intel}/e1000e/phy.c      |    0
2547  drivers/net/{ => ethernet/intel}/igb/Makefile      |    0
2548  drivers/net/{ => ethernet/intel}/igb/e1000_82575.c |    0
2549  drivers/net/{ => ethernet/intel}/igb/e1000_82575.h |    0
2550  .../net/{ => ethernet/intel}/igb/e1000_defines.h   |    0
2551  drivers/net/{ => ethernet/intel}/igb/e1000_hw.h    |    0
2552  drivers/net/{ => ethernet/intel}/igb/e1000_mac.c   |    0
2553  drivers/net/{ => ethernet/intel}/igb/e1000_mac.h   |    0
2554  drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c   |    0
2555  drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h   |    0
2556  drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c   |    0
2557  drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h   |    0
2558  drivers/net/{ => ethernet/intel}/igb/e1000_phy.c   |    0
2559  drivers/net/{ => ethernet/intel}/igb/e1000_phy.h   |    0
2560  drivers/net/{ => ethernet/intel}/igb/e1000_regs.h  |    0
2561  drivers/net/{ => ethernet/intel}/igb/igb.h         |    0
2562  drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c |    0
2563  drivers/net/{ => ethernet/intel}/igb/igb_main.c    |    4 +-
2564  drivers/net/{ => ethernet/intel}/igbvf/Makefile    |    0
2565  drivers/net/{ => ethernet/intel}/igbvf/defines.h   |    0
2566  drivers/net/{ => ethernet/intel}/igbvf/ethtool.c   |    0
2567  drivers/net/{ => ethernet/intel}/igbvf/igbvf.h     |    0
2568  drivers/net/{ => ethernet/intel}/igbvf/mbx.c       |    0
2569  drivers/net/{ => ethernet/intel}/igbvf/mbx.h       |    0
2570  drivers/net/{ => ethernet/intel}/igbvf/netdev.c    |    2 +-
2571  drivers/net/{ => ethernet/intel}/igbvf/regs.h      |    0
2572  drivers/net/{ => ethernet/intel}/igbvf/vf.c        |    0
2573  drivers/net/{ => ethernet/intel}/igbvf/vf.h        |    0
2574  drivers/net/{ => ethernet/intel}/ixgb/Makefile     |    0
2575  drivers/net/{ => ethernet/intel}/ixgb/ixgb.h       |    0
2576  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c    |    0
2577  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h    |    0
2578  .../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c   |    0
2579  drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c    |    0
2580  drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h    |    0
2581  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h   |    0
2582  drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c  |    2 +-
2583  drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h |    0
2584  drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c |    0
2585  drivers/net/{ => ethernet/intel}/ixgbe/Makefile    |    0
2586  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h     |   27 +-
2587  .../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c   |    0
2588  .../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c   |    0
2589  .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c  |    0
2590  .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h  |    0
2591  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c |    0
2592  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h |    0
2593  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c   |    0
2594  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h   |    0
2595  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c   |    0
2596  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h   |    0
2597  .../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c  |    2 +-
2598  .../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c |    0
2599  .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c    |   10 +-
2600  .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h    |    0
2601  .../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c    |  558 +-
2602  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c |    0
2603  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h |    0
2604  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c |    0
2605  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h |    0
2606  .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c   |    0
2607  .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h   |    0
2608  .../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h    |    0
2609  .../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c    |    0
2610  drivers/net/{ => ethernet/intel}/ixgbevf/Makefile  |    0
2611  drivers/net/{ => ethernet/intel}/ixgbevf/defines.h |    0
2612  drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c |    0
2613  drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h |    0
2614  .../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c    |    4 +-
2615  drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c     |    0
2616  drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h     |    0
2617  drivers/net/{ => ethernet/intel}/ixgbevf/regs.h    |    0
2618  drivers/net/{ => ethernet/intel}/ixgbevf/vf.c      |    0
2619  drivers/net/{ => ethernet/intel}/ixgbevf/vf.h      |    0
2620  drivers/net/{ => ethernet}/jme.c                   |    2 +-
2621  drivers/net/{ => ethernet}/jme.h                   |    0
2622  drivers/net/{ => ethernet}/korina.c                |    3 +-
2623  drivers/net/{ => ethernet}/lantiq_etop.c           |    2 +-
2624  drivers/net/ethernet/marvell/Kconfig               |  110 +
2625  drivers/net/ethernet/marvell/Makefile              |    8 +
2626  drivers/net/{ => ethernet/marvell}/mv643xx_eth.c   |    2 +
2627  drivers/net/{ => ethernet/marvell}/pxa168_eth.c    |    0
2628  drivers/net/{ => ethernet/marvell}/skge.c          |    2 +-
2629  drivers/net/{ => ethernet/marvell}/skge.h          |    0
2630  drivers/net/{ => ethernet/marvell}/sky2.c          |    4 +-
2631  drivers/net/{ => ethernet/marvell}/sky2.h          |    0
2632  drivers/net/ethernet/mellanox/Kconfig              |   22 +
2633  drivers/net/ethernet/mellanox/Makefile             |    5 +
2634  drivers/net/ethernet/mellanox/mlx4/Kconfig         |   27 +
2635  drivers/net/{ => ethernet/mellanox}/mlx4/Makefile  |    0
2636  drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c   |    0
2637  drivers/net/{ => ethernet/mellanox}/mlx4/catas.c   |    0
2638  drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c     |    0
2639  drivers/net/{ => ethernet/mellanox}/mlx4/cq.c      |    0
2640  drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c   |    0
2641  .../net/{ => ethernet/mellanox}/mlx4/en_ethtool.c  |    0
2642  drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c |    0
2643  .../net/{ => ethernet/mellanox}/mlx4/en_netdev.c   |    2 +-
2644  drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c |    0
2645  drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h |    0
2646  .../{ => ethernet/mellanox}/mlx4/en_resources.c    |    0
2647  drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c   |    0
2648  .../net/{ => ethernet/mellanox}/mlx4/en_selftest.c |    0
2649  drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c   |    0
2650  drivers/net/{ => ethernet/mellanox}/mlx4/eq.c      |    0
2651  drivers/net/{ => ethernet/mellanox}/mlx4/fw.c      |    0
2652  drivers/net/{ => ethernet/mellanox}/mlx4/fw.h      |    0
2653  drivers/net/{ => ethernet/mellanox}/mlx4/icm.c     |    0
2654  drivers/net/{ => ethernet/mellanox}/mlx4/icm.h     |    0
2655  drivers/net/{ => ethernet/mellanox}/mlx4/intf.c    |    0
2656  drivers/net/{ => ethernet/mellanox}/mlx4/main.c    |    0
2657  drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c     |    0
2658  drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h    |    0
2659  drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h |    0
2660  drivers/net/{ => ethernet/mellanox}/mlx4/mr.c      |    0
2661  drivers/net/{ => ethernet/mellanox}/mlx4/pd.c      |    0
2662  drivers/net/{ => ethernet/mellanox}/mlx4/port.c    |    0
2663  drivers/net/{ => ethernet/mellanox}/mlx4/profile.c |    0
2664  drivers/net/{ => ethernet/mellanox}/mlx4/qp.c      |    0
2665  drivers/net/{ => ethernet/mellanox}/mlx4/reset.c   |    0
2666  drivers/net/{ => ethernet/mellanox}/mlx4/sense.c   |    0
2667  drivers/net/{ => ethernet/mellanox}/mlx4/srq.c     |    0
2668  drivers/net/ethernet/micrel/Kconfig                |   64 +
2669  drivers/net/ethernet/micrel/Makefile               |    9 +
2670  drivers/net/{arm => ethernet/micrel}/ks8695net.c   |    2 +-
2671  drivers/net/{arm => ethernet/micrel}/ks8695net.h   |    0
2672  drivers/net/{ => ethernet/micrel}/ks8842.c         |    0
2673  drivers/net/{ => ethernet/micrel}/ks8851.c         |    0
2674  drivers/net/{ => ethernet/micrel}/ks8851.h         |    0
2675  drivers/net/{ => ethernet/micrel}/ks8851_mll.c     |    0
2676  drivers/net/{ => ethernet/micrel}/ksz884x.c        |    0
2677  drivers/net/ethernet/microchip/Kconfig             |   37 +
2678  drivers/net/ethernet/microchip/Makefile            |    5 +
2679  drivers/net/{ => ethernet/microchip}/enc28j60.c    |    2 +-
2680  drivers/net/{ => ethernet/microchip}/enc28j60_hw.h |    0
2681  drivers/net/{ => ethernet}/mipsnet.c               |    2 +-
2682  drivers/net/ethernet/myricom/Kconfig               |   46 +
2683  drivers/net/ethernet/myricom/Makefile              |    5 +
2684  .../net/{ => ethernet/myricom}/myri10ge/Makefile   |    0
2685  .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c |    2 +-
2686  .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h |    0
2687  .../myricom}/myri10ge/myri10ge_mcp_gen_header.h    |    0
2688  drivers/net/ethernet/natsemi/Kconfig               |   82 +
2689  drivers/net/ethernet/natsemi/Makefile              |   10 +
2690  drivers/net/{ => ethernet/natsemi}/ibmlana.c       |    2 +-
2691  drivers/net/{ => ethernet/natsemi}/ibmlana.h       |    0
2692  drivers/net/{ => ethernet/natsemi}/jazzsonic.c     |    2 +-
2693  drivers/net/{ => ethernet/natsemi}/macsonic.c      |    2 +-
2694  drivers/net/{ => ethernet/natsemi}/natsemi.c       |    2 +-
2695  drivers/net/{ => ethernet/natsemi}/ns83820.c       |    2 +-
2696  drivers/net/{ => ethernet/natsemi}/sonic.c         |    0
2697  drivers/net/{ => ethernet/natsemi}/sonic.h         |    0
2698  drivers/net/{ => ethernet/natsemi}/xtsonic.c       |    2 +-
2699  drivers/net/ethernet/neterion/Kconfig              |   54 +
2700  drivers/net/ethernet/neterion/Makefile             |    6 +
2701  drivers/net/{ => ethernet/neterion}/s2io-regs.h    |    0
2702  drivers/net/{ => ethernet/neterion}/s2io.c         |    2 +-
2703  drivers/net/{ => ethernet/neterion}/s2io.h         |    0
2704  drivers/net/{ => ethernet/neterion}/vxge/Makefile  |    0
2705  .../net/{ => ethernet/neterion}/vxge/vxge-config.c |    0
2706  .../net/{ => ethernet/neterion}/vxge/vxge-config.h |    0
2707  .../{ => ethernet/neterion}/vxge/vxge-ethtool.c    |    0
2708  .../{ => ethernet/neterion}/vxge/vxge-ethtool.h    |    0
2709  .../net/{ => ethernet/neterion}/vxge/vxge-main.c   |    2 +-
2710  .../net/{ => ethernet/neterion}/vxge/vxge-main.h   |    0
2711  .../net/{ => ethernet/neterion}/vxge/vxge-reg.h    |    0
2712  .../{ => ethernet/neterion}/vxge/vxge-traffic.c    |    0
2713  .../{ => ethernet/neterion}/vxge/vxge-traffic.h    |    0
2714  .../{ => ethernet/neterion}/vxge/vxge-version.h    |    0
2715  drivers/net/{ => ethernet}/netx-eth.c              |    2 +-
2716  drivers/net/ethernet/nuvoton/Kconfig               |   29 +
2717  drivers/net/ethernet/nuvoton/Makefile              |    5 +
2718  .../net/{arm => ethernet/nuvoton}/w90p910_ether.c  |    2 +-
2719  drivers/net/ethernet/nvidia/Kconfig                |   31 +
2720  drivers/net/ethernet/nvidia/Makefile               |    5 +
2721  drivers/net/{ => ethernet/nvidia}/forcedeth.c      |    4 +-
2722  drivers/net/{ => ethernet}/octeon/Kconfig          |    6 +-
2723  drivers/net/ethernet/octeon/Makefile               |    5 +
2724  drivers/net/{ => ethernet}/octeon/octeon_mgmt.c    |    4 +-
2725  drivers/net/ethernet/oki-semi/Kconfig              |   22 +
2726  drivers/net/ethernet/oki-semi/Makefile             |    5 +
2727  drivers/net/ethernet/oki-semi/pch_gbe/Kconfig      |   20 +
2728  .../net/{ => ethernet/oki-semi}/pch_gbe/Makefile   |    0
2729  .../net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h  |    0
2730  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c  |    0
2731  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h  |    0
2732  .../oki-semi}/pch_gbe/pch_gbe_ethtool.c            |    0
2733  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c |    2 +-
2734  .../oki-semi}/pch_gbe/pch_gbe_param.c              |    0
2735  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c  |    0
2736  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h  |    0
2737  drivers/net/ethernet/packetengines/Kconfig         |   46 +
2738  drivers/net/ethernet/packetengines/Makefile        |    6 +
2739  drivers/net/{ => ethernet/packetengines}/hamachi.c |    2 +-
2740  .../net/{ => ethernet/packetengines}/yellowfin.c   |    2 +-
2741  drivers/net/ethernet/pasemi/Kconfig                |   29 +
2742  drivers/net/ethernet/pasemi/Makefile               |    5 +
2743  drivers/net/{ => ethernet/pasemi}/pasemi_mac.c     |    2 +-
2744  drivers/net/{ => ethernet/pasemi}/pasemi_mac.h     |    0
2745  .../net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c |    0
2746  drivers/net/ethernet/qlogic/Kconfig                |   53 +
2747  drivers/net/ethernet/qlogic/Makefile               |    8 +
2748  drivers/net/{ => ethernet/qlogic}/netxen/Makefile  |    0
2749  .../net/{ => ethernet/qlogic}/netxen/netxen_nic.h  |    6 +
2750  .../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c  |    0
2751  .../qlogic}/netxen/netxen_nic_ethtool.c            |    0
2752  .../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h  |    0
2753  .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c   |    0
2754  .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h   |    0
2755  .../{ => ethernet/qlogic}/netxen/netxen_nic_init.c |    8 +-
2756  .../{ => ethernet/qlogic}/netxen/netxen_nic_main.c |  105 +-
2757  drivers/net/{ => ethernet/qlogic}/qla3xxx.c        |    3 +-
2758  drivers/net/{ => ethernet/qlogic}/qla3xxx.h        |    0
2759  drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile  |    0
2760  drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h  |    6 +-
2761  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c  |    0
2762  .../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c  |   22 +-
2763  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h  |    0
2764  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c   |    4 +-
2765  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c |    3 +-
2766  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c |   42 +-
2767  drivers/net/{ => ethernet/qlogic}/qlge/Makefile    |    0
2768  drivers/net/{ => ethernet/qlogic}/qlge/qlge.h      |    0
2769  drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c  |    0
2770  .../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c  |    0
2771  drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c |    2 +-
2772  drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c  |    0
2773  drivers/net/ethernet/racal/Kconfig                 |   32 +
2774  drivers/net/ethernet/racal/Makefile                |    5 +
2775  drivers/net/{ => ethernet/racal}/ni5010.c          |    2 +-
2776  drivers/net/{ => ethernet/racal}/ni5010.h          |    0
2777  drivers/net/ethernet/rdc/Kconfig                   |   33 +
2778  drivers/net/ethernet/rdc/Makefile                  |    5 +
2779  drivers/net/{ => ethernet/rdc}/r6040.c             |    2 +-
2780  drivers/net/{ => ethernet/realtek}/8139cp.c        |    2 +-
2781  drivers/net/{ => ethernet/realtek}/8139too.c       |    2 +-
2782  drivers/net/ethernet/realtek/Kconfig               |  126 +
2783  drivers/net/ethernet/realtek/Makefile              |    9 +
2784  drivers/net/{ => ethernet/realtek}/atp.c           |    2 +-
2785  drivers/net/{ => ethernet/realtek}/atp.h           |    0
2786  drivers/net/{ => ethernet/realtek}/r8169.c         |    2 +-
2787  drivers/net/{ => ethernet/realtek}/sc92031.c       |    2 +-
2788  drivers/net/ethernet/renesas/Kconfig               |   18 +
2789  drivers/net/ethernet/renesas/Makefile              |    5 +
2790  drivers/net/{ => ethernet/renesas}/sh_eth.c        |    2 +-
2791  drivers/net/{ => ethernet/renesas}/sh_eth.h        |    0
2792  drivers/net/{ => ethernet}/s6gmac.c                |    0
2793  drivers/net/ethernet/seeq/Kconfig                  |   45 +
2794  drivers/net/ethernet/seeq/Makefile                 |    7 +
2795  drivers/net/{arm => ethernet/seeq}/ether3.c        |    2 +-
2796  drivers/net/{arm => ethernet/seeq}/ether3.h        |    0
2797  drivers/net/{ => ethernet/seeq}/seeq8005.c         |    2 +-
2798  drivers/net/{ => ethernet/seeq}/seeq8005.h         |    0
2799  drivers/net/{ => ethernet/seeq}/sgiseeq.c          |    2 +-
2800  drivers/net/{ => ethernet/seeq}/sgiseeq.h          |    0
2801  drivers/net/{ => ethernet}/sfc/Kconfig             |    4 +-
2802  drivers/net/{ => ethernet}/sfc/Makefile            |    0
2803  drivers/net/{ => ethernet}/sfc/bitfield.h          |    0
2804  drivers/net/{ => ethernet}/sfc/efx.c               |    2 +-
2805  drivers/net/{ => ethernet}/sfc/efx.h               |    0
2806  drivers/net/{ => ethernet}/sfc/enum.h              |    0
2807  drivers/net/{ => ethernet}/sfc/ethtool.c           |    0
2808  drivers/net/{ => ethernet}/sfc/falcon.c            |    0
2809  drivers/net/{ => ethernet}/sfc/falcon_boards.c     |    0
2810  drivers/net/{ => ethernet}/sfc/falcon_xmac.c       |    0
2811  drivers/net/{ => ethernet}/sfc/filter.c            |    0
2812  drivers/net/{ => ethernet}/sfc/filter.h            |    0
2813  drivers/net/{ => ethernet}/sfc/io.h                |    0
2814  drivers/net/{ => ethernet}/sfc/mac.h               |    0
2815  drivers/net/{ => ethernet}/sfc/mcdi.c              |    0
2816  drivers/net/{ => ethernet}/sfc/mcdi.h              |    0
2817  drivers/net/{ => ethernet}/sfc/mcdi_mac.c          |    0
2818  drivers/net/{ => ethernet}/sfc/mcdi_pcol.h         |    0
2819  drivers/net/{ => ethernet}/sfc/mcdi_phy.c          |    0
2820  drivers/net/{ => ethernet}/sfc/mdio_10g.c          |    0
2821  drivers/net/{ => ethernet}/sfc/mdio_10g.h          |    0
2822  drivers/net/{ => ethernet}/sfc/mtd.c               |    0
2823  drivers/net/{ => ethernet}/sfc/net_driver.h        |    0
2824  drivers/net/{ => ethernet}/sfc/nic.c               |    0
2825  drivers/net/{ => ethernet}/sfc/nic.h               |    0
2826  drivers/net/{ => ethernet}/sfc/phy.h               |    0
2827  drivers/net/{ => ethernet}/sfc/qt202x_phy.c        |    0
2828  drivers/net/{ => ethernet}/sfc/regs.h              |    0
2829  drivers/net/{ => ethernet}/sfc/rx.c                |    0
2830  drivers/net/{ => ethernet}/sfc/selftest.c          |    0
2831  drivers/net/{ => ethernet}/sfc/selftest.h          |    0
2832  drivers/net/{ => ethernet}/sfc/siena.c             |    0
2833  drivers/net/{ => ethernet}/sfc/spi.h               |    0
2834  drivers/net/{ => ethernet}/sfc/tenxpress.c         |    0
2835  drivers/net/{ => ethernet}/sfc/tx.c                |    0
2836  drivers/net/{ => ethernet}/sfc/txc43128_phy.c      |    0
2837  drivers/net/{ => ethernet}/sfc/workarounds.h       |    0
2838  drivers/net/ethernet/sgi/Kconfig                   |   34 +
2839  drivers/net/ethernet/sgi/Makefile                  |    6 +
2840  drivers/net/{ => ethernet/sgi}/ioc3-eth.c          |    2 +-
2841  drivers/net/{ => ethernet/sgi}/meth.c              |    0
2842  drivers/net/{ => ethernet/sgi}/meth.h              |    0
2843  drivers/net/ethernet/sis/Kconfig                   |   50 +
2844  drivers/net/ethernet/sis/Makefile                  |    6 +
2845  drivers/net/{ => ethernet/sis}/sis190.c            |    2 +-
2846  drivers/net/{ => ethernet/sis}/sis900.c            |    2 +-
2847  drivers/net/{ => ethernet/sis}/sis900.h            |    0
2848  drivers/net/ethernet/smsc/Kconfig                  |  131 +
2849  drivers/net/ethernet/smsc/Makefile                 |   11 +
2850  drivers/net/{ => ethernet/smsc}/epic100.c          |    2 +-
2851  drivers/net/{ => ethernet/smsc}/smc911x.c          |    2 +-
2852  drivers/net/{ => ethernet/smsc}/smc911x.h          |    0
2853  drivers/net/{ => ethernet/smsc}/smc9194.c          |    2 +-
2854  drivers/net/{ => ethernet/smsc}/smc9194.h          |    0
2855  .../net/{pcmcia => ethernet/smsc}/smc91c92_cs.c    |    2 +-
2856  drivers/net/{ => ethernet/smsc}/smc91x.c           |    2 +-
2857  drivers/net/{ => ethernet/smsc}/smc91x.h           |    0
2858  drivers/net/{ => ethernet/smsc}/smsc911x.c         |   87 +-
2859  drivers/net/{ => ethernet/smsc}/smsc911x.h         |    0
2860  drivers/net/{ => ethernet/smsc}/smsc9420.c         |    2 +-
2861  drivers/net/{ => ethernet/smsc}/smsc9420.h         |    0
2862  drivers/net/ethernet/stmicro/Kconfig               |   22 +
2863  drivers/net/ethernet/stmicro/Makefile              |    5 +
2864  drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig  |   14 +-
2865  drivers/net/{ => ethernet/stmicro}/stmmac/Makefile |    0
2866  drivers/net/{ => ethernet/stmicro}/stmmac/common.h |    0
2867  drivers/net/{ => ethernet/stmicro}/stmmac/descs.h  |    0
2868  .../net/{ => ethernet/stmicro}/stmmac/dwmac100.h   |    0
2869  .../net/{ => ethernet/stmicro}/stmmac/dwmac1000.h  |    0
2870  .../{ => ethernet/stmicro}/stmmac/dwmac1000_core.c |    0
2871  .../{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c  |    0
2872  .../{ => ethernet/stmicro}/stmmac/dwmac100_core.c  |    0
2873  .../{ => ethernet/stmicro}/stmmac/dwmac100_dma.c   |    0
2874  .../net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h  |    0
2875  .../net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c  |    0
2876  .../net/{ => ethernet/stmicro}/stmmac/enh_desc.c   |    0
2877  .../net/{ => ethernet/stmicro}/stmmac/norm_desc.c  |    0
2878  drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h |    0
2879  .../{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c |    0
2880  .../{ => ethernet/stmicro}/stmmac/stmmac_main.c    |   13 +-
2881  .../{ => ethernet/stmicro}/stmmac/stmmac_mdio.c    |    0
2882  .../{ => ethernet/stmicro}/stmmac/stmmac_timer.c   |    0
2883  .../{ => ethernet/stmicro}/stmmac/stmmac_timer.h   |    0
2884  drivers/net/ethernet/sun/Kconfig                   |   87 +
2885  drivers/net/ethernet/sun/Makefile                  |   11 +
2886  drivers/net/{ => ethernet/sun}/cassini.c           |    2 +-
2887  drivers/net/{ => ethernet/sun}/cassini.h           |    0
2888  drivers/net/{ => ethernet/sun}/niu.c               |    5 +-
2889  drivers/net/{ => ethernet/sun}/niu.h               |    0
2890  drivers/net/{ => ethernet/sun}/sunbmac.c           |    2 +-
2891  drivers/net/{ => ethernet/sun}/sunbmac.h           |    0
2892  drivers/net/{ => ethernet/sun}/sungem.c            |    6 +-
2893  drivers/net/{ => ethernet/sun}/sungem.h            |    0
2894  drivers/net/{ => ethernet/sun}/sunhme.c            |    2 +-
2895  drivers/net/{ => ethernet/sun}/sunhme.h            |    0
2896  drivers/net/{ => ethernet/sun}/sunqe.c             |    2 +-
2897  drivers/net/{ => ethernet/sun}/sunqe.h             |    0
2898  drivers/net/{ => ethernet/sun}/sunvnet.c           |    2 +-
2899  drivers/net/{ => ethernet/sun}/sunvnet.h           |    0
2900  drivers/net/ethernet/tehuti/Kconfig                |   26 +
2901  drivers/net/ethernet/tehuti/Makefile               |    5 +
2902  drivers/net/{ => ethernet/tehuti}/tehuti.c         |    2 +-
2903  drivers/net/{ => ethernet/tehuti}/tehuti.h         |    0
2904  drivers/net/ethernet/ti/Kconfig                    |   76 +
2905  drivers/net/ethernet/ti/Makefile                   |    9 +
2906  drivers/net/{ => ethernet/ti}/cpmac.c              |    2 +-
2907  drivers/net/{ => ethernet/ti}/davinci_cpdma.c      |    0
2908  drivers/net/{ => ethernet/ti}/davinci_cpdma.h      |    0
2909  drivers/net/{ => ethernet/ti}/davinci_emac.c       |    2 +-
2910  drivers/net/{ => ethernet/ti}/davinci_mdio.c       |    0
2911  drivers/net/{ => ethernet/ti}/tlan.c               |    2 +-
2912  drivers/net/{ => ethernet/ti}/tlan.h               |    0
2913  drivers/net/ethernet/tile/Kconfig                  |   15 +
2914  drivers/net/{ => ethernet}/tile/Makefile           |    0
2915  drivers/net/{ => ethernet}/tile/tilepro.c          |    0
2916  drivers/net/ethernet/toshiba/Kconfig               |   56 +
2917  drivers/net/ethernet/toshiba/Makefile              |   10 +
2918  drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c |    2 +-
2919  drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h |    0
2920  .../{ => ethernet/toshiba}/ps3_gelic_wireless.c    |    2 +-
2921  .../{ => ethernet/toshiba}/ps3_gelic_wireless.h    |    0
2922  drivers/net/{ => ethernet/toshiba}/spider_net.c    |    6 +-
2923  drivers/net/{ => ethernet/toshiba}/spider_net.h    |    2 +-
2924  .../{ => ethernet/toshiba}/spider_net_ethtool.c    |    0
2925  drivers/net/{ => ethernet/toshiba}/tc35815.c       |    2 +-
2926  drivers/net/ethernet/tundra/Kconfig                |   28 +
2927  drivers/net/ethernet/tundra/Makefile               |    5 +
2928  drivers/net/{ => ethernet/tundra}/tsi108_eth.c     |    2 +-
2929  drivers/net/{ => ethernet/tundra}/tsi108_eth.h     |    0
2930  drivers/net/ethernet/via/Kconfig                   |   56 +
2931  drivers/net/ethernet/via/Makefile                  |    6 +
2932  drivers/net/{ => ethernet/via}/via-rhine.c         |    2 +-
2933  drivers/net/{ => ethernet/via}/via-velocity.c      |  148 +-
2934  drivers/net/{ => ethernet/via}/via-velocity.h      |    0
2935  drivers/net/ethernet/xilinx/Kconfig                |   35 +
2936  drivers/net/ethernet/xilinx/Makefile               |    7 +
2937  drivers/net/{ => ethernet/xilinx}/ll_temac.h       |    0
2938  drivers/net/{ => ethernet/xilinx}/ll_temac_main.c  |    1 -
2939  drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c  |    0
2940  .../net/{ => ethernet/xilinx}/xilinx_emaclite.c    |    0
2941  drivers/net/ethernet/xircom/Kconfig                |   30 +
2942  drivers/net/ethernet/xircom/Makefile               |    5 +
2943  .../net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c   |    2 +-
2944  drivers/net/ethernet/xscale/Kconfig                |   31 +
2945  drivers/net/ethernet/xscale/Makefile               |    6 +
2946  drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig  |    2 +-
2947  drivers/net/{ => ethernet/xscale}/ixp2000/Makefile |    0
2948  drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c  |    0
2949  drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h  |    0
2950  .../net/{ => ethernet/xscale}/ixp2000/enp2611.c    |    0
2951  .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.c    |    0
2952  .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.h    |    0
2953  .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc    |    0
2954  .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode |    0
2955  .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc    |    0
2956  .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode |    0
2957  drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c |    0
2958  drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h |    0
2959  .../{ => ethernet/xscale}/ixp2000/ixpdev_priv.h    |    0
2960  drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c |    0
2961  drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h |    0
2962  drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c  |    2 +-
2963  drivers/net/ibm_newemac/Makefile                   |   11 -
2964  drivers/net/macvlan.c                              |    2 +-
2965  drivers/net/octeon/Makefile                        |    2 -
2966  drivers/net/pci-skeleton.c                         | 1923 ------
2967  drivers/net/pcmcia/Kconfig                         |   78 -
2968  drivers/net/pcmcia/Makefile                        |    8 -
2969  drivers/net/skfp/skfddi.c                          |    2 +-
2970  drivers/net/slip.c                                 |   29 +-
2971  drivers/net/slip.h                                 |    9 -
2972  drivers/net/sungem_phy.c                           |    7 +-
2973  drivers/net/tokenring/3c359.c                      |    2 +-
2974  drivers/net/tokenring/ibmtr.c                      |    2 +-
2975  drivers/net/tokenring/lanstreamer.c                |    2 +-
2976  drivers/net/tokenring/olympic.c                    |    2 +-
2977  drivers/net/tokenring/smctr.c                      |    2 +-
2978  drivers/net/tokenring/tms380tr.c                   |    2 +-
2979  drivers/net/tun.c                                  |    2 +-
2980  drivers/net/usb/asix.c                             |    6 +-
2981  drivers/net/usb/catc.c                             |    2 +-
2982  drivers/net/usb/dm9601.c                           |    2 +-
2983  drivers/net/usb/int51x1.c                          |    2 +-
2984  drivers/net/usb/kaweth.c                           |    2 +-
2985  drivers/net/usb/lg-vl600.c                         |   19 +
2986  drivers/net/usb/mcs7830.c                          |    2 +-
2987  drivers/net/usb/pegasus.c                          |    2 +-
2988  drivers/net/usb/rtl8150.c                          |    2 +-
2989  drivers/net/usb/smsc75xx.c                         |    2 +-
2990  drivers/net/usb/smsc95xx.c                         |    2 +-
2991  drivers/net/virtio_net.c                           |    1 +
2992  drivers/net/vmxnet3/vmxnet3_drv.c                  |    2 +-
2993  drivers/net/wan/hdlc_ppp.c                         |   14 +-
2994  drivers/net/wan/sbni.c                             |    2 +-
2995  drivers/net/wireless/airo.c                        |    4 +-
2996  drivers/net/wireless/ath/Kconfig                   |    1 +
2997  drivers/net/wireless/ath/Makefile                  |    1 +
2998  drivers/net/wireless/ath/ath5k/ahb.c               |    4 +-
2999  drivers/net/wireless/ath/ath5k/ani.c               |    1 -
3000  drivers/net/wireless/ath/ath5k/ani.h               |    4 +
3001  drivers/net/wireless/ath/ath5k/ath5k.h             |   98 +-
3002  drivers/net/wireless/ath/ath5k/attach.c            |   18 +-
3003  drivers/net/wireless/ath/ath5k/base.c              |   31 +-
3004  drivers/net/wireless/ath/ath5k/base.h              |   55 +-
3005  drivers/net/wireless/ath/ath5k/caps.c              |    2 +-
3006  drivers/net/wireless/ath/ath5k/debug.c             |   15 +-
3007  drivers/net/wireless/ath/ath5k/desc.c              |    1 -
3008  drivers/net/wireless/ath/ath5k/dma.c               |    1 -
3009  drivers/net/wireless/ath/ath5k/eeprom.c            |   10 +-
3010  drivers/net/wireless/ath/ath5k/gpio.c              |    1 -
3011  drivers/net/wireless/ath/ath5k/initvals.c          |    1 -
3012  drivers/net/wireless/ath/ath5k/led.c               |    1 -
3013  drivers/net/wireless/ath/ath5k/mac80211-ops.c      |    5 +-
3014  drivers/net/wireless/ath/ath5k/pci.c               |    4 +-
3015  drivers/net/wireless/ath/ath5k/pcu.c               |    5 +-
3016  drivers/net/wireless/ath/ath5k/phy.c               |   91 +-
3017  drivers/net/wireless/ath/ath5k/qcu.c               |   10 +-
3018  drivers/net/wireless/ath/ath5k/reset.c             |   79 +-
3019  drivers/net/wireless/ath/ath5k/rfkill.c            |    2 +-
3020  drivers/net/wireless/ath/ath5k/sysfs.c             |    1 -
3021  drivers/net/wireless/ath/ath5k/trace.h             |    3 +-
3022  drivers/net/wireless/ath/ath6kl/Kconfig            |   15 +
3023  drivers/net/wireless/ath/ath6kl/Makefile           |   35 +
3024  drivers/net/wireless/ath/ath6kl/bmi.c              |  692 +++
3025  drivers/net/wireless/ath/ath6kl/bmi.h              |  250 +
3026  drivers/net/wireless/ath/ath6kl/cfg80211.c         | 1538 +++++
3027  drivers/net/wireless/ath/ath6kl/cfg80211.h         |   39 +
3028  drivers/net/wireless/ath/ath6kl/common.h           |  180 +
3029  drivers/net/wireless/ath/ath6kl/core.h             |  544 ++
3030  drivers/net/wireless/ath/ath6kl/debug.c            |  150 +
3031  drivers/net/wireless/ath/ath6kl/debug.h            |  105 +
3032  drivers/net/wireless/ath/ath6kl/hif-ops.h          |   72 +
3033  drivers/net/wireless/ath/ath6kl/hif.h              |  207 +
3034  drivers/net/wireless/ath/ath6kl/htc.c              | 2457 ++++++++
3035  drivers/net/wireless/ath/ath6kl/htc.h              |  607 ++
3036  drivers/net/wireless/ath/ath6kl/htc_hif.c          |  641 ++
3037  drivers/net/wireless/ath/ath6kl/htc_hif.h          |   92 +
3038  drivers/net/wireless/ath/ath6kl/init.c             | 1303 ++++
3039  drivers/net/wireless/ath/ath6kl/main.c             | 1337 ++++
3040  drivers/net/wireless/ath/ath6kl/node.c             |  234 +
3041  drivers/net/wireless/ath/ath6kl/sdio.c             |  912 +++
3042  drivers/net/wireless/ath/ath6kl/target.h           |  331 +
3043  drivers/net/wireless/ath/ath6kl/txrx.c             | 1457 +++++
3044  drivers/net/wireless/ath/ath6kl/wmi.c              | 2743 +++++++++
3045  drivers/net/wireless/ath/ath6kl/wmi.h              | 2018 ++++++
3046  drivers/net/wireless/ath/ath9k/ahb.c               |    2 +-
3047  .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h   |  190 +-
3048  drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |  150 +-
3049  drivers/net/wireless/ath/ath9k/ar9003_mac.c        |   15 +-
3050  drivers/net/wireless/ath/ath9k/ar9003_phy.c        |    4 +-
3051  drivers/net/wireless/ath/ath9k/ath9k.h             |    6 +-
3052  drivers/net/wireless/ath/ath9k/beacon.c            |   18 +-
3053  drivers/net/wireless/ath/ath9k/calib.c             |   15 +
3054  drivers/net/wireless/ath/ath9k/calib.h             |    1 +
3055  drivers/net/wireless/ath/ath9k/debug.c             |   60 +
3056  drivers/net/wireless/ath/ath9k/eeprom.h            |    2 +
3057  drivers/net/wireless/ath/ath9k/eeprom_4k.c         |  135 +-
3058  drivers/net/wireless/ath/ath9k/eeprom_9287.c       |  122 +-
3059  drivers/net/wireless/ath/ath9k/eeprom_def.c        |  150 +-
3060  drivers/net/wireless/ath/ath9k/gpio.c              |    2 +
3061  drivers/net/wireless/ath/ath9k/htc.h               |    3 -
3062  drivers/net/wireless/ath/ath9k/htc_drv_init.c      |    1 -
3063  drivers/net/wireless/ath/ath9k/hw.c                |   10 +-
3064  drivers/net/wireless/ath/ath9k/hw.h                |    9 +-
3065  drivers/net/wireless/ath/ath9k/init.c              |    8 +-
3066  drivers/net/wireless/ath/ath9k/mac.c               |   16 +-
3067  drivers/net/wireless/ath/ath9k/main.c              |   10 +-
3068  drivers/net/wireless/ath/ath9k/pci.c               |    4 +-
3069  drivers/net/wireless/ath/ath9k/rc.c                |    4 +-
3070  drivers/net/wireless/ath/ath9k/rc.h                |    6 -
3071  drivers/net/wireless/ath/ath9k/recv.c              |   10 +-
3072  drivers/net/wireless/ath/ath9k/xmit.c              |   12 +-
3073  drivers/net/wireless/ath/regd.h                    |    2 +-
3074  drivers/net/wireless/ath/regd_common.h             |    2 +-
3075  drivers/net/wireless/b43/Kconfig                   |    6 +-
3076  drivers/net/wireless/b43/main.c                    |    2 +-
3077  drivers/net/wireless/b43legacy/b43legacy.h         |    1 -
3078  drivers/net/wireless/b43legacy/dma.c               |  374 +-
3079  drivers/net/wireless/b43legacy/dma.h               |  107 -
3080  drivers/net/wireless/b43legacy/main.c              |    4 +-
3081  drivers/net/wireless/hostap/hostap_main.c          |    6 +-
3082  drivers/net/wireless/ipw2x00/ipw2200.c             |    3 +-
3083  drivers/net/wireless/iwlegacy/iwl-3945-led.c       |    1 -
3084  drivers/net/wireless/iwlegacy/iwl-3945-rs.c        |    1 -
3085  drivers/net/wireless/iwlegacy/iwl-3945.c           |    1 -
3086  drivers/net/wireless/iwlegacy/iwl-4965-led.c       |    1 -
3087  drivers/net/wireless/iwlegacy/iwl-4965-rs.c        |    1 -
3088  drivers/net/wireless/iwlegacy/iwl-4965.c           |    1 -
3089  drivers/net/wireless/iwlegacy/iwl-led.c            |    1 -
3090  drivers/net/wireless/iwlegacy/iwl3945-base.c       |    1 -
3091  drivers/net/wireless/iwlegacy/iwl4965-base.c       |    1 -
3092  drivers/net/wireless/iwlwifi/Kconfig               |   17 -
3093  drivers/net/wireless/iwlwifi/iwl-1000.c            |   16 +-
3094  drivers/net/wireless/iwlwifi/iwl-2000.c            |   24 +-
3095  drivers/net/wireless/iwlwifi/iwl-5000.c            |   13 +-
3096  drivers/net/wireless/iwlwifi/iwl-6000.c            |   20 +-
3097  drivers/net/wireless/iwlwifi/iwl-agn-calib.c       |   69 +-
3098  drivers/net/wireless/iwlwifi/iwl-agn-hw.h          |    4 +-
3099  drivers/net/wireless/iwlwifi/iwl-agn-lib.c         |   47 +-
3100  drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |    1 -
3101  drivers/net/wireless/iwlwifi/iwl-agn-rxon.c        |   23 +-
3102  drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |   30 +-
3103  drivers/net/wireless/iwlwifi/iwl-agn.c             |  388 +-
3104  drivers/net/wireless/iwlwifi/iwl-agn.h             |    1 +
3105  drivers/net/wireless/iwlwifi/iwl-commands.h        |   34 +-
3106  drivers/net/wireless/iwlwifi/iwl-core.c            |    5 +
3107  drivers/net/wireless/iwlwifi/iwl-core.h            |    5 +
3108  drivers/net/wireless/iwlwifi/iwl-dev.h             |   29 +-
3109  drivers/net/wireless/iwlwifi/iwl-led.c             |    1 -
3110  drivers/net/wireless/iwlwifi/iwl-scan.c            |   19 +-
3111  drivers/net/wireless/iwlwifi/iwl-trans.c           |   10 +-
3112  drivers/net/wireless/libertas/cfg.c                |   69 +-
3113  drivers/net/wireless/libertas/cfg.h                |    1 +
3114  drivers/net/wireless/libertas/cmd.c                |    6 +-
3115  drivers/net/wireless/libertas/decl.h               |    4 +
3116  drivers/net/wireless/libertas/dev.h                |   28 +-
3117  drivers/net/wireless/libertas/ethtool.c            |    1 +
3118  drivers/net/wireless/libertas/if_sdio.c            |  277 +-
3119  drivers/net/wireless/libertas/if_spi.c             |    4 -
3120  drivers/net/wireless/libertas/if_usb.c             |   13 +-
3121  drivers/net/wireless/libertas/main.c               |  182 +-
3122  drivers/net/wireless/libertas/mesh.c               |   79 +-
3123  drivers/net/wireless/libertas/mesh.h               |   27 +-
3124  drivers/net/wireless/libertas/rx.c                 |    1 +
3125  drivers/net/wireless/libertas/tx.c                 |    1 +
3126  drivers/net/wireless/mac80211_hwsim.c              |    6 +
3127  drivers/net/wireless/mwifiex/cfg80211.c            |  209 +-
3128  drivers/net/wireless/mwifiex/fw.h                  |   15 +-
3129  drivers/net/wireless/mwifiex/init.c                |   21 -
3130  drivers/net/wireless/mwifiex/ioctl.h               |    5 +-
3131  drivers/net/wireless/mwifiex/join.c                |   32 -
3132  drivers/net/wireless/mwifiex/main.c                |    6 +-
3133  drivers/net/wireless/mwifiex/main.h                |   55 +-
3134  drivers/net/wireless/mwifiex/scan.c                | 1578 +----
3135  drivers/net/wireless/mwifiex/sta_event.c           |    9 +-
3136  drivers/net/wireless/mwifiex/sta_ioctl.c           |  230 +-
3137  drivers/net/wireless/orinoco/main.c                |    2 +-
3138  drivers/net/wireless/orinoco/orinoco_usb.c         |    2 +-
3139  drivers/net/wireless/orinoco/wext.c                |    1 +
3140  drivers/net/wireless/ray_cs.c                      |    2 +-
3141  drivers/net/wireless/rndis_wlan.c                  |    4 +-
3142  drivers/net/wireless/rt2x00/rt2400pci.c            |   39 +-
3143  drivers/net/wireless/rt2x00/rt2500pci.c            |   39 +-
3144  drivers/net/wireless/rt2x00/rt2800pci.c            |   46 +-
3145  drivers/net/wireless/rt2x00/rt2x00dev.c            |    1 -
3146  drivers/net/wireless/rt2x00/rt61pci.c              |   34 +-
3147  drivers/net/wireless/rtlwifi/pci.c                 |   37 +-
3148  drivers/net/wireless/rtlwifi/pci.h                 |   26 -
3149  drivers/net/wireless/wl1251/cmd.h                  |    2 +-
3150  drivers/net/wireless/wl1251/wl12xx_80211.h         |    2 +-
3151  drivers/net/wireless/wl12xx/cmd.h                  |    4 +-
3152  drivers/net/wireless/wl12xx/main.c                 |    2 +-
3153  drivers/net/wireless/wl12xx/scan.h                 |    6 +-
3154  drivers/net/wireless/wl12xx/wl12xx.h               |    4 +-
3155  drivers/net/wireless/wl12xx/wl12xx_80211.h         |    2 +-
3156  drivers/net/wireless/zd1201.c                      |    2 +-
3157  drivers/s390/cio/qdio.h                            |   38 +-
3158  drivers/s390/cio/qdio_debug.c                      |    3 +
3159  drivers/s390/cio/qdio_main.c                       |  208 +-
3160  drivers/s390/cio/qdio_setup.c                      |   83 +-
3161  drivers/s390/cio/qdio_thinint.c                    |   88 +-
3162  drivers/s390/net/lcs.c                             |    2 +-
3163  drivers/s390/net/qeth_core.h                       |   50 +-
3164  drivers/s390/net/qeth_core_main.c                  |  777 ++-
3165  drivers/s390/net/qeth_l2_main.c                    |    4 +-
3166  drivers/s390/net/qeth_l3.h                         |    4 +
3167  drivers/s390/net/qeth_l3_main.c                    |   92 +-
3168  drivers/s390/net/qeth_l3_sys.c                     |  110 +-
3169  drivers/scsi/bnx2fc/Kconfig                        |    3 +-
3170  drivers/scsi/bnx2fc/bnx2fc.h                       |    2 +-
3171  drivers/scsi/bnx2i/Kconfig                         |    3 +-
3172  drivers/scsi/bnx2i/bnx2i.h                         |    2 +-
3173  drivers/scsi/cxgbi/cxgb3i/Kbuild                   |    2 +-
3174  drivers/scsi/cxgbi/cxgb3i/Kconfig                  |    3 +-
3175  drivers/scsi/cxgbi/cxgb4i/Kbuild                   |    2 +-
3176  drivers/scsi/cxgbi/cxgb4i/Kconfig                  |    3 +-
3177  drivers/staging/Kconfig                            |    2 -
3178  drivers/staging/Makefile                           |    1 -
3179  drivers/staging/ath6kl/Kconfig                     |  158 -
3180  drivers/staging/ath6kl/Makefile                    |  122 -
3181  drivers/staging/ath6kl/TODO                        |   25 -
3182  drivers/staging/ath6kl/bmi/include/bmi_internal.h  |   54 -
3183  drivers/staging/ath6kl/bmi/src/bmi.c               | 1010 ---
3184  .../staging/ath6kl/hif/common/hif_sdio_common.h    |   87 -
3185  .../hif/sdio/linux_sdio/include/hif_internal.h     |  131 -
3186  .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c   | 1273 ----
3187  .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c   |  393 --
3188  drivers/staging/ath6kl/htc2/AR6000/ar6k.c          | 1479 -----
3189  drivers/staging/ath6kl/htc2/AR6000/ar6k.h          |  401 --
3190  drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c   |  783 ---
3191  drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c    |  755 ---
3192  .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c        | 1284 ----
3193  drivers/staging/ath6kl/htc2/htc.c                  |  575 --
3194  drivers/staging/ath6kl/htc2/htc_debug.h            |   38 -
3195  drivers/staging/ath6kl/htc2/htc_internal.h         |  211 -
3196  drivers/staging/ath6kl/htc2/htc_recv.c             | 1572 -----
3197  drivers/staging/ath6kl/htc2/htc_send.c             | 1018 ---
3198  drivers/staging/ath6kl/htc2/htc_services.c         |  450 --
3199  drivers/staging/ath6kl/include/a_config.h          |   31 -
3200  drivers/staging/ath6kl/include/a_debug.h           |  195 -
3201  drivers/staging/ath6kl/include/a_drv.h             |   32 -
3202  drivers/staging/ath6kl/include/a_drv_api.h         |  204 -
3203  drivers/staging/ath6kl/include/a_osapi.h           |   32 -
3204  drivers/staging/ath6kl/include/aggr_recv_api.h     |  140 -
3205  drivers/staging/ath6kl/include/ar3kconfig.h        |   65 -
3206  drivers/staging/ath6kl/include/ar6000_api.h        |   32 -
3207  drivers/staging/ath6kl/include/ar6000_diag.h       |   48 -
3208  drivers/staging/ath6kl/include/ar6kap_common.h     |   44 -
3209  drivers/staging/ath6kl/include/athbtfilter.h       |  135 -
3210  drivers/staging/ath6kl/include/bmi.h               |  134 -
3211  .../ath6kl/include/common/AR6002/AR6K_version.h    |   52 -
3212  .../staging/ath6kl/include/common/AR6002/addrs.h   |   90 -
3213  .../common/AR6002/hw4.0/hw/apb_athr_wlan_map.h     |   40 -
3214  .../include/common/AR6002/hw4.0/hw/apb_map.h       |   40 -
3215  .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h |   24 -
3216  .../include/common/AR6002/hw4.0/hw/mbox_reg.h      |  552 --
3217  .../common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h    |  471 --
3218  .../include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h |  589 --
3219  .../include/common/AR6002/hw4.0/hw/rtc_reg.h       |  187 -
3220  .../include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h  |  162 -
3221  .../include/common/AR6002/hw4.0/hw/uart_reg.h      |   40 -
3222  drivers/staging/ath6kl/include/common/athdefs.h    |   75 -
3223  drivers/staging/ath6kl/include/common/bmi_msg.h    |  233 -
3224  drivers/staging/ath6kl/include/common/cnxmgmt.h    |   36 -
3225  drivers/staging/ath6kl/include/common/dbglog.h     |  126 -
3226  drivers/staging/ath6kl/include/common/dbglog_id.h  |  558 --
3227  drivers/staging/ath6kl/include/common/discovery.h  |   75 -
3228  .../staging/ath6kl/include/common/epping_test.h    |  111 -
3229  drivers/staging/ath6kl/include/common/gmboxif.h    |   70 -
3230  drivers/staging/ath6kl/include/common/gpio_reg.h   |    9 -
3231  drivers/staging/ath6kl/include/common/htc.h        |  227 -
3232  .../staging/ath6kl/include/common/htc_services.h   |   52 -
3233  drivers/staging/ath6kl/include/common/pkt_log.h    |   45 -
3234  drivers/staging/ath6kl/include/common/roaming.h    |   41 -
3235  drivers/staging/ath6kl/include/common/targaddrs.h  |  395 --
3236  drivers/staging/ath6kl/include/common/testcmd.h    |  185 -
3237  drivers/staging/ath6kl/include/common/tlpm.h       |   38 -
3238  drivers/staging/ath6kl/include/common/wlan_defs.h  |   79 -
3239  drivers/staging/ath6kl/include/common/wmi.h        | 3220 ----------
3240  drivers/staging/ath6kl/include/common/wmix.h       |  271 -
3241  drivers/staging/ath6kl/include/common_drv.h        |  104 -
3242  drivers/staging/ath6kl/include/dbglog_api.h        |   52 -
3243  drivers/staging/ath6kl/include/dl_list.h           |  153 -
3244  drivers/staging/ath6kl/include/dset_api.h          |   65 -
3245  drivers/staging/ath6kl/include/hci_transport_api.h |  259 -
3246  drivers/staging/ath6kl/include/hif.h               |  456 --
3247  drivers/staging/ath6kl/include/host_version.h      |   52 -
3248  drivers/staging/ath6kl/include/htc_api.h           |  575 --
3249  drivers/staging/ath6kl/include/htc_packet.h        |  227 -
3250  drivers/staging/ath6kl/include/wlan_api.h          |  128 -
3251  drivers/staging/ath6kl/include/wmi_api.h           |  441 --
3252  drivers/staging/ath6kl/miscdrv/ar3kconfig.c        |  565 --
3253  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c   |  572 --
3254  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h   |   75 -
3255  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c   |  969 ---
3256  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h   |  113 -
3257  drivers/staging/ath6kl/miscdrv/common_drv.c        |  910 ---
3258  drivers/staging/ath6kl/miscdrv/credit_dist.c       |  417 --
3259  drivers/staging/ath6kl/miscdrv/miscdrv.h           |   42 -
3260  drivers/staging/ath6kl/os/linux/ar6000_drv.c       | 6267 -------------------
3261  drivers/staging/ath6kl/os/linux/ar6000_pm.c        |  626 --
3262  drivers/staging/ath6kl/os/linux/ar6000_raw_if.c    |  455 --
3263  drivers/staging/ath6kl/os/linux/cfg80211.c         | 1892 ------
3264  .../staging/ath6kl/os/linux/export_hci_transport.c |  124 -
3265  drivers/staging/ath6kl/os/linux/hci_bridge.c       | 1141 ----
3266  .../staging/ath6kl/os/linux/include/ar6000_drv.h   |  776 ---
3267  drivers/staging/ath6kl/os/linux/include/ar6k_pal.h |   36 -
3268  .../ath6kl/os/linux/include/ar6xapi_linux.h        |  190 -
3269  .../staging/ath6kl/os/linux/include/athdrv_linux.h | 1217 ----
3270  drivers/staging/ath6kl/os/linux/include/cfg80211.h |   61 -
3271  .../staging/ath6kl/os/linux/include/config_linux.h |   51 -
3272  .../staging/ath6kl/os/linux/include/debug_linux.h  |   50 -
3273  .../ath6kl/os/linux/include/export_hci_transport.h |   76 -
3274  .../ath6kl/os/linux/include/ieee80211_ioctl.h      |  177 -
3275  .../staging/ath6kl/os/linux/include/osapi_linux.h  |  339 -
3276  .../staging/ath6kl/os/linux/include/wlan_config.h  |  108 -
3277  .../ath6kl/os/linux/include/wmi_filter_linux.h     |  300 -
3278  drivers/staging/ath6kl/os/linux/netbuf.c           |  231 -
3279  drivers/staging/ath6kl/reorder/aggr_rx_internal.h  |  117 -
3280  drivers/staging/ath6kl/reorder/rcv_aggr.c          |  661 --
3281  drivers/staging/ath6kl/wlan/include/ieee80211.h    |  397 --
3282  .../staging/ath6kl/wlan/include/ieee80211_node.h   |   93 -
3283  drivers/staging/ath6kl/wlan/src/wlan_node.c        |  636 --
3284  drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c |  199 -
3285  drivers/staging/ath6kl/wlan/src/wlan_utils.c       |   58 -
3286  drivers/staging/ath6kl/wmi/wmi.c                   | 6444 --------------------
3287  drivers/staging/ath6kl/wmi/wmi_host.h              |  102 -
3288  drivers/staging/brcm80211/brcmfmac/dhd_linux.c     |    2 +-
3289  drivers/staging/et131x/et131x_netdev.c             |    2 +-
3290  drivers/staging/hv/netvsc_drv.c                    |    2 +-
3291  drivers/staging/octeon/ethernet.c                  |   12 +-
3292  drivers/staging/rtl8187se/r8180_core.c             |    2 +-
3293  drivers/staging/rtl8192e/r8192E_core.c             |    2 +-
3294  drivers/staging/rtl8192u/r8192U_core.c             |    2 +-
3295  drivers/staging/slicoss/slicoss.c                  |    2 +-
3296  drivers/staging/vt6655/device_main.c               |    2 +-
3297  drivers/staging/vt6656/main_usb.c                  |    2 +-
3298  drivers/staging/wlags49_h2/wl_netdev.c             |    2 +-
3299  drivers/staging/wlan-ng/p80211netdev.c             |    2 +-
3300  drivers/watchdog/bcm47xx_wdt.c                     |   27 +-
3301  include/linux/bcma/bcma.h                          |    9 +-
3302  include/linux/bcma/bcma_driver_chipcommon.h        |   67 +
3303  include/linux/bcma/bcma_driver_mips.h              |   51 +
3304  include/linux/bcma/bcma_soc.h                      |   16 +
3305  include/linux/ethtool.h                            |  144 +-
3306  include/linux/if.h                                 |    1 +
3307  include/linux/if_ether.h                           |    1 +
3308  include/linux/netdevice.h                          |    6 +-
3309  include/linux/nl80211.h                            |   61 +-
3310  include/linux/skbuff.h                             |  177 +-
3311  include/linux/ssb/ssb_regs.h                       |   40 +
3312  {drivers/net => include/linux}/sungem_phy.h        |    2 +-
3313  include/net/addrconf.h                             |    2 +-
3314  include/net/cfg80211-wext.h                        |   55 +
3315  include/net/cfg80211.h                             |  279 +-
3316  include/net/dst.h                                  |    9 +-
3317  include/net/if_inet6.h                             |    1 +
3318  include/net/iucv/af_iucv.h                         |   52 +
3319  include/net/iucv/iucv.h                            |   36 +-
3320  include/net/lib80211.h                             |    3 -
3321  include/net/mac80211.h                             |   11 -
3322  include/net/sock.h                                 |   15 +-
3323  net/802/garp.c                                     |    4 +-
3324  net/802/stp.c                                      |    4 +-
3325  net/8021q/vlan.c                                   |    2 +-
3326  net/8021q/vlan_dev.c                               |    1 -
3327  net/atm/lec.c                                      |    2 +-
3328  net/bluetooth/bnep/netdev.c                        |    2 +-
3329  net/bridge/br_device.c                             |    2 +-
3330  net/bridge/netfilter/ebtable_broute.c              |    4 +-
3331  net/caif/cfmuxl.c                                  |    6 +-
3332  net/can/af_can.c                                   |    4 +-
3333  net/core/dev.c                                     |  102 +-
3334  net/core/dev_addr_lists.c                          |    4 +-
3335  net/core/dst.c                                     |   15 +-
3336  net/core/fib_rules.c                               |    4 +-
3337  net/core/filter.c                                  |    2 +-
3338  net/core/neighbour.c                               |   40 +-
3339  net/core/net-sysfs.c                               |    8 +-
3340  net/core/netpoll.c                                 |    4 +-
3341  net/core/rtnetlink.c                               |    1 -
3342  net/core/skbuff.c                                  |    2 +
3343  net/core/sock.c                                    |    4 +-
3344  net/dccp/ccids/ccid2.c                             |   84 +-
3345  net/dccp/ccids/ccid2.h                             |    6 +
3346  net/dccp/dccp.h                                    |    1 +
3347  net/dccp/feat.c                                    |  202 +-
3348  net/dccp/feat.h                                    |    1 +
3349  net/dccp/proto.c                                   |    1 -
3350  net/decnet/dn_dev.c                                |    6 +-
3351  net/dsa/slave.c                                    |    3 -
3352  net/ipv4/devinet.c                                 |    6 +-
3353  net/ipv4/fib_trie.c                                |   12 +-
3354  net/ipv4/gre.c                                     |    4 +-
3355  net/ipv4/igmp.c                                    |   12 +-
3356  net/ipv4/ipip.c                                    |   10 +-
3357  net/ipv4/ipmr.c                                    |    8 +-
3358  net/ipv4/netfilter/nf_nat_amanda.c                 |    4 +-
3359  net/ipv4/netfilter/nf_nat_core.c                   |   24 +-
3360  net/ipv4/netfilter/nf_nat_ftp.c                    |    4 +-
3361  net/ipv4/netfilter/nf_nat_h323.c                   |   36 +-
3362  net/ipv4/netfilter/nf_nat_irc.c                    |    4 +-
3363  net/ipv4/netfilter/nf_nat_pptp.c                   |   16 +-
3364  net/ipv4/netfilter/nf_nat_sip.c                    |   28 +-
3365  net/ipv4/netfilter/nf_nat_snmp_basic.c             |    4 +-
3366  net/ipv4/netfilter/nf_nat_standalone.c             |    6 +-
3367  net/ipv4/netfilter/nf_nat_tftp.c                   |    4 +-
3368  net/ipv4/route.c                                   |    6 +-
3369  net/ipv4/tcp_ipv4.c                                |    6 +-
3370  net/ipv4/udp.c                                     |   11 +-
3371  net/ipv6/addrconf.c                                |   73 +-
3372  net/ipv6/exthdrs.c                                 |    7 +-
3373  net/ipv6/icmp.c                                    |   25 +-
3374  net/ipv6/inet6_connection_sock.c                   |    9 +-
3375  net/ipv6/ip6_tunnel.c                              |   37 +-
3376  net/ipv6/ndisc.c                                   |   31 +-
3377  net/ipv6/raw.c                                     |    8 +-
3378  net/ipv6/sit.c                                     |   12 +-
3379  net/ipv6/tcp_ipv6.c                                |    6 +-
3380  net/ipv6/udp.c                                     |    4 +-
3381  net/irda/irlan/irlan_eth.c                         |    2 +-
3382  net/iucv/Kconfig                                   |   14 +-
3383  net/iucv/af_iucv.c                                 |  868 +++-
3384  net/iucv/iucv.c                                    |   23 +
3385  net/mac80211/agg-rx.c                              |    4 +-
3386  net/mac80211/agg-tx.c                              |   18 +-
3387  net/mac80211/cfg.c                                 |   47 +-
3388  net/mac80211/driver-ops.h                          |   31 -
3389  net/mac80211/ibss.c                                |    6 +-
3390  net/mac80211/ieee80211_i.h                         |   64 -
3391  net/mac80211/iface.c                               |    6 +-
3392  net/mac80211/main.c                                |    1 +
3393  net/mac80211/mesh_hwmp.c                           |    7 +-
3394  net/mac80211/mesh_pathtbl.c                        |    4 +-
3395  net/mac80211/rc80211_minstrel_ht.c                 |    8 +-
3396  net/mac80211/sta_info.c                            |    9 +-
3397  net/mac80211/status.c                              |    3 -
3398  net/mac80211/tx.c                                  |   20 +
3399  net/mac80211/util.c                                |  168 +-
3400  net/netfilter/core.c                               |    4 +-
3401  net/netfilter/nf_conntrack_core.c                  |   12 +-
3402  net/netfilter/nf_conntrack_ecache.c                |    8 +-
3403  net/netfilter/nf_conntrack_extend.c                |    4 +-
3404  net/netfilter/nf_conntrack_helper.c                |    6 +-
3405  net/netfilter/nf_conntrack_netlink.c               |    6 +-
3406  net/netfilter/nf_log.c                             |   10 +-
3407  net/netfilter/nf_queue.c                           |    6 +-
3408  net/netfilter/nfnetlink.c                          |    6 +-
3409  net/netlabel/netlabel_domainhash.c                 |    6 +-
3410  net/netlabel/netlabel_unlabeled.c                  |    6 +-
3411  net/netlink/af_netlink.c                           |    2 +-
3412  net/phonet/af_phonet.c                             |    4 +-
3413  net/phonet/pn_dev.c                                |    6 +-
3414  net/phonet/socket.c                                |    6 +-
3415  net/socket.c                                       |    4 +-
3416  net/sunrpc/auth_gss/auth_gss.c                     |    4 +-
3417  net/wireless/lib80211.c                            |   15 +-
3418  net/wireless/nl80211.c                             |   86 +-
3419  net/wireless/reg.c                                 |   14 +-
3420  net/wireless/scan.c                                |    1 +
3421  net/wireless/util.c                                |  168 +
3422  net/wireless/wext-compat.c                         |  137 +-
3423  net/wireless/wext-compat.h                         |    8 +
3424  net/wireless/wext-sme.c                            |    3 +-
3425  net/xfrm/xfrm_user.c                               |    4 +-
3426  1435 files changed, 42875 insertions(+), 73716 deletions(-)
3427  create mode 100644 Documentation/devicetree/bindings/net/smsc911x.txt
3428  create mode 100644 arch/mips/bcm47xx/Kconfig
3429  create mode 100644 drivers/bcma/driver_mips.c
3430  create mode 100644 drivers/bcma/host_soc.c
3431  delete mode 100644 drivers/net/arm/Kconfig
3432  delete mode 100644 drivers/net/arm/Makefile
3433  delete mode 100644 drivers/net/benet/Kconfig
3434  delete mode 100644 drivers/net/bna/bfi_ctreg.h
3435  delete mode 100644 drivers/net/bna/bfi_ll.h
3436  delete mode 100644 drivers/net/bna/bna_ctrl.c
3437  delete mode 100644 drivers/net/bna/bna_hw.h
3438  delete mode 100644 drivers/net/bna/bna_txrx.c
3439  rename drivers/net/{ => ethernet/3com}/3c501.c (99%)
3440  rename drivers/net/{ => ethernet/3com}/3c501.h (100%)
3441  rename drivers/net/{ => ethernet/3com}/3c509.c (99%)
3442  rename drivers/net/{ => ethernet/3com}/3c515.c (99%)
3443  rename drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c (99%)
3444  rename drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c (99%)
3445  rename drivers/net/{ => ethernet/3com}/3c59x.c (99%)
3446  create mode 100644 drivers/net/ethernet/3com/Kconfig
3447  create mode 100644 drivers/net/ethernet/3com/Makefile
3448  rename drivers/net/{ => ethernet/3com}/typhoon.c (99%)
3449  rename drivers/net/{ => ethernet/3com}/typhoon.h (100%)
3450  rename drivers/net/{ => ethernet/8390}/3c503.c (99%)
3451  rename drivers/net/{ => ethernet/8390}/3c503.h (100%)
3452  rename drivers/net/{ => ethernet/8390}/8390.c (97%)
3453  rename drivers/net/{ => ethernet/8390}/8390.h (100%)
3454  rename drivers/net/{ => ethernet/8390}/8390p.c (97%)
3455  create mode 100644 drivers/net/ethernet/8390/Kconfig
3456  create mode 100644 drivers/net/ethernet/8390/Makefile
3457  rename drivers/net/{ => ethernet/8390}/ac3200.c (99%)
3458  rename drivers/net/{ => ethernet/8390}/apne.c (100%)
3459  rename drivers/net/{ => ethernet/8390}/ax88796.c (99%)
3460  rename drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c (99%)
3461  rename drivers/net/{ => ethernet/8390}/e2100.c (99%)
3462  rename drivers/net/{ => ethernet/8390}/es3210.c (100%)
3463  rename drivers/net/{arm => ethernet/8390}/etherh.c (99%)
3464  rename drivers/net/{ => ethernet/8390}/hp-plus.c (99%)
3465  rename drivers/net/{ => ethernet/8390}/hp.c (100%)
3466  rename drivers/net/{ => ethernet/8390}/hydra.c (99%)
3467  rename drivers/net/{ => ethernet/8390}/lib8390.c (100%)
3468  rename drivers/net/{ => ethernet/8390}/lne390.c (100%)
3469  rename drivers/net/{ => ethernet/8390}/mac8390.c (99%)
3470  rename drivers/net/{ => ethernet/8390}/ne-h8300.c (99%)
3471  rename drivers/net/{ => ethernet/8390}/ne.c (100%)
3472  rename drivers/net/{ => ethernet/8390}/ne2.c (100%)
3473  rename drivers/net/{ => ethernet/8390}/ne2k-pci.c (99%)
3474  rename drivers/net/{ => ethernet/8390}/ne3210.c (100%)
3475  rename drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c (99%)
3476  rename drivers/net/{ => ethernet/8390}/smc-mca.c (99%)
3477  rename drivers/net/{ => ethernet/8390}/smc-ultra.c (99%)
3478  rename drivers/net/{ => ethernet/8390}/smc-ultra32.c (99%)
3479  rename drivers/net/{ => ethernet/8390}/stnic.c (100%)
3480  rename drivers/net/{ => ethernet/8390}/wd.c (99%)
3481  rename drivers/net/{ => ethernet/8390}/zorro8390.c (99%)
3482  create mode 100644 drivers/net/ethernet/Kconfig
3483  create mode 100644 drivers/net/ethernet/Makefile
3484  create mode 100644 drivers/net/ethernet/adaptec/Kconfig
3485  create mode 100644 drivers/net/ethernet/adaptec/Makefile
3486  rename drivers/net/{ => ethernet/adaptec}/starfire.c (99%)
3487  create mode 100644 drivers/net/ethernet/adi/Kconfig
3488  create mode 100644 drivers/net/ethernet/adi/Makefile
3489  rename drivers/net/{ => ethernet/adi}/bfin_mac.c (99%)
3490  rename drivers/net/{ => ethernet/adi}/bfin_mac.h (100%)
3491  create mode 100644 drivers/net/ethernet/aeroflex/Kconfig
3492  create mode 100644 drivers/net/ethernet/aeroflex/Makefile
3493  rename drivers/net/{ => ethernet/aeroflex}/greth.c (99%)
3494  rename drivers/net/{ => ethernet/aeroflex}/greth.h (100%)
3495  create mode 100644 drivers/net/ethernet/alteon/Kconfig
3496  create mode 100644 drivers/net/ethernet/alteon/Makefile
3497  rename drivers/net/{ => ethernet/alteon}/acenic.c (99%)
3498  rename drivers/net/{ => ethernet/alteon}/acenic.h (100%)
3499  rename drivers/net/{ => ethernet/amd}/7990.c (100%)
3500  rename drivers/net/{ => ethernet/amd}/7990.h (100%)
3501  create mode 100644 drivers/net/ethernet/amd/Kconfig
3502  create mode 100644 drivers/net/ethernet/amd/Makefile
3503  rename drivers/net/{ => ethernet/amd}/a2065.c (99%)
3504  rename drivers/net/{ => ethernet/amd}/a2065.h (100%)
3505  rename drivers/net/{arm => ethernet/amd}/am79c961a.c (99%)
3506  rename drivers/net/{arm => ethernet/amd}/am79c961a.h (100%)
3507  rename drivers/net/{ => ethernet/amd}/amd8111e.c (99%)
3508  rename drivers/net/{ => ethernet/amd}/amd8111e.h (100%)
3509  rename drivers/net/{ => ethernet/amd}/ariadne.c (99%)
3510  rename drivers/net/{ => ethernet/amd}/ariadne.h (100%)
3511  rename drivers/net/{ => ethernet/amd}/atarilance.c (99%)
3512  rename drivers/net/{ => ethernet/amd}/au1000_eth.c (99%)
3513  rename drivers/net/{ => ethernet/amd}/au1000_eth.h (100%)
3514  rename drivers/net/{ => ethernet/amd}/declance.c (99%)
3515  rename drivers/net/{ => ethernet/amd}/depca.c (99%)
3516  rename drivers/net/{ => ethernet/amd}/depca.h (100%)
3517  rename drivers/net/{ => ethernet/amd}/hplance.c (99%)
3518  rename drivers/net/{ => ethernet/amd}/hplance.h (100%)
3519  rename drivers/net/{ => ethernet/amd}/lance.c (99%)
3520  rename drivers/net/{ => ethernet/amd}/mvme147.c (99%)
3521  rename drivers/net/{ => ethernet/amd}/ni65.c (99%)
3522  rename drivers/net/{ => ethernet/amd}/ni65.h (100%)
3523  rename drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c (99%)
3524  rename drivers/net/{ => ethernet/amd}/pcnet32.c (99%)
3525  rename drivers/net/{ => ethernet/amd}/sun3lance.c (99%)
3526  rename drivers/net/{ => ethernet/amd}/sunlance.c (99%)
3527  create mode 100644 drivers/net/ethernet/apple/Kconfig
3528  create mode 100644 drivers/net/ethernet/apple/Makefile
3529  rename drivers/net/{ => ethernet/apple}/bmac.c (99%)
3530  rename drivers/net/{ => ethernet/apple}/bmac.h (100%)
3531  rename drivers/net/{ => ethernet/apple}/cs89x0.c (99%)
3532  rename drivers/net/{ => ethernet/apple}/cs89x0.h (100%)
3533  rename drivers/net/{ => ethernet/apple}/mac89x0.c (99%)
3534  rename drivers/net/{ => ethernet/apple}/mace.c (99%)
3535  rename drivers/net/{ => ethernet/apple}/mace.h (100%)
3536  rename drivers/net/{ => ethernet/apple}/macmace.c (99%)
3537  create mode 100644 drivers/net/ethernet/atheros/Kconfig
3538  create mode 100644 drivers/net/ethernet/atheros/Makefile
3539  rename drivers/net/{ => ethernet/atheros}/atl1c/Makefile (100%)
3540  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h (100%)
3541  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_ethtool.c (100%)
3542  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.c (100%)
3543  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.h (100%)
3544  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_main.c (99%)
3545  rename drivers/net/{ => ethernet/atheros}/atl1e/Makefile (100%)
3546  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h (100%)
3547  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_ethtool.c (100%)
3548  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.c (100%)
3549  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.h (100%)
3550  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_main.c (99%)
3551  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_param.c (100%)
3552  rename drivers/net/{ => ethernet/atheros}/atlx/Makefile (100%)
3553  rename drivers/net/{ => ethernet/atheros}/atlx/atl1.c (99%)
3554  rename drivers/net/{ => ethernet/atheros}/atlx/atl1.h (100%)
3555  rename drivers/net/{ => ethernet/atheros}/atlx/atl2.c (99%)
3556  rename drivers/net/{ => ethernet/atheros}/atlx/atl2.h (100%)
3557  rename drivers/net/{ => ethernet/atheros}/atlx/atlx.c (100%)
3558  rename drivers/net/{ => ethernet/atheros}/atlx/atlx.h (100%)
3559  create mode 100644 drivers/net/ethernet/broadcom/Kconfig
3560  create mode 100644 drivers/net/ethernet/broadcom/Makefile
3561  rename drivers/net/{ => ethernet/broadcom}/b44.c (99%)
3562  rename drivers/net/{ => ethernet/broadcom}/b44.h (100%)
3563  rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c (99%)
3564  rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h (100%)
3565  rename drivers/net/{ => ethernet/broadcom}/bnx2.c (99%)
3566  rename drivers/net/{ => ethernet/broadcom}/bnx2.h (100%)
3567  rename drivers/net/{ => ethernet/broadcom}/bnx2_fw.h (100%)
3568  rename drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile (100%)
3569  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h (98%)
3570  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c (98%)
3571  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h (99%)
3572  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c (99%)
3573  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h (100%)
3574  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h (100%)
3575  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c (99%)
3576  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h (100%)
3577  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_file_hdr.h (100%)
3578  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h (100%)
3579  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h (100%)
3580  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h (100%)
3581  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c (99%)
3582  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h (100%)
3583  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c (99%)
3584  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h (100%)
3585  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c (98%)
3586  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h (100%)
3587  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c (98%)
3588  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h (100%)
3589  rename drivers/net/{ => ethernet/broadcom}/cnic.c (99%)
3590  rename drivers/net/{ => ethernet/broadcom}/cnic.h (100%)
3591  rename drivers/net/{ => ethernet/broadcom}/cnic_defs.h (100%)
3592  rename drivers/net/{ => ethernet/broadcom}/cnic_if.h (100%)
3593  rename drivers/net/{ => ethernet/broadcom}/sb1250-mac.c (99%)
3594  rename drivers/net/{ => ethernet/broadcom}/tg3.c (98%)
3595  rename drivers/net/{ => ethernet/broadcom}/tg3.h (99%)
3596  create mode 100644 drivers/net/ethernet/brocade/Kconfig
3597  create mode 100644 drivers/net/ethernet/brocade/Makefile
3598  create mode 100644 drivers/net/ethernet/brocade/bna/Kconfig
3599  rename drivers/net/{ => ethernet/brocade}/bna/Makefile (52%)
3600  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c (98%)
3601  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h (100%)
3602  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h (100%)
3603  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h (92%)
3604  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_cna.h (100%)
3605  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h (89%)
3606  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_status.h (100%)
3607  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c (87%)
3608  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h (88%)
3609  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c (76%)
3610  create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.c
3611  create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.h
3612  rename drivers/net/{ => ethernet/brocade}/bna/bfi.h (70%)
3613  rename drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h (100%)
3614  create mode 100644 drivers/net/ethernet/brocade/bna/bfi_enet.h
3615  create mode 100644 drivers/net/ethernet/brocade/bna/bfi_reg.h
3616  rename drivers/net/{ => ethernet/brocade}/bna/bna.h (67%)
3617  create mode 100644 drivers/net/ethernet/brocade/bna/bna_enet.c
3618  create mode 100644 drivers/net/ethernet/brocade/bna/bna_hw_defs.h
3619  create mode 100644 drivers/net/ethernet/brocade/bna/bna_tx_rx.c
3620  rename drivers/net/{ => ethernet/brocade}/bna/bna_types.h (58%)
3621  rename drivers/net/{ => ethernet/brocade}/bna/bnad.c (85%)
3622  rename drivers/net/{ => ethernet/brocade}/bna/bnad.h (89%)
3623  rename drivers/net/{ => ethernet/brocade}/bna/bnad_ethtool.c (67%)
3624  rename drivers/net/{ => ethernet/brocade}/bna/cna.h (68%)
3625  rename drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c (100%)
3626  create mode 100644 drivers/net/ethernet/cadence/Kconfig
3627  create mode 100644 drivers/net/ethernet/cadence/Makefile
3628  rename drivers/net/{arm => ethernet/cadence}/at91_ether.c (99%)
3629  rename drivers/net/{arm => ethernet/cadence}/at91_ether.h (100%)
3630  rename drivers/net/{ => ethernet/cadence}/macb.c (99%)
3631  rename drivers/net/{ => ethernet/cadence}/macb.h (100%)
3632  create mode 100644 drivers/net/ethernet/chelsio/Kconfig
3633  create mode 100644 drivers/net/ethernet/chelsio/Makefile
3634  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/Makefile (100%)
3635  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/common.h (100%)
3636  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cphy.h (100%)
3637  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h (100%)
3638  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c (99%)
3639  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/elmer0.h (100%)
3640  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.c (100%)
3641  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.h (100%)
3642  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h (100%)
3643  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/gmac.h (100%)
3644  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c (100%)
3645  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h (100%)
3646  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c (100%)
3647  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/my3126.c (100%)
3648  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/pm3393.c (100%)
3649  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/regs.h (100%)
3650  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.c (100%)
3651  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.h (100%)
3652  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/subr.c (100%)
3653  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/suni1x10gexp_regs.h (100%)
3654  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.c (100%)
3655  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.h (100%)
3656  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326.c (100%)
3657  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326_reg.h (100%)
3658  rename drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile (100%)
3659  rename drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h (100%)
3660  rename drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c (100%)
3661  rename drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c (100%)
3662  rename drivers/net/{ => ethernet/chelsio}/cxgb3/common.h (100%)
3663  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h (100%)
3664  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h (100%)
3665  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h (100%)
3666  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c (99%)
3667  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c (100%)
3668  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h (100%)
3669  rename drivers/net/{ => ethernet/chelsio}/cxgb3/firmware_exports.h (100%)
3670  rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c (100%)
3671  rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h (100%)
3672  rename drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c (100%)
3673  rename drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h (100%)
3674  rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c (100%)
3675  rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge_defs.h (100%)
3676  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h (100%)
3677  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c (100%)
3678  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h (100%)
3679  rename drivers/net/{ => ethernet/chelsio}/cxgb3/version.h (100%)
3680  rename drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c (100%)
3681  rename drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c (100%)
3682  rename drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile (100%)
3683  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h (100%)
3684  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c (99%)
3685  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h (100%)
3686  rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c (100%)
3687  rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h (100%)
3688  rename drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c (100%)
3689  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c (100%)
3690  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h (100%)
3691  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h (100%)
3692  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h (100%)
3693  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h (100%)
3694  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/Makefile (100%)
3695  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/adapter.h (100%)
3696  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c (99%)
3697  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c (100%)
3698  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h (100%)
3699  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h (100%)
3700  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c (100%)
3701  create mode 100644 drivers/net/ethernet/cirrus/Kconfig
3702  create mode 100644 drivers/net/ethernet/cirrus/Makefile
3703  rename drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c (100%)
3704  create mode 100644 drivers/net/ethernet/cisco/Kconfig
3705  create mode 100644 drivers/net/ethernet/cisco/Makefile
3706  create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig
3707  rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%)
3708  rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%)
3709  rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%)
3710  rename drivers/net/{ => ethernet/cisco}/enic/enic.h (100%)
3711  rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%)
3712  rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (100%)
3713  rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (99%)
3714  rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (100%)
3715  rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (100%)
3716  rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%)
3717  rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%)
3718  rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%)
3719  rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%)
3720  rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%)
3721  rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (100%)
3722  rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (100%)
3723  rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%)
3724  rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%)
3725  rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%)
3726  rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%)
3727  rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%)
3728  rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%)
3729  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%)
3730  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%)
3731  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%)
3732  rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%)
3733  rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%)
3734  rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%)
3735  rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%)
3736  rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%)
3737  rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%)
3738  create mode 100644 drivers/net/ethernet/davicom/Kconfig
3739  create mode 100644 drivers/net/ethernet/davicom/Makefile
3740  rename drivers/net/{ => ethernet/davicom}/dm9000.c (99%)
3741  rename drivers/net/{ => ethernet/davicom}/dm9000.h (100%)
3742  create mode 100644 drivers/net/ethernet/dec/Kconfig
3743  create mode 100644 drivers/net/ethernet/dec/Makefile
3744  rename drivers/net/{ => ethernet/dec}/ewrk3.c (99%)
3745  rename drivers/net/{ => ethernet/dec}/ewrk3.h (100%)
3746  rename drivers/net/{ => ethernet/dec}/tulip/21142.c (100%)
3747  rename drivers/net/{ => ethernet/dec}/tulip/Kconfig (96%)
3748  rename drivers/net/{ => ethernet/dec}/tulip/Makefile (100%)
3749  rename drivers/net/{ => ethernet/dec}/tulip/de2104x.c (99%)
3750  rename drivers/net/{ => ethernet/dec}/tulip/de4x5.c (99%)
3751  rename drivers/net/{ => ethernet/dec}/tulip/de4x5.h (100%)
3752  rename drivers/net/{ => ethernet/dec}/tulip/dmfe.c (99%)
3753  rename drivers/net/{ => ethernet/dec}/tulip/eeprom.c (100%)
3754  rename drivers/net/{ => ethernet/dec}/tulip/interrupt.c (100%)
3755  rename drivers/net/{ => ethernet/dec}/tulip/media.c (100%)
3756  rename drivers/net/{ => ethernet/dec}/tulip/pnic.c (100%)
3757  rename drivers/net/{ => ethernet/dec}/tulip/pnic2.c (100%)
3758  rename drivers/net/{ => ethernet/dec}/tulip/timer.c (100%)
3759  rename drivers/net/{ => ethernet/dec}/tulip/tulip.h (100%)
3760  rename drivers/net/{ => ethernet/dec}/tulip/tulip_core.c (99%)
3761  rename drivers/net/{ => ethernet/dec}/tulip/uli526x.c (99%)
3762  rename drivers/net/{ => ethernet/dec}/tulip/winbond-840.c (99%)
3763  rename drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c (100%)
3764  create mode 100644 drivers/net/ethernet/dlink/Kconfig
3765  create mode 100644 drivers/net/ethernet/dlink/Makefile
3766  rename drivers/net/{ => ethernet/dlink}/de600.c (100%)
3767  rename drivers/net/{ => ethernet/dlink}/de600.h (100%)
3768  rename drivers/net/{ => ethernet/dlink}/de620.c (99%)
3769  rename drivers/net/{ => ethernet/dlink}/de620.h (100%)
3770  rename drivers/net/{ => ethernet/dlink}/dl2k.c (99%)
3771  rename drivers/net/{ => ethernet/dlink}/dl2k.h (100%)
3772  rename drivers/net/{ => ethernet/dlink}/sundance.c (99%)
3773  rename drivers/net/{ => ethernet}/dnet.c (100%)
3774  rename drivers/net/{ => ethernet}/dnet.h (100%)
3775  create mode 100644 drivers/net/ethernet/emulex/Kconfig
3776  create mode 100644 drivers/net/ethernet/emulex/Makefile
3777  create mode 100644 drivers/net/ethernet/emulex/benet/Kconfig
3778  rename drivers/net/{ => ethernet/emulex}/benet/Makefile (100%)
3779  rename drivers/net/{ => ethernet/emulex}/benet/be.h (85%)
3780  rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.c (94%)
3781  rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.h (95%)
3782  rename drivers/net/{ => ethernet/emulex}/benet/be_ethtool.c (85%)
3783  rename drivers/net/{ => ethernet/emulex}/benet/be_hw.h (94%)
3784  rename drivers/net/{ => ethernet/emulex}/benet/be_main.c (91%)
3785  rename drivers/net/{ => ethernet}/ethoc.c (99%)
3786  create mode 100644 drivers/net/ethernet/faraday/Kconfig
3787  create mode 100644 drivers/net/ethernet/faraday/Makefile
3788  rename drivers/net/{ => ethernet/faraday}/ftgmac100.c (100%)
3789  rename drivers/net/{ => ethernet/faraday}/ftgmac100.h (100%)
3790  rename drivers/net/{ => ethernet/faraday}/ftmac100.c (100%)
3791  rename drivers/net/{ => ethernet/faraday}/ftmac100.h (100%)
3792  rename drivers/net/{ => ethernet}/fealnx.c (99%)
3793  create mode 100644 drivers/net/ethernet/freescale/Kconfig
3794  create mode 100644 drivers/net/ethernet/freescale/Makefile
3795  rename drivers/net/{ => ethernet/freescale}/fec.c (99%)
3796  rename drivers/net/{ => ethernet/freescale}/fec.h (100%)
3797  rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c (99%)
3798  rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h (100%)
3799  rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx_phy.c (100%)
3800  rename drivers/net/{ => ethernet/freescale}/fs_enet/Kconfig (91%)
3801  rename drivers/net/{ => ethernet/freescale}/fs_enet/Makefile (100%)
3802  rename drivers/net/{ => ethernet/freescale}/fs_enet/fec.h (100%)
3803  rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet-main.c (99%)
3804  rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet.h (100%)
3805  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fcc.c (100%)
3806  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fec.c (100%)
3807  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-scc.c (100%)
3808  rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-bitbang.c (100%)
3809  rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-fec.c (100%)
3810  rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c (100%)
3811  rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h (100%)
3812  rename drivers/net/{ => ethernet/freescale}/gianfar.c (99%)
3813  rename drivers/net/{ => ethernet/freescale}/gianfar.h (100%)
3814  rename drivers/net/{ => ethernet/freescale}/gianfar_ethtool.c (100%)
3815  rename drivers/net/{ => ethernet/freescale}/gianfar_ptp.c (100%)
3816  rename drivers/net/{ => ethernet/freescale}/gianfar_sysfs.c (100%)
3817  rename drivers/net/{ => ethernet/freescale}/ucc_geth.c (99%)
3818  rename drivers/net/{ => ethernet/freescale}/ucc_geth.h (100%)
3819  rename drivers/net/{ => ethernet/freescale}/ucc_geth_ethtool.c (100%)
3820  create mode 100644 drivers/net/ethernet/fujitsu/Kconfig
3821  create mode 100644 drivers/net/ethernet/fujitsu/Makefile
3822  rename drivers/net/{ => ethernet/fujitsu}/at1700.c (99%)
3823  rename drivers/net/{ => ethernet/fujitsu}/eth16i.c (99%)
3824  rename drivers/net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c (99%)
3825  create mode 100644 drivers/net/ethernet/hp/Kconfig
3826  create mode 100644 drivers/net/ethernet/hp/Makefile
3827  rename drivers/net/{ => ethernet/hp}/hp100.c (99%)
3828  rename drivers/net/{ => ethernet/hp}/hp100.h (100%)
3829  rename drivers/net/{ => ethernet/i825xx}/3c505.c (99%)
3830  rename drivers/net/{ => ethernet/i825xx}/3c505.h (100%)
3831  rename drivers/net/{ => ethernet/i825xx}/3c507.c (100%)
3832  rename drivers/net/{ => ethernet/i825xx}/3c523.c (99%)
3833  rename drivers/net/{ => ethernet/i825xx}/3c523.h (100%)
3834  rename drivers/net/{ => ethernet/i825xx}/3c527.c (99%)
3835  rename drivers/net/{ => ethernet/i825xx}/3c527.h (100%)
3836  rename drivers/net/{ => ethernet/i825xx}/82596.c (99%)
3837  create mode 100644 drivers/net/ethernet/i825xx/Kconfig
3838  create mode 100644 drivers/net/ethernet/i825xx/Makefile
3839  rename drivers/net/{ => ethernet/i825xx}/eepro.c (99%)
3840  rename drivers/net/{ => ethernet/i825xx}/eexpress.c (99%)
3841  rename drivers/net/{ => ethernet/i825xx}/eexpress.h (100%)
3842  rename drivers/net/{arm => ethernet/i825xx}/ether1.c (99%)
3843  rename drivers/net/{arm => ethernet/i825xx}/ether1.h (100%)
3844  rename drivers/net/{ => ethernet/i825xx}/lasi_82596.c (100%)
3845  rename drivers/net/{ => ethernet/i825xx}/lib82596.c (99%)
3846  rename drivers/net/{ => ethernet/i825xx}/lp486e.c (99%)
3847  rename drivers/net/{ => ethernet/i825xx}/ni52.c (99%)
3848  rename drivers/net/{ => ethernet/i825xx}/ni52.h (100%)
3849  rename drivers/net/{ => ethernet/i825xx}/sni_82596.c (100%)
3850  rename drivers/net/{ => ethernet/i825xx}/sun3_82586.c (99%)
3851  rename drivers/net/{ => ethernet/i825xx}/sun3_82586.h (100%)
3852  rename drivers/net/{ => ethernet/i825xx}/znet.c (99%)
3853  create mode 100644 drivers/net/ethernet/ibm/Kconfig
3854  create mode 100644 drivers/net/ethernet/ibm/Makefile
3855  rename drivers/net/{ => ethernet/ibm}/ehea/Makefile (100%)
3856  rename drivers/net/{ => ethernet/ibm}/ehea/ehea.h (100%)
3857  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c (100%)
3858  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h (100%)
3859  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c (99%)
3860  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c (100%)
3861  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h (100%)
3862  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c (100%)
3863  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h (100%)
3864  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Kconfig (63%)
3865  create mode 100644 drivers/net/ethernet/ibm/emac/Makefile
3866  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.c (99%)
3867  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.h (97%)
3868  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.c (100%)
3869  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.h (98%)
3870  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/emac.h (100%)
3871  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.c (99%)
3872  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.h (99%)
3873  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.c (100%)
3874  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.h (100%)
3875  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c (100%)
3876  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h (96%)
3877  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.c (100%)
3878  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.h (97%)
3879  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.c (100%)
3880  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.h (96%)
3881  rename drivers/net/{ => ethernet/ibm}/ibmveth.c (99%)
3882  rename drivers/net/{ => ethernet/ibm}/ibmveth.h (100%)
3883  rename drivers/net/{ => ethernet/ibm}/iseries_veth.c (99%)
3884  create mode 100644 drivers/net/ethernet/icplus/Kconfig
3885  create mode 100644 drivers/net/ethernet/icplus/Makefile
3886  rename drivers/net/{ => ethernet/icplus}/ipg.c (92%)
3887  rename drivers/net/{ => ethernet/icplus}/ipg.h (100%)
3888  create mode 100644 drivers/net/ethernet/intel/Kconfig
3889  create mode 100644 drivers/net/ethernet/intel/Makefile
3890  rename drivers/net/{ => ethernet/intel}/e100.c (99%)
3891  rename drivers/net/{ => ethernet/intel}/e1000/Makefile (100%)
3892  rename drivers/net/{ => ethernet/intel}/e1000/e1000.h (100%)
3893  rename drivers/net/{ => ethernet/intel}/e1000/e1000_ethtool.c (100%)
3894  rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c (100%)
3895  rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h (100%)
3896  rename drivers/net/{ => ethernet/intel}/e1000/e1000_main.c (99%)
3897  rename drivers/net/{ => ethernet/intel}/e1000/e1000_osdep.h (100%)
3898  rename drivers/net/{ => ethernet/intel}/e1000/e1000_param.c (100%)
3899  rename drivers/net/{e1000e/es2lan.c => ethernet/intel/e1000e/80003es2lan.c} (100%)
3900  rename drivers/net/{ => ethernet/intel}/e1000e/82571.c (100%)
3901  rename drivers/net/{ => ethernet/intel}/e1000e/Makefile (96%)
3902  rename drivers/net/{ => ethernet/intel}/e1000e/defines.h (100%)
3903  rename drivers/net/{ => ethernet/intel}/e1000e/e1000.h (99%)
3904  rename drivers/net/{ => ethernet/intel}/e1000e/ethtool.c (99%)
3905  rename drivers/net/{ => ethernet/intel}/e1000e/hw.h (100%)
3906  rename drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c (100%)
3907  rename drivers/net/{ => ethernet/intel}/e1000e/lib.c (100%)
3908  rename drivers/net/{ => ethernet/intel}/e1000e/netdev.c (97%)
3909  rename drivers/net/{ => ethernet/intel}/e1000e/param.c (100%)
3910  rename drivers/net/{ => ethernet/intel}/e1000e/phy.c (100%)
3911  rename drivers/net/{ => ethernet/intel}/igb/Makefile (100%)
3912  rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.c (100%)
3913  rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.h (100%)
3914  rename drivers/net/{ => ethernet/intel}/igb/e1000_defines.h (100%)
3915  rename drivers/net/{ => ethernet/intel}/igb/e1000_hw.h (100%)
3916  rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.c (100%)
3917  rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.h (100%)
3918  rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c (100%)
3919  rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h (100%)
3920  rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c (100%)
3921  rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h (100%)
3922  rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.c (100%)
3923  rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.h (100%)
3924  rename drivers/net/{ => ethernet/intel}/igb/e1000_regs.h (100%)
3925  rename drivers/net/{ => ethernet/intel}/igb/igb.h (100%)
3926  rename drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c (100%)
3927  rename drivers/net/{ => ethernet/intel}/igb/igb_main.c (99%)
3928  rename drivers/net/{ => ethernet/intel}/igbvf/Makefile (100%)
3929  rename drivers/net/{ => ethernet/intel}/igbvf/defines.h (100%)
3930  rename drivers/net/{ => ethernet/intel}/igbvf/ethtool.c (100%)
3931  rename drivers/net/{ => ethernet/intel}/igbvf/igbvf.h (100%)
3932  rename drivers/net/{ => ethernet/intel}/igbvf/mbx.c (100%)
3933  rename drivers/net/{ => ethernet/intel}/igbvf/mbx.h (100%)
3934  rename drivers/net/{ => ethernet/intel}/igbvf/netdev.c (99%)
3935  rename drivers/net/{ => ethernet/intel}/igbvf/regs.h (100%)
3936  rename drivers/net/{ => ethernet/intel}/igbvf/vf.c (100%)
3937  rename drivers/net/{ => ethernet/intel}/igbvf/vf.h (100%)
3938  rename drivers/net/{ => ethernet/intel}/ixgb/Makefile (100%)
3939  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb.h (100%)
3940  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c (100%)
3941  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h (100%)
3942  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c (100%)
3943  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c (100%)
3944  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h (100%)
3945  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h (100%)
3946  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c (99%)
3947  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h (100%)
3948  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c (100%)
3949  rename drivers/net/{ => ethernet/intel}/ixgbe/Makefile (100%)
3950  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h (97%)
3951  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c (100%)
3952  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c (100%)
3953  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.c (100%)
3954  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.h (100%)
3955  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c (100%)
3956  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h (100%)
3957  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c (100%)
3958  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h (100%)
3959  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c (100%)
3960  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h (100%)
3961  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c (99%)
3962  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c (100%)
3963  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c (99%)
3964  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h (100%)
3965  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_main.c (96%)
3966  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c (100%)
3967  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h (100%)
3968  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c (100%)
3969  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h (100%)
3970  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c (100%)
3971  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h (100%)
3972  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_type.h (100%)
3973  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c (100%)
3974  rename drivers/net/{ => ethernet/intel}/ixgbevf/Makefile (100%)
3975  rename drivers/net/{ => ethernet/intel}/ixgbevf/defines.h (100%)
3976  rename drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c (100%)
3977  rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h (100%)
3978  rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf_main.c (99%)
3979  rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c (100%)
3980  rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h (100%)
3981  rename drivers/net/{ => ethernet/intel}/ixgbevf/regs.h (100%)
3982  rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.c (100%)
3983  rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.h (100%)
3984  rename drivers/net/{ => ethernet}/jme.c (99%)
3985  rename drivers/net/{ => ethernet}/jme.h (100%)
3986  rename drivers/net/{ => ethernet}/korina.c (99%)
3987  rename drivers/net/{ => ethernet}/lantiq_etop.c (99%)
3988  create mode 100644 drivers/net/ethernet/marvell/Kconfig
3989  create mode 100644 drivers/net/ethernet/marvell/Makefile
3990  rename drivers/net/{ => ethernet/marvell}/mv643xx_eth.c (99%)
3991  rename drivers/net/{ => ethernet/marvell}/pxa168_eth.c (100%)
3992  rename drivers/net/{ => ethernet/marvell}/skge.c (99%)
3993  rename drivers/net/{ => ethernet/marvell}/skge.h (100%)
3994  rename drivers/net/{ => ethernet/marvell}/sky2.c (99%)
3995  rename drivers/net/{ => ethernet/marvell}/sky2.h (100%)
3996  create mode 100644 drivers/net/ethernet/mellanox/Kconfig
3997  create mode 100644 drivers/net/ethernet/mellanox/Makefile
3998  create mode 100644 drivers/net/ethernet/mellanox/mlx4/Kconfig
3999  rename drivers/net/{ => ethernet/mellanox}/mlx4/Makefile (100%)
4000  rename drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c (100%)
4001  rename drivers/net/{ => ethernet/mellanox}/mlx4/catas.c (100%)
4002  rename drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c (100%)
4003  rename drivers/net/{ => ethernet/mellanox}/mlx4/cq.c (100%)
4004  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c (100%)
4005  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_ethtool.c (100%)
4006  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c (100%)
4007  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_netdev.c (99%)
4008  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c (100%)
4009  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h (100%)
4010  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_resources.c (100%)
4011  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c (100%)
4012  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_selftest.c (100%)
4013  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c (100%)
4014  rename drivers/net/{ => ethernet/mellanox}/mlx4/eq.c (100%)
4015  rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.c (100%)
4016  rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.h (100%)
4017  rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.c (100%)
4018  rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.h (100%)
4019  rename drivers/net/{ => ethernet/mellanox}/mlx4/intf.c (100%)
4020  rename drivers/net/{ => ethernet/mellanox}/mlx4/main.c (100%)
4021  rename drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c (100%)
4022  rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h (100%)
4023  rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h (100%)
4024  rename drivers/net/{ => ethernet/mellanox}/mlx4/mr.c (100%)
4025  rename drivers/net/{ => ethernet/mellanox}/mlx4/pd.c (100%)
4026  rename drivers/net/{ => ethernet/mellanox}/mlx4/port.c (100%)
4027  rename drivers/net/{ => ethernet/mellanox}/mlx4/profile.c (100%)
4028  rename drivers/net/{ => ethernet/mellanox}/mlx4/qp.c (100%)
4029  rename drivers/net/{ => ethernet/mellanox}/mlx4/reset.c (100%)
4030  rename drivers/net/{ => ethernet/mellanox}/mlx4/sense.c (100%)
4031  rename drivers/net/{ => ethernet/mellanox}/mlx4/srq.c (100%)
4032  create mode 100644 drivers/net/ethernet/micrel/Kconfig
4033  create mode 100644 drivers/net/ethernet/micrel/Makefile
4034  rename drivers/net/{arm => ethernet/micrel}/ks8695net.c (99%)
4035  rename drivers/net/{arm => ethernet/micrel}/ks8695net.h (100%)
4036  rename drivers/net/{ => ethernet/micrel}/ks8842.c (100%)
4037  rename drivers/net/{ => ethernet/micrel}/ks8851.c (100%)
4038  rename drivers/net/{ => ethernet/micrel}/ks8851.h (100%)
4039  rename drivers/net/{ => ethernet/micrel}/ks8851_mll.c (100%)
4040  rename drivers/net/{ => ethernet/micrel}/ksz884x.c (100%)
4041  create mode 100644 drivers/net/ethernet/microchip/Kconfig
4042  create mode 100644 drivers/net/ethernet/microchip/Makefile
4043  rename drivers/net/{ => ethernet/microchip}/enc28j60.c (99%)
4044  rename drivers/net/{ => ethernet/microchip}/enc28j60_hw.h (100%)
4045  rename drivers/net/{ => ethernet}/mipsnet.c (99%)
4046  create mode 100644 drivers/net/ethernet/myricom/Kconfig
4047  create mode 100644 drivers/net/ethernet/myricom/Makefile
4048  rename drivers/net/{ => ethernet/myricom}/myri10ge/Makefile (100%)
4049  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge.c (99%)
4050  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h (100%)
4051  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp_gen_header.h (100%)
4052  create mode 100644 drivers/net/ethernet/natsemi/Kconfig
4053  create mode 100644 drivers/net/ethernet/natsemi/Makefile
4054  rename drivers/net/{ => ethernet/natsemi}/ibmlana.c (99%)
4055  rename drivers/net/{ => ethernet/natsemi}/ibmlana.h (100%)
4056  rename drivers/net/{ => ethernet/natsemi}/jazzsonic.c (99%)
4057  rename drivers/net/{ => ethernet/natsemi}/macsonic.c (99%)
4058  rename drivers/net/{ => ethernet/natsemi}/natsemi.c (99%)
4059  rename drivers/net/{ => ethernet/natsemi}/ns83820.c (99%)
4060  rename drivers/net/{ => ethernet/natsemi}/sonic.c (100%)
4061  rename drivers/net/{ => ethernet/natsemi}/sonic.h (100%)
4062  rename drivers/net/{ => ethernet/natsemi}/xtsonic.c (99%)
4063  create mode 100644 drivers/net/ethernet/neterion/Kconfig
4064  create mode 100644 drivers/net/ethernet/neterion/Makefile
4065  rename drivers/net/{ => ethernet/neterion}/s2io-regs.h (100%)
4066  rename drivers/net/{ => ethernet/neterion}/s2io.c (99%)
4067  rename drivers/net/{ => ethernet/neterion}/s2io.h (100%)
4068  rename drivers/net/{ => ethernet/neterion}/vxge/Makefile (100%)
4069  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.c (100%)
4070  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.h (100%)
4071  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.c (100%)
4072  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.h (100%)
4073  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.c (99%)
4074  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.h (100%)
4075  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-reg.h (100%)
4076  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.c (100%)
4077  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.h (100%)
4078  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-version.h (100%)
4079  rename drivers/net/{ => ethernet}/netx-eth.c (99%)
4080  create mode 100644 drivers/net/ethernet/nuvoton/Kconfig
4081  create mode 100644 drivers/net/ethernet/nuvoton/Makefile
4082  rename drivers/net/{arm => ethernet/nuvoton}/w90p910_ether.c (99%)
4083  create mode 100644 drivers/net/ethernet/nvidia/Kconfig
4084  create mode 100644 drivers/net/ethernet/nvidia/Makefile
4085  rename drivers/net/{ => ethernet/nvidia}/forcedeth.c (99%)
4086  rename drivers/net/{ => ethernet}/octeon/Kconfig (85%)
4087  create mode 100644 drivers/net/ethernet/octeon/Makefile
4088  rename drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (99%)
4089  create mode 100644 drivers/net/ethernet/oki-semi/Kconfig
4090  create mode 100644 drivers/net/ethernet/oki-semi/Makefile
4091  create mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
4092  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/Makefile (100%)
4093  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h (100%)
4094  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c (100%)
4095  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h (100%)
4096  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_ethtool.c (100%)
4097  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c (99%)
4098  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_param.c (100%)
4099  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c (100%)
4100  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h (100%)
4101  create mode 100644 drivers/net/ethernet/packetengines/Kconfig
4102  create mode 100644 drivers/net/ethernet/packetengines/Makefile
4103  rename drivers/net/{ => ethernet/packetengines}/hamachi.c (99%)
4104  rename drivers/net/{ => ethernet/packetengines}/yellowfin.c (99%)
4105  create mode 100644 drivers/net/ethernet/pasemi/Kconfig
4106  create mode 100644 drivers/net/ethernet/pasemi/Makefile
4107  rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.c (99%)
4108  rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.h (100%)
4109  rename drivers/net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c (100%)
4110  create mode 100644 drivers/net/ethernet/qlogic/Kconfig
4111  create mode 100644 drivers/net/ethernet/qlogic/Makefile
4112  rename drivers/net/{ => ethernet/qlogic}/netxen/Makefile (100%)
4113  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic.h (99%)
4114  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c (100%)
4115  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ethtool.c (100%)
4116  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h (100%)
4117  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.c (100%)
4118  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.h (100%)
4119  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_init.c (99%)
4120  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_main.c (96%)
4121  rename drivers/net/{ => ethernet/qlogic}/qla3xxx.c (99%)
4122  rename drivers/net/{ => ethernet/qlogic}/qla3xxx.h (100%)
4123  rename drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile (100%)
4124  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h (99%)
4125  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c (100%)
4126  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c (98%)
4127  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h (100%)
4128  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c (99%)
4129  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c (99%)
4130  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c (98%)
4131  rename drivers/net/{ => ethernet/qlogic}/qlge/Makefile (100%)
4132  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge.h (100%)
4133  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c (100%)
4134  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c (100%)
4135  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c (99%)
4136  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c (100%)
4137  create mode 100644 drivers/net/ethernet/racal/Kconfig
4138  create mode 100644 drivers/net/ethernet/racal/Makefile
4139  rename drivers/net/{ => ethernet/racal}/ni5010.c (99%)
4140  rename drivers/net/{ => ethernet/racal}/ni5010.h (100%)
4141  create mode 100644 drivers/net/ethernet/rdc/Kconfig
4142  create mode 100644 drivers/net/ethernet/rdc/Makefile
4143  rename drivers/net/{ => ethernet/rdc}/r6040.c (99%)
4144  rename drivers/net/{ => ethernet/realtek}/8139cp.c (99%)
4145  rename drivers/net/{ => ethernet/realtek}/8139too.c (99%)
4146  create mode 100644 drivers/net/ethernet/realtek/Kconfig
4147  create mode 100644 drivers/net/ethernet/realtek/Makefile
4148  rename drivers/net/{ => ethernet/realtek}/atp.c (99%)
4149  rename drivers/net/{ => ethernet/realtek}/atp.h (100%)
4150  rename drivers/net/{ => ethernet/realtek}/r8169.c (99%)
4151  rename drivers/net/{ => ethernet/realtek}/sc92031.c (99%)
4152  create mode 100644 drivers/net/ethernet/renesas/Kconfig
4153  create mode 100644 drivers/net/ethernet/renesas/Makefile
4154  rename drivers/net/{ => ethernet/renesas}/sh_eth.c (99%)
4155  rename drivers/net/{ => ethernet/renesas}/sh_eth.h (100%)
4156  rename drivers/net/{ => ethernet}/s6gmac.c (100%)
4157  create mode 100644 drivers/net/ethernet/seeq/Kconfig
4158  create mode 100644 drivers/net/ethernet/seeq/Makefile
4159  rename drivers/net/{arm => ethernet/seeq}/ether3.c (99%)
4160  rename drivers/net/{arm => ethernet/seeq}/ether3.h (100%)
4161  rename drivers/net/{ => ethernet/seeq}/seeq8005.c (99%)
4162  rename drivers/net/{ => ethernet/seeq}/seeq8005.h (100%)
4163  rename drivers/net/{ => ethernet/seeq}/sgiseeq.c (99%)
4164  rename drivers/net/{ => ethernet/seeq}/sgiseeq.h (100%)
4165  rename drivers/net/{ => ethernet}/sfc/Kconfig (96%)
4166  rename drivers/net/{ => ethernet}/sfc/Makefile (100%)
4167  rename drivers/net/{ => ethernet}/sfc/bitfield.h (100%)
4168  rename drivers/net/{ => ethernet}/sfc/efx.c (99%)
4169  rename drivers/net/{ => ethernet}/sfc/efx.h (100%)
4170  rename drivers/net/{ => ethernet}/sfc/enum.h (100%)
4171  rename drivers/net/{ => ethernet}/sfc/ethtool.c (100%)
4172  rename drivers/net/{ => ethernet}/sfc/falcon.c (100%)
4173  rename drivers/net/{ => ethernet}/sfc/falcon_boards.c (100%)
4174  rename drivers/net/{ => ethernet}/sfc/falcon_xmac.c (100%)
4175  rename drivers/net/{ => ethernet}/sfc/filter.c (100%)
4176  rename drivers/net/{ => ethernet}/sfc/filter.h (100%)
4177  rename drivers/net/{ => ethernet}/sfc/io.h (100%)
4178  rename drivers/net/{ => ethernet}/sfc/mac.h (100%)
4179  rename drivers/net/{ => ethernet}/sfc/mcdi.c (100%)
4180  rename drivers/net/{ => ethernet}/sfc/mcdi.h (100%)
4181  rename drivers/net/{ => ethernet}/sfc/mcdi_mac.c (100%)
4182  rename drivers/net/{ => ethernet}/sfc/mcdi_pcol.h (100%)
4183  rename drivers/net/{ => ethernet}/sfc/mcdi_phy.c (100%)
4184  rename drivers/net/{ => ethernet}/sfc/mdio_10g.c (100%)
4185  rename drivers/net/{ => ethernet}/sfc/mdio_10g.h (100%)
4186  rename drivers/net/{ => ethernet}/sfc/mtd.c (100%)
4187  rename drivers/net/{ => ethernet}/sfc/net_driver.h (100%)
4188  rename drivers/net/{ => ethernet}/sfc/nic.c (100%)
4189  rename drivers/net/{ => ethernet}/sfc/nic.h (100%)
4190  rename drivers/net/{ => ethernet}/sfc/phy.h (100%)
4191  rename drivers/net/{ => ethernet}/sfc/qt202x_phy.c (100%)
4192  rename drivers/net/{ => ethernet}/sfc/regs.h (100%)
4193  rename drivers/net/{ => ethernet}/sfc/rx.c (100%)
4194  rename drivers/net/{ => ethernet}/sfc/selftest.c (100%)
4195  rename drivers/net/{ => ethernet}/sfc/selftest.h (100%)
4196  rename drivers/net/{ => ethernet}/sfc/siena.c (100%)
4197  rename drivers/net/{ => ethernet}/sfc/spi.h (100%)
4198  rename drivers/net/{ => ethernet}/sfc/tenxpress.c (100%)
4199  rename drivers/net/{ => ethernet}/sfc/tx.c (100%)
4200  rename drivers/net/{ => ethernet}/sfc/txc43128_phy.c (100%)
4201  rename drivers/net/{ => ethernet}/sfc/workarounds.h (100%)
4202  create mode 100644 drivers/net/ethernet/sgi/Kconfig
4203  create mode 100644 drivers/net/ethernet/sgi/Makefile
4204  rename drivers/net/{ => ethernet/sgi}/ioc3-eth.c (99%)
4205  rename drivers/net/{ => ethernet/sgi}/meth.c (100%)
4206  rename drivers/net/{ => ethernet/sgi}/meth.h (100%)
4207  create mode 100644 drivers/net/ethernet/sis/Kconfig
4208  create mode 100644 drivers/net/ethernet/sis/Makefile
4209  rename drivers/net/{ => ethernet/sis}/sis190.c (99%)
4210  rename drivers/net/{ => ethernet/sis}/sis900.c (99%)
4211  rename drivers/net/{ => ethernet/sis}/sis900.h (100%)
4212  create mode 100644 drivers/net/ethernet/smsc/Kconfig
4213  create mode 100644 drivers/net/ethernet/smsc/Makefile
4214  rename drivers/net/{ => ethernet/smsc}/epic100.c (99%)
4215  rename drivers/net/{ => ethernet/smsc}/smc911x.c (99%)
4216  rename drivers/net/{ => ethernet/smsc}/smc911x.h (100%)
4217  rename drivers/net/{ => ethernet/smsc}/smc9194.c (99%)
4218  rename drivers/net/{ => ethernet/smsc}/smc9194.h (100%)
4219  rename drivers/net/{pcmcia => ethernet/smsc}/smc91c92_cs.c (99%)
4220  rename drivers/net/{ => ethernet/smsc}/smc91x.c (99%)
4221  rename drivers/net/{ => ethernet/smsc}/smc91x.h (100%)
4222  rename drivers/net/{ => ethernet/smsc}/smsc911x.c (97%)
4223  rename drivers/net/{ => ethernet/smsc}/smsc911x.h (100%)
4224  rename drivers/net/{ => ethernet/smsc}/smsc9420.c (99%)
4225  rename drivers/net/{ => ethernet/smsc}/smsc9420.h (100%)
4226  create mode 100644 drivers/net/ethernet/stmicro/Kconfig
4227  create mode 100644 drivers/net/ethernet/stmicro/Makefile
4228  rename drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig (93%)
4229  rename drivers/net/{ => ethernet/stmicro}/stmmac/Makefile (100%)
4230  rename drivers/net/{ => ethernet/stmicro}/stmmac/common.h (100%)
4231  rename drivers/net/{ => ethernet/stmicro}/stmmac/descs.h (100%)
4232  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100.h (100%)
4233  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000.h (100%)
4234  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_core.c (100%)
4235  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c (100%)
4236  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_core.c (100%)
4237  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_dma.c (100%)
4238  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h (100%)
4239  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c (100%)
4240  rename drivers/net/{ => ethernet/stmicro}/stmmac/enh_desc.c (100%)
4241  rename drivers/net/{ => ethernet/stmicro}/stmmac/norm_desc.c (100%)
4242  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h (100%)
4243  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c (100%)
4244  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_main.c (99%)
4245  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_mdio.c (100%)
4246  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.c (100%)
4247  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.h (100%)
4248  create mode 100644 drivers/net/ethernet/sun/Kconfig
4249  create mode 100644 drivers/net/ethernet/sun/Makefile
4250  rename drivers/net/{ => ethernet/sun}/cassini.c (99%)
4251  rename drivers/net/{ => ethernet/sun}/cassini.h (100%)
4252  rename drivers/net/{ => ethernet/sun}/niu.c (99%)
4253  rename drivers/net/{ => ethernet/sun}/niu.h (100%)
4254  rename drivers/net/{ => ethernet/sun}/sunbmac.c (99%)
4255  rename drivers/net/{ => ethernet/sun}/sunbmac.h (100%)
4256  rename drivers/net/{ => ethernet/sun}/sungem.c (99%)
4257  rename drivers/net/{ => ethernet/sun}/sungem.h (100%)
4258  rename drivers/net/{ => ethernet/sun}/sunhme.c (99%)
4259  rename drivers/net/{ => ethernet/sun}/sunhme.h (100%)
4260  rename drivers/net/{ => ethernet/sun}/sunqe.c (99%)
4261  rename drivers/net/{ => ethernet/sun}/sunqe.h (100%)
4262  rename drivers/net/{ => ethernet/sun}/sunvnet.c (99%)
4263  rename drivers/net/{ => ethernet/sun}/sunvnet.h (100%)
4264  create mode 100644 drivers/net/ethernet/tehuti/Kconfig
4265  create mode 100644 drivers/net/ethernet/tehuti/Makefile
4266  rename drivers/net/{ => ethernet/tehuti}/tehuti.c (99%)
4267  rename drivers/net/{ => ethernet/tehuti}/tehuti.h (100%)
4268  create mode 100644 drivers/net/ethernet/ti/Kconfig
4269  create mode 100644 drivers/net/ethernet/ti/Makefile
4270  rename drivers/net/{ => ethernet/ti}/cpmac.c (99%)
4271  rename drivers/net/{ => ethernet/ti}/davinci_cpdma.c (100%)
4272  rename drivers/net/{ => ethernet/ti}/davinci_cpdma.h (100%)
4273  rename drivers/net/{ => ethernet/ti}/davinci_emac.c (99%)
4274  rename drivers/net/{ => ethernet/ti}/davinci_mdio.c (100%)
4275  rename drivers/net/{ => ethernet/ti}/tlan.c (99%)
4276  rename drivers/net/{ => ethernet/ti}/tlan.h (100%)
4277  create mode 100644 drivers/net/ethernet/tile/Kconfig
4278  rename drivers/net/{ => ethernet}/tile/Makefile (100%)
4279  rename drivers/net/{ => ethernet}/tile/tilepro.c (100%)
4280  create mode 100644 drivers/net/ethernet/toshiba/Kconfig
4281  create mode 100644 drivers/net/ethernet/toshiba/Makefile
4282  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c (99%)
4283  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h (100%)
4284  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.c (99%)
4285  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.h (100%)
4286  rename drivers/net/{ => ethernet/toshiba}/spider_net.c (99%)
4287  rename drivers/net/{ => ethernet/toshiba}/spider_net.h (99%)
4288  rename drivers/net/{ => ethernet/toshiba}/spider_net_ethtool.c (100%)
4289  rename drivers/net/{ => ethernet/toshiba}/tc35815.c (99%)
4290  create mode 100644 drivers/net/ethernet/tundra/Kconfig
4291  create mode 100644 drivers/net/ethernet/tundra/Makefile
4292  rename drivers/net/{ => ethernet/tundra}/tsi108_eth.c (99%)
4293  rename drivers/net/{ => ethernet/tundra}/tsi108_eth.h (100%)
4294  create mode 100644 drivers/net/ethernet/via/Kconfig
4295  create mode 100644 drivers/net/ethernet/via/Makefile
4296  rename drivers/net/{ => ethernet/via}/via-rhine.c (99%)
4297  rename drivers/net/{ => ethernet/via}/via-velocity.c (97%)
4298  rename drivers/net/{ => ethernet/via}/via-velocity.h (100%)
4299  create mode 100644 drivers/net/ethernet/xilinx/Kconfig
4300  create mode 100644 drivers/net/ethernet/xilinx/Makefile
4301  rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%)
4302  rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (99%)
4303  rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%)
4304  rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%)
4305  create mode 100644 drivers/net/ethernet/xircom/Kconfig
4306  create mode 100644 drivers/net/ethernet/xircom/Makefile
4307  rename drivers/net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c (99%)
4308  create mode 100644 drivers/net/ethernet/xscale/Kconfig
4309  create mode 100644 drivers/net/ethernet/xscale/Makefile
4310  rename drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig (94%)
4311  rename drivers/net/{ => ethernet/xscale}/ixp2000/Makefile (100%)
4312  rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c (100%)
4313  rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h (100%)
4314  rename drivers/net/{ => ethernet/xscale}/ixp2000/enp2611.c (100%)
4315  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.c (100%)
4316  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.h (100%)
4317  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc (100%)
4318  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode (100%)
4319  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc (100%)
4320  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode (100%)
4321  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c (100%)
4322  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h (100%)
4323  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev_priv.h (100%)
4324  rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c (100%)
4325  rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h (100%)
4326  rename drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c (99%)
4327  delete mode 100644 drivers/net/ibm_newemac/Makefile
4328  delete mode 100644 drivers/net/octeon/Makefile
4329  delete mode 100644 drivers/net/pci-skeleton.c
4330  create mode 100644 drivers/net/wireless/ath/ath6kl/Kconfig
4331  create mode 100644 drivers/net/wireless/ath/ath6kl/Makefile
4332  create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.c
4333  create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.h
4334  create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.c
4335  create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.h
4336  create mode 100644 drivers/net/wireless/ath/ath6kl/common.h
4337  create mode 100644 drivers/net/wireless/ath/ath6kl/core.h
4338  create mode 100644 drivers/net/wireless/ath/ath6kl/debug.c
4339  create mode 100644 drivers/net/wireless/ath/ath6kl/debug.h
4340  create mode 100644 drivers/net/wireless/ath/ath6kl/hif-ops.h
4341  create mode 100644 drivers/net/wireless/ath/ath6kl/hif.h
4342  create mode 100644 drivers/net/wireless/ath/ath6kl/htc.c
4343  create mode 100644 drivers/net/wireless/ath/ath6kl/htc.h
4344  create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.c
4345  create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.h
4346  create mode 100644 drivers/net/wireless/ath/ath6kl/init.c
4347  create mode 100644 drivers/net/wireless/ath/ath6kl/main.c
4348  create mode 100644 drivers/net/wireless/ath/ath6kl/node.c
4349  create mode 100644 drivers/net/wireless/ath/ath6kl/sdio.c
4350  create mode 100644 drivers/net/wireless/ath/ath6kl/target.h
4351  create mode 100644 drivers/net/wireless/ath/ath6kl/txrx.c
4352  create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.c
4353  create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.h
4354  delete mode 100644 drivers/staging/ath6kl/Kconfig
4355  delete mode 100644 drivers/staging/ath6kl/Makefile
4356  delete mode 100644 drivers/staging/ath6kl/TODO
4357  delete mode 100644 drivers/staging/ath6kl/bmi/include/bmi_internal.h
4358  delete mode 100644 drivers/staging/ath6kl/bmi/src/bmi.c
4359  delete mode 100644 drivers/staging/ath6kl/hif/common/hif_sdio_common.h
4360  delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
4361  delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
4362  delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
4363  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.c
4364  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.h
4365  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
4366  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
4367  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
4368  delete mode 100644 drivers/staging/ath6kl/htc2/htc.c
4369  delete mode 100644 drivers/staging/ath6kl/htc2/htc_debug.h
4370  delete mode 100644 drivers/staging/ath6kl/htc2/htc_internal.h
4371  delete mode 100644 drivers/staging/ath6kl/htc2/htc_recv.c
4372  delete mode 100644 drivers/staging/ath6kl/htc2/htc_send.c
4373  delete mode 100644 drivers/staging/ath6kl/htc2/htc_services.c
4374  delete mode 100644 drivers/staging/ath6kl/include/a_config.h
4375  delete mode 100644 drivers/staging/ath6kl/include/a_debug.h
4376  delete mode 100644 drivers/staging/ath6kl/include/a_drv.h
4377  delete mode 100644 drivers/staging/ath6kl/include/a_drv_api.h
4378  delete mode 100644 drivers/staging/ath6kl/include/a_osapi.h
4379  delete mode 100644 drivers/staging/ath6kl/include/aggr_recv_api.h
4380  delete mode 100644 drivers/staging/ath6kl/include/ar3kconfig.h
4381  delete mode 100644 drivers/staging/ath6kl/include/ar6000_api.h
4382  delete mode 100644 drivers/staging/ath6kl/include/ar6000_diag.h
4383  delete mode 100644 drivers/staging/ath6kl/include/ar6kap_common.h
4384  delete mode 100644 drivers/staging/ath6kl/include/athbtfilter.h
4385  delete mode 100644 drivers/staging/ath6kl/include/bmi.h
4386  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
4387  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/addrs.h
4388  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
4389  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
4390  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
4391  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
4392  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
4393  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
4394  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
4395  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
4396  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
4397  delete mode 100644 drivers/staging/ath6kl/include/common/athdefs.h
4398  delete mode 100644 drivers/staging/ath6kl/include/common/bmi_msg.h
4399  delete mode 100644 drivers/staging/ath6kl/include/common/cnxmgmt.h
4400  delete mode 100644 drivers/staging/ath6kl/include/common/dbglog.h
4401  delete mode 100644 drivers/staging/ath6kl/include/common/dbglog_id.h
4402  delete mode 100644 drivers/staging/ath6kl/include/common/discovery.h
4403  delete mode 100644 drivers/staging/ath6kl/include/common/epping_test.h
4404  delete mode 100644 drivers/staging/ath6kl/include/common/gmboxif.h
4405  delete mode 100644 drivers/staging/ath6kl/include/common/gpio_reg.h
4406  delete mode 100644 drivers/staging/ath6kl/include/common/htc.h
4407  delete mode 100644 drivers/staging/ath6kl/include/common/htc_services.h
4408  delete mode 100644 drivers/staging/ath6kl/include/common/pkt_log.h
4409  delete mode 100644 drivers/staging/ath6kl/include/common/roaming.h
4410  delete mode 100644 drivers/staging/ath6kl/include/common/targaddrs.h
4411  delete mode 100644 drivers/staging/ath6kl/include/common/testcmd.h
4412  delete mode 100644 drivers/staging/ath6kl/include/common/tlpm.h
4413  delete mode 100644 drivers/staging/ath6kl/include/common/wlan_defs.h
4414  delete mode 100644 drivers/staging/ath6kl/include/common/wmi.h
4415  delete mode 100644 drivers/staging/ath6kl/include/common/wmix.h
4416  delete mode 100644 drivers/staging/ath6kl/include/common_drv.h
4417  delete mode 100644 drivers/staging/ath6kl/include/dbglog_api.h
4418  delete mode 100644 drivers/staging/ath6kl/include/dl_list.h
4419  delete mode 100644 drivers/staging/ath6kl/include/dset_api.h
4420  delete mode 100644 drivers/staging/ath6kl/include/hci_transport_api.h
4421  delete mode 100644 drivers/staging/ath6kl/include/hif.h
4422  delete mode 100644 drivers/staging/ath6kl/include/host_version.h
4423  delete mode 100644 drivers/staging/ath6kl/include/htc_api.h
4424  delete mode 100644 drivers/staging/ath6kl/include/htc_packet.h
4425  delete mode 100644 drivers/staging/ath6kl/include/wlan_api.h
4426  delete mode 100644 drivers/staging/ath6kl/include/wmi_api.h
4427  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kconfig.c
4428  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
4429  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
4430  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
4431  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
4432  delete mode 100644 drivers/staging/ath6kl/miscdrv/common_drv.c
4433  delete mode 100644 drivers/staging/ath6kl/miscdrv/credit_dist.c
4434  delete mode 100644 drivers/staging/ath6kl/miscdrv/miscdrv.h
4435  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_drv.c
4436  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_pm.c
4437  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
4438  delete mode 100644 drivers/staging/ath6kl/os/linux/cfg80211.c
4439  delete mode 100644 drivers/staging/ath6kl/os/linux/export_hci_transport.c
4440  delete mode 100644 drivers/staging/ath6kl/os/linux/hci_bridge.c
4441  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
4442  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
4443  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
4444  delete mode 100644 drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
4445  delete mode 100644 drivers/staging/ath6kl/os/linux/include/cfg80211.h
4446  delete mode 100644 drivers/staging/ath6kl/os/linux/include/config_linux.h
4447  delete mode 100644 drivers/staging/ath6kl/os/linux/include/debug_linux.h
4448  delete mode 100644 drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
4449  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
4450  delete mode 100644 drivers/staging/ath6kl/os/linux/include/osapi_linux.h
4451  delete mode 100644 drivers/staging/ath6kl/os/linux/include/wlan_config.h
4452  delete mode 100644 drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
4453  delete mode 100644 drivers/staging/ath6kl/os/linux/netbuf.c
4454  delete mode 100644 drivers/staging/ath6kl/reorder/aggr_rx_internal.h
4455  delete mode 100644 drivers/staging/ath6kl/reorder/rcv_aggr.c
4456  delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211.h
4457  delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211_node.h
4458  delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_node.c
4459  delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
4460  delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_utils.c
4461  delete mode 100644 drivers/staging/ath6kl/wmi/wmi.c
4462  delete mode 100644 drivers/staging/ath6kl/wmi/wmi_host.h
4463  create mode 100644 include/linux/bcma/bcma_driver_mips.h
4464  create mode 100644 include/linux/bcma/bcma_soc.h
4465  rename {drivers/net => include/linux}/sungem_phy.h (98%)
4466  create mode 100644 include/net/cfg80211-wext.h
4467 $ git am -3 ../patches/0001-powerpc-update-ppc64_defconfig-for-net-device-moveme.patch
4468 Applying: powerpc: update ppc64_defconfig for net device movement
4469 $ git reset HEAD^
4470 Unstaged changes after reset:
4471 M       arch/powerpc/configs/ppc64_defconfig
4472 $ git add .
4473 $ git commit -v -a --amend
4474 [master e89b043] Merge remote-tracking branch 'net/master'
4475 $ git am -3 ../patches/0001-sparc-update-sparc32_defconfig-for-net-device-moveme.patch
4476 Applying: sparc: update sparc32_defconfig for net device movement
4477 $ git reset HEAD^
4478 Unstaged changes after reset:
4479 M       arch/sparc/configs/sparc32_defconfig
4480 $ git add .
4481 $ git commit -v -a --amend
4482 [master 4ce2819] Merge remote-tracking branch 'net/master'
4483 $ git am -3 ../patches/0001-sparc-update-sparc64_defconfig-for-net-device-moveme.patch
4484 Applying: sparc: update sparc64_defconfig for net device movement
4485 $ git reset HEAD^
4486 Unstaged changes after reset:
4487 M       arch/sparc/configs/sparc64_defconfig
4488 $ git add .
4489 $ git commit -v -a --amend
4490 [master de2d505] Merge remote-tracking branch 'net/master'
4491 Merging wireless/master
4492 $ git merge wireless/master
4493 Auto-merging drivers/net/wireless/b43/dma.c
4494 Auto-merging include/net/cfg80211.h
4495 Auto-merging net/mac80211/mesh_pathtbl.c
4496 Merge made by recursive.
4497  drivers/bcma/driver_chipcommon_pmu.c        |   20 ++-
4498  drivers/bcma/sprom.c                        |    6 +
4499  drivers/net/wireless/ath/ath9k/ar9002_hw.c  |    8 +-
4500  drivers/net/wireless/ath/ath9k/ar9003_hw.c  |    8 +-
4501  drivers/net/wireless/ath/ath9k/hw-ops.h     |    8 +-
4502  drivers/net/wireless/ath/ath9k/hw.c         |    8 +-
4503  drivers/net/wireless/ath/ath9k/hw.h         |    7 +-
4504  drivers/net/wireless/ath/ath9k/main.c       |    8 +-
4505  drivers/net/wireless/ath/ath9k/pci.c        |   47 +++--
4506  drivers/net/wireless/b43/b43.h              |   11 +-
4507  drivers/net/wireless/b43/dma.c              |   13 ++-
4508  drivers/net/wireless/b43/dma.h              |    7 +-
4509  drivers/net/wireless/b43/main.c             |   51 +++++-
4510  drivers/net/wireless/b43/phy_common.c       |   32 ++++
4511  drivers/net/wireless/b43/phy_common.h       |    2 +
4512  drivers/net/wireless/b43/phy_ht.c           |  180 +++++++++++++++++++
4513  drivers/net/wireless/b43/phy_ht.h           |    4 +
4514  drivers/net/wireless/b43/phy_n.c            |   40 +----
4515  drivers/net/wireless/b43/pio.c              |   10 +-
4516  drivers/net/wireless/b43/tables_phy_ht.c    |   39 ++++
4517  drivers/net/wireless/b43/tables_phy_ht.h    |    3 +
4518  drivers/net/wireless/b43/xmit.c             |  120 +++++++++----
4519  drivers/net/wireless/b43/xmit.h             |   62 +++++--
4520  drivers/net/wireless/mwl8k.c                |    3 -
4521  drivers/net/wireless/rtlwifi/debug.c        |    6 +-
4522  include/linux/bcma/bcma_driver_chipcommon.h |   18 ++
4523  include/linux/ieee80211.h                   |   55 ++++---
4524  include/net/cfg80211.h                      |    4 +-
4525  net/mac80211/agg-tx.c                       |    2 +-
4526  net/mac80211/mesh.c                         |  253 ++++++++++++++++++++-------
4527  net/mac80211/mesh.h                         |   26 ++-
4528  net/mac80211/mesh_hwmp.c                    |   61 ++++---
4529  net/mac80211/mesh_pathtbl.c                 |    8 +-
4530  net/mac80211/mesh_plink.c                   |  241 +++++++++++++------------
4531  net/mac80211/rx.c                           |   23 ++-
4532  net/mac80211/status.c                       |   18 ++
4533  net/mac80211/tx.c                           |   14 ++-
4534  net/wireless/util.c                         |    6 +-
4535  38 files changed, 1027 insertions(+), 405 deletions(-)
4536 Merging bluetooth/master
4537 $ git merge bluetooth/master
4538 Merge made by recursive.
4539  drivers/bluetooth/btusb.c     |    3 +-
4540  include/net/bluetooth/l2cap.h |    3 +-
4541  net/bluetooth/af_bluetooth.c  |   30 +++++-
4542  net/bluetooth/bnep/core.c     |    5 +-
4543  net/bluetooth/cmtp/core.c     |    5 +-
4544  net/bluetooth/hci_conn.c      |   14 +-
4545  net/bluetooth/hidp/core.c     |   10 ++-
4546  net/bluetooth/l2cap_core.c    |  257 ++++++++++++++---------------------------
4547  net/bluetooth/rfcomm/core.c   |    5 +-
4548  9 files changed, 144 insertions(+), 188 deletions(-)
4549 Merging mtd/master
4550 $ git merge mtd/master
4551 Already up-to-date.
4552 Merging l2-mtd/master
4553 $ git merge l2-mtd/master
4554 Resolved 'drivers/mtd/maps/lantiq-flash.c' using previous resolution.
4555 Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
4556 Auto-merging arch/arm/mach-at91/board-cam60.c
4557 Auto-merging arch/arm/mach-at91/board-cap9adk.c
4558 Auto-merging arch/arm/mach-at91/board-kb9202.c
4559 Auto-merging arch/arm/mach-at91/board-neocore926.c
4560 Auto-merging arch/arm/mach-at91/board-qil-a9260.c
4561 Auto-merging arch/arm/mach-at91/board-rm9200dk.c
4562 Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
4563 Auto-merging arch/arm/mach-at91/board-sam9260ek.c
4564 Auto-merging arch/arm/mach-at91/board-sam9261ek.c
4565 Auto-merging arch/arm/mach-at91/board-sam9263ek.c
4566 Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
4567 Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
4568 Auto-merging arch/arm/mach-at91/board-sam9rlek.c
4569 Auto-merging arch/arm/mach-at91/board-usb-a9260.c
4570 Auto-merging arch/arm/mach-at91/board-usb-a9263.c
4571 Auto-merging arch/arm/mach-at91/board-yl-9200.c
4572 Auto-merging arch/arm/mach-mmp/aspenite.c
4573 Removing drivers/mtd/maps/ceiva.c
4574 Removing drivers/mtd/maps/edb7312.c
4575 Auto-merging drivers/mtd/maps/lantiq-flash.c
4576 CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
4577 Removing drivers/mtd/nand/edb7312.c
4578 Auto-merging drivers/mtd/onenand/omap2.c
4579 Automatic merge failed; fix conflicts and then commit the result.
4580 $ git commit -v -a
4581 [master 20114c7] Merge remote-tracking branch 'l2-mtd/master'
4582 $ git diff -M --stat --summary HEAD^..
4583  Documentation/DocBook/mtdnand.tmpl                 |    5 +-
4584  .../devicetree/bindings/mtd/atmel-dataflash.txt    |   14 +
4585  arch/arm/mach-at91/board-afeb-9260v1.c             |    9 +-
4586  arch/arm/mach-at91/board-cam60.c                   |    9 +-
4587  arch/arm/mach-at91/board-cap9adk.c                 |    9 +-
4588  arch/arm/mach-at91/board-kb9202.c                  |    9 +-
4589  arch/arm/mach-at91/board-neocore926.c              |    9 +-
4590  arch/arm/mach-at91/board-qil-a9260.c               |    9 +-
4591  arch/arm/mach-at91/board-rm9200dk.c                |    9 +-
4592  arch/arm/mach-at91/board-sam9-l9260.c              |    9 +-
4593  arch/arm/mach-at91/board-sam9260ek.c               |    9 +-
4594  arch/arm/mach-at91/board-sam9261ek.c               |    9 +-
4595  arch/arm/mach-at91/board-sam9263ek.c               |    9 +-
4596  arch/arm/mach-at91/board-sam9g20ek.c               |    9 +-
4597  arch/arm/mach-at91/board-sam9m10g45ek.c            |    9 +-
4598  arch/arm/mach-at91/board-sam9rlek.c                |    9 +-
4599  arch/arm/mach-at91/board-snapper9260.c             |   10 +-
4600  arch/arm/mach-at91/board-usb-a9260.c               |    9 +-
4601  arch/arm/mach-at91/board-usb-a9263.c               |    9 +-
4602  arch/arm/mach-at91/board-yl-9200.c                 |    9 +-
4603  arch/arm/mach-at91/include/mach/board.h            |    3 +-
4604  arch/arm/mach-davinci/board-da830-evm.c            |    2 +-
4605  arch/arm/mach-davinci/board-da850-evm.c            |    2 +-
4606  arch/arm/mach-davinci/board-dm355-evm.c            |    2 +-
4607  arch/arm/mach-davinci/board-dm355-leopard.c        |    2 +-
4608  arch/arm/mach-davinci/board-dm365-evm.c            |    2 +-
4609  arch/arm/mach-davinci/board-dm644x-evm.c           |    2 +-
4610  arch/arm/mach-davinci/board-mityomapl138.c         |    3 +-
4611  arch/arm/mach-davinci/board-neuros-osd2.c          |    2 +-
4612  arch/arm/mach-davinci/board-tnetv107x-evm.c        |    2 +-
4613  arch/arm/mach-davinci/include/mach/nand.h          |    4 +-
4614  arch/arm/mach-ep93xx/ts72xx.c                      |   23 +-
4615  arch/arm/mach-mmp/aspenite.c                       |    5 +-
4616  arch/arm/mach-orion5x/ts78xx-setup.c               |    2 +-
4617  arch/arm/mach-pxa/cm-x300.c                        |    5 +-
4618  arch/arm/mach-pxa/colibri-pxa3xx.c                 |    5 +-
4619  arch/arm/mach-pxa/littleton.c                      |    5 +-
4620  arch/arm/mach-pxa/mxm8x10.c                        |    9 +-
4621  arch/arm/mach-pxa/raumfeld.c                       |    5 +-
4622  arch/arm/mach-pxa/zylonite.c                       |    5 +-
4623  arch/arm/plat-pxa/include/plat/pxa3xx_nand.h       |   20 +-
4624  arch/avr32/boards/atngw100/setup.c                 |    8 +-
4625  arch/avr32/boards/atstk1000/atstk1002.c            |    9 +-
4626  arch/avr32/mach-at32ap/include/mach/board.h        |    3 +-
4627  arch/cris/arch-v32/drivers/mach-a3/nandflash.c     |    2 +-
4628  arch/cris/arch-v32/drivers/mach-fs/nandflash.c     |    2 +-
4629  drivers/mtd/Kconfig                                |   16 +-
4630  drivers/mtd/Makefile                               |    2 +-
4631  drivers/mtd/afs.c                                  |    4 +-
4632  drivers/mtd/ar7part.c                              |    2 +-
4633  drivers/mtd/chips/cfi_cmdset_0002.c                |   31 +-
4634  drivers/mtd/chips/fwh_lock.h                       |    3 +-
4635  drivers/mtd/chips/jedec_probe.c                    |   34 +-
4636  drivers/mtd/cmdlinepart.c                          |    7 +-
4637  drivers/mtd/devices/doc2000.c                      |   13 +-
4638  drivers/mtd/devices/doc2001.c                      |    7 +-
4639  drivers/mtd/devices/doc2001plus.c                  |    7 +-
4640  drivers/mtd/devices/docecc.c                       |    2 +-
4641  drivers/mtd/devices/lart.c                         |   18 +-
4642  drivers/mtd/devices/m25p80.c                       |   84 +--
4643  drivers/mtd/devices/mtd_dataflash.c                |   91 +-
4644  drivers/mtd/devices/sst25l.c                       |   42 +-
4645  drivers/mtd/ftl.c                                  |   40 +-
4646  drivers/mtd/inftlcore.c                            |   59 +-
4647  drivers/mtd/inftlmount.c                           |  116 +--
4648  drivers/mtd/maps/Kconfig                           |   22 -
4649  drivers/mtd/maps/Makefile                          |    2 -
4650  drivers/mtd/maps/bfin-async-flash.c                |   16 +-
4651  drivers/mtd/maps/ceiva.c                           |  341 -------
4652  drivers/mtd/maps/dc21285.c                         |    9 +-
4653  drivers/mtd/maps/edb7312.c                         |  134 ---
4654  drivers/mtd/maps/gpio-addr-flash.c                 |   16 +-
4655  drivers/mtd/maps/h720x-flash.c                     |   23 +-
4656  drivers/mtd/maps/impa7.c                           |   28 +-
4657  drivers/mtd/maps/intel_vr_nor.c                    |    7 +-
4658  drivers/mtd/maps/ixp2000.c                         |   11 +-
4659  drivers/mtd/maps/ixp4xx.c                          |   29 +-
4660  drivers/mtd/maps/lantiq-flash.c                    |   17 +-
4661  drivers/mtd/maps/latch-addr-flash.c                |   24 +-
4662  drivers/mtd/maps/pcmciamtd.c                       |  124 +--
4663  drivers/mtd/maps/physmap.c                         |   38 +-
4664  drivers/mtd/maps/physmap_of.c                      |   80 +--
4665  drivers/mtd/maps/plat-ram.c                        |   23 +-
4666  drivers/mtd/maps/pxa2xx-flash.c                    |   20 +-
4667  drivers/mtd/maps/rbtx4939-flash.c                  |   24 +-
4668  drivers/mtd/maps/sa1100-flash.c                    |   30 +-
4669  drivers/mtd/maps/solutionengine.c                  |   30 +-
4670  drivers/mtd/maps/wr_sbc82xx_flash.c                |   33 +-
4671  drivers/mtd/mtdblock.c                             |   18 +-
4672  drivers/mtd/mtdchar.c                              |   37 +-
4673  drivers/mtd/mtdconcat.c                            |    2 +-
4674  drivers/mtd/mtdcore.c                              |   69 +-
4675  drivers/mtd/mtdcore.h                              |    3 +
4676  drivers/mtd/mtdpart.c                              |   52 +-
4677  drivers/mtd/mtdsuper.c                             |   20 +-
4678  drivers/mtd/mtdswap.c                              |    5 +-
4679  drivers/mtd/nand/Kconfig                           |   14 +-
4680  drivers/mtd/nand/Makefile                          |    1 -
4681  drivers/mtd/nand/atmel_nand.c                      |   74 +--
4682  drivers/mtd/nand/au1550nd.c                        |   29 +-
4683  drivers/mtd/nand/autcpu12.c                        |    4 +-
4684  drivers/mtd/nand/bcm_umi_nand.c                    |   57 +-
4685  drivers/mtd/nand/cafe_nand.c                       |   21 +-
4686  drivers/mtd/nand/cmx270_nand.c                     |   23 +-
4687  drivers/mtd/nand/cs553x_nand.c                     |   15 +-
4688  drivers/mtd/nand/davinci_nand.c                    |   39 +-
4689  drivers/mtd/nand/denali.c                          |    6 +-
4690  drivers/mtd/nand/diskonchip.c                      |    6 +-
4691  drivers/mtd/nand/edb7312.c                         |  203 ----
4692  drivers/mtd/nand/fsl_elbc_nand.c                   |   75 +-
4693  drivers/mtd/nand/fsl_upm.c                         |   16 +-
4694  drivers/mtd/nand/fsmc_nand.c                       |   77 +--
4695  drivers/mtd/nand/h1910.c                           |   19 +-
4696  drivers/mtd/nand/jz4740_nand.c                     |   18 +-
4697  drivers/mtd/nand/mpc5121_nfc.c                     |   22 +-
4698  drivers/mtd/nand/mxc_nand.c                        |   35 +-
4699  drivers/mtd/nand/nand_base.c                       |  996 ++++++++++----------
4700  drivers/mtd/nand/nand_bbt.c                        |  516 +++++------
4701  drivers/mtd/nand/nand_bch.c                        |    4 +-
4702  drivers/mtd/nand/nand_ecc.c                        |   10 +-
4703  drivers/mtd/nand/nandsim.c                         |    4 +-
4704  drivers/mtd/nand/ndfc.c                            |   22 +-
4705  drivers/mtd/nand/nomadik_nand.c                    |    1 +
4706  drivers/mtd/nand/nuc900_nand.c                     |    1 +
4707  drivers/mtd/nand/omap2.c                           |   22 +-
4708  drivers/mtd/nand/orion_nand.c                      |   16 +-
4709  drivers/mtd/nand/pasemi_nand.c                     |    3 +-
4710  drivers/mtd/nand/plat_nand.c                       |   25 +-
4711  drivers/mtd/nand/ppchameleonevb.c                  |   47 +-
4712  drivers/mtd/nand/pxa3xx_nand.c                     |  471 ++++++----
4713  drivers/mtd/nand/rtc_from4.c                       |    5 +-
4714  drivers/mtd/nand/s3c2410.c                         |   27 +-
4715  drivers/mtd/nand/sharpsl.c                         |   13 +-
4716  drivers/mtd/nand/socrates_nand.c                   |   28 +-
4717  drivers/mtd/nand/tmio_nand.c                       |   17 +-
4718  drivers/mtd/nand/txx9ndfmc.c                       |    8 +-
4719  drivers/mtd/nftlcore.c                             |   27 +-
4720  drivers/mtd/nftlmount.c                            |   26 +-
4721  drivers/mtd/ofpart.c                               |  112 +++-
4722  drivers/mtd/onenand/generic.c                      |   14 +-
4723  drivers/mtd/onenand/omap2.c                        |   16 +-
4724  drivers/mtd/onenand/onenand_base.c                 |   62 +-
4725  drivers/mtd/onenand/onenand_bbt.c                  |    6 +-
4726  drivers/mtd/onenand/samsung.c                      |   13 +-
4727  drivers/mtd/redboot.c                              |   13 +-
4728  drivers/mtd/sm_ftl.c                               |   18 +-
4729  drivers/mtd/ssfdc.c                                |   44 +-
4730  drivers/mtd/tests/mtd_readtest.c                   |    3 +-
4731  fs/jffs2/scan.c                                    |    4 +-
4732  fs/jffs2/wbuf.c                                    |    3 +-
4733  include/linux/mtd/bbm.h                            |   39 +-
4734  include/linux/mtd/mtd.h                            |   38 +-
4735  include/linux/mtd/nand.h                           |   78 +-
4736  include/linux/mtd/onenand.h                        |    4 +
4737  include/linux/mtd/partitions.h                     |   46 +-
4738  include/linux/mtd/physmap.h                        |   17 -
4739  156 files changed, 2112 insertions(+), 3642 deletions(-)
4740  create mode 100644 Documentation/devicetree/bindings/mtd/atmel-dataflash.txt
4741  delete mode 100644 drivers/mtd/maps/ceiva.c
4742  delete mode 100644 drivers/mtd/maps/edb7312.c
4743  delete mode 100644 drivers/mtd/nand/edb7312.c
4744 Merging crypto/master
4745 $ git merge crypto/master
4746 Merge made by recursive.
4747  .../devicetree/bindings/crypto/picochip-spacc.txt  |   23 +
4748  arch/x86/crypto/Makefile                           |    8 +
4749  arch/x86/crypto/sha1_ssse3_asm.S                   |  558 ++++++++++++++++++++
4750  arch/x86/crypto/sha1_ssse3_glue.c                  |  240 +++++++++
4751  arch/x86/include/asm/cpufeature.h                  |    3 +
4752  crypto/Kconfig                                     |   10 +
4753  crypto/cryptd.c                                    |    2 +-
4754  crypto/sha1_generic.c                              |    9 +-
4755  drivers/crypto/n2_core.c                           |    4 +-
4756  drivers/crypto/padlock-aes.c                       |    4 +-
4757  drivers/crypto/picoxcell_crypto.c                  |  121 ++---
4758  include/crypto/sha.h                               |    5 +
4759  12 files changed, 915 insertions(+), 72 deletions(-)
4760  create mode 100644 Documentation/devicetree/bindings/crypto/picochip-spacc.txt
4761  create mode 100644 arch/x86/crypto/sha1_ssse3_asm.S
4762  create mode 100644 arch/x86/crypto/sha1_ssse3_glue.c
4763 Merging sound/for-next
4764 $ git merge sound/for-next
4765 Removing sound/pci/hda/alc268_quirks.c
4766 Removing sound/pci/hda/alc269_quirks.c
4767 Removing sound/pci/hda/alc680_quirks.c
4768 Removing sound/pci/hda/alc861_quirks.c
4769 Removing sound/pci/hda/alc861vd_quirks.c
4770 Merge made by recursive.
4771  .../bindings/sound/soc/codecs/fsl-sgtl5000.txt     |   11 +
4772  Documentation/devicetree/bindings/sound/wm8510.txt |   18 +
4773  Documentation/devicetree/bindings/sound/wm8523.txt |   16 +
4774  Documentation/devicetree/bindings/sound/wm8580.txt |   16 +
4775  Documentation/devicetree/bindings/sound/wm8711.txt |   18 +
4776  Documentation/devicetree/bindings/sound/wm8728.txt |   18 +
4777  Documentation/devicetree/bindings/sound/wm8731.txt |   18 +
4778  Documentation/devicetree/bindings/sound/wm8737.txt |   18 +
4779  Documentation/devicetree/bindings/sound/wm8741.txt |   18 +
4780  Documentation/devicetree/bindings/sound/wm8750.txt |   18 +
4781  Documentation/devicetree/bindings/sound/wm8753.txt |   18 +
4782  Documentation/sound/alsa/ALSA-Configuration.txt    |    5 +
4783  Documentation/sound/alsa/HD-Audio-Models.txt       |   56 +-
4784  Documentation/sound/alsa/HD-Audio.txt              |   48 +
4785  arch/mips/alchemy/devboards/db1200/platform.c      |   16 +
4786  arch/mips/alchemy/devboards/db1x00/platform.c      |   48 +
4787  include/linux/mfd/wm8994/registers.h               |   84 ++
4788  include/sound/adau1373.h                           |   34 +
4789  include/sound/soc-dapm.h                           |    2 +
4790  include/sound/soc.h                                |    9 +
4791  sound/firewire/isight.c                            |    1 -
4792  sound/mips/Kconfig                                 |    5 +-
4793  sound/pci/hda/Makefile                             |    3 +
4794  sound/pci/hda/alc260_quirks.c                      |  304 -----
4795  sound/pci/hda/alc262_quirks.c                      |  508 +-------
4796  sound/pci/hda/alc268_quirks.c                      |  636 ---------
4797  sound/pci/hda/alc269_quirks.c                      |  674 ----------
4798  sound/pci/hda/alc662_quirks.c                      |  833 ------------
4799  sound/pci/hda/alc680_quirks.c                      |  222 ---
4800  sound/pci/hda/alc861_quirks.c                      |  725 ----------
4801  sound/pci/hda/alc861vd_quirks.c                    |  605 ---------
4802  sound/pci/hda/hda_codec.c                          |   71 +-
4803  sound/pci/hda/hda_intel.c                          |   68 +-
4804  sound/pci/hda/hda_local.h                          |   24 +-
4805  sound/pci/hda/hda_trace.h                          |  117 ++
4806  sound/pci/hda/patch_conexant.c                     |   13 +-
4807  sound/pci/hda/patch_realtek.c                      |  862 +++++++++----
4808  sound/pci/oxygen/xonar_pcm179x.c                   |    1 +
4809  sound/pci/rme9652/hdspm.c                          |  139 +-
4810  sound/soc/Kconfig                                  |    3 +
4811  sound/soc/Makefile                                 |    1 +
4812  sound/soc/au1x/Kconfig                             |   28 +
4813  sound/soc/au1x/Makefile                            |   10 +
4814  sound/soc/au1x/ac97c.c                             |  363 +++++
4815  sound/soc/au1x/db1000.c                            |   75 +
4816  sound/soc/au1x/db1200.c                            |   64 +-
4817  sound/soc/au1x/dbdma2.c                            |   91 +-
4818  sound/soc/au1x/dma.c                               |  377 ++++++
4819  sound/soc/au1x/i2sc.c                              |  346 +++++
4820  sound/soc/au1x/psc-ac97.c                          |   48 +-
4821  sound/soc/au1x/psc-i2s.c                           |   42 +-
4822  sound/soc/au1x/psc.h                               |   16 +-
4823  sound/soc/blackfin/Kconfig                         |   13 +
4824  sound/soc/blackfin/Makefile                        |    2 +
4825  sound/soc/blackfin/bf5xx-ad193x.c                  |    2 +-
4826  sound/soc/blackfin/bfin-eval-adau1373.c            |  202 +++
4827  sound/soc/codecs/Kconfig                           |    4 +
4828  sound/soc/codecs/Makefile                          |    2 +
4829  sound/soc/codecs/ad193x.c                          |   11 +-
4830  sound/soc/codecs/ad193x.h                          |    5 +-
4831  sound/soc/codecs/adau1373.c                        | 1414 ++++++++++++++++++++
4832  sound/soc/codecs/adau1373.h                        |   29 +
4833  sound/soc/codecs/sgtl5000.c                        |    8 +
4834  sound/soc/codecs/sta32x.c                          |   22 +-
4835  sound/soc/codecs/wm1250-ev1.c                      |   20 +-
4836  sound/soc/codecs/wm8510.c                          |    8 +
4837  sound/soc/codecs/wm8523.c                          |    9 +-
4838  sound/soc/codecs/wm8580.c                          |    9 +-
4839  sound/soc/codecs/wm8711.c                          |   13 +-
4840  sound/soc/codecs/wm8728.c                          |   13 +-
4841  sound/soc/codecs/wm8731.c                          |   10 +
4842  sound/soc/codecs/wm8737.c                          |   10 +
4843  sound/soc/codecs/wm8741.c                          |  135 ++-
4844  sound/soc/codecs/wm8750.c                          |   14 +-
4845  sound/soc/codecs/wm8753.c                          |   13 +-
4846  sound/soc/codecs/wm8962.c                          |    8 +-
4847  sound/soc/codecs/wm8993.c                          |    7 +-
4848  sound/soc/codecs/wm8994-tables.c                   |   16 +-
4849  sound/soc/codecs/wm8994.c                          |  270 +++-
4850  sound/soc/codecs/wm8994.h                          |    2 +
4851  sound/soc/codecs/wm_hubs.c                         |   48 +-
4852  sound/soc/codecs/wm_hubs.h                         |    3 +-
4853  sound/soc/fsl/fsl_dma.c                            |    1 -
4854  sound/soc/fsl/fsl_ssi.c                            |   61 +-
4855  sound/soc/mxs/Kconfig                              |   20 +
4856  sound/soc/mxs/Makefile                             |   10 +
4857  sound/soc/mxs/mxs-pcm.c                            |  359 +++++
4858  sound/soc/mxs/mxs-pcm.h                            |   43 +
4859  sound/soc/mxs/mxs-saif.c                           |  677 ++++++++++
4860  sound/soc/mxs/mxs-saif.h                           |  130 ++
4861  sound/soc/mxs/mxs-sgtl5000.c                       |  165 +++
4862  sound/soc/nuc900/nuc900-pcm.c                      |    1 -
4863  sound/soc/omap/ams-delta.c                         |    6 +-
4864  sound/soc/pxa/spitz.c                              |    2 +-
4865  sound/soc/pxa/z2.c                                 |    2 +-
4866  sound/soc/s6000/s6000-pcm.c                        |    1 -
4867  sound/soc/samsung/h1940_uda1380.c                  |    1 +
4868  sound/soc/samsung/jive_wm8750.c                    |    2 +-
4869  sound/soc/samsung/rx1950_uda1380.c                 |    1 +
4870  sound/soc/samsung/smartq_wm8987.c                  |    2 +-
4871  sound/soc/samsung/smdk_wm8580.c                    |    6 +-
4872  sound/soc/samsung/smdk_wm8580pcm.c                 |    4 +-
4873  sound/soc/samsung/speyside.c                       |    5 +-
4874  sound/soc/samsung/speyside_wm8962.c                |    4 +-
4875  sound/soc/soc-cache.c                              |    7 -
4876  sound/soc/soc-core.c                               |    4 +-
4877  sound/soc/soc-dapm.c                               |   12 +-
4878  sound/soc/soc-io.c                                 |  334 +----
4879  sound/soc/soc-jack.c                               |    2 +-
4880  sound/soc/soc-pcm.c                                |    5 +-
4881  sound/usb/mixer.c                                  |   13 +-
4882  111 files changed, 6429 insertions(+), 5537 deletions(-)
4883  create mode 100644 Documentation/devicetree/bindings/sound/soc/codecs/fsl-sgtl5000.txt
4884  create mode 100644 Documentation/devicetree/bindings/sound/wm8510.txt
4885  create mode 100644 Documentation/devicetree/bindings/sound/wm8523.txt
4886  create mode 100644 Documentation/devicetree/bindings/sound/wm8580.txt
4887  create mode 100644 Documentation/devicetree/bindings/sound/wm8711.txt
4888  create mode 100644 Documentation/devicetree/bindings/sound/wm8728.txt
4889  create mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt
4890  create mode 100644 Documentation/devicetree/bindings/sound/wm8737.txt
4891  create mode 100644 Documentation/devicetree/bindings/sound/wm8741.txt
4892  create mode 100644 Documentation/devicetree/bindings/sound/wm8750.txt
4893  create mode 100644 Documentation/devicetree/bindings/sound/wm8753.txt
4894  create mode 100644 include/sound/adau1373.h
4895  delete mode 100644 sound/pci/hda/alc268_quirks.c
4896  delete mode 100644 sound/pci/hda/alc269_quirks.c
4897  delete mode 100644 sound/pci/hda/alc680_quirks.c
4898  delete mode 100644 sound/pci/hda/alc861_quirks.c
4899  delete mode 100644 sound/pci/hda/alc861vd_quirks.c
4900  create mode 100644 sound/pci/hda/hda_trace.h
4901  create mode 100644 sound/soc/au1x/ac97c.c
4902  create mode 100644 sound/soc/au1x/db1000.c
4903  create mode 100644 sound/soc/au1x/dma.c
4904  create mode 100644 sound/soc/au1x/i2sc.c
4905  create mode 100644 sound/soc/blackfin/bfin-eval-adau1373.c
4906  create mode 100644 sound/soc/codecs/adau1373.c
4907  create mode 100644 sound/soc/codecs/adau1373.h
4908  create mode 100644 sound/soc/mxs/Kconfig
4909  create mode 100644 sound/soc/mxs/Makefile
4910  create mode 100644 sound/soc/mxs/mxs-pcm.c
4911  create mode 100644 sound/soc/mxs/mxs-pcm.h
4912  create mode 100644 sound/soc/mxs/mxs-saif.c
4913  create mode 100644 sound/soc/mxs/mxs-saif.h
4914  create mode 100644 sound/soc/mxs/mxs-sgtl5000.c
4915 Merging sound-asoc/for-next
4916 $ git merge sound-asoc/for-next
4917 Merge made by recursive.
4918  include/sound/soc.h                 |    1 +
4919  sound/soc/codecs/wm8523.c           |   26 ++---
4920  sound/soc/codecs/wm8962.c           |  191 ++++++++++++++++++++++++++++++++++-
4921  sound/soc/codecs/wm8996.c           |   38 +++++---
4922  sound/soc/ep93xx/ep93xx-i2s.c       |    5 +-
4923  sound/soc/fsl/fsl_dma.c             |    2 +
4924  sound/soc/fsl/mpc8610_hpcd.c        |   18 ++--
4925  sound/soc/fsl/p1022_ds.c            |    4 +-
4926  sound/soc/kirkwood/kirkwood-i2s.c   |    2 +-
4927  sound/soc/mxs/mxs-saif.c            |   27 +++--
4928  sound/soc/mxs/mxs-sgtl5000.c        |   10 ++-
4929  sound/soc/samsung/speyside_wm8962.c |    6 +
4930  sound/soc/soc-core.c                |    4 +-
4931  13 files changed, 274 insertions(+), 60 deletions(-)
4932 Merging cpufreq/next
4933 $ git merge cpufreq/next
4934 Merge made by recursive.
4935  Documentation/cpu-freq/governors.txt |    2 +-
4936  drivers/cpufreq/cpufreq_ondemand.c   |    2 +-
4937  drivers/cpufreq/e_powersaver.c       |  135 +++++++++++++++++++++++++++++++---
4938  drivers/cpufreq/exynos4210-cpufreq.c |   23 ++++++-
4939  4 files changed, 148 insertions(+), 14 deletions(-)
4940 Merging quilt/rr
4941 $ git merge quilt/rr
4942 Auto-merging drivers/net/virtio_net.c
4943 Merge made by recursive.
4944  arch/x86/lguest/boot.c        |   10 ++++++++++
4945  drivers/char/virtio_console.c |   10 ++++------
4946  drivers/lguest/core.c         |    2 +-
4947  drivers/net/virtio_net.c      |   14 +++++---------
4948  include/linux/virtio_config.h |    3 +++
4949  5 files changed, 23 insertions(+), 16 deletions(-)
4950 Merging input/next
4951 $ git merge input/next
4952 Auto-merging drivers/input/misc/Kconfig
4953 Auto-merging drivers/input/misc/Makefile
4954 Merge made by recursive.
4955  drivers/input/input-polldev.c        |    6 +-
4956  drivers/input/misc/Kconfig           |   45 ++-
4957  drivers/input/misc/Makefile          |    4 +-
4958  drivers/input/misc/bma150.c          |  691 ++++++++++++++++++++++++++++++++++
4959  drivers/input/misc/pm8xxx-vibrator.c |  296 +++++++++++++++
4960  include/linux/bma150.h               |   46 +++
4961  6 files changed, 1074 insertions(+), 14 deletions(-)
4962  create mode 100644 drivers/input/misc/bma150.c
4963  create mode 100644 drivers/input/misc/pm8xxx-vibrator.c
4964  create mode 100644 include/linux/bma150.h
4965 Merging input-mt/next
4966 $ git merge input-mt/next
4967 Already up-to-date.
4968 Merging lsm/for-next
4969 $ git merge lsm/for-next
4970 Already up-to-date.
4971 Merging block/for-next
4972 $ git merge block/for-next
4973 Already up-to-date.
4974 Merging quilt/device-mapper
4975 $ git merge quilt/device-mapper
4976 Merge made by recursive.
4977  Documentation/device-mapper/persistent-data.txt    |   84 +
4978  Documentation/device-mapper/thin-provisioning.txt  |  275 +++
4979  drivers/md/Kconfig                                 |    9 +
4980  drivers/md/Makefile                                |    3 +
4981  drivers/md/dm-crypt.c                              |    1 +
4982  drivers/md/dm-flakey.c                             |    4 +-
4983  drivers/md/dm-kcopyd.c                             |   31 +-
4984  drivers/md/dm-raid.c                               |    2 +-
4985  drivers/md/dm-table.c                              |   84 +-
4986  drivers/md/dm-thin-metadata.c                      | 1406 ++++++++++++
4987  drivers/md/dm-thin-metadata.h                      |  168 ++
4988  drivers/md/dm-thin.c                               | 2280 ++++++++++++++++++++
4989  drivers/md/dm.c                                    |   12 +-
4990  drivers/md/persistent-data/Kconfig                 |    7 +
4991  drivers/md/persistent-data/Makefile                |    9 +
4992  drivers/md/persistent-data/dm-block-manager.c      |  998 +++++++++
4993  drivers/md/persistent-data/dm-block-manager.h      |  134 ++
4994  drivers/md/persistent-data/dm-btree-internal.h     |  133 ++
4995  drivers/md/persistent-data/dm-btree-remove.c       |  571 +++++
4996  drivers/md/persistent-data/dm-btree-spine.c        |  222 ++
4997  drivers/md/persistent-data/dm-btree.c              |  861 ++++++++
4998  drivers/md/persistent-data/dm-btree.h              |  158 ++
4999  .../persistent-data/dm-persistent-data-internal.h  |   20 +
5000  drivers/md/persistent-data/dm-space-map-common.h   |   94 +
5001  drivers/md/persistent-data/dm-space-map-disk.c     |  663 ++++++
5002  drivers/md/persistent-data/dm-space-map-disk.h     |   25 +
5003  drivers/md/persistent-data/dm-space-map-metadata.c |  956 ++++++++
5004  drivers/md/persistent-data/dm-space-map-metadata.h |   33 +
5005  drivers/md/persistent-data/dm-space-map.h          |  118 +
5006  .../md/persistent-data/dm-transaction-manager.c    |  414 ++++
5007  .../md/persistent-data/dm-transaction-manager.h    |  130 ++
5008  include/linux/device-mapper.h                      |   40 +-
5009  include/linux/dm-kcopyd.h                          |    4 +
5010  33 files changed, 9927 insertions(+), 22 deletions(-)
5011  create mode 100644 Documentation/device-mapper/persistent-data.txt
5012  create mode 100644 Documentation/device-mapper/thin-provisioning.txt
5013  create mode 100644 drivers/md/dm-thin-metadata.c
5014  create mode 100644 drivers/md/dm-thin-metadata.h
5015  create mode 100644 drivers/md/dm-thin.c
5016  create mode 100644 drivers/md/persistent-data/Kconfig
5017  create mode 100644 drivers/md/persistent-data/Makefile
5018  create mode 100644 drivers/md/persistent-data/dm-block-manager.c
5019  create mode 100644 drivers/md/persistent-data/dm-block-manager.h
5020  create mode 100644 drivers/md/persistent-data/dm-btree-internal.h
5021  create mode 100644 drivers/md/persistent-data/dm-btree-remove.c
5022  create mode 100644 drivers/md/persistent-data/dm-btree-spine.c
5023  create mode 100644 drivers/md/persistent-data/dm-btree.c
5024  create mode 100644 drivers/md/persistent-data/dm-btree.h
5025  create mode 100644 drivers/md/persistent-data/dm-persistent-data-internal.h
5026  create mode 100644 drivers/md/persistent-data/dm-space-map-common.h
5027  create mode 100644 drivers/md/persistent-data/dm-space-map-disk.c
5028  create mode 100644 drivers/md/persistent-data/dm-space-map-disk.h
5029  create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.c
5030  create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.h
5031  create mode 100644 drivers/md/persistent-data/dm-space-map.h
5032  create mode 100644 drivers/md/persistent-data/dm-transaction-manager.c
5033  create mode 100644 drivers/md/persistent-data/dm-transaction-manager.h
5034 Merging embedded/master
5035 $ git merge embedded/master
5036 Already up-to-date.
5037 Merging firmware/master
5038 $ git merge firmware/master
5039 Already up-to-date.
5040 Merging pcmcia/master
5041 $ git merge pcmcia/master
5042 Already up-to-date.
5043 Merging battery/master
5044 $ git merge battery/master
5045 Merge made by recursive.
5046  .../bindings/power_supply/olpc_battery.txt         |    5 +
5047  drivers/power/ds2780_battery.c                     |    2 +-
5048  drivers/power/max17042_battery.c                   |   17 ++--
5049  drivers/power/max8903_charger.c                    |    2 +-
5050  drivers/power/max8997_charger.c                    |    1 +
5051  drivers/power/max8998_charger.c                    |    2 +
5052  drivers/power/olpc_battery.c                       |   79 ++++++++++++++-----
5053  drivers/power/pda_power.c                          |   74 ++++++++++++++++--
5054  drivers/power/power_supply_sysfs.c                 |    4 +-
5055  drivers/power/wm831x_power.c                       |   44 +++++++----
5056  drivers/power/z2_battery.c                         |    2 +-
5057  include/linux/pda_power.h                          |    2 +
5058  12 files changed, 175 insertions(+), 59 deletions(-)
5059  create mode 100644 Documentation/devicetree/bindings/power_supply/olpc_battery.txt
5060 Merging leds/for-mm
5061 $ git merge leds/for-mm
5062 Resolved 'drivers/leds/Kconfig' using previous resolution.
5063 Auto-merging drivers/leds/Kconfig
5064 CONFLICT (content): Merge conflict in drivers/leds/Kconfig
5065 Automatic merge failed; fix conflicts and then commit the result.
5066 $ git commit -v -a
5067 [master 4a506c5] Merge remote-tracking branch 'leds/for-mm'
5068 $ git diff -M --stat --summary HEAD^..
5069 Merging backlight/for-mm
5070 $ git merge backlight/for-mm
5071 Already up-to-date.
5072 Merging mmc/mmc-next
5073 $ git merge mmc/mmc-next
5074 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
5075 Auto-merging drivers/mmc/host/sdhci-tegra.c
5076 Merge made by recursive.
5077  .../devicetree/bindings/mmc/nvidia-sdhci.txt       |   25 +
5078  Documentation/fault-injection/fault-injection.txt  |    8 +-
5079  arch/arm/mach-at91/at91sam9260_devices.c           |    2 +-
5080  drivers/mmc/core/core.c                            |   76 ++-
5081  drivers/mmc/core/debugfs.c                         |   25 +
5082  drivers/mmc/core/host.c                            |   23 +-
5083  drivers/mmc/core/host.h                            |    8 +-
5084  drivers/mmc/core/sd.c                              |   81 ++-
5085  drivers/mmc/host/at91_mci.c                        |    6 +-
5086  drivers/mmc/host/atmel-mci-regs.h                  |  220 +++---
5087  drivers/mmc/host/atmel-mci.c                       |  823 +++++++++++++-------
5088  drivers/mmc/host/sdhci-esdhc-imx.c                 |   45 +-
5089  drivers/mmc/host/sdhci-tegra.c                     |   51 +-
5090  drivers/mmc/host/sh_mobile_sdhi.c                  |    4 +-
5091  include/linux/atmel-mci.h                          |    4 +-
5092  include/linux/atmel_pdc.h                          |    2 +
5093  include/linux/mmc/host.h                           |    5 +
5094  lib/Kconfig.debug                                  |   11 +
5095  lib/fault-inject.c                                 |    2 +
5096  19 files changed, 990 insertions(+), 431 deletions(-)
5097  create mode 100644 Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt
5098 Merging kgdb/kgdb-next
5099 $ git merge kgdb/kgdb-next
5100 Merge made by recursive.
5101 Merging slab/for-next
5102 $ git merge slab/for-next
5103 Already up-to-date!
5104 Merge made by recursive.
5105 Merging uclinux/for-next
5106 $ git merge uclinux/for-next
5107 Already up-to-date.
5108 Merging md/for-next
5109 $ git merge md/for-next
5110 Merge made by recursive.
5111  drivers/md/md.c    |   12 +++++++++++-
5112  drivers/md/raid5.c |    6 ++----
5113  2 files changed, 13 insertions(+), 5 deletions(-)
5114 Merging mfd/for-next
5115 $ git merge mfd/for-next
5116 Merge made by recursive.
5117  arch/arm/mach-omap2/board-omap3beagle.c |    9 +-
5118  drivers/leds/leds-asic3.c               |   35 +++-
5119  drivers/mfd/Kconfig                     |    1 +
5120  drivers/mfd/ab3550-core.c               |   10 +-
5121  drivers/mfd/ab8500-gpadc.c              |   56 ++++--
5122  drivers/mfd/asic3.c                     |   26 ++-
5123  drivers/mfd/max8997.c                   |   32 +++-
5124  drivers/mfd/omap-usb-host.c             |    2 +-
5125  drivers/mfd/pcf50633-core.c             |  114 +++-------
5126  drivers/mfd/tc3589x.c                   |    2 +
5127  drivers/mfd/timberdale.c                |    9 +-
5128  drivers/mfd/tps65910-irq.c              |    2 +
5129  drivers/mfd/twl4030-irq.c               |  342 ++++++++++++-------------------
5130  drivers/mfd/twl4030-madc.c              |   27 +++-
5131  drivers/mfd/twl6030-irq.c               |   18 +-
5132  drivers/mfd/wm831x-irq.c                |    2 -
5133  drivers/mfd/wm8350-gpio.c               |    4 +-
5134  drivers/mfd/wm8994-core.c               |   53 +++++
5135  drivers/rtc/rtc-twl.c                   |   10 +-
5136  include/linux/i2c/twl4030-madc.h        |    4 +
5137  include/linux/mfd/ab8500/gpadc.h        |    5 +-
5138  include/linux/mfd/max8997-private.h     |    1 -
5139  include/linux/mfd/pcf50633/core.h       |    3 +-
5140  include/linux/mfd/wm8994/core.h         |    2 +
5141  include/linux/mfd/wm8994/pdata.h        |    9 +-
5142  25 files changed, 433 insertions(+), 345 deletions(-)
5143 Merging hdlc/hdlc-next
5144 $ git merge hdlc/hdlc-next
5145 Already up-to-date.
5146 Merging drm/drm-next
5147 $ git merge drm/drm-next
5148 Already up-to-date.
5149 Merging fbdev/master
5150 $ git merge fbdev/master
5151 Auto-merging arch/powerpc/platforms/85xx/p1022_ds.c
5152 Auto-merging arch/powerpc/platforms/86xx/mpc8610_hpcd.c
5153 Auto-merging arch/powerpc/sysdev/fsl_soc.h
5154 Auto-merging drivers/staging/xgifb/XGI_main_26.c
5155 Auto-merging drivers/video/atmel_lcdfb.c
5156 Auto-merging drivers/video/backlight/adp8860_bl.c
5157 Auto-merging drivers/video/controlfb.c
5158 Auto-merging drivers/video/fb_defio.c
5159 Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
5160 Auto-merging drivers/video/platinumfb.c
5161 Auto-merging drivers/video/via/viafbdev.c
5162 Merge made by recursive.
5163  arch/powerpc/platforms/512x/mpc512x_shared.c |   22 +-
5164  arch/powerpc/platforms/85xx/p1022_ds.c       |   47 +--
5165  arch/powerpc/platforms/86xx/mpc8610_hpcd.c   |   55 ++--
5166  arch/powerpc/sysdev/fsl_soc.h                |   25 +-
5167  drivers/staging/xgifb/XGI_main_26.c          |   22 +-
5168  drivers/video/68328fb.c                      |    4 +-
5169  drivers/video/Kconfig                        |   16 +-
5170  drivers/video/Makefile                       |    1 +
5171  drivers/video/acornfb.c                      |    5 +-
5172  drivers/video/arkfb.c                        |    9 +-
5173  drivers/video/atmel_lcdfb.c                  |   15 +-
5174  drivers/video/aty/radeon_base.c              |   10 +-
5175  drivers/video/au1200fb.c                     |  297 ++++++--------
5176  drivers/video/backlight/adp8860_bl.c         |    1 -
5177  drivers/video/backlight/adp8870_bl.c         |    1 -
5178  drivers/video/controlfb.c                    |    2 +-
5179  drivers/video/da8xx-fb.c                     |  155 +++++++-
5180  drivers/video/fb-puv3.c                      |    4 +-
5181  drivers/video/fb_defio.c                     |    3 +-
5182  drivers/video/fsl-diu-fb.c                   |   74 +++-
5183  drivers/video/g364fb.c                       |    5 +-
5184  drivers/video/grvga.c                        |  579 ++++++++++++++++++++++++++
5185  drivers/video/gxt4500.c                      |    4 +-
5186  drivers/video/hgafb.c                        |    4 +-
5187  drivers/video/imsttfb.c                      |    2 +-
5188  drivers/video/intelfb/intelfbhw.c            |    6 +-
5189  drivers/video/mb862xx/mb862xxfbdrv.c         |    2 +-
5190  drivers/video/mx3fb.c                        |    6 +-
5191  drivers/video/neofb.c                        |    4 +-
5192  drivers/video/platinumfb.c                   |    2 +-
5193  drivers/video/pm2fb.c                        |    6 +-
5194  drivers/video/pm3fb.c                        |    6 +-
5195  drivers/video/pxa3xx-gcu.c                   |    2 -
5196  drivers/video/s3c-fb.c                       |    2 +-
5197  drivers/video/s3fb.c                         |    9 +-
5198  drivers/video/savage/savagefb_driver.c       |   16 +-
5199  drivers/video/sis/sis_main.c                 |   30 +-
5200  drivers/video/skeletonfb.c                   |    2 +-
5201  drivers/video/sm501fb.c                      |    6 +-
5202  drivers/video/tridentfb.c                    |    4 +-
5203  drivers/video/valkyriefb.c                   |    2 +-
5204  drivers/video/vfb.c                          |    4 +-
5205  drivers/video/vga16fb.c                      |    2 +-
5206  drivers/video/via/via_modesetting.h          |    5 +
5207  drivers/video/via/viafbdev.c                 |   16 +-
5208  drivers/video/vt8500lcdfb.c                  |    4 +-
5209  drivers/video/vt8623fb.c                     |    9 +-
5210  drivers/video/xilinxfb.c                     |    1 -
5211  48 files changed, 1110 insertions(+), 398 deletions(-)
5212  create mode 100644 drivers/video/grvga.c
5213 Merging viafb/viafb-next
5214 $ git merge viafb/viafb-next
5215 Merge made by recursive.
5216  drivers/video/via/dvi.c             |   34 +--
5217  drivers/video/via/dvi.h             |    3 +-
5218  drivers/video/via/global.c          |    2 +
5219  drivers/video/via/global.h          |    2 +
5220  drivers/video/via/hw.c              |  544 ++++++-----------------------------
5221  drivers/video/via/hw.h              |  285 +------------------
5222  drivers/video/via/lcd.c             |   53 ++--
5223  drivers/video/via/lcd.h             |    7 +-
5224  drivers/video/via/share.h           |   23 +--
5225  drivers/video/via/via-core.c        |    2 +-
5226  drivers/video/via/via_modesetting.c |  104 +++++++
5227  drivers/video/via/via_modesetting.h |   18 ++
5228  drivers/video/via/viafbdev.c        |  166 ++++++------
5229  drivers/video/via/viamode.c         |   60 +++-
5230  drivers/video/via/viamode.h         |    4 +-
5231  15 files changed, 391 insertions(+), 916 deletions(-)
5232 Merging omap_dss2/for-next
5233 $ git merge omap_dss2/for-next
5234 Already up-to-date.
5235 Merging voltage/for-next
5236 $ git merge voltage/for-next
5237 Merge made by recursive.
5238  drivers/regulator/88pm8607.c           |    2 +-
5239  drivers/regulator/aat2870-regulator.c  |    1 +
5240  drivers/regulator/max8649.c            |    2 +-
5241  drivers/regulator/max8952.c            |    3 ---
5242  drivers/regulator/tps65023-regulator.c |   11 +++++++++++
5243  drivers/regulator/tps6507x-regulator.c |    8 +-------
5244  drivers/regulator/tps65912-regulator.c |    2 --
5245  include/linux/regulator/consumer.h     |    2 +-
5246  8 files changed, 16 insertions(+), 15 deletions(-)
5247 Merging security/next
5248 $ git merge security/next
5249 Resolved 'fs/ocfs2/xattr.c' using previous resolution.
5250 Auto-merging Documentation/kernel-parameters.txt
5251 Auto-merging MAINTAINERS
5252 Auto-merging fs/gfs2/inode.c
5253 Auto-merging fs/ocfs2/xattr.c
5254 CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
5255 Auto-merging fs/xfs/xfs_iops.c
5256 Auto-merging kernel/cred.c
5257 Removing security/integrity/ima/ima_iint.c
5258 Automatic merge failed; fix conflicts and then commit the result.
5259 $ git commit -v -a
5260 [master 010acc7] Merge remote-tracking branch 'security/next'
5261 $ git diff -M --stat --summary HEAD^..
5262  Documentation/ABI/testing/evm       |   23 ++
5263  Documentation/kernel-parameters.txt |    6 +
5264  MAINTAINERS                         |    5 +
5265  drivers/char/tpm/tpm.c              |    3 +
5266  fs/attr.c                           |    5 +-
5267  fs/btrfs/xattr.c                    |   50 +++---
5268  fs/cifs/xattr.c                     |   40 ++--
5269  fs/ext2/xattr_security.c            |   34 ++--
5270  fs/ext3/xattr_security.c            |   36 ++--
5271  fs/ext4/xattr_security.c            |   36 ++--
5272  fs/gfs2/inode.c                     |   38 ++--
5273  fs/jffs2/security.c                 |   35 ++--
5274  fs/jfs/xattr.c                      |   57 +++---
5275  fs/ocfs2/xattr.c                    |   41 +++--
5276  fs/reiserfs/xattr_security.c        |    4 +-
5277  fs/xattr.c                          |   63 ++++++-
5278  fs/xfs/xfs_iops.c                   |   39 ++--
5279  include/linux/evm.h                 |   92 +++++++++
5280  include/linux/ima.h                 |   13 --
5281  include/linux/integrity.h           |   38 ++++
5282  include/linux/security.h            |   28 ++-
5283  include/linux/xattr.h               |   14 ++-
5284  kernel/cred.c                       |   18 ++-
5285  mm/shmem.c                          |    4 +-
5286  security/Kconfig                    |    2 +-
5287  security/Makefile                   |    4 +-
5288  security/commoncap.c                |   16 +-
5289  security/integrity/Kconfig          |    7 +
5290  security/integrity/Makefile         |   12 +
5291  security/integrity/evm/Kconfig      |   14 ++
5292  security/integrity/evm/Makefile     |    6 +
5293  security/integrity/evm/evm.h        |   38 ++++
5294  security/integrity/evm/evm_crypto.c |  216 +++++++++++++++++++
5295  security/integrity/evm/evm_main.c   |  384 ++++++++++++++++++++++++++++++++++
5296  security/integrity/evm/evm_secfs.c  |  108 ++++++++++
5297  security/integrity/iint.c           |  171 ++++++++++++++++
5298  security/integrity/ima/Kconfig      |    1 +
5299  security/integrity/ima/Makefile     |    2 +-
5300  security/integrity/ima/ima.h        |   29 +--
5301  security/integrity/ima/ima_api.c    |    7 +-
5302  security/integrity/ima/ima_iint.c   |  169 ---------------
5303  security/integrity/ima/ima_main.c   |   12 +-
5304  security/integrity/integrity.h      |   47 +++++
5305  security/keys/gc.c                  |  386 +++++++++++++++++++++++++----------
5306  security/keys/internal.h            |    4 +
5307  security/keys/key.c                 |  121 +-----------
5308  security/keys/keyring.c             |    3 +-
5309  security/keys/process_keys.c        |   16 ++-
5310  security/security.c                 |   71 ++++++-
5311  security/tomoyo/gc.c                |    2 +-
5312  50 files changed, 1899 insertions(+), 671 deletions(-)
5313  create mode 100644 Documentation/ABI/testing/evm
5314  create mode 100644 include/linux/evm.h
5315  create mode 100644 include/linux/integrity.h
5316  create mode 100644 security/integrity/Kconfig
5317  create mode 100644 security/integrity/Makefile
5318  create mode 100644 security/integrity/evm/Kconfig
5319  create mode 100644 security/integrity/evm/Makefile
5320  create mode 100644 security/integrity/evm/evm.h
5321  create mode 100644 security/integrity/evm/evm_crypto.c
5322  create mode 100644 security/integrity/evm/evm_main.c
5323  create mode 100644 security/integrity/evm/evm_secfs.c
5324  create mode 100644 security/integrity/iint.c
5325  delete mode 100644 security/integrity/ima/ima_iint.c
5326  create mode 100644 security/integrity/integrity.h
5327 Merging selinux/master
5328 $ git merge selinux/master
5329 Already up-to-date.
5330 Merging lblnet/master
5331 $ git merge lblnet/master
5332 Already up-to-date.
5333 Merging agp/agp-next
5334 $ git merge agp/agp-next
5335 Merge made by recursive.
5336 Merging watchdog/master
5337 $ git merge watchdog/master
5338 Merge made by recursive.
5339  drivers/watchdog/hpwdt.c        |    9 +++++----
5340  drivers/watchdog/watchdog_dev.c |   14 +++++++-------
5341  2 files changed, 12 insertions(+), 11 deletions(-)
5342 Merging bdev/master
5343 $ git merge bdev/master
5344 Already up-to-date.
5345 Merging dwmw2-iommu/master
5346 $ git merge dwmw2-iommu/master
5347 Already up-to-date.
5348 Merging cputime/cputime
5349 $ git merge cputime/cputime
5350 Already up-to-date.
5351 Merging osd/linux-next
5352 $ git merge osd/linux-next
5353 Merge made by recursive.
5354  fs/exofs/exofs.h       |    3 --
5355  fs/exofs/super.c       |   57 ++++++++++++++++++-----------------------------
5356  include/scsi/osd_ore.h |    2 +
5357  3 files changed, 24 insertions(+), 38 deletions(-)
5358 Merging jc_docs/docs-next
5359 $ git merge jc_docs/docs-next
5360 Already up-to-date.
5361 Merging nommu/master
5362 $ git merge nommu/master
5363 Already up-to-date.
5364 Merging trivial/for-next
5365 $ git merge trivial/for-next
5366 Auto-merging fs/eventpoll.c
5367 Auto-merging lib/Kconfig.debug
5368 Auto-merging lib/idr.c
5369 Merge made by recursive.
5370  Documentation/ABI/removed/o2cb                     |    2 +-
5371  Documentation/ABI/testing/sysfs-bus-bcma           |    8 ++++----
5372  .../testing/sysfs-class-backlight-driver-adp8870   |   16 ++++++++--------
5373  drivers/usb/serial/mos7720.c                       |    1 -
5374  drivers/usb/serial/mos7840.c                       |    1 -
5375  fs/eventpoll.c                                     |    2 +-
5376  lib/Kconfig.debug                                  |    2 +-
5377  lib/idr.c                                          |    2 +-
5378  8 files changed, 16 insertions(+), 18 deletions(-)
5379 Merging audit/for-next
5380 $ git merge audit/for-next
5381 Already up-to-date.
5382 Merging pm/linux-next
5383 $ git merge pm/linux-next
5384 Resolved 'arch/s390/include/asm/thread_info.h' using previous resolution.
5385 Resolved 'drivers/mfd/twl4030-irq.c' using previous resolution.
5386 Auto-merging arch/arm/mach-shmobile/board-mackerel.c
5387 Auto-merging arch/arm/mach-shmobile/setup-sh7372.c
5388 Auto-merging arch/s390/Kconfig
5389 Auto-merging arch/s390/include/asm/thread_info.h
5390 CONFLICT (content): Merge conflict in arch/s390/include/asm/thread_info.h
5391 Auto-merging drivers/bluetooth/btusb.c
5392 Auto-merging drivers/mfd/twl4030-irq.c
5393 CONFLICT (content): Merge conflict in drivers/mfd/twl4030-irq.c
5394 Auto-merging drivers/mfd/twl6030-irq.c
5395 Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
5396 Auto-merging drivers/usb/core/hcd.c
5397 Auto-merging fs/ext4/super.c
5398 Auto-merging fs/gfs2/quota.c
5399 Auto-merging fs/xfs/xfs_buf.c
5400 Auto-merging include/linux/netdevice.h
5401 Removing include/linux/pm_qos_params.h
5402 Auto-merging kernel/power/qos.c
5403 Auto-merging net/mac80211/main.c
5404 Automatic merge failed; fix conflicts and then commit the result.
5405 $ git commit -v -a
5406 [master 2fa119e] Merge remote-tracking branch 'pm/linux-next'
5407 $ git diff -M --stat --summary HEAD^..
5408  Documentation/power/basic-pm-debugging.txt   |   24 ++
5409  Documentation/power/freezing-of-tasks.txt    |   14 +-
5410  Documentation/power/runtime_pm.txt           |    1 +
5411  Documentation/usb/power-management.txt       |    8 +-
5412  arch/alpha/include/asm/thread_info.h         |    2 -
5413  arch/arm/include/asm/thread_info.h           |    2 -
5414  arch/arm/mach-msm/clock.c                    |    2 +-
5415  arch/arm/mach-omap1/pm_bus.c                 |    1 +
5416  arch/arm/mach-shmobile/board-ap4evb.c        |    1 +
5417  arch/arm/mach-shmobile/board-mackerel.c      |    2 +-
5418  arch/arm/mach-shmobile/include/mach/sh7372.h |    3 +
5419  arch/arm/mach-shmobile/pm-sh7372.c           |   56 +---
5420  arch/arm/mach-shmobile/pm_runtime.c          |    1 +
5421  arch/arm/mach-shmobile/setup-sh7372.c        |    3 +
5422  arch/avr32/include/asm/thread_info.h         |    2 -
5423  arch/blackfin/include/asm/thread_info.h      |    2 -
5424  arch/cris/include/asm/thread_info.h          |    2 -
5425  arch/frv/include/asm/thread_info.h           |    2 -
5426  arch/h8300/include/asm/thread_info.h         |    2 -
5427  arch/ia64/include/asm/thread_info.h          |    2 -
5428  arch/m32r/include/asm/thread_info.h          |    2 -
5429  arch/m68k/include/asm/thread_info.h          |    1 -
5430  arch/microblaze/include/asm/thread_info.h    |    2 -
5431  arch/mips/include/asm/thread_info.h          |    2 -
5432  arch/mn10300/include/asm/thread_info.h       |    2 -
5433  arch/parisc/include/asm/thread_info.h        |    2 -
5434  arch/powerpc/include/asm/thread_info.h       |    2 -
5435  arch/s390/Kconfig                            |    1 +
5436  arch/s390/include/asm/thread_info.h          |    2 -
5437  arch/s390/kernel/suspend.c                   |  118 ++++++++
5438  arch/s390/kernel/swsusp_asm64.S              |    3 +
5439  arch/sh/include/asm/thread_info.h            |    2 -
5440  arch/sparc/include/asm/thread_info_32.h      |    2 -
5441  arch/sparc/include/asm/thread_info_64.h      |    2 -
5442  arch/um/include/asm/thread_info.h            |    2 -
5443  arch/unicore32/include/asm/thread_info.h     |    2 -
5444  arch/x86/include/asm/thread_info.h           |    2 -
5445  arch/xtensa/include/asm/thread_info.h        |    2 -
5446  drivers/acpi/processor_idle.c                |    2 +-
5447  drivers/base/power/Makefile                  |    4 +-
5448  drivers/base/power/clock_ops.c               |  122 ++++-----
5449  drivers/base/power/common.c                  |   86 ++++++
5450  drivers/base/power/domain.c                  |  331 ++++++++++++----------
5451  drivers/base/power/main.c                    |   34 ++-
5452  drivers/base/power/qos.c                     |  399 ++++++++++++++++++++++++++
5453  drivers/base/power/runtime.c                 |   15 +-
5454  drivers/bluetooth/btmrvl_main.c              |    2 -
5455  drivers/bluetooth/btusb.c                    |    2 +-
5456  drivers/cpuidle/cpuidle.c                    |    2 +-
5457  drivers/cpuidle/governors/ladder.c           |    2 +-
5458  drivers/cpuidle/governors/menu.c             |    2 +-
5459  drivers/hid/hid-picolcd.c                    |    2 +-
5460  drivers/hid/usbhid/hid-core.c                |    7 +-
5461  drivers/media/video/via-camera.c             |    4 +-
5462  drivers/mfd/twl6030-irq.c                    |    2 -
5463  drivers/net/ethernet/intel/e1000e/netdev.c   |    2 +-
5464  drivers/net/irda/stir4200.c                  |    2 +-
5465  drivers/net/usb/usbnet.c                     |    2 +-
5466  drivers/net/wimax/i2400m/usb.c               |    4 +-
5467  drivers/net/wireless/ipw2x00/ipw2100.c       |    4 +-
5468  drivers/platform/x86/thinkpad_acpi.c         |   15 +-
5469  drivers/staging/rts_pstor/rtsx.c             |    2 -
5470  drivers/usb/class/cdc-acm.c                  |    2 +-
5471  drivers/usb/class/cdc-wdm.c                  |    6 +-
5472  drivers/usb/core/driver.c                    |    9 +-
5473  drivers/usb/core/hcd.c                       |    4 +-
5474  drivers/usb/core/hub.c                       |   10 +-
5475  drivers/usb/serial/sierra.c                  |    2 +-
5476  drivers/usb/serial/usb_wwan.c                |    2 +-
5477  fs/btrfs/async-thread.c                      |    2 +-
5478  fs/btrfs/disk-io.c                           |    8 +-
5479  fs/ext4/super.c                              |    3 +-
5480  fs/fs-writeback.c                            |    4 +-
5481  fs/gfs2/log.c                                |    4 +-
5482  fs/gfs2/quota.c                              |    4 +-
5483  fs/jbd/journal.c                             |    2 +-
5484  fs/jbd2/journal.c                            |    2 +-
5485  fs/jfs/jfs_logmgr.c                          |    2 +-
5486  fs/jfs/jfs_txnmgr.c                          |    4 +-
5487  fs/nilfs2/segment.c                          |    2 +-
5488  fs/xfs/xfs_buf.c                             |    2 +-
5489  include/linux/device.h                       |    5 +
5490  include/linux/freezer.h                      |   78 ++---
5491  include/linux/kthread.h                      |    1 +
5492  include/linux/netdevice.h                    |    4 +-
5493  include/linux/pm.h                           |   33 ++-
5494  include/linux/pm_clock.h                     |   71 +++++
5495  include/linux/pm_domain.h                    |   17 +-
5496  include/linux/pm_qos.h                       |  147 ++++++++++
5497  include/linux/pm_qos_params.h                |   38 ---
5498  include/linux/pm_runtime.h                   |   42 ---
5499  include/linux/sched.h                        |    3 +-
5500  include/linux/suspend.h                      |   86 ++++++
5501  include/sound/pcm.h                          |    4 +-
5502  kernel/Makefile                              |    2 +-
5503  kernel/cgroup_freezer.c                      |   51 ++--
5504  kernel/exit.c                                |    8 +-
5505  kernel/fork.c                                |    1 -
5506  kernel/freezer.c                             |  179 +++++++-----
5507  kernel/kthread.c                             |   25 ++
5508  kernel/power/Kconfig                         |    3 +
5509  kernel/power/Makefile                        |    2 +-
5510  kernel/power/hibernate.c                     |   15 +-
5511  kernel/power/main.c                          |  102 +++++++
5512  kernel/power/process.c                       |   65 ++---
5513  kernel/{pm_qos_params.c => power/qos.c}      |  273 +++++++++---------
5514  kernel/power/snapshot.c                      |   18 ++
5515  kernel/power/suspend.c                       |   17 +-
5516  kernel/power/user.c                          |    4 +-
5517  mm/backing-dev.c                             |    8 +-
5518  net/mac80211/main.c                          |    2 +-
5519  net/mac80211/mlme.c                          |    2 +-
5520  net/mac80211/scan.c                          |    2 +-
5521  sound/core/pcm_native.c                      |    2 +-
5522  sound/usb/card.c                             |    2 +-
5523  115 files changed, 1858 insertions(+), 860 deletions(-)
5524  create mode 100644 drivers/base/power/common.c
5525  create mode 100644 drivers/base/power/qos.c
5526  create mode 100644 include/linux/pm_clock.h
5527  create mode 100644 include/linux/pm_qos.h
5528  delete mode 100644 include/linux/pm_qos_params.h
5529  rename kernel/{pm_qos_params.c => power/qos.c} (71%)
5530 Merging apm/for-next
5531 $ git merge apm/for-next
5532 Auto-merging drivers/char/apm-emulation.c
5533 Merge made by recursive.
5534  drivers/char/apm-emulation.c |   16 ++++++----------
5535  1 files changed, 6 insertions(+), 10 deletions(-)
5536 Merging fsnotify/for-next
5537 $ git merge fsnotify/for-next
5538 Auto-merging fs/cachefiles/namei.c
5539 Auto-merging fs/nfsd/vfs.c
5540 Auto-merging fs/notify/fanotify/fanotify_user.c
5541 Auto-merging fs/notify/group.c
5542 Auto-merging fs/notify/mark.c
5543 Auto-merging include/linux/fsnotify_backend.h
5544 Merge made by recursive.
5545  fs/cachefiles/namei.c              |    1 -
5546  fs/cachefiles/xattr.c              |    1 -
5547  fs/nfsd/vfs.c                      |    3 -
5548  fs/notify/dnotify/dnotify.c        |   15 +++---
5549  fs/notify/fanotify/fanotify.c      |   24 +++++----
5550  fs/notify/fanotify/fanotify_user.c |  101 +++++++++++++++++++++++++-----------
5551  fs/notify/group.c                  |    1 +
5552  fs/notify/mark.c                   |   36 +++++--------
5553  include/linux/fanotify.h           |    5 ++-
5554  include/linux/fsnotify_backend.h   |   14 ++++-
5555  10 files changed, 121 insertions(+), 80 deletions(-)
5556 Merging irda/for-next
5557 $ git merge irda/for-next
5558 Already up-to-date.
5559 Merging i7core_edac/linux_next
5560 $ git merge i7core_edac/linux_next
5561 Auto-merging drivers/edac/i7core_edac.c
5562 Merge made by recursive.
5563  drivers/edac/i7core_edac.c |   23 ++++++++++++++++++++---
5564  1 files changed, 20 insertions(+), 3 deletions(-)
5565 Merging i7300_edac/linux_next
5566 $ git merge i7300_edac/linux_next
5567 Resolved 'arch/x86/kernel/cpu/mcheck/mce.c' using previous resolution.
5568 Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
5569 CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
5570 Removing drivers/edac/edac_mce.c
5571 Auto-merging drivers/edac/i7core_edac.c
5572 Auto-merging include/linux/edac.h
5573 Removing include/linux/edac_mce.h
5574 Automatic merge failed; fix conflicts and then commit the result.
5575 $ git commit -v -a
5576 [master d947090] Merge remote-tracking branch 'i7300_edac/linux_next'
5577 $ git diff -M --stat --summary HEAD^..
5578  arch/x86/kernel/cpu/mcheck/mce.c |   18 +--
5579  drivers/edac/Kconfig             |    8 +-
5580  drivers/edac/Makefile            |    1 -
5581  drivers/edac/edac_core.h         |  350 +----------------------------------
5582  drivers/edac/edac_mce.c          |   61 ------
5583  drivers/edac/i7core_edac.c       |  385 ++++++++++++++++++++++++++++++++++----
5584  include/linux/edac.h             |  350 ++++++++++++++++++++++++++++++++++
5585  include/linux/edac_mce.h         |   31 ---
5586  8 files changed, 709 insertions(+), 495 deletions(-)
5587  delete mode 100644 drivers/edac/edac_mce.c
5588  delete mode 100644 include/linux/edac_mce.h
5589 Merging devicetree/devicetree/next
5590 $ git merge devicetree/devicetree/next
5591 Resolved 'drivers/of/base.c' using previous resolution.
5592 Auto-merging drivers/of/base.c
5593 CONFLICT (content): Merge conflict in drivers/of/base.c
5594 Automatic merge failed; fix conflicts and then commit the result.
5595 $ git commit -v -a
5596 [master 3f893b0] Merge remote-tracking branch 'devicetree/devicetree/next'
5597 $ git diff -M --stat --summary HEAD^..
5598 Merging spi/spi/next
5599 $ git merge spi/spi/next
5600 Already up-to-date.
5601 Merging gpio/gpio/next
5602 $ git merge gpio/gpio/next
5603 Already up-to-date.
5604 Merging tip/auto-latest
5605 $ git merge tip/auto-latest
5606 Resolved 'arch/x86/mm/fault.c' using previous resolution.
5607 Auto-merging Documentation/kernel-parameters.txt
5608 Auto-merging arch/x86/mm/fault.c
5609 CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
5610 Auto-merging arch/x86/xen/mmu.c
5611 Automatic merge failed; fix conflicts and then commit the result.
5612 $ git commit -v -a
5613 [master a068c20] Merge remote-tracking branch 'tip/auto-latest'
5614 $ git diff -M --stat --summary HEAD^..
5615  Documentation/kernel-parameters.txt   |   18 ++++
5616  Documentation/x86/entry_64.txt        |    3 -
5617  arch/x86/Kconfig                      |    9 ++
5618  arch/x86/include/asm/archrandom.h     |   75 +++++++++++++++++
5619  arch/x86/include/asm/cmpxchg_32.h     |   21 +++++
5620  arch/x86/include/asm/cmpxchg_64.h     |   26 ++++++
5621  arch/x86/include/asm/elf.h            |   31 +++++++
5622  arch/x86/include/asm/pgtable_types.h  |    1 -
5623  arch/x86/include/asm/spinlock.h       |  140 +++++++++++---------------------
5624  arch/x86/include/asm/spinlock_types.h |   22 +++++-
5625  arch/x86/include/asm/x86_init.h       |   12 ---
5626  arch/x86/kernel/apic/x2apic_uv_x.c    |    1 -
5627  arch/x86/kernel/cpu/Makefile          |    1 +
5628  arch/x86/kernel/cpu/amd.c             |   47 +++++++----
5629  arch/x86/kernel/cpu/common.c          |    5 +
5630  arch/x86/kernel/cpu/cpu.h             |    1 +
5631  arch/x86/kernel/cpu/rdrand.c          |   73 ++++++++++++++++
5632  arch/x86/kernel/sys_x86_64.c          |   77 +++++++++++++++++-
5633  arch/x86/kernel/x86_init.c            |    4 -
5634  arch/x86/mm/fault.c                   |    2 +-
5635  arch/x86/mm/init.c                    |  147 ++++++++++++++++++++++++---------
5636  arch/x86/mm/mmap.c                    |   20 +----
5637  arch/x86/platform/olpc/olpc.c         |    4 +-
5638  arch/x86/vdso/vma.c                   |    9 ++
5639  arch/x86/xen/mmu.c                    |   15 ----
5640  drivers/char/random.c                 |   23 +++++-
5641  include/linux/random.h                |   13 +++
5642  27 files changed, 590 insertions(+), 210 deletions(-)
5643  create mode 100644 arch/x86/include/asm/archrandom.h
5644  create mode 100644 arch/x86/kernel/cpu/rdrand.c
5645 Merging rcu/rcu/next
5646 $ git merge rcu/rcu/next
5647 Auto-merging Documentation/RCU/NMI-RCU.txt
5648 Auto-merging include/linux/rcupdate.h
5649 Auto-merging include/linux/sched.h
5650 Auto-merging init/Kconfig
5651 Auto-merging kernel/lockdep.c
5652 Auto-merging kernel/pid.c
5653 Auto-merging kernel/rcupdate.c
5654 Auto-merging kernel/rcutorture.c
5655 Auto-merging kernel/rcutree_trace.c
5656 Auto-merging kernel/rtmutex.c
5657 Auto-merging kernel/sched.c
5658 Merge made by recursive.
5659  Documentation/RCU/NMI-RCU.txt       |    2 +-
5660  Documentation/RCU/lockdep-splat.txt |  110 +++++++++
5661  Documentation/RCU/lockdep.txt       |   34 ++-
5662  Documentation/RCU/torture.txt       |  137 ++++++++---
5663  Documentation/RCU/trace.txt         |   38 ++--
5664  include/linux/lockdep.h             |    2 +-
5665  include/linux/rcupdate.h            |  300 +++++++++++-------------
5666  include/linux/rcutiny.h             |   20 ++-
5667  include/linux/rcutree.h             |    2 +
5668  include/linux/sched.h               |    4 -
5669  include/linux/types.h               |   10 +
5670  include/trace/events/rcu.h          |  459 +++++++++++++++++++++++++++++++++++
5671  init/Kconfig                        |    6 +-
5672  kernel/lockdep.c                    |   84 ++++---
5673  kernel/pid.c                        |    4 +-
5674  kernel/rcu.h                        |   85 +++++++
5675  kernel/rcupdate.c                   |   26 ++-
5676  kernel/rcutiny.c                    |  117 ++-------
5677  kernel/rcutiny_plugin.h             |  135 +++++++----
5678  kernel/rcutorture.c                 |   74 +++----
5679  kernel/rcutree.c                    |  226 +++++++++++-------
5680  kernel/rcutree.h                    |   16 +-
5681  kernel/rcutree_plugin.h             |  116 ++++++---
5682  kernel/rcutree_trace.c              |   13 +-
5683  kernel/rtmutex.c                    |    7 +
5684  kernel/sched.c                      |   13 +-
5685  kernel/time/tick-sched.c            |    6 -
5686  27 files changed, 1438 insertions(+), 608 deletions(-)
5687  create mode 100644 Documentation/RCU/lockdep-splat.txt
5688  create mode 100644 include/trace/events/rcu.h
5689  create mode 100644 kernel/rcu.h
5690 Merging kvm/linux-next
5691 $ git merge kvm/linux-next
5692 Already up-to-date.
5693 Merging oprofile/for-next
5694 $ git merge oprofile/for-next
5695 Already up-to-date.
5696 Merging ptrace/ptrace
5697 $ git merge ptrace/ptrace
5698 Auto-merging include/linux/sched.h
5699 Auto-merging kernel/fork.c
5700 Merge made by recursive.
5701  arch/x86/kernel/signal.c |    6 +----
5702  fs/exec.c                |   18 +------------
5703  include/linux/sched.h    |    3 +-
5704  include/linux/signal.h   |    1 +
5705  kernel/fork.c            |   61 +++++++++++++++++++++++++++++----------------
5706  kernel/signal.c          |   21 ++++++++++++++++
5707  6 files changed, 65 insertions(+), 45 deletions(-)
5708 $ git revert 932e5a25b9cf
5709 [master 12688b4] Revert "signal: Add block_sigmask() for adding sigmask to current->blocked"
5710  3 files changed, 5 insertions(+), 23 deletions(-)
5711 Merging xen/upstream/xen
5712 $ git merge xen/upstream/xen
5713 Merge made by recursive.
5714 Merging xen-two/linux-next
5715 $ git merge xen-two/linux-next
5716 Auto-merging arch/x86/xen/mmu.c
5717 Merge made by recursive.
5718  .../ABI/testing/sysfs-bus-pci-devices-cciss        |    7 ++
5719  Documentation/blockdev/cciss.txt                   |   10 +++
5720  arch/x86/xen/Kconfig                               |    8 --
5721  arch/x86/xen/mmu.c                                 |   38 -----------
5722  drivers/block/cciss.c                              |   69 ++++++++++++++++---
5723  drivers/block/cciss.h                              |    1 +
5724  drivers/block/xen-blkback/blkback.c                |    8 +-
5725  drivers/block/xen-blkback/common.h                 |    2 +-
5726  drivers/block/xen-blkback/xenbus.c                 |   14 +++-
5727  drivers/block/xen-blkfront.c                       |    9 ++-
5728  drivers/pci/xen-pcifront.c                         |    4 +-
5729  drivers/xen/balloon.c                              |   15 ++--
5730  drivers/xen/events.c                               |    9 +--
5731  drivers/xen/gntdev.c                               |    3 +-
5732  drivers/xen/grant-table.c                          |    2 +-
5733  drivers/xen/pci.c                                  |    4 +-
5734  drivers/xen/swiotlb-xen.c                          |   42 ++++++++----
5735  drivers/xen/xen-balloon.c                          |   17 ++---
5736  drivers/xen/xen-pciback/conf_space_header.c        |    2 +-
5737  drivers/xen/xenbus/xenbus_probe.c                  |    7 +-
5738  drivers/xen/xenbus/xenbus_probe.h                  |    3 +-
5739  21 files changed, 156 insertions(+), 118 deletions(-)
5740 Merging xen-pvhvm/linux-next
5741 $ git merge xen-pvhvm/linux-next
5742 Already up-to-date.
5743 Merging edac-amd/for-next
5744 $ git merge edac-amd/for-next
5745 Merge made by recursive.
5746  drivers/edac/mce_amd.c |    4 ++--
5747  1 files changed, 2 insertions(+), 2 deletions(-)
5748 Merging percpu/for-next
5749 $ git merge percpu/for-next
5750 Merge made by recursive.
5751  mm/percpu-vm.c |    5 ++---
5752  mm/percpu.c    |   17 +++++++++--------
5753  2 files changed, 11 insertions(+), 11 deletions(-)
5754 Merging workqueues/for-next
5755 $ git merge workqueues/for-next
5756 Already up-to-date.
5757 Merging sfi/sfi-test
5758 $ git merge sfi/sfi-test
5759 Already up-to-date.
5760 Merging asm-generic/next
5761 $ git merge asm-generic/next
5762 Already up-to-date.
5763 Merging drivers-x86/linux-next
5764 $ git merge drivers-x86/linux-next
5765 Already up-to-date.
5766 Merging hwpoison/hwpoison
5767 $ git merge hwpoison/hwpoison
5768 Already up-to-date.
5769 Merging sysctl/master
5770 $ git merge sysctl/master
5771 Auto-merging fs/proc/proc_sysctl.c
5772 Merge made by recursive.
5773  fs/proc/proc_sysctl.c |   14 ++------------
5774  1 files changed, 2 insertions(+), 12 deletions(-)
5775 Merging namespace/master
5776 $ git merge namespace/master
5777 Auto-merging fs/proc/inode.c
5778 Merge made by recursive.
5779  fs/proc/inode.c      |    6 +-
5780  fs/proc/namespaces.c |  160 +++++++++++++++++++++++++++++++++++++++++++-------
5781  2 files changed, 142 insertions(+), 24 deletions(-)
5782 Merging regmap/for-next
5783 $ git merge regmap/for-next
5784 Auto-merging drivers/base/regmap/regmap-spi.c
5785 Auto-merging drivers/mfd/Kconfig
5786 Auto-merging drivers/mfd/wm8994-core.c
5787 Auto-merging include/linux/mfd/wm8994/core.h
5788 Merge made by recursive.
5789  drivers/base/regmap/Makefile         |    1 +
5790  drivers/base/regmap/internal.h       |   66 ++++++
5791  drivers/base/regmap/regmap-debugfs.c |  209 +++++++++++++++++
5792  drivers/base/regmap/regmap-i2c.c     |    1 -
5793  drivers/base/regmap/regmap-spi.c     |    1 -
5794  drivers/base/regmap/regmap.c         |  139 +++++++++---
5795  drivers/mfd/Kconfig                  |    3 +
5796  drivers/mfd/wm831x-core.c            |  424 +++++++++++++++++++++++++++++-----
5797  drivers/mfd/wm831x-i2c.c             |   68 +-----
5798  drivers/mfd/wm831x-spi.c             |  196 +++-------------
5799  drivers/mfd/wm8400-core.c            |  106 +++------
5800  drivers/mfd/wm8994-core.c            |  178 +++------------
5801  include/linux/mfd/wm831x/core.h      |    9 +-
5802  include/linux/mfd/wm8400-private.h   |    7 +-
5803  include/linux/mfd/wm8994/core.h      |    9 +-
5804  include/linux/regmap.h               |   47 ++++-
5805  include/trace/events/regmap.h        |  112 +++++++++
5806  17 files changed, 1025 insertions(+), 551 deletions(-)
5807  create mode 100644 drivers/base/regmap/internal.h
5808  create mode 100644 drivers/base/regmap/regmap-debugfs.c
5809  create mode 100644 include/trace/events/regmap.h
5810 Merging driver-core/driver-core-next
5811 $ git merge driver-core/driver-core-next
5812 Auto-merging MAINTAINERS
5813 Auto-merging drivers/base/platform.c
5814 Auto-merging include/linux/device.h
5815 Auto-merging include/linux/netdevice.h
5816 Auto-merging net/core/dev.c
5817 Merge made by recursive.
5818  Documentation/filesystems/sysfs.txt |   10 ++-
5819  MAINTAINERS                         |    6 ++
5820  drivers/base/core.c                 |    5 +-
5821  drivers/base/platform.c             |    2 +-
5822  drivers/misc/pch_phub.c             |   10 ++-
5823  drivers/uio/uio.c                   |    7 +-
5824  drivers/uio/uio_pci_generic.c       |    5 -
5825  drivers/uio/uio_pdrv_genirq.c       |    2 +-
5826  fs/debugfs/inode.c                  |    2 +-
5827  fs/sysfs/dir.c                      |  167 +++++++++++++++++++++++------------
5828  fs/sysfs/inode.c                    |   14 +---
5829  fs/sysfs/sysfs.h                    |   17 +++-
5830  include/linux/device.h              |    5 +
5831  include/linux/dynamic_debug.h       |   34 +++++--
5832  include/linux/netdevice.h           |   10 +-
5833  lib/dynamic_debug.c                 |  158 +++++++++++++++++++++++----------
5834  lib/kobject_uevent.c                |    2 +-
5835  net/core/dev.c                      |    3 +-
5836  18 files changed, 308 insertions(+), 151 deletions(-)
5837 Merging tty/tty-next
5838 $ git merge tty/tty-next
5839 Auto-merging arch/arm/Kconfig
5840 Removing arch/arm/plat-samsung/irq-uart.c
5841 Auto-merging drivers/tty/serial/8250.c
5842 Auto-merging drivers/tty/serial/bfin_uart.c
5843 Auto-merging drivers/tty/serial/samsung.c
5844 Auto-merging drivers/tty/serial/serial_core.c
5845 Auto-merging include/linux/tty.h
5846 Merge made by recursive.
5847  .../devicetree/bindings/tty/serial/of-serial.txt   |    1 +
5848  arch/arm/Kconfig                                   |    1 -
5849  arch/arm/mach-s3c64xx/dev-uart.c                   |   60 +--
5850  arch/arm/mach-s3c64xx/include/mach/irqs.h          |   30 -
5851  arch/arm/mach-s3c64xx/irq.c                        |   25 -
5852  arch/arm/plat-s5p/Kconfig                          |    1 -
5853  arch/arm/plat-s5p/dev-uart.c                       |   84 +--
5854  arch/arm/plat-s5p/include/plat/irqs.h              |   35 -
5855  arch/arm/plat-s5p/irq.c                            |   34 -
5856  arch/arm/plat-samsung/Kconfig                      |    5 -
5857  arch/arm/plat-samsung/Makefile                     |    1 -
5858  arch/arm/plat-samsung/include/plat/regs-serial.h   |    5 +
5859  arch/arm/plat-samsung/irq-uart.c                   |   96 ---
5860  arch/mips/pmc-sierra/msp71xx/msp_serial.c          |   73 ++-
5861  arch/powerpc/include/asm/udbg.h                    |    1 +
5862  arch/powerpc/kernel/udbg.c                         |    2 +
5863  drivers/tty/Kconfig                                |   34 +
5864  drivers/tty/Makefile                               |    1 +
5865  drivers/tty/amiserial.c                            |   10 +-
5866  drivers/tty/cyclades.c                             |   12 +-
5867  drivers/tty/ehv_bytechan.c                         |  888 ++++++++++++++++++++
5868  drivers/tty/mxser.c                                |   13 +-
5869  drivers/tty/serial/8250.c                          |  107 +--
5870  drivers/tty/serial/8250_dw.c                       |   99 +++
5871  drivers/tty/serial/Kconfig                         |    9 +-
5872  drivers/tty/serial/Makefile                        |    3 +-
5873  drivers/tty/serial/{bfin_5xx.c => bfin_uart.c}     |   61 +-
5874  drivers/tty/serial/msm_serial.c                    |    2 -
5875  drivers/tty/serial/of_serial.c                     |    7 +
5876  drivers/tty/serial/samsung.c                       |  107 +++-
5877  drivers/tty/serial/samsung.h                       |    1 +
5878  drivers/tty/serial/serial_core.c                   |   58 +--
5879  drivers/tty/synclink.c                             |    1 -
5880  drivers/tty/tty_ldisc.c                            |    1 -
5881  drivers/tty/tty_mutex.c                            |   12 -
5882  drivers/tty/vt/selection.c                         |    4 +-
5883  drivers/tty/vt/vt.c                                |    2 +-
5884  include/linux/serial_8250.h                        |   10 +
5885  include/linux/serial_core.h                        |    6 +-
5886  include/linux/tty.h                                |    2 -
5887  40 files changed, 1330 insertions(+), 574 deletions(-)
5888  delete mode 100644 arch/arm/plat-samsung/irq-uart.c
5889  create mode 100644 drivers/tty/ehv_bytechan.c
5890  create mode 100644 drivers/tty/serial/8250_dw.c
5891  rename drivers/tty/serial/{bfin_5xx.c => bfin_uart.c} (97%)
5892 $ git reset --hard HEAD^
5893 HEAD is now at 89d3e45 Merge remote-tracking branch 'driver-core/driver-core-next'
5894 Merging refs/next/20110823/tty
5895 $ git merge refs/next/20110823/tty
5896 Already up-to-date.
5897 Merging usb/usb-next
5898 $ git merge usb/usb-next
5899 Auto-merging MAINTAINERS
5900 Auto-merging arch/arm/mach-mmp/pxa168.c
5901 Auto-merging drivers/usb/core/hub.c
5902 Auto-merging drivers/usb/host/ehci-hub.c
5903 Auto-merging drivers/usb/host/ehci-s5p.c
5904 Merge made by recursive.
5905  Documentation/usb/dwc3.txt              |   53 +
5906  MAINTAINERS                             |    8 +
5907  arch/arm/mach-mmp/include/mach/pxa168.h |    7 +
5908  arch/arm/mach-mmp/pxa168.c              |   46 +
5909  drivers/usb/Kconfig                     |    3 +
5910  drivers/usb/Makefile                    |    2 +
5911  drivers/usb/core/hub.c                  |    5 -
5912  drivers/usb/dwc3/Kconfig                |   25 +
5913  drivers/usb/dwc3/Makefile               |   36 +
5914  drivers/usb/dwc3/core.c                 |  467 +++++++
5915  drivers/usb/dwc3/core.h                 |  709 +++++++++++
5916  drivers/usb/dwc3/debug.h                |   51 +
5917  drivers/usb/dwc3/debugfs.c              |  534 ++++++++
5918  drivers/usb/dwc3/dwc3-omap.c            |  410 ++++++
5919  drivers/usb/dwc3/dwc3-pci.c             |  219 ++++
5920  drivers/usb/dwc3/ep0.c                  |  782 ++++++++++++
5921  drivers/usb/dwc3/gadget.c               | 2063 +++++++++++++++++++++++++++++++
5922  drivers/usb/dwc3/gadget.h               |  292 +++++
5923  drivers/usb/dwc3/io.h                   |   55 +
5924  drivers/usb/gadget/Kconfig              |   12 +
5925  drivers/usb/gadget/gadget_chips.h       |    3 +
5926  drivers/usb/gadget/s3c-hsudc.c          |   49 +-
5927  drivers/usb/host/Kconfig                |    7 +
5928  drivers/usb/host/ehci-au1xxx.c          |    2 +-
5929  drivers/usb/host/ehci-dbg.c             |   17 +-
5930  drivers/usb/host/ehci-fsl.c             |    4 +-
5931  drivers/usb/host/ehci-hcd.c             |   30 +-
5932  drivers/usb/host/ehci-hub.c             |   10 +-
5933  drivers/usb/host/ehci-pci.c             |    2 +-
5934  drivers/usb/host/ehci-pxa168.c          |  363 ++++++
5935  drivers/usb/host/ehci-q.c               |   22 +-
5936  drivers/usb/host/ehci-s5p.c             |    2 +-
5937  drivers/usb/host/ehci-sched.c           |   11 +-
5938  drivers/usb/host/ehci-xls.c             |  161 +++
5939  drivers/usb/host/ehci.h                 |    7 +
5940  drivers/usb/host/isp1362-hcd.c          |    6 +-
5941  drivers/usb/host/isp1760-hcd.c          |  401 ++++---
5942  drivers/usb/host/isp1760-hcd.h          |    3 +-
5943  drivers/usb/host/ohci-hcd.c             |    5 +
5944  drivers/usb/host/ohci-omap3.c           |    2 +-
5945  drivers/usb/host/ohci-xls.c             |  151 +++
5946  drivers/usb/misc/usblcd.c               |  127 ++-
5947  drivers/usb/misc/usbled.c               |   25 +-
5948  drivers/usb/otg/twl6030-usb.c           |   16 -
5949  drivers/usb/renesas_usbhs/pipe.c        |    2 +-
5950  drivers/usb/serial/ipw.c                |   33 +-
5951  drivers/usb/storage/usb.c               |   16 +-
5952  include/linux/usb/ch9.h                 |   17 +
5953  48 files changed, 6972 insertions(+), 301 deletions(-)
5954  create mode 100644 Documentation/usb/dwc3.txt
5955  create mode 100644 drivers/usb/dwc3/Kconfig
5956  create mode 100644 drivers/usb/dwc3/Makefile
5957  create mode 100644 drivers/usb/dwc3/core.c
5958  create mode 100644 drivers/usb/dwc3/core.h
5959  create mode 100644 drivers/usb/dwc3/debug.h
5960  create mode 100644 drivers/usb/dwc3/debugfs.c
5961  create mode 100644 drivers/usb/dwc3/dwc3-omap.c
5962  create mode 100644 drivers/usb/dwc3/dwc3-pci.c
5963  create mode 100644 drivers/usb/dwc3/ep0.c
5964  create mode 100644 drivers/usb/dwc3/gadget.c
5965  create mode 100644 drivers/usb/dwc3/gadget.h
5966  create mode 100644 drivers/usb/dwc3/io.h
5967  create mode 100644 drivers/usb/host/ehci-pxa168.c
5968  create mode 100644 drivers/usb/host/ehci-xls.c
5969  create mode 100644 drivers/usb/host/ohci-xls.c
5970 $ git am -3 ../patches/0001-usb-include-module.h-in-the-DesignWare-USB3-DRD-driv.patch
5971 Applying: usb: include module.h in the DesignWare USB3 DRD driver
5972 $ git reset HEAD^
5973 Unstaged changes after reset:
5974 M       drivers/usb/dwc3/dwc3-pci.c
5975 $ git add .
5976 $ git commit -v -a --amend
5977 [master fd90adc] Merge remote-tracking branch 'usb/usb-next'
5978 Merging staging/staging-next
5979 $ git merge staging/staging-next
5980 Recorded preimage for 'drivers/staging/xgifb/XGI_main_26.c'
5981 Auto-merging drivers/staging/Kconfig
5982 Auto-merging drivers/staging/Makefile
5983 Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_linux.c
5984 Removing drivers/staging/brcm80211/brcmsmac/bmac.c
5985 Removing drivers/staging/brcm80211/brcmsmac/bmac.h
5986 Auto-merging drivers/staging/brcm80211/brcmsmac/otp.c
5987 Auto-merging drivers/staging/brcm80211/brcmsmac/types.h
5988 Auto-merging drivers/staging/et131x/et131x_netdev.c
5989 Removing drivers/staging/iio/accel/accel.h
5990 Removing drivers/staging/iio/accel/inclinometer.h
5991 Removing drivers/staging/iio/adc/adc.h
5992 Removing drivers/staging/iio/gyro/gyro.h
5993 Removing drivers/staging/iio/magnetometer/magnet.h
5994 Auto-merging drivers/staging/vt6655/device_main.c
5995 Auto-merging drivers/staging/vt6656/main_usb.c
5996 Auto-merging drivers/staging/xgifb/XGI_main_26.c
5997 CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_main_26.c
5998 Auto-merging drivers/staging/zcache/zcache-main.c
5999 Automatic merge failed; fix conflicts and then commit the result.
6000 $ git commit -v -a
6001 Recorded resolution for 'drivers/staging/xgifb/XGI_main_26.c'.
6002 [master c786e6e] Merge remote-tracking branch 'staging/staging-next'
6003 $ git diff -M --stat --summary HEAD^..
6004  drivers/staging/Kconfig                            |    2 +
6005  drivers/staging/Makefile                           |    1 +
6006  drivers/staging/altera-stapl/altera.c              |    2 +-
6007  drivers/staging/bcm/Bcmchar.c                      | 3170 ++++++-------
6008  drivers/staging/bcm/Macros.h                       |  337 +-
6009  drivers/staging/bcm/headers.h                      |    2 +
6010  drivers/staging/bcm/nvm.c                          |   13 +-
6011  drivers/staging/brcm80211/Kconfig                  |    7 +-
6012  drivers/staging/brcm80211/TODO                     |    4 -
6013  drivers/staging/brcm80211/brcmfmac/bcmsdh.c        |  539 +--
6014  drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c  |  965 +---
6015  drivers/staging/brcm80211/brcmfmac/dhd.h           |  228 +-
6016  drivers/staging/brcm80211/brcmfmac/dhd_common.c    |  128 +-
6017  drivers/staging/brcm80211/brcmfmac/dhd_linux.c     |  235 +-
6018  drivers/staging/brcm80211/brcmfmac/dhd_sdio.c      | 1635 ++-----
6019  drivers/staging/brcm80211/brcmfmac/sdio_host.h     |  278 +-
6020  drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c   |  244 +-
6021  drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h   |   14 +-
6022  drivers/staging/brcm80211/brcmsmac/Makefile        |    1 -
6023  drivers/staging/brcm80211/brcmsmac/aiutils.c       |  773 ++--
6024  drivers/staging/brcm80211/brcmsmac/aiutils.h       |   58 +-
6025  drivers/staging/brcm80211/brcmsmac/alloc.c         |    9 +-
6026  drivers/staging/brcm80211/brcmsmac/ampdu.c         |  230 +-
6027  drivers/staging/brcm80211/brcmsmac/antsel.c        |   25 +-
6028  drivers/staging/brcm80211/brcmsmac/bmac.c          | 3593 --------------
6029  drivers/staging/brcm80211/brcmsmac/bmac.h          |  174 -
6030  drivers/staging/brcm80211/brcmsmac/channel.c       |  388 +-
6031  drivers/staging/brcm80211/brcmsmac/channel.h       |   25 +-
6032  drivers/staging/brcm80211/brcmsmac/d11.h           |  641 ++-
6033  drivers/staging/brcm80211/brcmsmac/dma.c           |  961 ++---
6034  drivers/staging/brcm80211/brcmsmac/dma.h           |  186 +-
6035  drivers/staging/brcm80211/brcmsmac/mac80211_if.c   |  171 +-
6036  drivers/staging/brcm80211/brcmsmac/mac80211_if.h   |   17 +-
6037  drivers/staging/brcm80211/brcmsmac/main.c          | 4867 ++++++++++++++++---
6038  drivers/staging/brcm80211/brcmsmac/main.h          |  852 ++--
6039  drivers/staging/brcm80211/brcmsmac/nicpci.c        |   75 +-
6040  drivers/staging/brcm80211/brcmsmac/nicpci.h        |   30 +-
6041  drivers/staging/brcm80211/brcmsmac/otp.c           |  154 +-
6042  drivers/staging/brcm80211/brcmsmac/otp.h           |   15 +-
6043  drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c   |  589 +--
6044  drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h   |   85 +-
6045  drivers/staging/brcm80211/brcmsmac/phy/phy_int.h   |  188 +-
6046  drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c   |  582 ++--
6047  drivers/staging/brcm80211/brcmsmac/phy/phy_n.c     | 5114 ++++++++++----------
6048  drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.c |  172 +-
6049  .../staging/brcm80211/brcmsmac/phy/phytbl_lcn.c    | 1168 ++---
6050  drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.c  |    3 +-
6051  drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.h  |   24 +-
6052  drivers/staging/brcm80211/brcmsmac/phy_shim.c      |   24 +-
6053  drivers/staging/brcm80211/brcmsmac/phy_shim.h      |   69 +-
6054  drivers/staging/brcm80211/brcmsmac/pmu.c           |   54 +-
6055  drivers/staging/brcm80211/brcmsmac/pub.h           |  272 +-
6056  drivers/staging/brcm80211/brcmsmac/rate.c          |  163 +-
6057  drivers/staging/brcm80211/brcmsmac/rate.h          |  186 +-
6058  drivers/staging/brcm80211/brcmsmac/scb.h           |   36 +-
6059  drivers/staging/brcm80211/brcmsmac/srom.c          |  114 +-
6060  drivers/staging/brcm80211/brcmsmac/srom.h          |    4 +-
6061  drivers/staging/brcm80211/brcmsmac/stf.c           |  100 +-
6062  drivers/staging/brcm80211/brcmsmac/stf.h           |    6 +-
6063  drivers/staging/brcm80211/brcmsmac/types.h         |  279 +-
6064  drivers/staging/brcm80211/brcmutil/utils.c         |  110 +-
6065  drivers/staging/brcm80211/brcmutil/wifi.c          |   37 +-
6066  drivers/staging/brcm80211/include/brcmu_utils.h    |   19 +-
6067  drivers/staging/brcm80211/include/brcmu_wifi.h     |  135 +-
6068  drivers/staging/brcm80211/include/chipcommon.h     |   13 +-
6069  drivers/staging/brcm80211/include/defs.h           |   18 +-
6070  drivers/staging/brcm80211/include/soc.h            |    5 +-
6071  drivers/staging/comedi/Kconfig                     |   18 +-
6072  drivers/staging/comedi/comedi_fops.c               |    2 +-
6073  drivers/staging/comedi/drivers/Makefile            |    1 +
6074  drivers/staging/comedi/drivers/adv_pci_dio.c       |    2 +-
6075  drivers/staging/comedi/drivers/ni_labpc.c          |   20 +-
6076  drivers/staging/comedi/drivers/ni_pcidio.c         |    2 +-
6077  drivers/staging/comedi/drivers/usbduxsigma.c       | 2880 +++++++++++
6078  drivers/staging/cxd2099/Makefile                   |    6 +-
6079  drivers/staging/easycap/easycap_ioctl.c            |   30 +-
6080  drivers/staging/et131x/et1310_eeprom.c             |   32 +-
6081  drivers/staging/et131x/et1310_mac.c                |  379 +-
6082  drivers/staging/et131x/et1310_phy.c                |  556 +--
6083  drivers/staging/et131x/et1310_pm.c                 |   48 +-
6084  drivers/staging/et131x/et1310_rx.c                 |  625 ++--
6085  drivers/staging/et131x/et1310_rx.h                 |   62 +-
6086  drivers/staging/et131x/et1310_tx.c                 |  464 +-
6087  drivers/staging/et131x/et131x.h                    |   74 +-
6088  drivers/staging/et131x/et131x_adapter.h            |   95 +-
6089  drivers/staging/et131x/et131x_initpci.c            |  165 +-
6090  drivers/staging/et131x/et131x_isr.c                |   57 +-
6091  drivers/staging/et131x/et131x_netdev.c             |  137 +-
6092  drivers/staging/ft1000/ft1000-pcmcia/ft1000.h      |   10 +
6093  drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c   |    8 +-
6094  drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c |    3 +-
6095  drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c   |   24 +-
6096  drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c |    4 +-
6097  drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      |    2 +-
6098  drivers/staging/go7007/Makefile                    |    8 +-
6099  drivers/staging/go7007/wis-tw2804.c                |    6 +-
6100  drivers/staging/hv/hv.c                            |    4 +-
6101  drivers/staging/hv/hv_mouse.c                      |   40 +-
6102  drivers/staging/hv/tools/hv_kvp_daemon.c           |   19 +-
6103  drivers/staging/hv/vmbus_drv.c                     |   19 +-
6104  drivers/staging/iio/Documentation/sysfs-bus-iio    |   23 +-
6105  .../iio/Documentation/sysfs-bus-iio-adc-ad7280a    |   21 +
6106  .../sysfs-bus-iio-impedance-analyzer-ad5933        |   30 +
6107  drivers/staging/iio/Kconfig                        |    1 +
6108  drivers/staging/iio/Makefile                       |    1 +
6109  drivers/staging/iio/accel/accel.h                  |   87 -
6110  drivers/staging/iio/accel/adis16201_core.c         |    4 -
6111  drivers/staging/iio/accel/adis16201_ring.c         |   15 +-
6112  drivers/staging/iio/accel/adis16201_trigger.c      |   13 +-
6113  drivers/staging/iio/accel/adis16203_core.c         |    3 -
6114  drivers/staging/iio/accel/adis16203_ring.c         |    8 -
6115  drivers/staging/iio/accel/adis16203_trigger.c      |   14 +-
6116  drivers/staging/iio/accel/adis16204_core.c         |   47 +-
6117  drivers/staging/iio/accel/adis16204_ring.c         |    8 -
6118  drivers/staging/iio/accel/adis16204_trigger.c      |   14 +-
6119  drivers/staging/iio/accel/adis16209_core.c         |    3 -
6120  drivers/staging/iio/accel/adis16209_ring.c         |    8 -
6121  drivers/staging/iio/accel/adis16209_trigger.c      |   14 +-
6122  drivers/staging/iio/accel/adis16220_core.c         |  342 +-
6123  drivers/staging/iio/accel/adis16240_core.c         |    2 -
6124  drivers/staging/iio/accel/adis16240_ring.c         |    8 -
6125  drivers/staging/iio/accel/adis16240_trigger.c      |   14 +-
6126  drivers/staging/iio/accel/inclinometer.h           |   25 -
6127  drivers/staging/iio/accel/kxsd9.c                  |  268 +-
6128  drivers/staging/iio/accel/lis3l02dq_core.c         |   26 +-
6129  drivers/staging/iio/accel/lis3l02dq_ring.c         |   15 +-
6130  drivers/staging/iio/accel/sca3000_core.c           |   19 +-
6131  drivers/staging/iio/accel/sca3000_ring.c           |   71 -
6132  drivers/staging/iio/adc/Kconfig                    |   24 +
6133  drivers/staging/iio/adc/Makefile                   |    2 +
6134  drivers/staging/iio/adc/ad7150.c                   |   10 +-
6135  drivers/staging/iio/adc/ad7192.c                   | 1189 +++++
6136  drivers/staging/iio/adc/ad7192.h                   |   47 +
6137  drivers/staging/iio/adc/ad7280a.c                  |  992 ++++
6138  drivers/staging/iio/adc/ad7280a.h                  |   38 +
6139  drivers/staging/iio/adc/ad7298_core.c              |    1 -
6140  drivers/staging/iio/adc/ad7298_ring.c              |    3 -
6141  drivers/staging/iio/adc/ad7476_core.c              |    1 -
6142  drivers/staging/iio/adc/ad7476_ring.c              |    2 -
6143  drivers/staging/iio/adc/ad7606_core.c              |    1 -
6144  drivers/staging/iio/adc/ad7606_ring.c              |    2 -
6145  drivers/staging/iio/adc/ad7780.c                   |    1 -
6146  drivers/staging/iio/adc/ad7793.c                   |    1 -
6147  drivers/staging/iio/adc/ad7816.c                   |    2 +-
6148  drivers/staging/iio/adc/ad7887_core.c              |    2 +-
6149  drivers/staging/iio/adc/ad7887_ring.c              |    3 -
6150  drivers/staging/iio/adc/ad799x_core.c              |   13 +-
6151  drivers/staging/iio/adc/ad799x_ring.c              |    3 -
6152  drivers/staging/iio/adc/adc.h                      |   42 -
6153  drivers/staging/iio/adc/adt75.c                    |    2 +-
6154  drivers/staging/iio/adc/max1363_core.c             |   19 +-
6155  drivers/staging/iio/adc/max1363_ring.c             |    4 -
6156  drivers/staging/iio/addac/adt7316.c                |    2 +-
6157  drivers/staging/iio/dac/ad5504.c                   |    4 +-
6158  drivers/staging/iio/dac/ad5791.c                   |    1 -
6159  drivers/staging/iio/dds/ad9852.c                   |    1 -
6160  drivers/staging/iio/dds/ad9910.c                   |    1 -
6161  drivers/staging/iio/dds/ad9951.c                   |    1 -
6162  drivers/staging/iio/gyro/adis16060_core.c          |  115 +-
6163  drivers/staging/iio/gyro/adis16080_core.c          |   92 +-
6164  drivers/staging/iio/gyro/adis16130_core.c          |  144 +-
6165  drivers/staging/iio/gyro/adis16260_core.c          |    2 -
6166  drivers/staging/iio/gyro/adis16260_ring.c          |    8 -
6167  drivers/staging/iio/gyro/adis16260_trigger.c       |   14 +-
6168  drivers/staging/iio/gyro/adxrs450_core.c           |  252 +-
6169  drivers/staging/iio/gyro/gyro.h                    |   85 -
6170  drivers/staging/iio/iio.h                          |   91 +-
6171  drivers/staging/iio/iio_core.h                     |   48 +
6172  drivers/staging/iio/impedance-analyzer/Kconfig     |   16 +
6173  drivers/staging/iio/impedance-analyzer/Makefile    |    5 +
6174  drivers/staging/iio/impedance-analyzer/ad5933.c    |  818 ++++
6175  drivers/staging/iio/impedance-analyzer/ad5933.h    |   28 +
6176  drivers/staging/iio/imu/adis16400_core.c           |   72 +-
6177  drivers/staging/iio/imu/adis16400_ring.c           |    8 -
6178  drivers/staging/iio/imu/adis16400_trigger.c        |   14 +-
6179  drivers/staging/iio/industrialio-core.c            |  209 +-
6180  drivers/staging/iio/industrialio-ring.c            |    1 +
6181  drivers/staging/iio/industrialio-trigger.c         |   17 +-
6182  drivers/staging/iio/light/isl29018.c               |   46 +
6183  drivers/staging/iio/light/tsl2563.c                |    4 +-
6184  drivers/staging/iio/light/tsl2583.c                |  220 +-
6185  drivers/staging/iio/magnetometer/ak8975.c          |  214 +-
6186  drivers/staging/iio/magnetometer/hmc5843.c         |   96 +-
6187  drivers/staging/iio/magnetometer/magnet.h          |   31 -
6188  drivers/staging/iio/meter/ade7758_ring.c           |    9 -
6189  drivers/staging/iio/meter/ade7758_trigger.c        |   16 +-
6190  drivers/staging/iio/meter/ade7854.c                |    2 +-
6191  drivers/staging/iio/resolver/ad2s1210.c            |    1 -
6192  drivers/staging/iio/resolver/ad2s90.c              |    1 -
6193  drivers/staging/iio/sysfs.h                        |   79 +-
6194  drivers/staging/iio/trigger.h                      |   36 +-
6195  drivers/staging/iio/trigger/iio-trig-bfin-timer.c  |    6 +-
6196  drivers/staging/iio/trigger/iio-trig-gpio.c        |    6 +-
6197  .../staging/iio/trigger/iio-trig-periodic-rtc.c    |    7 +-
6198  drivers/staging/iio/trigger/iio-trig-sysfs.c       |    6 +-
6199  drivers/staging/keucr/scsiglue.c                   |    5 +-
6200  drivers/staging/keucr/smil.h                       |    6 +-
6201  drivers/staging/keucr/smilsub.c                    | 1574 ++-----
6202  drivers/staging/keucr/smscsi.c                     |  117 +-
6203  drivers/staging/mei/interrupt.c                    |    6 +
6204  drivers/staging/mei/main.c                         |   30 +-
6205  drivers/staging/nvec/nvec_kbd.c                    |   22 +-
6206  drivers/staging/olpc_dcon/olpc_dcon.c              |   43 +-
6207  drivers/staging/pohmelfs/trans.c                   |    6 +-
6208  drivers/staging/rtl8187se/Makefile                 |    6 +-
6209  drivers/staging/rtl8187se/ieee80211/ieee80211.h    |    4 +-
6210  .../rtl8187se/ieee80211/ieee80211_softmac.c        |   14 +-
6211  drivers/staging/rtl8187se/r8180_rtl8225z2.c        |    4 +-
6212  drivers/staging/rtl8192u/ieee80211/compress.c      |    4 +-
6213  drivers/staging/rtl8192u/ieee80211/ieee80211.h     |    4 +-
6214  .../staging/rtl8192u/ieee80211/ieee80211_softmac.c |   14 +-
6215  drivers/staging/rtl8712/big_endian.h               |   25 +
6216  drivers/staging/rtl8712/drv_types.h                |    5 +
6217  drivers/staging/rtl8712/ethernet.h                 |   25 +
6218  drivers/staging/rtl8712/generic.h                  |   25 +
6219  drivers/staging/rtl8712/if_ether.h                 |   25 +
6220  drivers/staging/rtl8712/little_endian.h            |   25 +
6221  drivers/staging/rtl8712/mlme_osdep.h               |   25 +
6222  drivers/staging/rtl8712/mp_custom_oid.h            |   25 +
6223  drivers/staging/rtl8712/os_intfs.c                 |   14 +
6224  drivers/staging/rtl8712/osdep_service.h            |    1 -
6225  drivers/staging/rtl8712/recv_osdep.h               |   25 +
6226  drivers/staging/rtl8712/rtl8712_bitdef.h           |   21 +
6227  drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h   |   19 +
6228  drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h   |   19 +
6229  drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h |   19 +
6230  drivers/staging/rtl8712/rtl8712_debugctrl_regdef.h |   19 +
6231  .../staging/rtl8712/rtl8712_edcasetting_bitdef.h   |   25 +
6232  .../staging/rtl8712/rtl8712_edcasetting_regdef.h   |   19 +
6233  drivers/staging/rtl8712/rtl8712_fifoctrl_bitdef.h  |   19 +
6234  drivers/staging/rtl8712/rtl8712_fifoctrl_regdef.h  |   19 +
6235  drivers/staging/rtl8712/rtl8712_gp_bitdef.h        |   25 +
6236  drivers/staging/rtl8712/rtl8712_gp_regdef.h        |   25 +
6237  drivers/staging/rtl8712/rtl8712_hal.h              |   25 +
6238  drivers/staging/rtl8712/rtl8712_interrupt_bitdef.h |   19 +
6239  .../staging/rtl8712/rtl8712_macsetting_bitdef.h    |   19 +
6240  .../staging/rtl8712/rtl8712_macsetting_regdef.h    |   19 +
6241  drivers/staging/rtl8712/rtl8712_powersave_bitdef.h |   19 +
6242  drivers/staging/rtl8712/rtl8712_powersave_regdef.h |   19 +
6243  drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h  |   19 +
6244  drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h  |   25 +
6245  drivers/staging/rtl8712/rtl8712_regdef.h           |   25 +
6246  drivers/staging/rtl8712/rtl8712_security_bitdef.h  |   19 +
6247  drivers/staging/rtl8712/rtl8712_spec.h             |   25 +
6248  drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h    |   25 +
6249  drivers/staging/rtl8712/rtl8712_syscfg_regdef.h    |   25 +
6250  drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h  |   19 +
6251  drivers/staging/rtl8712/rtl8712_timectrl_regdef.h  |   19 +
6252  drivers/staging/rtl8712/rtl8712_wmac_bitdef.h      |   25 +
6253  drivers/staging/rtl8712/rtl8712_wmac_regdef.h      |   25 +
6254  drivers/staging/rtl8712/rtl871x_byteorder.h        |   19 +
6255  drivers/staging/rtl8712/rtl871x_eeprom.h           |   19 +
6256  drivers/staging/rtl8712/rtl871x_event.h            |   25 +
6257  drivers/staging/rtl8712/rtl871x_ht.h               |   25 +
6258  drivers/staging/rtl8712/rtl871x_ioctl_linux.c      |   28 +-
6259  drivers/staging/rtl8712/rtl871x_ioctl_set.h        |   25 +
6260  drivers/staging/rtl8712/rtl871x_mp.h               |   25 +
6261  drivers/staging/rtl8712/rtl871x_pwrctrl.h          |   25 +
6262  drivers/staging/rtl8712/rtl871x_rf.h               |   25 +
6263  drivers/staging/rtl8712/rtl871x_security.h         |   25 +
6264  drivers/staging/rtl8712/rtl871x_wlan_sme.h         |   25 +
6265  drivers/staging/rtl8712/swab.h                     |   25 +
6266  drivers/staging/rtl8712/usb_ops.h                  |   25 +
6267  drivers/staging/rtl8712/usb_osintf.h               |   25 +
6268  drivers/staging/rtl8712/usb_vendor_req.h           |   25 +
6269  drivers/staging/rts5139/Kconfig                    |   16 +
6270  drivers/staging/rts5139/Makefile                   |   37 +
6271  drivers/staging/rts5139/TODO                       |    5 +
6272  drivers/staging/rts5139/debug.h                    |   46 +
6273  drivers/staging/rts5139/ms.c                       | 4190 ++++++++++++++++
6274  drivers/staging/rts5139/ms.h                       |  263 +
6275  drivers/staging/rts5139/ms_mg.c                    |  642 +++
6276  drivers/staging/rts5139/ms_mg.h                    |   41 +
6277  drivers/staging/rts5139/rts51x.c                   |  967 ++++
6278  drivers/staging/rts5139/rts51x.h                   |  205 +
6279  drivers/staging/rts5139/rts51x_card.c              |  986 ++++
6280  drivers/staging/rts5139/rts51x_card.h              |  881 ++++
6281  drivers/staging/rts5139/rts51x_chip.c              | 1167 +++++
6282  drivers/staging/rts5139/rts51x_chip.h              |  904 ++++
6283  drivers/staging/rts5139/rts51x_fop.c               |  298 ++
6284  drivers/staging/rts5139/rts51x_fop.h               |   62 +
6285  drivers/staging/rts5139/rts51x_scsi.c              | 2233 +++++++++
6286  drivers/staging/rts5139/rts51x_scsi.h              |  162 +
6287  drivers/staging/rts5139/rts51x_sys.h               |   54 +
6288  drivers/staging/rts5139/rts51x_transport.c         | 1000 ++++
6289  drivers/staging/rts5139/rts51x_transport.h         |   80 +
6290  drivers/staging/rts5139/sd.c                       | 3400 +++++++++++++
6291  drivers/staging/rts5139/sd.h                       |  304 ++
6292  drivers/staging/rts5139/sd_cprm.c                  | 1215 +++++
6293  drivers/staging/rts5139/sd_cprm.h                  |   54 +
6294  drivers/staging/rts5139/trace.h                    |  137 +
6295  drivers/staging/rts5139/xd.c                       | 2254 +++++++++
6296  drivers/staging/rts5139/xd.h                       |  193 +
6297  drivers/staging/rts_pstor/Makefile                 |    2 +-
6298  drivers/staging/rts_pstor/rtsx_scsi.c              |    2 +-
6299  drivers/staging/rts_pstor/sd.c                     |    4 +-
6300  drivers/staging/rts_pstor/spi.c                    |    2 +-
6301  drivers/staging/serqt_usb2/serqt_usb2.c            |   34 +-
6302  drivers/staging/spectra/ffsport.c                  |   15 +-
6303  drivers/staging/tidspbridge/gen/gh.c               |    2 +-
6304  drivers/staging/usbip/stub.h                       |    5 +
6305  drivers/staging/usbip/stub_dev.c                   |    6 +-
6306  drivers/staging/usbip/stub_rx.c                    |    5 +-
6307  drivers/staging/usbip/usbip_protocol.txt           |  358 ++
6308  .../staging/usbip/userspace/libsrc/vhci_driver.c   |    2 +-
6309  drivers/staging/usbip/userspace/src/usbip_attach.c |    4 +-
6310  drivers/staging/usbip/vhci.h                       |    5 +
6311  drivers/staging/vme/bridges/vme_ca91cx42.c         |   24 +
6312  drivers/staging/vme/bridges/vme_tsi148.c           |   24 +
6313  drivers/staging/vme/devices/vme_user.c             |    4 +-
6314  drivers/staging/vme/vme.c                          |   74 +-
6315  drivers/staging/vme/vme_bridge.h                   |   11 +-
6316  drivers/staging/vt6655/IEEE11h.c                   |  406 +-
6317  drivers/staging/vt6655/device_main.c               |   10 +-
6318  drivers/staging/vt6655/dpc.c                       |   30 +-
6319  drivers/staging/vt6655/wmgr.c                      |   49 +-
6320  drivers/staging/vt6656/dpc.c                       |   30 +-
6321  drivers/staging/vt6656/main_usb.c                  |   11 +-
6322  drivers/staging/vt6656/wmgr.c                      |   49 +-
6323  drivers/staging/winbond/phy_calibration.c          |   12 +-
6324  drivers/staging/xgifb/XGI_main.h                   |  117 +-
6325  drivers/staging/xgifb/XGI_main_26.c                |  545 +--
6326  drivers/staging/xgifb/XGIfb.h                      |   12 -
6327  drivers/staging/xgifb/vb_def.h                     |  590 +---
6328  drivers/staging/xgifb/vb_ext.h                     |   20 -
6329  drivers/staging/xgifb/vb_setmode.c                 |    3 -
6330  drivers/staging/xgifb/vb_struct.h                  |   71 -
6331  drivers/staging/xgifb/vb_table.h                   |  729 ---
6332  drivers/staging/xgifb/vgatypes.h                   |    5 -
6333  drivers/staging/zcache/zcache-main.c               |    6 +-
6334  drivers/staging/zram/zram_drv.c                    |   36 +-
6335  drivers/staging/zram/zram_drv.h                    |    4 +-
6336  drivers/staging/zram/zram_sysfs.c                  |    4 +-
6337  333 files changed, 47433 insertions(+), 23487 deletions(-)
6338  delete mode 100644 drivers/staging/brcm80211/brcmsmac/bmac.c
6339  delete mode 100644 drivers/staging/brcm80211/brcmsmac/bmac.h
6340  create mode 100644 drivers/staging/comedi/drivers/usbduxsigma.c
6341  create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-adc-ad7280a
6342  create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-impedance-analyzer-ad5933
6343  delete mode 100644 drivers/staging/iio/accel/accel.h
6344  delete mode 100644 drivers/staging/iio/accel/inclinometer.h
6345  create mode 100644 drivers/staging/iio/adc/ad7192.c
6346  create mode 100644 drivers/staging/iio/adc/ad7192.h
6347  create mode 100644 drivers/staging/iio/adc/ad7280a.c
6348  create mode 100644 drivers/staging/iio/adc/ad7280a.h
6349  delete mode 100644 drivers/staging/iio/adc/adc.h
6350  delete mode 100644 drivers/staging/iio/gyro/gyro.h
6351  create mode 100644 drivers/staging/iio/iio_core.h
6352  create mode 100644 drivers/staging/iio/impedance-analyzer/Kconfig
6353  create mode 100644 drivers/staging/iio/impedance-analyzer/Makefile
6354  create mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.c
6355  create mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.h
6356  delete mode 100644 drivers/staging/iio/magnetometer/magnet.h
6357  create mode 100644 drivers/staging/rts5139/Kconfig
6358  create mode 100644 drivers/staging/rts5139/Makefile
6359  create mode 100644 drivers/staging/rts5139/TODO
6360  create mode 100644 drivers/staging/rts5139/debug.h
6361  create mode 100644 drivers/staging/rts5139/ms.c
6362  create mode 100644 drivers/staging/rts5139/ms.h
6363  create mode 100644 drivers/staging/rts5139/ms_mg.c
6364  create mode 100644 drivers/staging/rts5139/ms_mg.h
6365  create mode 100644 drivers/staging/rts5139/rts51x.c
6366  create mode 100644 drivers/staging/rts5139/rts51x.h
6367  create mode 100644 drivers/staging/rts5139/rts51x_card.c
6368  create mode 100644 drivers/staging/rts5139/rts51x_card.h
6369  create mode 100644 drivers/staging/rts5139/rts51x_chip.c
6370  create mode 100644 drivers/staging/rts5139/rts51x_chip.h
6371  create mode 100644 drivers/staging/rts5139/rts51x_fop.c
6372  create mode 100644 drivers/staging/rts5139/rts51x_fop.h
6373  create mode 100644 drivers/staging/rts5139/rts51x_scsi.c
6374  create mode 100644 drivers/staging/rts5139/rts51x_scsi.h
6375  create mode 100644 drivers/staging/rts5139/rts51x_sys.h
6376  create mode 100644 drivers/staging/rts5139/rts51x_transport.c
6377  create mode 100644 drivers/staging/rts5139/rts51x_transport.h
6378  create mode 100644 drivers/staging/rts5139/sd.c
6379  create mode 100644 drivers/staging/rts5139/sd.h
6380  create mode 100644 drivers/staging/rts5139/sd_cprm.c
6381  create mode 100644 drivers/staging/rts5139/sd_cprm.h
6382  create mode 100644 drivers/staging/rts5139/trace.h
6383  create mode 100644 drivers/staging/rts5139/xd.c
6384  create mode 100644 drivers/staging/rts5139/xd.h
6385  create mode 100644 drivers/staging/usbip/usbip_protocol.txt
6386 Merging bkl-config/config
6387 $ git merge bkl-config/config
6388 Already up-to-date.
6389 Merging tmem/linux-next
6390 $ git merge tmem/linux-next
6391 Auto-merging include/linux/swap.h
6392 Auto-merging mm/Kconfig
6393 Auto-merging mm/swapfile.c
6394 Merge made by recursive.
6395  .../ABI/testing/sysfs-kernel-mm-frontswap          |   16 +
6396  Documentation/vm/frontswap.txt                     |  210 ++++++++++++
6397  include/linux/frontswap.h                          |   92 ++++++
6398  include/linux/swap.h                               |    2 +
6399  include/linux/swapfile.h                           |   13 +
6400  mm/Kconfig                                         |   17 +
6401  mm/Makefile                                        |    1 +
6402  mm/frontswap.c                                     |  335 ++++++++++++++++++++
6403  mm/page_io.c                                       |   12 +
6404  mm/swapfile.c                                      |   65 +++-
6405  10 files changed, 751 insertions(+), 12 deletions(-)
6406  create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-frontswap
6407  create mode 100644 Documentation/vm/frontswap.txt
6408  create mode 100644 include/linux/frontswap.h
6409  create mode 100644 include/linux/swapfile.h
6410  create mode 100644 mm/frontswap.c
6411 Merging writeback/next
6412 $ git merge writeback/next
6413 Merge made by recursive.
6414  include/linux/writeback.h |   11 -----------
6415  mm/page-writeback.c       |   15 ++-------------
6416  2 files changed, 2 insertions(+), 24 deletions(-)
6417 Merging arm-dt/devicetree/arm-next
6418 $ git merge arm-dt/devicetree/arm-next
6419 Already up-to-date.
6420 Merging moduleh/module.h-split
6421 $ git merge moduleh/module.h-split
6422 Auto-merging arch/arm/common/scoop.c
6423 Auto-merging arch/arm/kernel/setup.c
6424 Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
6425 Auto-merging arch/arm/mach-ixp2000/core.c
6426 Auto-merging arch/arm/mach-ixp4xx/common-pci.c
6427 Auto-merging arch/arm/mach-msm/io.c
6428 Auto-merging arch/arm/mach-omap1/board-ams-delta.c
6429 Auto-merging arch/arm/mach-omap1/board-sx1.c
6430 Auto-merging arch/arm/mach-omap1/board-voiceblue.c
6431 Auto-merging arch/arm/mach-orion5x/dns323-setup.c
6432 Auto-merging arch/arm/plat-samsung/dev-ts.c
6433 Auto-merging arch/arm/plat-samsung/platformdata.c
6434 Auto-merging arch/mips/bcm47xx/gpio.c
6435 Auto-merging arch/mips/bcm47xx/setup.c
6436 Auto-merging arch/mips/kernel/traps.c
6437 Auto-merging arch/sparc/kernel/pcic.c
6438 Auto-merging arch/x86/kernel/cpu/amd.c
6439 Auto-merging drivers/ata/libata-eh.c
6440 Auto-merging drivers/base/power/main.c
6441 Auto-merging drivers/base/power/runtime.c
6442 Auto-merging drivers/bcma/core.c
6443 Auto-merging drivers/bcma/driver_chipcommon.c
6444 Auto-merging drivers/bcma/driver_pci.c
6445 Auto-merging drivers/bcma/main.c
6446 Auto-merging drivers/char/virtio_console.c
6447 Auto-merging drivers/clocksource/sh_cmt.c
6448 Auto-merging drivers/firmware/google/gsmi.c
6449 Auto-merging drivers/gpio/gpio-ep93xx.c
6450 Auto-merging drivers/hid/hid-axff.c
6451 Auto-merging drivers/hid/hid-debug.c
6452 Auto-merging drivers/hid/hid-picolcd.c
6453 Auto-merging drivers/hid/hid-sjoy.c
6454 Auto-merging drivers/hid/usbhid/hid-quirks.c
6455 Auto-merging drivers/input/input-polldev.c
6456 Auto-merging drivers/input/misc/ad714x.c
6457 Auto-merging drivers/leds/leds-asic3.c
6458 Auto-merging drivers/md/dm-raid.c
6459 Auto-merging drivers/md/md.c
6460 Auto-merging drivers/md/raid5.c
6461 Auto-merging drivers/mfd/ab3550-core.c
6462 Auto-merging drivers/mfd/asic3.c
6463 Auto-merging drivers/mfd/max8997.c
6464 Auto-merging drivers/mfd/twl6030-irq.c
6465 Auto-merging drivers/mfd/wm8400-core.c
6466 Auto-merging drivers/misc/ti-st/st_kim.c
6467 Auto-merging drivers/mmc/core/debugfs.c
6468 Auto-merging drivers/mmc/core/host.c
6469 Auto-merging drivers/mmc/core/sd.c
6470 Auto-merging drivers/mmc/host/sdhci-tegra.c
6471 Auto-merging drivers/mmc/host/sh_mobile_sdhi.c
6472 Auto-merging drivers/mtd/ar7part.c
6473 Auto-merging drivers/mtd/cmdlinepart.c
6474 Auto-merging drivers/mtd/mtdsuper.c
6475 Auto-merging drivers/mtd/nand/cafe_nand.c
6476 Auto-merging drivers/mtd/nand/cmx270_nand.c
6477 Auto-merging drivers/mtd/nand/diskonchip.c
6478 Auto-merging drivers/mtd/nand/nand_bbt.c
6479 Auto-merging drivers/mtd/nand/omap2.c
6480 Auto-merging drivers/mtd/onenand/onenand_bbt.c
6481 Auto-merging drivers/mtd/redboot.c
6482 Auto-merging drivers/net/ethernet/mellanox/mlx4/alloc.c
6483 Auto-merging drivers/net/ethernet/mellanox/mlx4/catas.c
6484 Auto-merging drivers/net/ethernet/mellanox/mlx4/cmd.c
6485 Auto-merging drivers/net/ethernet/mellanox/mlx4/cq.c
6486 Auto-merging drivers/net/ethernet/mellanox/mlx4/eq.c
6487 Auto-merging drivers/net/ethernet/mellanox/mlx4/fw.c
6488 Auto-merging drivers/net/ethernet/mellanox/mlx4/intf.c
6489 Auto-merging drivers/net/ethernet/mellanox/mlx4/mr.c
6490 Auto-merging drivers/net/ethernet/mellanox/mlx4/pd.c
6491 Auto-merging drivers/net/ethernet/mellanox/mlx4/port.c
6492 Auto-merging drivers/net/ethernet/mellanox/mlx4/qp.c
6493 Auto-merging drivers/net/ethernet/mellanox/mlx4/srq.c
6494 Auto-merging drivers/pci/hotplug/pcihp_slot.c
6495 Auto-merging drivers/pci/setup-res.c
6496 Auto-merging drivers/power/max17042_battery.c
6497 Auto-merging drivers/power/max8903_charger.c
6498 Auto-merging drivers/power/max8997_charger.c
6499 Auto-merging drivers/power/max8998_charger.c
6500 Auto-merging drivers/power/power_supply_sysfs.c
6501 Auto-merging drivers/regulator/88pm8607.c
6502 Auto-merging drivers/rtc/interface.c
6503 Auto-merging drivers/s390/cio/qdio_debug.c
6504 Auto-merging drivers/staging/altera-stapl/altera.c
6505 Auto-merging drivers/staging/brcm80211/brcmutil/wifi.c
6506 Auto-merging drivers/staging/iio/accel/adis16201_core.c
6507 Auto-merging drivers/staging/iio/accel/adis16203_core.c
6508 Auto-merging drivers/staging/iio/accel/adis16204_core.c
6509 Auto-merging drivers/staging/iio/accel/adis16209_core.c
6510 Auto-merging drivers/staging/iio/accel/adis16220_core.c
6511 CONFLICT (content): Merge conflict in drivers/staging/iio/accel/adis16220_core.c
6512 Auto-merging drivers/staging/iio/accel/adis16240_core.c
6513 Auto-merging drivers/staging/iio/accel/kxsd9.c
6514 Auto-merging drivers/staging/iRecorded preimage for 'drivers/staging/iio/accel/adis16220_core.c'
6515 Resolved 'include/linux/dmaengine.h' using previous resolution.
6516 io/accel/lis3l02dq_core.c
6517 Auto-merging drivers/staging/iio/accel/sca3000_core.c
6518 Auto-merging drivers/staging/iio/adc/ad7150.c
6519 Auto-merging drivers/staging/iio/adc/ad7298_core.c
6520 Auto-merging drivers/staging/iio/adc/ad7476_core.c
6521 Auto-merging drivers/staging/iio/adc/ad7606_core.c
6522 Auto-merging drivers/staging/iio/adc/ad7780.c
6523 Auto-merging drivers/staging/iio/adc/ad7816.c
6524 Auto-merging drivers/staging/iio/adc/ad7887_core.c
6525 Auto-merging drivers/staging/iio/adc/ad799x_core.c
6526 Auto-merging drivers/staging/iio/adc/adt75.c
6527 Auto-merging drivers/staging/iio/adc/max1363_core.c
6528 Auto-merging drivers/staging/iio/addac/adt7316.c
6529 Auto-merging drivers/staging/iio/dac/ad5504.c
6530 Auto-merging drivers/staging/iio/dac/ad5791.c
6531 Auto-merging drivers/staging/iio/dds/ad9852.c
6532 Auto-merging drivers/staging/iio/dds/ad9910.c
6533 Auto-merging drivers/staging/iio/dds/ad9951.c
6534 Auto-merging drivers/staging/iio/gyro/adis16060_core.c
6535 Auto-merging drivers/staging/iio/gyro/adis16080_core.c
6536 Auto-merging drivers/staging/iio/gyro/adis16130_core.c
6537 Auto-merging drivers/staging/iio/gyro/adis16260_core.c
6538 Auto-merging drivers/staging/iio/gyro/adxrs450_core.c
6539 Auto-merging drivers/staging/iio/imu/adis16400_core.c
6540 Auto-merging drivers/staging/iio/industrialio-ring.c
6541 Auto-merging drivers/staging/iio/light/tsl2583.c
6542 Auto-merging drivers/staging/iio/meter/ade7854.c
6543 Auto-merging drivers/staging/iio/resolver/ad2s1210.c
6544 Auto-merging drivers/staging/iio/resolver/ad2s90.c
6545 Auto-merging drivers/staging/iio/trigger.h
6546 Auto-merging drivers/staging/olpc_dcon/olpc_dcon.c
6547 Auto-merging drivers/staging/usbip/stub_dev.c
6548 Auto-merging drivers/tty/serial/max3107-aava.c
6549 Auto-merging drivers/tty/serial/max3107.c
6550 Auto-merging drivers/uio/uio_pdrv_genirq.c
6551 Auto-merging drivers/usb/core/driver.c
6552 Auto-merging drivers/usb/host/xhci-hub.c
6553 Auto-merging drivers/video/atmel_lcdfb.c
6554 Auto-merging drivers/video/carminefb.c
6555 Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
6556 Auto-merging drivers/video/msm/mdp.c
6557 Auto-merging drivers/xen/balloon.c
6558 Auto-merging drivers/xen/swiotlb-xen.c
6559 Auto-merging drivers/xen/xen-selfballoon.c
6560 Auto-merging drivers/xen/xenbus/xenbus_probe.c
6561 Auto-merging fs/exofs/super.c
6562 Auto-merging fs/jfs/jfs_logmgr.c
6563 Auto-merging fs/logfs/super.c
6564 Auto-merging include/linux/bcma/bcma.h
6565 Auto-merging include/linux/blkdev.h
6566 Auto-merging include/linux/device.h
6567 Auto-merging include/linux/dmaengine.h
6568 CONFLICT (content): Merge conflict in include/linux/dmaengine.h
6569 Auto-merging include/linux/hid.h
6570 Auto-merging include/linux/mtd/mtd.h
6571 Auto-merging include/linux/pm_runtime.h
6572 Auto-merging include/net/lib80211.h
6573 Auto-merging include/net/sock.h
6574 Auto-merging kernel/cgroup_freezer.c
6575 Auto-merging kernel/crash_dump.c
6576 Auto-merging kernel/cred.c
6577 Auto-merging kernel/exit.c
6578 Auto-merging kernel/fork.c
6579 Auto-merging kernel/freezer.c
6580 Auto-merging kernel/kthread.c
6581 Auto-merging kernel/lockdep.c
6582 Auto-merging kernel/pid.c
6583 Auto-merging kernel/power/hibernate.c
6584 Auto-merging kernel/power/main.c
6585 Auto-merging kernel/power/suspend.c
6586 Auto-merging kernel/rcupdate.c
6587 Auto-merging kernel/rcutiny.c
6588 Auto-merging kernel/rcutorture.c
6589 Auto-merging kernel/rcutree.c
6590 Auto-merging kernel/rcutree_trace.c
6591 Auto-merging kernel/rtmutex.c
6592 Auto-merging kernel/sched.c
6593 Auto-merging kernel/trace/blktrace.c
6594 Auto-merging mm/swapfile.c
6595 Automatic merge failed; fix conflicts and then commit the result.
6596 $ git commit -v -a
6597 Recorded resolution for 'drivers/staging/iio/accel/adis16220_core.c'.
6598 [master 009d78a] Merge remote-tracking branch 'moduleh/module.h-split'
6599 $ git diff -M --stat --summary HEAD^..
6600  arch/alpha/kernel/core_irongate.c                  |    1 +
6601  arch/alpha/kernel/pci-sysfs.c                      |    1 +
6602  arch/alpha/kernel/pci_iommu.c                      |    1 +
6603  arch/alpha/kernel/setup.c                          |    1 +
6604  arch/arm/common/it8152.c                           |    1 +
6605  arch/arm/common/scoop.c                            |    1 +
6606  arch/arm/kernel/armksyms.c                         |    2 +-
6607  arch/arm/kernel/bios32.c                           |    2 +-
6608  arch/arm/kernel/devtree.c                          |    2 +-
6609  arch/arm/kernel/elf.c                              |    2 +-
6610  arch/arm/kernel/io.c                               |    2 +-
6611  arch/arm/kernel/irq.c                              |    1 -
6612  arch/arm/kernel/leds.c                             |    3 +-
6613  arch/arm/kernel/perf_event.c                       |    2 +-
6614  arch/arm/kernel/pj4-cp0.c                          |    1 -
6615  arch/arm/kernel/process.c                          |    2 +-
6616  arch/arm/kernel/ptrace.c                           |    1 +
6617  arch/arm/kernel/return_address.c                   |    2 +-
6618  arch/arm/kernel/setup.c                            |    2 +-
6619  arch/arm/kernel/stacktrace.c                       |    2 +-
6620  arch/arm/kernel/sys_arm.c                          |    2 +-
6621  arch/arm/kernel/time.c                             |    2 +-
6622  arch/arm/kernel/unwind.c                           |    2 +-
6623  arch/arm/kernel/xscale-cp0.c                       |    1 -
6624  arch/arm/mach-at91/cpuidle.c                       |    1 +
6625  arch/arm/mach-bcmring/dma.c                        |    1 +
6626  arch/arm/mach-bcmring/mm.c                         |    1 +
6627  arch/arm/mach-davinci/board-dm644x-evm.c           |    1 +
6628  arch/arm/mach-davinci/board-dm646x-evm.c           |    1 +
6629  arch/arm/mach-davinci/cdce949.c                    |    1 +
6630  arch/arm/mach-davinci/cpufreq.c                    |    1 +
6631  arch/arm/mach-davinci/cpuidle.c                    |    1 +
6632  arch/arm/mach-ep93xx/core.c                        |    1 +
6633  arch/arm/mach-exynos4/dev-sysmmu.c                 |    1 +
6634  arch/arm/mach-footbridge/dc21285.c                 |    1 +
6635  arch/arm/mach-imx/mach-mx31lilly.c                 |    1 +
6636  arch/arm/mach-imx/mach-mx31lite.c                  |    1 +
6637  arch/arm/mach-imx/mach-mx31moboard.c               |    1 +
6638  arch/arm/mach-iop13xx/pci.c                        |    1 +
6639  arch/arm/mach-ixp2000/core.c                       |    1 +
6640  arch/arm/mach-ixp4xx/common-pci.c                  |    1 +
6641  arch/arm/mach-ixp4xx/common.c                      |    1 +
6642  arch/arm/mach-kirkwood/cpuidle.c                   |    1 +
6643  arch/arm/mach-msm/io.c                             |    1 +
6644  arch/arm/mach-netx/xc.c                            |    1 +
6645  arch/arm/mach-omap1/board-ams-delta.c              |    1 +
6646  arch/arm/mach-omap1/board-sx1.c                    |    1 +
6647  arch/arm/mach-omap1/board-voiceblue.c              |    1 +
6648  arch/arm/mach-omap1/mailbox.c                      |    1 +
6649  arch/arm/mach-omap2/board-omap3evm.c               |    1 +
6650  arch/arm/mach-omap2/clockdomain.c                  |    1 +
6651  arch/arm/mach-omap2/display.c                      |    1 +
6652  arch/arm/mach-omap2/gpmc-onenand.c                 |    1 +
6653  arch/arm/mach-omap2/pm.c                           |    1 +
6654  arch/arm/mach-omap2/prcm.c                         |    1 +
6655  arch/arm/mach-omap2/usb-tusb6010.c                 |    2 +
6656  arch/arm/mach-omap2/voltage.c                      |    1 +
6657  arch/arm/mach-orion5x/dns323-setup.c               |    2 +-
6658  arch/arm/mach-orion5x/pci.c                        |    1 +
6659  arch/arm/mach-pxa/corgi.c                          |    1 +
6660  arch/arm/mach-pxa/poodle.c                         |    1 +
6661  arch/arm/mach-pxa/spitz.c                          |    1 +
6662  arch/arm/mach-s3c2410/mach-h1940.c                 |    1 +
6663  arch/arm/mach-s3c64xx/dev-audio.c                  |    1 +
6664  arch/arm/mach-sa1100/collie.c                      |    1 +
6665  arch/arm/mach-sa1100/jornada720.c                  |    1 +
6666  arch/arm/mach-shmobile/clock.c                     |    1 +
6667  arch/arm/mach-tegra/pcie.c                         |    1 +
6668  arch/arm/mm/fault-armv.c                           |    1 -
6669  arch/arm/mm/init.c                                 |    1 +
6670  arch/arm/plat-iop/gpio.c                           |    1 +
6671  arch/arm/plat-iop/time.c                           |    1 +
6672  arch/arm/plat-omap/clock.c                         |    1 +
6673  arch/arm/plat-omap/mailbox.c                       |    1 +
6674  arch/arm/plat-s3c24xx/devs.c                       |    1 +
6675  arch/arm/plat-s5p/dev-ehci.c                       |    1 +
6676  arch/arm/plat-s5p/dev-onenand.c                    |    2 +
6677  arch/arm/plat-samsung/dev-adc.c                    |    2 +
6678  arch/arm/plat-samsung/dev-asocdma.c                |    1 +
6679  arch/arm/plat-samsung/dev-backlight.c              |    1 +
6680  arch/arm/plat-samsung/dev-ide.c                    |    2 +
6681  arch/arm/plat-samsung/dev-nand.c                   |    1 +
6682  arch/arm/plat-samsung/dev-pwm.c                    |    1 +
6683  arch/arm/plat-samsung/dev-rtc.c                    |    1 +
6684  arch/arm/plat-samsung/dev-ts.c                     |    2 +
6685  arch/arm/plat-samsung/dev-usb.c                    |    1 +
6686  arch/arm/plat-samsung/dev-wdt.c                    |    3 +
6687  arch/arm/plat-samsung/platformdata.c               |    1 +
6688  arch/arm/vfp/vfpmodule.c                           |    1 -
6689  arch/avr32/mach-at32ap/clock.c                     |    1 +
6690  arch/avr32/mach-at32ap/cpufreq.c                   |    1 +
6691  arch/avr32/mach-at32ap/intc.c                      |    1 +
6692  arch/avr32/mach-at32ap/pio.c                       |    1 +
6693  arch/avr32/mm/dma-coherent.c                       |    1 +
6694  arch/blackfin/kernel/dma-mapping.c                 |    1 +
6695  arch/blackfin/kernel/perf_event.c                  |    1 +
6696  arch/blackfin/kernel/sys_bfin.c                    |    1 +
6697  arch/blackfin/mach-bf518/boards/ezbrd.c            |    1 +
6698  arch/blackfin/mach-bf527/boards/ad7160eval.c       |    1 +
6699  arch/blackfin/mach-bf527/boards/ezkit.c            |    1 +
6700  arch/blackfin/mach-bf527/boards/tll6527m.c         |    1 +
6701  arch/blackfin/mach-bf537/boards/dnp5370.c          |    1 +
6702  arch/blackfin/mach-common/cpufreq.c                |    1 +
6703  arch/blackfin/mm/init.c                            |    1 +
6704  arch/ia64/hp/common/hwsw_iommu.c                   |    1 +
6705  arch/ia64/kernel/dma-mapping.c                     |    1 +
6706  arch/ia64/kernel/topology.c                        |    1 +
6707  arch/ia64/sn/kernel/io_init.c                      |    1 +
6708  arch/ia64/sn/pci/pcibr/pcibr_dma.c                 |    1 +
6709  arch/ia64/sn/pci/pcibr/pcibr_provider.c            |    1 +
6710  arch/ia64/sn/pci/tioca_provider.c                  |    1 +
6711  arch/m68k/atari/time.c                             |    1 +
6712  arch/m68k/kernel/dma_mm.c                          |    1 +
6713  arch/m68k/kernel/dma_no.c                          |    1 +
6714  arch/mips/bcm47xx/gpio.c                           |    1 +
6715  arch/mips/bcm47xx/setup.c                          |    1 +
6716  arch/mips/cavium-octeon/csrc-octeon.c              |    1 +
6717  arch/mips/cavium-octeon/dma-octeon.c               |    1 +
6718  arch/mips/cavium-octeon/flash_setup.c              |    1 +
6719  arch/mips/kernel/8250-platform.c                   |    1 -
6720  arch/mips/kernel/cpu-probe.c                       |    3 +-
6721  arch/mips/kernel/i8253.c                           |    2 +-
6722  arch/mips/kernel/init_task.c                       |    2 +-
6723  arch/mips/kernel/irq-msc01.c                       |    1 -
6724  arch/mips/kernel/irq.c                             |    1 -
6725  arch/mips/kernel/mips-mt.c                         |    2 +-
6726  arch/mips/kernel/mips_ksyms.c                      |    2 +-
6727  arch/mips/kernel/module.c                          |    1 -
6728  arch/mips/kernel/process.c                         |    2 +-
6729  arch/mips/kernel/prom.c                            |    2 +-
6730  arch/mips/kernel/reset.c                           |    2 +-
6731  arch/mips/kernel/rtlx.c                            |    1 -
6732  arch/mips/kernel/setup.c                           |    2 +-
6733  arch/mips/kernel/spinlock_test.c                   |    2 +-
6734  arch/mips/kernel/stacktrace.c                      |    2 +-
6735  arch/mips/kernel/time.c                            |    2 +-
6736  arch/mips/kernel/traps.c                           |    1 -
6737  arch/mips/kernel/unaligned.c                       |    1 -
6738  arch/mips/kernel/vpe.c                             |    1 -
6739  arch/mips/loongson/common/platform.c               |    1 +
6740  arch/mips/pci/pci-ip27.c                           |    1 +
6741  arch/mips/pci/pci.c                                |    1 +
6742  arch/mips/powertv/pci/fixup-powertv.c              |    1 +
6743  arch/mips/powertv/powertv-usb.c                    |    1 +
6744  arch/mips/rb532/gpio.c                             |    1 +
6745  arch/mips/rb532/setup.c                            |    1 +
6746  arch/mips/txx9/generic/spi_eeprom.c                |    1 +
6747  arch/mips/txx9/rbtx4939/setup.c                    |    1 +
6748  arch/mips/vr41xx/common/giu.c                      |    1 +
6749  arch/mips/vr41xx/common/rtc.c                      |    1 +
6750  arch/parisc/kernel/drivers.c                       |    1 +
6751  arch/parisc/kernel/pci-dma.c                       |    1 +
6752  arch/parisc/kernel/setup.c                         |    1 +
6753  arch/parisc/lib/iomap.c                            |    1 +
6754  arch/powerpc/include/asm/lv1call.h                 |    1 +
6755  arch/powerpc/include/asm/machdep.h                 |    1 +
6756  arch/powerpc/include/asm/spu.h                     |    1 +
6757  arch/powerpc/kernel/btext.c                        |    2 +-
6758  arch/powerpc/kernel/clock.c                        |    2 +-
6759  arch/powerpc/kernel/cputable.c                     |    2 +-
6760  arch/powerpc/kernel/crash.c                        |    1 +
6761  arch/powerpc/kernel/dma-iommu.c                    |    1 +
6762  arch/powerpc/kernel/dma.c                          |    1 +
6763  arch/powerpc/kernel/firmware.c                     |    3 +-
6764  arch/powerpc/kernel/hw_breakpoint.c                |    1 -
6765  arch/powerpc/kernel/ibmebus.c                      |    2 +
6766  arch/powerpc/kernel/init_task.c                    |    2 +-
6767  arch/powerpc/kernel/io-workarounds.c               |    1 +
6768  arch/powerpc/kernel/io.c                           |    2 +-
6769  arch/powerpc/kernel/iomap.c                        |    1 +
6770  arch/powerpc/kernel/irq.c                          |    2 +-
6771  arch/powerpc/kernel/isa-bridge.c                   |    1 +
6772  arch/powerpc/kernel/kvm.c                          |    1 +
6773  arch/powerpc/kernel/module.c                       |    1 -
6774  arch/powerpc/kernel/of_platform.c                  |    2 +-
6775  arch/powerpc/kernel/paca.c                         |    2 +-
6776  arch/powerpc/kernel/pci-common.c                   |    1 +
6777  arch/powerpc/kernel/pci_32.c                       |    1 +
6778  arch/powerpc/kernel/pci_64.c                       |    1 +
6779  arch/powerpc/kernel/pci_dn.c                       |    1 +
6780  arch/powerpc/kernel/pci_of_scan.c                  |    1 +
6781  arch/powerpc/kernel/pmc.c                          |    2 +-
6782  arch/powerpc/kernel/ppc_ksyms.c                    |    2 +-
6783  arch/powerpc/kernel/process.c                      |    2 +-
6784  arch/powerpc/kernel/prom.c                         |    2 +-
6785  arch/powerpc/kernel/prom_parse.c                   |    1 -
6786  arch/powerpc/kernel/ptrace.c                       |    1 -
6787  arch/powerpc/kernel/rtas.c                         |    2 +-
6788  arch/powerpc/kernel/setup-common.c                 |    2 +-
6789  arch/powerpc/kernel/setup_64.c                     |    2 +-
6790  arch/powerpc/kernel/signal_64.c                    |    1 -
6791  arch/powerpc/kernel/smp.c                          |    2 +-
6792  arch/powerpc/kernel/stacktrace.c                   |    2 +-
6793  arch/powerpc/kernel/swsusp_64.c                    |    1 +
6794  arch/powerpc/kernel/sysfs.c                        |    2 +-
6795  arch/powerpc/kernel/time.c                         |    2 +-
6796  arch/powerpc/kernel/vdso.c                         |    1 -
6797  arch/powerpc/kernel/vio.c                          |    3 +-
6798  arch/powerpc/kvm/44x.c                             |    1 +
6799  arch/powerpc/kvm/book3s.c                          |    1 +
6800  arch/powerpc/kvm/book3s_exports.c                  |    2 +-
6801  arch/powerpc/kvm/book3s_hv.c                       |    1 +
6802  arch/powerpc/kvm/book3s_hv_builtin.c               |    1 +
6803  arch/powerpc/kvm/book3s_pr.c                       |    1 +
6804  arch/powerpc/kvm/powerpc.c                         |    1 -
6805  arch/powerpc/lib/checksum_wrappers_64.c            |    2 +-
6806  arch/powerpc/lib/devres.c                          |    2 +-
6807  arch/powerpc/lib/locks.c                           |    2 +-
6808  arch/powerpc/lib/rheap.c                           |    2 +-
6809  arch/powerpc/mm/dma-noncoherent.c                  |    1 +
6810  arch/powerpc/mm/hash_utils_64.c                    |    1 +
6811  arch/powerpc/mm/mem.c                              |    2 +-
6812  arch/powerpc/mm/mmu_context_hash32.c               |    1 +
6813  arch/powerpc/mm/mmu_context_hash64.c               |    2 +-
6814  arch/powerpc/mm/numa.c                             |    2 +-
6815  arch/powerpc/mm/pgtable_64.c                       |    1 +
6816  arch/powerpc/mm/slice.c                            |    2 +-
6817  arch/powerpc/mm/tlb_hash32.c                       |    1 +
6818  arch/powerpc/mm/tlb_nohash.c                       |    1 +
6819  arch/powerpc/platforms/44x/warp.c                  |    1 +
6820  arch/powerpc/platforms/512x/clock.c                |    1 +
6821  arch/powerpc/platforms/52xx/mpc52xx_common.c       |    1 +
6822  arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c      |    1 +
6823  arch/powerpc/platforms/83xx/suspend.c              |    1 +
6824  arch/powerpc/platforms/85xx/mpc85xx_cds.c          |    1 -
6825  arch/powerpc/platforms/85xx/mpc85xx_mds.c          |    1 -
6826  arch/powerpc/platforms/85xx/sbc8548.c              |    1 -
6827  arch/powerpc/platforms/86xx/gef_gpio.c             |    1 +
6828  arch/powerpc/platforms/8xx/tqm8xx_setup.c          |    1 -
6829  arch/powerpc/platforms/cell/axon_msi.c             |    1 +
6830  arch/powerpc/platforms/cell/beat.c                 |    2 +-
6831  arch/powerpc/platforms/cell/beat_spu_priv1.c       |    2 -
6832  arch/powerpc/platforms/cell/beat_wrapper.h         |    1 +
6833  arch/powerpc/platforms/cell/cbe_cpufreq.c          |    1 +
6834  arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c      |    1 +
6835  arch/powerpc/platforms/cell/cbe_powerbutton.c      |    1 +
6836  arch/powerpc/platforms/cell/cbe_regs.c             |    2 +-
6837  arch/powerpc/platforms/cell/celleb_setup.c         |    1 +
6838  arch/powerpc/platforms/cell/cpufreq_spudemand.c    |    1 +
6839  arch/powerpc/platforms/cell/interrupt.c            |    2 +-
6840  arch/powerpc/platforms/cell/pmu.c                  |    1 +
6841  arch/powerpc/platforms/cell/qpace_setup.c          |    1 +
6842  arch/powerpc/platforms/cell/setup.c                |    1 +
6843  arch/powerpc/platforms/cell/smp.c                  |    1 -
6844  arch/powerpc/platforms/cell/spu_callbacks.c        |    2 +-
6845  arch/powerpc/platforms/cell/spu_fault.c            |    2 +-
6846  arch/powerpc/platforms/cell/spu_manage.c           |    2 +-
6847  arch/powerpc/platforms/cell/spu_notify.c           |    3 +-
6848  arch/powerpc/platforms/cell/spu_priv1_mmio.c       |    1 -
6849  arch/powerpc/platforms/cell/spufs/backing_ops.c    |    1 -
6850  arch/powerpc/platforms/cell/spufs/context.c        |    2 +-
6851  arch/powerpc/platforms/cell/spufs/coredump.c       |    1 -
6852  arch/powerpc/platforms/cell/spufs/fault.c          |    1 -
6853  arch/powerpc/platforms/cell/spufs/file.c           |    2 +-
6854  arch/powerpc/platforms/cell/spufs/hw_ops.c         |    1 -
6855  arch/powerpc/platforms/cell/spufs/sched.c          |    1 -
6856  arch/powerpc/platforms/cell/spufs/switch.c         |    2 +-
6857  arch/powerpc/platforms/cell/spufs/syscalls.c       |    2 +-
6858  arch/powerpc/platforms/embedded6xx/holly.c         |    1 +
6859  arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c  |    1 +
6860  arch/powerpc/platforms/iseries/hvlpconfig.c        |    2 +-
6861  arch/powerpc/platforms/iseries/iommu.c             |    2 +-
6862  arch/powerpc/platforms/iseries/ksyms.c             |    2 +-
6863  arch/powerpc/platforms/iseries/lpardata.c          |    1 -
6864  arch/powerpc/platforms/iseries/lpevents.c          |    2 +-
6865  arch/powerpc/platforms/iseries/mf.c                |    1 +
6866  arch/powerpc/platforms/iseries/pci.c               |    1 -
6867  arch/powerpc/platforms/iseries/setup.c             |    1 +
6868  arch/powerpc/platforms/iseries/smp.c               |    1 -
6869  arch/powerpc/platforms/iseries/vio.c               |    2 +-
6870  arch/powerpc/platforms/iseries/viopath.c           |    2 +-
6871  arch/powerpc/platforms/maple/setup.c               |    1 +
6872  arch/powerpc/platforms/pasemi/cpufreq.c            |    1 +
6873  arch/powerpc/platforms/pasemi/dma_lib.c            |    3 +-
6874  arch/powerpc/platforms/pasemi/setup.c              |    1 +
6875  arch/powerpc/platforms/powermac/backlight.c        |    1 +
6876  arch/powerpc/platforms/powermac/feature.c          |    1 +
6877  arch/powerpc/platforms/powermac/low_i2c.c          |    2 +-
6878  arch/powerpc/platforms/powermac/nvram.c            |    2 +-
6879  arch/powerpc/platforms/powermac/pic.c              |    1 -
6880  arch/powerpc/platforms/powermac/setup.c            |    1 +
6881  arch/powerpc/platforms/ps3/exports.c               |    2 -
6882  arch/powerpc/platforms/ps3/interrupt.c             |    2 +-
6883  arch/powerpc/platforms/ps3/mm.c                    |    2 +-
6884  arch/powerpc/platforms/ps3/os-area.c               |    1 +
6885  arch/powerpc/platforms/ps3/setup.c                 |    1 +
6886  arch/powerpc/platforms/ps3/spu.c                   |    1 +
6887  arch/powerpc/platforms/ps3/system-bus.c            |    2 +-
6888  arch/powerpc/platforms/pseries/eeh.c               |    2 +
6889  arch/powerpc/platforms/pseries/eeh_event.c         |    1 +
6890  arch/powerpc/platforms/pseries/eeh_sysfs.c         |    1 +
6891  arch/powerpc/platforms/pseries/hotplug-cpu.c       |    1 +
6892  arch/powerpc/platforms/pseries/hvconsole.c         |    3 +-
6893  arch/powerpc/platforms/pseries/io_event_irq.c      |    2 +-
6894  arch/powerpc/platforms/pseries/iommu.c             |    1 +
6895  arch/powerpc/platforms/pseries/lpar.c              |    1 +
6896  arch/powerpc/platforms/pseries/mobility.c          |    1 +
6897  arch/powerpc/platforms/pseries/pci_dlpar.c         |    1 +
6898  arch/powerpc/platforms/pseries/plpar_wrappers.h    |    3 +
6899  arch/powerpc/platforms/pseries/setup.c             |    2 +-
6900  arch/powerpc/platforms/pseries/smp.c               |    1 -
6901  arch/powerpc/platforms/pseries/suspend.c           |    1 +
6902  arch/powerpc/sysdev/bestcomm/sram.c                |    2 +-
6903  arch/powerpc/sysdev/cpm_common.c                   |    1 +
6904  arch/powerpc/sysdev/dcr.c                          |    1 +
6905  arch/powerpc/sysdev/fsl_gtm.c                      |    1 +
6906  arch/powerpc/sysdev/fsl_lbc.c                      |    3 +-
6907  arch/powerpc/sysdev/fsl_pmc.c                      |    1 +
6908  arch/powerpc/sysdev/fsl_rio.c                      |    2 +-
6909  arch/powerpc/sysdev/fsl_soc.c                      |    2 +-
6910  arch/powerpc/sysdev/mpc5xxx_clocks.c               |    1 +
6911  arch/powerpc/sysdev/mpc8xx_pic.c                   |    1 -
6912  arch/powerpc/sysdev/mv64x60_pci.c                  |    1 +
6913  arch/powerpc/sysdev/pmi.c                          |    1 +
6914  arch/powerpc/sysdev/ppc4xx_msi.c                   |    1 +
6915  arch/powerpc/sysdev/qe_lib/gpio.c                  |    1 +
6916  arch/powerpc/sysdev/qe_lib/ucc.c                   |    2 +-
6917  arch/powerpc/sysdev/qe_lib/ucc_fast.c              |    2 +-
6918  arch/powerpc/sysdev/qe_lib/ucc_slow.c              |    2 +-
6919  arch/powerpc/sysdev/qe_lib/usb.c                   |    1 +
6920  arch/powerpc/sysdev/rtc_cmos_setup.c               |    1 +
6921  arch/powerpc/sysdev/scom.c                         |    1 +
6922  arch/powerpc/sysdev/simple_gpio.c                  |    1 -
6923  arch/powerpc/sysdev/tsi108_dev.c                   |    2 +-
6924  arch/powerpc/xmon/xmon.c                           |    2 +-
6925  arch/s390/crypto/sha_common.c                      |    1 +
6926  arch/s390/mm/init.c                                |    1 +
6927  arch/sh/drivers/dma/dma-sysfs.c                    |    1 +
6928  arch/sh/drivers/pci/pci.c                          |    1 +
6929  arch/sh/kernel/cpu/shmobile/cpuidle.c              |    1 +
6930  arch/sh/kernel/perf_event.c                        |    1 +
6931  arch/sh/kernel/topology.c                          |    1 +
6932  arch/sh/mm/init.c                                  |    1 +
6933  arch/sparc/include/asm/termios.h                   |    1 -
6934  arch/sparc/kernel/auxio_32.c                       |    1 +
6935  arch/sparc/kernel/btext.c                          |    1 -
6936  arch/sparc/kernel/central.c                        |    1 +
6937  arch/sparc/kernel/cpu.c                            |    2 +-
6938  arch/sparc/kernel/cpumap.c                         |    2 +-
6939  arch/sparc/kernel/dma.c                            |    1 -
6940  arch/sparc/kernel/ebus.c                           |    2 +-
6941  arch/sparc/kernel/hvapi.c                          |    2 +-
6942  arch/sparc/kernel/idprom.c                         |    2 +-
6943  arch/sparc/kernel/iommu.c                          |    2 +-
6944  arch/sparc/kernel/irq_32.c                         |    1 +
6945  arch/sparc/kernel/irq_64.c                         |    1 -
6946  arch/sparc/kernel/ldc.c                            |    2 +-
6947  arch/sparc/kernel/leon_kernel.c                    |    1 -
6948  arch/sparc/kernel/leon_pci_grpci2.c                |    1 -
6949  arch/sparc/kernel/nmi.c                            |    2 +-
6950  arch/sparc/kernel/of_device_32.c                   |    1 -
6951  arch/sparc/kernel/of_device_64.c                   |    3 +-
6952  arch/sparc/kernel/of_device_common.c               |    2 +-
6953  arch/sparc/kernel/pci.c                            |    2 +-
6954  arch/sparc/kernel/pci_fire.c                       |    1 +
6955  arch/sparc/kernel/pci_psycho.c                     |    1 +
6956  arch/sparc/kernel/pci_sabre.c                      |    1 +
6957  arch/sparc/kernel/pci_schizo.c                     |    1 +
6958  arch/sparc/kernel/pci_sun4v.c                      |    1 +
6959  arch/sparc/kernel/pcic.c                           |    1 +
6960  arch/sparc/kernel/pcr.c                            |    3 +-
6961  arch/sparc/kernel/pmc.c                            |    1 +
6962  arch/sparc/kernel/power.c                          |    2 +-
6963  arch/sparc/kernel/process_64.c                     |    2 +-
6964  arch/sparc/kernel/prom_32.c                        |    1 -
6965  arch/sparc/kernel/prom_64.c                        |    1 -
6966  arch/sparc/kernel/prom_common.c                    |    2 +-
6967  arch/sparc/kernel/reboot.c                         |    2 +-
6968  arch/sparc/kernel/sbus.c                           |    1 +
6969  arch/sparc/kernel/setup_32.c                       |    1 +
6970  arch/sparc/kernel/setup_64.c                       |    1 +
6971  arch/sparc/kernel/smp_64.c                         |    2 +-
6972  arch/sparc/kernel/sparc_ksyms_64.c                 |    2 +-
6973  arch/sparc/kernel/stacktrace.c                     |    2 +-
6974  arch/sparc/kernel/sys_sparc32.c                    |    1 -
6975  arch/sparc/kernel/sys_sparc_64.c                   |    2 +-
6976  arch/sparc/kernel/time_64.c                        |    2 +-
6977  arch/sparc/kernel/traps_32.c                       |    1 +
6978  arch/sparc/kernel/unaligned_32.c                   |    1 -
6979  arch/sparc/kernel/vio.c                            |    1 +
6980  arch/sparc/kernel/viohs.c                          |    2 +-
6981  arch/sparc/mm/fault_32.c                           |    1 -
6982  arch/sparc/mm/generic_32.c                         |    1 +
6983  arch/sparc/mm/generic_64.c                         |    1 +
6984  arch/sparc/mm/highmem.c                            |    1 +
6985  arch/sparc/mm/hugetlbpage.c                        |    1 -
6986  arch/x86/crypto/aes_glue.c                         |    1 +
6987  arch/x86/crypto/aesni-intel_glue.c                 |    1 +
6988  arch/x86/kernel/cpu/amd.c                          |    1 +
6989  arch/x86/kernel/cpu/mcheck/therm_throt.c           |    1 +
6990  arch/x86/kernel/devicetree.c                       |    1 +
6991  arch/x86/kernel/e820.c                             |    1 +
6992  arch/x86/kernel/hpet.c                             |    1 +
6993  arch/x86/kernel/irq.c                              |    1 +
6994  arch/x86/kernel/pci-dma.c                          |    1 +
6995  arch/x86/kernel/probe_roms.c                       |    4 +-
6996  arch/x86/kernel/rtc.c                              |    1 +
6997  arch/x86/kernel/smp.c                              |    1 +
6998  arch/x86/kernel/time.c                             |    1 +
6999  arch/x86/kernel/topology.c                         |    1 +
7000  arch/x86/kernel/vsyscall_64.c                      |    1 +
7001  arch/x86/pci/i386.c                                |    1 +
7002  arch/x86/pci/legacy.c                              |    1 +
7003  arch/x86/platform/efi/efi.c                        |    1 +
7004  arch/x86/platform/efi/efi_32.c                     |    1 +
7005  arch/x86/platform/mrst/vrtc.c                      |    1 +
7006  arch/x86/platform/olpc/olpc-xo1-pm.c               |    1 +
7007  arch/x86/platform/uv/bios_uv.c                     |    1 +
7008  arch/x86/power/cpu.c                               |    1 +
7009  arch/x86/video/fbdev.c                             |    1 +
7010  block/blk-integrity.c                              |    1 +
7011  block/ioctl.c                                      |    1 +
7012  crypto/async_tx/async_memcpy.c                     |    1 +
7013  crypto/async_tx/async_pq.c                         |    1 +
7014  crypto/async_tx/async_raid6_recov.c                |    1 +
7015  crypto/async_tx/async_tx.c                         |    1 +
7016  crypto/async_tx/async_xor.c                        |    1 +
7017  crypto/async_tx/raid6test.c                        |    1 +
7018  crypto/crypto_wq.c                                 |    1 +
7019  crypto/md4.c                                       |    1 +
7020  crypto/proc.c                                      |    1 +
7021  crypto/vmac.c                                      |    1 +
7022  crypto/xcbc.c                                      |    1 +
7023  drivers/acpi/acpica/hwsleep.c                      |    1 +
7024  drivers/acpi/ec_sys.c                              |    1 +
7025  drivers/acpi/sbshc.c                               |    1 +
7026  drivers/acpi/sysfs.c                               |    2 +-
7027  drivers/ata/libata-eh.c                            |    1 +
7028  drivers/ata/libata-pmp.c                           |    1 +
7029  drivers/ata/libata-scsi.c                          |    1 +
7030  drivers/ata/libata-sff.c                           |    1 +
7031  drivers/base/base.h                                |    1 +
7032  drivers/base/dma-coherent.c                        |    1 +
7033  drivers/base/dma-mapping.c                         |    1 +
7034  drivers/base/hypervisor.c                          |    1 +
7035  drivers/base/power/generic_ops.c                   |    1 +
7036  drivers/base/power/main.c                          |    1 +
7037  drivers/base/power/runtime.c                       |    1 +
7038  drivers/base/power/sysfs.c                         |    1 +
7039  drivers/base/power/trace.c                         |    1 +
7040  drivers/base/power/wakeup.c                        |    1 +
7041  drivers/base/transport_class.c                     |    1 +
7042  drivers/bcma/core.c                                |    1 +
7043  drivers/bcma/driver_chipcommon.c                   |    1 +
7044  drivers/bcma/driver_pci.c                          |    1 +
7045  drivers/bcma/host_pci.c                            |    1 +
7046  drivers/bcma/main.c                                |    1 +
7047  drivers/block/aoe/aoechr.c                         |    1 +
7048  drivers/block/ps3disk.c                            |    1 +
7049  drivers/block/ps3vram.c                            |    1 +
7050  drivers/block/virtio_blk.c                         |    1 +
7051  drivers/char/hw_random/virtio-rng.c                |    1 +
7052  drivers/char/ramoops.c                             |    1 +
7053  drivers/char/ttyprintk.c                           |    1 +
7054  drivers/char/virtio_console.c                      |    1 +
7055  drivers/clocksource/sh_cmt.c                       |    1 +
7056  drivers/clocksource/sh_mtu2.c                      |    1 +
7057  drivers/clocksource/sh_tmu.c                       |    1 +
7058  drivers/cpufreq/cpufreq_stats.c                    |    1 +
7059  drivers/cpufreq/s3c64xx-cpufreq.c                  |    1 +
7060  drivers/crypto/mv_cesa.c                           |    1 +
7061  drivers/dca/dca-core.c                             |    1 +
7062  drivers/dca/dca-sysfs.c                            |    1 +
7063  drivers/dma/intel_mid_dma.c                        |    1 +
7064  drivers/dma/ipu/ipu_idmac.c                        |    1 +
7065  drivers/dma/ste_dma40.c                            |    1 +
7066  drivers/edac/mce_amd_inj.c                         |    1 +
7067  drivers/firewire/core-iso.c                        |    1 +
7068  drivers/firmware/google/gsmi.c                     |    1 +
7069  drivers/firmware/sigma.c                           |    1 +
7070  drivers/gpio/gpio-74x164.c                         |    1 +
7071  drivers/gpio/gpio-ep93xx.c                         |    1 +
7072  drivers/gpio/gpio-mc33880.c                        |    1 +
7073  drivers/gpio/gpio-mcp23s08.c                       |    1 +
7074  drivers/gpio/gpio-ml-ioh.c                         |    1 +
7075  drivers/gpio/gpio-mpc5200.c                        |    1 +
7076  drivers/gpio/gpio-mxc.c                            |    1 +
7077  drivers/gpio/gpio-mxs.c                            |    1 +
7078  drivers/gpio/gpio-pcf857x.c                        |    1 +
7079  drivers/gpio/gpio-pch.c                            |    1 +
7080  drivers/gpio/gpio-xilinx.c                         |    1 +
7081  drivers/gpu/drm/ttm/ttm_tt.c                       |    1 +
7082  drivers/hid/hid-axff.c                             |    1 +
7083  drivers/hid/hid-debug.c                            |    1 +
7084  drivers/hid/hid-dr.c                               |    1 +
7085  drivers/hid/hid-emsff.c                            |    1 +
7086  drivers/hid/hid-gaff.c                             |    1 +
7087  drivers/hid/hid-holtekff.c                         |    1 +
7088  drivers/hid/hid-picolcd.c                          |    1 +
7089  drivers/hid/hid-pl.c                               |    1 +
7090  drivers/hid/hid-roccat-common.c                    |    1 +
7091  drivers/hid/hid-roccat.c                           |    1 +
7092  drivers/hid/hid-sjoy.c                             |    1 +
7093  drivers/hid/hid-tmff.c                             |    1 +
7094  drivers/hid/hid-zpff.c                             |    1 +
7095  drivers/hid/usbhid/hid-quirks.c                    |    1 +
7096  drivers/hwmon/ultra45_env.c                        |    1 +
7097  drivers/i2c/busses/i2c-pxa-pci.c                   |    1 +
7098  drivers/i2c/busses/i2c-sh7760.c                    |    1 +
7099  drivers/i2c/busses/i2c-tegra.c                     |    1 +
7100  drivers/i2c/i2c-boardinfo.c                        |    1 +
7101  drivers/ide/buddha.c                               |    1 +
7102  drivers/ide/cmd640.c                               |    1 +
7103  drivers/ide/ide-acpi.c                             |    1 +
7104  drivers/ide/ide-atapi.c                            |    1 +
7105  drivers/ide/ide-disk_proc.c                        |    1 +
7106  drivers/ide/ide-dma-sff.c                          |    1 +
7107  drivers/ide/ide-dma.c                              |    1 +
7108  drivers/ide/ide-eh.c                               |    1 +
7109  drivers/ide/ide-floppy_proc.c                      |    1 +
7110  drivers/ide/ide-io-std.c                           |    1 +
7111  drivers/ide/ide-ioctls.c                           |    1 +
7112  drivers/ide/ide-legacy.c                           |    1 +
7113  drivers/ide/ide-lib.c                              |    1 +
7114  drivers/ide/ide-pnp.c                              |    1 +
7115  drivers/ide/ide-taskfile.c                         |    1 +
7116  drivers/ide/ide-xfer-mode.c                        |    1 +
7117  drivers/ide/macide.c                               |    1 +
7118  drivers/ide/pmac.c                                 |    1 +
7119  drivers/ide/q40ide.c                               |    1 +
7120  drivers/ide/setup-pci.c                            |    1 +
7121  drivers/ide/tc86c001.c                             |    1 +
7122  drivers/idle/intel_idle.c                          |    1 +
7123  drivers/infiniband/core/cm.c                       |    1 +
7124  drivers/infiniband/core/fmr_pool.c                 |    1 +
7125  drivers/infiniband/core/mad.c                      |    1 +
7126  drivers/infiniband/core/multicast.c                |    1 +
7127  drivers/infiniband/core/packer.c                   |    1 +
7128  drivers/infiniband/core/sysfs.c                    |    1 +
7129  drivers/infiniband/core/ud_header.c                |    1 +
7130  drivers/infiniband/core/umem.c                     |    1 +
7131  drivers/infiniband/core/uverbs_marshall.c          |    1 +
7132  drivers/infiniband/core/verbs.c                    |    1 +
7133  drivers/infiniband/hw/ipath/ipath_diag.c           |    1 +
7134  drivers/infiniband/hw/ipath/ipath_file_ops.c       |    1 +
7135  drivers/infiniband/hw/ipath/ipath_sysfs.c          |    1 +
7136  drivers/infiniband/hw/ipath/ipath_verbs.c          |    1 +
7137  drivers/infiniband/hw/mthca/mthca_catas.c          |    1 +
7138  drivers/infiniband/hw/mthca/mthca_cmd.c            |    1 +
7139  drivers/infiniband/hw/mthca/mthca_provider.c       |    2 +
7140  drivers/infiniband/hw/qib/qib_diag.c               |    1 +
7141  drivers/infiniband/hw/qib/qib_file_ops.c           |    1 +
7142  drivers/infiniband/hw/qib/qib_iba7220.c            |    1 +
7143  drivers/infiniband/hw/qib/qib_iba7322.c            |    1 +
7144  drivers/infiniband/hw/qib/qib_pcie.c               |    1 +
7145  drivers/infiniband/hw/qib/qib_sd7220.c             |    1 +
7146  drivers/infiniband/hw/qib/qib_verbs.c              |    1 +
7147  drivers/input/input-compat.c                       |    1 +
7148  drivers/input/input-mt.c                           |    1 +
7149  drivers/input/input-polldev.c                      |    1 +
7150  drivers/input/joystick/as5011.c                    |    1 +
7151  drivers/input/keyboard/nomadik-ske-keypad.c        |    1 +
7152  drivers/input/keyboard/tnetv107x-keypad.c          |    1 +
7153  drivers/input/misc/ad714x.c                        |    1 +
7154  drivers/input/misc/adxl34x.c                       |    1 +
7155  drivers/input/misc/ati_remote2.c                   |    1 +
7156  drivers/input/misc/cma3000_d0x.c                   |    1 +
7157  drivers/input/misc/dm355evm_keys.c                 |    1 +
7158  drivers/input/sparse-keymap.c                      |    1 +
7159  drivers/input/touchscreen/ad7877.c                 |    1 +
7160  drivers/input/touchscreen/ad7879-spi.c             |    1 +
7161  drivers/input/touchscreen/ad7879.c                 |    1 +
7162  drivers/input/touchscreen/ads7846.c                |    1 +
7163  drivers/input/touchscreen/bu21013_ts.c             |    1 +
7164  drivers/isdn/capi/kcapi_proc.c                     |    1 +
7165  drivers/leds/dell-led.c                            |    1 +
7166  drivers/leds/leds-88pm860x.c                       |    1 +
7167  drivers/leds/leds-asic3.c                          |    1 +
7168  drivers/leds/leds-atmel-pwm.c                      |    1 +
7169  drivers/leds/leds-cobalt-raq.c                     |    1 +
7170  drivers/leds/leds-fsg.c                            |    1 +
7171  drivers/leds/leds-gpio.c                           |    1 +
7172  drivers/leds/leds-lm3530.c                         |    1 +
7173  drivers/leds/leds-locomo.c                         |    1 +
7174  drivers/leds/leds-lt3593.c                         |    1 +
7175  drivers/leds/leds-net48xx.c                        |    1 +
7176  drivers/leds/leds-net5501.c                        |    1 +
7177  drivers/leds/leds-ns2.c                            |    1 +
7178  drivers/leds/leds-s3c24xx.c                        |    1 +
7179  drivers/leds/leds-wm831x-status.c                  |    1 +
7180  drivers/leds/leds-wm8350.c                         |    1 +
7181  drivers/leds/leds-wrap.c                           |    1 +
7182  drivers/lguest/lguest_device.c                     |    1 +
7183  drivers/md/dm-exception-store.c                    |    1 +
7184  drivers/md/dm-log-userspace-base.c                 |    1 +
7185  drivers/md/dm-path-selector.c                      |    1 +
7186  drivers/md/dm-raid.c                               |    1 +
7187  drivers/md/dm-round-robin.c                        |    1 +
7188  drivers/md/dm-service-time.c                       |    1 +
7189  drivers/md/dm-snap-persistent.c                    |    1 +
7190  drivers/md/dm-snap-transient.c                     |    1 +
7191  drivers/md/dm-uevent.c                             |    1 +
7192  drivers/md/faulty.c                                |    1 +
7193  drivers/md/linear.c                                |    1 +
7194  drivers/md/md.c                                    |    1 +
7195  drivers/md/multipath.c                             |    1 +
7196  drivers/md/raid0.c                                 |    1 +
7197  drivers/md/raid1.c                                 |    1 +
7198  drivers/md/raid10.c                                |    1 +
7199  drivers/md/raid5.c                                 |    1 +
7200  drivers/media/common/saa7146_core.c                |    1 +
7201  drivers/media/common/saa7146_fops.c                |    1 +
7202  drivers/media/common/saa7146_hlp.c                 |    1 +
7203  drivers/media/common/saa7146_video.c               |    1 +
7204  drivers/media/common/tuners/tuner-types.c          |    1 +
7205  drivers/media/dvb/frontends/dibx000_common.c       |    1 +
7206  drivers/media/dvb/siano/sms-cards.c                |    1 +
7207  drivers/media/dvb/siano/smsendian.c                |    1 +
7208  drivers/media/dvb/siano/smssdio.c                  |    1 +
7209  drivers/media/dvb/siano/smsusb.c                   |    1 +
7210  drivers/media/media-device.c                       |    1 +
7211  drivers/media/radio/radio-timb.c                   |    1 +
7212  drivers/media/radio/radio-wl1273.c                 |    1 +
7213  drivers/media/radio/si4713-i2c.c                   |    1 +
7214  drivers/media/radio/wl128x/fmdrv_v4l2.c            |    2 +
7215  drivers/media/rc/ir-jvc-decoder.c                  |    1 +
7216  drivers/media/rc/ir-lirc-codec.c                   |    1 +
7217  drivers/media/rc/ir-nec-decoder.c                  |    1 +
7218  drivers/media/rc/ir-raw.c                          |    2 +
7219  drivers/media/rc/ir-rc5-decoder.c                  |    1 +
7220  drivers/media/rc/ir-rc5-sz-decoder.c               |    1 +
7221  drivers/media/rc/ir-rc6-decoder.c                  |    1 +
7222  drivers/media/rc/ir-sony-decoder.c                 |    1 +
7223  drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c    |    1 +
7224  drivers/media/rc/keymaps/rc-alink-dtu-m.c          |    1 +
7225  drivers/media/rc/keymaps/rc-anysee.c               |    1 +
7226  drivers/media/rc/keymaps/rc-apac-viewcomp.c        |    1 +
7227  drivers/media/rc/keymaps/rc-asus-pc39.c            |    1 +
7228  drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c |    1 +
7229  drivers/media/rc/keymaps/rc-avermedia-a16d.c       |    1 +
7230  drivers/media/rc/keymaps/rc-avermedia-cardbus.c    |    1 +
7231  drivers/media/rc/keymaps/rc-avermedia-dvbt.c       |    1 +
7232  drivers/media/rc/keymaps/rc-avermedia-m135a.c      |    1 +
7233  .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c    |    1 +
7234  drivers/media/rc/keymaps/rc-avermedia-rm-ks.c      |    1 +
7235  drivers/media/rc/keymaps/rc-avermedia.c            |    1 +
7236  drivers/media/rc/keymaps/rc-avertv-303.c           |    1 +
7237  drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c   |    1 +
7238  drivers/media/rc/keymaps/rc-behold-columbus.c      |    1 +
7239  drivers/media/rc/keymaps/rc-behold.c               |    1 +
7240  drivers/media/rc/keymaps/rc-budget-ci-old.c        |    1 +
7241  drivers/media/rc/keymaps/rc-cinergy-1400.c         |    1 +
7242  drivers/media/rc/keymaps/rc-cinergy.c              |    1 +
7243  drivers/media/rc/keymaps/rc-dib0700-nec.c          |    1 +
7244  drivers/media/rc/keymaps/rc-dib0700-rc5.c          |    1 +
7245  drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c  |    1 +
7246  drivers/media/rc/keymaps/rc-digittrade.c           |    1 +
7247  drivers/media/rc/keymaps/rc-dm1105-nec.c           |    1 +
7248  drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c      |    1 +
7249  drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c   |    1 +
7250  drivers/media/rc/keymaps/rc-em-terratec.c          |    1 +
7251  drivers/media/rc/keymaps/rc-encore-enltv-fm53.c    |    1 +
7252  drivers/media/rc/keymaps/rc-encore-enltv.c         |    1 +
7253  drivers/media/rc/keymaps/rc-encore-enltv2.c        |    1 +
7254  drivers/media/rc/keymaps/rc-evga-indtube.c         |    1 +
7255  drivers/media/rc/keymaps/rc-eztv.c                 |    1 +
7256  drivers/media/rc/keymaps/rc-flydvb.c               |    1 +
7257  drivers/media/rc/keymaps/rc-flyvideo.c             |    1 +
7258  drivers/media/rc/keymaps/rc-fusionhdtv-mce.c       |    1 +
7259  drivers/media/rc/keymaps/rc-gadmei-rm008z.c        |    1 +
7260  drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c   |    1 +
7261  drivers/media/rc/keymaps/rc-gotview7135.c          |    1 +
7262  drivers/media/rc/keymaps/rc-hauppauge.c            |    1 +
7263  drivers/media/rc/keymaps/rc-imon-mce.c             |    1 +
7264  drivers/media/rc/keymaps/rc-imon-pad.c             |    1 +
7265  drivers/media/rc/keymaps/rc-iodata-bctv7e.c        |    1 +
7266  drivers/media/rc/keymaps/rc-kaiomy.c               |    1 +
7267  drivers/media/rc/keymaps/rc-kworld-315u.c          |    1 +
7268  .../media/rc/keymaps/rc-kworld-plus-tv-analog.c    |    1 +
7269  drivers/media/rc/keymaps/rc-leadtek-y04g0051.c     |    1 +
7270  drivers/media/rc/keymaps/rc-lirc.c                 |    1 +
7271  drivers/media/rc/keymaps/rc-lme2510.c              |    1 +
7272  drivers/media/rc/keymaps/rc-manli.c                |    1 +
7273  drivers/media/rc/keymaps/rc-msi-digivox-ii.c       |    1 +
7274  drivers/media/rc/keymaps/rc-msi-digivox-iii.c      |    1 +
7275  drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c  |    1 +
7276  drivers/media/rc/keymaps/rc-msi-tvanywhere.c       |    1 +
7277  drivers/media/rc/keymaps/rc-nebula.c               |    1 +
7278  .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c  |    1 +
7279  drivers/media/rc/keymaps/rc-norwood.c              |    1 +
7280  drivers/media/rc/keymaps/rc-npgtech.c              |    1 +
7281  drivers/media/rc/keymaps/rc-pctv-sedna.c           |    1 +
7282  drivers/media/rc/keymaps/rc-pinnacle-color.c       |    1 +
7283  drivers/media/rc/keymaps/rc-pinnacle-grey.c        |    1 +
7284  drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c     |    1 +
7285  drivers/media/rc/keymaps/rc-pixelview-002t.c       |    1 +
7286  drivers/media/rc/keymaps/rc-pixelview-mk12.c       |    1 +
7287  drivers/media/rc/keymaps/rc-pixelview-new.c        |    1 +
7288  drivers/media/rc/keymaps/rc-pixelview.c            |    1 +
7289  .../media/rc/keymaps/rc-powercolor-real-angel.c    |    1 +
7290  drivers/media/rc/keymaps/rc-proteus-2309.c         |    1 +
7291  drivers/media/rc/keymaps/rc-purpletv.c             |    1 +
7292  drivers/media/rc/keymaps/rc-pv951.c                |    1 +
7293  drivers/media/rc/keymaps/rc-rc6-mce.c              |    1 +
7294  .../media/rc/keymaps/rc-real-audio-220-32-keys.c   |    1 +
7295  drivers/media/rc/keymaps/rc-streamzap.c            |    1 +
7296  drivers/media/rc/keymaps/rc-tbs-nec.c              |    1 +
7297  drivers/media/rc/keymaps/rc-technisat-usb2.c       |    1 +
7298  drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c  |    1 +
7299  drivers/media/rc/keymaps/rc-terratec-slim-2.c      |    1 +
7300  drivers/media/rc/keymaps/rc-terratec-slim.c        |    1 +
7301  drivers/media/rc/keymaps/rc-tevii-nec.c            |    1 +
7302  drivers/media/rc/keymaps/rc-tivo.c                 |    1 +
7303  drivers/media/rc/keymaps/rc-total-media-in-hand.c  |    1 +
7304  drivers/media/rc/keymaps/rc-trekstor.c             |    1 +
7305  drivers/media/rc/keymaps/rc-tt-1500.c              |    1 +
7306  drivers/media/rc/keymaps/rc-twinhan1027.c          |    1 +
7307  drivers/media/rc/keymaps/rc-videomate-m1f.c        |    1 +
7308  drivers/media/rc/keymaps/rc-videomate-s350.c       |    1 +
7309  drivers/media/rc/keymaps/rc-videomate-tv-pvr.c     |    1 +
7310  drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c |    1 +
7311  drivers/media/rc/keymaps/rc-winfast.c              |    1 +
7312  drivers/media/rc/rc-main.c                         |    1 +
7313  drivers/media/video/adp1653.c                      |    1 +
7314  drivers/media/video/ak881x.c                       |    1 +
7315  drivers/media/video/cpia2/cpia2_usb.c              |    1 +
7316  drivers/media/video/cx25840/cx25840-ir.c           |    1 +
7317  drivers/media/video/davinci/dm355_ccdc.c           |    1 +
7318  drivers/media/video/davinci/dm644x_ccdc.c          |    1 +
7319  drivers/media/video/hdpvr/hdpvr-i2c.c              |    1 +
7320  drivers/media/video/hexium_gemini.c                |    1 +
7321  drivers/media/video/hexium_orion.c                 |    1 +
7322  drivers/media/video/imx074.c                       |    1 +
7323  drivers/media/video/m5mols/m5mols_core.c           |    1 +
7324  drivers/media/video/mt9m001.c                      |    1 +
7325  drivers/media/video/mt9m111.c                      |    1 +
7326  drivers/media/video/mt9t031.c                      |    1 +
7327  drivers/media/video/mt9v011.c                      |    1 +
7328  drivers/media/video/mt9v022.c                      |    1 +
7329  drivers/media/video/mt9v032.c                      |    1 +
7330  drivers/media/video/mxb.c                          |    1 +
7331  drivers/media/video/noon010pc30.c                  |    1 +
7332  drivers/media/video/omap24xxcam.c                  |    1 +
7333  drivers/media/video/ov6650.c                       |    1 +
7334  drivers/media/video/pvrusb2/pvrusb2-devattr.c      |    1 +
7335  drivers/media/video/pvrusb2/pvrusb2-hdw.c          |    1 +
7336  drivers/media/video/pvrusb2/pvrusb2-i2c-core.c     |    1 +
7337  drivers/media/video/pvrusb2/pvrusb2-v4l2.c         |    1 +
7338  drivers/media/video/rj54n1cb0c.c                   |    1 +
7339  drivers/media/video/sh_mobile_csi2.c               |    1 +
7340  drivers/media/video/sh_vou.c                       |    1 +
7341  drivers/media/video/sr030pc30.c                    |    1 +
7342  drivers/media/video/tcm825x.c                      |    1 +
7343  drivers/media/video/timblogiw.c                    |    1 +
7344  drivers/media/video/tvp514x.c                      |    1 +
7345  drivers/media/video/tvp5150.c                      |    1 +
7346  drivers/media/video/tvp7002.c                      |    1 +
7347  drivers/media/video/usbvision/usbvision-cards.c    |    1 +
7348  drivers/media/video/v4l2-ctrls.c                   |    1 +
7349  drivers/media/video/v4l2-device.c                  |    1 +
7350  drivers/media/video/v4l2-event.c                   |    1 +
7351  drivers/media/video/v4l2-fh.c                      |    1 +
7352  drivers/media/video/v4l2-int-device.c              |    1 +
7353  drivers/media/video/v4l2-subdev.c                  |    1 +
7354  drivers/memstick/core/memstick.c                   |    1 +
7355  drivers/memstick/core/mspro_block.c                |    1 +
7356  drivers/memstick/host/jmb38x_ms.c                  |    1 +
7357  drivers/memstick/host/tifm_ms.c                    |    1 +
7358  drivers/message/i2o/pci.c                          |    1 +
7359  drivers/mfd/ab3100-core.c                          |    1 +
7360  drivers/mfd/ab3550-core.c                          |    1 +
7361  drivers/mfd/ab8500-debugfs.c                       |    1 +
7362  drivers/mfd/ab8500-sysctrl.c                       |    1 +
7363  drivers/mfd/abx500-core.c                          |    1 +
7364  drivers/mfd/asic3.c                                |    1 +
7365  drivers/mfd/dm355evm_msp.c                         |    1 +
7366  drivers/mfd/max8997.c                              |    1 +
7367  drivers/mfd/mfd-core.c                             |    1 +
7368  drivers/mfd/pcf50633-irq.c                         |    1 +
7369  drivers/mfd/tmio_core.c                            |    1 +
7370  drivers/mfd/twl-core.c                             |    1 +
7371  drivers/mfd/twl6030-irq.c                          |    1 +
7372  drivers/mfd/wl1273-core.c                          |    1 +
7373  drivers/mfd/wm8400-core.c                          |    1 +
7374  drivers/misc/ab8500-pwm.c                          |    1 +
7375  drivers/misc/atmel-ssc.c                           |    1 +
7376  drivers/misc/atmel_tclib.c                         |    1 +
7377  drivers/misc/bh1780gli.c                           |    1 +
7378  drivers/misc/kgdbts.c                              |    1 +
7379  drivers/misc/ti-st/st_kim.c                        |    1 +
7380  drivers/misc/tifm_7xx1.c                           |    1 +
7381  drivers/misc/tifm_core.c                           |    1 +
7382  drivers/mmc/card/mmc_test.c                        |    1 +
7383  drivers/mmc/core/bus.c                             |    2 +
7384  drivers/mmc/core/debugfs.c                         |    1 +
7385  drivers/mmc/core/host.c                            |    1 +
7386  drivers/mmc/core/mmc.c                             |    1 +
7387  drivers/mmc/core/mmc_ops.c                         |    1 +
7388  drivers/mmc/core/quirks.c                          |    1 +
7389  drivers/mmc/core/sd.c                              |    1 +
7390  drivers/mmc/core/sd_ops.c                          |    1 +
7391  drivers/mmc/core/sdio_bus.c                        |    1 +
7392  drivers/mmc/core/sdio_io.c                         |    1 +
7393  drivers/mmc/core/sdio_irq.c                        |    1 +
7394  drivers/mmc/host/mmc_spi.c                         |    1 +
7395  drivers/mmc/host/mxs-mmc.c                         |    1 +
7396  drivers/mmc/host/sdhci-of-esdhc.c                  |    1 +
7397  drivers/mmc/host/sdhci-of-hlwd.c                   |    1 +
7398  drivers/mmc/host/sdhci-pci.c                       |    1 +
7399  drivers/mmc/host/sdhci-pltfm.c                     |    1 +
7400  drivers/mmc/host/sdhci-pxav2.c                     |    1 +
7401  drivers/mmc/host/sdhci-pxav3.c                     |    1 +
7402  drivers/mmc/host/sdhci-spear.c                     |    1 +
7403  drivers/mmc/host/sdhci-tegra.c                     |    1 +
7404  drivers/mmc/host/sdhci.c                           |    1 +
7405  drivers/mmc/host/sdricoh_cs.c                      |    1 +
7406  drivers/mmc/host/sh_mmcif.c                        |    1 +
7407  drivers/mmc/host/sh_mobile_sdhi.c                  |    1 +
7408  drivers/mmc/host/tifm_sd.c                         |    1 +
7409  drivers/mmc/host/via-sdmmc.c                       |    1 +
7410  drivers/mtd/ar7part.c                              |    1 +
7411  drivers/mtd/cmdlinepart.c                          |    1 +
7412  drivers/mtd/lpddr/lpddr_cmds.c                     |    1 +
7413  drivers/mtd/mtdblock_ro.c                          |    1 +
7414  drivers/mtd/mtdsuper.c                             |    1 +
7415  drivers/mtd/nand/cafe_nand.c                       |    1 +
7416  drivers/mtd/nand/cmx270_nand.c                     |    1 +
7417  drivers/mtd/nand/diskonchip.c                      |    1 +
7418  drivers/mtd/nand/nand_bbt.c                        |    1 +
7419  drivers/mtd/nand/omap2.c                           |    1 +
7420  drivers/mtd/nand/sm_common.c                       |    1 +
7421  drivers/mtd/onenand/onenand_bbt.c                  |    1 +
7422  drivers/mtd/redboot.c                              |    1 +
7423  drivers/mtd/rfd_ftl.c                              |    1 +
7424  drivers/mtd/ubi/vmt.c                              |    1 +
7425  drivers/net/ethernet/mellanox/mlx4/alloc.c         |    1 +
7426  drivers/net/ethernet/mellanox/mlx4/catas.c         |    1 +
7427  drivers/net/ethernet/mellanox/mlx4/cmd.c           |    1 +
7428  drivers/net/ethernet/mellanox/mlx4/cq.c            |    1 +
7429  drivers/net/ethernet/mellanox/mlx4/eq.c            |    1 +
7430  drivers/net/ethernet/mellanox/mlx4/fw.c            |    1 +
7431  drivers/net/ethernet/mellanox/mlx4/intf.c          |    1 +
7432  drivers/net/ethernet/mellanox/mlx4/mr.c            |    1 +
7433  drivers/net/ethernet/mellanox/mlx4/pd.c            |    1 +
7434  drivers/net/ethernet/mellanox/mlx4/port.c          |    1 +
7435  drivers/net/ethernet/mellanox/mlx4/qp.c            |    1 +
7436  drivers/net/ethernet/mellanox/mlx4/srq.c           |    1 +
7437  drivers/net/phy/realtek.c                          |    1 +
7438  drivers/net/wireless/b43/pcmcia.c                  |    1 +
7439  drivers/of/of_pci.c                                |    1 +
7440  drivers/of/of_pci_irq.c                            |    1 +
7441  drivers/of/of_spi.c                                |    1 +
7442  drivers/parisc/ccio-dma.c                          |    1 +
7443  drivers/parisc/sba_iommu.c                         |    1 +
7444  drivers/pci/hotplug-pci.c                          |    1 +
7445  drivers/pci/hotplug/pciehp_acpi.c                  |    1 +
7446  drivers/pci/hotplug/pcihp_slot.c                   |    1 +
7447  drivers/pci/hotplug/rpadlpar_core.c                |    1 +
7448  drivers/pci/htirq.c                                |    1 +
7449  drivers/pci/iov.c                                  |    1 +
7450  drivers/pci/irq.c                                  |    1 +
7451  drivers/pci/msi.c                                  |    1 +
7452  drivers/pci/pci-sysfs.c                            |    1 +
7453  drivers/pci/quirks.c                               |    1 +
7454  drivers/pci/rom.c                                  |    1 +
7455  drivers/pci/setup-res.c                            |    1 +
7456  drivers/pci/slot.c                                 |    1 +
7457  drivers/pci/vpd.c                                  |    1 +
7458  drivers/pcmcia/db1xxx_ss.c                         |    1 +
7459  drivers/pcmcia/pxa2xx_cm_x255.c                    |    1 +
7460  drivers/pcmcia/pxa2xx_cm_x270.c                    |    1 +
7461  drivers/platform/x86/intel_scu_ipc.c               |    1 +
7462  drivers/platform/x86/msi-wmi.c                     |    1 +
7463  drivers/platform/x86/wmi.c                         |    1 +
7464  drivers/power/max17042_battery.c                   |    1 +
7465  drivers/power/max8903_charger.c                    |    1 +
7466  drivers/power/max8997_charger.c                    |    1 +
7467  drivers/power/max8998_charger.c                    |    1 +
7468  drivers/power/power_supply_sysfs.c                 |    1 +
7469  drivers/ps3/ps3stor_lib.c                          |    1 +
7470  drivers/ps3/sys-manager-core.c                     |    1 +
7471  drivers/rapidio/switches/idt_gen2.c                |    1 +
7472  drivers/regulator/88pm8607.c                       |    1 +
7473  drivers/regulator/ab8500.c                         |    1 +
7474  drivers/regulator/bq24022.c                        |    1 +
7475  drivers/regulator/da903x.c                         |    1 +
7476  drivers/regulator/db8500-prcmu.c                   |    1 +
7477  drivers/regulator/dummy.c                          |    1 +
7478  drivers/regulator/fixed.c                          |    1 +
7479  drivers/regulator/lp3971.c                         |    1 +
7480  drivers/regulator/lp3972.c                         |    1 +
7481  drivers/regulator/max8925-regulator.c              |    1 +
7482  drivers/regulator/max8997.c                        |    1 +
7483  drivers/regulator/mc13783-regulator.c              |    1 +
7484  drivers/regulator/mc13892-regulator.c              |    1 +
7485  drivers/regulator/mc13xxx-regulator-core.c         |    1 +
7486  drivers/regulator/tps6586x-regulator.c             |    1 +
7487  drivers/regulator/userspace-consumer.c             |    1 +
7488  drivers/regulator/virtual.c                        |    1 +
7489  drivers/regulator/wm8400-regulator.c               |    1 +
7490  drivers/rtc/interface.c                            |    1 +
7491  drivers/rtc/rtc-dm355evm.c                         |    1 +
7492  drivers/rtc/rtc-ds1305.c                           |    1 +
7493  drivers/rtc/rtc-ds1511.c                           |    1 +
7494  drivers/rtc/rtc-ds1553.c                           |    1 +
7495  drivers/rtc/rtc-ds1672.c                           |    1 +
7496  drivers/rtc/rtc-ds1742.c                           |    1 +
7497  drivers/rtc/rtc-em3027.c                           |    1 +
7498  drivers/rtc/rtc-isl12022.c                         |    1 +
7499  drivers/rtc/rtc-mv.c                               |    1 +
7500  drivers/rtc/rtc-pcf2123.c                          |    1 +
7501  drivers/rtc/rtc-pcf8563.c                          |    1 +
7502  drivers/rtc/rtc-rs5c348.c                          |    1 +
7503  drivers/rtc/rtc-rs5c372.c                          |    1 +
7504  drivers/rtc/rtc-stk17ta8.c                         |    1 +
7505  drivers/rtc/rtc-tx4939.c                           |    1 +
7506  drivers/rtc/rtc-x1205.c                            |    1 +
7507  drivers/s390/char/fs3270.c                         |    1 +
7508  drivers/s390/char/sclp_cpi_sys.c                   |    1 +
7509  drivers/s390/char/vmur.c                           |    1 +
7510  drivers/s390/cio/chp.c                             |    2 +
7511  drivers/s390/cio/qdio_debug.c                      |    2 +
7512  drivers/s390/kvm/kvm_virtio.c                      |    1 +
7513  drivers/s390/scsi/zfcp_ccw.c                       |    1 +
7514  drivers/s390/scsi/zfcp_dbf.c                       |    1 +
7515  drivers/s390/scsi/zfcp_scsi.c                      |    1 +
7516  drivers/scsi/a2091.c                               |    1 +
7517  drivers/scsi/a3000.c                               |    1 +
7518  drivers/scsi/aacraid/aachba.c                      |    1 +
7519  drivers/scsi/bfa/bfad_debugfs.c                    |    1 +
7520  drivers/scsi/bfa/bfad_im.c                         |    2 +
7521  drivers/scsi/device_handler/scsi_dh.c              |    1 +
7522  drivers/scsi/device_handler/scsi_dh_alua.c         |    1 +
7523  drivers/scsi/device_handler/scsi_dh_emc.c          |    1 +
7524  drivers/scsi/device_handler/scsi_dh_hp_sw.c        |    1 +
7525  drivers/scsi/device_handler/scsi_dh_rdac.c         |    1 +
7526  drivers/scsi/gvp11.c                               |    1 +
7527  drivers/scsi/libfc/fc_disc.c                       |    1 +
7528  drivers/scsi/libfc/fc_elsct.c                      |    1 +
7529  drivers/scsi/libfc/fc_exch.c                       |    1 +
7530  drivers/scsi/libfc/fc_libfc.c                      |    1 +
7531  drivers/scsi/libfc/fc_lport.c                      |    1 +
7532  drivers/scsi/libfc/fc_npiv.c                       |    1 +
7533  drivers/scsi/libfc/fc_rport.c                      |    1 +
7534  drivers/scsi/libsas/sas_scsi_host.c                |    1 +
7535  drivers/scsi/libsas/sas_task.c                     |    1 +
7536  drivers/scsi/libsrp.c                              |    1 +
7537  drivers/scsi/lpfc/lpfc_attr.c                      |    1 +
7538  drivers/scsi/lpfc/lpfc_debugfs.c                   |    1 +
7539  drivers/scsi/lpfc/lpfc_init.c                      |    1 +
7540  drivers/scsi/lpfc/lpfc_scsi.c                      |    1 +
7541  drivers/scsi/mac53c94.c                            |    1 +
7542  drivers/scsi/megaraid/megaraid_mbox.c              |    1 +
7543  drivers/scsi/osd/osd_initiator.c                   |    1 +
7544  drivers/scsi/ps3rom.c                              |    1 +
7545  drivers/scsi/scsi_lib.c                            |    1 +
7546  drivers/scsi/scsi_lib_dma.c                        |    1 +
7547  drivers/scsi/scsi_pm.c                             |    1 +
7548  drivers/scsi/sr_ioctl.c                            |    1 +
7549  drivers/sfi/sfi_core.h                             |    3 +
7550  drivers/sh/intc/core.c                             |    1 +
7551  drivers/sh/intc/virq.c                             |    1 +
7552  drivers/sh/maple/maple.c                           |    1 +
7553  drivers/spi/spi-altera.c                           |    1 +
7554  drivers/spi/spi-au1550.c                           |    1 +
7555  drivers/spi/spi-bitbang.c                          |    1 +
7556  drivers/spi/spi-butterfly.c                        |    1 +
7557  drivers/spi/spi-dw-mmio.c                          |    1 +
7558  drivers/spi/spi-dw-pci.c                           |    1 +
7559  drivers/spi/spi-dw.c                               |    1 +
7560  drivers/spi/spi-gpio.c                             |    1 +
7561  drivers/spi/spi-oc-tiny.c                          |    1 +
7562  drivers/spi/spi-omap-uwire.c                       |    1 +
7563  drivers/spi/spi-orion.c                            |    1 +
7564  drivers/spi/spi-pxa2xx-pci.c                       |    1 +
7565  drivers/spi/spi-s3c24xx.c                          |    1 +
7566  drivers/spi/spi-sh-msiof.c                         |    1 +
7567  drivers/spi/spi-sh-sci.c                           |    1 +
7568  drivers/spi/spi-ti-ssp.c                           |    1 +
7569  drivers/spi/spi-tle62x0.c                          |    1 +
7570  drivers/spi/spi-txx9.c                             |    1 +
7571  drivers/spi/spi.c                                  |    1 +
7572  drivers/ssb/b43_pci_bridge.c                       |    1 +
7573  drivers/ssb/driver_chipcommon.c                    |    1 +
7574  drivers/ssb/driver_chipcommon_pmu.c                |    1 +
7575  drivers/ssb/driver_gige.c                          |    1 +
7576  drivers/ssb/driver_pcicore.c                       |    1 +
7577  drivers/ssb/embedded.c                             |    1 +
7578  drivers/ssb/main.c                                 |    1 +
7579  drivers/ssb/pcihost_wrapper.c                      |    1 +
7580  drivers/staging/altera-stapl/altera.c              |    1 +
7581  drivers/staging/brcm80211/brcmutil/wifi.c          |    1 +
7582  drivers/staging/dt3155v4l/dt3155v4l.c              |    1 +
7583  drivers/staging/iio/accel/adis16201_core.c         |    1 +
7584  drivers/staging/iio/accel/adis16203_core.c         |    1 +
7585  drivers/staging/iio/accel/adis16204_core.c         |    1 +
7586  drivers/staging/iio/accel/adis16209_core.c         |    1 +
7587  drivers/staging/iio/accel/adis16220_core.c         |    1 +
7588  drivers/staging/iio/accel/adis16240_core.c         |    1 +
7589  drivers/staging/iio/accel/kxsd9.c                  |    1 +
7590  drivers/staging/iio/accel/lis3l02dq_core.c         |    1 +
7591  drivers/staging/iio/accel/sca3000_core.c           |    1 +
7592  drivers/staging/iio/adc/ad7150.c                   |    1 +
7593  drivers/staging/iio/adc/ad7152.c                   |    1 +
7594  drivers/staging/iio/adc/ad7291.c                   |    1 +
7595  drivers/staging/iio/adc/ad7298_core.c              |    1 +
7596  drivers/staging/iio/adc/ad7314.c                   |    1 +
7597  drivers/staging/iio/adc/ad7476_core.c              |    1 +
7598  drivers/staging/iio/adc/ad7606_core.c              |    1 +
7599  drivers/staging/iio/adc/ad7745.c                   |    1 +
7600  drivers/staging/iio/adc/ad7780.c                   |    1 +
7601  drivers/staging/iio/adc/ad7816.c                   |    1 +
7602  drivers/staging/iio/adc/ad7887_core.c              |    1 +
7603  drivers/staging/iio/adc/ad799x_core.c              |    1 +
7604  drivers/staging/iio/adc/adt7310.c                  |    1 +
7605  drivers/staging/iio/adc/adt7410.c                  |    1 +
7606  drivers/staging/iio/adc/adt75.c                    |    1 +
7607  drivers/staging/iio/adc/max1363_core.c             |    1 +
7608  drivers/staging/iio/addac/adt7316-i2c.c            |    1 +
7609  drivers/staging/iio/addac/adt7316.c                |    1 +
7610  drivers/staging/iio/dac/ad5446.c                   |    1 +
7611  drivers/staging/iio/dac/ad5504.c                   |    1 +
7612  drivers/staging/iio/dac/ad5624r_spi.c              |    1 +
7613  drivers/staging/iio/dac/ad5686.c                   |    1 +
7614  drivers/staging/iio/dac/ad5791.c                   |    1 +
7615  drivers/staging/iio/dds/ad5930.c                   |    1 +
7616  drivers/staging/iio/dds/ad9832.c                   |    1 +
7617  drivers/staging/iio/dds/ad9834.c                   |    1 +
7618  drivers/staging/iio/dds/ad9850.c                   |    1 +
7619  drivers/staging/iio/dds/ad9852.c                   |    1 +
7620  drivers/staging/iio/dds/ad9910.c                   |    1 +
7621  drivers/staging/iio/dds/ad9951.c                   |    1 +
7622  drivers/staging/iio/gyro/adis16060_core.c          |    1 +
7623  drivers/staging/iio/gyro/adis16080_core.c          |    1 +
7624  drivers/staging/iio/gyro/adis16130_core.c          |    1 +
7625  drivers/staging/iio/gyro/adis16260_core.c          |    1 +
7626  drivers/staging/iio/gyro/adxrs450_core.c           |    1 +
7627  drivers/staging/iio/imu/adis16400_core.c           |    1 +
7628  drivers/staging/iio/industrialio-ring.c            |    1 +
7629  drivers/staging/iio/light/tsl2583.c                |    1 +
7630  drivers/staging/iio/meter/ade7753.c                |    1 +
7631  drivers/staging/iio/meter/ade7754.c                |    1 +
7632  drivers/staging/iio/meter/ade7758_core.c           |    1 +
7633  drivers/staging/iio/meter/ade7759.c                |    1 +
7634  drivers/staging/iio/meter/ade7854-i2c.c            |    1 +
7635  drivers/staging/iio/meter/ade7854-spi.c            |    1 +
7636  drivers/staging/iio/meter/ade7854.c                |    1 +
7637  drivers/staging/iio/resolver/ad2s120x.c            |    1 +
7638  drivers/staging/iio/resolver/ad2s1210.c            |    1 +
7639  drivers/staging/iio/resolver/ad2s90.c              |    1 +
7640  drivers/staging/iio/trigger.h                      |    1 +
7641  .../staging/intel_sst/intel_sst_drv_interface.c    |    1 +
7642  drivers/staging/line6/audio.c                      |    1 +
7643  drivers/staging/olpc_dcon/olpc_dcon.c              |    1 +
7644  drivers/staging/sm7xx/smtcfb.c                     |    2 +
7645  drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c      |    1 +
7646  drivers/staging/usbip/stub_dev.c                   |    1 +
7647  drivers/staging/usbip/stub_main.c                  |    1 +
7648  drivers/staging/usbip/usbip_event.c                |    1 +
7649  drivers/tty/hvc/hvc_iseries.c                      |    1 +
7650  drivers/tty/hvc/hvc_vio.c                          |    1 +
7651  drivers/tty/serial/jsm/jsm_driver.c                |    2 +-
7652  drivers/tty/serial/kgdboc.c                        |    1 +
7653  drivers/tty/serial/max3100.c                       |    1 +
7654  drivers/tty/serial/max3107-aava.c                  |    1 +
7655  drivers/tty/serial/max3107.c                       |    1 +
7656  drivers/tty/serial/nwpserial.c                     |    1 +
7657  drivers/tty/serial/timbuart.c                      |    1 +
7658  drivers/tty/serial/xilinx_uartps.c                 |    1 +
7659  drivers/tty/vt/vc_screen.c                         |    1 +
7660  drivers/uio/uio_pdrv.c                             |    1 +
7661  drivers/uio/uio_pdrv_genirq.c                      |    1 +
7662  drivers/usb/c67x00/c67x00-drv.c                    |    1 +
7663  drivers/usb/core/driver.c                          |    1 +
7664  drivers/usb/core/notify.c                          |    1 +
7665  drivers/usb/gadget/cdc2.c                          |    1 +
7666  drivers/usb/gadget/composite.c                     |    1 +
7667  drivers/usb/gadget/dbgp.c                          |    1 +
7668  drivers/usb/gadget/f_fs.c                          |    1 +
7669  drivers/usb/gadget/f_obex.c                        |    1 +
7670  drivers/usb/gadget/f_sourcesink.c                  |    1 +
7671  drivers/usb/gadget/file_storage.c                  |    1 +
7672  drivers/usb/gadget/fusb300_udc.c                   |    1 +
7673  drivers/usb/gadget/gmidi.c                         |    1 +
7674  drivers/usb/gadget/u_serial.c                      |    1 +
7675  drivers/usb/host/fsl-mph-dr-of.c                   |    1 +
7676  drivers/usb/host/isp1760-if.c                      |    1 +
7677  drivers/usb/host/pci-quirks.c                      |    1 +
7678  drivers/usb/host/whci/debug.c                      |    1 +
7679  drivers/usb/host/whci/hcd.c                        |    1 +
7680  drivers/usb/host/xhci-hub.c                        |    1 +
7681  drivers/usb/host/xhci-pci.c                        |    1 +
7682  drivers/usb/mon/mon_bin.c                          |    1 +
7683  drivers/usb/mon/mon_stat.c                         |    1 +
7684  drivers/usb/mon/mon_text.c                         |    1 +
7685  drivers/usb/otg/gpio_vbus.c                        |    1 +
7686  drivers/usb/otg/otg.c                              |    1 +
7687  drivers/usb/otg/ulpi.c                             |    1 +
7688  drivers/usb/serial/aircable.c                      |    1 +
7689  drivers/usb/serial/qcserial.c                      |    1 +
7690  drivers/usb/storage/option_ms.c                    |    1 +
7691  drivers/usb/storage/protocol.c                     |    1 +
7692  drivers/usb/storage/sierra_ms.c                    |    1 +
7693  drivers/usb/storage/transport.c                    |    1 +
7694  drivers/usb/storage/uas.c                          |    1 +
7695  drivers/usb/wusbcore/devconnect.c                  |    1 +
7696  drivers/usb/wusbcore/mmc.c                         |    1 +
7697  drivers/usb/wusbcore/rh.c                          |    1 +
7698  drivers/usb/wusbcore/security.c                    |    1 +
7699  drivers/usb/wusbcore/wa-hc.c                       |    1 +
7700  drivers/usb/wusbcore/wa-rpipe.c                    |    1 +
7701  drivers/usb/wusbcore/wa-xfer.c                     |    1 +
7702  drivers/uwb/est.c                                  |    1 +
7703  drivers/uwb/i1480/dfu/dfu.c                        |    1 +
7704  drivers/uwb/ie.c                                   |    1 +
7705  drivers/uwb/lc-dev.c                               |    2 +
7706  drivers/uwb/neh.c                                  |    1 +
7707  drivers/uwb/pal.c                                  |    1 +
7708  drivers/uwb/radio.c                                |    1 +
7709  drivers/uwb/reset.c                                |    1 +
7710  drivers/uwb/rsv.c                                  |    1 +
7711  drivers/uwb/scan.c                                 |    1 +
7712  drivers/uwb/umc-bus.c                              |    1 +
7713  drivers/uwb/umc-dev.c                              |    1 +
7714  drivers/uwb/umc-drv.c                              |    1 +
7715  drivers/uwb/whci.c                                 |    1 +
7716  drivers/video/atmel_lcdfb.c                        |    1 +
7717  drivers/video/backlight/88pm860x_bl.c              |    1 +
7718  drivers/video/backlight/adp5520_bl.c               |    1 +
7719  drivers/video/backlight/ams369fg06.c               |    1 +
7720  drivers/video/backlight/da903x_bl.c                |    1 +
7721  drivers/video/backlight/l4f00242t03.c              |    1 +
7722  drivers/video/backlight/ld9040.c                   |    1 +
7723  drivers/video/backlight/lms283gf05.c               |    1 +
7724  drivers/video/backlight/max8925_bl.c               |    1 +
7725  drivers/video/backlight/s6e63m0.c                  |    1 +
7726  drivers/video/backlight/wm831x_bl.c                |    1 +
7727  drivers/video/carminefb.c                          |    1 +
7728  drivers/video/cobalt_lcdfb.c                       |    1 +
7729  drivers/video/fb_ddc.c                             |    3 +-
7730  drivers/video/fb_notify.c                          |    1 +
7731  drivers/video/mb862xx/mb862xx-i2c.c                |    1 +
7732  drivers/video/mb862xx/mb862xxfbdrv.c               |    1 +
7733  drivers/video/msm/mdp.c                            |    1 +
7734  drivers/video/omap/lcd_mipid.c                     |    1 +
7735  drivers/video/omap/omapfb_main.c                   |    1 +
7736  drivers/video/omap2/dss/dispc.c                    |    1 +
7737  drivers/video/omap2/dss/dpi.c                      |    1 +
7738  drivers/video/omap2/dss/dsi.c                      |    1 +
7739  drivers/video/omap2/dss/dss.c                      |    1 +
7740  drivers/video/omap2/dss/rfbi.c                     |    1 +
7741  drivers/video/omap2/dss/sdi.c                      |    1 +
7742  drivers/video/omap2/omapfb/omapfb-ioctl.c          |    1 +
7743  drivers/video/savage/savagefb_accel.c              |    1 +
7744  drivers/video/sh_mipi_dsi.c                        |    1 +
7745  drivers/video/sh_mobile_lcdcfb.c                   |    1 +
7746  drivers/video/via/via-gpio.c                       |    1 +
7747  drivers/video/w100fb.c                             |    1 +
7748  drivers/virtio/virtio.c                            |    1 +
7749  drivers/virtio/virtio_balloon.c                    |    1 +
7750  drivers/virtio/virtio_ring.c                       |    1 +
7751  drivers/w1/w1_family.c                             |    1 +
7752  drivers/xen/balloon.c                              |    1 +
7753  drivers/xen/manage.c                               |    1 +
7754  drivers/xen/swiotlb-xen.c                          |    1 +
7755  drivers/xen/xen-pciback/conf_space.c               |    1 +
7756  drivers/xen/xen-selfballoon.c                      |    2 +
7757  drivers/xen/xenbus/xenbus_client.c                 |    1 +
7758  drivers/xen/xenbus/xenbus_probe.c                  |    1 +
7759  drivers/xen/xenbus/xenbus_probe_backend.c          |    1 +
7760  drivers/xen/xenbus/xenbus_probe_frontend.c         |    1 +
7761  drivers/zorro/proc.c                               |    1 +
7762  fs/bio-integrity.c                                 |    1 +
7763  fs/exofs/super.c                                   |    1 +
7764  fs/gfs2/ops_fstype.c                               |    1 +
7765  fs/ioprio.c                                        |    1 +
7766  fs/jfs/jfs_logmgr.c                                |    1 +
7767  fs/logfs/super.c                                   |    1 +
7768  fs/nfsd/nfssvc.c                                   |    1 +
7769  fs/proc/vmcore.c                                   |    1 +
7770  include/acpi/platform/aclinux.h                    |    2 +-
7771  include/drm/drmP.h                                 |    3 +-
7772  include/linux/bcma/bcma.h                          |    7 +-
7773  include/linux/blkdev.h                             |    2 +-
7774  include/linux/cpuidle.h                            |    3 +-
7775  include/linux/crypto.h                             |    6 --
7776  include/linux/device.h                             |   15 ++-
7777  include/linux/device_cgroup.h                      |    1 -
7778  include/linux/dmaengine.h                          |    2 +
7779  include/linux/export.h                             |   89 ++++++++++++++++++++
7780  include/linux/firmware.h                           |    2 +-
7781  include/linux/ftrace.h                             |    2 +-
7782  include/linux/gameport.h                           |   17 ++--
7783  include/linux/hid.h                                |    9 +-
7784  include/linux/i2c.h                                |   10 +-
7785  include/linux/ipmi.h                               |    3 +-
7786  include/linux/ipmi_smi.h                           |    1 -
7787  include/linux/mdio-bitbang.h                       |    3 +-
7788  include/linux/module.h                             |   68 +---------------
7789  include/linux/mtd/mtd.h                            |    3 +-
7790  include/linux/of_platform.h                        |    1 -
7791  include/linux/pci_hotplug.h                        |   10 +--
7792  include/linux/pm_runtime.h                         |    1 +
7793  include/linux/regulator/driver.h                   |    1 +
7794  include/linux/serio.h                              |   20 +++--
7795  include/linux/ssb/ssb.h                            |    7 +-
7796  include/linux/stop_machine.h                       |    1 +
7797  include/linux/sunrpc/svc_xprt.h                    |    3 +-
7798  include/linux/sysdev.h                             |    1 -
7799  include/linux/textsearch.h                         |    3 +-
7800  include/linux/uio_driver.h                         |   12 ++--
7801  include/linux/usb.h                                |    9 +-
7802  include/linux/uwb.h                                |    1 +
7803  include/linux/uwb/umc.h                            |    7 +-
7804  include/linux/vermagic.h                           |    1 -
7805  include/linux/vlynq.h                              |    3 +-
7806  include/media/saa7146.h                            |    3 +-
7807  include/media/v4l2-int-device.h                    |    3 +-
7808  include/net/inet_timewait_sock.h                   |    1 -
7809  include/net/lib80211.h                             |    3 +-
7810  include/net/sch_generic.h                          |    1 -
7811  include/net/sock.h                                 |    2 +-
7812  include/sound/core.h                               |    2 +-
7813  include/trace/define_trace.h                       |    2 +-
7814  include/trace/events/module.h                      |    2 +-
7815  include/xen/xenbus.h                               |    1 +
7816  kernel/async.c                                     |    2 +-
7817  kernel/audit.c                                     |    2 +-
7818  kernel/auditsc.c                                   |    2 +-
7819  kernel/capability.c                                |    2 +-
7820  kernel/cgroup_freezer.c                            |    2 +-
7821  kernel/compat.c                                    |    1 +
7822  kernel/cpu.c                                       |    2 +-
7823  kernel/cpuset.c                                    |    2 +-
7824  kernel/crash_dump.c                                |    2 +-
7825  kernel/cred.c                                      |    2 +-
7826  kernel/debug/kdb/kdb_debugger.c                    |    1 +
7827  kernel/dma.c                                       |    2 +-
7828  kernel/events/core.c                               |    1 +
7829  kernel/exit.c                                      |    3 +-
7830  kernel/fork.c                                      |    3 +-
7831  kernel/freezer.c                                   |    2 +-
7832  kernel/futex.c                                     |    2 +-
7833  kernel/groups.c                                    |    2 +-
7834  kernel/hrtimer.c                                   |    2 +-
7835  kernel/hung_task.c                                 |    2 +-
7836  kernel/irq_work.c                                  |    4 +-
7837  kernel/kfifo.c                                     |    2 +-
7838  kernel/kprobes.c                                   |    2 +-
7839  kernel/ksysfs.c                                    |    3 +-
7840  kernel/kthread.c                                   |    2 +-
7841  kernel/latencytop.c                                |    2 +-
7842  kernel/lockdep.c                                   |    2 +-
7843  kernel/lockdep_proc.c                              |    2 +-
7844  kernel/module.c                                    |    2 +-
7845  kernel/mutex-debug.c                               |    2 +-
7846  kernel/mutex.c                                     |    2 +-
7847  kernel/notifier.c                                  |    2 +-
7848  kernel/nsproxy.c                                   |    2 +-
7849  kernel/padata.c                                    |    2 +-
7850  kernel/params.c                                    |    4 +-
7851  kernel/pid.c                                       |    2 +-
7852  kernel/posix-timers.c                              |    2 +-
7853  kernel/power/hibernate.c                           |    1 +
7854  kernel/power/main.c                                |    1 +
7855  kernel/power/suspend.c                             |    2 +
7856  kernel/printk.c                                    |    2 +-
7857  kernel/profile.c                                   |    2 +-
7858  kernel/ptrace.c                                    |    2 +-
7859  kernel/range.c                                     |    2 +-
7860  kernel/rcupdate.c                                  |    2 +-
7861  kernel/rcutiny.c                                   |    4 +-
7862  kernel/rcutorture.c                                |    3 +-
7863  kernel/rcutree.c                                   |    2 +-
7864  kernel/rcutree_trace.c                             |    3 +-
7865  kernel/relay.c                                     |    2 +-
7866  kernel/resource.c                                  |    2 +-
7867  kernel/rtmutex-debug.c                             |    2 +-
7868  kernel/rtmutex-tester.c                            |    2 +-
7869  kernel/rtmutex.c                                   |    2 +-
7870  kernel/rwsem.c                                     |    2 +-
7871  kernel/sched.c                                     |    2 +-
7872  kernel/sched_clock.c                               |    2 +-
7873  kernel/semaphore.c                                 |    2 +-
7874  kernel/signal.c                                    |    2 +-
7875  kernel/smp.c                                       |    2 +-
7876  kernel/softirq.c                                   |    2 +-
7877  kernel/spinlock.c                                  |    2 +-
7878  kernel/srcu.c                                      |    2 +-
7879  kernel/stacktrace.c                                |    2 +-
7880  kernel/stop_machine.c                              |    2 +-
7881  kernel/sys.c                                       |    3 +-
7882  kernel/sysctl.c                                    |    2 +-
7883  kernel/time.c                                      |    2 +-
7884  kernel/time/posix-clock.c                          |    1 +
7885  kernel/timer.c                                     |    2 +-
7886  kernel/trace/blktrace.c                            |    1 +
7887  kernel/trace/ftrace.c                              |    1 +
7888  kernel/trace/trace_syscalls.c                      |    1 +
7889  kernel/up.c                                        |    2 +-
7890  kernel/user-return-notifier.c                      |    2 +-
7891  kernel/user.c                                      |    2 +-
7892  kernel/user_namespace.c                            |    2 +-
7893  kernel/utsname.c                                   |    2 +-
7894  kernel/utsname_sysctl.c                            |    2 +-
7895  kernel/wait.c                                      |    2 +-
7896  kernel/watchdog.c                                  |    3 +-
7897  kernel/workqueue.c                                 |    2 +-
7898  lib/dma-debug.c                                    |    1 +
7899  lib/raid6/algos.c                                  |    1 +
7900  lib/raid6/mktables.c                               |    1 +
7901  lib/raid6/recov.c                                  |    1 +
7902  mm/fremap.c                                        |    1 -
7903  mm/memcontrol.c                                    |    1 +
7904  mm/memory-failure.c                                |    1 +
7905  mm/mmzone.c                                        |    1 -
7906  mm/quicklist.c                                     |    1 -
7907  mm/sparse-vmemmap.c                                |    1 -
7908  mm/swap_state.c                                    |    1 -
7909  mm/swapfile.c                                      |    1 -
7910  net/caif/cfpkt_skbuff.c                            |    1 +
7911  net/netfilter/ipset/pfxlen.c                       |    1 +
7912  net/rfkill/input.c                                 |    1 +
7913  security/selinux/netlink.c                         |    1 +
7914  sound/core/control.c                               |    1 +
7915  sound/core/device.c                                |    1 +
7916  sound/core/hwdep.c                                 |    1 +
7917  sound/core/info.c                                  |    1 +
7918  sound/core/info_oss.c                              |    1 +
7919  sound/core/init.c                                  |    1 +
7920  sound/core/isadma.c                                |    1 +
7921  sound/core/jack.c                                  |    1 +
7922  sound/core/memory.c                                |    1 +
7923  sound/core/misc.c                                  |    1 +
7924  sound/core/oss/mixer_oss.c                         |    1 +
7925  sound/core/rawmidi.c                               |    1 +
7926  sound/core/seq/oss/seq_oss.c                       |    2 +-
7927  sound/core/seq/oss/seq_oss_init.c                  |    2 +-
7928  sound/core/seq/oss/seq_oss_synth.c                 |    1 +
7929  sound/core/seq/seq.c                               |    2 +-
7930  sound/core/seq/seq_clientmgr.c                     |    1 +
7931  sound/core/seq/seq_device.c                        |    1 +
7932  sound/core/seq/seq_dummy.c                         |    2 +-
7933  sound/core/seq/seq_info.c                          |    1 +
7934  sound/core/seq/seq_lock.c                          |    1 +
7935  sound/core/seq/seq_memory.c                        |    1 +
7936  sound/core/seq/seq_midi.c                          |    2 +-
7937  sound/core/seq/seq_midi_emul.c                     |    1 +
7938  sound/core/seq/seq_midi_event.c                    |    1 +
7939  sound/core/seq/seq_ports.c                         |    1 +
7940  sound/core/seq/seq_system.c                        |    1 +
7941  sound/core/seq/seq_virmidi.c                       |    1 +
7942  sound/core/sound.c                                 |    2 +-
7943  sound/core/sound_oss.c                             |    1 +
7944  sound/core/timer.c                                 |    2 +-
7945  sound/core/vmaster.c                               |    1 +
7946  sound/drivers/mpu401/mpu401.c                      |    2 +-
7947  sound/drivers/mpu401/mpu401_uart.c                 |    1 +
7948  sound/drivers/mtpav.c                              |    1 +
7949  sound/drivers/mts64.c                              |    1 +
7950  sound/drivers/opl3/opl3_lib.c                      |    1 +
7951  sound/drivers/opl3/opl3_oss.c                      |    1 +
7952  sound/drivers/opl3/opl3_seq.c                      |    1 +
7953  sound/drivers/opl3/opl3_synth.c                    |    1 +
7954  sound/drivers/opl4/opl4_lib.c                      |    1 +
7955  sound/drivers/opl4/opl4_proc.c                     |    1 +
7956  sound/drivers/opl4/opl4_seq.c                      |    1 +
7957  sound/drivers/portman2x4.c                         |    1 +
7958  sound/drivers/serial-u16550.c                      |    2 +-
7959  sound/drivers/virmidi.c                            |    2 +-
7960  sound/firewire/iso-resources.c                     |    1 +
7961  sound/firewire/packets-buffer.c                    |    1 +
7962  sound/i2c/i2c.c                                    |    1 +
7963  sound/i2c/other/ak4xxx-adda.c                      |    1 +
7964  sound/i2c/other/pt2258.c                           |    1 +
7965  sound/i2c/other/tea575x-tuner.c                    |    1 +
7966  sound/i2c/tea6330t.c                               |    1 +
7967  sound/isa/sb/emu8000.c                             |    1 +
7968  sound/isa/sb/emu8000_callback.c                    |    1 +
7969  sound/isa/sb/emu8000_patch.c                       |    1 +
7970  sound/isa/sb/emu8000_synth.c                       |    1 +
7971  sound/isa/wavefront/wavefront_fx.c                 |    1 +
7972  sound/isa/wavefront/wavefront_synth.c              |    1 +
7973  sound/pci/als4000.c                                |    2 +-
7974  sound/pci/asihpi/hpioctl.c                         |    1 +
7975  sound/pci/ctxfi/xfi.c                              |    1 +
7976  sound/pci/oxygen/oxygen_io.c                       |    1 +
7977  sound/soc/blackfin/bf5xx-sport.c                   |    1 +
7978  sound/soc/tegra/tegra_asoc_utils.c                 |    1 +
7979  sound/synth/emux/emux.c                            |    1 +
7980  sound/synth/emux/emux_oss.c                        |    1 +
7981  sound/synth/emux/emux_seq.c                        |    2 +-
7982  sound/synth/emux/emux_synth.c                      |    1 +
7983  sound/synth/emux/soundfont.c                       |    1 +
7984  sound/synth/util_mem.c                             |    1 +
7985  sound/usb/6fire/firmware.c                         |    1 +
7986  sound/usb/midi.c                                   |    1 +
7987  virt/kvm/iommu.c                                   |    2 +
7988  1388 files changed, 1520 insertions(+), 426 deletions(-)
7989  create mode 100644 include/linux/export.h
7990 $ git am -3 ../patches/0001-dm-use-export.h-instead-of-module.h-where-possible.patch
7991 Applying: dm: use export.h instead of module.h where possible
7992 $ git reset HEAD^
7993 Unstaged changes after reset:
7994 M       drivers/md/persistent-data/dm-btree-remove.c
7995 M       drivers/md/persistent-data/dm-btree.c
7996 M       drivers/md/persistent-data/dm-space-map-disk.c
7997 M       drivers/md/persistent-data/dm-transaction-manager.c
7998 $ git add .
7999 $ git commit -v -a --amend
8000 [master 67d5589] Merge remote-tracking branch 'moduleh/module.h-split'
8001 $ git am -3 ../patches/0001-block-bsg-lib.c-needs-export.h-not-module.h.patch
8002 Applying: block: bsg-lib.c needs export.h not module.h
8003 $ git reset HEAD^
8004 Unstaged changes after reset:
8005 M       block/bsg-lib.c
8006 $ git add .
8007 $ git commit -v -a --amend
8008 [master f50c02e] Merge remote-tracking branch 'moduleh/module.h-split'
8009 $ git am -3 ../patches/0001-PM-EXPORT_SYMBOL-needs-export.h.patch
8010 Applying: PM: EXPORT_SYMBOL needs export.h
8011 $ git reset HEAD^
8012 Unstaged changes after reset:
8013 M       drivers/base/power/common.c
8014 $ git add .
8015 $ git commit -v -a --amend
8016 [master 2675ede] Merge remote-tracking branch 'moduleh/module.h-split'
8017 Merging kvmtool/master
8018 $ git merge kvmtool/master
8019 Recorded preimage for 'include/net/9p/9p.h'
8020 Auto-merging include/net/9p/9p.h
8021 CONFLICT (content): Merge conflict in include/net/9p/9p.h
8022 Automatic merge failed; fix conflicts and then commit the result.
8023 $ git commit -v -a
8024 Recorded resolution for 'include/net/9p/9p.h'.
8025 [master 6168721] Merge remote-tracking branch 'kvmtool/master'
8026 $ git diff -M --stat --summary HEAD^..
8027  tools/kvm/.gitignore                    |    9 +
8028  tools/kvm/CREDITS-Git                   |   30 +
8029  tools/kvm/Documentation/kvm-balloon.txt |   24 +
8030  tools/kvm/Documentation/kvm-debug.txt   |   16 +
8031  tools/kvm/Documentation/kvm-list.txt    |   16 +
8032  tools/kvm/Documentation/kvm-pause.txt   |   16 +
8033  tools/kvm/Documentation/kvm-resume.txt  |   16 +
8034  tools/kvm/Documentation/kvm-run.txt     |   62 ++
8035  tools/kvm/Documentation/kvm-stat.txt    |   19 +
8036  tools/kvm/Documentation/kvm-stop.txt    |   16 +
8037  tools/kvm/Documentation/kvm-version.txt |   21 +
8038  tools/kvm/Makefile                      |  277 +++++++
8039  tools/kvm/README                        |  109 +++
8040  tools/kvm/bios.c                        |  157 ++++
8041  tools/kvm/bios/.gitignore               |    3 +
8042  tools/kvm/bios/bios-rom.S               |   12 +
8043  tools/kvm/bios/e820.c                   |   73 ++
8044  tools/kvm/bios/entry.S                  |   90 +++
8045  tools/kvm/bios/gen-offsets.sh           |   14 +
8046  tools/kvm/bios/int10.c                  |  151 ++++
8047  tools/kvm/bios/int15.c                  |   18 +
8048  tools/kvm/bios/local.S                  |    7 +
8049  tools/kvm/bios/macro.S                  |   25 +
8050  tools/kvm/bios/rom.ld.S                 |   17 +
8051  tools/kvm/builtin-balloon.c             |   75 ++
8052  tools/kvm/builtin-debug.c               |   66 ++
8053  tools/kvm/builtin-help.c                |   61 ++
8054  tools/kvm/builtin-list.c                |   66 ++
8055  tools/kvm/builtin-pause.c               |   66 ++
8056  tools/kvm/builtin-resume.c              |   66 ++
8057  tools/kvm/builtin-run.c                 |  749 ++++++++++++++++++
8058  tools/kvm/builtin-stat.c                |   79 ++
8059  tools/kvm/builtin-stop.c                |   66 ++
8060  tools/kvm/builtin-version.c             |   15 +
8061  tools/kvm/code16gcc.h                   |   15 +
8062  tools/kvm/command-list.txt              |   13 +
8063  tools/kvm/config/feature-tests.mak      |  148 ++++
8064  tools/kvm/config/utilities.mak          |  188 +++++
8065  tools/kvm/cpuid.c                       |   51 ++
8066  tools/kvm/disk/blk.c                    |   39 +
8067  tools/kvm/disk/core.c                   |  222 ++++++
8068  tools/kvm/disk/qcow.c                   | 1099 ++++++++++++++++++++++++++
8069  tools/kvm/disk/raw.c                    |   82 ++
8070  tools/kvm/framebuffer.c                 |   68 ++
8071  tools/kvm/guest_compat.c                |  104 +++
8072  tools/kvm/hw/i8042.c                    |  348 +++++++++
8073  tools/kvm/hw/rtc.c                      |   87 +++
8074  tools/kvm/hw/serial.c                   |  358 +++++++++
8075  tools/kvm/hw/vesa.c                     |   77 ++
8076  tools/kvm/include/asm/hweight.h         |    8 +
8077  tools/kvm/include/kvm/8250-serial.h     |   10 +
8078  tools/kvm/include/kvm/apic.h            |   17 +
8079  tools/kvm/include/kvm/assembly.h        |   24 +
8080  tools/kvm/include/kvm/barrier.h         |   15 +
8081  tools/kvm/include/kvm/bios-export.h     |   13 +
8082  tools/kvm/include/kvm/bios.h            |   83 ++
8083  tools/kvm/include/kvm/boot-protocol.h   |   16 +
8084  tools/kvm/include/kvm/brlock.h          |   41 +
8085  tools/kvm/include/kvm/builtin-balloon.h |    7 +
8086  tools/kvm/include/kvm/builtin-debug.h   |    7 +
8087  tools/kvm/include/kvm/builtin-help.h    |    6 +
8088  tools/kvm/include/kvm/builtin-list.h    |    7 +
8089  tools/kvm/include/kvm/builtin-pause.h   |    7 +
8090  tools/kvm/include/kvm/builtin-resume.h  |    7 +
8091  tools/kvm/include/kvm/builtin-run.h     |    7 +
8092  tools/kvm/include/kvm/builtin-stat.h    |    7 +
8093  tools/kvm/include/kvm/builtin-stop.h    |    7 +
8094  tools/kvm/include/kvm/builtin-version.h |    6 +
8095  tools/kvm/include/kvm/compiler.h        |    6 +
8096  tools/kvm/include/kvm/cpufeature.h      |   41 +
8097  tools/kvm/include/kvm/disk-image.h      |   73 ++
8098  tools/kvm/include/kvm/e820.h            |   12 +
8099  tools/kvm/include/kvm/framebuffer.h     |   34 +
8100  tools/kvm/include/kvm/guest_compat.h    |    9 +
8101  tools/kvm/include/kvm/i8042.h           |   12 +
8102  tools/kvm/include/kvm/interrupt.h       |   26 +
8103  tools/kvm/include/kvm/ioeventfd.h       |   27 +
8104  tools/kvm/include/kvm/ioport.h          |   65 ++
8105  tools/kvm/include/kvm/irq.h             |   29 +
8106  tools/kvm/include/kvm/kvm-cmd.h         |   17 +
8107  tools/kvm/include/kvm/kvm-cpu.h         |   44 ++
8108  tools/kvm/include/kvm/kvm.h             |  109 +++
8109  tools/kvm/include/kvm/mptable.h         |    8 +
8110  tools/kvm/include/kvm/mutex.h           |   33 +
8111  tools/kvm/include/kvm/parse-options.h   |  213 +++++
8112  tools/kvm/include/kvm/pci.h             |   74 ++
8113  tools/kvm/include/kvm/qcow.h            |  122 +++
8114  tools/kvm/include/kvm/rbtree-interval.h |   27 +
8115  tools/kvm/include/kvm/read-write.h      |   32 +
8116  tools/kvm/include/kvm/rtc.h             |    6 +
8117  tools/kvm/include/kvm/rwsem.h           |   39 +
8118  tools/kvm/include/kvm/sdl.h             |   17 +
8119  tools/kvm/include/kvm/segment.h         |   16 +
8120  tools/kvm/include/kvm/strbuf.h          |    6 +
8121  tools/kvm/include/kvm/symbol.h          |   22 +
8122  tools/kvm/include/kvm/term.h            |   17 +
8123  tools/kvm/include/kvm/threadpool.h      |   37 +
8124  tools/kvm/include/kvm/types.h           |    7 +
8125  tools/kvm/include/kvm/uip.h             |  356 +++++++++
8126  tools/kvm/include/kvm/util.h            |   78 ++
8127  tools/kvm/include/kvm/vesa.h            |   18 +
8128  tools/kvm/include/kvm/virtio-9p.h       |   75 ++
8129  tools/kvm/include/kvm/virtio-balloon.h  |    8 +
8130  tools/kvm/include/kvm/virtio-blk.h      |   12 +
8131  tools/kvm/include/kvm/virtio-console.h  |    9 +
8132  tools/kvm/include/kvm/virtio-net.h      |   21 +
8133  tools/kvm/include/kvm/virtio-pci-dev.h  |   24 +
8134  tools/kvm/include/kvm/virtio-pci.h      |   51 ++
8135  tools/kvm/include/kvm/virtio-rng.h      |    9 +
8136  tools/kvm/include/kvm/virtio.h          |   65 ++
8137  tools/kvm/include/kvm/vnc.h             |   14 +
8138  tools/kvm/include/linux/bitops.h        |   33 +
8139  tools/kvm/include/linux/byteorder.h     |    7 +
8140  tools/kvm/include/linux/kernel.h        |   39 +
8141  tools/kvm/include/linux/module.h        |    6 +
8142  tools/kvm/include/linux/prefetch.h      |    6 +
8143  tools/kvm/include/linux/types.h         |   50 ++
8144  tools/kvm/interrupt.c                   |   27 +
8145  tools/kvm/ioeventfd.c                   |  128 +++
8146  tools/kvm/ioport.c                      |  192 +++++
8147  tools/kvm/irq.c                         |  193 +++++
8148  tools/kvm/kvm-cmd.c                     |   89 +++
8149  tools/kvm/kvm-cpu.c                     |  509 ++++++++++++
8150  tools/kvm/kvm.c                         |  751 ++++++++++++++++++
8151  tools/kvm/main.c                        |   14 +
8152  tools/kvm/mmio.c                        |  132 ++++
8153  tools/kvm/mptable.c                     |  284 +++++++
8154  tools/kvm/net/uip/arp.c                 |   30 +
8155  tools/kvm/net/uip/buf.c                 |  114 +++
8156  tools/kvm/net/uip/core.c                |  190 +++++
8157  tools/kvm/net/uip/csum.c                |   92 +++
8158  tools/kvm/net/uip/dhcp.c                |  195 +++++
8159  tools/kvm/net/uip/icmp.c                |   29 +
8160  tools/kvm/net/uip/ipv4.c                |   29 +
8161  tools/kvm/net/uip/tcp.c                 |  317 ++++++++
8162  tools/kvm/net/uip/udp.c                 |  236 ++++++
8163  tools/kvm/pci.c                         |  170 ++++
8164  tools/kvm/read-write.c                  |  318 ++++++++
8165  tools/kvm/symbol.c                      |   98 +++
8166  tools/kvm/term.c                        |  127 +++
8167  tools/kvm/tests/Makefile                |   19 +
8168  tools/kvm/tests/boot/Makefile           |   13 +
8169  tools/kvm/tests/boot/init.c             |   11 +
8170  tools/kvm/tests/kernel/.gitignore       |    2 +
8171  tools/kvm/tests/kernel/Makefile         |   20 +
8172  tools/kvm/tests/kernel/README           |   16 +
8173  tools/kvm/tests/kernel/kernel.S         |    8 +
8174  tools/kvm/tests/pit/.gitignore          |    2 +
8175  tools/kvm/tests/pit/Makefile            |   20 +
8176  tools/kvm/tests/pit/README              |   16 +
8177  tools/kvm/tests/pit/tick.S              |  109 +++
8178  tools/kvm/threadpool.c                  |  146 ++++
8179  tools/kvm/ui/sdl.c                      |  158 ++++
8180  tools/kvm/ui/vnc.c                      |  218 ++++++
8181  tools/kvm/util.c                        |  101 +++
8182  tools/kvm/util/KVMTOOLS-VERSION-GEN     |   40 +
8183  tools/kvm/util/generate-cmdlist.sh      |   23 +
8184  tools/kvm/util/kvm-ifup-vbr0            |    6 +
8185  tools/kvm/util/parse-options.c          |  631 +++++++++++++++
8186  tools/kvm/util/rbtree-interval.c        |   90 +++
8187  tools/kvm/util/set_private_br.sh        |   51 ++
8188  tools/kvm/util/strbuf.c                 |   13 +
8189  tools/kvm/virtio/9p-pdu.c               |  287 +++++++
8190  tools/kvm/virtio/9p.c                   | 1284 +++++++++++++++++++++++++++++++
8191  tools/kvm/virtio/balloon.c              |  306 ++++++++
8192  tools/kvm/virtio/blk.c                  |  268 +++++++
8193  tools/kvm/virtio/console.c              |  267 +++++++
8194  tools/kvm/virtio/core.c                 |  123 +++
8195  tools/kvm/virtio/net.c                  |  425 ++++++++++
8196  tools/kvm/virtio/pci.c                  |  231 ++++++
8197  tools/kvm/virtio/rng.c                  |  198 +++++
8198  171 files changed, 17128 insertions(+), 0 deletions(-)
8199  create mode 100644 tools/kvm/.gitignore
8200  create mode 100644 tools/kvm/CREDITS-Git
8201  create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
8202  create mode 100644 tools/kvm/Documentation/kvm-debug.txt
8203  create mode 100644 tools/kvm/Documentation/kvm-list.txt
8204  create mode 100644 tools/kvm/Documentation/kvm-pause.txt
8205  create mode 100644 tools/kvm/Documentation/kvm-resume.txt
8206  create mode 100644 tools/kvm/Documentation/kvm-run.txt
8207  create mode 100644 tools/kvm/Documentation/kvm-stat.txt
8208  create mode 100644 tools/kvm/Documentation/kvm-stop.txt
8209  create mode 100644 tools/kvm/Documentation/kvm-version.txt
8210  create mode 100644 tools/kvm/Makefile
8211  create mode 100644 tools/kvm/README
8212  create mode 100644 tools/kvm/bios.c
8213  create mode 100644 tools/kvm/bios/.gitignore
8214  create mode 100644 tools/kvm/bios/bios-rom.S
8215  create mode 100644 tools/kvm/bios/e820.c
8216  create mode 100644 tools/kvm/bios/entry.S
8217  create mode 100644 tools/kvm/bios/gen-offsets.sh
8218  create mode 100644 tools/kvm/bios/int10.c
8219  create mode 100644 tools/kvm/bios/int15.c
8220  create mode 100644 tools/kvm/bios/local.S
8221  create mode 100644 tools/kvm/bios/macro.S
8222  create mode 100644 tools/kvm/bios/rom.ld.S
8223  create mode 100644 tools/kvm/builtin-balloon.c
8224  create mode 100644 tools/kvm/builtin-debug.c
8225  create mode 100644 tools/kvm/builtin-help.c
8226  create mode 100644 tools/kvm/builtin-list.c
8227  create mode 100644 tools/kvm/builtin-pause.c
8228  create mode 100644 tools/kvm/builtin-resume.c
8229  create mode 100644 tools/kvm/builtin-run.c
8230  create mode 100644 tools/kvm/builtin-stat.c
8231  create mode 100644 tools/kvm/builtin-stop.c
8232  create mode 100644 tools/kvm/builtin-version.c
8233  create mode 100644 tools/kvm/code16gcc.h
8234  create mode 100644 tools/kvm/command-list.txt
8235  create mode 100644 tools/kvm/config/feature-tests.mak
8236  create mode 100644 tools/kvm/config/utilities.mak
8237  create mode 100644 tools/kvm/cpuid.c
8238  create mode 100644 tools/kvm/disk/blk.c
8239  create mode 100644 tools/kvm/disk/core.c
8240  create mode 100644 tools/kvm/disk/qcow.c
8241  create mode 100644 tools/kvm/disk/raw.c
8242  create mode 100644 tools/kvm/framebuffer.c
8243  create mode 100644 tools/kvm/guest_compat.c
8244  create mode 100644 tools/kvm/hw/i8042.c
8245  create mode 100644 tools/kvm/hw/rtc.c
8246  create mode 100644 tools/kvm/hw/serial.c
8247  create mode 100644 tools/kvm/hw/vesa.c
8248  create mode 100644 tools/kvm/include/asm/hweight.h
8249  create mode 100644 tools/kvm/include/kvm/8250-serial.h
8250  create mode 100644 tools/kvm/include/kvm/apic.h
8251  create mode 100644 tools/kvm/include/kvm/assembly.h
8252  create mode 100644 tools/kvm/include/kvm/barrier.h
8253  create mode 100644 tools/kvm/include/kvm/bios-export.h
8254  create mode 100644 tools/kvm/include/kvm/bios.h
8255  create mode 100644 tools/kvm/include/kvm/boot-protocol.h
8256  create mode 100644 tools/kvm/include/kvm/brlock.h
8257  create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
8258  create mode 100644 tools/kvm/include/kvm/builtin-debug.h
8259  create mode 100644 tools/kvm/include/kvm/builtin-help.h
8260  create mode 100644 tools/kvm/include/kvm/builtin-list.h
8261  create mode 100644 tools/kvm/include/kvm/builtin-pause.h
8262  create mode 100644 tools/kvm/include/kvm/builtin-resume.h
8263  create mode 100644 tools/kvm/include/kvm/builtin-run.h
8264  create mode 100644 tools/kvm/include/kvm/builtin-stat.h
8265  create mode 100644 tools/kvm/include/kvm/builtin-stop.h
8266  create mode 100644 tools/kvm/include/kvm/builtin-version.h
8267  create mode 100644 tools/kvm/include/kvm/compiler.h
8268  create mode 100644 tools/kvm/include/kvm/cpufeature.h
8269  create mode 100644 tools/kvm/include/kvm/disk-image.h
8270  create mode 100644 tools/kvm/include/kvm/e820.h
8271  create mode 100644 tools/kvm/include/kvm/framebuffer.h
8272  create mode 100644 tools/kvm/include/kvm/guest_compat.h
8273  create mode 100644 tools/kvm/include/kvm/i8042.h
8274  create mode 100644 tools/kvm/include/kvm/interrupt.h
8275  create mode 100644 tools/kvm/include/kvm/ioeventfd.h
8276  create mode 100644 tools/kvm/include/kvm/ioport.h
8277  create mode 100644 tools/kvm/include/kvm/irq.h
8278  create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
8279  create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
8280  create mode 100644 tools/kvm/include/kvm/kvm.h
8281  create mode 100644 tools/kvm/include/kvm/mptable.h
8282  create mode 100644 tools/kvm/include/kvm/mutex.h
8283  create mode 100644 tools/kvm/include/kvm/parse-options.h
8284  create mode 100644 tools/kvm/include/kvm/pci.h
8285  create mode 100644 tools/kvm/include/kvm/qcow.h
8286  create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
8287  create mode 100644 tools/kvm/include/kvm/read-write.h
8288  create mode 100644 tools/kvm/include/kvm/rtc.h
8289  create mode 100644 tools/kvm/include/kvm/rwsem.h
8290  create mode 100644 tools/kvm/include/kvm/sdl.h
8291  create mode 100644 tools/kvm/include/kvm/segment.h
8292  create mode 100644 tools/kvm/include/kvm/strbuf.h
8293  create mode 100644 tools/kvm/include/kvm/symbol.h
8294  create mode 100644 tools/kvm/include/kvm/term.h
8295  create mode 100644 tools/kvm/include/kvm/threadpool.h
8296  create mode 100644 tools/kvm/include/kvm/types.h
8297  create mode 100644 tools/kvm/include/kvm/uip.h
8298  create mode 100644 tools/kvm/include/kvm/util.h
8299  create mode 100644 tools/kvm/include/kvm/vesa.h
8300  create mode 100644 tools/kvm/include/kvm/virtio-9p.h
8301  create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
8302  create mode 100644 tools/kvm/include/kvm/virtio-blk.h
8303  create mode 100644 tools/kvm/include/kvm/virtio-console.h
8304  create mode 100644 tools/kvm/include/kvm/virtio-net.h
8305  create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
8306  create mode 100644 tools/kvm/include/kvm/virtio-pci.h
8307  create mode 100644 tools/kvm/include/kvm/virtio-rng.h
8308  create mode 100644 tools/kvm/include/kvm/virtio.h
8309  create mode 100644 tools/kvm/include/kvm/vnc.h
8310  create mode 100644 tools/kvm/include/linux/bitops.h
8311  create mode 100644 tools/kvm/include/linux/byteorder.h
8312  create mode 100644 tools/kvm/include/linux/kernel.h
8313  create mode 100644 tools/kvm/include/linux/module.h
8314  create mode 100644 tools/kvm/include/linux/prefetch.h
8315  create mode 100644 tools/kvm/include/linux/types.h
8316  create mode 100644 tools/kvm/interrupt.c
8317  create mode 100644 tools/kvm/ioeventfd.c
8318  create mode 100644 tools/kvm/ioport.c
8319  create mode 100644 tools/kvm/irq.c
8320  create mode 100644 tools/kvm/kvm-cmd.c
8321  create mode 100644 tools/kvm/kvm-cpu.c
8322  create mode 100644 tools/kvm/kvm.c
8323  create mode 100644 tools/kvm/main.c
8324  create mode 100644 tools/kvm/mmio.c
8325  create mode 100644 tools/kvm/mptable.c
8326  create mode 100644 tools/kvm/net/uip/arp.c
8327  create mode 100644 tools/kvm/net/uip/buf.c
8328  create mode 100644 tools/kvm/net/uip/core.c
8329  create mode 100644 tools/kvm/net/uip/csum.c
8330  create mode 100644 tools/kvm/net/uip/dhcp.c
8331  create mode 100644 tools/kvm/net/uip/icmp.c
8332  create mode 100644 tools/kvm/net/uip/ipv4.c
8333  create mode 100644 tools/kvm/net/uip/tcp.c
8334  create mode 100644 tools/kvm/net/uip/udp.c
8335  create mode 100644 tools/kvm/pci.c
8336  create mode 100644 tools/kvm/read-write.c
8337  create mode 100644 tools/kvm/symbol.c
8338  create mode 100644 tools/kvm/term.c
8339  create mode 100644 tools/kvm/tests/Makefile
8340  create mode 100644 tools/kvm/tests/boot/Makefile
8341  create mode 100644 tools/kvm/tests/boot/init.c
8342  create mode 100644 tools/kvm/tests/kernel/.gitignore
8343  create mode 100644 tools/kvm/tests/kernel/Makefile
8344  create mode 100644 tools/kvm/tests/kernel/README
8345  create mode 100644 tools/kvm/tests/kernel/kernel.S
8346  create mode 100644 tools/kvm/tests/pit/.gitignore
8347  create mode 100644 tools/kvm/tests/pit/Makefile
8348  create mode 100644 tools/kvm/tests/pit/README
8349  create mode 100644 tools/kvm/tests/pit/tick.S
8350  create mode 100644 tools/kvm/threadpool.c
8351  create mode 100644 tools/kvm/ui/sdl.c
8352  create mode 100644 tools/kvm/ui/vnc.c
8353  create mode 100644 tools/kvm/util.c
8354  create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
8355  create mode 100755 tools/kvm/util/generate-cmdlist.sh
8356  create mode 100755 tools/kvm/util/kvm-ifup-vbr0
8357  create mode 100644 tools/kvm/util/parse-options.c
8358  create mode 100644 tools/kvm/util/rbtree-interval.c
8359  create mode 100755 tools/kvm/util/set_private_br.sh
8360  create mode 100644 tools/kvm/util/strbuf.c
8361  create mode 100644 tools/kvm/virtio/9p-pdu.c
8362  create mode 100644 tools/kvm/virtio/9p.c
8363  create mode 100644 tools/kvm/virtio/balloon.c
8364  create mode 100644 tools/kvm/virtio/blk.c
8365  create mode 100644 tools/kvm/virtio/console.c
8366  create mode 100644 tools/kvm/virtio/core.c
8367  create mode 100644 tools/kvm/virtio/net.c
8368  create mode 100644 tools/kvm/virtio/pci.c
8369  create mode 100644 tools/kvm/virtio/rng.c
8370 Merging scsi-post-merge/merge-base:master
8371 $ git clone -s -l -n -q . ../rebase-tmp
8372 $ cd ../rebase-tmp
8373 $ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm
8374 From ../next
8375  * [new branch]      quilt/akpm -> akpm
8376 $ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base
8377 From ../next
8378  * [new branch]      quilt/akpm-base -> akpm-base
8379 $ git checkout akpm
8380 Switched to branch 'akpm'
8381 $ git rebase --onto master akpm-base
8382 First, rewinding head to replay your work on top of it...
8383 Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
8384 Applying: This patch makes two changes:
8385 Applying: On thread exit shm_exit_ns() is called, it uses shm_ids(ns).rw_mutex.  It
8386 Applying: Because of x86-implement-strict-user-copy-checks-for-x86_64.patch
8387 Applying: When no floppy is found the module code can be released while a timer
8388 Applying: The parameter's origin type is long.  On an i386 architecture, it can
8389 Applying: Add support for Aspire 1410 BIOS v1.3314.  Fixes the following error:
8390 Applying: This makes the iris driver use the platform API, so it is properly exposed
8391 Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
8392 Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
8393 Applying: Cc: Ed Wildgoose <git@wildgooses.com>
8394 Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
8395 Applying: The x86 timer interrupt handler is the only handler not traced in the
8396 Applying: The current interrupt traces from irq_handler_entry and irq_handler_exit
8397 Applying: Don't allow everybody to use a modem.
8398 Applying: The address limit is already set in flush_old_exec() so this
8399 Applying: A call to va_copy() should always be followed by a call to va_end() in the
8400 Applying: Don't dereference em if it's NULL or an error pointer.
8401 Applying: Some messing with error codes to return 0 on out id's and match
8402 Applying: fb_set_suspend() must be called with the console semaphore held, which
8403 Applying: hwmon was using an idr with a NULL pointer, so convert to an
8404 Applying: A straightforward looking use of idr for a device id.
8405 Using index info to reconstruct a base tree...
8406 Falling back to patching base and 3-way merge...
8407 Auto-merging drivers/hwmon/ibmaem.c
8408 Applying: The address limit is already set in flush_old_exec() so this
8409 Applying: The address limit is already set in flush_old_exec() so this
8410 Applying: Add new check (assert_init) to make sure objects are initialized and
8411 Applying: del_timer_sync() calls debug_object_assert_init() to assert that a timer
8412 Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
8413 Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
8414 Applying: The address limit is already set in flush_old_exec() so those calls to
8415 Applying: When do pci remove/rescan on system that have more iommus, got
8416 Applying: The current implementation of dmi_name_in_vendors() is an invitation to
8417 Applying: For headers that get exported to userland and make use of u32 style
8418 Applying: Fix sparse warnings of right shift bigger than source value size:
8419 Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
8420 Applying: Some mangling of errors was necessary to maintain current interface.
8421 Applying: This does involve additional use of the spin lock in idr.c.  Is this an
8422 Applying: Instead of open coding this function use kstrtoul_from_user() directly.
8423 Applying: brd_make_request() always returns 0, which doesn't make much sense.
8424 Applying: The address limit is already set in flush_old_exec() so this assignment of
8425 Applying: The basic idea behind cross memory attach is to allow MPI programs doing
8426 Applying: - Add x86_64 specific wire up
8427 Applying: acct_isolated of compaction uses page_lru_base_type which returns only
8428 Applying: Change ISOLATE_XXX macro with bitwise isolate_mode_t type.  Normally,
8429 Applying: In async mode, compaction doesn't migrate dirty or writeback pages.  So,
8430 Applying: In __zone_reclaim case, we don't want to shrink mapped page.  Nonetheless,
8431 Applying: unmap_and_move() is one a big messy function.  Clean it up.
8432 Applying: radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was
8433 Applying: per-task block plug can reduce block queue lock contention and increase
8434 Applying: The tracing ring-buffer used this function briefly, but not anymore.
8435 Applying: After selecting a task to kill, the oom killer iterates all processes and
8436 Applying: Remove PageSwapBacked (!page_is_file_cache) cases from
8437 Applying: Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
8438 Applying: The current implementation of the /dev/hpet driver couples opening the
8439 Applying: smp_call_function() only lets all other CPUs execute a specific function,
8440 Applying: auto_demotion_disable is called only for online CPUs.  For hotplugged
8441 Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:
8442 Applying: Strict user copy checks are only really supported on x86_32 even though
8443 Applying: The help text for this config is duplicated across the x86, parisc, and
8444 Applying: s/lib-/obj-/ for usercopy.o
8445 Applying: After an "unexpected" reboot, I found this Oops in my logs:
8446 Applying: In the move of the lis3 driver, the hp_accel.c file got dropped from the
8447 Applying: Add axis correction for HP EliteBook 2730p.
8448 Applying: Add axis correction for HP EliteBook 8540w.
8449 Applying: Add axis correction for HP ProBook 6555b.
8450 Applying: Adapt the help text for CONFIG_HP_ACCEL to the move of
8451 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
8452 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
8453 Applying: Change exported functions to use the device given as parameter
8454 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
8455 Applying: Add V2 of the LED driver for a single timer channel for the TPU hardware
8456 Applying: Add support for slice by 8 to existing crc32 algorithm.  Also modify
8457 Applying: don't include asm/msr.h
8458 Applying: This is the one use of an ida that doesn't retry on receiving -EAGAIN.
8459 Applying: One can get this information from minix/inode.c, but adding the
8460 Applying: Signed-off-by: Igor Mammedov <imammedo@redhat.com>
8461 Applying: Force this on for -next/mm testing purposes.
8462 Applying: Add a proc_dointvec_bool() sysctl handler for cases where the input value
8463 Applying: Use the new proc_do_intvec_bool() handler for various boolean inputs.
8464 Applying: Add a proc_dointvec_unsigned() sysctl handler for positive value cases.
8465 Applying: Cc: Alexey Dobriyan <adobriyan@gmail.com>
8466 Applying: Use the new proc_do_intvec_unsigned() handler for various unsigned inputs.
8467 Applying: A default echo function has been provided so it is no longer an error when
8468 Applying: This client driver allows you to use a GPIO pin as a source for PPS
8469 Applying: remove unneeded cast of void*
8470 Applying: Straightforward.  As an aside, the ida_init calls are not needed as far as
8471 $ cd ../next
8472 $ git fetch -f ../rebase-tmp akpm:akpm
8473 From ../rebase-tmp
8474  + 1e25afc...071c6be akpm       -> akpm  (forced update)
8475 $ rm -rf ../rebase-tmp
8476 Merging akpm
8477 $ git merge --no-ff akpm
8478 Removing arch/sparc/lib/usercopy.c
8479 Removing drivers/leds/leds-alix2.c
8480 Merge made by recursive.
8481  Documentation/DocBook/debugobjects.tmpl            |   50 ++
8482  .../trace/postprocess/trace-vmscan-postprocess.pl  |    8 +-
8483  MAINTAINERS                                        |    1 +
8484  arch/arm/include/asm/processor.h                   |    1 -
8485  arch/arm/mach-ux500/mbox-db5500.c                  |    2 +-
8486  arch/ia64/include/asm/processor.h                  |    1 -
8487  arch/parisc/Kconfig                                |    1 +
8488  arch/parisc/Kconfig.debug                          |   14 -
8489  arch/parisc/include/asm/processor.h                |    2 -
8490  arch/parisc/kernel/process.c                       |    1 -
8491  arch/powerpc/include/asm/systbl.h                  |    2 +
8492  arch/powerpc/include/asm/unistd.h                  |    4 +-
8493  arch/s390/Kconfig                                  |    1 +
8494  arch/s390/Kconfig.debug                            |   14 -
8495  arch/s390/lib/Makefile                             |    1 -
8496  arch/sparc/kernel/process_32.c                     |    3 +-
8497  arch/sparc/kernel/process_64.c                     |    3 -
8498  arch/sparc/lib/Makefile                            |    1 -
8499  arch/sparc/lib/usercopy.c                          |    8 -
8500  arch/tile/Kconfig                                  |    8 +-
8501  arch/tile/include/asm/uaccess.h                    |    7 +-
8502  arch/tile/lib/uaccess.c                            |    8 -
8503  arch/unicore32/include/asm/processor.h             |    1 -
8504  arch/x86/Kconfig                                   |   15 +
8505  arch/x86/Kconfig.debug                             |   14 -
8506  arch/x86/ia32/ia32entry.S                          |    2 +
8507  arch/x86/include/asm/irq_vectors.h                 |   50 ++
8508  arch/x86/include/asm/uaccess_64.h                  |   12 +-
8509  arch/x86/include/asm/unistd_32.h                   |    4 +-
8510  arch/x86/include/asm/unistd_64.h                   |    4 +
8511  arch/x86/kernel/apic/apic.c                        |    7 +
8512  arch/x86/kernel/cpu/mcheck/therm_throt.c           |    3 +
8513  arch/x86/kernel/cpu/mcheck/threshold.c             |    3 +
8514  arch/x86/kernel/e820.c                             |   59 +--
8515  arch/x86/kernel/irq.c                              |    6 +-
8516  arch/x86/kernel/irq_work.c                         |    3 +
8517  arch/x86/kernel/smp.c                              |    7 +
8518  arch/x86/kernel/syscall_table_32.S                 |    2 +
8519  arch/x86/kernel/time.c                             |   15 +-
8520  arch/x86/kernel/traps.c                            |    3 +
8521  arch/x86/lib/usercopy_32.c                         |    6 -
8522  arch/x86/mm/mmap.c                                 |    4 +-
8523  arch/x86/mm/tlb.c                                  |    3 +
8524  arch/x86/platform/Makefile                         |    1 +
8525  arch/x86/platform/geode/Makefile                   |    1 +
8526  arch/x86/platform/geode/alix.c                     |  142 ++++++
8527  arch/x86/platform/iris/iris.c                      |   67 +++-
8528  drivers/block/brd.c                                |    2 +-
8529  drivers/block/floppy.c                             |    8 +-
8530  drivers/char/hpet.c                                |   56 ++-
8531  drivers/firmware/dmi_scan.c                        |    6 +-
8532  drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c      |   34 +-
8533  drivers/hwmon/hwmon.c                              |   32 +-
8534  drivers/hwmon/ibmaem.c                             |   47 +--
8535  drivers/idle/intel_idle.c                          |   59 ++-
8536  drivers/iommu/dmar.c                               |    7 +-
8537  drivers/iommu/intel-iommu.c                        |  177 +++++++-
8538  drivers/leds/Kconfig                               |   20 +-
8539  drivers/leds/Makefile                              |    2 +-
8540  drivers/leds/leds-alix2.c                          |  239 ----------
8541  drivers/leds/leds-renesas-tpu.c                    |  343 ++++++++++++++
8542  drivers/misc/lis3lv02d/lis3lv02d.c                 |  389 +++++++++-------
8543  drivers/misc/lis3lv02d/lis3lv02d.h                 |    9 +-
8544  drivers/misc/lis3lv02d/lis3lv02d_i2c.c             |   11 +-
8545  drivers/misc/lis3lv02d/lis3lv02d_spi.c             |    2 +-
8546  drivers/platform/x86/Kconfig                       |    2 +-
8547  drivers/platform/x86/acerhdf.c                     |    1 +
8548  drivers/platform/x86/hp_accel.c                    |   10 +-
8549  drivers/pps/clients/Kconfig                        |    9 +
8550  drivers/pps/clients/Makefile                       |    1 +
8551  drivers/pps/clients/pps-gpio.c                     |  227 +++++++++
8552  drivers/pps/clients/pps-ktimer.c                   |   12 -
8553  drivers/pps/clients/pps_parport.c                  |    9 -
8554  drivers/pps/kapi.c                                 |   20 +-
8555  drivers/rtc/class.c                                |   32 +-
8556  drivers/scsi/aacraid/commctrl.c                    |    1 +
8557  drivers/scsi/megaraid.c                            |    8 +-
8558  drivers/scsi/osd/osd_uld.c                         |   22 +-
8559  drivers/scsi/sd.c                                  |   32 +-
8560  drivers/scsi/sg.c                                  |   25 +-
8561  drivers/video/fbmem.c                              |   24 +-
8562  drivers/w1/slaves/w1_ds2760.c                      |   48 +--
8563  drivers/w1/slaves/w1_ds2780.c                      |   48 +--
8564  fs/aio.c                                           |    4 +-
8565  fs/btrfs/inode.c                                   |    3 +-
8566  fs/compat.c                                        |    7 +-
8567  fs/ext4/ext4.h                                     |    7 +-
8568  fs/ext4/ialloc.c                                   |    4 +-
8569  fs/ocfs2/ocfs2.h                                   |   47 ++
8570  fs/ocfs2/quota_local.c                             |   10 +-
8571  fs/read_write.c                                    |    8 +-
8572  include/linux/compat.h                             |    3 +-
8573  include/linux/debugobjects.h                       |    6 +
8574  include/linux/dmar.h                               |    5 +
8575  include/linux/fs.h                                 |    7 +-
8576  include/linux/hpet.h                               |    1 +
8577  include/linux/jiffies.h                            |    2 +-
8578  include/linux/leds-renesas-tpu.h                   |   14 +
8579  include/linux/magic.h                              |   10 +-
8580  include/linux/memcontrol.h                         |    3 +-
8581  include/linux/mmzone.h                             |   12 +
8582  include/linux/pps-gpio.h                           |   32 ++
8583  include/linux/swap.h                               |    7 +-
8584  include/linux/syscalls.h                           |   13 +
8585  include/linux/sysctl.h                             |    4 +
8586  include/linux/writeback.h                          |    2 -
8587  include/scsi/scsi_netlink.h                        |    2 +-
8588  include/trace/events/irq_vectors.h                 |   56 +++
8589  include/trace/events/vmscan.h                      |    8 +-
8590  init/do_mounts.c                                   |   46 ++-
8591  ipc/msgutil.c                                      |    6 +
8592  ipc/shm.c                                          |   13 +-
8593  ipc/util.c                                         |   30 +-
8594  ipc/util.h                                         |    1 +
8595  kernel/audit.c                                     |    5 +-
8596  kernel/kprobes.c                                   |    2 +-
8597  kernel/sys_ni.c                                    |    4 +
8598  kernel/sysctl.c                                    |  103 +++--
8599  kernel/time.c                                      |    2 +-
8600  kernel/timer.c                                     |   54 ++-
8601  lib/Kconfig.debug                                  |   18 +
8602  lib/Makefile                                       |    1 +
8603  lib/crc32.c                                        |  370 +++++++++++-----
8604  lib/crc32defs.h                                    |   16 +-
8605  lib/debugobjects.c                                 |   33 ++
8606  lib/gen_crc32table.c                               |   59 ++-
8607  lib/radix-tree.c                                   |   10 +-
8608  {arch/s390/lib => lib}/usercopy.c                  |    0
8609  mm/Makefile                                        |    3 +-
8610  mm/compaction.c                                    |   24 +-
8611  mm/memcontrol.c                                    |    5 +-
8612  mm/mempolicy.c                                     |    4 +-
8613  mm/migrate.c                                       |   75 ++--
8614  mm/mincore.c                                       |    6 +
8615  mm/oom_kill.c                                      |    5 +-
8616  mm/page-writeback.c                                |  122 +++---
8617  mm/process_vm_access.c                             |  487 ++++++++++++++++++++
8618  mm/vmscan.c                                        |   63 ++-
8619  security/keys/compat.c                             |    2 +-
8620  security/keys/keyctl.c                             |    2 +-
8621  security/selinux/selinuxfs.c                       |   14 +-
8622  141 files changed, 3100 insertions(+), 1311 deletions(-)
8623  delete mode 100644 arch/sparc/lib/usercopy.c
8624  create mode 100644 arch/x86/platform/geode/Makefile
8625  create mode 100644 arch/x86/platform/geode/alix.c
8626  delete mode 100644 drivers/leds/leds-alix2.c
8627  create mode 100644 drivers/leds/leds-renesas-tpu.c
8628  create mode 100644 drivers/pps/clients/pps-gpio.c
8629  create mode 100644 include/linux/leds-renesas-tpu.h
8630  create mode 100644 include/linux/pps-gpio.h
8631  create mode 100644 include/trace/events/irq_vectors.h
8632  rename {arch/s390/lib => lib}/usercopy.c (100%)
8633  create mode 100644 mm/process_vm_access.c
8634 $ git am -3 ../patches/0001-do_mounts-remove-__init_data-from-root_wait.patch
8635 Applying: do_mounts: remove __init_data from root_wait
8636 $ git reset HEAD^
8637 Unstaged changes after reset:
8638 M       init/do_mounts.c
8639 $ git add .
8640 $ git commit -v -a --amend
8641 [master f0b3d29] Merge branch 'akpm'
8642 $ git revert 1dac4186bcc6
8643 [master 9cba48a] Revert "Staging: add driver for Realtek RTS5139 cardreader"
8644  30 files changed, 0 insertions(+), 21799 deletions(-)
8645  delete mode 100644 drivers/staging/rts5139/Kconfig
8646  delete mode 100644 drivers/staging/rts5139/Makefile
8647  delete mode 100644 drivers/staging/rts5139/TODO
8648  delete mode 100644 drivers/staging/rts5139/debug.h
8649  delete mode 100644 drivers/staging/rts5139/ms.c
8650  delete mode 100644 drivers/staging/rts5139/ms.h
8651  delete mode 100644 drivers/staging/rts5139/ms_mg.c
8652  delete mode 100644 drivers/staging/rts5139/ms_mg.h
8653  delete mode 100644 drivers/staging/rts5139/rts51x.c
8654  delete mode 100644 drivers/staging/rts5139/rts51x.h
8655  delete mode 100644 drivers/staging/rts5139/rts51x_card.c
8656  delete mode 100644 drivers/staging/rts5139/rts51x_card.h
8657  delete mode 100644 drivers/staging/rts5139/rts51x_chip.c
8658  delete mode 100644 drivers/staging/rts5139/rts51x_chip.h
8659  delete mode 100644 drivers/staging/rts5139/rts51x_fop.c
8660  delete mode 100644 drivers/staging/rts5139/rts51x_fop.h
8661  delete mode 100644 drivers/staging/rts5139/rts51x_scsi.c
8662  delete mode 100644 drivers/staging/rts5139/rts51x_scsi.h
8663  delete mode 100644 drivers/staging/rts5139/rts51x_sys.h
8664  delete mode 100644 drivers/staging/rts5139/rts51x_transport.c
8665  delete mode 100644 drivers/staging/rts5139/rts51x_transport.h
8666  delete mode 100644 drivers/staging/rts5139/sd.c
8667  delete mode 100644 drivers/staging/rts5139/sd.h
8668  delete mode 100644 drivers/staging/rts5139/sd_cprm.c
8669  delete mode 100644 drivers/staging/rts5139/sd_cprm.h
8670  delete mode 100644 drivers/staging/rts5139/trace.h
8671  delete mode 100644 drivers/staging/rts5139/xd.c
8672  delete mode 100644 drivers/staging/rts5139/xd.h