Next/merge.log

   1 $ date
   2 Wed Sep 14 10:52:19 EST 2011
   3 $ git checkout master
   4 Already on 'master'
   5 $ git reset --hard stable
   6 HEAD is now at b6fd41e Linux 3.1-rc6
   7 Merging origin/master
   8 $ git merge origin/master
   9 Updating b6fd41e..003f6c9
  10 Fast-forward
  11  Documentation/kernel-parameters.txt |    9 ++++++---
  12  arch/x86/xen/time.c                 |    5 +++--
  13  drivers/acpi/acpica/acconfig.h      |    2 +-
  14  drivers/acpi/apei/Kconfig           |    1 +
  15  drivers/acpi/apei/apei-base.c       |    2 +-
  16  drivers/pci/probe.c                 |    3 ++-
  17  lib/sha1.c                          |    1 +
  18  7 files changed, 15 insertions(+), 8 deletions(-)
  19 Merging fixes/fixes
  20 $ git merge fixes/fixes
  21 Already up-to-date.
  22 Merging kbuild-current/rc-fixes
  23 $ git merge kbuild-current/rc-fixes
  24 Already up-to-date.
  25 Merging arm-current/master
  26 $ git merge arm-current/master
  27 Already up-to-date.
  28 Merging m68k-current/for-linus
  29 $ git merge m68k-current/for-linus
  30 Already up-to-date.
  31 Merging powerpc-merge/merge
  32 $ git merge powerpc-merge/merge
  33 Already up-to-date.
  34 Merging 52xx-and-virtex-current/powerpc/merge
  35 $ git merge 52xx-and-virtex-current/powerpc/merge
  36 Already up-to-date.
  37 Merging sparc-current/master
  38 $ git merge sparc-current/master
  39 Already up-to-date.
  40 Merging scsi-rc-fixes/master
  41 $ git merge scsi-rc-fixes/master
  42 Auto-merging MAINTAINERS
  43 Merge made by recursive.
  44  Documentation/ABI/testing/sysfs-class-scsi_host |   13 +
  45  MAINTAINERS                                     |   11 +
  46  drivers/scsi/bnx2i/bnx2i_hwi.c                  |    2 +-
  47  drivers/scsi/fcoe/fcoe.c                        |   13 +-
  48  drivers/scsi/hpsa.c                             |   57 +++--
  49  drivers/scsi/isci/host.c                        |   13 +-
  50  drivers/scsi/isci/host.h                        |    3 +
  51  drivers/scsi/isci/init.c                        |   47 +++--
  52  drivers/scsi/isci/phy.c                         |   13 +
  53  drivers/scsi/isci/registers.h                   |   12 +
  54  drivers/scsi/isci/request.c                     |   30 ++--
  55  drivers/scsi/isci/unsolicited_frame_control.c   |    2 +-
  56  drivers/scsi/isci/unsolicited_frame_control.h   |    2 +-
  57  drivers/scsi/libfc/fc_exch.c                    |   59 ++++--
  58  drivers/scsi/libfc/fc_fcp.c                     |   11 +-
  59  drivers/scsi/libfc/fc_lport.c                   |   11 +-
  60  drivers/scsi/qla2xxx/qla_attr.c                 |    7 +-
  61  drivers/scsi/qla2xxx/qla_dbg.c                  |   36 ++--
  62  drivers/scsi/qla2xxx/qla_def.h                  |    2 +
  63  drivers/scsi/qla2xxx/qla_fw.h                   |    5 +
  64  drivers/scsi/qla2xxx/qla_init.c                 |    3 -
  65  drivers/scsi/qla2xxx/qla_inline.h               |   29 +++
  66  drivers/scsi/qla2xxx/qla_iocb.c                 |  282 +++++++++++++++++++----
  67  drivers/scsi/qla2xxx/qla_isr.c                  |  109 +++++++--
  68  drivers/scsi/qla2xxx/qla_mid.c                  |    2 +-
  69  drivers/scsi/qla2xxx/qla_nx.c                   |   25 +-
  70  drivers/scsi/qla2xxx/qla_os.c                   |   30 ++-
  71  drivers/scsi/qla2xxx/qla_version.h              |    2 +-
  72  28 files changed, 631 insertions(+), 200 deletions(-)
  73  create mode 100644 Documentation/ABI/testing/sysfs-class-scsi_host
  74 Merging net-current/master
  75 $ git merge net-current/master
  76 Auto-merging MAINTAINERS
  77 Merge made by recursive.
  78  MAINTAINERS                            |    6 ++----
  79  include/net/transp_v6.h                |    1 +
  80  net/bridge/netfilter/Kconfig           |    2 +-
  81  net/ipv4/af_inet.c                     |    7 ++++++-
  82  net/ipv4/netfilter/ip_queue.c          |   12 +++++-------
  83  net/ipv6/datagram.c                    |    5 +++--
  84  net/ipv6/ip6_flowlabel.c               |    8 ++++----
  85  net/ipv6/ipv6_sockglue.c               |    2 +-
  86  net/ipv6/netfilter/ip6_queue.c         |   12 +++++-------
  87  net/ipv6/raw.c                         |    4 ++--
  88  net/ipv6/udp.c                         |    4 ++--
  89  net/netfilter/nf_conntrack_pptp.c      |    1 +
  90  net/netfilter/nf_conntrack_proto_tcp.c |    6 +++---
  91  net/netfilter/nfnetlink_queue.c        |    4 ++--
  92  net/netfilter/xt_rateest.c             |    9 ++++-----
  93  15 files changed, 42 insertions(+), 41 deletions(-)
  94 Merging sound-current/for-linus
  95 $ git merge sound-current/for-linus
  96 Already up-to-date.
  97 Merging pci-current/for-linus
  98 $ git merge pci-current/for-linus
  99 Merge made by recursive.
 100  drivers/pci/hotplug/shpchp_core.c |    4 ++--
 101  drivers/pci/hotplug/shpchp_hpc.c  |    4 ++--
 102  2 files changed, 4 insertions(+), 4 deletions(-)
 103 Merging wireless-current/master
 104 $ git merge wireless-current/master
 105 Merge made by recursive.
 106  drivers/net/wireless/ath/ath9k/ar9002_calib.c    |    3 ++-
 107  drivers/net/wireless/ath/ath9k/ar9003_phy.c      |    2 +-
 108  drivers/net/wireless/ath/ath9k/main.c            |    6 ++++++
 109  drivers/net/wireless/iwlegacy/iwl-3945-rs.c      |   13 ++++++++-----
 110  drivers/net/wireless/iwlwifi/iwl-agn-ucode.c     |    2 +-
 111  drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c |    2 ++
 112  drivers/net/wireless/rtlwifi/core.c              |    8 ++++++++
 113  drivers/net/wireless/rtlwifi/rtl8192cu/trx.c     |   11 ++++++-----
 114  net/mac80211/sta_info.c                          |    2 +-
 115  9 files changed, 35 insertions(+), 14 deletions(-)
 116 Merging driver-core.current/driver-core-linus
 117 $ git merge driver-core.current/driver-core-linus
 118 Already up-to-date.
 119 Merging tty.current/tty-linus
 120 $ git merge tty.current/tty-linus
 121 Already up-to-date.
 122 Merging usb.current/usb-linus
 123 $ git merge usb.current/usb-linus
 124 Already up-to-date.
 125 Merging staging.current/staging-linus
 126 $ git merge staging.current/staging-linus
 127 Already up-to-date.
 128 Merging cpufreq-current/fixes
 129 $ git merge cpufreq-current/fixes
 130 Already up-to-date.
 131 Merging input-current/for-linus
 132 $ git merge input-current/for-linus
 133 Merge made by recursive.
 134  drivers/input/keyboard/adp5588-keys.c |    1 -
 135  drivers/input/misc/cm109.c            |    2 +-
 136  drivers/input/tablet/wacom_sys.c      |   14 --------------
 137  drivers/input/tablet/wacom_wac.c      |   10 +++++-----
 138  4 files changed, 6 insertions(+), 21 deletions(-)
 139 Merging md-current/for-linus
 140 $ git merge md-current/for-linus
 141 Already up-to-date.
 142 Merging audit-current/for-linus
 143 $ git merge audit-current/for-linus
 144 Already up-to-date.
 145 Merging crypto-current/master
 146 $ git merge crypto-current/master
 147 Already up-to-date.
 148 Merging ide-curent/master
 149 $ git merge ide-curent/master
 150 Already up-to-date.
 151 Merging dwmw2/master
 152 $ git merge dwmw2/master
 153 Already up-to-date.
 154 Merging sh-current/sh-fixes-for-linus
 155 $ git merge sh-current/sh-fixes-for-linus
 156 Already up-to-date.
 157 Merging rmobile-current/rmobile-fixes-for-linus
 158 $ git merge rmobile-current/rmobile-fixes-for-linus
 159 Already up-to-date.
 160 Merging devicetree-current/devicetree/merge
 161 $ git merge devicetree-current/devicetree/merge
 162 Already up-to-date.
 163 Merging spi-current/spi/merge
 164 $ git merge spi-current/spi/merge
 165 Already up-to-date.
 166 Merging arm/for-next
 167 $ git merge arm/for-next
 168 Removing arch/arm/include/asm/auxvec.h
 169 Removing arch/arm/include/asm/bitsperlong.h
 170 Removing arch/arm/include/asm/cputime.h
 171 Removing arch/arm/include/asm/emergency-restart.h
 172 Removing arch/arm/include/asm/errno.h
 173 Removing arch/arm/include/asm/ioctl.h
 174 Removing arch/arm/include/asm/irq_regs.h
 175 Removing arch/arm/include/asm/kdebug.h
 176 Removing arch/arm/include/asm/local.h
 177 Removing arch/arm/include/asm/local64.h
 178 Removing arch/arm/include/asm/percpu.h
 179 Removing arch/arm/include/asm/poll.h
 180 Removing arch/arm/include/asm/resource.h
 181 Removing arch/arm/include/asm/sections.h
 182 Removing arch/arm/include/asm/siginfo.h
 183 Removing arch/arm/include/asm/sizes.h
 184 Auto-merging arch/arm/mach-davinci/board-da850-evm.c
 185 Auto-merging arch/arm/mach-ixp2000/include/mach/gpio-ixp2000.h
 186 Auto-merging arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h
 187 Removing arch/arm/mach-sa1100/leds-simpad.c
 188 Auto-merging arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
 189 Auto-merging drivers/gpio/gpio-davinci.c
 190 Auto-merging drivers/gpio/gpio-ks8695.c
 191 Auto-merging drivers/gpio/gpio-lpc32xx.c
 192 Auto-merging drivers/gpio/gpio-sa1100.c
 193 Merge made by recursive.
 194  Documentation/devicetree/bindings/arm/l2cc.txt     |   42 +
 195  arch/arm/Kconfig                                   |   46 +-
 196  arch/arm/Kconfig.debug                             |   48 +-
 197  arch/arm/Makefile                                  |    3 +
 198  arch/arm/boot/Makefile                             |    9 +
 199  arch/arm/boot/compressed/Makefile                  |    8 +
 200  arch/arm/common/gic.c                              |   17 +-
 201  arch/arm/common/scoop.c                            |    2 +-
 202  arch/arm/include/asm/Kbuild                        |   17 +
 203  arch/arm/include/asm/auxvec.h                      |    4 -
 204  arch/arm/include/asm/bitsperlong.h                 |    1 -
 205  arch/arm/include/asm/bug.h                         |   55 +-
 206  arch/arm/include/asm/cputime.h                     |    6 -
 207  arch/arm/include/asm/cputype.h                     |    6 +
 208  arch/arm/include/asm/device.h                      |    5 +
 209  arch/arm/include/asm/dma-mapping.h                 |    9 +-
 210  arch/arm/include/asm/ecard.h                       |    1 -
 211  arch/arm/include/asm/emergency-restart.h           |    6 -
 212  arch/arm/include/asm/errno.h                       |    6 -
 213  arch/arm/include/asm/gpio.h                        |   19 +
 214  arch/arm/include/asm/hardware/cache-l2x0.h         |   17 +
 215  arch/arm/include/asm/hardware/iop3xx-gpio.h        |    2 +
 216  arch/arm/include/asm/io.h                          |   21 +
 217  arch/arm/include/asm/ioctl.h                       |    1 -
 218  arch/arm/include/asm/irq_regs.h                    |    1 -
 219  arch/arm/include/asm/kdebug.h                      |    1 -
 220  arch/arm/include/asm/local.h                       |    1 -
 221  arch/arm/include/asm/local64.h                     |    1 -
 222  arch/arm/include/asm/mach/arch.h                   |    2 +-
 223  arch/arm/include/asm/memory.h                      |   16 -
 224  arch/arm/include/asm/module.h                      |    4 -
 225  arch/arm/include/asm/page.h                        |   42 +-
 226  arch/arm/include/asm/percpu.h                      |    6 -
 227  arch/arm/include/asm/pgalloc.h                     |    6 +-
 228  arch/arm/include/asm/pgtable-2level-hwdef.h        |   93 ++
 229  arch/arm/include/asm/pgtable-2level-types.h        |   67 ++
 230  arch/arm/include/asm/pgtable-2level.h              |  143 +++
 231  arch/arm/include/asm/pgtable-hwdef.h               |   77 +--
 232  arch/arm/include/asm/pgtable.h                     |  164 +---
 233  arch/arm/include/asm/poll.h                        |    1 -
 234  arch/arm/include/asm/proc-fns.h                    |    8 +
 235  arch/arm/include/asm/resource.h                    |    6 -
 236  arch/arm/include/asm/sections.h                    |    1 -
 237  arch/arm/include/asm/siginfo.h                     |    6 -
 238  arch/arm/include/asm/sizes.h                       |   21 -
 239  arch/arm/include/asm/smp.h                         |    6 +
 240  arch/arm/include/asm/suspend.h                     |   17 +-
 241  arch/arm/include/asm/system.h                      |    4 +-
 242  arch/arm/include/asm/tlb.h                         |    1 +
 243  arch/arm/include/asm/tlbflush.h                    |    4 +-
 244  arch/arm/include/asm/topology.h                    |   33 +
 245  arch/arm/kernel/Makefile                           |    3 +-
 246  arch/arm/kernel/armksyms.c                         |    3 -
 247  arch/arm/kernel/ecard.c                            |   36 +-
 248  arch/arm/kernel/entry-armv.S                       |   44 +-
 249  arch/arm/kernel/head.S                             |  135 +--
 250  arch/arm/kernel/module.c                           |    2 +-
 251  arch/arm/kernel/process.c                          |    2 +-
 252  arch/arm/kernel/setup.c                            |   41 +-
 253  arch/arm/kernel/sleep.S                            |   85 +-
 254  arch/arm/kernel/smp.c                              |   20 +
 255  arch/arm/kernel/suspend.c                          |   70 ++
 256  arch/arm/kernel/topology.c                         |  148 +++
 257  arch/arm/kernel/traps.c                            |   31 +-
 258  arch/arm/kernel/vmlinux.lds.S                      |    3 +-
 259  arch/arm/lib/backtrace.S                           |    6 -
 260  arch/arm/mach-at91/Makefile.boot                   |    6 +-
 261  arch/arm/mach-at91/at91cap9_devices.c              |    2 +-
 262  arch/arm/mach-at91/at91rm9200_devices.c            |    2 +-
 263  arch/arm/mach-at91/at91sam9260_devices.c           |    2 +-
 264  arch/arm/mach-at91/at91sam9261_devices.c           |    2 +-
 265  arch/arm/mach-at91/at91sam9263_devices.c           |    2 +-
 266  arch/arm/mach-at91/at91sam9g45.c                   |    2 +
 267  arch/arm/mach-at91/at91sam9g45_devices.c           |    2 +-
 268  arch/arm/mach-at91/at91sam9rl_devices.c            |    2 +-
 269  arch/arm/mach-at91/board-1arm.c                    |    2 +-
 270  arch/arm/mach-at91/board-afeb-9260v1.c             |    2 +-
 271  arch/arm/mach-at91/board-cam60.c                   |    2 +-
 272  arch/arm/mach-at91/board-cap9adk.c                 |    2 +-
 273  arch/arm/mach-at91/board-carmeva.c                 |    2 +-
 274  arch/arm/mach-at91/board-cpu9krea.c                |    2 +-
 275  arch/arm/mach-at91/board-cpuat91.c                 |    2 +-
 276  arch/arm/mach-at91/board-csb337.c                  |    2 +-
 277  arch/arm/mach-at91/board-csb637.c                  |    2 +-
 278  arch/arm/mach-at91/board-eb9200.c                  |    2 +-
 279  arch/arm/mach-at91/board-ecbat91.c                 |    2 +-
 280  arch/arm/mach-at91/board-kafa.c                    |    2 +-
 281  arch/arm/mach-at91/board-kb9202.c                  |    2 +-
 282  arch/arm/mach-at91/board-neocore926.c              |    2 +-
 283  arch/arm/mach-at91/board-picotux200.c              |    2 +-
 284  arch/arm/mach-at91/board-qil-a9260.c               |    2 +-
 285  arch/arm/mach-at91/board-rm9200dk.c                |    2 +-
 286  arch/arm/mach-at91/board-rm9200ek.c                |    2 +-
 287  arch/arm/mach-at91/board-sam9-l9260.c              |    2 +-
 288  arch/arm/mach-at91/board-sam9260ek.c               |    2 +-
 289  arch/arm/mach-at91/board-sam9261ek.c               |    2 +-
 290  arch/arm/mach-at91/board-sam9263ek.c               |    2 +-
 291  arch/arm/mach-at91/board-sam9g20ek.c               |    2 +-
 292  arch/arm/mach-at91/board-sam9m10g45ek.c            |    2 +-
 293  arch/arm/mach-at91/board-sam9rlek.c                |    2 +-
 294  arch/arm/mach-at91/board-usb-a9260.c               |    2 +-
 295  arch/arm/mach-at91/board-usb-a9263.c               |    2 +-
 296  arch/arm/mach-at91/board-yl-9200.c                 |    2 +-
 297  arch/arm/mach-at91/gpio.c                          |    4 +-
 298  arch/arm/mach-at91/include/mach/at91sam9g45.h      |    2 -
 299  arch/arm/mach-at91/include/mach/gpio.h             |    5 -
 300  arch/arm/mach-at91/leds.c                          |    2 +-
 301  arch/arm/mach-at91/pm.c                            |    2 +-
 302  arch/arm/mach-bcmring/Makefile.boot                |    2 +-
 303  arch/arm/mach-bcmring/include/mach/memory.h        |    5 -
 304  arch/arm/mach-bcmring/mm.c                         |    3 +
 305  arch/arm/mach-clps711x/Makefile.boot               |    2 +-
 306  arch/arm/mach-clps711x/autcpu12.c                  |    2 +-
 307  arch/arm/mach-clps711x/cdb89712.c                  |    2 +-
 308  arch/arm/mach-clps711x/ceiva.c                     |    2 +-
 309  arch/arm/mach-clps711x/clep7312.c                  |    2 +-
 310  arch/arm/mach-clps711x/edb7211-arch.c              |    2 +-
 311  arch/arm/mach-clps711x/fortunet.c                  |    1 -
 312  arch/arm/mach-clps711x/p720t.c                     |    2 +-
 313  arch/arm/mach-cns3xxx/Makefile.boot                |    2 +-
 314  arch/arm/mach-cns3xxx/cns3420vb.c                  |    2 +-
 315  arch/arm/mach-davinci/Makefile                     |    3 +-
 316  arch/arm/mach-davinci/Makefile.boot                |    4 +-
 317  arch/arm/mach-davinci/board-da830-evm.c            |    2 +-
 318  arch/arm/mach-davinci/board-da850-evm.c            |    2 +-
 319  arch/arm/mach-davinci/board-dm355-evm.c            |    2 +-
 320  arch/arm/mach-davinci/board-dm355-leopard.c        |    2 +-
 321  arch/arm/mach-davinci/board-dm365-evm.c            |    2 +-
 322  arch/arm/mach-davinci/board-dm644x-evm.c           |    2 +-
 323  arch/arm/mach-davinci/board-dm646x-evm.c           |    4 +-
 324  arch/arm/mach-davinci/board-mityomapl138.c         |    2 +-
 325  arch/arm/mach-davinci/board-neuros-osd2.c          |    2 +-
 326  arch/arm/mach-davinci/board-omapl138-hawk.c        |    2 +-
 327  arch/arm/mach-davinci/board-sffsdr.c               |    2 +-
 328  arch/arm/mach-davinci/board-tnetv107x-evm.c        |    2 +-
 329  arch/arm/mach-davinci/common.c                     |    3 +
 330  arch/arm/mach-davinci/da830.c                      |    3 +-
 331  arch/arm/mach-davinci/da850.c                      |    3 +-
 332  arch/arm/mach-davinci/dm355.c                      |    2 +-
 333  arch/arm/mach-davinci/dm365.c                      |    3 +-
 334  arch/arm/mach-davinci/dm644x.c                     |    2 +-
 335  arch/arm/mach-davinci/dm646x.c                     |    2 +-
 336  arch/arm/mach-davinci/include/mach/gpio-davinci.h  |   91 ++
 337  arch/arm/mach-davinci/include/mach/gpio.h          |   79 +--
 338  arch/arm/mach-davinci/include/mach/memory.h        |    5 -
 339  arch/arm/mach-davinci/tnetv107x.c                  |    3 +-
 340  arch/arm/mach-dove/Makefile.boot                   |    2 +-
 341  arch/arm/mach-dove/cm-a510.c                       |    2 +-
 342  arch/arm/mach-dove/dove-db-setup.c                 |    2 +-
 343  arch/arm/mach-ebsa110/Makefile.boot                |    2 +-
 344  arch/arm/mach-ebsa110/core.c                       |    2 +-
 345  arch/arm/mach-ebsa110/include/mach/io.h            |    2 -
 346  arch/arm/mach-ep93xx/Makefile.boot                 |   10 +-
 347  arch/arm/mach-ep93xx/adssphere.c                   |    2 +-
 348  arch/arm/mach-ep93xx/edb93xx.c                     |   16 +-
 349  arch/arm/mach-ep93xx/gesbc9312.c                   |    2 +-
 350  arch/arm/mach-ep93xx/include/mach/gpio.h           |   17 +-
 351  arch/arm/mach-ep93xx/micro9.c                      |    8 +-
 352  arch/arm/mach-ep93xx/simone.c                      |    4 +-
 353  arch/arm/mach-ep93xx/snappercl15.c                 |    2 +-
 354  arch/arm/mach-ep93xx/ts72xx.c                      |    2 +-
 355  arch/arm/mach-exynos4/Makefile.boot                |    2 +-
 356  arch/arm/mach-exynos4/include/mach/gpio.h          |    7 -
 357  arch/arm/mach-exynos4/mach-armlex4210.c            |    2 +-
 358  arch/arm/mach-exynos4/mach-nuri.c                  |    2 +-
 359  arch/arm/mach-exynos4/mach-smdkc210.c              |    2 +-
 360  arch/arm/mach-exynos4/mach-smdkv310.c              |    2 +-
 361  arch/arm/mach-exynos4/mach-universal_c210.c        |    2 +-
 362  arch/arm/mach-footbridge/Kconfig                   |    4 +-
 363  arch/arm/mach-footbridge/Makefile.boot             |    2 +-
 364  arch/arm/mach-footbridge/cats-hw.c                 |    2 +-
 365  arch/arm/mach-footbridge/ebsa285.c                 |    2 +-
 366  arch/arm/mach-footbridge/include/mach/io.h         |    2 -
 367  arch/arm/mach-footbridge/netwinder-hw.c            |    2 +-
 368  arch/arm/mach-footbridge/personal.c                |    2 +-
 369  arch/arm/mach-gemini/Makefile.boot                 |    4 +-
 370  arch/arm/mach-gemini/board-nas4220b.c              |    2 +-
 371  arch/arm/mach-gemini/board-rut1xx.c                |    2 +-
 372  arch/arm/mach-gemini/board-wbd111.c                |    2 +-
 373  arch/arm/mach-gemini/board-wbd222.c                |    2 +-
 374  arch/arm/mach-gemini/include/mach/gpio.h           |    5 -
 375  arch/arm/mach-h720x/Makefile.boot                  |    2 +-
 376  arch/arm/mach-h720x/h7201-eval.c                   |    2 +-
 377  arch/arm/mach-h720x/h7202-eval.c                   |    2 +-
 378  arch/arm/mach-imx/Makefile.boot                    |   10 +-
 379  arch/arm/mach-imx/iomux-imx31.c                    |    3 +-
 380  arch/arm/mach-imx/mach-armadillo5x0.c              |    2 +-
 381  arch/arm/mach-imx/mach-cpuimx27.c                  |    2 +-
 382  arch/arm/mach-imx/mach-cpuimx35.c                  |    2 +-
 383  arch/arm/mach-imx/mach-eukrea_cpuimx25.c           |    2 +-
 384  arch/arm/mach-imx/mach-imx27_visstrim_m10.c        |    2 +-
 385  arch/arm/mach-imx/mach-imx27ipcam.c                |    2 +-
 386  arch/arm/mach-imx/mach-imx27lite.c                 |    2 +-
 387  arch/arm/mach-imx/mach-kzm_arm11_01.c              |    2 +-
 388  arch/arm/mach-imx/mach-mx1ads.c                    |    4 +-
 389  arch/arm/mach-imx/mach-mx21ads.c                   |    2 +-
 390  arch/arm/mach-imx/mach-mx25_3ds.c                  |    2 +-
 391  arch/arm/mach-imx/mach-mx27_3ds.c                  |    2 +-
 392  arch/arm/mach-imx/mach-mx27ads.c                   |    5 +-
 393  arch/arm/mach-imx/mach-mx31_3ds.c                  |    2 +-
 394  arch/arm/mach-imx/mach-mx31ads.c                   |    2 +-
 395  arch/arm/mach-imx/mach-mx31lilly.c                 |    2 +-
 396  arch/arm/mach-imx/mach-mx31lite.c                  |    2 +-
 397  arch/arm/mach-imx/mach-mx31moboard.c               |    2 +-
 398  arch/arm/mach-imx/mach-mx35_3ds.c                  |    2 +-
 399  arch/arm/mach-imx/mach-mxt_td60.c                  |    2 +-
 400  arch/arm/mach-imx/mach-pca100.c                    |    2 +-
 401  arch/arm/mach-imx/mach-pcm037.c                    |    2 +-
 402  arch/arm/mach-imx/mach-pcm038.c                    |    2 +-
 403  arch/arm/mach-imx/mach-pcm043.c                    |    2 +-
 404  arch/arm/mach-imx/mach-qong.c                      |    2 +-
 405  arch/arm/mach-imx/mach-scb9328.c                   |    2 +-
 406  arch/arm/mach-integrator/Makefile.boot             |    2 +-
 407  arch/arm/mach-integrator/core.c                    |    4 +
 408  arch/arm/mach-integrator/include/mach/io.h         |    2 -
 409  arch/arm/mach-integrator/include/mach/platform.h   |   12 -
 410  arch/arm/mach-integrator/integrator_ap.c           |   88 +-
 411  arch/arm/mach-integrator/integrator_cp.c           |    2 +-
 412  arch/arm/mach-iop13xx/Makefile.boot                |    2 +-
 413  arch/arm/mach-iop13xx/iq81340mc.c                  |    2 +-
 414  arch/arm/mach-iop13xx/iq81340sc.c                  |    2 +-
 415  arch/arm/mach-iop32x/Makefile.boot                 |    2 +-
 416  arch/arm/mach-iop32x/em7210.c                      |    2 +-
 417  arch/arm/mach-iop32x/glantank.c                    |    2 +-
 418  arch/arm/mach-iop32x/iq31244.c                     |    4 +-
 419  arch/arm/mach-iop32x/iq80321.c                     |    2 +-
 420  arch/arm/mach-iop32x/n2100.c                       |    2 +-
 421  arch/arm/mach-iop33x/Makefile.boot                 |    2 +-
 422  arch/arm/mach-iop33x/iq80331.c                     |    2 +-
 423  arch/arm/mach-iop33x/iq80332.c                     |    2 +-
 424  arch/arm/mach-ixp2000/Makefile.boot                |    2 +-
 425  arch/arm/mach-ixp2000/core.c                       |    4 +-
 426  arch/arm/mach-ixp2000/enp2611.c                    |    2 +-
 427  .../include/mach/{gpio.h => gpio-ixp2000.h}        |    4 +-
 428  arch/arm/mach-ixp2000/ixdp2400.c                   |    2 +-
 429  arch/arm/mach-ixp2000/ixdp2800.c                   |    2 +-
 430  arch/arm/mach-ixp2000/ixdp2x00.c                   |    4 +-
 431  arch/arm/mach-ixp2000/ixdp2x01.c                   |    6 +-
 432  arch/arm/mach-ixp23xx/Makefile.boot                |    2 +-
 433  arch/arm/mach-ixp23xx/espresso.c                   |    2 +-
 434  arch/arm/mach-ixp23xx/ixdp2351.c                   |    2 +-
 435  arch/arm/mach-ixp23xx/roadrunner.c                 |    2 +-
 436  arch/arm/mach-ixp4xx/Makefile.boot                 |    2 +-
 437  arch/arm/mach-ixp4xx/avila-setup.c                 |    4 +-
 438  arch/arm/mach-ixp4xx/common-pci.c                  |    3 +-
 439  arch/arm/mach-ixp4xx/coyote-setup.c                |    4 +-
 440  arch/arm/mach-ixp4xx/dsmg600-setup.c               |    5 +-
 441  arch/arm/mach-ixp4xx/fsg-setup.c                   |    5 +-
 442  arch/arm/mach-ixp4xx/gateway7001-setup.c           |    2 +-
 443  arch/arm/mach-ixp4xx/goramo_mlr.c                  |    2 +-
 444  arch/arm/mach-ixp4xx/gtwx5715-setup.c              |    2 +-
 445  arch/arm/mach-ixp4xx/include/mach/gpio.h           |    3 +
 446  arch/arm/mach-ixp4xx/include/mach/io.h             |    2 -
 447  arch/arm/mach-ixp4xx/ixdp425-setup.c               |    8 +-
 448  arch/arm/mach-ixp4xx/nas100d-setup.c               |    5 +-
 449  arch/arm/mach-ixp4xx/nslu2-setup.c                 |    5 +-
 450  arch/arm/mach-ixp4xx/vulcan-setup.c                |    2 +-
 451  arch/arm/mach-ixp4xx/wg302v2-setup.c               |    2 +-
 452  arch/arm/mach-kirkwood/Makefile.boot               |    2 +-
 453  arch/arm/mach-kirkwood/d2net_v2-setup.c            |    2 +-
 454  arch/arm/mach-kirkwood/db88f6281-bp-setup.c        |    2 +-
 455  arch/arm/mach-kirkwood/dockstar-setup.c            |    2 +-
 456  arch/arm/mach-kirkwood/guruplug-setup.c            |    2 +-
 457  arch/arm/mach-kirkwood/irq.c                       |    3 +-
 458  arch/arm/mach-kirkwood/mpp.c                       |    3 +-
 459  arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c     |    2 +-
 460  arch/arm/mach-kirkwood/netspace_v2-setup.c         |    6 +-
 461  arch/arm/mach-kirkwood/netxbig_v2-setup.c          |    4 +-
 462  arch/arm/mach-kirkwood/openrd-setup.c              |    6 +-
 463  arch/arm/mach-kirkwood/rd88f6192-nas-setup.c       |    2 +-
 464  arch/arm/mach-kirkwood/rd88f6281-setup.c           |    2 +-
 465  arch/arm/mach-kirkwood/sheevaplug-setup.c          |    4 +-
 466  arch/arm/mach-kirkwood/t5325-setup.c               |    2 +-
 467  arch/arm/mach-kirkwood/ts219-setup.c               |    2 +-
 468  arch/arm/mach-kirkwood/ts41x-setup.c               |    2 +-
 469  arch/arm/mach-ks8695/Makefile                      |    2 +-
 470  arch/arm/mach-ks8695/Makefile.boot                 |    2 +-
 471  arch/arm/mach-ks8695/board-acs5k.c                 |    6 +-
 472  arch/arm/mach-ks8695/board-dsm320.c                |    6 +-
 473  arch/arm/mach-ks8695/board-micrel.c                |    6 +-
 474  arch/arm/mach-ks8695/devices.c                     |    1 +
 475  arch/arm/mach-ks8695/include/mach/gpio-ks8695.h    |   39 +
 476  arch/arm/mach-ks8695/include/mach/gpio.h           |   38 -
 477  arch/arm/mach-ks8695/leds.c                        |    4 +-
 478  arch/arm/mach-lpc32xx/Makefile                     |    2 +-
 479  arch/arm/mach-lpc32xx/Makefile.boot                |    2 +-
 480  arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h  |   50 +
 481  arch/arm/mach-lpc32xx/include/mach/gpio.h          |   74 --
 482  arch/arm/mach-lpc32xx/phy3250.c                    |    3 +-
 483  arch/arm/mach-mmp/Makefile.boot                    |    2 +-
 484  arch/arm/mach-mmp/aspenite.c                       |    5 +-
 485  arch/arm/mach-mmp/mmp2.c                           |    3 +-
 486  arch/arm/mach-mmp/pxa168.c                         |    3 +-
 487  arch/arm/mach-mmp/pxa910.c                         |    3 +-
 488  arch/arm/mach-mmp/tavorevb.c                       |    3 +-
 489  arch/arm/mach-mmp/ttc_dkb.c                        |    2 +-
 490  arch/arm/mach-msm/Makefile.boot                    |    2 +-
 491  arch/arm/mach-msm/board-halibut.c                  |    2 +-
 492  arch/arm/mach-msm/board-mahimahi.c                 |    2 +-
 493  arch/arm/mach-msm/board-msm7x27.c                  |   11 +-
 494  arch/arm/mach-msm/board-msm7x30.c                  |   31 +-
 495  arch/arm/mach-msm/board-msm8960.c                  |   22 +
 496  arch/arm/mach-msm/board-msm8x60.c                  |   25 +
 497  arch/arm/mach-msm/board-qsd8x50.c                  |    7 +-
 498  arch/arm/mach-msm/board-sapphire.c                 |    5 +-
 499  arch/arm/mach-msm/board-trout-mmc.c                |    3 +-
 500  arch/arm/mach-msm/board-trout-panel.c              |    3 +-
 501  arch/arm/mach-msm/board-trout.c                    |    2 +-
 502  arch/arm/mach-msm/include/mach/gpio.h              |   27 +-
 503  arch/arm/mach-msm/include/mach/memory.h            |    6 +-
 504  arch/arm/mach-mv78xx0/Makefile.boot                |    2 +-
 505  arch/arm/mach-mv78xx0/buffalo-wxl-setup.c          |    2 +-
 506  arch/arm/mach-mv78xx0/db78x00-bp-setup.c           |    2 +-
 507  arch/arm/mach-mv78xx0/irq.c                        |    3 +-
 508  arch/arm/mach-mv78xx0/mpp.c                        |    3 +-
 509  arch/arm/mach-mv78xx0/rd78x00-masa-setup.c         |    2 +-
 510  arch/arm/mach-mx5/Makefile.boot                    |    6 +-
 511  arch/arm/mach-mx5/board-cpuimx51.c                 |    2 +-
 512  arch/arm/mach-mx5/board-cpuimx51sd.c               |    2 +-
 513  arch/arm/mach-mx5/board-mx51_3ds.c                 |    2 +-
 514  arch/arm/mach-mx5/board-mx51_babbage.c             |    2 +-
 515  arch/arm/mach-mx5/board-mx51_efikamx.c             |    2 +-
 516  arch/arm/mach-mx5/board-mx51_efikasb.c             |    2 +-
 517  arch/arm/mach-mxs/Makefile.boot                    |    2 +-
 518  arch/arm/mach-mxs/include/mach/gpio.h              |    8 -
 519  arch/arm/mach-netx/Makefile.boot                   |    2 +-
 520  arch/arm/mach-netx/nxdb500.c                       |    2 +-
 521  arch/arm/mach-netx/nxdkn.c                         |    2 +-
 522  arch/arm/mach-netx/nxeb500hmi.c                    |    2 +-
 523  arch/arm/mach-nomadik/Makefile.boot                |    2 +-
 524  arch/arm/mach-nomadik/board-nhk8815.c              |    3 +-
 525  arch/arm/mach-nomadik/cpu-8815.c                   |    2 +-
 526  arch/arm/mach-nomadik/i2c-8815nhk.c                |    2 +-
 527  arch/arm/mach-nomadik/include/mach/gpio.h          |    2 -
 528  arch/arm/mach-nuc93x/Makefile.boot                 |    2 +-
 529  arch/arm/mach-nuc93x/mach-nuc932evb.c              |    1 -
 530  arch/arm/mach-omap1/Makefile.boot                  |    2 +-
 531  arch/arm/mach-omap1/board-ams-delta.c              |    5 +-
 532  arch/arm/mach-omap1/board-fsample.c                |    5 +-
 533  arch/arm/mach-omap1/board-generic.c                |    5 +-
 534  arch/arm/mach-omap1/board-h2-mmc.c                 |    3 +-
 535  arch/arm/mach-omap1/board-h2.c                     |    5 +-
 536  arch/arm/mach-omap1/board-h3-mmc.c                 |    3 +-
 537  arch/arm/mach-omap1/board-h3.c                     |    5 +-
 538  arch/arm/mach-omap1/board-htcherald.c              |    3 +-
 539  arch/arm/mach-omap1/board-innovator.c              |    5 +-
 540  arch/arm/mach-omap1/board-nokia770.c               |    5 +-
 541  arch/arm/mach-omap1/board-osk.c                    |    5 +-
 542  arch/arm/mach-omap1/board-palmte.c                 |    5 +-
 543  arch/arm/mach-omap1/board-palmtt.c                 |    4 +-
 544  arch/arm/mach-omap1/board-palmz71.c                |    4 +-
 545  arch/arm/mach-omap1/board-perseus2.c               |    5 +-
 546  arch/arm/mach-omap1/board-sx1-mmc.c                |    2 +-
 547  arch/arm/mach-omap1/board-sx1.c                    |    5 +-
 548  arch/arm/mach-omap1/board-voiceblue.c              |    4 +-
 549  arch/arm/mach-omap1/devices.c                      |    2 +-
 550  arch/arm/mach-omap1/fpga.c                         |    2 +-
 551  arch/arm/mach-omap1/io.c                           |    1 +
 552  arch/arm/mach-omap1/irq.c                          |    3 +-
 553  arch/arm/mach-omap1/leds-h2p2-debug.c              |    2 +-
 554  arch/arm/mach-omap1/leds-osk.c                     |    3 +-
 555  arch/arm/mach-omap1/leds.c                         |    2 +-
 556  arch/arm/mach-omap1/serial.c                       |    3 +-
 557  arch/arm/mach-omap2/Makefile.boot                  |    2 +-
 558  arch/arm/mach-omap2/board-2430sdp.c                |    2 +-
 559  arch/arm/mach-omap2/board-3430sdp.c                |    2 +-
 560  arch/arm/mach-omap2/board-3630sdp.c                |    2 +-
 561  arch/arm/mach-omap2/board-4430sdp.c                |    2 +-
 562  arch/arm/mach-omap2/board-am3517crane.c            |    2 +-
 563  arch/arm/mach-omap2/board-am3517evm.c              |    2 +-
 564  arch/arm/mach-omap2/board-apollon.c                |    2 +-
 565  arch/arm/mach-omap2/board-cm-t35.c                 |    4 +-
 566  arch/arm/mach-omap2/board-cm-t3517.c               |    2 +-
 567  arch/arm/mach-omap2/board-devkit8000.c             |    2 +-
 568  arch/arm/mach-omap2/board-generic.c                |    5 +-
 569  arch/arm/mach-omap2/board-h4.c                     |    5 +-
 570  arch/arm/mach-omap2/board-igep0020.c               |    4 +-
 571  arch/arm/mach-omap2/board-ldp.c                    |    5 +-
 572  arch/arm/mach-omap2/board-n8x0.c                   |    6 +-
 573  arch/arm/mach-omap2/board-omap3beagle.c            |    2 +-
 574  arch/arm/mach-omap2/board-omap3evm.c               |    2 +-
 575  arch/arm/mach-omap2/board-omap3logic.c             |    4 +-
 576  arch/arm/mach-omap2/board-omap3pandora.c           |    2 +-
 577  arch/arm/mach-omap2/board-omap3stalker.c           |    2 +-
 578  arch/arm/mach-omap2/board-omap3touchbook.c         |    2 +-
 579  arch/arm/mach-omap2/board-omap4panda.c             |    2 +-
 580  arch/arm/mach-omap2/board-overo.c                  |    2 +-
 581  arch/arm/mach-omap2/board-rm680.c                  |    2 +-
 582  arch/arm/mach-omap2/board-rx51.c                   |    2 +-
 583  arch/arm/mach-omap2/board-ti8168evm.c              |    2 +-
 584  arch/arm/mach-omap2/board-zoom.c                   |    4 +-
 585  arch/arm/mach-omap2/devices.c                      |    3 +-
 586  arch/arm/mach-omap2/io.c                           |    2 +-
 587  arch/arm/mach-orion5x/Makefile.boot                |    2 +-
 588  arch/arm/mach-orion5x/d2net-setup.c                |    4 +-
 589  arch/arm/mach-orion5x/db88f5281-setup.c            |    5 +-
 590  arch/arm/mach-orion5x/dns323-setup.c               |    5 +-
 591  arch/arm/mach-orion5x/edmini_v2-setup.c            |    2 +-
 592  arch/arm/mach-orion5x/irq.c                        |    3 +-
 593  arch/arm/mach-orion5x/kurobox_pro-setup.c          |    7 +-
 594  arch/arm/mach-orion5x/ls-chl-setup.c               |    2 +-
 595  arch/arm/mach-orion5x/ls_hgl-setup.c               |    2 +-
 596  arch/arm/mach-orion5x/lsmini-setup.c               |    2 +-
 597  arch/arm/mach-orion5x/mss2-setup.c                 |    2 +-
 598  arch/arm/mach-orion5x/mv2120-setup.c               |    5 +-
 599  arch/arm/mach-orion5x/net2big-setup.c              |    2 +-
 600  arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c       |    5 +-
 601  arch/arm/mach-orion5x/rd88f5181l-ge-setup.c        |    5 +-
 602  arch/arm/mach-orion5x/rd88f5182-setup.c            |    5 +-
 603  arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c       |    5 +-
 604  arch/arm/mach-orion5x/terastation_pro2-setup.c     |    5 +-
 605  arch/arm/mach-orion5x/ts209-setup.c                |    5 +-
 606  arch/arm/mach-orion5x/ts409-setup.c                |    5 +-
 607  arch/arm/mach-orion5x/ts78xx-setup.c               |    2 +-
 608  arch/arm/mach-orion5x/wnr854t-setup.c              |    5 +-
 609  arch/arm/mach-orion5x/wrt350n-v2-setup.c           |    5 +-
 610  arch/arm/mach-pnx4008/Makefile.boot                |    2 +-
 611  arch/arm/mach-pnx4008/core.c                       |    2 +-
 612  arch/arm/mach-pnx4008/gpio.c                       |    3 +-
 613  .../include/mach/{gpio.h => gpio-pnx4008.h}        |    2 +-
 614  arch/arm/mach-pnx4008/serial.c                     |    3 +-
 615  arch/arm/mach-prima2/Makefile.boot                 |    2 +-
 616  arch/arm/mach-prima2/prima2.c                      |    2 +-
 617  arch/arm/mach-pxa/Makefile.boot                    |    2 +-
 618  arch/arm/mach-pxa/balloon3.c                       |    2 +-
 619  arch/arm/mach-pxa/capc7117.c                       |    2 +-
 620  arch/arm/mach-pxa/cm-x2xx.c                        |    2 +-
 621  arch/arm/mach-pxa/cm-x300.c                        |    2 +-
 622  arch/arm/mach-pxa/colibri-pxa270.c                 |    4 +-
 623  arch/arm/mach-pxa/colibri-pxa300.c                 |    2 +-
 624  arch/arm/mach-pxa/colibri-pxa320.c                 |    2 +-
 625  arch/arm/mach-pxa/csb726.c                         |    2 +-
 626  arch/arm/mach-pxa/em-x270.c                        |    4 +-
 627  arch/arm/mach-pxa/eseries.c                        |   12 +-
 628  arch/arm/mach-pxa/ezx.c                            |   12 +-
 629  arch/arm/mach-pxa/generic.c                        |    2 +-
 630  arch/arm/mach-pxa/gumstix.c                        |    2 +-
 631  arch/arm/mach-pxa/h5000.c                          |    2 +-
 632  arch/arm/mach-pxa/himalaya.c                       |    2 +-
 633  arch/arm/mach-pxa/hx4700.c                         |    2 +-
 634  arch/arm/mach-pxa/icontrol.c                       |    2 +-
 635  arch/arm/mach-pxa/include/mach/littleton.h         |    2 +-
 636  arch/arm/mach-pxa/irq.c                            |    3 +-
 637  arch/arm/mach-pxa/littleton.c                      |    2 +-
 638  arch/arm/mach-pxa/lpd270.c                         |    5 +-
 639  arch/arm/mach-pxa/lubbock.c                        |    2 +-
 640  arch/arm/mach-pxa/magician.c                       |    2 +-
 641  arch/arm/mach-pxa/mainstone.c                      |    5 +-
 642  arch/arm/mach-pxa/mfp-pxa2xx.c                     |    3 +-
 643  arch/arm/mach-pxa/mioa701.c                        |    2 +-
 644  arch/arm/mach-pxa/mp900.c                          |    2 +-
 645  arch/arm/mach-pxa/palmld.c                         |    2 +-
 646  arch/arm/mach-pxa/palmt5.c                         |    2 +-
 647  arch/arm/mach-pxa/palmtc.c                         |    2 +-
 648  arch/arm/mach-pxa/palmte2.c                        |    2 +-
 649  arch/arm/mach-pxa/palmtreo.c                       |    4 +-
 650  arch/arm/mach-pxa/palmtx.c                         |    2 +-
 651  arch/arm/mach-pxa/palmz72.c                        |    2 +-
 652  arch/arm/mach-pxa/pcm027.c                         |    2 +-
 653  arch/arm/mach-pxa/pcm990-baseboard.c               |    3 +-
 654  arch/arm/mach-pxa/pxa25x.c                         |    2 +-
 655  arch/arm/mach-pxa/pxa27x.c                         |    2 +-
 656  arch/arm/mach-pxa/pxa3xx.c                         |    3 +-
 657  arch/arm/mach-pxa/pxa95x.c                         |    3 +-
 658  arch/arm/mach-pxa/raumfeld.c                       |    6 +-
 659  arch/arm/mach-pxa/saar.c                           |    4 +-
 660  arch/arm/mach-pxa/saarb.c                          |    5 +-
 661  arch/arm/mach-pxa/stargate2.c                      |    4 +-
 662  arch/arm/mach-pxa/tavorevb.c                       |    2 +-
 663  arch/arm/mach-pxa/tavorevb3.c                      |    2 +-
 664  arch/arm/mach-pxa/trizeps4.c                       |    4 +-
 665  arch/arm/mach-pxa/viper.c                          |    2 +-
 666  arch/arm/mach-pxa/vpac270.c                        |    2 +-
 667  arch/arm/mach-pxa/xcep.c                           |    2 +-
 668  arch/arm/mach-pxa/z2.c                             |    2 +-
 669  arch/arm/mach-pxa/zeus.c                           |    2 +-
 670  arch/arm/mach-pxa/zylonite.c                       |    2 +-
 671  arch/arm/mach-realview/Makefile.boot               |    4 +-
 672  arch/arm/mach-realview/include/mach/gpio.h         |    7 +-
 673  arch/arm/mach-realview/realview_eb.c               |    2 +-
 674  arch/arm/mach-realview/realview_pb1176.c           |    2 +-
 675  arch/arm/mach-realview/realview_pb11mp.c           |    2 +-
 676  arch/arm/mach-realview/realview_pba8.c             |    2 +-
 677  arch/arm/mach-realview/realview_pbx.c              |    2 +-
 678  arch/arm/mach-rpc/Makefile.boot                    |    2 +-
 679  arch/arm/mach-rpc/include/mach/hardware.h          |   25 +-
 680  arch/arm/mach-rpc/include/mach/io.h                |  193 +---
 681  arch/arm/mach-rpc/riscpc.c                         |    4 +-
 682  arch/arm/mach-s3c2410/Makefile.boot                |    4 +-
 683  arch/arm/mach-s3c2410/include/mach/gpio.h          |    6 -
 684  arch/arm/mach-s3c2410/include/mach/h1940-latch.h   |    2 +-
 685  arch/arm/mach-s3c2410/include/mach/io.h            |    2 -
 686  arch/arm/mach-s3c2410/mach-amlm5900.c              |    2 +-
 687  arch/arm/mach-s3c2410/mach-bast.c                  |    2 +-
 688  arch/arm/mach-s3c2410/mach-h1940.c                 |    2 +-
 689  arch/arm/mach-s3c2410/mach-n30.c                   |    4 +-
 690  arch/arm/mach-s3c2410/mach-otom.c                  |    2 +-
 691  arch/arm/mach-s3c2410/mach-qt2410.c                |    2 +-
 692  arch/arm/mach-s3c2410/mach-smdk2410.c              |    2 +-
 693  arch/arm/mach-s3c2410/mach-tct_hammer.c            |    2 +-
 694  arch/arm/mach-s3c2410/mach-vr1000.c                |    2 +-
 695  arch/arm/mach-s3c2412/mach-jive.c                  |    2 +-
 696  arch/arm/mach-s3c2412/mach-smdk2413.c              |    6 +-
 697  arch/arm/mach-s3c2412/mach-vstms.c                 |    2 +-
 698  arch/arm/mach-s3c2416/mach-smdk2416.c              |    2 +-
 699  arch/arm/mach-s3c2440/mach-anubis.c                |    2 +-
 700  arch/arm/mach-s3c2440/mach-at2440evb.c             |    2 +-
 701  arch/arm/mach-s3c2440/mach-gta02.c                 |    2 +-
 702  arch/arm/mach-s3c2440/mach-mini2440.c              |    2 +-
 703  arch/arm/mach-s3c2440/mach-nexcoder.c              |    2 +-
 704  arch/arm/mach-s3c2440/mach-osiris.c                |    2 +-
 705  arch/arm/mach-s3c2440/mach-rx1950.c                |    2 +-
 706  arch/arm/mach-s3c2440/mach-rx3715.c                |    2 +-
 707  arch/arm/mach-s3c2440/mach-smdk2440.c              |    2 +-
 708  arch/arm/mach-s3c2443/mach-smdk2443.c              |    2 +-
 709  arch/arm/mach-s3c64xx/Makefile.boot                |    2 +-
 710  arch/arm/mach-s3c64xx/cpu.c                        |    2 +
 711  arch/arm/mach-s3c64xx/include/mach/gpio.h          |    7 -
 712  arch/arm/mach-s3c64xx/include/mach/memory.h        |    2 -
 713  arch/arm/mach-s3c64xx/mach-anw6410.c               |    2 +-
 714  arch/arm/mach-s3c64xx/mach-crag6410.c              |    2 +-
 715  arch/arm/mach-s3c64xx/mach-hmt.c                   |    2 +-
 716  arch/arm/mach-s3c64xx/mach-mini6410.c              |    2 +-
 717  arch/arm/mach-s3c64xx/mach-ncp.c                   |    2 +-
 718  arch/arm/mach-s3c64xx/mach-real6410.c              |    2 +-
 719  arch/arm/mach-s3c64xx/mach-smartq5.c               |    2 +-
 720  arch/arm/mach-s3c64xx/mach-smartq7.c               |    2 +-
 721  arch/arm/mach-s3c64xx/mach-smdk6400.c              |    2 +-
 722  arch/arm/mach-s3c64xx/mach-smdk6410.c              |    2 +-
 723  arch/arm/mach-s5p64x0/Makefile.boot                |    2 +-
 724  arch/arm/mach-s5p64x0/cpu.c                        |    3 +
 725  arch/arm/mach-s5p64x0/include/mach/gpio.h          |    7 -
 726  arch/arm/mach-s5p64x0/include/mach/memory.h        |    1 -
 727  arch/arm/mach-s5p64x0/mach-smdk6440.c              |    2 +-
 728  arch/arm/mach-s5p64x0/mach-smdk6450.c              |    2 +-
 729  arch/arm/mach-s5pc100/Makefile.boot                |    2 +-
 730  arch/arm/mach-s5pc100/include/mach/gpio.h          |    7 -
 731  arch/arm/mach-s5pc100/mach-smdkc100.c              |    2 +-
 732  arch/arm/mach-s5pv210/Makefile.boot                |    2 +-
 733  arch/arm/mach-s5pv210/cpu.c                        |    2 +
 734  arch/arm/mach-s5pv210/include/mach/gpio.h          |    7 -
 735  arch/arm/mach-s5pv210/include/mach/memory.h        |    1 -
 736  arch/arm/mach-s5pv210/mach-aquila.c                |    2 +-
 737  arch/arm/mach-s5pv210/mach-goni.c                  |    2 +-
 738  arch/arm/mach-s5pv210/mach-smdkc110.c              |    2 +-
 739  arch/arm/mach-s5pv210/mach-smdkv210.c              |    2 +-
 740  arch/arm/mach-s5pv210/mach-torbreck.c              |    2 +-
 741  arch/arm/mach-sa1100/Makefile                      |    3 +-
 742  arch/arm/mach-sa1100/Makefile.boot                 |    5 +-
 743  arch/arm/mach-sa1100/assabet.c                     |    2 +-
 744  arch/arm/mach-sa1100/badge4.c                      |    2 +-
 745  arch/arm/mach-sa1100/generic.c                     |    2 +-
 746  arch/arm/mach-sa1100/h3100.c                       |    2 +-
 747  arch/arm/mach-sa1100/h3600.c                       |    2 +-
 748  arch/arm/mach-sa1100/hackkit.c                     |    2 +-
 749  arch/arm/mach-sa1100/include/mach/gpio.h           |    4 +-
 750  arch/arm/mach-sa1100/include/mach/io.h             |    6 +-
 751  arch/arm/mach-sa1100/include/mach/simpad.h         |   94 ++-
 752  arch/arm/mach-sa1100/jornada720.c                  |    2 +-
 753  arch/arm/mach-sa1100/lart.c                        |    2 +-
 754  arch/arm/mach-sa1100/leds-simpad.c                 |  100 --
 755  arch/arm/mach-sa1100/leds.c                        |    2 -
 756  arch/arm/mach-sa1100/leds.h                        |    1 -
 757  arch/arm/mach-sa1100/nanoengine.c                  |    2 +-
 758  arch/arm/mach-sa1100/shannon.c                     |    2 +-
 759  arch/arm/mach-sa1100/simpad.c                      |  215 ++++-
 760  arch/arm/mach-shark/Makefile.boot                  |    2 +-
 761  arch/arm/mach-shark/core.c                         |    2 +-
 762  arch/arm/mach-shmobile/Makefile.boot               |    2 +-
 763  arch/arm/mach-shmobile/board-ag5evm.c              |    3 +
 764  arch/arm/mach-shmobile/board-ap4evb.c              |    3 +
 765  arch/arm/mach-shmobile/board-g3evm.c               |    3 +
 766  arch/arm/mach-shmobile/board-g4evm.c               |    3 +
 767  arch/arm/mach-shmobile/board-mackerel.c            |    3 +
 768  arch/arm/mach-shmobile/include/mach/gpio.h         |   24 +-
 769  arch/arm/mach-shmobile/include/mach/memory.h       |    3 -
 770  arch/arm/mach-spear3xx/Makefile.boot               |    2 +-
 771  arch/arm/mach-spear3xx/spear300_evb.c              |    2 +-
 772  arch/arm/mach-spear3xx/spear310_evb.c              |    2 +-
 773  arch/arm/mach-spear3xx/spear320_evb.c              |    2 +-
 774  arch/arm/mach-spear6xx/Makefile.boot               |    2 +-
 775  arch/arm/mach-spear6xx/spear600_evb.c              |    2 +-
 776  arch/arm/mach-tcc8k/Makefile.boot                  |    2 +-
 777  arch/arm/mach-tcc8k/board-tcc8000-sdk.c            |    2 +-
 778  arch/arm/mach-tegra/Makefile.boot                  |    2 +-
 779  arch/arm/mach-tegra/board-harmony.c                |    2 +-
 780  arch/arm/mach-tegra/board-paz00.c                  |    2 +-
 781  arch/arm/mach-tegra/board-seaboard.c               |    6 +-
 782  arch/arm/mach-tegra/board-trimslice-pinmux.c       |    3 +-
 783  arch/arm/mach-tegra/board-trimslice.c              |    2 +-
 784  arch/arm/mach-tegra/include/mach/gpio.h            |   23 +-
 785  arch/arm/mach-u300/Kconfig                         |    1 +
 786  arch/arm/mach-u300/Makefile.boot                   |    4 +-
 787  arch/arm/mach-u300/core.c                          |   34 +-
 788  arch/arm/mach-u300/include/mach/gpio-u300.h        |  150 +++
 789  arch/arm/mach-u300/include/mach/gpio.h             |  294 -----
 790  arch/arm/mach-u300/include/mach/irqs.h             |   25 +-
 791  arch/arm/mach-u300/include/mach/memory.h           |   13 +-
 792  arch/arm/mach-u300/mmc.c                           |    2 +-
 793  arch/arm/mach-u300/u300.c                          |    2 +-
 794  arch/arm/mach-ux500/Makefile.boot                  |    2 +-
 795  arch/arm/mach-ux500/board-mop500-pins.c            |    2 +-
 796  arch/arm/mach-ux500/board-mop500-u8500uib.c        |    3 +-
 797  arch/arm/mach-ux500/board-mop500.c                 |    7 +-
 798  arch/arm/mach-ux500/board-u5500-sdi.c              |    2 +-
 799  arch/arm/mach-ux500/board-u5500.c                  |    4 +-
 800  arch/arm/mach-ux500/cpu-db5500.c                   |    2 +-
 801  arch/arm/mach-ux500/cpu-db8500.c                   |    2 +-
 802  arch/arm/mach-ux500/devices-common.c               |    2 +-
 803  arch/arm/mach-ux500/include/mach/gpio.h            |    2 -
 804  arch/arm/mach-versatile/Makefile.boot              |    2 +-
 805  arch/arm/mach-versatile/include/mach/gpio.h        |    7 +-
 806  arch/arm/mach-versatile/versatile_ab.c             |    2 +-
 807  arch/arm/mach-versatile/versatile_pb.c             |    2 +-
 808  arch/arm/mach-vexpress/Makefile.boot               |    2 +-
 809  arch/arm/mach-vexpress/hotplug.c                   |    9 +-
 810  arch/arm/mach-vexpress/include/mach/io.h           |    2 -
 811  arch/arm/mach-vexpress/v2m.c                       |    2 +-
 812  arch/arm/mach-vt8500/Makefile.boot                 |    2 +-
 813  arch/arm/mach-vt8500/bv07.c                        |    2 +-
 814  arch/arm/mach-vt8500/include/mach/gpio.h           |    7 +-
 815  arch/arm/mach-vt8500/include/mach/io.h             |    2 -
 816  arch/arm/mach-vt8500/wm8505_7in.c                  |    2 +-
 817  arch/arm/mach-w90x900/Makefile.boot                |    2 +-
 818  arch/arm/mach-w90x900/include/mach/gpio.h          |    6 +-
 819  arch/arm/mach-w90x900/mach-nuc910evb.c             |    1 -
 820  arch/arm/mach-w90x900/mach-nuc950evb.c             |    1 -
 821  arch/arm/mach-w90x900/mach-nuc960evb.c             |    1 -
 822  arch/arm/mach-zynq/Makefile.boot                   |    2 +-
 823  arch/arm/mm/cache-l2x0.c                           |  103 ++
 824  arch/arm/mm/dma-mapping.c                          |   46 +-
 825  arch/arm/mm/init.c                                 |    9 -
 826  arch/arm/mm/mm.h                                   |    4 +-
 827  arch/arm/mm/mmu.c                                  |   18 +-
 828  arch/arm/mm/proc-arm920.S                          |   21 +-
 829  arch/arm/mm/proc-arm926.S                          |   21 +-
 830  arch/arm/mm/proc-sa1100.S                          |   25 +-
 831  arch/arm/mm/proc-v6.S                              |   44 +-
 832  arch/arm/mm/proc-v7.S                              |   50 +-
 833  arch/arm/mm/proc-xsc3.S                            |   28 +-
 834  arch/arm/mm/proc-xscale.S                          |   25 +-
 835  arch/arm/plat-mxc/include/mach/gpio.h              |    6 -
 836  arch/arm/plat-mxc/include/mach/memory.h            |   15 -
 837  .../include/plat/{gpio.h => gpio-nomadik.h}        |   17 +-
 838  arch/arm/plat-omap/debug-devices.c                 |    3 +-
 839  arch/arm/plat-omap/debug-leds.c                    |    3 +-
 840  arch/arm/plat-omap/devices.c                       |    3 +-
 841  arch/arm/plat-omap/include/plat/gpio.h             |   20 -
 842  arch/arm/plat-omap/include/plat/io.h               |    2 +
 843  arch/arm/plat-omap/include/plat/memory.h           |   13 -
 844  arch/arm/plat-omap/io.c                            |    8 +
 845  arch/arm/plat-orion/include/plat/gpio.h            |   10 +-
 846  arch/arm/plat-pxa/gpio.c                           |    4 +-
 847  arch/arm/plat-pxa/include/plat/gpio.h              |    2 +
 848  arch/arm/plat-spear/include/plat/gpio.h            |   25 +-
 849  drivers/amba/bus.c                                 |   57 +-
 850  drivers/ata/pata_at91.c                            |    2 +-
 851  drivers/gpio/Kconfig                               |    9 +
 852  drivers/gpio/Makefile                              |    6 +-
 853  .../gpio.c => drivers/gpio/gpio-davinci.c          |    7 +-
 854  drivers/gpio/gpio-ep93xx.c                         |   19 +-
 855  .../gpio.c => drivers/gpio/gpio-ks8695.c           |    4 +-
 856  .../gpiolib.c => drivers/gpio/gpio-lpc32xx.c       |    2 +-
 857  drivers/gpio/gpio-nomadik.c                        |    3 +-
 858  drivers/gpio/gpio-omap.c                           |    2 +-
 859  .../gpio.c => drivers/gpio/gpio-sa1100.c           |    4 +-
 860  drivers/gpio/gpio-tegra.c                          |   22 +-
 861  .../mach-davinci => drivers/gpio}/gpio-tnetv107x.c |    0
 862  drivers/gpio/gpio-u300.c                           | 1190 ++++++++++++--------
 863  drivers/i2c/busses/i2c-ixp2000.c                   |    2 +-
 864  drivers/ide/at91_ide.c                             |    2 +-
 865  drivers/input/keyboard/omap-keypad.c               |    2 +-
 866  drivers/mfd/menelaus.c                             |    2 +-
 867  drivers/mmc/host/mmci.c                            |   12 +
 868  drivers/mmc/host/omap.c                            |    2 +-
 869  drivers/mmc/host/sdhci-tegra.c                     |    2 +-
 870  drivers/mtd/nand/ams-delta.c                       |    2 +-
 871  drivers/mtd/onenand/omap2.c                        |    2 +-
 872  drivers/net/arm/at91_ether.c                       |    2 +-
 873  drivers/pcmcia/pxa2xx_vpac270.c                    |    2 +-
 874  drivers/pcmcia/sa1100_simpad.c                     |   35 +-
 875  drivers/spi/spi-atmel.c                            |    2 +-
 876  drivers/spi/spi-pl022.c                            |   84 +-
 877  drivers/tty/serial/atmel_serial.c                  |    2 +-
 878  drivers/usb/host/ohci-pnx4008.c                    |    2 +-
 879  drivers/usb/musb/davinci.c                         |    2 +-
 880  drivers/video/atmel_lcdfb.c                        |    2 +-
 881  drivers/video/omap/lcd_apollon.c                   |    2 +-
 882  drivers/video/omap/lcd_h3.c                        |    2 +-
 883  drivers/video/omap/lcd_inn1610.c                   |    2 +-
 884  drivers/video/omap/lcd_ldp.c                       |    2 +-
 885  drivers/video/omap/lcd_osk.c                       |    2 +-
 886  drivers/video/omap/lcd_overo.c                     |    2 +-
 887  drivers/video/omap/lcd_palmtt.c                    |    2 +-
 888  drivers/video/pnx4008/sdum.c                       |    2 +-
 889  695 files changed, 3726 insertions(+), 3312 deletions(-)
 890  create mode 100644 Documentation/devicetree/bindings/arm/l2cc.txt
 891  delete mode 100644 arch/arm/include/asm/auxvec.h
 892  delete mode 100644 arch/arm/include/asm/bitsperlong.h
 893  delete mode 100644 arch/arm/include/asm/cputime.h
 894  delete mode 100644 arch/arm/include/asm/emergency-restart.h
 895  delete mode 100644 arch/arm/include/asm/errno.h
 896  delete mode 100644 arch/arm/include/asm/ioctl.h
 897  delete mode 100644 arch/arm/include/asm/irq_regs.h
 898  delete mode 100644 arch/arm/include/asm/kdebug.h
 899  delete mode 100644 arch/arm/include/asm/local.h
 900  delete mode 100644 arch/arm/include/asm/local64.h
 901  delete mode 100644 arch/arm/include/asm/percpu.h
 902  create mode 100644 arch/arm/include/asm/pgtable-2level-hwdef.h
 903  create mode 100644 arch/arm/include/asm/pgtable-2level-types.h
 904  create mode 100644 arch/arm/include/asm/pgtable-2level.h
 905  delete mode 100644 arch/arm/include/asm/poll.h
 906  delete mode 100644 arch/arm/include/asm/resource.h
 907  delete mode 100644 arch/arm/include/asm/sections.h
 908  delete mode 100644 arch/arm/include/asm/siginfo.h
 909  delete mode 100644 arch/arm/include/asm/sizes.h
 910  create mode 100644 arch/arm/kernel/suspend.c
 911  create mode 100644 arch/arm/kernel/topology.c
 912  create mode 100644 arch/arm/mach-davinci/include/mach/gpio-davinci.h
 913  rename arch/arm/mach-ixp2000/include/mach/{gpio.h => gpio-ixp2000.h} (95%)
 914  create mode 100644 arch/arm/mach-ks8695/include/mach/gpio-ks8695.h
 915  create mode 100644 arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h
 916  rename arch/arm/mach-pnx4008/include/mach/{gpio.h => gpio-pnx4008.h} (99%)
 917  delete mode 100644 arch/arm/mach-sa1100/leds-simpad.c
 918  create mode 100644 arch/arm/mach-u300/include/mach/gpio-u300.h
 919  rename arch/arm/plat-nomadik/include/plat/{gpio.h => gpio-nomadik.h} (82%)
 920  rename arch/arm/mach-davinci/gpio.c => drivers/gpio/gpio-davinci.c (98%)
 921  rename arch/arm/mach-ks8695/gpio.c => drivers/gpio/gpio-ks8695.c (99%)
 922  rename arch/arm/mach-lpc32xx/gpiolib.c => drivers/gpio/gpio-lpc32xx.c (99%)
 923  rename arch/arm/mach-sa1100/gpio.c => drivers/gpio/gpio-sa1100.c (96%)
 924  rename {arch/arm/mach-davinci => drivers/gpio}/gpio-tnetv107x.c (100%)
 925 Merging arm-lpae/for-next
 926 $ git merge arm-lpae/for-next
 927 Resolved 'arch/arm/include/asm/page.h' using previous resolution.
 928 Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution.
 929 Resolved 'arch/arm/include/asm/pgtable-hwdef.h' using previous resolution.
 930 Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution.
 931 Resolved 'arch/arm/include/asm/tlb.h' using previous resolution.
 932 Resolved 'arch/arm/kernel/head.S' using previous resolution.
 933 Resolved 'arch/arm/kernel/sleep.S' using previous resolution.
 934 Resolved 'arch/arm/mm/dma-mapping.c' using previous resolution.
 935 Resolved 'arch/arm/mm/mmu.c' using previous resolution.
 936 Auto-merging arch/arm/Kconfig
 937 Auto-merging arch/arm/include/asm/page.h
 938 CONFLICT (content): Merge conflict in arch/arm/include/asm/page.h
 939 Auto-merging arch/arm/include/asm/pgalloc.h
 940 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
 941 Auto-merging arch/arm/include/asm/pgtable-hwdef.h
 942 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable-hwdef.h
 943 Auto-merging arch/arm/include/asm/pgtable.h
 944 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
 945 Auto-merging arch/arm/include/asm/proc-fns.h
 946 Auto-merging arch/arm/include/asm/system.h
 947 Auto-merging arch/arm/include/asm/tlb.h
 948 CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
 949 Auto-merging arch/arm/kernel/head.S
 950 CONFLICT (content): Merge conflict in arch/arm/kernel/head.S
 951 Auto-merging arch/arm/kernel/setup.c
 952 Auto-merging arch/arm/kernel/sleep.S
 953 CONFLICT (content): Merge conflict in arch/arm/kernel/sleep.S
 954 Auto-merging arch/arm/mm/dma-mapping.c
 955 CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
 956 Auto-merging arch/arm/mm/mmu.c
 957 CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
 958 Automatic merge failed; fix conflicts and then commit the result.
 959 $ git commit -v -a
 960 [master 5d1b8ee] Merge remote-tracking branch 'arm-lpae/for-next'
 961 $ git diff -M --stat --summary HEAD^..
 962  arch/arm/Kconfig                            |    2 +-
 963  arch/arm/boot/compressed/head.S             |    1 +
 964  arch/arm/include/asm/assembler.h            |   11 +
 965  arch/arm/include/asm/page.h                 |    4 +
 966  arch/arm/include/asm/pgalloc.h              |   24 ++
 967  arch/arm/include/asm/pgtable-3level-hwdef.h |   82 ++++++
 968  arch/arm/include/asm/pgtable-3level-types.h |   70 +++++
 969  arch/arm/include/asm/pgtable-3level.h       |  107 +++++++
 970  arch/arm/include/asm/pgtable-hwdef.h        |    4 +
 971  arch/arm/include/asm/pgtable.h              |   70 ++++-
 972  arch/arm/include/asm/proc-fns.h             |   21 ++
 973  arch/arm/include/asm/setup.h                |    8 +
 974  arch/arm/include/asm/system.h               |    8 +
 975  arch/arm/include/asm/tlb.h                  |   11 +-
 976  arch/arm/kernel/head.S                      |   45 +++-
 977  arch/arm/kernel/hw_breakpoint.c             |    8 +-
 978  arch/arm/kernel/setup.c                     |   10 +
 979  arch/arm/kernel/sleep.S                     |    2 +
 980  arch/arm/mm/Kconfig                         |   13 +
 981  arch/arm/mm/Makefile                        |    4 +
 982  arch/arm/mm/alignment.c                     |    2 +-
 983  arch/arm/mm/context.c                       |   19 +-
 984  arch/arm/mm/fault.c                         |   87 ++++++
 985  arch/arm/mm/idmap.c                         |   36 +++-
 986  arch/arm/mm/ioremap.c                       |   39 ++-
 987  arch/arm/mm/mmu.c                           |   35 ++-
 988  arch/arm/mm/pgd.c                           |   51 +++-
 989  arch/arm/mm/proc-macros.S                   |    5 +-
 990  arch/arm/mm/proc-v7lpae.S                   |  422 +++++++++++++++++++++++++++
 991  29 files changed, 1160 insertions(+), 41 deletions(-)
 992  create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h
 993  create mode 100644 arch/arm/include/asm/pgtable-3level-types.h
 994  create mode 100644 arch/arm/include/asm/pgtable-3level.h
 995  create mode 100644 arch/arm/mm/proc-v7lpae.S
 996 Merging arm-soc/for-next
 997 $ git merge arm-soc/for-next
 998 Resolved 'arch/arm/include/asm/hardware/cache-l2x0.h' using previous resolution.
 999 Resolved 'arch/arm/mach-msm/board-msm8x60.c' using previous resolution.
1000 Resolved 'arch/arm/mach-mxs/include/mach/gpio.h' using previous resolution.
1001 Resolved 'arch/arm/mach-u300/Makefile.boot' using previous resolution.
1002 Resolved 'arch/arm/plat-mxc/include/mach/gpio.h' using previous resolution.
1003 Auto-merging arch/arm/Kconfig
1004 Auto-merging arch/arm/Makefile
1005 Auto-merging arch/arm/configs/imx_v4_v5_defconfig
1006 Removing arch/arm/configs/mx1_defconfig
1007 Removing arch/arm/configs/mx21_defconfig
1008 Auto-merging arch/arm/configs/mx5_defconfig
1009 Auto-merging arch/arm/include/asm/hardware/cache-l2x0.h
1010 CONFLICT (content): Merge conflict in arch/arm/include/asm/hardware/cache-l2x0.h
1011 Auto-merging arch/arm/mach-at91/at91cap9_devices.c
1012 Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
1013 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
1014 Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
1015 Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
1016 Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
1017 CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-at91/board-usb-a9260.c left in tree.
1018 Auto-merging arch/arm/mach-at91/board-usb-a926x.c
1019 Auto-merging arch/arm/mach-msm/board-msm8x60.c
1020 CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm8x60.c
1021 Removing arch/arm/mach-mx5/devices.c
1022 Removing arch/arm/mach-mx5/devices.h
1023 Auto-merging arch/arm/mach-mxs/include/mach/gpio.h
1024 CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/gpio.h
1025 Auto-merging arch/arm/mach-u300/Kconfig
1026 Auto-merging arch/arm/mach-u300/Makefile.boot
1027 CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
1028 Auto-merging arch/arm/mach-u300/core.c
1029 Auto-merging arch/arm/mach-vexpress/hotplug.c
1030 Auto-merging arch/arm/plat-mxc/include/mach/gpio.h
1031 CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/gpio.h
1032 Automatic merge failed; fix conflicts and then commit the result.
1033 $ git rm -f arch/arm/mach-at91/board-usb-a9260.c
1034 arch/arm/include/asm/hardware/cache-l2x0.h: needs merge
1035 arch/arm/mach-at91/board-usb-a9260.c: needs merge
1036 arch/arm/mach-msm/board-msm8x60.c: needs merge
1037 arch/arm/mach-mxs/include/mach/gpio.h: needs merge
1038 arch/arm/mach-u300/Makefile.boot: needs merge
1039 arch/arm/plat-mxc/include/mach/gpio.h: needs merge
1040 rm 'arch/arm/mach-at91/board-usb-a9260.c'
1041 $ git commit -v -a
1042 [master 7b42ce8] Merge remote-tracking branch 'arm-soc/for-next'
1043 $ git diff -M --stat --summary HEAD^..
1044  .../devicetree/bindings/tty/serial/msm_serial.txt  |   27 +
1045  arch/arm/Kconfig                                   |    1 +
1046  arch/arm/Makefile                                  |    4 +-
1047  arch/arm/boot/dts/msm8660-surf.dts                 |   24 +
1048  arch/arm/boot/dts/prima2-cb.dts                    |    9 +-
1049  .../{mx27_defconfig => imx_v4_v5_defconfig}        |   68 +-
1050  arch/arm/configs/mx1_defconfig                     |   91 -
1051  arch/arm/configs/mx21_defconfig                    |   97 -
1052  arch/arm/configs/{mx51_defconfig => mx5_defconfig} |   60 +-
1053  arch/arm/mach-at91/Kconfig                         |   13 +
1054  arch/arm/mach-at91/Makefile                        |    6 +-
1055  arch/arm/mach-at91/at91cap9.c                      |    2 +
1056  arch/arm/mach-at91/at91cap9_devices.c              |    6 +
1057  arch/arm/mach-at91/at91rm9200.c                    |    2 +
1058  arch/arm/mach-at91/at91rm9200_devices.c            |    8 +
1059  arch/arm/mach-at91/at91sam9260.c                   |    2 +
1060  arch/arm/mach-at91/at91sam9260_devices.c           |    8 +
1061  arch/arm/mach-at91/at91sam9261.c                   |   29 +-
1062  arch/arm/mach-at91/at91sam9261_devices.c           |    8 +
1063  arch/arm/mach-at91/at91sam9263.c                   |    2 +
1064  arch/arm/mach-at91/at91sam9263_devices.c           |    6 +
1065  arch/arm/mach-at91/at91sam9g45.c                   |    2 +
1066  arch/arm/mach-at91/at91sam9g45_devices.c           |    6 +
1067  arch/arm/mach-at91/board-rsi-ews.c                 |  233 ++
1068  arch/arm/mach-at91/board-usb-a9260.c               |  230 --
1069  .../{board-usb-a9263.c => board-usb-a926x.c}       |  179 +-
1070  arch/arm/mach-at91/include/mach/board.h            |    5 +
1071  arch/arm/mach-at91/include/mach/timex.h            |    5 +
1072  arch/arm/mach-exynos4/hotplug.c                    |    2 +-
1073  arch/arm/mach-exynos4/platsmp.c                    |    2 +-
1074  arch/arm/mach-imx/Kconfig                          |   51 +-
1075  arch/arm/mach-imx/Makefile                         |   10 +-
1076  arch/arm/mach-imx/cache-l2x0.c                     |    2 +-
1077  arch/arm/mach-imx/clock-imx25.c                    |    6 +
1078  arch/arm/mach-imx/clock-imx27.c                    |    6 +-
1079  arch/arm/mach-imx/clock-imx31.c                    |    8 +-
1080  arch/arm/mach-imx/clock-imx35.c                    |    7 +-
1081  arch/arm/mach-imx/cpu-imx25.c                      |   41 +
1082  arch/arm/mach-imx/cpu-imx27.c                      |   28 +-
1083  arch/arm/mach-imx/cpu-imx31.c                      |   49 +-
1084  arch/arm/mach-imx/cpu-imx35.c                      |   30 +-
1085  arch/arm/mach-imx/devices-imx27.h                  |    4 +
1086  arch/arm/mach-imx/devices-imx31.h                  |    4 +
1087  arch/arm/mach-imx/devices-imx35.h                  |    4 +
1088  arch/arm/mach-imx/mach-armadillo5x0.c              |   18 +-
1089  arch/arm/mach-imx/mach-cpuimx35.c                  |    2 +-
1090  arch/arm/mach-imx/mach-mx1ads.c                    |   15 +-
1091  arch/arm/mach-imx/mach-mx25_3ds.c                  |   10 +
1092  arch/arm/mach-imx/mach-mx27_3ds.c                  |    2 +-
1093  arch/arm/mach-imx/mach-vpr200.c                    |    2 +-
1094  arch/arm/mach-msm/board-msm8x60.c                  |   58 +-
1095  arch/arm/mach-msm/hotplug.c                        |    2 +-
1096  arch/arm/mach-msm/platsmp.c                        |    2 +-
1097  arch/arm/mach-mx5/Kconfig                          |   29 +-
1098  arch/arm/mach-mx5/Makefile                         |    2 +-
1099  arch/arm/mach-mx5/board-cpuimx51.c                 |   27 +-
1100  arch/arm/mach-mx5/board-cpuimx51sd.c               |   25 +-
1101  arch/arm/mach-mx5/board-mx51_3ds.c                 |    1 -
1102  arch/arm/mach-mx5/board-mx51_babbage.c             |   26 +-
1103  arch/arm/mach-mx5/board-mx51_efikamx.c             |   13 +-
1104  arch/arm/mach-mx5/board-mx51_efikasb.c             |   24 +-
1105  arch/arm/mach-mx5/board-mx53_ard.c                 |    4 +-
1106  arch/arm/mach-mx5/board-mx53_loco.c                |   20 +
1107  arch/arm/mach-mx5/clock-mx51-mx53.c                |   14 +-
1108  arch/arm/mach-mx5/cpu.c                            |   74 +-
1109  arch/arm/mach-mx5/devices-imx51.h                  |   17 +
1110  arch/arm/mach-mx5/devices-imx53.h                  |    4 +
1111  arch/arm/mach-mx5/devices.c                        |  120 -
1112  arch/arm/mach-mx5/devices.h                        |    5 -
1113  arch/arm/mach-mx5/ehci.c                           |    2 +-
1114  arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c       |    3 +-
1115  arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c       |    6 +-
1116  arch/arm/mach-mx5/mm.c                             |    8 +-
1117  arch/arm/mach-mx5/mx51_efika.c                     |   20 +-
1118  arch/arm/mach-mx5/pm-imx5.c                        |   15 +-
1119  arch/arm/mach-mxs/Kconfig                          |    6 +
1120  arch/arm/mach-mxs/clock-mx28.c                     |    8 +-
1121  arch/arm/mach-mxs/devices-mx23.h                   |    2 +
1122  arch/arm/mach-mxs/devices-mx28.h                   |    5 +
1123  arch/arm/mach-mxs/devices/Kconfig                  |    6 +
1124  arch/arm/mach-mxs/devices/Makefile                 |    2 +
1125  arch/arm/mach-mxs/devices/platform-mxs-saif.c      |   60 +
1126  arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c  |   51 +
1127  arch/arm/mach-mxs/include/mach/devices-common.h    |   12 +
1128  arch/arm/mach-mxs/include/mach/gpio.h              |    4 -
1129  arch/arm/mach-mxs/include/mach/mxs.h               |    2 +
1130  arch/arm/mach-mxs/mach-mx23evk.c                   |    2 +-
1131  arch/arm/mach-mxs/mach-mx28evk.c                   |   79 +-
1132  arch/arm/mach-mxs/mach-stmp378x_devb.c             |    2 +-
1133  arch/arm/mach-mxs/mach-tx28.c                      |    1 +
1134  arch/arm/mach-prima2/Makefile                      |    1 +
1135  arch/arm/mach-prima2/irq.c                         |    3 +
1136  arch/arm/mach-prima2/rtciobrg.c                    |  139 +
1137  arch/arm/mach-realview/hotplug.c                   |    2 +-
1138  arch/arm/mach-shmobile/smp-sh73a0.c                |    6 +-
1139  arch/arm/mach-tegra/board-harmony.c                |    5 +-
1140  arch/arm/mach-tegra/board-paz00-pinmux.c           |    3 +
1141  arch/arm/mach-tegra/board-paz00.c                  |   62 +-
1142  arch/arm/mach-tegra/board-paz00.h                  |   16 +-
1143  arch/arm/mach-tegra/board-seaboard-pinmux.c        |    6 +-
1144  arch/arm/mach-tegra/board-seaboard.c               |   81 +-
1145  arch/arm/mach-tegra/board-seaboard.h               |   12 +-
1146  arch/arm/mach-tegra/board-trimslice.c              |    3 +-
1147  arch/arm/mach-u300/Kconfig                         |   46 -
1148  arch/arm/mach-u300/Makefile.boot                   |   17 +-
1149  arch/arm/mach-u300/core.c                          |   82 +-
1150  arch/arm/mach-u300/include/mach/memory.h           |   22 +-
1151  arch/arm/mach-u300/u300.c                          |   16 -
1152  arch/arm/mach-ux500/hotplug.c                      |    2 +-
1153  arch/arm/mach-ux500/platsmp.c                      |    2 +-
1154  arch/arm/mach-vexpress/hotplug.c                   |    2 +-
1155  arch/arm/plat-mxc/Kconfig                          |   39 +-
1156  arch/arm/plat-mxc/audmux-v2.c                      |   18 +-
1157  arch/arm/plat-mxc/cpu.c                            |    9 +
1158  arch/arm/plat-mxc/devices.c                        |   14 -
1159  arch/arm/plat-mxc/devices/Kconfig                  |    5 +-
1160  arch/arm/plat-mxc/devices/Makefile                 |    1 +
1161  arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c  |    5 +
1162  arch/arm/plat-mxc/devices/platform-imx-i2c.c       |    6 +
1163  arch/arm/plat-mxc/devices/platform-mxc-ehci.c      |    9 +
1164  arch/arm/plat-mxc/devices/platform-pata_imx.c      |   59 +
1165  arch/arm/plat-mxc/include/mach/common.h            |    2 +-
1166  arch/arm/plat-mxc/include/mach/devices-common.h    |    8 +
1167  arch/arm/plat-mxc/include/mach/gpio.h              |    8 -
1168  arch/arm/plat-mxc/include/mach/hardware.h          |    6 +
1169  arch/arm/plat-mxc/include/mach/iomux-mx51.h        | 2270 +++++---------
1170  arch/arm/plat-mxc/include/mach/iomux-mx53.h        | 3530 +++++++-------------
1171  arch/arm/plat-mxc/include/mach/iomux-v3.h          |    1 +
1172  arch/arm/plat-mxc/include/mach/memory.h            |   16 +-
1173  arch/arm/plat-mxc/include/mach/mx25.h              |    5 +
1174  arch/arm/plat-mxc/include/mach/mx35.h              |    2 +-
1175  arch/arm/plat-mxc/include/mach/mx3x.h              |   18 +-
1176  arch/arm/plat-mxc/include/mach/mx51.h              |  167 +-
1177  arch/arm/plat-mxc/pwm.c                            |    2 +-
1178  arch/arm/plat-versatile/platsmp.c                  |    2 +-
1179  drivers/gpio/gpio-mxc.c                            |   12 +
1180  drivers/gpio/gpio-mxs.c                            |    2 +
1181  drivers/tty/serial/msm_serial.c                    |   30 +-
1182  drivers/usb/host/ohci-at91.c                       |  239 ++-
1183  include/linux/rtc/sirfsoc_rtciobrg.h               |   18 +
1184  140 files changed, 4037 insertions(+), 5193 deletions(-)
1185  create mode 100644 Documentation/devicetree/bindings/tty/serial/msm_serial.txt
1186  create mode 100644 arch/arm/boot/dts/msm8660-surf.dts
1187  rename arch/arm/configs/{mx27_defconfig => imx_v4_v5_defconfig} (69%)
1188  delete mode 100644 arch/arm/configs/mx1_defconfig
1189  delete mode 100644 arch/arm/configs/mx21_defconfig
1190  rename arch/arm/configs/{mx51_defconfig => mx5_defconfig} (82%)
1191  create mode 100644 arch/arm/mach-at91/board-rsi-ews.c
1192  delete mode 100644 arch/arm/mach-at91/board-usb-a9260.c
1193  rename arch/arm/mach-at91/{board-usb-a9263.c => board-usb-a926x.c} (54%)
1194  create mode 100644 arch/arm/mach-imx/cpu-imx25.c
1195  delete mode 100644 arch/arm/mach-mx5/devices.c
1196  delete mode 100644 arch/arm/mach-mx5/devices.h
1197  create mode 100644 arch/arm/mach-mxs/devices/platform-mxs-saif.c
1198  create mode 100644 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c
1199  create mode 100644 arch/arm/mach-prima2/rtciobrg.c
1200  create mode 100644 arch/arm/plat-mxc/devices/platform-pata_imx.c
1201  create mode 100644 include/linux/rtc/sirfsoc_rtciobrg.h
1202 $ git am -3 ../patches/0001-arm-soc-merge-fixup-for-fixup-reserve-being-added-to.patch
1203 Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
1204 $ git reset HEAD^
1205 Unstaged changes after reset:
1206 M       arch/arm/mach-msm/board-msm8x60.c
1207 $ git add .
1208 $ git commit -v -a --amend
1209 [master bdab4eb] Merge remote-tracking branch 'arm-soc/for-next'
1210 Merging at91/at91-next
1211 $ git merge at91/at91-next
1212 Merge made by recursive.
1213 Merging davinci/davinci-next
1214 $ git merge davinci/davinci-next
1215 Already up-to-date.
1216 Merging i.MX/for-next
1217 $ git merge i.MX/for-next
1218 Removing arch/arm/mach-mx5/mm-mx50.c
1219 Merge made by recursive.
1220  arch/arm/mach-mx5/Makefile                |    1 -
1221  arch/arm/mach-mx5/mm-mx50.c               |   72 ---------------------------
1222  arch/arm/mach-mx5/mm.c                    |   76 ++++++++++++++++++-----------
1223  arch/arm/mach-mxs/clock-mx28.c            |    6 ++-
1224  arch/arm/plat-mxc/include/mach/hardware.h |    7 ++-
1225  arch/arm/plat-mxc/include/mach/mx51.h     |   16 +------
1226  arch/arm/plat-mxc/include/mach/mx53.h     |    1 +
1227  7 files changed, 60 insertions(+), 119 deletions(-)
1228  delete mode 100644 arch/arm/mach-mx5/mm-mx50.c
1229 Merging linux-spec/for-next
1230 $ git merge linux-spec/for-next
1231 Already up-to-date.
1232 Merging omap/for-next
1233 $ git merge omap/for-next
1234 Already up-to-date.
1235 Merging pxa/for-next
1236 $ git merge pxa/for-next
1237 Already up-to-date.
1238 Merging samsung/next-samsung
1239 $ git merge samsung/next-samsung
1240 Already up-to-date.
1241 Merging s5p/for-next
1242 $ git merge s5p/for-next
1243 Auto-merging arch/arm/mach-exynos4/mach-nuri.c
1244 CONFLICT (delete/modify): arch/arm/mach-exynos4/mach-smdkc210.c deleted in s5p/for-next and modified in HEAD. Version HEAD of arch/arm/mach-exynos4/mach-smdkc210.c left in tree.
1245 Auto-merging arch/arm/mach-exynos4/mach-smdkv310.c
1246 Auto-merging arch/arm/mach-exynos4/mach-universal_c210.c
1247 Auto-merging arch/arm/mach-exynos4/platsmp.c
1248 Removing arch/arm/mach-s3c2410/gpio.c
1249 Removing arch/arm/mach-s3c2412/gpio.c
1250 Auto-merging arch/arm/mach-s3c64xx/cpu.c
1251 Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
1252 Auto-merging arch/arm/mach-s3c64xx/mach-mini6410.c
1253 Auto-merging arch/arm/mach-s3c64xx/mach-real6410.c
1254 Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c
1255 Auto-merging arch/arm/mach-s5p64x0/mach-smdk6440.c
1256 Auto-merging arch/arm/mach-s5p64x0/mach-smdk6450.c
1257 Auto-merging arch/arm/mach-s5pc100/mach-smdkc100.c
1258 Auto-merging arch/arm/mach-s5pv210/mach-smdkv210.c
1259 Automatic merge failed; fix conflicts and then commit the result.
1260 $ git rm -f arch/arm/mach-exynos4/mach-smdkc210.c
1261 arch/arm/mach-exynos4/mach-smdkc210.c: needs merge
1262 rm 'arch/arm/mach-exynos4/mach-smdkc210.c'
1263 $ git commit -v -a
1264 [master 6528de4] Merge remote-tracking branch 's5p/for-next'
1265 $ git diff -M --stat --summary HEAD^..
1266  arch/arm/configs/exynos4_defconfig                 |    1 +
1267  arch/arm/mach-exynos4/Kconfig                      |   63 +++-
1268  arch/arm/mach-exynos4/Makefile                     |   11 +-
1269  arch/arm/mach-exynos4/clock-exynos4210.c           |  139 +++++++++
1270  arch/arm/mach-exynos4/clock-exynos4212.c           |  118 ++++++++
1271  arch/arm/mach-exynos4/clock.c                      |  218 +++++++++-----
1272  arch/arm/mach-exynos4/cpu.c                        |   40 +++-
1273  arch/arm/mach-exynos4/include/mach/exynos4-clock.h |   43 +++
1274  arch/arm/mach-exynos4/include/mach/map.h           |    3 +-
1275  arch/arm/mach-exynos4/include/mach/regs-clock.h    |   54 +++--
1276  arch/arm/mach-exynos4/mach-nuri.c                  |   34 +++
1277  arch/arm/mach-exynos4/mach-origen.c                |  108 +++++++
1278  arch/arm/mach-exynos4/mach-smdk4212.c              |  292 ++++++++++++++++++
1279  arch/arm/mach-exynos4/mach-smdkc210.c              |  309 --------------------
1280  arch/arm/mach-exynos4/mach-smdkv310.c              |   89 ++++++
1281  arch/arm/mach-exynos4/mach-universal_c210.c        |   34 +++
1282  arch/arm/mach-exynos4/mct.c                        |    4 +-
1283  arch/arm/mach-exynos4/platsmp.c                    |   10 +-
1284  arch/arm/mach-exynos4/pm.c                         |   79 +-----
1285  arch/arm/mach-s3c2410/Kconfig                      |    6 -
1286  arch/arm/mach-s3c2410/Makefile                     |    1 -
1287  arch/arm/mach-s3c2410/dma.c                        |   14 -
1288  arch/arm/mach-s3c2410/gpio.c                       |   72 -----
1289  arch/arm/mach-s3c2412/Kconfig                      |    1 -
1290  arch/arm/mach-s3c2412/Makefile                     |    1 -
1291  arch/arm/mach-s3c2412/dma.c                        |   18 --
1292  arch/arm/mach-s3c2412/gpio.c                       |   62 ----
1293  arch/arm/mach-s3c2440/Kconfig                      |    2 -
1294  arch/arm/mach-s3c2440/dma.c                        |   17 -
1295  arch/arm/mach-s3c2443/dma.c                        |   27 --
1296  arch/arm/mach-s3c64xx/Kconfig                      |    1 +
1297  arch/arm/mach-s3c64xx/Makefile                     |    2 +-
1298  arch/arm/mach-s3c64xx/clock.c                      |    8 +-
1299  arch/arm/mach-s3c64xx/cpu.c                        |   22 +-
1300  arch/arm/mach-s3c64xx/dma.c                        |    2 +-
1301  arch/arm/mach-s3c64xx/include/mach/crag6410.h      |   23 ++
1302  arch/arm/mach-s3c64xx/include/mach/regs-sys.h      |    3 +
1303  arch/arm/mach-s3c64xx/mach-crag6410-module.c       |  173 +++++++++++
1304  arch/arm/mach-s3c64xx/mach-crag6410.c              |   97 +------
1305  arch/arm/mach-s3c64xx/mach-mini6410.c              |    8 +-
1306  arch/arm/mach-s3c64xx/mach-real6410.c              |    8 +-
1307  arch/arm/mach-s3c64xx/mach-smdk6410.c              |   47 +---
1308  arch/arm/mach-s3c64xx/pm.c                         |    4 +
1309  arch/arm/mach-s5p64x0/dev-spi.c                    |    8 +-
1310  arch/arm/mach-s5p64x0/dma.c                        |    7 +-
1311  arch/arm/mach-s5p64x0/gpiolib.c                    |    7 +-
1312  arch/arm/mach-s5p64x0/irq-eint.c                   |    3 +-
1313  arch/arm/mach-s5p64x0/mach-smdk6440.c              |    8 +-
1314  arch/arm/mach-s5p64x0/mach-smdk6450.c              |    8 +-
1315  arch/arm/mach-s5pc100/mach-smdkc100.c              |    8 +-
1316  arch/arm/mach-s5pv210/Kconfig                      |    6 -
1317  arch/arm/mach-s5pv210/Makefile                     |    2 +-
1318  arch/arm/mach-s5pv210/mach-smdkv210.c              |    8 +-
1319  arch/arm/plat-s3c24xx/cpu.c                        |    9 +-
1320  arch/arm/plat-s5p/cpu.c                            |   37 ++-
1321  arch/arm/plat-s5p/include/plat/exynos4.h           |    5 +-
1322  arch/arm/plat-s5p/include/plat/pll.h               |   56 ++++-
1323  arch/arm/plat-samsung/Makefile                     |    2 +-
1324  arch/arm/plat-samsung/cpu.c                        |   58 ++++
1325  arch/arm/plat-samsung/dev-hsmmc.c                  |   19 +--
1326  arch/arm/plat-samsung/dev-hsmmc1.c                 |   19 +--
1327  arch/arm/plat-samsung/dev-hsmmc2.c                 |   19 +--
1328  arch/arm/plat-samsung/dev-hsmmc3.c                 |   19 +--
1329  arch/arm/plat-samsung/dev-ts.c                     |    9 +
1330  arch/arm/plat-samsung/include/plat/cpu.h           |  105 +++++++-
1331  arch/arm/plat-samsung/include/plat/dma-s3c24xx.h   |    6 -
1332  arch/arm/plat-samsung/include/plat/sdhci.h         |    7 +
1333  arch/arm/plat-samsung/platformdata.c               |   22 ++
1334  68 files changed, 1688 insertions(+), 1037 deletions(-)
1335  create mode 100644 arch/arm/mach-exynos4/clock-exynos4210.c
1336  create mode 100644 arch/arm/mach-exynos4/clock-exynos4212.c
1337  create mode 100644 arch/arm/mach-exynos4/include/mach/exynos4-clock.h
1338  create mode 100644 arch/arm/mach-exynos4/mach-origen.c
1339  create mode 100644 arch/arm/mach-exynos4/mach-smdk4212.c
1340  delete mode 100644 arch/arm/mach-exynos4/mach-smdkc210.c
1341  delete mode 100644 arch/arm/mach-s3c2410/gpio.c
1342  delete mode 100644 arch/arm/mach-s3c2412/gpio.c
1343  create mode 100644 arch/arm/mach-s3c64xx/include/mach/crag6410.h
1344  create mode 100644 arch/arm/mach-s3c64xx/mach-crag6410-module.c
1345  create mode 100644 arch/arm/plat-samsung/cpu.c
1346 $ git am -3 ../patches/0001-s5p-merge-fixup-for-atags_offset-use.patch
1347 Applying: s5p: merge fixup for atags_offset use
1348 $ git reset HEAD^
1349 Unstaged changes after reset:
1350 M       arch/arm/mach-exynos4/mach-smdkv310.c
1351 $ git add .
1352 $ git commit -v -a --amend
1353 [master 3508336] Merge remote-tracking branch 's5p/for-next'
1354 Merging tegra/for-next
1355 $ git merge tegra/for-next
1356 Already up-to-date.
1357 Merging ux500-core/ux500-core
1358 $ git merge ux500-core/ux500-core
1359 Auto-merging arch/arm/mach-ux500/board-mop500-pins.c
1360 Auto-merging arch/arm/mach-ux500/board-mop500.c
1361 Merge made by recursive.
1362  arch/arm/mach-ux500/Makefile                  |    1 +
1363  arch/arm/mach-ux500/board-mop500-pins.c       |   34 ++++--
1364  arch/arm/mach-ux500/board-mop500-sdi.c        |   52 ++++++---
1365  arch/arm/mach-ux500/board-mop500.c            |   78 +++++++++++---
1366  arch/arm/mach-ux500/board-mop500.h            |    3 +
1367  arch/arm/mach-ux500/cache-l2x0.c              |   72 +++++++++++++
1368  arch/arm/mach-ux500/cpu.c                     |   69 ------------
1369  arch/arm/mach-ux500/include/mach/uncompress.h |   10 +--
1370  arch/arm/mach-ux500/pins-db8500.h             |  142 +++++++++++++------------
1371  arch/arm/plat-nomadik/include/plat/pincfg.h   |    5 -
1372  10 files changed, 270 insertions(+), 196 deletions(-)
1373  create mode 100644 arch/arm/mach-ux500/cache-l2x0.c
1374 Merging xilinx/arm-next
1375 $ git merge xilinx/arm-next
1376 Already up-to-date.
1377 Merging blackfin/for-linus
1378 $ git merge blackfin/for-linus
1379 Removing arch/blackfin/include/asm/mutex.h
1380 Merge made by recursive.
1381  arch/blackfin/include/asm/Kbuild             |    1 +
1382  arch/blackfin/include/asm/bfin_serial.h      |    2 +
1383  arch/blackfin/include/asm/mutex.h            |    1 -
1384  arch/blackfin/include/asm/uaccess.h          |    6 ++--
1385  arch/blackfin/mach-bf518/boards/ezbrd.c      |   14 +++++++++++-
1386  arch/blackfin/mach-bf518/boards/tcm-bf518.c  |   14 +++++++++++-
1387  arch/blackfin/mach-bf527/boards/ad7160eval.c |   14 +++++++++++-
1388  arch/blackfin/mach-bf527/boards/cm_bf527.c   |   14 +++++++++++-
1389  arch/blackfin/mach-bf527/boards/ezbrd.c      |   14 +++++++++++-
1390  arch/blackfin/mach-bf527/boards/ezkit.c      |   14 +++++++++++-
1391  arch/blackfin/mach-bf527/boards/tll6527m.c   |   14 +++++++++++-
1392  arch/blackfin/mach-bf533/boards/H8606.c      |   10 +++++++-
1393  arch/blackfin/mach-bf533/boards/blackstamp.c |    7 +++++-
1394  arch/blackfin/mach-bf533/boards/cm_bf533.c   |    7 +++++-
1395  arch/blackfin/mach-bf533/boards/ezkit.c      |    7 +++++-
1396  arch/blackfin/mach-bf533/boards/ip0x.c       |    7 +++++-
1397  arch/blackfin/mach-bf533/boards/stamp.c      |    7 +++++-
1398  arch/blackfin/mach-bf537/boards/cm_bf537e.c  |   14 +++++++++++-
1399  arch/blackfin/mach-bf537/boards/cm_bf537u.c  |   14 +++++++++++-
1400  arch/blackfin/mach-bf537/boards/dnp5370.c    |   14 +++++++++++-
1401  arch/blackfin/mach-bf537/boards/minotaur.c   |   14 +++++++++++-
1402  arch/blackfin/mach-bf537/boards/pnav10.c     |   14 +++++++++++-
1403  arch/blackfin/mach-bf537/boards/stamp.c      |   14 +++++++++++-
1404  arch/blackfin/mach-bf537/boards/tcm_bf537.c  |   14 +++++++++++-
1405  arch/blackfin/mach-bf538/boards/ezkit.c      |   21 ++++++++++++++++--
1406  arch/blackfin/mach-bf548/boards/cm_bf548.c   |   28 ++++++++++++++++++++++---
1407  arch/blackfin/mach-bf548/boards/ezkit.c      |   28 ++++++++++++++++++++++---
1408  arch/blackfin/mach-bf561/boards/acvilon.c    |    7 +++++-
1409  arch/blackfin/mach-bf561/boards/cm_bf561.c   |    7 +++++-
1410  arch/blackfin/mach-bf561/boards/ezkit.c      |    7 +++++-
1411  arch/blackfin/mach-bf561/boards/tepla.c      |    7 +++++-
1412  31 files changed, 302 insertions(+), 54 deletions(-)
1413  delete mode 100644 arch/blackfin/include/asm/mutex.h
1414 Merging cris/for-next
1415 $ git merge cris/for-next
1416 Auto-merging arch/cris/arch-v32/drivers/cryptocop.c
1417 Auto-merging drivers/net/cris/eth_v10.c
1418 Merge made by recursive.
1419  Documentation/cris/README               |   62 +++++++++++++++---------------
1420  arch/cris/arch-v32/drivers/cryptocop.c  |    6 +--
1421  arch/cris/arch-v32/kernel/ptrace.c      |    2 -
1422  arch/cris/include/arch-v32/arch/cache.h |    2 +-
1423  drivers/net/cris/eth_v10.c              |    1 -
1424  5 files changed, 34 insertions(+), 39 deletions(-)
1425 Merging quilt/hexagon
1426 $ git merge quilt/hexagon
1427 Auto-merging MAINTAINERS
1428 Merge made by recursive.
1429  MAINTAINERS                               |    6 +
1430  arch/hexagon/Kconfig                      |  218 ++++++++++++
1431  arch/hexagon/Makefile                     |   59 +++
1432  arch/hexagon/configs/comet_defconfig      |   85 +++++
1433  arch/hexagon/include/asm/Kbuild           |   60 ++++
1434  arch/hexagon/include/asm/asm-offsets.h    |    1 +
1435  arch/hexagon/include/asm/atomic.h         |  164 +++++++++
1436  arch/hexagon/include/asm/bitops.h         |  301 ++++++++++++++++
1437  arch/hexagon/include/asm/bitsperlong.h    |   26 ++
1438  arch/hexagon/include/asm/byteorder.h      |   28 ++
1439  arch/hexagon/include/asm/cache.h          |   34 ++
1440  arch/hexagon/include/asm/cacheflush.h     |   99 ++++++
1441  arch/hexagon/include/asm/checksum.h       |   50 +++
1442  arch/hexagon/include/asm/delay.h          |   28 ++
1443  arch/hexagon/include/asm/dma-mapping.h    |  101 ++++++
1444  arch/hexagon/include/asm/dma.h            |   29 ++
1445  arch/hexagon/include/asm/elf.h            |  228 ++++++++++++
1446  arch/hexagon/include/asm/fixmap.h         |   73 ++++
1447  arch/hexagon/include/asm/fpu.h            |    4 +
1448  arch/hexagon/include/asm/futex.h          |  137 ++++++++
1449  arch/hexagon/include/asm/hexagon_vm.h     |  281 +++++++++++++++
1450  arch/hexagon/include/asm/intrinsics.h     |   26 ++
1451  arch/hexagon/include/asm/io.h             |  323 +++++++++++++++++
1452  arch/hexagon/include/asm/irq.h            |   36 ++
1453  arch/hexagon/include/asm/irqflags.h       |   62 ++++
1454  arch/hexagon/include/asm/kgdb.h           |   39 ++
1455  arch/hexagon/include/asm/linkage.h        |   25 ++
1456  arch/hexagon/include/asm/mem-layout.h     |  112 ++++++
1457  arch/hexagon/include/asm/mmu.h            |   37 ++
1458  arch/hexagon/include/asm/mmu_context.h    |  100 ++++++
1459  arch/hexagon/include/asm/module.h         |   26 ++
1460  arch/hexagon/include/asm/mutex.h          |    8 +
1461  arch/hexagon/include/asm/page.h           |  157 +++++++++
1462  arch/hexagon/include/asm/param.h          |   26 ++
1463  arch/hexagon/include/asm/perf_event.h     |   24 ++
1464  arch/hexagon/include/asm/pgalloc.h        |  146 ++++++++
1465  arch/hexagon/include/asm/pgtable.h        |  518 +++++++++++++++++++++++++++
1466  arch/hexagon/include/asm/processor.h      |  123 +++++++
1467  arch/hexagon/include/asm/ptrace.h         |   46 +++
1468  arch/hexagon/include/asm/registers.h      |  236 +++++++++++++
1469  arch/hexagon/include/asm/setup.h          |   29 ++
1470  arch/hexagon/include/asm/sigcontext.h     |   32 ++
1471  arch/hexagon/include/asm/signal.h         |   26 ++
1472  arch/hexagon/include/asm/smp.h            |   44 +++
1473  arch/hexagon/include/asm/spinlock.h       |  186 ++++++++++
1474  arch/hexagon/include/asm/spinlock_types.h |   42 +++
1475  arch/hexagon/include/asm/string.h         |   32 ++
1476  arch/hexagon/include/asm/suspend.h        |   27 ++
1477  arch/hexagon/include/asm/swab.h           |   24 ++
1478  arch/hexagon/include/asm/syscall.h        |   40 +++
1479  arch/hexagon/include/asm/system.h         |  126 +++++++
1480  arch/hexagon/include/asm/thread_info.h    |  154 ++++++++
1481  arch/hexagon/include/asm/time.h           |   29 ++
1482  arch/hexagon/include/asm/timer-regs.h     |   39 ++
1483  arch/hexagon/include/asm/timex.h          |   37 ++
1484  arch/hexagon/include/asm/tlb.h            |   39 ++
1485  arch/hexagon/include/asm/tlbflush.h       |   58 +++
1486  arch/hexagon/include/asm/traps.h          |   29 ++
1487  arch/hexagon/include/asm/uaccess.h        |  116 ++++++
1488  arch/hexagon/include/asm/unistd.h         |   36 ++
1489  arch/hexagon/include/asm/user.h           |   79 +++++
1490  arch/hexagon/include/asm/vdso.h           |   31 ++
1491  arch/hexagon/include/asm/vm_fault.h       |   26 ++
1492  arch/hexagon/include/asm/vm_mmu.h         |  111 ++++++
1493  arch/hexagon/kernel/Makefile              |   19 +
1494  arch/hexagon/kernel/asm-offsets.c         |  104 ++++++
1495  arch/hexagon/kernel/dma.c                 |  220 ++++++++++++
1496  arch/hexagon/kernel/head.S                |  162 +++++++++
1497  arch/hexagon/kernel/hexagon_ksyms.c       |   42 +++
1498  arch/hexagon/kernel/init_task.c           |   54 +++
1499  arch/hexagon/kernel/irq.c                 |   67 ++++
1500  arch/hexagon/kernel/irq_cpu.c             |   90 +++++
1501  arch/hexagon/kernel/kgdb.c                |  241 +++++++++++++
1502  arch/hexagon/kernel/module.c              |  162 +++++++++
1503  arch/hexagon/kernel/process.c             |  279 +++++++++++++++
1504  arch/hexagon/kernel/ptrace.c              |  333 ++++++++++++++++++
1505  arch/hexagon/kernel/reset.c               |   38 ++
1506  arch/hexagon/kernel/setup.c               |  145 ++++++++
1507  arch/hexagon/kernel/signal.c              |  320 +++++++++++++++++
1508  arch/hexagon/kernel/smp.c                 |  282 +++++++++++++++
1509  arch/hexagon/kernel/stacktrace.c          |   66 ++++
1510  arch/hexagon/kernel/syscall.c             |   90 +++++
1511  arch/hexagon/kernel/syscalltab.c          |   32 ++
1512  arch/hexagon/kernel/time.c                |  275 +++++++++++++++
1513  arch/hexagon/kernel/topology.c            |   52 +++
1514  arch/hexagon/kernel/trampoline.S          |   35 ++
1515  arch/hexagon/kernel/traps.c               |  356 +++++++++++++++++++
1516  arch/hexagon/kernel/vdso.c                |  101 ++++++
1517  arch/hexagon/kernel/vm_entry.S            |  269 ++++++++++++++
1518  arch/hexagon/kernel/vm_events.c           |  101 ++++++
1519  arch/hexagon/kernel/vm_init_segtable.S    |  442 +++++++++++++++++++++++
1520  arch/hexagon/kernel/vm_ops.S              |  102 ++++++
1521  arch/hexagon/kernel/vm_switch.S           |   95 +++++
1522  arch/hexagon/kernel/vm_vectors.S          |   50 +++
1523  arch/hexagon/kernel/vmlinux.lds.S         |   93 +++++
1524  arch/hexagon/lib/Makefile                 |    4 +
1525  arch/hexagon/lib/checksum.c               |  203 +++++++++++
1526  arch/hexagon/lib/io.c                     |   91 +++++
1527  arch/hexagon/lib/memcpy.S                 |  543 +++++++++++++++++++++++++++++
1528  arch/hexagon/lib/memset.S                 |  316 +++++++++++++++++
1529  arch/hexagon/mm/Makefile                  |    7 +
1530  arch/hexagon/mm/cache.c                   |  128 +++++++
1531  arch/hexagon/mm/copy_from_user.S          |  114 ++++++
1532  arch/hexagon/mm/copy_to_user.S            |   92 +++++
1533  arch/hexagon/mm/copy_user_template.S      |  185 ++++++++++
1534  arch/hexagon/mm/init.c                    |  276 +++++++++++++++
1535  arch/hexagon/mm/ioremap.c                 |   56 +++
1536  arch/hexagon/mm/pgalloc.c                 |   25 ++
1537  arch/hexagon/mm/strnlen_user.S            |  140 ++++++++
1538  arch/hexagon/mm/uaccess.c                 |   59 +++
1539  arch/hexagon/mm/vm_fault.c                |  188 ++++++++++
1540  arch/hexagon/mm/vm_tlb.c                  |   93 +++++
1541  include/asm-generic/checksum.h            |    4 +
1542  include/asm-generic/rwsem.h               |  132 +++++++
1543  114 files changed, 12847 insertions(+), 0 deletions(-)
1544  create mode 100644 arch/hexagon/Kconfig
1545  create mode 100644 arch/hexagon/Makefile
1546  create mode 100644 arch/hexagon/configs/comet_defconfig
1547  create mode 100644 arch/hexagon/include/asm/Kbuild
1548  create mode 100644 arch/hexagon/include/asm/asm-offsets.h
1549  create mode 100644 arch/hexagon/include/asm/atomic.h
1550  create mode 100644 arch/hexagon/include/asm/bitops.h
1551  create mode 100644 arch/hexagon/include/asm/bitsperlong.h
1552  create mode 100644 arch/hexagon/include/asm/byteorder.h
1553  create mode 100644 arch/hexagon/include/asm/cache.h
1554  create mode 100644 arch/hexagon/include/asm/cacheflush.h
1555  create mode 100644 arch/hexagon/include/asm/checksum.h
1556  create mode 100644 arch/hexagon/include/asm/delay.h
1557  create mode 100644 arch/hexagon/include/asm/dma-mapping.h
1558  create mode 100644 arch/hexagon/include/asm/dma.h
1559  create mode 100644 arch/hexagon/include/asm/elf.h
1560  create mode 100644 arch/hexagon/include/asm/fixmap.h
1561  create mode 100644 arch/hexagon/include/asm/fpu.h
1562  create mode 100644 arch/hexagon/include/asm/futex.h
1563  create mode 100644 arch/hexagon/include/asm/hexagon_vm.h
1564  create mode 100644 arch/hexagon/include/asm/intrinsics.h
1565  create mode 100644 arch/hexagon/include/asm/io.h
1566  create mode 100644 arch/hexagon/include/asm/irq.h
1567  create mode 100644 arch/hexagon/include/asm/irqflags.h
1568  create mode 100644 arch/hexagon/include/asm/kgdb.h
1569  create mode 100644 arch/hexagon/include/asm/linkage.h
1570  create mode 100644 arch/hexagon/include/asm/mem-layout.h
1571  create mode 100644 arch/hexagon/include/asm/mmu.h
1572  create mode 100644 arch/hexagon/include/asm/mmu_context.h
1573  create mode 100644 arch/hexagon/include/asm/module.h
1574  create mode 100644 arch/hexagon/include/asm/mutex.h
1575  create mode 100644 arch/hexagon/include/asm/page.h
1576  create mode 100644 arch/hexagon/include/asm/param.h
1577  create mode 100644 arch/hexagon/include/asm/perf_event.h
1578  create mode 100644 arch/hexagon/include/asm/pgalloc.h
1579  create mode 100644 arch/hexagon/include/asm/pgtable.h
1580  create mode 100644 arch/hexagon/include/asm/processor.h
1581  create mode 100644 arch/hexagon/include/asm/ptrace.h
1582  create mode 100644 arch/hexagon/include/asm/registers.h
1583  create mode 100644 arch/hexagon/include/asm/setup.h
1584  create mode 100644 arch/hexagon/include/asm/sigcontext.h
1585  create mode 100644 arch/hexagon/include/asm/signal.h
1586  create mode 100644 arch/hexagon/include/asm/smp.h
1587  create mode 100644 arch/hexagon/include/asm/spinlock.h
1588  create mode 100644 arch/hexagon/include/asm/spinlock_types.h
1589  create mode 100644 arch/hexagon/include/asm/string.h
1590  create mode 100644 arch/hexagon/include/asm/suspend.h
1591  create mode 100644 arch/hexagon/include/asm/swab.h
1592  create mode 100644 arch/hexagon/include/asm/syscall.h
1593  create mode 100644 arch/hexagon/include/asm/system.h
1594  create mode 100644 arch/hexagon/include/asm/thread_info.h
1595  create mode 100644 arch/hexagon/include/asm/time.h
1596  create mode 100644 arch/hexagon/include/asm/timer-regs.h
1597  create mode 100644 arch/hexagon/include/asm/timex.h
1598  create mode 100644 arch/hexagon/include/asm/tlb.h
1599  create mode 100644 arch/hexagon/include/asm/tlbflush.h
1600  create mode 100644 arch/hexagon/include/asm/traps.h
1601  create mode 100644 arch/hexagon/include/asm/uaccess.h
1602  create mode 100644 arch/hexagon/include/asm/unistd.h
1603  create mode 100644 arch/hexagon/include/asm/user.h
1604  create mode 100644 arch/hexagon/include/asm/vdso.h
1605  create mode 100644 arch/hexagon/include/asm/vm_fault.h
1606  create mode 100644 arch/hexagon/include/asm/vm_mmu.h
1607  create mode 100644 arch/hexagon/kernel/Makefile
1608  create mode 100644 arch/hexagon/kernel/asm-offsets.c
1609  create mode 100644 arch/hexagon/kernel/dma.c
1610  create mode 100644 arch/hexagon/kernel/head.S
1611  create mode 100644 arch/hexagon/kernel/hexagon_ksyms.c
1612  create mode 100644 arch/hexagon/kernel/init_task.c
1613  create mode 100644 arch/hexagon/kernel/irq.c
1614  create mode 100644 arch/hexagon/kernel/irq_cpu.c
1615  create mode 100644 arch/hexagon/kernel/kgdb.c
1616  create mode 100644 arch/hexagon/kernel/module.c
1617  create mode 100644 arch/hexagon/kernel/process.c
1618  create mode 100644 arch/hexagon/kernel/ptrace.c
1619  create mode 100644 arch/hexagon/kernel/reset.c
1620  create mode 100644 arch/hexagon/kernel/setup.c
1621  create mode 100644 arch/hexagon/kernel/signal.c
1622  create mode 100644 arch/hexagon/kernel/smp.c
1623  create mode 100644 arch/hexagon/kernel/stacktrace.c
1624  create mode 100644 arch/hexagon/kernel/syscall.c
1625  create mode 100644 arch/hexagon/kernel/syscalltab.c
1626  create mode 100644 arch/hexagon/kernel/time.c
1627  create mode 100644 arch/hexagon/kernel/topology.c
1628  create mode 100644 arch/hexagon/kernel/trampoline.S
1629  create mode 100644 arch/hexagon/kernel/traps.c
1630  create mode 100644 arch/hexagon/kernel/vdso.c
1631  create mode 100644 arch/hexagon/kernel/vm_entry.S
1632  create mode 100644 arch/hexagon/kernel/vm_events.c
1633  create mode 100644 arch/hexagon/kernel/vm_init_segtable.S
1634  create mode 100644 arch/hexagon/kernel/vm_ops.S
1635  create mode 100644 arch/hexagon/kernel/vm_switch.S
1636  create mode 100644 arch/hexagon/kernel/vm_vectors.S
1637  create mode 100644 arch/hexagon/kernel/vmlinux.lds.S
1638  create mode 100644 arch/hexagon/lib/Makefile
1639  create mode 100644 arch/hexagon/lib/checksum.c
1640  create mode 100644 arch/hexagon/lib/io.c
1641  create mode 100644 arch/hexagon/lib/memcpy.S
1642  create mode 100644 arch/hexagon/lib/memset.S
1643  create mode 100644 arch/hexagon/mm/Makefile
1644  create mode 100644 arch/hexagon/mm/cache.c
1645  create mode 100644 arch/hexagon/mm/copy_from_user.S
1646  create mode 100644 arch/hexagon/mm/copy_to_user.S
1647  create mode 100644 arch/hexagon/mm/copy_user_template.S
1648  create mode 100644 arch/hexagon/mm/init.c
1649  create mode 100644 arch/hexagon/mm/ioremap.c
1650  create mode 100644 arch/hexagon/mm/pgalloc.c
1651  create mode 100644 arch/hexagon/mm/strnlen_user.S
1652  create mode 100644 arch/hexagon/mm/uaccess.c
1653  create mode 100644 arch/hexagon/mm/vm_fault.c
1654  create mode 100644 arch/hexagon/mm/vm_tlb.c
1655  create mode 100644 include/asm-generic/rwsem.h
1656 Merging ia64/test
1657 $ git merge ia64/test
1658 Merge made by recursive.
1659  arch/ia64/configs/generic_defconfig   |    1 +
1660  arch/ia64/configs/gensparse_defconfig |    1 +
1661  arch/ia64/configs/tiger_defconfig     |    1 +
1662  arch/ia64/configs/xen_domu_defconfig  |    1 +
1663  arch/ia64/configs/zx1_defconfig       |    1 +
1664  arch/ia64/sn/kernel/sn2/sn_hwperf.c   |   12 +++--
1665  drivers/acpi/apei/erst.c              |    2 +-
1666  drivers/char/agp/hp-agp.c             |    6 ++-
1667  drivers/firmware/efivars.c            |    2 +-
1668  fs/pstore/inode.c                     |   40 ++++++++++++++--
1669  fs/pstore/internal.h                  |    2 +-
1670  fs/pstore/platform.c                  |   82 ++++++++++++++++++++++++++------
1671  include/linux/pstore.h                |    2 +-
1672  13 files changed, 123 insertions(+), 30 deletions(-)
1673 Merging m68k/for-next
1674 $ git merge m68k/for-next
1675 Merge made by recursive.
1676  arch/m68k/mac/macints.c      |    2 +-
1677  arch/m68k/mac/misc.c         |   40 +++++++++++++++++++++++-----------------
1678  drivers/zorro/zorro-driver.c |    8 ++++----
1679  3 files changed, 28 insertions(+), 22 deletions(-)
1680 Merging m68knommu/for-next
1681 $ git merge m68knommu/for-next
1682 Auto-merging arch/m68k/Kconfig.machine
1683 Removing arch/m68k/Kconfig.mmu
1684 Removing arch/m68k/Makefile_mm
1685 Removing arch/m68k/Makefile_no
1686 Removing arch/m68k/include/asm/entry_mm.h
1687 Removing arch/m68k/include/asm/entry_no.h
1688 Removing arch/m68k/kernel/Makefile_mm
1689 Removing arch/m68k/kernel/Makefile_no
1690 Removing arch/m68k/kernel/traps_mm.c
1691 Removing arch/m68k/kernel/traps_no.c
1692 Merge made by recursive.
1693  arch/m68k/Kconfig                            |  195 +----
1694  arch/m68k/Kconfig.bus                        |   55 ++
1695  arch/m68k/Kconfig.cpu                        |  429 +++++++++
1696  arch/m68k/Kconfig.devices                    |  171 ++++
1697  arch/m68k/{Kconfig.nommu => Kconfig.machine} |  543 ++++--------
1698  arch/m68k/Kconfig.mmu                        |  411 ---------
1699  arch/m68k/Makefile                           |  168 ++++-
1700  arch/m68k/Makefile_mm                        |  121 ---
1701  arch/m68k/Makefile_no                        |  124 ---
1702  arch/m68k/include/asm/entry.h                |  255 ++++++-
1703  arch/m68k/include/asm/entry_mm.h             |  128 ---
1704  arch/m68k/include/asm/entry_no.h             |  181 ----
1705  arch/m68k/include/asm/m520xsim.h             |   26 +-
1706  arch/m68k/include/asm/mcfqspi.h              |    8 +-
1707  arch/m68k/include/asm/page_no.h              |    3 +
1708  arch/m68k/include/asm/processor.h            |    6 +
1709  arch/m68k/include/asm/sections.h             |    2 +
1710  arch/m68k/kernel/Makefile                    |   24 +-
1711  arch/m68k/kernel/Makefile_mm                 |   17 -
1712  arch/m68k/kernel/Makefile_no                 |   10 -
1713  arch/m68k/kernel/entry_no.S                  |    6 +-
1714  arch/m68k/kernel/setup_no.c                  |    4 +-
1715  arch/m68k/kernel/traps.c                     | 1108 +++++++++++++++++++++++-
1716  arch/m68k/kernel/traps_mm.c                  | 1207 --------------------------
1717  arch/m68k/kernel/traps_no.c                  |  361 --------
1718  arch/m68k/kernel/vectors.c                   |  145 +++
1719  arch/m68k/lib/memcpy.c                       |    9 +
1720  arch/m68k/mm/init_no.c                       |   21 +-
1721  arch/m68k/platform/520x/config.c             |    6 +-
1722  arch/m68k/platform/520x/gpio.c               |   50 +-
1723  arch/m68k/platform/68328/Makefile            |    5 +-
1724  arch/m68k/platform/68328/entry.S             |   18 +-
1725  arch/m68k/platform/68360/Makefile            |    6 +-
1726  arch/m68k/platform/68360/entry.S             |    4 +-
1727  arch/m68k/platform/coldfire/entry.S          |    6 +-
1728  35 files changed, 2656 insertions(+), 3177 deletions(-)
1729  create mode 100644 arch/m68k/Kconfig.bus
1730  create mode 100644 arch/m68k/Kconfig.cpu
1731  create mode 100644 arch/m68k/Kconfig.devices
1732  rename arch/m68k/{Kconfig.nommu => Kconfig.machine} (62%)
1733  delete mode 100644 arch/m68k/Kconfig.mmu
1734  delete mode 100644 arch/m68k/Makefile_mm
1735  delete mode 100644 arch/m68k/Makefile_no
1736  delete mode 100644 arch/m68k/include/asm/entry_mm.h
1737  delete mode 100644 arch/m68k/include/asm/entry_no.h
1738  delete mode 100644 arch/m68k/kernel/Makefile_mm
1739  delete mode 100644 arch/m68k/kernel/Makefile_no
1740  delete mode 100644 arch/m68k/kernel/traps_mm.c
1741  delete mode 100644 arch/m68k/kernel/traps_no.c
1742  create mode 100644 arch/m68k/kernel/vectors.c
1743 Merging microblaze/next
1744 $ git merge microblaze/next
1745 Already up-to-date.
1746 Merging mips/mips-for-linux-next
1747 $ git merge mips/mips-for-linux-next
1748 Auto-merging arch/mips/kernel/scall32-o32.S
1749 Removing arch/mips/nxp/pnx8550/common/pci.c
1750 Removing arch/mips/nxp/pnx8550/common/setup.c
1751 Merge made by recursive.
1752  arch/mips/Kconfig                                  |    1 +
1753  arch/mips/Makefile                                 |    2 +
1754  arch/mips/alchemy/common/platform.c                |    2 +-
1755  arch/mips/alchemy/common/power.c                   |   22 ++-
1756  arch/mips/ar7/irq.c                                |    3 +-
1757  arch/mips/bcm63xx/irq.c                            |    1 +
1758  arch/mips/cobalt/irq.c                             |    1 +
1759  arch/mips/dec/setup.c                              |    4 +
1760  arch/mips/emma/markeins/irq.c                      |    2 +-
1761  arch/mips/include/asm/cacheflush.h                 |   24 ++++
1762  arch/mips/include/asm/io.h                         |   12 +--
1763  .../asm/mach-cavium-octeon/cpu-feature-overrides.h |    1 -
1764  arch/mips/include/asm/mipsprom.h                   |    6 +-
1765  arch/mips/include/asm/prom.h                       |    6 +-
1766  arch/mips/kernel/ftrace.c                          |   39 +++---
1767  arch/mips/kernel/scall32-o32.S                     |    2 +-
1768  arch/mips/kernel/signal.c                          |    3 +
1769  arch/mips/kernel/traps.c                           |    6 +-
1770  arch/mips/lantiq/irq.c                             |    6 +-
1771  arch/mips/lasat/interrupt.c                        |    1 +
1772  arch/mips/loongson/fuloong-2e/irq.c                |    1 +
1773  arch/mips/loongson/lemote-2f/irq.c                 |    3 +-
1774  arch/mips/mm/c-octeon.c                            |    6 +
1775  arch/mips/mm/c-r3k.c                               |    7 +
1776  arch/mips/mm/c-r4k.c                               |   35 +++++
1777  arch/mips/mm/c-tx39.c                              |    7 +
1778  arch/mips/mm/cache.c                               |    5 +
1779  arch/mips/mm/tlbex.c                               |    3 +-
1780  arch/mips/mti-malta/malta-int.c                    |    6 +-
1781  arch/mips/netlogic/Platform                        |    5 +
1782  arch/mips/netlogic/xlr/setup.c                     |    4 +-
1783  arch/mips/netlogic/xlr/smp.c                       |    2 +-
1784  arch/mips/netlogic/xlr/smpboot.S                   |   16 ++-
1785  arch/mips/nxp/pnx8550/common/pci.c                 |  134 ------------------
1786  arch/mips/nxp/pnx8550/common/setup.c               |  143 --------------------
1787  arch/mips/pci/pci-lantiq.c                         |    9 +-
1788  arch/mips/pci/pci-rc32434.c                        |    2 +-
1789  arch/mips/pmc-sierra/msp71xx/msp_irq.c             |    6 +-
1790  arch/mips/pmc-sierra/msp71xx/msp_setup.c           |    1 +
1791  arch/mips/pmc-sierra/yosemite/py-console.c         |   12 +--
1792  arch/mips/pnx8550/common/int.c                     |    2 +-
1793  arch/mips/pnx8550/common/prom.c                    |    2 +-
1794  arch/mips/sgi-ip22/ip22-int.c                      |   10 +-
1795  arch/mips/sgi-ip27/ip27-irq.c                      |    4 +-
1796  arch/mips/sni/rm200.c                              |    1 +
1797  arch/mips/vr41xx/common/irq.c                      |    1 +
1798  drivers/mtd/maps/lantiq-flash.c                    |    4 +-
1799  47 files changed, 204 insertions(+), 371 deletions(-)
1800  delete mode 100644 arch/mips/nxp/pnx8550/common/pci.c
1801  delete mode 100644 arch/mips/nxp/pnx8550/common/setup.c
1802 Merging openrisc/for-upstream
1803 $ git merge openrisc/for-upstream
1804 Already up-to-date.
1805 Merging parisc/for-next
1806 $ git merge parisc/for-next
1807 Already up-to-date.
1808 Merging powerpc/next
1809 $ git merge powerpc/next
1810 Removing arch/powerpc/boot/dts/hcu4.dts
1811 Removing arch/powerpc/configs/40x/hcu4_defconfig
1812 Removing arch/powerpc/platforms/40x/hcu4.c
1813 Merge made by recursive.
1814  arch/powerpc/Kconfig                    |    2 +-
1815  arch/powerpc/boot/dts/hcu4.dts          |  168 ------------------------------
1816  arch/powerpc/boot/dts/yosemite.dts      |   36 +++++++
1817  arch/powerpc/configs/40x/hcu4_defconfig |   80 --------------
1818  arch/powerpc/configs/ppc40x_defconfig   |    1 -
1819  arch/powerpc/include/asm/kexec.h        |    2 +-
1820  arch/powerpc/kernel/misc_32.S           |  171 +++++++++++++++++++++++++++++++
1821  arch/powerpc/platforms/40x/Kconfig      |    8 --
1822  arch/powerpc/platforms/40x/Makefile     |    1 -
1823  arch/powerpc/platforms/40x/hcu4.c       |   61 -----------
1824  arch/powerpc/sysdev/ppc4xx_pci.c        |   89 +++++++++++++---
1825  arch/powerpc/sysdev/ppc4xx_pci.h        |   12 ++
1826  drivers/edac/ppc4xx_edac.c              |    2 +-
1827  13 files changed, 294 insertions(+), 339 deletions(-)
1828  delete mode 100644 arch/powerpc/boot/dts/hcu4.dts
1829  delete mode 100644 arch/powerpc/configs/40x/hcu4_defconfig
1830  delete mode 100644 arch/powerpc/platforms/40x/hcu4.c
1831 Merging 4xx/next
1832 $ git merge 4xx/next
1833 Already up-to-date.
1834 Merging 52xx-and-virtex/powerpc/next
1835 $ git merge 52xx-and-virtex/powerpc/next
1836 Merge made by recursive.
1837  arch/powerpc/boot/dts/charon.dts             |  236 ++++++++++++++++++++++++++
1838  arch/powerpc/configs/52xx/tqm5200_defconfig  |   20 ++-
1839  arch/powerpc/platforms/52xx/mpc5200_simple.c |    1 +
1840  3 files changed, 249 insertions(+), 8 deletions(-)
1841  create mode 100644 arch/powerpc/boot/dts/charon.dts
1842 Merging galak/next
1843 $ git merge galak/next
1844 Already up-to-date.
1845 Merging s390/features
1846 $ git merge s390/features
1847 Auto-merging Documentation/kernel-parameters.txt
1848 Merge made by recursive.
1849  Documentation/kernel-parameters.txt |    6 +-
1850  arch/s390/Kconfig                   |   10 ++
1851  arch/s390/defconfig                 |    2 +-
1852  arch/s390/include/asm/ccwdev.h      |    3 +
1853  arch/s390/include/asm/ipl.h         |    1 +
1854  arch/s390/include/asm/irq.h         |    2 +-
1855  arch/s390/include/asm/kexec.h       |    3 +
1856  arch/s390/include/asm/lowcore.h     |   10 +-
1857  arch/s390/include/asm/setup.h       |    9 ++
1858  arch/s390/include/asm/smp.h         |    5 +
1859  arch/s390/include/asm/system.h      |    2 +
1860  arch/s390/include/asm/thread_info.h |    2 +-
1861  arch/s390/kernel/Makefile           |    1 +
1862  arch/s390/kernel/asm-offsets.c      |    1 -
1863  arch/s390/kernel/crash_dump.c       |   39 ++++++
1864  arch/s390/kernel/entry.S            |    4 +-
1865  arch/s390/kernel/entry64.S          |    4 +-
1866  arch/s390/kernel/head.S             |   16 +++
1867  arch/s390/kernel/head_kdump.S       |  116 +++++++++++++++++
1868  arch/s390/kernel/ipl.c              |    5 +
1869  arch/s390/kernel/irq.c              |    2 +-
1870  arch/s390/kernel/machine_kexec.c    |  245 +++++++++++++++++++++++++++++++++++
1871  arch/s390/kernel/mem_detect.c       |   69 ++++++++++
1872  arch/s390/kernel/reipl64.S          |    4 +-
1873  arch/s390/kernel/setup.c            |  203 +++++++++++++++++++++++++++++
1874  arch/s390/kernel/smp.c              |   23 ++++
1875  arch/s390/mm/maccess.c              |   57 ++++++++
1876  arch/s390/mm/vmem.c                 |    6 +
1877  drivers/s390/block/dasd.c           |    2 -
1878  drivers/s390/block/dasd_eckd.c      |    1 +
1879  drivers/s390/block/dasd_fba.c       |    1 +
1880  drivers/s390/char/con3215.c         |    3 +-
1881  drivers/s390/char/raw3270.c         |    3 +-
1882  drivers/s390/char/tape_34xx.c       |    1 +
1883  drivers/s390/char/tape_3590.c       |    1 +
1884  drivers/s390/char/tape_core.c       |    2 -
1885  drivers/s390/char/vmur.c            |    3 +-
1886  drivers/s390/char/zcore.c           |   20 +---
1887  drivers/s390/cio/ccwreq.c           |   23 +++-
1888  drivers/s390/cio/cio.c              |   25 +++-
1889  drivers/s390/cio/device.c           |   13 ++
1890  drivers/s390/cio/device.h           |   13 ++-
1891  drivers/s390/cio/io_sch.h           |    2 +
1892  drivers/s390/cio/qdio_main.c        |    2 -
1893  drivers/s390/net/claw.c             |    3 +-
1894  drivers/s390/net/ctcm_main.c        |    3 +-
1895  drivers/s390/net/lcs.c              |    3 +-
1896  include/linux/crash_dump.h          |    1 +
1897  include/linux/kexec.h               |    4 +
1898  kernel/crash_dump.c                 |   11 ++
1899  kernel/kexec.c                      |    2 +-
1900  51 files changed, 924 insertions(+), 68 deletions(-)
1901  create mode 100644 arch/s390/kernel/crash_dump.c
1902  create mode 100644 arch/s390/kernel/head_kdump.S
1903 Merging sh/sh-latest
1904 $ git merge sh/sh-latest
1905 Merge made by recursive.
1906  arch/sh/boards/mach-ecovec24/setup.c |    4 ++++
1907  1 files changed, 4 insertions(+), 0 deletions(-)
1908 Merging rmobile/rmobile-latest
1909 $ git merge rmobile/rmobile-latest
1910 Merge made by recursive.
1911  arch/arm/mach-shmobile/include/mach/sh73a0.h |   13 ++++
1912  arch/arm/mach-shmobile/pfc-sh73a0.c          |   77 +++++++++++++++++++++-----
1913  2 files changed, 75 insertions(+), 15 deletions(-)
1914 Merging sparc/master
1915 $ git merge sparc/master
1916 Already up-to-date.
1917 Merging tile/master
1918 $ git merge tile/master
1919 Merge made by recursive.
1920  arch/tile/kernel/intvec_32.S  |    2 +-
1921  arch/tile/lib/atomic_asm_32.S |    2 +-
1922  fs/nfs/nfs4filelayout.c       |    6 +++---
1923  3 files changed, 5 insertions(+), 5 deletions(-)
1924 Merging unicore32/unicore32
1925 $ git merge unicore32/unicore32
1926 Merge made by recursive.
1927  arch/unicore32/boot/compressed/Makefile |    4 ++--
1928  arch/unicore32/include/asm/bitops.h     |   12 ++++++------
1929  arch/unicore32/kernel/ksyms.c           |    4 ++--
1930  arch/unicore32/lib/findbit.S            |   14 ++++++++------
1931  4 files changed, 18 insertions(+), 16 deletions(-)
1932 Merging xtensa/master
1933 $ git merge xtensa/master
1934 Merge made by recursive.
1935  arch/xtensa/include/asm/irqflags.h |    1 +
1936  arch/xtensa/include/asm/regs.h     |   91 ++++++++++++++++++---------------
1937  arch/xtensa/include/asm/timex.h    |    4 +-
1938  arch/xtensa/include/asm/uaccess.h  |    2 +-
1939  arch/xtensa/kernel/align.S         |   14 +++---
1940  arch/xtensa/kernel/coprocessor.S   |   10 ++--
1941  arch/xtensa/kernel/entry.S         |   98 ++++++++++++++++++------------------
1942  arch/xtensa/kernel/head.S          |   12 ++--
1943  arch/xtensa/kernel/irq.c           |    5 ++
1944  arch/xtensa/kernel/traps.c         |    4 +-
1945  arch/xtensa/kernel/vectors.S       |   22 ++++----
1946  arch/xtensa/kernel/vmlinux.lds.S   |    1 +
1947  12 files changed, 139 insertions(+), 125 deletions(-)
1948 Merging ceph/for-next
1949 $ git merge ceph/for-next
1950 Auto-merging fs/ceph/caps.c
1951 Auto-merging fs/ceph/mds_client.c
1952 Auto-merging fs/ceph/super.c
1953 Auto-merging fs/ceph/super.h
1954 Auto-merging include/linux/ceph/libceph.h
1955 Auto-merging net/ceph/osd_client.c
1956 Merge made by recursive.
1957  drivers/block/rbd.c            |    2 +-
1958  fs/ceph/addr.c                 |  192 +++++++++++++++++++++++++---------------
1959  fs/ceph/caps.c                 |    2 +-
1960  fs/ceph/ioctl.h                |   55 +++++++++++-
1961  fs/ceph/mds_client.c           |   11 ++-
1962  fs/ceph/super.c                |   23 ++++--
1963  fs/ceph/super.h                |    8 +-
1964  include/linux/ceph/libceph.h   |    4 +-
1965  include/linux/ceph/messenger.h |    3 +-
1966  net/ceph/ceph_common.c         |   47 +++++-----
1967  net/ceph/messenger.c           |   16 +++-
1968  net/ceph/mon_client.c          |   71 ++++++++-------
1969  net/ceph/msgpool.c             |    4 +-
1970  net/ceph/osd_client.c          |    8 +-
1971  14 files changed, 290 insertions(+), 156 deletions(-)
1972 Merging cifs/master
1973 $ git merge cifs/master
1974 Merge made by recursive.
1975  fs/cifs/cifsencrypt.c |   54 ++++++++++---------------------------------------
1976  fs/cifs/cifsfs.c      |   10 +++++---
1977  fs/cifs/cifssmb.c     |    3 +-
1978  fs/cifs/connect.c     |    4 +-
1979  4 files changed, 21 insertions(+), 50 deletions(-)
1980 Merging configfs/linux-next
1981 $ git merge configfs/linux-next
1982 Already up-to-date.
1983 Merging ecryptfs/next
1984 $ git merge ecryptfs/next
1985 Already up-to-date.
1986 Merging ext3/for_next
1987 $ git merge ext3/for_next
1988 Already up-to-date.
1989 Merging ext4/dev
1990 $ git merge ext4/dev
1991 Auto-merging fs/ext4/ext4.h
1992 Auto-merging fs/ext4/inode.c
1993 Merge made by recursive.
1994  Documentation/filesystems/ext4.txt |    8 +++--
1995  fs/ext4/ext4.h                     |    6 ++-
1996  fs/ext4/inode.c                    |    7 ++++
1997  fs/ext4/namei.c                    |    8 ++--
1998  fs/ext4/super.c                    |   46 ++++++++++++++++-----------
1999  fs/jbd2/transaction.c              |   59 ++++++++++++++++++++++++++++++++----
2000  include/linux/ext2_fs.h            |    4 +-
2001  include/linux/ext3_fs.h            |    4 +-
2002  8 files changed, 104 insertions(+), 38 deletions(-)
2003 Merging fatfs/master
2004 $ git merge fatfs/master
2005 Already up-to-date.
2006 Merging fuse/for-next
2007 $ git merge fuse/for-next
2008 Already up-to-date.
2009 Merging gfs2/master
2010 $ git merge gfs2/master
2011 Auto-merging fs/gfs2/acl.c
2012 Merge made by recursive.
2013  fs/gfs2/acl.c    |    5 +-
2014  fs/gfs2/aops.c   |    6 ---
2015  fs/gfs2/dir.c    |   42 +++++---------------
2016  fs/gfs2/file.c   |   50 ++++++++++++++++++------
2017  fs/gfs2/glops.c  |   29 +++++++++++---
2018  fs/gfs2/incore.h |    1 +
2019  fs/gfs2/inode.c  |   85 +++++++++++++++--------------------------
2020  fs/gfs2/inode.h  |    2 +-
2021  fs/gfs2/quota.c  |   13 +-----
2022  fs/gfs2/super.c  |  111 +++++++++++++++++++++++++++++++++++-------------------
2023  fs/gfs2/xattr.c  |    5 +-
2024  11 files changed, 182 insertions(+), 167 deletions(-)
2025 Merging hfsplus/for-next
2026 $ git merge hfsplus/for-next
2027 Already up-to-date.
2028 Merging jfs/next
2029 $ git merge jfs/next
2030 Already up-to-date.
2031 Merging logfs/master
2032 $ git merge logfs/master
2033 Auto-merging fs/logfs/logfs.h
2034 Merge made by recursive.
2035  fs/logfs/dev_mtd.c   |   26 ++++++++++++--------------
2036  fs/logfs/logfs.h     |    1 +
2037  fs/logfs/readwrite.c |    4 ++++
2038  fs/logfs/segment.c   |   14 ++++++++++----
2039  fs/logfs/super.c     |    1 +
2040  5 files changed, 28 insertions(+), 18 deletions(-)
2041 Merging nfs/linux-next
2042 $ git merge nfs/linux-next
2043 Merge made by recursive.
2044  fs/nfs/nfs4_fs.h    |    8 +++++---
2045  fs/nfs/nfs4proc.c   |   20 ++++++++++++++------
2046  fs/nfs/nfs4renewd.c |   12 +++++++++---
2047  fs/nfs/nfs4state.c  |    6 ++++++
2048  fs/nfs/super.c      |   23 ++++++++++++++++++++---
2049  fs/nfs/write.c      |    2 +-
2050  6 files changed, 55 insertions(+), 16 deletions(-)
2051 Merging nfsd/nfsd-next
2052 $ git merge nfsd/nfsd-next
2053 Auto-merging fs/compat.c
2054 Auto-merging fs/nfs/nfs4_fs.h
2055 Auto-merging include/linux/fs.h
2056 Removing include/linux/nfsd/const.h
2057 Removing include/linux/nfsd/syscall.h
2058 Merge made by recursive.
2059  arch/alpha/include/asm/fcntl.h |    2 -
2060  fs/compat.c                    |    1 -
2061  fs/lockd/svc.c                 |    2 +-
2062  fs/locks.c                     |  125 +++++++-----
2063  fs/nfs/callback.c              |    4 +-
2064  fs/nfs/nfs4_fs.h               |   24 ---
2065  fs/nfsd/export.c               |    1 -
2066  fs/nfsd/nfs4proc.c             |   42 +++--
2067  fs/nfsd/nfs4recover.c          |   53 ++++-
2068  fs/nfsd/nfs4state.c            |  448 ++++++++++++++++------------------------
2069  fs/nfsd/nfs4xdr.c              |   33 ++--
2070  fs/nfsd/nfsctl.c               |    1 -
2071  fs/nfsd/nfsd.h                 |   26 +++
2072  fs/nfsd/nfsfh.c                |   39 ++--
2073  fs/nfsd/state.h                |   18 +-
2074  fs/nfsd/vfs.c                  |   11 +-
2075  fs/nfsd/vfs.h                  |   27 ++--
2076  fs/nfsd/xdr4.h                 |    2 +-
2077  include/asm-generic/fcntl.h    |    5 -
2078  include/linux/fs.h             |    8 +-
2079  include/linux/nfs4.h           |   16 ++
2080  include/linux/nfsd/Kbuild      |    2 -
2081  include/linux/nfsd/const.h     |   55 -----
2082  include/linux/nfsd/nfsfh.h     |    7 +-
2083  include/linux/nfsd/syscall.h   |  116 -----------
2084  include/linux/sunrpc/svc.h     |    2 +-
2085  net/sunrpc/svc.c               |   33 +++-
2086  27 files changed, 474 insertions(+), 629 deletions(-)
2087  delete mode 100644 include/linux/nfsd/const.h
2088  delete mode 100644 include/linux/nfsd/syscall.h
2089 Merging nilfs2/for-next
2090 $ git merge nilfs2/for-next
2091 Already up-to-date.
2092 Merging ocfs2/linux-next
2093 $ git merge ocfs2/linux-next
2094 Auto-merging fs/ocfs2/file.c
2095 Auto-merging fs/ocfs2/move_extents.c
2096 Merge made by recursive.
2097  fs/ocfs2/aops.c              |   69 +++++++++++++--
2098  fs/ocfs2/aops.h              |   14 +++
2099  fs/ocfs2/cluster/heartbeat.c |  194 ++++++++++++++++++++++++++----------------
2100  fs/ocfs2/cluster/netdebug.c  |  102 +++++++++++++++-------
2101  fs/ocfs2/cluster/tcp.c       |  138 ++++++++++++++++--------------
2102  fs/ocfs2/cluster/tcp.h       |    2 +
2103  fs/ocfs2/dir.c               |    3 +-
2104  fs/ocfs2/dlm/dlmcommon.h     |   56 +++----------
2105  fs/ocfs2/dlm/dlmdomain.c     |   44 +++++-----
2106  fs/ocfs2/dlm/dlmlock.c       |   54 ++++++------
2107  fs/ocfs2/dlm/dlmmaster.c     |  175 +++++++++++++++++++-------------------
2108  fs/ocfs2/dlm/dlmrecovery.c   |  164 ++++++++++++++++++------------------
2109  fs/ocfs2/dlm/dlmthread.c     |   16 ++--
2110  fs/ocfs2/dlmglue.c           |   21 +++--
2111  fs/ocfs2/extent_map.c        |   96 +++++++++++++++++++++
2112  fs/ocfs2/extent_map.h        |    2 +
2113  fs/ocfs2/file.c              |   93 ++++++++++++++++++++-
2114  fs/ocfs2/inode.h             |    3 +
2115  fs/ocfs2/ioctl.c             |    8 +-
2116  fs/ocfs2/journal.c           |   23 +++++-
2117  fs/ocfs2/mmap.c              |   53 +++++------
2118  fs/ocfs2/move_extents.c      |    2 +-
2119  fs/ocfs2/ocfs2.h             |    4 +-
2120  fs/ocfs2/quota_local.c       |   13 ++-
2121  fs/ocfs2/slot_map.c          |    4 +-
2122  fs/ocfs2/stack_o2cb.c        |   71 ++++++++++++++--
2123  fs/ocfs2/super.c             |   23 +++--
2124  fs/ocfs2/xattr.c             |    9 ++-
2125  28 files changed, 932 insertions(+), 524 deletions(-)
2126 Merging omfs/for-next
2127 $ git merge omfs/for-next
2128 Already up-to-date.
2129 Merging squashfs/master
2130 $ git merge squashfs/master
2131 Already up-to-date.
2132 Merging udf/for_next
2133 $ git merge udf/for_next
2134 Already up-to-date.
2135 Merging v9fs/for-next
2136 $ git merge v9fs/for-next
2137 Resolved 'net/9p/trans_virtio.c' using previous resolution.
2138 Auto-merging include/net/9p/9p.h
2139 Auto-merging net/9p/trans_virtio.c
2140 CONFLICT (content): Merge conflict in net/9p/trans_virtio.c
2141 Automatic merge failed; fix conflicts and then commit the result.
2142 $ git commit -v -a
2143 [master 3574921] Merge remote-tracking branch 'v9fs/for-next'
2144 $ git diff -M --stat --summary HEAD^..
2145  fs/9p/vfs_dir.c            |   14 +-
2146  include/net/9p/9p.h        |   14 +-
2147  include/net/9p/client.h    |    6 +-
2148  include/net/9p/transport.h |   10 +-
2149  include/trace/events/9p.h  |  186 ++++++++++++++++++
2150  net/9p/client.c            |  456 +++++++++++++++++++++++++++++++-------------
2151  net/9p/protocol.c          |   99 ++---------
2152  net/9p/protocol.h          |    4 +-
2153  net/9p/trans_common.c      |   53 ++----
2154  net/9p/trans_common.h      |   21 +--
2155  net/9p/trans_virtio.c      |  319 ++++++++++++++++++-------------
2156  11 files changed, 748 insertions(+), 434 deletions(-)
2157  create mode 100644 include/trace/events/9p.h
2158 Merging ubifs/linux-next
2159 $ git merge ubifs/linux-next
2160 Already up-to-date.
2161 Merging xfs/master
2162 $ git merge xfs/master
2163 Resolved 'fs/xfs/xfs_super.c' using previous resolution.
2164 Auto-merging fs/xfs/xfs_iops.c
2165 Auto-merging fs/xfs/xfs_super.c
2166 CONFLICT (content): Merge conflict in fs/xfs/xfs_super.c
2167 Automatic merge failed; fix conflicts and then commit the result.
2168 $ git commit -v -a
2169 [master 918ab53] Merge remote-tracking branch 'xfs/master'
2170 $ git diff -M --stat --summary HEAD^..
2171  fs/xfs/xfs_aops.c        |  110 ++++++++++++++++------------------------------
2172  fs/xfs/xfs_aops.h        |    4 +-
2173  fs/xfs/xfs_attr.c        |   21 ++-------
2174  fs/xfs/xfs_bmap.c        |   10 +----
2175  fs/xfs/xfs_buf.c         |  108 +++++++++++++++------------------------------
2176  fs/xfs/xfs_buf.h         |   14 +++---
2177  fs/xfs/xfs_buf_item.c    |    4 +-
2178  fs/xfs/xfs_dquot.c       |    6 ++-
2179  fs/xfs/xfs_file.c        |  110 ++++++++++++++++++++++++++++++++++------------
2180  fs/xfs/xfs_fsops.c       |   40 +++++++++--------
2181  fs/xfs/xfs_iget.c        |    2 -
2182  fs/xfs/xfs_inode.c       |    6 ++-
2183  fs/xfs/xfs_inode.h       |    1 -
2184  fs/xfs/xfs_iops.c        |    8 ++--
2185  fs/xfs/xfs_log_recover.c |   18 +++++---
2186  fs/xfs/xfs_mount.c       |    2 +-
2187  fs/xfs/xfs_qm.c          |    3 +-
2188  fs/xfs/xfs_rw.c          |    2 +-
2189  fs/xfs/xfs_super.c       |    7 +---
2190  fs/xfs/xfs_sync.c        |   14 +++---
2191  fs/xfs/xfs_trace.h       |    1 -
2192  fs/xfs/xfs_trans_buf.c   |    5 +-
2193  fs/xfs/xfs_vnodeops.c    |    4 +-
2194  23 files changed, 232 insertions(+), 268 deletions(-)
2195 Merging vfs/for-next
2196 $ git merge vfs/for-next
2197 Already up-to-date.
2198 Merging vfs-scale/vfs-scale-working
2199 $ git merge vfs-scale/vfs-scale-working
2200 Already up-to-date.
2201 Merging pci/linux-next
2202 $ git merge pci/linux-next
2203 Already up-to-date.
2204 Merging hid/for-next
2205 $ git merge hid/for-next
2206 Resolved 'drivers/hid/hid-core.c' using previous resolution.
2207 Resolved 'drivers/hid/hid-ids.h' using previous resolution.
2208 Auto-merging drivers/hid/Kconfig
2209 Auto-merging drivers/hid/hid-apple.c
2210 Auto-merging drivers/hid/hid-core.c
2211 CONFLICT (content): Merge conflict in drivers/hid/hid-core.c
2212 Auto-merging drivers/hid/hid-ids.h
2213 CONFLICT (content): Merge conflict in drivers/hid/hid-ids.h
2214 Auto-merging drivers/hid/usbhid/hid-quirks.c
2215 Automatic merge failed; fix conflicts and then commit the result.
2216 $ git commit -v -a
2217 [master f35e02d] Merge remote-tracking branch 'hid/for-next'
2218 $ git diff -M --stat --summary HEAD^..
2219  .../ABI/testing/sysfs-driver-hid-logitech-lg4ff    |    7 +
2220  drivers/hid/Kconfig                                |   19 +-
2221  drivers/hid/Makefile                               |    2 +-
2222  drivers/hid/hid-apple.c                            |    9 +
2223  drivers/hid/hid-axff.c                             |   36 ++-
2224  drivers/hid/hid-core.c                             |   56 +++-
2225  drivers/hid/hid-debug.c                            |    5 +
2226  drivers/hid/hid-ids.h                              |    7 +
2227  drivers/hid/hid-lg.c                               |   29 +-
2228  drivers/hid/hid-lg.h                               |    4 +-
2229  drivers/hid/hid-lg4ff.c                            |  403 ++++++++++++++++++--
2230  drivers/hid/hid-lgff.c                             |   13 -
2231  drivers/hid/hid-multitouch.c                       |   15 +
2232  drivers/hid/hid-prodikeys.c                        |    8 +-
2233  drivers/hid/hid-sjoy.c                             |   68 ++--
2234  drivers/hid/hid-zydacron.c                         |    4 +-
2235  drivers/hid/usbhid/hid-quirks.c                    |    1 -
2236  include/linux/hid.h                                |    2 +
2237  18 files changed, 573 insertions(+), 115 deletions(-)
2238  create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
2239 Merging quilt/i2c
2240 $ git merge quilt/i2c
2241 Merge made by recursive.
2242  drivers/i2c/busses/Kconfig |    2 +-
2243  1 files changed, 1 insertions(+), 1 deletions(-)
2244 Merging bjdooks-i2c/next-i2c
2245 $ git merge bjdooks-i2c/next-i2c
2246 Auto-merging drivers/i2c/busses/i2c-omap.c
2247 Merge made by recursive.
2248  arch/arm/plat-omap/i2c.c      |   27 +++++++++++
2249  drivers/i2c/busses/i2c-omap.c |   99 ++++++++++++++++++++++------------------
2250  include/linux/i2c-omap.h      |    2 +
2251  3 files changed, 83 insertions(+), 45 deletions(-)
2252 Merging quilt/jdelvare-hwmon
2253 $ git merge quilt/jdelvare-hwmon
2254 Merge made by recursive.
2255  drivers/hwmon/Kconfig      |   15 ++++-
2256  drivers/hwmon/ibmaem.c     |   60 ++++++++++--------
2257  drivers/hwmon/lm90.c       |  146 +++++++++++++++++++++----------------------
2258  drivers/hwmon/smsc47b397.c |   13 +++--
2259  4 files changed, 126 insertions(+), 108 deletions(-)
2260 Merging hwmon-staging/hwmon-next
2261 $ git merge hwmon-staging/hwmon-next
2262 Auto-merging drivers/hwmon/Kconfig
2263 Merge made by recursive.
2264  Documentation/hwmon/adm1275               |   40 ++-
2265  Documentation/hwmon/exynos4_tmu           |   81 +++++
2266  Documentation/hwmon/pmbus-core            |  283 ++++++++++++++++
2267  Documentation/hwmon/zl6100                |  125 +++++++
2268  drivers/hwmon/Kconfig                     |   10 +
2269  drivers/hwmon/Makefile                    |    1 +
2270  drivers/hwmon/exynos4_tmu.c               |  524 +++++++++++++++++++++++++++++
2271  drivers/hwmon/f71882fg.c                  |  231 +++++++------
2272  drivers/hwmon/pmbus/Kconfig               |   16 +-
2273  drivers/hwmon/pmbus/Makefile              |    1 +
2274  drivers/hwmon/pmbus/adm1275.c             |  159 ++++++++-
2275  drivers/hwmon/pmbus/lm25066.c             |   17 +-
2276  drivers/hwmon/pmbus/max16064.c            |    3 +-
2277  drivers/hwmon/pmbus/max34440.c            |   13 +-
2278  drivers/hwmon/pmbus/max8688.c             |    9 +-
2279  drivers/hwmon/pmbus/pmbus.c               |    5 +-
2280  drivers/hwmon/pmbus/pmbus.h               |   20 +-
2281  drivers/hwmon/pmbus/pmbus_core.c          |   32 +-
2282  drivers/hwmon/pmbus/ucd9000.c             |   13 +-
2283  drivers/hwmon/pmbus/ucd9200.c             |    5 +-
2284  drivers/hwmon/pmbus/zl6100.c              |  256 ++++++++++++++
2285  drivers/hwmon/w83627ehf.c                 |   62 ++++
2286  include/linux/platform_data/exynos4_tmu.h |   83 +++++
2287  23 files changed, 1797 insertions(+), 192 deletions(-)
2288  create mode 100644 Documentation/hwmon/exynos4_tmu
2289  create mode 100644 Documentation/hwmon/pmbus-core
2290  create mode 100644 Documentation/hwmon/zl6100
2291  create mode 100644 drivers/hwmon/exynos4_tmu.c
2292  create mode 100644 drivers/hwmon/pmbus/zl6100.c
2293  create mode 100644 include/linux/platform_data/exynos4_tmu.h
2294 Merging quilt/kernel-doc
2295 $ git merge quilt/kernel-doc
2296 Merge made by recursive.
2297  Documentation/CodingStyle               |    4 ++--
2298  Documentation/cgroups/cgroups.txt       |    4 ++--
2299  Documentation/filesystems/hfs.txt       |    9 ++++-----
2300  Documentation/filesystems/inotify.txt   |    3 ++-
2301  Documentation/laptops/thinkpad-acpi.txt |    4 ++--
2302  Documentation/networking/dmfe.txt       |    3 ++-
2303  Documentation/serial/computone.txt      |    2 --
2304  7 files changed, 14 insertions(+), 15 deletions(-)
2305 Merging docs/docs-move
2306 $ git merge docs/docs-move
2307 Merge made by recursive.
2308  Documentation/DocBook/drm.tmpl  |  308 +++++++++++++++++++++------------------
2309  drivers/gpu/drm/i915/i915_drv.c |    4 +-
2310  2 files changed, 170 insertions(+), 142 deletions(-)
2311 Merging v4l-dvb/master
2312 $ git merge v4l-dvb/master
2313 Already up-to-date.
2314 Merging kbuild/for-next
2315 $ git merge kbuild/for-next
2316 Merge made by recursive.
2317  scripts/kconfig/Makefile             |   28 ++--------------------------
2318  scripts/kconfig/menu.c               |   13 +++++--------
2319  scripts/kconfig/nconf.c              |    2 --
2320  scripts/kconfig/streamline_config.pl |   22 +++++++++++++++++++---
2321  4 files changed, 26 insertions(+), 39 deletions(-)
2322 Merging kconfig/for-next
2323 $ git merge kconfig/for-next
2324 Already up-to-date!
2325 Merge made by recursive.
2326 Merging ide/master
2327 $ git merge ide/master
2328 Already up-to-date.
2329 Merging libata/NEXT
2330 $ git merge libata/NEXT
2331 Merge made by recursive.
2332  drivers/ata/libata-eh.c  |    5 ++---
2333  drivers/ata/sata_sil24.c |    4 ++--
2334  2 files changed, 4 insertions(+), 5 deletions(-)
2335 Merging infiniband/for-next
2336 $ git merge infiniband/for-next
2337 Already up-to-date.
2338 Merging acpi/test
2339 $ git merge acpi/test
2340 Already up-to-date.
2341 Merging idle-test/idle-test
2342 $ git merge idle-test/idle-test
2343 Already up-to-date.
2344 Merging powertools/tools-test
2345 $ git merge powertools/tools-test
2346 Already up-to-date.
2347 Merging cpupowerutils/master
2348 $ git merge cpupowerutils/master
2349 Already up-to-date.
2350 Merging ieee1394/for-next
2351 $ git merge ieee1394/for-next
2352 Already up-to-date.
2353 Merging ubi/linux-next
2354 $ git merge ubi/linux-next
2355 Already up-to-date.
2356 Merging dlm/next
2357 $ git merge dlm/next
2358 Already up-to-date.
2359 Merging swiotlb/master
2360 $ git merge swiotlb/master
2361 Merge made by recursive.
2362 Merging ibft/master
2363 $ git merge ibft/master
2364 Merge made by recursive.
2365 Merging scsi/master
2366 $ git merge scsi/master
2367 Auto-merging drivers/s390/cio/qdio_main.c
2368 Auto-merging drivers/scsi/fcoe/fcoe.c
2369 Merge made by recursive.
2370  Documentation/ABI/testing/sysfs-block      |   13 +
2371  arch/s390/include/asm/qdio.h               |    5 +
2372  block/genhd.c                              |   71 +
2373  drivers/infiniband/ulp/iser/iscsi_iser.c   |   80 +-
2374  drivers/message/fusion/mptbase.c           |   92 ++-
2375  drivers/message/fusion/mptbase.h           |   72 +-
2376  drivers/message/fusion/mptsas.c            |   47 +-
2377  drivers/message/fusion/mptscsih.c          |   15 +-
2378  drivers/message/fusion/mptscsih.h          |    1 +
2379  drivers/s390/cio/qdio_main.c               |   11 +-
2380  drivers/s390/cio/qdio_setup.c              |    1 +
2381  drivers/s390/scsi/zfcp_dbf.c               |   36 +
2382  drivers/s390/scsi/zfcp_def.h               |    7 +
2383  drivers/s390/scsi/zfcp_ext.h               |    1 +
2384  drivers/s390/scsi/zfcp_fsf.c               |   80 +-
2385  drivers/s390/scsi/zfcp_qdio.c              |   58 +-
2386  drivers/s390/scsi/zfcp_qdio.h              |   66 +-
2387  drivers/s390/scsi/zfcp_scsi.c              |   15 +-
2388  drivers/scsi/Kconfig                       |   14 +-
2389  drivers/scsi/Makefile                      |    1 +
2390  drivers/scsi/be2iscsi/be_iscsi.c           |   60 +-
2391  drivers/scsi/be2iscsi/be_iscsi.h           |    2 +
2392  drivers/scsi/be2iscsi/be_main.c            |  101 +-
2393  drivers/scsi/be2iscsi/be_main.h            |    3 +
2394  drivers/scsi/bnx2fc/bnx2fc.h               |    2 +-
2395  drivers/scsi/bnx2fc/bnx2fc_fcoe.c          |  186 ++-
2396  drivers/scsi/bnx2fc/bnx2fc_hwi.c           |   10 +-
2397  drivers/scsi/bnx2fc/bnx2fc_io.c            |    7 -
2398  drivers/scsi/bnx2fc/bnx2fc_tgt.c           |   27 +-
2399  drivers/scsi/bnx2i/bnx2i_iscsi.c           |   80 +-
2400  drivers/scsi/cxgbi/cxgb3i/cxgb3i.c         |   20 +-
2401  drivers/scsi/cxgbi/cxgb4i/cxgb4i.c         |   20 +-
2402  drivers/scsi/cxgbi/libcxgbi.c              |   56 +
2403  drivers/scsi/cxgbi/libcxgbi.h              |    1 +
2404  drivers/scsi/device_handler/scsi_dh.c      |   61 +-
2405  drivers/scsi/device_handler/scsi_dh_alua.c |   92 +-
2406  drivers/scsi/fcoe/fcoe.c                   |   66 +-
2407  drivers/scsi/fcoe/fcoe.h                   |   10 -
2408  drivers/scsi/fcoe/fcoe_transport.c         |   72 +
2409  drivers/scsi/ipr.c                         |    2 +-
2410  drivers/scsi/isci/task.c                   |   29 +-
2411  drivers/scsi/iscsi_tcp.c                   |   83 +-
2412  drivers/scsi/libiscsi.c                    |    9 -
2413  drivers/scsi/libsas/sas_init.c             |   30 +-
2414  drivers/scsi/libsas/sas_scsi_host.c        |  101 +-
2415  drivers/scsi/lpfc/lpfc_attr.c              |   42 +-
2416  drivers/scsi/lpfc/lpfc_els.c               |   11 +-
2417  drivers/scsi/lpfc/lpfc_hbadisc.c           |    2 +-
2418  drivers/scsi/lpfc/lpfc_hw4.h               |    2 +
2419  drivers/scsi/lpfc/lpfc_init.c              |   63 +-
2420  drivers/scsi/lpfc/lpfc_scsi.c              |   11 +-
2421  drivers/scsi/lpfc/lpfc_sli.c               |   13 +-
2422  drivers/scsi/lpfc/lpfc_version.h           |    2 +-
2423  drivers/scsi/mpt2sas/mpt2sas_scsih.c       |    1 +
2424  drivers/scsi/mvsas/mv_sas.c                |   29 +-
2425  drivers/scsi/mvumi.c                       | 2018 +++++++++++++++++++++++++
2426  drivers/scsi/mvumi.h                       |  505 +++++++
2427  drivers/scsi/pm8001/pm8001_sas.c           |   38 +-
2428  drivers/scsi/qla2xxx/qla_attr.c            |  111 +-
2429  drivers/scsi/qla2xxx/qla_bsg.c             |  152 ++
2430  drivers/scsi/qla2xxx/qla_bsg.h             |   42 +
2431  drivers/scsi/qla2xxx/qla_dbg.c             |    6 +-
2432  drivers/scsi/qla2xxx/qla_def.h             |    9 +-
2433  drivers/scsi/qla2xxx/qla_gbl.h             |   18 +
2434  drivers/scsi/qla2xxx/qla_init.c            |   36 +-
2435  drivers/scsi/qla2xxx/qla_isr.c             |    5 +
2436  drivers/scsi/qla2xxx/qla_mbx.c             |  127 ++
2437  drivers/scsi/qla2xxx/qla_nx.c              |  970 ++++++++++++-
2438  drivers/scsi/qla2xxx/qla_nx.h              |  255 ++++-
2439  drivers/scsi/qla2xxx/qla_os.c              |   46 +-
2440  drivers/scsi/qla4xxx/Makefile              |    2 +-
2441  drivers/scsi/qla4xxx/ql4_attr.c            |   76 +
2442  drivers/scsi/qla4xxx/ql4_bsg.c             |  513 +++++++
2443  drivers/scsi/qla4xxx/ql4_bsg.h             |   19 +
2444  drivers/scsi/qla4xxx/ql4_def.h             |  201 ++-
2445  drivers/scsi/qla4xxx/ql4_fw.h              |  192 +++-
2446  drivers/scsi/qla4xxx/ql4_glbl.h            |   71 +-
2447  drivers/scsi/qla4xxx/ql4_init.c            |  786 ++---------
2448  drivers/scsi/qla4xxx/ql4_iocb.c            |   68 +-
2449  drivers/scsi/qla4xxx/ql4_isr.c             |   83 +-
2450  drivers/scsi/qla4xxx/ql4_mbx.c             |  752 +++++++++--
2451  drivers/scsi/qla4xxx/ql4_nvram.c           |   21 +
2452  drivers/scsi/qla4xxx/ql4_nx.c              |    9 +
2453  drivers/scsi/qla4xxx/ql4_os.c              | 2199 ++++++++++++++++++++++++----
2454  drivers/scsi/scsi_error.c                  |   12 +-
2455  drivers/scsi/scsi_sysfs.c                  |   38 +
2456  drivers/scsi/scsi_transport_iscsi.c        |  683 ++++++++--
2457  drivers/scsi/sd.c                          |    7 +-
2458  include/linux/genhd.h                      |    4 +
2459  include/scsi/iscsi_if.h                    |  134 ++-
2460  include/scsi/libfcoe.h                     |    3 +
2461  include/scsi/libsas.h                      |   26 +-
2462  include/scsi/scsi_bsg_iscsi.h              |  110 ++
2463  include/scsi/scsi_device.h                 |    6 +
2464  include/scsi/scsi_host.h                   |   16 +-
2465  include/scsi/scsi_transport_iscsi.h        |   45 +-
2466  96 files changed, 10171 insertions(+), 2235 deletions(-)
2467  create mode 100644 drivers/scsi/mvumi.c
2468  create mode 100644 drivers/scsi/mvumi.h
2469  create mode 100644 drivers/scsi/qla4xxx/ql4_bsg.c
2470  create mode 100644 drivers/scsi/qla4xxx/ql4_bsg.h
2471  create mode 100644 include/scsi/scsi_bsg_iscsi.h
2472 Merging iscsi-target/for-next
2473 $ git merge iscsi-target/for-next
2474 Already up-to-date.
2475 Merging slave-dma/next
2476 $ git merge slave-dma/next
2477 Merge made by recursive.
2478  arch/arm/include/asm/hardware/pl080.h |    4 +
2479  drivers/dma/amba-pl08x.c              |  455 ++++++++++++++-------------------
2480  drivers/dma/at_hdmac.c                |  159 +++++++++---
2481  drivers/dma/at_hdmac_regs.h           |   24 ++
2482  drivers/dma/dmatest.c                 |   23 ++-
2483  drivers/dma/imx-sdma.c                |   47 +++-
2484  drivers/dma/mxs-dma.c                 |   45 ++--
2485  include/linux/amba/pl08x.h            |   14 +-
2486  include/linux/dmaengine.h             |   13 +-
2487  9 files changed, 456 insertions(+), 328 deletions(-)
2488 Merging async_tx/next
2489 $ git merge async_tx/next
2490 Already up-to-date.
2491 Merging net/master
2492 $ git merge net/master
2493 Auto-merging MAINTAINERS
2494 CONFLICT (content): Merge conflict in MAINTAINERS
2495 Auto-merging arch/mips/Kconfig
2496 Auto-merging arch/powerpc/Kconfig
2497 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.
2498 Auto-merging arch/powerpc/configs/ppc40x_defconfig
2499 Auto-merging arch/powerpc/platforms/40x/Kconfig
2500 Auto-merging arch/s390/include/asm/qdio.h
2501 Auto-merging drivers/bcma/main.c
2502 Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c
2503 Removing drivers/net/arm/Kconfig
2504 Removing drivers/net/arm/Makefile
2505 Removing drivers/net/benet/Kconfig
2506 Removing drivers/net/bna/bfi_ctreg.h
2507 Removing drivers/net/bna/bfi_ll.h
2508 Removing drivers/net/bna/bna_ctrl.c
2509 Removing drivers/net/bna/bna_hw.h
2510 Removing drivers/net/bna/bna_txrx.c
2511 Auto-merging drivers/net/cris/eth_v10.c
2512 Auto-merging drivers/net/ethernet/3com/3c501.c
2513 Auto-merging drivers/net/ethernet/3com/3c509.c
2514 Auto-merging drivers/net/ethernet/3com/3c515.c
2515 Auto-merging drivers/net/ethernet/3com/3c574_cs.c
2516 Auto-merging drivers/net/ethernet/3com/3c589_cs.c
2517 Auto-merging drivers/net/ethernet/3com/3c59x.c
2518 Auto-merging drivers/net/ethernet/3com/typhoon.c
2519 Auto-merging drivers/net/ethernet/8390/3c503.c
2520 Auto-merging drivers/net/ethernet/8390/8390.c
2521 Auto-merging drivers/net/ethernet/8390/8390p.c
2522 Auto-merging drivers/net/ethernet/8390/ac3200.c
2523 Auto-merging drivers/net/ethernet/8390/ax88796.c
2524 Auto-merging drivers/net/ethernet/8390/axnet_cs.c
2525 Auto-merging drivers/net/ethernet/8390/e2100.c
2526 Auto-merging drivers/net/ethernet/8390/etherh.c
2527 Auto-merging drivers/net/ethernet/8390/hp-plus.c
2528 Auto-merging drivers/net/ethernet/8390/hydra.c
2529 Auto-merging drivers/net/ethernet/8390/mac8390.c
2530 Auto-merging drivers/net/ethernet/8390/ne-h8300.c
2531 Auto-merging drivers/net/ethernet/8390/ne2k-pci.c
2532 Auto-merging drivers/net/ethernet/8390/pcnet_cs.c
2533 Auto-merging drivers/net/ethernet/8390/smc-mca.c
2534 Auto-merging drivers/net/ethernet/8390/smc-ultra.c
2535 Auto-merging drivers/net/ethernet/8390/smc-ultra32.c
2536 Auto-merging drivers/net/ethernet/8390/wd.c
2537 Auto-merging drivers/net/ethernet/8390/zorro8390.c
2538 Auto-merging drivers/net/ethernet/adaptec/starfire.c
2539 Auto-merging drivers/net/ethernet/adi/bfin_mac.c
2540 Auto-merging drivers/net/ethernet/aeroflex/greth.c
2541 Auto-merging drivers/net/ethernet/alteon/acenic.c
2542 Auto-merging drivers/net/ethernet/amd/a2065.c
2543 Auto-merging drivers/net/ethernet/amd/am79c961a.c
2544 Auto-merging drivers/net/ethernet/amd/amd8111e.c
2545 Auto-merging drivers/net/ethernet/amd/ariadne.c
2546 Auto-merging drivers/net/ethernet/amd/atarilance.c
2547 Auto-merging drivers/net/ethernet/amd/au1000_eth.c
2548 Auto-merging drivers/net/ethernet/amd/declance.c
2549 Auto-merging drivers/net/ethernet/amd/depca.c
2550 Auto-merging drivers/net/ethernet/amd/hplance.c
2551 Auto-merging drivers/net/ethernet/amd/lance.c
2552 Auto-merging drivers/net/ethernet/amd/mvme147.c
2553 Auto-merging drivers/net/ethernet/amd/ni65.c
2554 Auto-merging drivers/net/ethernet/amd/nmclan_cs.c
2555 Auto-merging drivers/net/ethernet/amd/pcnet32.c
2556 Auto-merging drivers/net/ethernet/amd/sun3lance.c
2557 Auto-merging drivers/net/ethernet/amd/sunlance.c
2558 Auto-merging drivers/net/ethernet/apple/bmac.c
2559 Auto-merging drivers/net/ethernet/apple/cs89x0.c
2560 Auto-merging drivers/net/ethernet/apple/mac89x0.c
2561 Auto-merging drivers/net/ethernet/apple/mace.c
2562 Auto-merging drivers/net/ethernet/apple/macmace.c
2563 Auto-merging drivers/net/ethernet/atheros/atl1c/atl1c_main.c
2564 Auto-merging drivers/net/ethernet/atheros/atl1e/atl1e_main.c
2565 Auto-merging drivers/net/ethernet/atheros/atlx/atl1.c
2566 Auto-merging drivers/net/ethernet/atheros/atlx/atl2.c
2567 Auto-merging drivers/net/ethernet/broadcom/b44.c
2568 Auto-merging drivers/net/ethernet/broadcom/bcm63xx_enet.c
2569 Auto-merging drivers/net/ethernet/broadcom/bnx2.c
2570 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
2571 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
2572 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
2573 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
2574 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
2575 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
2576 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
2577 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
2578 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
2579 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
2580 Auto-merging drivers/net/ethernet/broadcom/cnic.c
2581 Auto-merging drivers/net/ethernet/broadcom/cnic.h
2582 Auto-merging drivers/net/ethernet/broadcom/cnic_defs.h
2583 Auto-merging drivers/net/ethernet/broadcom/sb1250-mac.c
2584 Auto-merging drivers/net/ethernet/broadcom/tg3.c
2585 Auto-merging drivers/net/ethernet/broadcom/tg3.h
2586 Auto-merging drivers/net/ethernet/brocade/bna/Makefile
2587 Auto-merging drivers/net/ethernet/brocade/bna/bfa_cee.c
2588 Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs.h
2589 Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
2590 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.c
2591 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.h
2592 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
2593 Auto-merging drivers/net/ethernet/brocade/bna/bfi.h
2594 Auto-merging drivers/net/ethernet/brocade/bna/bna.h
2595 Auto-merging drivers/net/ethernet/brocade/bna/bna_types.h
2596 Auto-merging drivers/net/ethernet/brocade/bna/bnad.c
2597 Auto-merging drivers/net/ethernet/brocade/bna/bnad.h
2598 Auto-merging drivers/net/ethernet/brocade/bna/bnad_ethtool.c
2599 Auto-merging drivers/net/ethernet/brocade/bna/cna.h
2600 Auto-merging drivers/net/ethernet/cadence/at91_ether.c
2601 Auto-merging drivers/net/ethernet/cadence/macb.c
2602 Auto-merging drivers/net/ethernet/chelsio/cxgb/cxgb2.c
2603 Auto-merging drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
2604 Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
2605 Auto-merging drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
2606 Auto-merging drivers/net/ethernet/cisco/enic/enic_main.c
2607 Auto-merging drivers/net/ethernet/davicom/dm9000.c
2608 Auto-merging drivers/net/ethernet/dec/ewrk3.c
2609 Auto-merging drivers/net/ethernet/dec/tulip/Kconfig
2610 Auto-merging drivers/net/ethernet/dec/tulip/de2104x.c
2611 Auto-merging drivers/net/ethernet/dec/tulip/de4x5.c
2612 Auto-merging drivers/net/ethernet/dec/tulip/dmfe.c
2613 Auto-merging drivers/net/ethernet/dec/tulip/tulip_core.c
2614 Auto-merging drivers/net/ethernet/dec/tulip/uli526x.c
2615 Auto-merging drivers/net/ethernet/dec/tulip/winbond-840.c
2616 Auto-merging drivers/net/ethernet/dlink/de620.c
2617 Auto-merging drivers/net/ethernet/dlink/dl2k.c
2618 Auto-merging drivers/net/ethernet/dlink/dl2k.h
2619 Auto-merging drivers/net/ethernet/dlink/sundance.c
2620 Auto-merging drivers/net/ethernet/emulex/benet/be.h
2621 Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.c
2622 Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.h
2623 Auto-merging drivers/net/ethernet/emulex/benet/be_ethtool.c
2624 Auto-merging drivers/net/ethernet/emulex/benet/be_hw.h
2625 Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
2626 Auto-merging drivers/net/ethernet/ethoc.c
2627 Auto-merging drivers/net/ethernet/fealnx.c
2628 Auto-merging drivers/net/ethernet/freescale/fec.c
2629 Auto-merging drivers/net/ethernet/freescale/fec_mpc52xx.c
2630 Auto-merging drivers/net/ethernet/freescale/fs_enet/Kconfig
2631 Auto-merging drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
2632 Auto-merging drivers/net/ethernet/freescale/gianfar.c
2633 Auto-merging drivers/net/ethernet/freescale/ucc_geth.c
2634 Auto-merging drivers/net/ethernet/fujitsu/at1700.c
2635 Auto-merging drivers/net/ethernet/fujitsu/eth16i.c
2636 Auto-merging drivers/net/ethernet/fujitsu/fmvj18x_cs.c
2637 Auto-merging drivers/net/ethernet/hp/hp100.c
2638 Auto-merging drivers/net/ethernet/i825xx/3c505.c
2639 Auto-merging drivers/net/ethernet/i825xx/3c523.c
2640 Auto-merging drivers/net/ethernet/i825xx/3c527.c
2641 Auto-merging drivers/net/ethernet/i825xx/82596.c
2642 Auto-merging drivers/net/ethernet/i825xx/eepro.c
2643 Auto-merging drivers/net/ethernet/i825xx/eexpress.c
2644 Auto-merging drivers/net/ethernet/i825xx/ether1.c
2645 Auto-merging drivers/net/ethernet/i825xx/lib82596.c
2646 Auto-merging drivers/net/ethernet/i825xx/lp486e.c
2647 Auto-merging drivers/net/ethernet/i825xx/ni52.c
2648 Auto-merging drivers/net/ethernet/i825xx/sun3_82586.c
2649 Auto-merging drivers/net/ethernet/i825xx/znet.c
2650 Auto-merging drivers/net/ethernet/ibm/ehea/ehea_main.c
2651 Auto-merging drivers/net/ethernet/ibm/emac/Kconfig
2652 Auto-merging drivers/net/ethernet/ibm/emac/core.c
2653 Auto-merging drivers/net/ethernet/ibm/emac/core.h
2654 Auto-merging drivers/net/ethernet/ibm/emac/debug.h
2655 Auto-merging drivers/net/ethernet/ibm/emac/mal.c
2656 Auto-merging drivers/net/ethernet/ibm/emac/mal.h
2657 Auto-merging drivers/net/ethernet/ibm/emac/rgmii.h
2658 Auto-merging drivers/net/ethernet/ibm/emac/tah.h
2659 Auto-merging drivers/net/ethernet/ibm/emac/zmii.h
2660 Auto-merging drivers/net/ethernet/ibm/ibmveth.c
2661 Auto-merging drivers/net/ethernet/ibm/iseries_veth.c
2662 Auto-merging drivers/net/ethernet/icplus/ipg.c
2663 Auto-merging drivers/net/ethernet/intel/e100.c
2664 Auto-merging drivers/net/ethernet/intel/e1000/e1000.h
2665 Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c
2666 Auto-merging drivers/net/ethernet/intel/e1000e/80003es2lan.c
2667 Auto-merging drivers/net/ethernet/intel/e1000e/82571.c
2668 Auto-merging drivers/net/ethernet/intel/e1000e/Makefile
2669 Auto-merging drivers/net/ethernet/intel/e1000e/e1000.h
2670 Auto-merging drivers/net/ethernet/intel/e1000e/ethtool.c
2671 Auto-merging drivers/net/ethernet/intel/e1000e/ich8lan.c
2672 Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
2673 Auto-merging drivers/net/ethernet/intel/igb/igb_main.c
2674 Auto-merging drivers/net/ethernet/intel/igbvf/netdev.c
2675 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_main.c
2676 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe.h
2677 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
2678 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
2679 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
2680 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
2681 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
2682 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
2683 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
2684 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
2685 Auto-merging drivers/net/ethernet/intel/ixgbevf/ethtool.c
2686 Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
2687 Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
2688 Auto-merging drivers/net/ethernet/jme.c
2689 Auto-merging drivers/net/ethernet/korina.c
2690 Auto-merging drivers/net/ethernet/lantiq_etop.c
2691 Auto-merging drivers/net/ethernet/marvell/mv643xx_eth.c
2692 Auto-merging drivers/net/ethernet/marvell/skge.c
2693 Auto-merging drivers/net/ethernet/marvell/sky2.c
2694 Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c
2695 Auto-merging drivers/net/ethernet/micrel/ks8695net.c
2696 Auto-merging drivers/net/ethernet/microchip/enc28j60.c
2697 Auto-merging drivers/net/ethernet/mipsnet.c
2698 Auto-merging drivers/net/ethernet/myricom/myri10ge/myri10ge.c
2699 Auto-merging drivers/net/ethernet/natsemi/ibmlana.c
2700 Auto-merging drivers/net/ethernet/natsemi/jazzsonic.c
2701 Auto-merging drivers/net/ethernet/natsemi/macsonic.c
2702 Auto-merging drivers/net/ethernet/natsemi/natsemi.c
2703 Auto-merging drivers/net/ethernet/natsemi/ns83820.c
2704 Auto-merging drivers/net/ethernet/natsemi/xtsonic.c
2705 Auto-merging drivers/net/ethernet/neterion/s2io.c
2706 Auto-merging drivers/net/ethernet/neterion/vxge/vxge-main.c
2707 Auto-merging drivers/net/ethernet/netx-eth.c
2708 Auto-merging drivers/net/ethernet/nuvoton/w90p910_ether.c
2709 Auto-merging drivers/net/ethernet/nvidia/forcedeth.c
2710 Auto-merging drivers/net/ethernet/octeon/Kconfig
2711 Auto-merging drivers/net/ethernet/octeon/octeon_mgmt.c
2712 Auto-merging drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
2713 Auto-merging drivers/net/ethernet/packetengines/hamachi.c
2714 Auto-merging drivers/net/ethernet/packetengines/yellowfin.c
2715 Auto-merging drivers/net/ethernet/pasemi/pasemi_mac.c
2716 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic.h
2717 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
2718 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
2719 Auto-merging drivers/net/ethernet/qlogic/qla3xxx.c
2720 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
2721 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
2722 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
2723 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
2724 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
2725 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
2726 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
2727 Auto-merging drivers/net/ethernet/qlogic/qlge/qlge_main.c
2728 Auto-merging drivers/net/ethernet/racal/ni5010.c
2729 Auto-merging drivers/net/ethernet/rdc/r6040.c
2730 Auto-merging drivers/net/ethernet/realtek/8139cp.c
2731 Auto-merging drivers/net/ethernet/realtek/8139too.c
2732 Auto-merging drivers/net/ethernet/realtek/atp.c
2733 Auto-merging drivers/net/ethernet/realtek/r8169.c
2734 Auto-merging drivers/net/ethernet/realtek/sc92031.c
2735 Auto-merging drivers/net/ethernet/renesas/sh_eth.c
2736 Auto-merging drivers/net/ethernet/seeq/ether3.c
2737 Auto-merging drivers/net/ethernet/seeq/seeq8005.c
2738 Auto-merging drivers/net/ethernet/seeq/sgiseeq.c
2739 Auto-merging drivers/net/ethernet/sfc/Kconfig
2740 Auto-merging drivers/net/ethernet/sfc/efx.c
2741 Auto-merging drivers/net/ethernet/sgi/ioc3-eth.c
2742 Auto-merging drivers/net/ethernet/sis/sis190.c
2743 Auto-merging drivers/net/ethernet/sis/sis900.c
2744 Auto-merging drivers/net/ethernet/smsc/epic100.c
2745 Auto-merging drivers/net/ethernet/smsc/smc911x.c
2746 Auto-merging drivers/net/ethernet/smsc/smc9194.c
2747 Auto-merging drivers/net/ethernet/smsc/smc91c92_cs.c
2748 Auto-merging drivers/net/ethernet/smsc/smc91x.c
2749 Auto-merging drivers/net/ethernet/smsc/smsc911x.c
2750 Auto-merging drivers/net/ethernet/smsc/smsc9420.c
2751 Auto-merging drivers/net/ethernet/stmicro/stmmac/Kconfig
2752 Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
2753 Auto-merging drivers/net/ethernet/sun/cassini.c
2754 Auto-merging drivers/net/ethernet/sun/niu.c
2755 Auto-merging drivers/net/ethernet/sun/sunbmac.c
2756 Auto-merging drivers/net/ethernet/sun/sunbmac.h
2757 Auto-merging drivers/net/ethernet/sun/sungem.c
2758 Auto-merging drivers/net/ethernet/sun/sunhme.c
2759 Auto-merging drivers/net/ethernet/sun/sunqe.c
2760 Auto-merging drivers/net/ethernet/sun/sunvnet.c
2761 Auto-merging drivers/net/ethernet/tehuti/tehuti.c
2762 Auto-merging drivers/net/ethernet/ti/cpmac.c
2763 Auto-merging drivers/net/ethernet/ti/davinci_emac.c
2764 Auto-merging drivers/net/ethernet/ti/tlan.c
2765 Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_net.c
2766 Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
2767 Auto-merging drivers/net/ethernet/toshiba/spider_net.c
2768 Auto-merging drivers/net/ethernet/toshiba/spider_net.h
2769 Auto-merging drivers/net/ethernet/toshiba/tc35815.c
2770 Auto-merging drivers/net/ethernet/tundra/tsi108_eth.c
2771 Auto-merging drivers/net/ethernet/via/via-rhine.c
2772 Auto-merging drivers/net/ethernet/via/via-velocity.c
2773 Auto-merging drivers/net/ethernet/xilinx/ll_temac_main.c
2774 Auto-merging drivers/net/ethernet/xircom/xirc2ps_cs.c
2775 Auto-merging drivers/net/ethernet/xscale/ixp2000/Kconfig
2776 Auto-merging drivers/net/ethernet/xscale/ixp4xx_eth.c
2777 Auto-merging drivers/net/fddi/defxx.c
2778 Auto-merging drivers/net/fddi/skfp/h/cmtdef.h
2779 Auto-merging drivers/net/fddi/skfp/h/hwmtm.h
2780 Auto-merging drivers/net/fddi/skfp/h/sba.h
2781 Auto-merging drivers/net/fddi/skfp/h/skfbiinc.h
2782 Auto-merging drivers/net/fddi/skfp/h/smc.h
2783 Auto-merging drivers/net/fddi/skfp/h/targethw.h
2784 Auto-merging drivers/net/fddi/skfp/h/targetos.h
2785 Auto-merging drivers/net/fddi/skfp/skfddi.c
2786 Removing drivers/net/ibm_newemac/Makefile
2787 Removing drivers/net/octeon/Makefile
2788 Removing drivers/net/pci-skeleton.c
2789 Removing drivers/net/pcmcia/Kconfig
2790 Removing drivers/net/pcmcia/Makefile
2791 Auto-merging drivers/net/slip/slip.c
2792 Auto-merging drivers/net/slip/slip.h
2793 Auto-merging drivers/net/tokenring/ibmtr_cs.c
2794 Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
2795 Auto-merging drivers/net/wireless/ath/ath9k/ar9003_phy.c
2796 Auto-merging drivers/net/wireless/ath/ath9k/main.c
2797 Auto-merging drivers/net/wireless/ath/carl9170/main.c
2798 Auto-merging drivers/net/wireless/iwlegacy/iwl-3945-rs.c
2799 Auto-merging drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
2800 Auto-merging drivers/net/wireless/wl12xx/main.c
2801 Auto-merging drivers/s390/cio/qdio_main.c
2802 CONFLICT (content): Merge conflict in drivers/s390/cio/qdio_main.c
2803 Auto-merging drivers/s390/cio/qdio_setup.c
2804 Auto-merging drivers/s390/net/lcs.c
2805 Auto-merging drivers/scsi/bnx2fc/bnx2fc.h
2806 Auto-merging drivers/scsi/bnx2fc/bnx2fc_fcoe.c
2807 Auto-merging drivers/scsi/fcoe/fcoe.c
2808 Auto-merging drivers/scsi/fcoe/fcoe_transport.c
2809 Removing drivers/staging/ath6kl/Kconfig
2810 Removing drivers/staging/ath6kl/Makefile
2811 Removing drivers/staging/ath6kl/TODO
2812 Removing drivers/staging/ath6kl/bmi/include/bmi_internal.h
2813 Removing drivers/staging/ath6kl/bmi/src/bmi.c
2814 Removing drivers/staging/ath6kl/hif/common/hif_sdio_common.h
2815 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
2816 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
2817 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
2818 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.c
2819 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.h
2820 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
2821 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
2822 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
2823 Removing drivers/staging/ath6kl/htc2/htc.c
2824 Removing drivers/staging/ath6kl/htc2/htc_debug.h
2825 Removing drivers/staging/ath6kl/htc2/htc_internal.h
2826 Removing drivers/staging/ath6kl/htc2/htc_recv.c
2827 Removing drivers/staging/ath6kl/htc2/htc_send.c
2828 Removing drivers/staging/ath6kl/htc2/htc_services.c
2829 Removing drivers/staging/ath6kl/include/a_config.h
2830 Removing drivers/staging/ath6kl/include/a_debug.h
2831 Removing drivers/staging/ath6kl/include/a_drv.h
2832 Removing drivers/staging/ath6kl/include/a_drv_api.h
2833 Removing drivers/staging/ath6kl/include/a_osapi.h
2834 Removing drivers/staging/ath6kl/include/aggr_recv_api.h
2835 Removing drivers/staging/ath6kl/include/ar3kconfig.h
2836 Removing drivers/staging/ath6kl/include/ar6000_api.h
2837 Removing drivers/staging/ath6kl/include/ar6000_diag.h
2838 Removing drivers/staging/ath6kl/include/ar6kap_common.h
2839 Removing drivers/staging/ath6kl/include/athbtfilter.h
2840 Removing drivers/staging/ath6kl/include/bmi.h
2841 Removing drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
2842 Removing drivers/staging/ath6kl/include/common/AR6002/addrs.h
2843 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
2844 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
2845 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
2846 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
2847 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
2848 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
2849 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
2850 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
2851 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
2852 Removing drivers/staging/ath6kl/include/common/athdefs.h
2853 Removing drivers/staging/ath6kl/include/common/bmi_msg.h
2854 Removing drivers/staging/ath6kl/include/common/cnxmgmt.h
2855 Removing drivers/staging/ath6kl/include/common/dbglog.h
2856 Removing drivers/staging/ath6kl/include/common/dbglog_id.h
2857 Removing drivers/staging/ath6kl/include/common/discovery.h
2858 Removing drivers/staging/ath6kl/include/common/epping_test.h
2859 Removing drivers/staging/ath6kl/include/common/gmboxif.h
2860 Removing drivers/staging/ath6kl/include/common/gpio_reg.h
2861 Removing drivers/staging/ath6kl/include/common/htc.h
2862 Removing drivers/staging/ath6kl/include/common/htc_services.h
2863 Removing drivers/staging/ath6kl/include/common/pkt_log.h
2864 Removing drivers/staging/ath6kl/include/common/roaming.h
2865 Removing drivers/staging/ath6kl/include/common/targaddrs.h
2866 Removing drivers/staging/ath6kl/include/common/testcmd.h
2867 Removing drivers/staging/ath6kl/include/common/tlpm.h
2868 Removing drivers/staging/ath6kl/include/common/wlan_defs.h
2869 Removing drivers/staging/ath6kl/include/common/wmi.h
2870 Removing drivers/staging/ath6kl/include/common/wmix.h
2871 Removing drivers/staging/ath6kl/include/common_drv.h
2872 Removing drivers/staging/ath6kl/include/dbglog_api.h
2873 Removing drivers/staging/ath6kl/include/dl_list.h
2874 Removing drivers/staging/ath6kl/include/dset_api.h
2875 Removing drivers/staging/ath6kl/include/hci_transport_api.h
2876 Removing drivers/staging/ath6kl/include/hif.h
2877 Removing drivers/staging/ath6kl/include/host_version.h
2878 Removing drivers/staging/ath6kl/include/htc_api.h
2879 Removing drivers/staging/ath6kl/include/htc_packet.h
2880 Removing drivers/staging/ath6kl/include/wlan_api.h
2881 Removing drivers/stagingRecorded preimage for 'drivers/s390/cio/qdio_main.c'
2882 Resolved 'MAINTAINERS' using previous resolution.
2883 /ath6kl/include/wmi_api.h
2884 Removing drivers/staging/ath6kl/miscdrv/ar3kconfig.c
2885 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
2886 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
2887 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
2888 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
2889 Removing drivers/staging/ath6kl/miscdrv/common_drv.c
2890 Removing drivers/staging/ath6kl/miscdrv/credit_dist.c
2891 Removing drivers/staging/ath6kl/miscdrv/miscdrv.h
2892 Removing drivers/staging/ath6kl/os/linux/ar6000_drv.c
2893 Removing drivers/staging/ath6kl/os/linux/ar6000_pm.c
2894 Removing drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
2895 Removing drivers/staging/ath6kl/os/linux/cfg80211.c
2896 Removing drivers/staging/ath6kl/os/linux/export_hci_transport.c
2897 Removing drivers/staging/ath6kl/os/linux/hci_bridge.c
2898 Removing drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
2899 Removing drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
2900 Removing drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
2901 Removing drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
2902 Removing drivers/staging/ath6kl/os/linux/include/cfg80211.h
2903 Removing drivers/staging/ath6kl/os/linux/include/config_linux.h
2904 Removing drivers/staging/ath6kl/os/linux/include/debug_linux.h
2905 Removing drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
2906 Removing drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
2907 Removing drivers/staging/ath6kl/os/linux/include/osapi_linux.h
2908 Removing drivers/staging/ath6kl/os/linux/include/wlan_config.h
2909 Removing drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
2910 Removing drivers/staging/ath6kl/os/linux/netbuf.c
2911 Removing drivers/staging/ath6kl/reorder/aggr_rx_internal.h
2912 Removing drivers/staging/ath6kl/reorder/rcv_aggr.c
2913 Removing drivers/staging/ath6kl/wlan/include/ieee80211.h
2914 Removing drivers/staging/ath6kl/wlan/include/ieee80211_node.h
2915 Removing drivers/staging/ath6kl/wlan/src/wlan_node.c
2916 Removing drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
2917 Removing drivers/staging/ath6kl/wlan/src/wlan_utils.c
2918 Removing drivers/staging/ath6kl/wmi/wmi.c
2919 Removing drivers/staging/ath6kl/wmi/wmi_host.h
2920 Auto-merging include/linux/sungem_phy.h
2921 Auto-merging include/net/cfg80211.h
2922 Auto-merging net/core/neighbour.c
2923 Auto-merging net/core/netpoll.c
2924 Auto-merging net/ipv4/igmp.c
2925 Auto-merging net/ipv6/raw.c
2926 Auto-merging net/ipv6/udp.c
2927 Auto-merging net/mac80211/main.c
2928 Auto-merging net/mac80211/sta_info.c
2929 Auto-merging net/socket.c
2930 Automatic merge failed; fix conflicts and then commit the result.
2931 $ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
2932 MAINTAINERS: needs merge
2933 arch/powerpc/configs/40x/hcu4_defconfig: needs merge
2934 drivers/s390/cio/qdio_main.c: needs merge
2935 rm 'arch/powerpc/configs/40x/hcu4_defconfig'
2936 $ git commit -v -a
2937 Recorded resolution for 'drivers/s390/cio/qdio_main.c'.
2938 [master f21825f] Merge remote-tracking branch 'net/master'
2939 $ git diff -M --stat --summary HEAD^..
2940  Documentation/ABI/testing/sysfs-class-net-mesh     |    8 +
2941  .../devicetree/bindings/net/can/fsl-flexcan.txt    |   63 +-
2942  Documentation/devicetree/bindings/net/smsc911x.txt |   38 +
2943  Documentation/networking/netdevices.txt            |    4 +-
2944  MAINTAINERS                                        |  198 +-
2945  arch/ia64/hp/sim/simeth.c                          |    2 +-
2946  arch/mips/Kconfig                                  |    8 +-
2947  arch/mips/bcm47xx/Kconfig                          |   31 +
2948  arch/mips/bcm47xx/Makefile                         |    3 +-
2949  arch/mips/bcm47xx/gpio.c                           |   82 +-
2950  arch/mips/bcm47xx/irq.c                            |   12 +
2951  arch/mips/bcm47xx/nvram.c                          |   29 +-
2952  arch/mips/bcm47xx/serial.c                         |   46 +-
2953  arch/mips/bcm47xx/setup.c                          |   90 +-
2954  arch/mips/bcm47xx/time.c                           |   16 +-
2955  arch/mips/bcm47xx/wgt634u.c                        |   14 +-
2956  arch/mips/include/asm/mach-bcm47xx/bcm47xx.h       |   26 +-
2957  arch/mips/include/asm/mach-bcm47xx/gpio.h          |  108 +-
2958  arch/mips/pci/pci-bcm47xx.c                        |    6 +
2959  arch/powerpc/Kconfig                               |    2 +
2960  arch/powerpc/boot/dts/p1010rdb.dts                 |   10 +-
2961  arch/powerpc/boot/dts/p1010si.dtsi                 |   10 +-
2962  arch/powerpc/configs/40x/acadia_defconfig          |   11 +-
2963  arch/powerpc/configs/40x/ep405_defconfig           |    5 +-
2964  arch/powerpc/configs/40x/kilauea_defconfig         |    9 +-
2965  arch/powerpc/configs/40x/makalu_defconfig          |    9 +-
2966  arch/powerpc/configs/40x/walnut_defconfig          |    5 +-
2967  arch/powerpc/configs/44x/arches_defconfig          |    9 +-
2968  arch/powerpc/configs/44x/bamboo_defconfig          |    5 +-
2969  arch/powerpc/configs/44x/bluestone_defconfig       |    9 +-
2970  arch/powerpc/configs/44x/canyonlands_defconfig     |    9 +-
2971  arch/powerpc/configs/44x/ebony_defconfig           |    5 +-
2972  arch/powerpc/configs/44x/eiger_defconfig           |    9 +-
2973  arch/powerpc/configs/44x/icon_defconfig            |    5 +-
2974  arch/powerpc/configs/44x/katmai_defconfig          |    5 +-
2975  arch/powerpc/configs/44x/redwood_defconfig         |   11 +-
2976  arch/powerpc/configs/44x/sam440ep_defconfig        |    5 +-
2977  arch/powerpc/configs/44x/sequoia_defconfig         |    5 +-
2978  arch/powerpc/configs/44x/taishan_defconfig         |    5 +-
2979  arch/powerpc/configs/44x/warp_defconfig            |    5 +-
2980  arch/powerpc/configs/ppc40x_defconfig              |    5 +-
2981  arch/powerpc/configs/ppc44x_defconfig              |    5 +-
2982  arch/powerpc/platforms/40x/Kconfig                 |   12 +-
2983  arch/powerpc/platforms/44x/Kconfig                 |   54 +-
2984  arch/powerpc/platforms/cell/Kconfig                |    8 +-
2985  arch/s390/include/asm/qdio.h                       |   78 +-
2986  arch/um/drivers/net_kern.c                         |    2 +-
2987  arch/xtensa/platforms/iss/network.c                |    2 +-
2988  drivers/atm/eni.c                                  |    3 +-
2989  drivers/bcma/Kconfig                               |   13 +
2990  drivers/bcma/Makefile                              |    2 +
2991  drivers/bcma/bcma_private.h                        |   16 +
2992  drivers/bcma/core.c                                |    2 +
2993  drivers/bcma/driver_chipcommon.c                   |   53 +
2994  drivers/bcma/driver_chipcommon_pmu.c               |  153 +-
2995  drivers/bcma/driver_mips.c                         |  256 +
2996  drivers/bcma/driver_pci.c                          |   16 +-
2997  drivers/bcma/host_soc.c                            |  183 +
2998  drivers/bcma/main.c                                |   70 +-
2999  drivers/bcma/scan.c                                |  348 +-
3000  drivers/bcma/sprom.c                               |    6 +
3001  drivers/infiniband/hw/amso1100/c2.c                |    8 +-
3002  drivers/infiniband/hw/cxgb3/Makefile               |    2 +-
3003  drivers/infiniband/hw/cxgb4/Makefile               |    2 +-
3004  drivers/infiniband/hw/mlx4/Kconfig                 |    3 +-
3005  drivers/infiniband/hw/nes/nes_nic.c                |   23 +-
3006  drivers/infiniband/ulp/ipoib/ipoib_cm.c            |    5 +-
3007  drivers/infiniband/ulp/ipoib/ipoib_ib.c            |    5 +-
3008  drivers/infiniband/ulp/ipoib/ipoib_main.c          |    2 +-
3009  drivers/media/dvb/dvb-core/dvb_net.c               |    2 +-
3010  drivers/net/Kconfig                                | 3447 +----------
3011  drivers/net/Makefile                               |  326 +-
3012  drivers/net/appletalk/cops.c                       |    2 +-
3013  drivers/net/appletalk/ltpc.c                       |    2 +-
3014  drivers/net/arcnet/Kconfig                         |   14 +-
3015  drivers/net/arcnet/Makefile                        |    1 +
3016  drivers/net/arcnet/com20020.c                      |    2 +-
3017  drivers/net/{pcmcia => arcnet}/com20020_cs.c       |    0
3018  drivers/net/arm/Kconfig                            |   74 -
3019  drivers/net/arm/Makefile                           |   14 -
3020  drivers/net/benet/Kconfig                          |    6 -
3021  drivers/net/bna/bfi_ctreg.h                        |  646 --
3022  drivers/net/bna/bfi_ll.h                           |  438 --
3023  drivers/net/bna/bna_ctrl.c                         | 3076 ----------
3024  drivers/net/bna/bna_hw.h                           | 1490 -----
3025  drivers/net/bna/bna_txrx.c                         | 4185 -------------
3026  drivers/net/bonding/bond_main.c                    |   55 +-
3027  drivers/net/bonding/bonding.h                      |    1 -
3028  drivers/net/caif/caif_hsi.c                        |    9 +-
3029  drivers/net/caif/caif_spi.c                        |    4 -
3030  drivers/net/can/flexcan.c                          |  189 +-
3031  drivers/net/can/mscan/mscan.c                      |   26 +-
3032  drivers/net/cris/eth_v10.c                         |    2 +-
3033  drivers/net/dummy.c                                |    2 +-
3034  drivers/net/{ => ethernet/3com}/3c501.c            |    2 +-
3035  drivers/net/{ => ethernet/3com}/3c501.h            |    0
3036  drivers/net/{ => ethernet/3com}/3c509.c            |    2 +-
3037  drivers/net/{ => ethernet/3com}/3c515.c            |    2 +-
3038  drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c   |    2 +-
3039  drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c   |    2 +-
3040  drivers/net/{ => ethernet/3com}/3c59x.c            |   11 +-
3041  drivers/net/ethernet/3com/Kconfig                  |  121 +
3042  drivers/net/ethernet/3com/Makefile                 |   11 +
3043  drivers/net/{ => ethernet/3com}/typhoon.c          |    2 +-
3044  drivers/net/{ => ethernet/3com}/typhoon.h          |    0
3045  drivers/net/{ => ethernet/8390}/3c503.c            |    2 +-
3046  drivers/net/{ => ethernet/8390}/3c503.h            |    0
3047  drivers/net/{ => ethernet/8390}/8390.c             |    2 +-
3048  drivers/net/{ => ethernet/8390}/8390.h             |    0
3049  drivers/net/{ => ethernet/8390}/8390p.c            |    2 +-
3050  drivers/net/ethernet/8390/Kconfig                  |  337 +
3051  drivers/net/ethernet/8390/Makefile                 |   29 +
3052  drivers/net/{ => ethernet/8390}/ac3200.c           |    2 +-
3053  drivers/net/{ => ethernet/8390}/apne.c             |    0
3054  drivers/net/{ => ethernet/8390}/ax88796.c          |    2 +-
3055  drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c   |    4 +-
3056  drivers/net/{ => ethernet/8390}/e2100.c            |    2 +-
3057  drivers/net/{ => ethernet/8390}/es3210.c           |    0
3058  drivers/net/{arm => ethernet/8390}/etherh.c        |    4 +-
3059  drivers/net/{ => ethernet/8390}/hp-plus.c          |    2 +-
3060  drivers/net/{ => ethernet/8390}/hp.c               |    0
3061  drivers/net/{ => ethernet/8390}/hydra.c            |    2 +-
3062  drivers/net/{ => ethernet/8390}/lib8390.c          |    0
3063  drivers/net/{ => ethernet/8390}/lne390.c           |    0
3064  drivers/net/{ => ethernet/8390}/mac8390.c          |    2 +-
3065  drivers/net/{ => ethernet/8390}/ne-h8300.c         |    2 +-
3066  drivers/net/{ => ethernet/8390}/ne.c               |    0
3067  drivers/net/{ => ethernet/8390}/ne2.c              |    0
3068  drivers/net/{ => ethernet/8390}/ne2k-pci.c         |    2 +-
3069  drivers/net/{ => ethernet/8390}/ne3210.c           |    0
3070  drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c   |    4 +-
3071  drivers/net/{ => ethernet/8390}/smc-mca.c          |    2 +-
3072  drivers/net/{ => ethernet/8390}/smc-ultra.c        |    2 +-
3073  drivers/net/{ => ethernet/8390}/smc-ultra32.c      |    2 +-
3074  drivers/net/{ => ethernet/8390}/stnic.c            |    0
3075  drivers/net/{ => ethernet/8390}/wd.c               |    2 +-
3076  drivers/net/{ => ethernet/8390}/zorro8390.c        |    2 +-
3077  drivers/net/ethernet/Kconfig                       |  173 +
3078  drivers/net/ethernet/Makefile                      |   74 +
3079  drivers/net/ethernet/adaptec/Kconfig               |   35 +
3080  drivers/net/ethernet/adaptec/Makefile              |    5 +
3081  drivers/net/{ => ethernet/adaptec}/starfire.c      |    2 +-
3082  drivers/net/ethernet/adi/Kconfig                   |   68 +
3083  drivers/net/ethernet/adi/Makefile                  |    5 +
3084  drivers/net/{ => ethernet/adi}/bfin_mac.c          |    2 +-
3085  drivers/net/{ => ethernet/adi}/bfin_mac.h          |    0
3086  drivers/net/ethernet/aeroflex/Kconfig              |   11 +
3087  drivers/net/ethernet/aeroflex/Makefile             |    5 +
3088  drivers/net/{ => ethernet/aeroflex}/greth.c        |   14 +-
3089  drivers/net/{ => ethernet/aeroflex}/greth.h        |    0
3090  drivers/net/ethernet/alteon/Kconfig                |   48 +
3091  drivers/net/ethernet/alteon/Makefile               |    5 +
3092  drivers/net/{ => ethernet/alteon}/acenic.c         |    8 +-
3093  drivers/net/{ => ethernet/alteon}/acenic.h         |    0
3094  drivers/net/{ => ethernet/amd}/7990.c              |    0
3095  drivers/net/{ => ethernet/amd}/7990.h              |    0
3096  drivers/net/ethernet/amd/Kconfig                   |  193 +
3097  drivers/net/ethernet/amd/Makefile                  |   20 +
3098  drivers/net/{ => ethernet/amd}/a2065.c             |    2 +-
3099  drivers/net/{ => ethernet/amd}/a2065.h             |    0
3100  drivers/net/{arm => ethernet/amd}/am79c961a.c      |    2 +-
3101  drivers/net/{arm => ethernet/amd}/am79c961a.h      |    0
3102  drivers/net/{ => ethernet/amd}/amd8111e.c          |    2 +-
3103  drivers/net/{ => ethernet/amd}/amd8111e.h          |    0
3104  drivers/net/{ => ethernet/amd}/ariadne.c           |    2 +-
3105  drivers/net/{ => ethernet/amd}/ariadne.h           |    0
3106  drivers/net/{ => ethernet/amd}/atarilance.c        |    2 +-
3107  drivers/net/{ => ethernet/amd}/au1000_eth.c        |    2 +-
3108  drivers/net/{ => ethernet/amd}/au1000_eth.h        |    0
3109  drivers/net/{ => ethernet/amd}/declance.c          |    2 +-
3110  drivers/net/{ => ethernet/amd}/depca.c             |    2 +-
3111  drivers/net/{ => ethernet/amd}/depca.h             |    0
3112  drivers/net/{ => ethernet/amd}/hplance.c           |    2 +-
3113  drivers/net/{ => ethernet/amd}/hplance.h           |    0
3114  drivers/net/{ => ethernet/amd}/lance.c             |    2 +-
3115  drivers/net/{ => ethernet/amd}/mvme147.c           |    2 +-
3116  drivers/net/{ => ethernet/amd}/ni65.c              |    2 +-
3117  drivers/net/{ => ethernet/amd}/ni65.h              |    0
3118  drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c   |    2 +-
3119  drivers/net/{ => ethernet/amd}/pcnet32.c           |    2 +-
3120  drivers/net/{ => ethernet/amd}/sun3lance.c         |    2 +-
3121  drivers/net/{ => ethernet/amd}/sunlance.c          |    2 +-
3122  drivers/net/ethernet/apple/Kconfig                 |   97 +
3123  drivers/net/ethernet/apple/Makefile                |    9 +
3124  drivers/net/{ => ethernet/apple}/bmac.c            |    2 +-
3125  drivers/net/{ => ethernet/apple}/bmac.h            |    0
3126  drivers/net/{ => ethernet/apple}/cs89x0.c          |    2 +-
3127  drivers/net/{ => ethernet/apple}/cs89x0.h          |    0
3128  drivers/net/{ => ethernet/apple}/mac89x0.c         |    2 +-
3129  drivers/net/{ => ethernet/apple}/mace.c            |    2 +-
3130  drivers/net/{ => ethernet/apple}/mace.h            |    0
3131  drivers/net/{ => ethernet/apple}/macmace.c         |    2 +-
3132  drivers/net/ethernet/atheros/Kconfig               |   66 +
3133  drivers/net/ethernet/atheros/Makefile              |    8 +
3134  drivers/net/{ => ethernet/atheros}/atl1c/Makefile  |    0
3135  drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h   |    0
3136  .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c   |    0
3137  .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c    |    0
3138  .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h    |    0
3139  .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c  |   11 +-
3140  drivers/net/{ => ethernet/atheros}/atl1e/Makefile  |    0
3141  drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h   |    0
3142  .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c   |    0
3143  .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c    |    0
3144  .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h    |    0
3145  .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c  |   13 +-
3146  .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c |    0
3147  drivers/net/{ => ethernet/atheros}/atlx/Makefile   |    0
3148  drivers/net/{ => ethernet/atheros}/atlx/atl1.c     |    7 +-
3149  drivers/net/{ => ethernet/atheros}/atlx/atl1.h     |    0
3150  drivers/net/{ => ethernet/atheros}/atlx/atl2.c     |    2 +-
3151  drivers/net/{ => ethernet/atheros}/atlx/atl2.h     |    0
3152  drivers/net/{ => ethernet/atheros}/atlx/atlx.c     |    0
3153  drivers/net/{ => ethernet/atheros}/atlx/atlx.h     |    0
3154  drivers/net/ethernet/broadcom/Kconfig              |  120 +
3155  drivers/net/ethernet/broadcom/Makefile             |   11 +
3156  drivers/net/{ => ethernet/broadcom}/b44.c          |    2 +-
3157  drivers/net/{ => ethernet/broadcom}/b44.h          |    0
3158  drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c |    2 +-
3159  drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h |    0
3160  drivers/net/{ => ethernet/broadcom}/bnx2.c         |   10 +-
3161  drivers/net/{ => ethernet/broadcom}/bnx2.h         |    0
3162  drivers/net/{ => ethernet/broadcom}/bnx2_fw.h      |    0
3163  drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile |    0
3164  drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h  |   67 +-
3165  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c  |   53 +-
3166  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h  |   10 +-
3167  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c  |    5 +-
3168  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h  |    0
3169  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h |    0
3170  .../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c  |   23 +-
3171  .../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h  |    0
3172  .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h            |    0
3173  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h  |    2 +
3174  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h |    0
3175  .../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h |    0
3176  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c |  154 +-
3177  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h |    0
3178  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c |   79 +-
3179  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h  |    0
3180  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c   |   67 +-
3181  .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h   |    0
3182  .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c    |   46 +-
3183  .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h    |    0
3184  drivers/net/{ => ethernet/broadcom}/cnic.c         |   35 +-
3185  drivers/net/{ => ethernet/broadcom}/cnic.h         |    4 +-
3186  drivers/net/{ => ethernet/broadcom}/cnic_defs.h    |    1 +
3187  drivers/net/{ => ethernet/broadcom}/cnic_if.h      |    0
3188  drivers/net/{ => ethernet/broadcom}/sb1250-mac.c   |    2 +-
3189  drivers/net/{ => ethernet/broadcom}/tg3.c          |  420 +-
3190  drivers/net/{ => ethernet/broadcom}/tg3.h          |    3 +
3191  drivers/net/ethernet/brocade/Kconfig               |   23 +
3192  drivers/net/ethernet/brocade/Makefile              |    5 +
3193  drivers/net/ethernet/brocade/bna/Kconfig           |   17 +
3194  drivers/net/{ => ethernet/brocade}/bna/Makefile    |    5 +-
3195  drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c   |    3 -
3196  drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h   |    0
3197  drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h    |    0
3198  drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h  |   25 +-
3199  .../net/{ => ethernet/brocade}/bna/bfa_defs_cna.h  |    0
3200  .../{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h |   28 +-
3201  .../{ => ethernet/brocade}/bna/bfa_defs_status.h   |    0
3202  drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c   |  405 +-
3203  drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h   |   45 +-
3204  .../net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c    |  157 +-
3205  drivers/net/ethernet/brocade/bna/bfa_msgq.c        |  669 ++
3206  drivers/net/ethernet/brocade/bna/bfa_msgq.h        |  130 +
3207  drivers/net/{ => ethernet/brocade}/bna/bfi.h       |  195 +-
3208  drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h   |    0
3209  drivers/net/ethernet/brocade/bna/bfi_enet.h        |  901 +++
3210  drivers/net/ethernet/brocade/bna/bfi_reg.h         |  452 ++
3211  drivers/net/{ => ethernet/brocade}/bna/bna.h       |  337 +-
3212  drivers/net/ethernet/brocade/bna/bna_enet.c        | 2129 +++++++
3213  drivers/net/ethernet/brocade/bna/bna_hw_defs.h     |  413 ++
3214  drivers/net/ethernet/brocade/bna/bna_tx_rx.c       | 3787 ++++++++++++
3215  drivers/net/{ => ethernet/brocade}/bna/bna_types.h |  654 +--
3216  drivers/net/{ => ethernet/brocade}/bna/bnad.c      |  652 ++-
3217  drivers/net/{ => ethernet/brocade}/bna/bnad.h      |   38 +-
3218  .../net/{ => ethernet/brocade}/bna/bnad_ethtool.c  |  384 +--
3219  drivers/net/{ => ethernet/brocade}/bna/cna.h       |   31 +-
3220  drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c |    0
3221  drivers/net/ethernet/cadence/Kconfig               |   44 +
3222  drivers/net/ethernet/cadence/Makefile              |    6 +
3223  drivers/net/{arm => ethernet/cadence}/at91_ether.c |    2 +-
3224  drivers/net/{arm => ethernet/cadence}/at91_ether.h |    0
3225  drivers/net/{ => ethernet/cadence}/macb.c          |    2 +-
3226  drivers/net/{ => ethernet/cadence}/macb.h          |    0
3227  drivers/net/ethernet/chelsio/Kconfig               |  107 +
3228  drivers/net/ethernet/chelsio/Makefile              |    8 +
3229  .../{chelsio => ethernet/chelsio/cxgb}/Makefile    |    0
3230  .../{chelsio => ethernet/chelsio/cxgb}/common.h    |    0
3231  .../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h  |    0
3232  .../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h  |    0
3233  .../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c |    2 +-
3234  .../{chelsio => ethernet/chelsio/cxgb}/elmer0.h    |    0
3235  .../net/{chelsio => ethernet/chelsio/cxgb}/espi.c  |    0
3236  .../net/{chelsio => ethernet/chelsio/cxgb}/espi.h  |    0
3237  .../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h |    0
3238  .../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h  |    0
3239  .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c |    0
3240  .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h |    0
3241  .../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c |    0
3242  .../{chelsio => ethernet/chelsio/cxgb}/my3126.c    |    0
3243  .../{chelsio => ethernet/chelsio/cxgb}/pm3393.c    |    0
3244  .../net/{chelsio => ethernet/chelsio/cxgb}/regs.h  |    0
3245  .../net/{chelsio => ethernet/chelsio/cxgb}/sge.c   |    0
3246  .../net/{chelsio => ethernet/chelsio/cxgb}/sge.h   |    0
3247  .../net/{chelsio => ethernet/chelsio/cxgb}/subr.c  |    0
3248  .../chelsio/cxgb}/suni1x10gexp_regs.h              |    0
3249  .../net/{chelsio => ethernet/chelsio/cxgb}/tp.c    |    0
3250  .../net/{chelsio => ethernet/chelsio/cxgb}/tp.h    |    0
3251  .../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c   |    0
3252  .../chelsio/cxgb}/vsc7326_reg.h                    |    0
3253  drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile  |    0
3254  drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h |    0
3255  drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c |    0
3256  drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c  |    0
3257  drivers/net/{ => ethernet/chelsio}/cxgb3/common.h  |    0
3258  .../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h  |    0
3259  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h  |    0
3260  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h |    0
3261  .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c  |    2 +-
3262  .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c   |    0
3263  .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h   |    0
3264  .../chelsio}/cxgb3/firmware_exports.h              |    0
3265  drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c     |    0
3266  drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h     |    0
3267  drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c     |    0
3268  drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h    |    0
3269  drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c     |    0
3270  .../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h    |    0
3271  drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h  |    0
3272  drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c   |    0
3273  drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h  |    0
3274  drivers/net/{ => ethernet/chelsio}/cxgb3/version.h |    0
3275  drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c |    0
3276  drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c   |    0
3277  drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile  |    0
3278  drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h   |    0
3279  .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c  |    3 +
3280  .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h   |    0
3281  drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c     |    0
3282  drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h     |    0
3283  drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c     |    0
3284  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c   |    0
3285  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h   |    0
3286  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h  |    0
3287  drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h |    0
3288  .../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h    |    0
3289  .../net/{ => ethernet/chelsio}/cxgb4vf/Makefile    |    0
3290  .../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h   |    0
3291  .../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c  |    2 +
3292  drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c   |    0
3293  .../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h   |    0
3294  .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h |    0
3295  .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c   |    0
3296  drivers/net/ethernet/cirrus/Kconfig                |   29 +
3297  drivers/net/ethernet/cirrus/Makefile               |    5 +
3298  drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c  |    0
3299  drivers/net/ethernet/cisco/Kconfig                 |   23 +
3300  drivers/net/ethernet/cisco/Makefile                |    5 +
3301  drivers/net/ethernet/cisco/enic/Kconfig            |    9 +
3302  drivers/net/{ => ethernet/cisco}/enic/Makefile     |    0
3303  drivers/net/{ => ethernet/cisco}/enic/cq_desc.h    |    0
3304  .../net/{ => ethernet/cisco}/enic/cq_enet_desc.h   |    0
3305  drivers/net/{ => ethernet/cisco}/enic/enic.h       |    0
3306  drivers/net/{ => ethernet/cisco}/enic/enic_dev.c   |    0
3307  drivers/net/{ => ethernet/cisco}/enic/enic_dev.h   |    0
3308  drivers/net/{ => ethernet/cisco}/enic/enic_main.c  |   19 +-
3309  drivers/net/{ => ethernet/cisco}/enic/enic_pp.c    |    0
3310  drivers/net/{ => ethernet/cisco}/enic/enic_pp.h    |    0
3311  drivers/net/{ => ethernet/cisco}/enic/enic_res.c   |    0
3312  drivers/net/{ => ethernet/cisco}/enic/enic_res.h   |    0
3313  .../net/{ => ethernet/cisco}/enic/rq_enet_desc.h   |    0
3314  drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c    |    0
3315  drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h    |    0
3316  drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c   |    0
3317  drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h   |    0
3318  .../net/{ => ethernet/cisco}/enic/vnic_devcmd.h    |    0
3319  drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h  |    0
3320  drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c  |    0
3321  drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h  |    0
3322  drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h   |    0
3323  .../net/{ => ethernet/cisco}/enic/vnic_resource.h  |    0
3324  drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c    |    0
3325  drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h    |    0
3326  drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h   |    0
3327  drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h |    0
3328  drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c   |    0
3329  drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h   |    0
3330  drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c    |    0
3331  drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h    |    0
3332  .../net/{ => ethernet/cisco}/enic/wq_enet_desc.h   |    0
3333  drivers/net/ethernet/davicom/Kconfig               |   23 +
3334  drivers/net/ethernet/davicom/Makefile              |    5 +
3335  drivers/net/{ => ethernet/davicom}/dm9000.c        |   13 +-
3336  drivers/net/{ => ethernet/davicom}/dm9000.h        |    0
3337  drivers/net/ethernet/dec/Kconfig                   |   37 +
3338  drivers/net/ethernet/dec/Makefile                  |    6 +
3339  drivers/net/{ => ethernet/dec}/ewrk3.c             |    2 +-
3340  drivers/net/{ => ethernet/dec}/ewrk3.h             |    0
3341  drivers/net/{ => ethernet/dec}/tulip/21142.c       |    0
3342  drivers/net/{ => ethernet/dec}/tulip/Kconfig       |   20 +-
3343  drivers/net/{ => ethernet/dec}/tulip/Makefile      |    0
3344  drivers/net/{ => ethernet/dec}/tulip/de2104x.c     |    2 +-
3345  drivers/net/{ => ethernet/dec}/tulip/de4x5.c       |    2 +-
3346  drivers/net/{ => ethernet/dec}/tulip/de4x5.h       |    0
3347  drivers/net/{ => ethernet/dec}/tulip/dmfe.c        |    2 +-
3348  drivers/net/{ => ethernet/dec}/tulip/eeprom.c      |    0
3349  drivers/net/{ => ethernet/dec}/tulip/interrupt.c   |    0
3350  drivers/net/{ => ethernet/dec}/tulip/media.c       |    0
3351  drivers/net/{ => ethernet/dec}/tulip/pnic.c        |    0
3352  drivers/net/{ => ethernet/dec}/tulip/pnic2.c       |    0
3353  drivers/net/{ => ethernet/dec}/tulip/timer.c       |    0
3354  drivers/net/{ => ethernet/dec}/tulip/tulip.h       |    0
3355  drivers/net/{ => ethernet/dec}/tulip/tulip_core.c  |    2 +-
3356  drivers/net/{ => ethernet/dec}/tulip/uli526x.c     |    2 +-
3357  drivers/net/{ => ethernet/dec}/tulip/winbond-840.c |    2 +-
3358  drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c   |    0
3359  drivers/net/ethernet/dlink/Kconfig                 |   85 +
3360  drivers/net/ethernet/dlink/Makefile                |    8 +
3361  drivers/net/{ => ethernet/dlink}/de600.c           |    0
3362  drivers/net/{ => ethernet/dlink}/de600.h           |    0
3363  drivers/net/{ => ethernet/dlink}/de620.c           |    2 +-
3364  drivers/net/{ => ethernet/dlink}/de620.h           |    0
3365  drivers/net/{ => ethernet/dlink}/dl2k.c            |  107 +-
3366  drivers/net/{ => ethernet/dlink}/dl2k.h            |  110 +-
3367  drivers/net/{ => ethernet/dlink}/sundance.c        |    2 +-
3368  drivers/net/{ => ethernet}/dnet.c                  |    0
3369  drivers/net/{ => ethernet}/dnet.h                  |    0
3370  drivers/net/ethernet/emulex/Kconfig                |   23 +
3371  drivers/net/ethernet/emulex/Makefile               |    5 +
3372  drivers/net/ethernet/emulex/benet/Kconfig          |    6 +
3373  drivers/net/{ => ethernet/emulex}/benet/Makefile   |    0
3374  drivers/net/{ => ethernet/emulex}/benet/be.h       |  125 +-
3375  drivers/net/{ => ethernet/emulex}/benet/be_cmds.c  |  164 +-
3376  drivers/net/{ => ethernet/emulex}/benet/be_cmds.h  |   91 +-
3377  .../net/{ => ethernet/emulex}/benet/be_ethtool.c   |  154 +-
3378  drivers/net/{ => ethernet/emulex}/benet/be_hw.h    |   21 +-
3379  drivers/net/{ => ethernet/emulex}/benet/be_main.c  |  543 +-
3380  drivers/net/{ => ethernet}/ethoc.c                 |    2 +-
3381  drivers/net/ethernet/faraday/Kconfig               |   39 +
3382  drivers/net/ethernet/faraday/Makefile              |    6 +
3383  drivers/net/{ => ethernet/faraday}/ftgmac100.c     |    0
3384  drivers/net/{ => ethernet/faraday}/ftgmac100.h     |    0
3385  drivers/net/{ => ethernet/faraday}/ftmac100.c      |    0
3386  drivers/net/{ => ethernet/faraday}/ftmac100.h      |    0
3387  drivers/net/{ => ethernet}/fealnx.c                |    2 +-
3388  drivers/net/ethernet/freescale/Kconfig             |   89 +
3389  drivers/net/ethernet/freescale/Makefile            |   18 +
3390  drivers/net/{ => ethernet/freescale}/fec.c         |    2 +-
3391  drivers/net/{ => ethernet/freescale}/fec.h         |    0
3392  drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c |    2 +-
3393  drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h |    0
3394  .../net/{ => ethernet/freescale}/fec_mpc52xx_phy.c |    0
3395  .../net/{ => ethernet/freescale}/fs_enet/Kconfig   |    2 +-
3396  .../net/{ => ethernet/freescale}/fs_enet/Makefile  |    0
3397  drivers/net/{ => ethernet/freescale}/fs_enet/fec.h |    0
3398  .../freescale}/fs_enet/fs_enet-main.c              |    2 +-
3399  .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h |    0
3400  .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c |    0
3401  .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c |    0
3402  .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c |    0
3403  .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c |    0
3404  .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c |    0
3405  drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c |    0
3406  drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h |    0
3407  drivers/net/{ => ethernet/freescale}/gianfar.c     |   12 +-
3408  drivers/net/{ => ethernet/freescale}/gianfar.h     |    0
3409  .../net/{ => ethernet/freescale}/gianfar_ethtool.c |    0
3410  drivers/net/{ => ethernet/freescale}/gianfar_ptp.c |    0
3411  .../net/{ => ethernet/freescale}/gianfar_sysfs.c   |    0
3412  drivers/net/{ => ethernet/freescale}/ucc_geth.c    |   12 +-
3413  drivers/net/{ => ethernet/freescale}/ucc_geth.h    |    0
3414  .../{ => ethernet/freescale}/ucc_geth_ethtool.c    |    0
3415  drivers/net/ethernet/fujitsu/Kconfig               |   54 +
3416  drivers/net/ethernet/fujitsu/Makefile              |    7 +
3417  drivers/net/{ => ethernet/fujitsu}/at1700.c        |    2 +-
3418  drivers/net/{ => ethernet/fujitsu}/eth16i.c        |    2 +-
3419  .../net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c  |    2 +-
3420  drivers/net/ethernet/hp/Kconfig                    |   32 +
3421  drivers/net/ethernet/hp/Makefile                   |    5 +
3422  drivers/net/{ => ethernet/hp}/hp100.c              |    4 +-
3423  drivers/net/{ => ethernet/hp}/hp100.h              |    0
3424  drivers/net/{ => ethernet/i825xx}/3c505.c          |    2 +-
3425  drivers/net/{ => ethernet/i825xx}/3c505.h          |    0
3426  drivers/net/{ => ethernet/i825xx}/3c507.c          |    0
3427  drivers/net/{ => ethernet/i825xx}/3c523.c          |    2 +-
3428  drivers/net/{ => ethernet/i825xx}/3c523.h          |    0
3429  drivers/net/{ => ethernet/i825xx}/3c527.c          |    2 +-
3430  drivers/net/{ => ethernet/i825xx}/3c527.h          |    0
3431  drivers/net/{ => ethernet/i825xx}/82596.c          |    2 +-
3432  drivers/net/ethernet/i825xx/Kconfig                |  183 +
3433  drivers/net/ethernet/i825xx/Makefile               |   20 +
3434  drivers/net/{ => ethernet/i825xx}/eepro.c          |    2 +-
3435  drivers/net/{ => ethernet/i825xx}/eexpress.c       |    2 +-
3436  drivers/net/{ => ethernet/i825xx}/eexpress.h       |    0
3437  drivers/net/{arm => ethernet/i825xx}/ether1.c      |    2 +-
3438  drivers/net/{arm => ethernet/i825xx}/ether1.h      |    0
3439  drivers/net/{ => ethernet/i825xx}/lasi_82596.c     |    0
3440  drivers/net/{ => ethernet/i825xx}/lib82596.c       |    2 +-
3441  drivers/net/{ => ethernet/i825xx}/lp486e.c         |    2 +-
3442  drivers/net/{ => ethernet/i825xx}/ni52.c           |    2 +-
3443  drivers/net/{ => ethernet/i825xx}/ni52.h           |    0
3444  drivers/net/{ => ethernet/i825xx}/sni_82596.c      |    0
3445  drivers/net/{ => ethernet/i825xx}/sun3_82586.c     |    2 +-
3446  drivers/net/{ => ethernet/i825xx}/sun3_82586.h     |    0
3447  drivers/net/{ => ethernet/i825xx}/znet.c           |    2 +-
3448  drivers/net/ethernet/ibm/Kconfig                   |   48 +
3449  drivers/net/ethernet/ibm/Makefile                  |    8 +
3450  drivers/net/{ => ethernet/ibm}/ehea/Makefile       |    0
3451  drivers/net/{ => ethernet/ibm}/ehea/ehea.h         |    0
3452  drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c |    0
3453  drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h      |    0
3454  drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c    |    2 +-
3455  drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c    |    0
3456  drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h    |    0
3457  drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c     |    0
3458  drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h     |    0
3459  .../net/{ibm_newemac => ethernet/ibm/emac}/Kconfig |   40 +-
3460  drivers/net/ethernet/ibm/emac/Makefile             |   11 +
3461  .../net/{ibm_newemac => ethernet/ibm/emac}/core.c  |   16 +-
3462  .../net/{ibm_newemac => ethernet/ibm/emac}/core.h  |   16 +-
3463  .../net/{ibm_newemac => ethernet/ibm/emac}/debug.c |    0
3464  .../net/{ibm_newemac => ethernet/ibm/emac}/debug.h |    2 +-
3465  .../net/{ibm_newemac => ethernet/ibm/emac}/emac.h  |    0
3466  .../net/{ibm_newemac => ethernet/ibm/emac}/mal.c   |    6 +-
3467  .../net/{ibm_newemac => ethernet/ibm/emac}/mal.h   |    4 +-
3468  .../net/{ibm_newemac => ethernet/ibm/emac}/phy.c   |    0
3469  .../net/{ibm_newemac => ethernet/ibm/emac}/phy.h   |    0
3470  .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c |    0
3471  .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h |    4 +-
3472  .../net/{ibm_newemac => ethernet/ibm/emac}/tah.c   |    0
3473  .../net/{ibm_newemac => ethernet/ibm/emac}/tah.h   |    4 +-
3474  .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.c  |    0
3475  .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.h  |    4 +-
3476  drivers/net/{ => ethernet/ibm}/ibmveth.c           |    2 +-
3477  drivers/net/{ => ethernet/ibm}/ibmveth.h           |    0
3478  drivers/net/{ => ethernet/ibm}/iseries_veth.c      |    2 +-
3479  drivers/net/ethernet/icplus/Kconfig                |   13 +
3480  drivers/net/ethernet/icplus/Makefile               |    5 +
3481  drivers/net/{ => ethernet/icplus}/ipg.c            |  199 +-
3482  drivers/net/{ => ethernet/icplus}/ipg.h            |    0
3483  drivers/net/ethernet/intel/Kconfig                 |  221 +
3484  drivers/net/ethernet/intel/Makefile                |   12 +
3485  drivers/net/{ => ethernet/intel}/e100.c            |    2 +-
3486  drivers/net/{ => ethernet/intel}/e1000/Makefile    |    0
3487  drivers/net/{ => ethernet/intel}/e1000/e1000.h     |    2 +
3488  .../net/{ => ethernet/intel}/e1000/e1000_ethtool.c |    0
3489  drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c  |    0
3490  drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h  |    0
3491  .../net/{ => ethernet/intel}/e1000/e1000_main.c    |   36 +-
3492  .../net/{ => ethernet/intel}/e1000/e1000_osdep.h   |    0
3493  .../net/{ => ethernet/intel}/e1000/e1000_param.c   |    0
3494  .../intel/e1000e/80003es2lan.c}                    |    1 -
3495  drivers/net/{ => ethernet/intel}/e1000e/82571.c    |    5 -
3496  drivers/net/{ => ethernet/intel}/e1000e/Makefile   |    2 +-
3497  drivers/net/{ => ethernet/intel}/e1000e/defines.h  |    0
3498  drivers/net/{ => ethernet/intel}/e1000e/e1000.h    |    6 +-
3499  drivers/net/{ => ethernet/intel}/e1000e/ethtool.c  |   97 +-
3500  drivers/net/{ => ethernet/intel}/e1000e/hw.h       |    0
3501  drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c  |    5 -
3502  drivers/net/{ => ethernet/intel}/e1000e/lib.c      |    0
3503  drivers/net/{ => ethernet/intel}/e1000e/netdev.c   |  257 +-
3504  drivers/net/{ => ethernet/intel}/e1000e/param.c    |    0
3505  drivers/net/{ => ethernet/intel}/e1000e/phy.c      |    0
3506  drivers/net/{ => ethernet/intel}/igb/Makefile      |    0
3507  drivers/net/{ => ethernet/intel}/igb/e1000_82575.c |    0
3508  drivers/net/{ => ethernet/intel}/igb/e1000_82575.h |    0
3509  .../net/{ => ethernet/intel}/igb/e1000_defines.h   |    0
3510  drivers/net/{ => ethernet/intel}/igb/e1000_hw.h    |    0
3511  drivers/net/{ => ethernet/intel}/igb/e1000_mac.c   |    0
3512  drivers/net/{ => ethernet/intel}/igb/e1000_mac.h   |    0
3513  drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c   |    0
3514  drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h   |    0
3515  drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c   |    0
3516  drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h   |    0
3517  drivers/net/{ => ethernet/intel}/igb/e1000_phy.c   |    0
3518  drivers/net/{ => ethernet/intel}/igb/e1000_phy.h   |    0
3519  drivers/net/{ => ethernet/intel}/igb/e1000_regs.h  |    0
3520  drivers/net/{ => ethernet/intel}/igb/igb.h         |    0
3521  drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c |    0
3522  drivers/net/{ => ethernet/intel}/igb/igb_main.c    |    9 +-
3523  drivers/net/{ => ethernet/intel}/igbvf/Makefile    |    0
3524  drivers/net/{ => ethernet/intel}/igbvf/defines.h   |    0
3525  drivers/net/{ => ethernet/intel}/igbvf/ethtool.c   |    0
3526  drivers/net/{ => ethernet/intel}/igbvf/igbvf.h     |    0
3527  drivers/net/{ => ethernet/intel}/igbvf/mbx.c       |    0
3528  drivers/net/{ => ethernet/intel}/igbvf/mbx.h       |    0
3529  drivers/net/{ => ethernet/intel}/igbvf/netdev.c    |    7 +-
3530  drivers/net/{ => ethernet/intel}/igbvf/regs.h      |    0
3531  drivers/net/{ => ethernet/intel}/igbvf/vf.c        |    0
3532  drivers/net/{ => ethernet/intel}/igbvf/vf.h        |    0
3533  drivers/net/{ => ethernet/intel}/ixgb/Makefile     |    0
3534  drivers/net/{ => ethernet/intel}/ixgb/ixgb.h       |    0
3535  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c    |    0
3536  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h    |    0
3537  .../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c   |    0
3538  drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c    |    0
3539  drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h    |    0
3540  drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h   |    0
3541  drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c  |    8 +-
3542  drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h |    0
3543  drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c |    0
3544  drivers/net/{ => ethernet/intel}/ixgbe/Makefile    |    0
3545  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h     |   35 +-
3546  .../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c   |    0
3547  .../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c   |   87 -
3548  .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c  |    9 +-
3549  .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h  |    0
3550  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c |    0
3551  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h |    0
3552  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c   |    0
3553  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h   |    0
3554  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c   |    4 +-
3555  .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h   |    0
3556  .../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c  |   48 +-
3557  .../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c |   10 +-
3558  .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c    |   10 +-
3559  .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h    |    0
3560  .../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c    |  802 ++--
3561  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c |    0
3562  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h |    0
3563  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c |    0
3564  drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h |    0
3565  .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c   |    0
3566  .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h   |    0
3567  .../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h    |    1 +
3568  .../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c    |    0
3569  drivers/net/{ => ethernet/intel}/ixgbevf/Makefile  |    0
3570  drivers/net/{ => ethernet/intel}/ixgbevf/defines.h |    0
3571  drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c |   46 -
3572  drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h |    8 +-
3573  .../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c    |   95 +-
3574  drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c     |    0
3575  drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h     |    0
3576  drivers/net/{ => ethernet/intel}/ixgbevf/regs.h    |    0
3577  drivers/net/{ => ethernet/intel}/ixgbevf/vf.c      |    0
3578  drivers/net/{ => ethernet/intel}/ixgbevf/vf.h      |    0
3579  drivers/net/{ => ethernet}/jme.c                   |    2 +-
3580  drivers/net/{ => ethernet}/jme.h                   |    0
3581  drivers/net/{ => ethernet}/korina.c                |    3 +-
3582  drivers/net/{ => ethernet}/lantiq_etop.c           |    2 +-
3583  drivers/net/ethernet/marvell/Kconfig               |  111 +
3584  drivers/net/ethernet/marvell/Makefile              |    8 +
3585  drivers/net/{ => ethernet/marvell}/mv643xx_eth.c   |    2 +
3586  drivers/net/{ => ethernet/marvell}/pxa168_eth.c    |    0
3587  drivers/net/{ => ethernet/marvell}/skge.c          |    2 +-
3588  drivers/net/{ => ethernet/marvell}/skge.h          |    0
3589  drivers/net/{ => ethernet/marvell}/sky2.c          |    4 +-
3590  drivers/net/{ => ethernet/marvell}/sky2.h          |    0
3591  drivers/net/ethernet/mellanox/Kconfig              |   23 +
3592  drivers/net/ethernet/mellanox/Makefile             |    5 +
3593  drivers/net/ethernet/mellanox/mlx4/Kconfig         |   27 +
3594  drivers/net/{ => ethernet/mellanox}/mlx4/Makefile  |    0
3595  drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c   |    0
3596  drivers/net/{ => ethernet/mellanox}/mlx4/catas.c   |    0
3597  drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c     |    0
3598  drivers/net/{ => ethernet/mellanox}/mlx4/cq.c      |    0
3599  drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c   |    0
3600  .../net/{ => ethernet/mellanox}/mlx4/en_ethtool.c  |    0
3601  drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c |    0
3602  .../net/{ => ethernet/mellanox}/mlx4/en_netdev.c   |    2 +-
3603  drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c |    0
3604  drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h |    0
3605  .../{ => ethernet/mellanox}/mlx4/en_resources.c    |    0
3606  drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c   |    0
3607  .../net/{ => ethernet/mellanox}/mlx4/en_selftest.c |    0
3608  drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c   |    0
3609  drivers/net/{ => ethernet/mellanox}/mlx4/eq.c      |    0
3610  drivers/net/{ => ethernet/mellanox}/mlx4/fw.c      |    0
3611  drivers/net/{ => ethernet/mellanox}/mlx4/fw.h      |    0
3612  drivers/net/{ => ethernet/mellanox}/mlx4/icm.c     |    0
3613  drivers/net/{ => ethernet/mellanox}/mlx4/icm.h     |    0
3614  drivers/net/{ => ethernet/mellanox}/mlx4/intf.c    |    0
3615  drivers/net/{ => ethernet/mellanox}/mlx4/main.c    |    0
3616  drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c     |    0
3617  drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h    |    0
3618  drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h |    0
3619  drivers/net/{ => ethernet/mellanox}/mlx4/mr.c      |    0
3620  drivers/net/{ => ethernet/mellanox}/mlx4/pd.c      |    0
3621  drivers/net/{ => ethernet/mellanox}/mlx4/port.c    |    0
3622  drivers/net/{ => ethernet/mellanox}/mlx4/profile.c |    0
3623  drivers/net/{ => ethernet/mellanox}/mlx4/qp.c      |    0
3624  drivers/net/{ => ethernet/mellanox}/mlx4/reset.c   |    0
3625  drivers/net/{ => ethernet/mellanox}/mlx4/sense.c   |    0
3626  drivers/net/{ => ethernet/mellanox}/mlx4/srq.c     |    0
3627  drivers/net/ethernet/micrel/Kconfig                |   65 +
3628  drivers/net/ethernet/micrel/Makefile               |    9 +
3629  drivers/net/{arm => ethernet/micrel}/ks8695net.c   |    2 +-
3630  drivers/net/{arm => ethernet/micrel}/ks8695net.h   |    0
3631  drivers/net/{ => ethernet/micrel}/ks8842.c         |    0
3632  drivers/net/{ => ethernet/micrel}/ks8851.c         |    0
3633  drivers/net/{ => ethernet/micrel}/ks8851.h         |    0
3634  drivers/net/{ => ethernet/micrel}/ks8851_mll.c     |    0
3635  drivers/net/{ => ethernet/micrel}/ksz884x.c        |    0
3636  drivers/net/ethernet/microchip/Kconfig             |   38 +
3637  drivers/net/ethernet/microchip/Makefile            |    5 +
3638  drivers/net/{ => ethernet/microchip}/enc28j60.c    |    2 +-
3639  drivers/net/{ => ethernet/microchip}/enc28j60_hw.h |    0
3640  drivers/net/{ => ethernet}/mipsnet.c               |    2 +-
3641  drivers/net/ethernet/myricom/Kconfig               |   47 +
3642  drivers/net/ethernet/myricom/Makefile              |    5 +
3643  .../net/{ => ethernet/myricom}/myri10ge/Makefile   |    0
3644  .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c |    2 +-
3645  .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h |    0
3646  .../myricom}/myri10ge/myri10ge_mcp_gen_header.h    |    0
3647  drivers/net/ethernet/natsemi/Kconfig               |   83 +
3648  drivers/net/ethernet/natsemi/Makefile              |   10 +
3649  drivers/net/{ => ethernet/natsemi}/ibmlana.c       |    2 +-
3650  drivers/net/{ => ethernet/natsemi}/ibmlana.h       |    0
3651  drivers/net/{ => ethernet/natsemi}/jazzsonic.c     |    2 +-
3652  drivers/net/{ => ethernet/natsemi}/macsonic.c      |    2 +-
3653  drivers/net/{ => ethernet/natsemi}/natsemi.c       |    2 +-
3654  drivers/net/{ => ethernet/natsemi}/ns83820.c       |    2 +-
3655  drivers/net/{ => ethernet/natsemi}/sonic.c         |    0
3656  drivers/net/{ => ethernet/natsemi}/sonic.h         |    0
3657  drivers/net/{ => ethernet/natsemi}/xtsonic.c       |    2 +-
3658  drivers/net/ethernet/neterion/Kconfig              |   55 +
3659  drivers/net/ethernet/neterion/Makefile             |    6 +
3660  drivers/net/{ => ethernet/neterion}/s2io-regs.h    |    0
3661  drivers/net/{ => ethernet/neterion}/s2io.c         |    2 +-
3662  drivers/net/{ => ethernet/neterion}/s2io.h         |    0
3663  drivers/net/{ => ethernet/neterion}/vxge/Makefile  |    0
3664  .../net/{ => ethernet/neterion}/vxge/vxge-config.c |    0
3665  .../net/{ => ethernet/neterion}/vxge/vxge-config.h |    0
3666  .../{ => ethernet/neterion}/vxge/vxge-ethtool.c    |    0
3667  .../{ => ethernet/neterion}/vxge/vxge-ethtool.h    |    0
3668  .../net/{ => ethernet/neterion}/vxge/vxge-main.c   |    2 +-
3669  .../net/{ => ethernet/neterion}/vxge/vxge-main.h   |    0
3670  .../net/{ => ethernet/neterion}/vxge/vxge-reg.h    |    0
3671  .../{ => ethernet/neterion}/vxge/vxge-traffic.c    |    0
3672  .../{ => ethernet/neterion}/vxge/vxge-traffic.h    |    0
3673  .../{ => ethernet/neterion}/vxge/vxge-version.h    |    0
3674  drivers/net/{ => ethernet}/netx-eth.c              |    2 +-
3675  drivers/net/ethernet/nuvoton/Kconfig               |   30 +
3676  drivers/net/ethernet/nuvoton/Makefile              |    5 +
3677  .../net/{arm => ethernet/nuvoton}/w90p910_ether.c  |    2 +-
3678  drivers/net/ethernet/nvidia/Kconfig                |   32 +
3679  drivers/net/ethernet/nvidia/Makefile               |    5 +
3680  drivers/net/{ => ethernet/nvidia}/forcedeth.c      |   18 +-
3681  drivers/net/{ => ethernet}/octeon/Kconfig          |    6 +-
3682  drivers/net/ethernet/octeon/Makefile               |    5 +
3683  drivers/net/{ => ethernet}/octeon/octeon_mgmt.c    |    4 +-
3684  drivers/net/ethernet/oki-semi/Kconfig              |   23 +
3685  drivers/net/ethernet/oki-semi/Makefile             |    5 +
3686  drivers/net/ethernet/oki-semi/pch_gbe/Kconfig      |   20 +
3687  .../net/{ => ethernet/oki-semi}/pch_gbe/Makefile   |    0
3688  .../net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h  |    0
3689  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c  |    0
3690  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h  |    0
3691  .../oki-semi}/pch_gbe/pch_gbe_ethtool.c            |    0
3692  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c |    2 +-
3693  .../oki-semi}/pch_gbe/pch_gbe_param.c              |    0
3694  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c  |    0
3695  .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h  |    0
3696  drivers/net/ethernet/packetengines/Kconfig         |   46 +
3697  drivers/net/ethernet/packetengines/Makefile        |    6 +
3698  drivers/net/{ => ethernet/packetengines}/hamachi.c |    2 +-
3699  .../net/{ => ethernet/packetengines}/yellowfin.c   |    2 +-
3700  drivers/net/ethernet/pasemi/Kconfig                |   30 +
3701  drivers/net/ethernet/pasemi/Makefile               |    5 +
3702  drivers/net/{ => ethernet/pasemi}/pasemi_mac.c     |    2 +-
3703  drivers/net/{ => ethernet/pasemi}/pasemi_mac.h     |    0
3704  .../net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c |    0
3705  drivers/net/ethernet/qlogic/Kconfig                |   54 +
3706  drivers/net/ethernet/qlogic/Makefile               |    8 +
3707  drivers/net/{ => ethernet/qlogic}/netxen/Makefile  |    0
3708  .../net/{ => ethernet/qlogic}/netxen/netxen_nic.h  |    6 +
3709  .../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c  |    0
3710  .../qlogic}/netxen/netxen_nic_ethtool.c            |    0
3711  .../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h  |    0
3712  .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c   |    0
3713  .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h   |    0
3714  .../{ => ethernet/qlogic}/netxen/netxen_nic_init.c |    8 +-
3715  .../{ => ethernet/qlogic}/netxen/netxen_nic_main.c |  105 +-
3716  drivers/net/{ => ethernet/qlogic}/qla3xxx.c        |    3 +-
3717  drivers/net/{ => ethernet/qlogic}/qla3xxx.h        |    0
3718  drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile  |    0
3719  drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h  |   19 +-
3720  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c  |  116 +-
3721  .../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c  |   47 +-
3722  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h  |    4 +-
3723  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c   |    4 +-
3724  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c |   21 +-
3725  .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c |  166 +-
3726  drivers/net/{ => ethernet/qlogic}/qlge/Makefile    |    0
3727  drivers/net/{ => ethernet/qlogic}/qlge/qlge.h      |    0
3728  drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c  |    0
3729  .../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c  |    0
3730  drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c |    2 +-
3731  drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c  |    0
3732  drivers/net/ethernet/racal/Kconfig                 |   33 +
3733  drivers/net/ethernet/racal/Makefile                |    5 +
3734  drivers/net/{ => ethernet/racal}/ni5010.c          |    2 +-
3735  drivers/net/{ => ethernet/racal}/ni5010.h          |    0
3736  drivers/net/ethernet/rdc/Kconfig                   |   34 +
3737  drivers/net/ethernet/rdc/Makefile                  |    5 +
3738  drivers/net/{ => ethernet/rdc}/r6040.c             |    2 +-
3739  drivers/net/{ => ethernet/realtek}/8139cp.c        |    5 +-
3740  drivers/net/{ => ethernet/realtek}/8139too.c       |    2 +-
3741  drivers/net/ethernet/realtek/Kconfig               |  127 +
3742  drivers/net/ethernet/realtek/Makefile              |    9 +
3743  drivers/net/{ => ethernet/realtek}/atp.c           |    2 +-
3744  drivers/net/{ => ethernet/realtek}/atp.h           |    0
3745  drivers/net/{ => ethernet/realtek}/r8169.c         |    2 +-
3746  drivers/net/{ => ethernet/realtek}/sc92031.c       |    2 +-
3747  drivers/net/ethernet/renesas/Kconfig               |   18 +
3748  drivers/net/ethernet/renesas/Makefile              |    5 +
3749  drivers/net/{ => ethernet/renesas}/sh_eth.c        |    2 +-
3750  drivers/net/{ => ethernet/renesas}/sh_eth.h        |    0
3751  drivers/net/{ => ethernet}/s6gmac.c                |    0
3752  drivers/net/ethernet/seeq/Kconfig                  |   46 +
3753  drivers/net/ethernet/seeq/Makefile                 |    7 +
3754  drivers/net/{arm => ethernet/seeq}/ether3.c        |    2 +-
3755  drivers/net/{arm => ethernet/seeq}/ether3.h        |    0
3756  drivers/net/{ => ethernet/seeq}/seeq8005.c         |    2 +-
3757  drivers/net/{ => ethernet/seeq}/seeq8005.h         |    0
3758  drivers/net/{ => ethernet/seeq}/sgiseeq.c          |    2 +-
3759  drivers/net/{ => ethernet/seeq}/sgiseeq.h          |    0
3760  drivers/net/{ => ethernet}/sfc/Kconfig             |    4 +-
3761  drivers/net/{ => ethernet}/sfc/Makefile            |    0
3762  drivers/net/{ => ethernet}/sfc/bitfield.h          |    0
3763  drivers/net/{ => ethernet}/sfc/efx.c               |    2 +-
3764  drivers/net/{ => ethernet}/sfc/efx.h               |    0
3765  drivers/net/{ => ethernet}/sfc/enum.h              |    0
3766  drivers/net/{ => ethernet}/sfc/ethtool.c           |    0
3767  drivers/net/{ => ethernet}/sfc/falcon.c            |    0
3768  drivers/net/{ => ethernet}/sfc/falcon_boards.c     |    0
3769  drivers/net/{ => ethernet}/sfc/falcon_xmac.c       |    0
3770  drivers/net/{ => ethernet}/sfc/filter.c            |    0
3771  drivers/net/{ => ethernet}/sfc/filter.h            |    0
3772  drivers/net/{ => ethernet}/sfc/io.h                |    0
3773  drivers/net/{ => ethernet}/sfc/mac.h               |    0
3774  drivers/net/{ => ethernet}/sfc/mcdi.c              |    0
3775  drivers/net/{ => ethernet}/sfc/mcdi.h              |    0
3776  drivers/net/{ => ethernet}/sfc/mcdi_mac.c          |    0
3777  drivers/net/{ => ethernet}/sfc/mcdi_pcol.h         |    0
3778  drivers/net/{ => ethernet}/sfc/mcdi_phy.c          |    0
3779  drivers/net/{ => ethernet}/sfc/mdio_10g.c          |    0
3780  drivers/net/{ => ethernet}/sfc/mdio_10g.h          |    0
3781  drivers/net/{ => ethernet}/sfc/mtd.c               |    0
3782  drivers/net/{ => ethernet}/sfc/net_driver.h        |    0
3783  drivers/net/{ => ethernet}/sfc/nic.c               |    0
3784  drivers/net/{ => ethernet}/sfc/nic.h               |    0
3785  drivers/net/{ => ethernet}/sfc/phy.h               |    0
3786  drivers/net/{ => ethernet}/sfc/qt202x_phy.c        |    0
3787  drivers/net/{ => ethernet}/sfc/regs.h              |    0
3788  drivers/net/{ => ethernet}/sfc/rx.c                |    0
3789  drivers/net/{ => ethernet}/sfc/selftest.c          |    0
3790  drivers/net/{ => ethernet}/sfc/selftest.h          |    0
3791  drivers/net/{ => ethernet}/sfc/siena.c             |    0
3792  drivers/net/{ => ethernet}/sfc/spi.h               |    0
3793  drivers/net/{ => ethernet}/sfc/tenxpress.c         |    0
3794  drivers/net/{ => ethernet}/sfc/tx.c                |    0
3795  drivers/net/{ => ethernet}/sfc/txc43128_phy.c      |    0
3796  drivers/net/{ => ethernet}/sfc/workarounds.h       |    0
3797  drivers/net/ethernet/sgi/Kconfig                   |   35 +
3798  drivers/net/ethernet/sgi/Makefile                  |    6 +
3799  drivers/net/{ => ethernet/sgi}/ioc3-eth.c          |    2 +-
3800  drivers/net/{ => ethernet/sgi}/meth.c              |    0
3801  drivers/net/{ => ethernet/sgi}/meth.h              |    0
3802  drivers/net/ethernet/sis/Kconfig                   |   51 +
3803  drivers/net/ethernet/sis/Makefile                  |    6 +
3804  drivers/net/{ => ethernet/sis}/sis190.c            |    2 +-
3805  drivers/net/{ => ethernet/sis}/sis900.c            |    2 +-
3806  drivers/net/{ => ethernet/sis}/sis900.h            |    0
3807  drivers/net/ethernet/smsc/Kconfig                  |  132 +
3808  drivers/net/ethernet/smsc/Makefile                 |   11 +
3809  drivers/net/{ => ethernet/smsc}/epic100.c          |    2 +-
3810  drivers/net/{ => ethernet/smsc}/smc911x.c          |    2 +-
3811  drivers/net/{ => ethernet/smsc}/smc911x.h          |    0
3812  drivers/net/{ => ethernet/smsc}/smc9194.c          |    2 +-
3813  drivers/net/{ => ethernet/smsc}/smc9194.h          |    0
3814  .../net/{pcmcia => ethernet/smsc}/smc91c92_cs.c    |    2 +-
3815  drivers/net/{ => ethernet/smsc}/smc91x.c           |    2 +-
3816  drivers/net/{ => ethernet/smsc}/smc91x.h           |    0
3817  drivers/net/{ => ethernet/smsc}/smsc911x.c         |   87 +-
3818  drivers/net/{ => ethernet/smsc}/smsc911x.h         |    0
3819  drivers/net/{ => ethernet/smsc}/smsc9420.c         |    2 +-
3820  drivers/net/{ => ethernet/smsc}/smsc9420.h         |    0
3821  drivers/net/ethernet/stmicro/Kconfig               |   23 +
3822  drivers/net/ethernet/stmicro/Makefile              |    5 +
3823  drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig  |   14 +-
3824  drivers/net/{ => ethernet/stmicro}/stmmac/Makefile |    0
3825  drivers/net/{ => ethernet/stmicro}/stmmac/common.h |    0
3826  drivers/net/{ => ethernet/stmicro}/stmmac/descs.h  |    0
3827  .../net/{ => ethernet/stmicro}/stmmac/dwmac100.h   |    0
3828  .../net/{ => ethernet/stmicro}/stmmac/dwmac1000.h  |    0
3829  .../{ => ethernet/stmicro}/stmmac/dwmac1000_core.c |    0
3830  .../{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c  |    0
3831  .../{ => ethernet/stmicro}/stmmac/dwmac100_core.c  |    0
3832  .../{ => ethernet/stmicro}/stmmac/dwmac100_dma.c   |    0
3833  .../net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h  |    0
3834  .../net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c  |    0
3835  .../net/{ => ethernet/stmicro}/stmmac/enh_desc.c   |    0
3836  .../net/{ => ethernet/stmicro}/stmmac/norm_desc.c  |    0
3837  drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h |    0
3838  .../{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c |    0
3839  .../{ => ethernet/stmicro}/stmmac/stmmac_main.c    |   13 +-
3840  .../{ => ethernet/stmicro}/stmmac/stmmac_mdio.c    |    0
3841  .../{ => ethernet/stmicro}/stmmac/stmmac_timer.c   |    0
3842  .../{ => ethernet/stmicro}/stmmac/stmmac_timer.h   |    0
3843  drivers/net/ethernet/sun/Kconfig                   |   88 +
3844  drivers/net/ethernet/sun/Makefile                  |   11 +
3845  drivers/net/{ => ethernet/sun}/cassini.c           |   17 +-
3846  drivers/net/{ => ethernet/sun}/cassini.h           |    0
3847  drivers/net/{ => ethernet/sun}/niu.c               |    5 +-
3848  drivers/net/{ => ethernet/sun}/niu.h               |    0
3849  drivers/net/{ => ethernet/sun}/sunbmac.c           |   33 +-
3850  drivers/net/{ => ethernet/sun}/sunbmac.h           |   17 -
3851  drivers/net/{ => ethernet/sun}/sungem.c            |    6 +-
3852  drivers/net/{ => ethernet/sun}/sungem.h            |    0
3853  drivers/net/{ => ethernet/sun}/sunhme.c            |    2 +-
3854  drivers/net/{ => ethernet/sun}/sunhme.h            |    0
3855  drivers/net/{ => ethernet/sun}/sunqe.c             |    2 +-
3856  drivers/net/{ => ethernet/sun}/sunqe.h             |    0
3857  drivers/net/{ => ethernet/sun}/sunvnet.c           |    2 +-
3858  drivers/net/{ => ethernet/sun}/sunvnet.h           |    0
3859  drivers/net/ethernet/tehuti/Kconfig                |   27 +
3860  drivers/net/ethernet/tehuti/Makefile               |    5 +
3861  drivers/net/{ => ethernet/tehuti}/tehuti.c         |    2 +-
3862  drivers/net/{ => ethernet/tehuti}/tehuti.h         |    0
3863  drivers/net/ethernet/ti/Kconfig                    |   77 +
3864  drivers/net/ethernet/ti/Makefile                   |    9 +
3865  drivers/net/{ => ethernet/ti}/cpmac.c              |    2 +-
3866  drivers/net/{ => ethernet/ti}/davinci_cpdma.c      |    0
3867  drivers/net/{ => ethernet/ti}/davinci_cpdma.h      |    0
3868  drivers/net/{ => ethernet/ti}/davinci_emac.c       |    2 +-
3869  drivers/net/{ => ethernet/ti}/davinci_mdio.c       |    0
3870  drivers/net/{ => ethernet/ti}/tlan.c               |    2 +-
3871  drivers/net/{ => ethernet/ti}/tlan.h               |    0
3872  drivers/net/ethernet/tile/Kconfig                  |   15 +
3873  drivers/net/{ => ethernet}/tile/Makefile           |    0
3874  drivers/net/{ => ethernet}/tile/tilepro.c          |    0
3875  drivers/net/ethernet/toshiba/Kconfig               |   57 +
3876  drivers/net/ethernet/toshiba/Makefile              |   10 +
3877  drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c |    2 +-
3878  drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h |    0
3879  .../{ => ethernet/toshiba}/ps3_gelic_wireless.c    |    2 +-
3880  .../{ => ethernet/toshiba}/ps3_gelic_wireless.h    |    0
3881  drivers/net/{ => ethernet/toshiba}/spider_net.c    |    6 +-
3882  drivers/net/{ => ethernet/toshiba}/spider_net.h    |    2 +-
3883  .../{ => ethernet/toshiba}/spider_net_ethtool.c    |    0
3884  drivers/net/{ => ethernet/toshiba}/tc35815.c       |    2 +-
3885  drivers/net/ethernet/tundra/Kconfig                |   29 +
3886  drivers/net/ethernet/tundra/Makefile               |    5 +
3887  drivers/net/{ => ethernet/tundra}/tsi108_eth.c     |    2 +-
3888  drivers/net/{ => ethernet/tundra}/tsi108_eth.h     |    0
3889  drivers/net/ethernet/via/Kconfig                   |   57 +
3890  drivers/net/ethernet/via/Makefile                  |    6 +
3891  drivers/net/{ => ethernet/via}/via-rhine.c         |    2 +-
3892  drivers/net/{ => ethernet/via}/via-velocity.c      |  148 +-
3893  drivers/net/{ => ethernet/via}/via-velocity.h      |    0
3894  drivers/net/ethernet/xilinx/Kconfig                |   36 +
3895  drivers/net/ethernet/xilinx/Makefile               |    7 +
3896  drivers/net/{ => ethernet/xilinx}/ll_temac.h       |    0
3897  drivers/net/{ => ethernet/xilinx}/ll_temac_main.c  |    1 -
3898  drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c  |    0
3899  .../net/{ => ethernet/xilinx}/xilinx_emaclite.c    |    0
3900  drivers/net/ethernet/xircom/Kconfig                |   31 +
3901  drivers/net/ethernet/xircom/Makefile               |    5 +
3902  .../net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c   |    2 +-
3903  drivers/net/ethernet/xscale/Kconfig                |   32 +
3904  drivers/net/ethernet/xscale/Makefile               |    6 +
3905  drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig  |    2 +-
3906  drivers/net/{ => ethernet/xscale}/ixp2000/Makefile |    0
3907  drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c  |    0
3908  drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h  |    0
3909  .../net/{ => ethernet/xscale}/ixp2000/enp2611.c    |    0
3910  .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.c    |    0
3911  .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.h    |    0
3912  .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc    |    0
3913  .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode |    0
3914  .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc    |    0
3915  .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode |    0
3916  drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c |    0
3917  drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h |    0
3918  .../{ => ethernet/xscale}/ixp2000/ixpdev_priv.h    |    0
3919  drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c |    0
3920  drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h |    0
3921  drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c  |    2 +-
3922  drivers/net/fddi/Kconfig                           |   77 +
3923  drivers/net/fddi/Makefile                          |    6 +
3924  drivers/net/{ => fddi}/defxx.c                     |    2 +-
3925  drivers/net/{ => fddi}/defxx.h                     |    0
3926  drivers/net/{ => fddi}/skfp/Makefile               |    0
3927  drivers/net/{ => fddi}/skfp/cfm.c                  |    0
3928  drivers/net/{ => fddi}/skfp/drvfbi.c               |    0
3929  drivers/net/{ => fddi}/skfp/ecm.c                  |    0
3930  drivers/net/{ => fddi}/skfp/ess.c                  |    0
3931  drivers/net/{ => fddi}/skfp/fplustm.c              |    0
3932  drivers/net/{ => fddi}/skfp/h/cmtdef.h             |    4 +-
3933  drivers/net/{ => fddi}/skfp/h/fddi.h               |    0
3934  drivers/net/{ => fddi}/skfp/h/fddimib.h            |    0
3935  drivers/net/{ => fddi}/skfp/h/fplustm.h            |    0
3936  drivers/net/{ => fddi}/skfp/h/hwmtm.h              |    2 +-
3937  drivers/net/{ => fddi}/skfp/h/mbuf.h               |    0
3938  drivers/net/{ => fddi}/skfp/h/osdef1st.h           |    0
3939  drivers/net/{ => fddi}/skfp/h/sba.h                |    4 +-
3940  drivers/net/{ => fddi}/skfp/h/sba_def.h            |    0
3941  drivers/net/{ => fddi}/skfp/h/skfbi.h              |    0
3942  drivers/net/{ => fddi}/skfp/h/skfbiinc.h           |    2 +-
3943  drivers/net/{ => fddi}/skfp/h/smc.h                |   14 +-
3944  drivers/net/{ => fddi}/skfp/h/smt.h                |    0
3945  drivers/net/{ => fddi}/skfp/h/smt_p.h              |    0
3946  drivers/net/{ => fddi}/skfp/h/smtstate.h           |    0
3947  drivers/net/{ => fddi}/skfp/h/supern_2.h           |    0
3948  drivers/net/{ => fddi}/skfp/h/targethw.h           |    6 +-
3949  drivers/net/{ => fddi}/skfp/h/targetos.h           |    2 +-
3950  drivers/net/{ => fddi}/skfp/h/types.h              |    0
3951  drivers/net/{ => fddi}/skfp/hwmtm.c                |    0
3952  drivers/net/{ => fddi}/skfp/hwt.c                  |    0
3953  drivers/net/{ => fddi}/skfp/pcmplc.c               |    0
3954  drivers/net/{ => fddi}/skfp/pmf.c                  |    0
3955  drivers/net/{ => fddi}/skfp/queue.c                |    0
3956  drivers/net/{ => fddi}/skfp/rmt.c                  |    0
3957  drivers/net/{ => fddi}/skfp/skfddi.c               |    2 +-
3958  drivers/net/{ => fddi}/skfp/smt.c                  |    0
3959  drivers/net/{ => fddi}/skfp/smtdef.c               |    0
3960  drivers/net/{ => fddi}/skfp/smtinit.c              |    0
3961  drivers/net/{ => fddi}/skfp/smttimer.c             |    0
3962  drivers/net/{ => fddi}/skfp/srf.c                  |    0
3963  drivers/net/hippi/Kconfig                          |   39 +
3964  drivers/net/hippi/Makefile                         |    5 +
3965  drivers/net/{ => hippi}/rrunner.c                  |    0
3966  drivers/net/{ => hippi}/rrunner.h                  |    0
3967  drivers/net/ibm_newemac/Makefile                   |   11 -
3968  drivers/net/macvlan.c                              |    2 +-
3969  drivers/net/octeon/Makefile                        |    2 -
3970  drivers/net/pci-skeleton.c                         | 1923 ------
3971  drivers/net/pcmcia/Kconfig                         |  123 -
3972  drivers/net/pcmcia/Makefile                        |   16 -
3973  drivers/net/phy/Kconfig                            |    2 +-
3974  drivers/net/plip/Kconfig                           |   38 +
3975  drivers/net/plip/Makefile                          |    5 +
3976  drivers/net/{ => plip}/plip.c                      |    0
3977  drivers/net/ppp/Kconfig                            |  175 +
3978  drivers/net/ppp/Makefile                           |   13 +
3979  drivers/net/{ => ppp}/bsd_comp.c                   |    0
3980  drivers/net/{ => ppp}/ppp_async.c                  |    0
3981  drivers/net/{ => ppp}/ppp_deflate.c                |    0
3982  drivers/net/{ => ppp}/ppp_generic.c                |    0
3983  drivers/net/{ => ppp}/ppp_mppe.c                   |    0
3984  drivers/net/{ => ppp}/ppp_mppe.h                   |    0
3985  drivers/net/{ => ppp}/ppp_synctty.c                |    0
3986  drivers/net/{ => ppp}/pppoe.c                      |    0
3987  drivers/net/{ => ppp}/pppox.c                      |    0
3988  drivers/net/{ => ppp}/pptp.c                       |    0
3989  drivers/net/slip/Kconfig                           |   79 +
3990  drivers/net/slip/Makefile                          |    6 +
3991  drivers/net/{ => slip}/slhc.c                      |    0
3992  drivers/net/{ => slip}/slip.c                      |   29 +-
3993  drivers/net/{ => slip}/slip.h                      |    9 -
3994  drivers/net/sungem_phy.c                           |    7 +-
3995  drivers/net/tokenring/3c359.c                      |    2 +-
3996  drivers/net/tokenring/Kconfig                      |   15 +-
3997  drivers/net/tokenring/Makefile                     |   21 +-
3998  drivers/net/tokenring/ibmtr.c                      |    2 +-
3999  drivers/net/{pcmcia => tokenring}/ibmtr_cs.c       |    2 +-
4000  drivers/net/tokenring/lanstreamer.c                |    2 +-
4001  drivers/net/tokenring/olympic.c                    |    2 +-
4002  drivers/net/tokenring/smctr.c                      |    2 +-
4003  drivers/net/tokenring/tms380tr.c                   |    2 +-
4004  drivers/net/tun.c                                  |    2 +-
4005  drivers/net/usb/asix.c                             |    6 +-
4006  drivers/net/usb/catc.c                             |    2 +-
4007  drivers/net/usb/dm9601.c                           |    2 +-
4008  drivers/net/usb/int51x1.c                          |    2 +-
4009  drivers/net/usb/kaweth.c                           |    2 +-
4010  drivers/net/usb/lg-vl600.c                         |   19 +
4011  drivers/net/usb/mcs7830.c                          |    2 +-
4012  drivers/net/usb/pegasus.c                          |    2 +-
4013  drivers/net/usb/rtl8150.c                          |    2 +-
4014  drivers/net/usb/smsc75xx.c                         |    2 +-
4015  drivers/net/usb/smsc95xx.c                         |    2 +-
4016  drivers/net/virtio_net.c                           |    1 +
4017  drivers/net/vmxnet3/vmxnet3_drv.c                  |    2 +-
4018  drivers/net/wan/hdlc_ppp.c                         |   14 +-
4019  drivers/net/wan/sbni.c                             |    2 +-
4020  drivers/net/wireless/airo.c                        |    4 +-
4021  drivers/net/wireless/ath/Kconfig                   |    1 +
4022  drivers/net/wireless/ath/Makefile                  |    1 +
4023  drivers/net/wireless/ath/ath5k/ahb.c               |    4 +-
4024  drivers/net/wireless/ath/ath5k/ani.c               |    1 -
4025  drivers/net/wireless/ath/ath5k/ani.h               |    4 +
4026  drivers/net/wireless/ath/ath5k/ath5k.h             |   98 +-
4027  drivers/net/wireless/ath/ath5k/attach.c            |   18 +-
4028  drivers/net/wireless/ath/ath5k/base.c              |   31 +-
4029  drivers/net/wireless/ath/ath5k/base.h              |   55 +-
4030  drivers/net/wireless/ath/ath5k/caps.c              |    2 +-
4031  drivers/net/wireless/ath/ath5k/debug.c             |   15 +-
4032  drivers/net/wireless/ath/ath5k/desc.c              |    1 -
4033  drivers/net/wireless/ath/ath5k/dma.c               |    1 -
4034  drivers/net/wireless/ath/ath5k/eeprom.c            |   10 +-
4035  drivers/net/wireless/ath/ath5k/gpio.c              |    1 -
4036  drivers/net/wireless/ath/ath5k/initvals.c          |    1 -
4037  drivers/net/wireless/ath/ath5k/led.c               |    1 -
4038  drivers/net/wireless/ath/ath5k/mac80211-ops.c      |    5 +-
4039  drivers/net/wireless/ath/ath5k/pci.c               |    4 +-
4040  drivers/net/wireless/ath/ath5k/pcu.c               |    5 +-
4041  drivers/net/wireless/ath/ath5k/phy.c               |   91 +-
4042  drivers/net/wireless/ath/ath5k/qcu.c               |   10 +-
4043  drivers/net/wireless/ath/ath5k/reset.c             |   79 +-
4044  drivers/net/wireless/ath/ath5k/rfkill.c            |    2 +-
4045  drivers/net/wireless/ath/ath5k/sysfs.c             |    1 -
4046  drivers/net/wireless/ath/ath5k/trace.h             |    3 +-
4047  drivers/net/wireless/ath/ath6kl/Kconfig            |   15 +
4048  drivers/net/wireless/ath/ath6kl/Makefile           |   35 +
4049  drivers/net/wireless/ath/ath6kl/bmi.c              |  692 +++
4050  drivers/net/wireless/ath/ath6kl/bmi.h              |  250 +
4051  drivers/net/wireless/ath/ath6kl/cfg80211.c         | 1538 +++++
4052  drivers/net/wireless/ath/ath6kl/cfg80211.h         |   39 +
4053  drivers/net/wireless/ath/ath6kl/common.h           |  180 +
4054  drivers/net/wireless/ath/ath6kl/core.h             |  544 ++
4055  drivers/net/wireless/ath/ath6kl/debug.c            |  150 +
4056  drivers/net/wireless/ath/ath6kl/debug.h            |  105 +
4057  drivers/net/wireless/ath/ath6kl/hif-ops.h          |   72 +
4058  drivers/net/wireless/ath/ath6kl/hif.h              |  207 +
4059  drivers/net/wireless/ath/ath6kl/htc.c              | 2457 ++++++++
4060  drivers/net/wireless/ath/ath6kl/htc.h              |  607 ++
4061  drivers/net/wireless/ath/ath6kl/htc_hif.c          |  641 ++
4062  drivers/net/wireless/ath/ath6kl/htc_hif.h          |   92 +
4063  drivers/net/wireless/ath/ath6kl/init.c             | 1303 ++++
4064  drivers/net/wireless/ath/ath6kl/main.c             | 1337 ++++
4065  drivers/net/wireless/ath/ath6kl/node.c             |  234 +
4066  drivers/net/wireless/ath/ath6kl/sdio.c             |  912 +++
4067  drivers/net/wireless/ath/ath6kl/target.h           |  331 +
4068  drivers/net/wireless/ath/ath6kl/txrx.c             | 1457 +++++
4069  drivers/net/wireless/ath/ath6kl/wmi.c              | 2743 +++++++++
4070  drivers/net/wireless/ath/ath6kl/wmi.h              | 2018 ++++++
4071  drivers/net/wireless/ath/ath9k/ahb.c               |    2 +-
4072  drivers/net/wireless/ath/ath9k/ar9002_hw.c         |    8 +-
4073  .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h   |  192 +-
4074  drivers/net/wireless/ath/ath9k/ar9003_calib.c      |   15 -
4075  drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |  150 +-
4076  drivers/net/wireless/ath/ath9k/ar9003_hw.c         |   89 +-
4077  drivers/net/wireless/ath/ath9k/ar9003_mac.c        |   47 +-
4078  drivers/net/wireless/ath/ath9k/ar9003_phy.c        |    8 +-
4079  drivers/net/wireless/ath/ath9k/ar9003_phy.h        |    2 -
4080  .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h   | 1673 +++++
4081  drivers/net/wireless/ath/ath9k/ath9k.h             |   10 +-
4082  drivers/net/wireless/ath/ath9k/beacon.c            |   18 +-
4083  drivers/net/wireless/ath/ath9k/calib.c             |   18 +-
4084  drivers/net/wireless/ath/ath9k/calib.h             |    1 +
4085  drivers/net/wireless/ath/ath9k/common.c            |   26 +
4086  drivers/net/wireless/ath/ath9k/common.h            |    1 +
4087  drivers/net/wireless/ath/ath9k/debug.c             |  115 +
4088  drivers/net/wireless/ath/ath9k/eeprom.h            |    2 +
4089  drivers/net/wireless/ath/ath9k/eeprom_4k.c         |  135 +-
4090  drivers/net/wireless/ath/ath9k/eeprom_9287.c       |  122 +-
4091  drivers/net/wireless/ath/ath9k/eeprom_def.c        |  150 +-
4092  drivers/net/wireless/ath/ath9k/gpio.c              |    2 +
4093  drivers/net/wireless/ath/ath9k/htc.h               |    3 -
4094  drivers/net/wireless/ath/ath9k/htc_drv_init.c      |   22 +-
4095  drivers/net/wireless/ath/ath9k/htc_drv_main.c      |   17 +
4096  drivers/net/wireless/ath/ath9k/hw-ops.h            |    8 +-
4097  drivers/net/wireless/ath/ath9k/hw.c                |   21 +-
4098  drivers/net/wireless/ath/ath9k/hw.h                |   17 +-
4099  drivers/net/wireless/ath/ath9k/init.c              |   35 +-
4100  drivers/net/wireless/ath/ath9k/mac.c               |   35 +-
4101  drivers/net/wireless/ath/ath9k/mac.h               |    2 +-
4102  drivers/net/wireless/ath/ath9k/main.c              |   64 +-
4103  drivers/net/wireless/ath/ath9k/pci.c               |   52 +-
4104  drivers/net/wireless/ath/ath9k/rc.c                |   38 +-
4105  drivers/net/wireless/ath/ath9k/rc.h                |    6 -
4106  drivers/net/wireless/ath/ath9k/recv.c              |   22 +-
4107  drivers/net/wireless/ath/ath9k/reg.h               |   14 +
4108  drivers/net/wireless/ath/ath9k/xmit.c              |   56 +-
4109  drivers/net/wireless/ath/carl9170/Kconfig          |   14 +
4110  drivers/net/wireless/ath/carl9170/carl9170.h       |   24 +
4111  drivers/net/wireless/ath/carl9170/cmd.c            |   34 +
4112  drivers/net/wireless/ath/carl9170/cmd.h            |    1 +
4113  drivers/net/wireless/ath/carl9170/fw.c             |    3 +
4114  drivers/net/wireless/ath/carl9170/fwcmd.h          |   11 +
4115  drivers/net/wireless/ath/carl9170/main.c           |  229 +-
4116  drivers/net/wireless/ath/carl9170/phy.c            |   16 +-
4117  drivers/net/wireless/ath/carl9170/version.h        |    4 +-
4118  drivers/net/wireless/ath/regd.h                    |    2 +-
4119  drivers/net/wireless/ath/regd_common.h             |    2 +-
4120  drivers/net/wireless/b43/Kconfig                   |   16 +-
4121  drivers/net/wireless/b43/b43.h                     |   23 +-
4122  drivers/net/wireless/b43/dma.c                     |  126 +-
4123  drivers/net/wireless/b43/dma.h                     |   13 +-
4124  drivers/net/wireless/b43/main.c                    |   68 +-
4125  drivers/net/wireless/b43/phy_common.c              |   32 +
4126  drivers/net/wireless/b43/phy_common.h              |    2 +
4127  drivers/net/wireless/b43/phy_ht.c                  |  203 +
4128  drivers/net/wireless/b43/phy_ht.h                  |   19 +
4129  drivers/net/wireless/b43/phy_lcn.c                 |  211 +-
4130  drivers/net/wireless/b43/phy_lcn.h                 |   16 +-
4131  drivers/net/wireless/b43/phy_n.c                   |   40 +-
4132  drivers/net/wireless/b43/pio.c                     |   12 +-
4133  drivers/net/wireless/b43/tables_phy_ht.c           |   84 +
4134  drivers/net/wireless/b43/tables_phy_ht.h           |    4 +
4135  drivers/net/wireless/b43/tables_phy_lcn.c          |  432 ++
4136  drivers/net/wireless/b43/tables_phy_lcn.h          |   16 +
4137  drivers/net/wireless/b43/xmit.c                    |  120 +-
4138  drivers/net/wireless/b43/xmit.h                    |   62 +-
4139  drivers/net/wireless/b43legacy/b43legacy.h         |    5 -
4140  drivers/net/wireless/b43legacy/dma.c               |  374 +-
4141  drivers/net/wireless/b43legacy/dma.h               |  107 -
4142  drivers/net/wireless/b43legacy/main.c              |    8 +-
4143  drivers/net/wireless/hostap/hostap_main.c          |    6 +-
4144  drivers/net/wireless/ipw2x00/ipw2200.c             |    3 +-
4145  drivers/net/wireless/iwlegacy/iwl-3945-led.c       |    1 -
4146  drivers/net/wireless/iwlegacy/iwl-3945-rs.c        |    1 -
4147  drivers/net/wireless/iwlegacy/iwl-3945.c           |    1 -
4148  drivers/net/wireless/iwlegacy/iwl-4965-led.c       |    1 -
4149  drivers/net/wireless/iwlegacy/iwl-4965-rs.c        |    1 -
4150  drivers/net/wireless/iwlegacy/iwl-4965.c           |    1 -
4151  drivers/net/wireless/iwlegacy/iwl-led.c            |    1 -
4152  drivers/net/wireless/iwlegacy/iwl3945-base.c       |    1 -
4153  drivers/net/wireless/iwlegacy/iwl4965-base.c       |    1 -
4154  drivers/net/wireless/iwlwifi/Kconfig               |   17 -
4155  drivers/net/wireless/iwlwifi/iwl-1000.c            |   16 +-
4156  drivers/net/wireless/iwlwifi/iwl-2000.c            |   24 +-
4157  drivers/net/wireless/iwlwifi/iwl-5000.c            |   13 +-
4158  drivers/net/wireless/iwlwifi/iwl-6000.c            |   20 +-
4159  drivers/net/wireless/iwlwifi/iwl-agn-calib.c       |   69 +-
4160  drivers/net/wireless/iwlwifi/iwl-agn-hw.h          |    4 +-
4161  drivers/net/wireless/iwlwifi/iwl-agn-lib.c         |   47 +-
4162  drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |    1 -
4163  drivers/net/wireless/iwlwifi/iwl-agn-rxon.c        |   23 +-
4164  drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |   30 +-
4165  drivers/net/wireless/iwlwifi/iwl-agn.c             |  388 +-
4166  drivers/net/wireless/iwlwifi/iwl-agn.h             |    1 +
4167  drivers/net/wireless/iwlwifi/iwl-commands.h        |   34 +-
4168  drivers/net/wireless/iwlwifi/iwl-core.c            |    5 +
4169  drivers/net/wireless/iwlwifi/iwl-core.h            |    5 +
4170  drivers/net/wireless/iwlwifi/iwl-dev.h             |   29 +-
4171  drivers/net/wireless/iwlwifi/iwl-led.c             |    1 -
4172  drivers/net/wireless/iwlwifi/iwl-scan.c            |   19 +-
4173  drivers/net/wireless/iwlwifi/iwl-trans.c           |   10 +-
4174  drivers/net/wireless/libertas/README               |   25 -
4175  drivers/net/wireless/libertas/cfg.c                |   69 +-
4176  drivers/net/wireless/libertas/cfg.h                |    1 +
4177  drivers/net/wireless/libertas/cmd.c                |    6 +-
4178  drivers/net/wireless/libertas/decl.h               |    4 +
4179  drivers/net/wireless/libertas/dev.h                |   28 +-
4180  drivers/net/wireless/libertas/ethtool.c            |    1 +
4181  drivers/net/wireless/libertas/if_sdio.c            |  277 +-
4182  drivers/net/wireless/libertas/if_spi.c             |    4 -
4183  drivers/net/wireless/libertas/if_usb.c             |   13 +-
4184  drivers/net/wireless/libertas/main.c               |  182 +-
4185  drivers/net/wireless/libertas/mesh.c               |   79 +-
4186  drivers/net/wireless/libertas/mesh.h               |   27 +-
4187  drivers/net/wireless/libertas/rx.c                 |    1 +
4188  drivers/net/wireless/libertas/tx.c                 |    1 +
4189  drivers/net/wireless/mac80211_hwsim.c              |    6 +
4190  drivers/net/wireless/mwifiex/cfg80211.c            |  209 +-
4191  drivers/net/wireless/mwifiex/fw.h                  |   15 +-
4192  drivers/net/wireless/mwifiex/init.c                |   21 -
4193  drivers/net/wireless/mwifiex/ioctl.h               |    5 +-
4194  drivers/net/wireless/mwifiex/join.c                |   32 -
4195  drivers/net/wireless/mwifiex/main.c                |    6 +-
4196  drivers/net/wireless/mwifiex/main.h                |   55 +-
4197  drivers/net/wireless/mwifiex/scan.c                | 1578 +----
4198  drivers/net/wireless/mwifiex/sta_event.c           |    9 +-
4199  drivers/net/wireless/mwifiex/sta_ioctl.c           |  230 +-
4200  drivers/net/wireless/mwl8k.c                       |    3 -
4201  drivers/net/wireless/orinoco/main.c                |    2 +-
4202  drivers/net/wireless/orinoco/orinoco_usb.c         |    2 +-
4203  drivers/net/wireless/orinoco/wext.c                |    1 +
4204  drivers/net/wireless/p54/eeprom.c                  |   26 +-
4205  drivers/net/wireless/p54/fwio.c                    |    2 +
4206  drivers/net/wireless/p54/main.c                    |  113 +-
4207  drivers/net/wireless/p54/p54.h                     |   18 +
4208  drivers/net/wireless/p54/txrx.c                    |   66 +
4209  drivers/net/wireless/ray_cs.c                      |    2 +-
4210  drivers/net/wireless/rndis_wlan.c                  |    4 +-
4211  drivers/net/wireless/rt2x00/rt2400pci.c            |   39 +-
4212  drivers/net/wireless/rt2x00/rt2500pci.c            |   39 +-
4213  drivers/net/wireless/rt2x00/rt2800pci.c            |   46 +-
4214  drivers/net/wireless/rt2x00/rt2x00dev.c            |    1 -
4215  drivers/net/wireless/rt2x00/rt61pci.c              |   34 +-
4216  drivers/net/wireless/rtlwifi/base.c                |  161 +
4217  drivers/net/wireless/rtlwifi/base.h                |    2 +
4218  drivers/net/wireless/rtlwifi/debug.c               |    6 +-
4219  drivers/net/wireless/rtlwifi/pci.c                 |   37 +-
4220  drivers/net/wireless/rtlwifi/pci.h                 |   26 -
4221  drivers/net/wireless/rtlwifi/rtl8192ce/def.h       |  139 -
4222  drivers/net/wireless/rtlwifi/rtl8192ce/sw.c        |   30 +-
4223  drivers/net/wireless/rtlwifi/rtl8192ce/trx.c       |  116 +-
4224  drivers/net/wireless/rtlwifi/rtl8192ce/trx.h       |    8 +-
4225  drivers/net/wireless/rtlwifi/rtl8192cu/mac.c       |    4 +-
4226  drivers/net/wireless/rtlwifi/rtl8192cu/mac.h       |    8 +-
4227  drivers/net/wireless/rtlwifi/rtl8192cu/rf.c        |    2 +-
4228  drivers/net/wireless/rtlwifi/rtl8192cu/sw.c        |   28 +-
4229  drivers/net/wireless/rtlwifi/rtl8192cu/trx.c       |   23 +-
4230  drivers/net/wireless/rtlwifi/rtl8192de/def.h       |   35 -
4231  drivers/net/wireless/rtlwifi/rtl8192de/sw.c        |   30 +-
4232  drivers/net/wireless/rtlwifi/rtl8192de/trx.c       |  121 +-
4233  drivers/net/wireless/rtlwifi/rtl8192de/trx.h       |    8 +-
4234  drivers/net/wireless/rtlwifi/rtl8192se/def.h       |   39 +-
4235  drivers/net/wireless/rtlwifi/rtl8192se/sw.c        |   30 +-
4236  drivers/net/wireless/rtlwifi/rtl8192se/trx.c       |  124 +-
4237  drivers/net/wireless/rtlwifi/wifi.h                |   35 +
4238  drivers/net/wireless/wl1251/cmd.h                  |    2 +-
4239  drivers/net/wireless/wl1251/wl12xx_80211.h         |    2 +-
4240  drivers/net/wireless/wl12xx/cmd.h                  |    4 +-
4241  drivers/net/wireless/wl12xx/main.c                 |    2 +-
4242  drivers/net/wireless/wl12xx/scan.h                 |    6 +-
4243  drivers/net/wireless/wl12xx/wl12xx.h               |    4 +-
4244  drivers/net/wireless/wl12xx/wl12xx_80211.h         |    2 +-
4245  drivers/net/wireless/zd1201.c                      |    2 +-
4246  drivers/nfc/pn533.c                                |   17 +-
4247  drivers/s390/cio/qdio.h                            |   38 +-
4248  drivers/s390/cio/qdio_debug.c                      |    3 +
4249  drivers/s390/cio/qdio_main.c                       |  208 +-
4250  drivers/s390/cio/qdio_setup.c                      |   83 +-
4251  drivers/s390/cio/qdio_thinint.c                    |   88 +-
4252  drivers/s390/net/lcs.c                             |    2 +-
4253  drivers/s390/net/qeth_core.h                       |   50 +-
4254  drivers/s390/net/qeth_core_main.c                  |  777 ++-
4255  drivers/s390/net/qeth_l2_main.c                    |    4 +-
4256  drivers/s390/net/qeth_l3.h                         |    4 +
4257  drivers/s390/net/qeth_l3_main.c                    |   92 +-
4258  drivers/s390/net/qeth_l3_sys.c                     |  110 +-
4259  drivers/scsi/bnx2fc/Kconfig                        |    3 +-
4260  drivers/scsi/bnx2fc/bnx2fc.h                       |    4 +-
4261  drivers/scsi/bnx2fc/bnx2fc_fcoe.c                  |    2 +-
4262  drivers/scsi/bnx2i/Kconfig                         |    3 +-
4263  drivers/scsi/bnx2i/bnx2i.h                         |    2 +-
4264  drivers/scsi/cxgbi/cxgb3i/Kbuild                   |    2 +-
4265  drivers/scsi/cxgbi/cxgb3i/Kconfig                  |    3 +-
4266  drivers/scsi/cxgbi/cxgb4i/Kbuild                   |    2 +-
4267  drivers/scsi/cxgbi/cxgb4i/Kconfig                  |    3 +-
4268  drivers/scsi/fcoe/fcoe.c                           |    2 +-
4269  drivers/scsi/fcoe/fcoe_transport.c                 |    5 +-
4270  drivers/ssb/main.c                                 |   24 +-
4271  drivers/staging/Kconfig                            |    2 -
4272  drivers/staging/Makefile                           |    1 -
4273  drivers/staging/ath6kl/Kconfig                     |  158 -
4274  drivers/staging/ath6kl/Makefile                    |  122 -
4275  drivers/staging/ath6kl/TODO                        |   25 -
4276  drivers/staging/ath6kl/bmi/include/bmi_internal.h  |   54 -
4277  drivers/staging/ath6kl/bmi/src/bmi.c               | 1010 ---
4278  .../staging/ath6kl/hif/common/hif_sdio_common.h    |   87 -
4279  .../hif/sdio/linux_sdio/include/hif_internal.h     |  131 -
4280  .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c   | 1273 ----
4281  .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c   |  393 --
4282  drivers/staging/ath6kl/htc2/AR6000/ar6k.c          | 1479 -----
4283  drivers/staging/ath6kl/htc2/AR6000/ar6k.h          |  401 --
4284  drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c   |  783 ---
4285  drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c    |  755 ---
4286  .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c        | 1284 ----
4287  drivers/staging/ath6kl/htc2/htc.c                  |  575 --
4288  drivers/staging/ath6kl/htc2/htc_debug.h            |   38 -
4289  drivers/staging/ath6kl/htc2/htc_internal.h         |  211 -
4290  drivers/staging/ath6kl/htc2/htc_recv.c             | 1572 -----
4291  drivers/staging/ath6kl/htc2/htc_send.c             | 1018 ---
4292  drivers/staging/ath6kl/htc2/htc_services.c         |  450 --
4293  drivers/staging/ath6kl/include/a_config.h          |   31 -
4294  drivers/staging/ath6kl/include/a_debug.h           |  195 -
4295  drivers/staging/ath6kl/include/a_drv.h             |   32 -
4296  drivers/staging/ath6kl/include/a_drv_api.h         |  204 -
4297  drivers/staging/ath6kl/include/a_osapi.h           |   32 -
4298  drivers/staging/ath6kl/include/aggr_recv_api.h     |  140 -
4299  drivers/staging/ath6kl/include/ar3kconfig.h        |   65 -
4300  drivers/staging/ath6kl/include/ar6000_api.h        |   32 -
4301  drivers/staging/ath6kl/include/ar6000_diag.h       |   48 -
4302  drivers/staging/ath6kl/include/ar6kap_common.h     |   44 -
4303  drivers/staging/ath6kl/include/athbtfilter.h       |  135 -
4304  drivers/staging/ath6kl/include/bmi.h               |  134 -
4305  .../ath6kl/include/common/AR6002/AR6K_version.h    |   52 -
4306  .../staging/ath6kl/include/common/AR6002/addrs.h   |   90 -
4307  .../common/AR6002/hw4.0/hw/apb_athr_wlan_map.h     |   40 -
4308  .../include/common/AR6002/hw4.0/hw/apb_map.h       |   40 -
4309  .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h |   24 -
4310  .../include/common/AR6002/hw4.0/hw/mbox_reg.h      |  552 --
4311  .../common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h    |  471 --
4312  .../include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h |  589 --
4313  .../include/common/AR6002/hw4.0/hw/rtc_reg.h       |  187 -
4314  .../include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h  |  162 -
4315  .../include/common/AR6002/hw4.0/hw/uart_reg.h      |   40 -
4316  drivers/staging/ath6kl/include/common/athdefs.h    |   75 -
4317  drivers/staging/ath6kl/include/common/bmi_msg.h    |  233 -
4318  drivers/staging/ath6kl/include/common/cnxmgmt.h    |   36 -
4319  drivers/staging/ath6kl/include/common/dbglog.h     |  126 -
4320  drivers/staging/ath6kl/include/common/dbglog_id.h  |  558 --
4321  drivers/staging/ath6kl/include/common/discovery.h  |   75 -
4322  .../staging/ath6kl/include/common/epping_test.h    |  111 -
4323  drivers/staging/ath6kl/include/common/gmboxif.h    |   70 -
4324  drivers/staging/ath6kl/include/common/gpio_reg.h   |    9 -
4325  drivers/staging/ath6kl/include/common/htc.h        |  227 -
4326  .../staging/ath6kl/include/common/htc_services.h   |   52 -
4327  drivers/staging/ath6kl/include/common/pkt_log.h    |   45 -
4328  drivers/staging/ath6kl/include/common/roaming.h    |   41 -
4329  drivers/staging/ath6kl/include/common/targaddrs.h  |  395 --
4330  drivers/staging/ath6kl/include/common/testcmd.h    |  185 -
4331  drivers/staging/ath6kl/include/common/tlpm.h       |   38 -
4332  drivers/staging/ath6kl/include/common/wlan_defs.h  |   79 -
4333  drivers/staging/ath6kl/include/common/wmi.h        | 3220 ----------
4334  drivers/staging/ath6kl/include/common/wmix.h       |  271 -
4335  drivers/staging/ath6kl/include/common_drv.h        |  104 -
4336  drivers/staging/ath6kl/include/dbglog_api.h        |   52 -
4337  drivers/staging/ath6kl/include/dl_list.h           |  153 -
4338  drivers/staging/ath6kl/include/dset_api.h          |   65 -
4339  drivers/staging/ath6kl/include/hci_transport_api.h |  259 -
4340  drivers/staging/ath6kl/include/hif.h               |  456 --
4341  drivers/staging/ath6kl/include/host_version.h      |   52 -
4342  drivers/staging/ath6kl/include/htc_api.h           |  575 --
4343  drivers/staging/ath6kl/include/htc_packet.h        |  227 -
4344  drivers/staging/ath6kl/include/wlan_api.h          |  128 -
4345  drivers/staging/ath6kl/include/wmi_api.h           |  441 --
4346  drivers/staging/ath6kl/miscdrv/ar3kconfig.c        |  565 --
4347  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c   |  572 --
4348  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h   |   75 -
4349  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c   |  969 ---
4350  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h   |  113 -
4351  drivers/staging/ath6kl/miscdrv/common_drv.c        |  910 ---
4352  drivers/staging/ath6kl/miscdrv/credit_dist.c       |  417 --
4353  drivers/staging/ath6kl/miscdrv/miscdrv.h           |   42 -
4354  drivers/staging/ath6kl/os/linux/ar6000_drv.c       | 6267 -------------------
4355  drivers/staging/ath6kl/os/linux/ar6000_pm.c        |  626 --
4356  drivers/staging/ath6kl/os/linux/ar6000_raw_if.c    |  455 --
4357  drivers/staging/ath6kl/os/linux/cfg80211.c         | 1892 ------
4358  .../staging/ath6kl/os/linux/export_hci_transport.c |  124 -
4359  drivers/staging/ath6kl/os/linux/hci_bridge.c       | 1141 ----
4360  .../staging/ath6kl/os/linux/include/ar6000_drv.h   |  776 ---
4361  drivers/staging/ath6kl/os/linux/include/ar6k_pal.h |   36 -
4362  .../ath6kl/os/linux/include/ar6xapi_linux.h        |  190 -
4363  .../staging/ath6kl/os/linux/include/athdrv_linux.h | 1217 ----
4364  drivers/staging/ath6kl/os/linux/include/cfg80211.h |   61 -
4365  .../staging/ath6kl/os/linux/include/config_linux.h |   51 -
4366  .../staging/ath6kl/os/linux/include/debug_linux.h  |   50 -
4367  .../ath6kl/os/linux/include/export_hci_transport.h |   76 -
4368  .../ath6kl/os/linux/include/ieee80211_ioctl.h      |  177 -
4369  .../staging/ath6kl/os/linux/include/osapi_linux.h  |  339 -
4370  .../staging/ath6kl/os/linux/include/wlan_config.h  |  108 -
4371  .../ath6kl/os/linux/include/wmi_filter_linux.h     |  300 -
4372  drivers/staging/ath6kl/os/linux/netbuf.c           |  231 -
4373  drivers/staging/ath6kl/reorder/aggr_rx_internal.h  |  117 -
4374  drivers/staging/ath6kl/reorder/rcv_aggr.c          |  661 --
4375  drivers/staging/ath6kl/wlan/include/ieee80211.h    |  397 --
4376  .../staging/ath6kl/wlan/include/ieee80211_node.h   |   93 -
4377  drivers/staging/ath6kl/wlan/src/wlan_node.c        |  636 --
4378  drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c |  199 -
4379  drivers/staging/ath6kl/wlan/src/wlan_utils.c       |   58 -
4380  drivers/staging/ath6kl/wmi/wmi.c                   | 6444 --------------------
4381  drivers/staging/ath6kl/wmi/wmi_host.h              |  102 -
4382  drivers/staging/brcm80211/brcmfmac/dhd_linux.c     |    2 +-
4383  drivers/staging/et131x/et131x_netdev.c             |    2 +-
4384  drivers/staging/hv/netvsc_drv.c                    |    2 +-
4385  drivers/staging/octeon/ethernet.c                  |   12 +-
4386  drivers/staging/rtl8187se/r8180_core.c             |    2 +-
4387  drivers/staging/rtl8192e/r8192E_core.c             |    2 +-
4388  drivers/staging/rtl8192u/r8192U_core.c             |    2 +-
4389  drivers/staging/slicoss/slicoss.c                  |    2 +-
4390  drivers/staging/vt6655/device_main.c               |    2 +-
4391  drivers/staging/vt6656/main_usb.c                  |    2 +-
4392  drivers/staging/wlags49_h2/wl_netdev.c             |    2 +-
4393  drivers/staging/wlan-ng/p80211netdev.c             |    2 +-
4394  drivers/watchdog/bcm47xx_wdt.c                     |   27 +-
4395  include/linux/atalk.h                              |    3 +-
4396  include/linux/ax25.h                               |    2 +-
4397  include/linux/bcma/bcma.h                          |    9 +-
4398  include/linux/bcma/bcma_driver_chipcommon.h        |   85 +
4399  include/linux/bcma/bcma_driver_mips.h              |   51 +
4400  include/linux/bcma/bcma_soc.h                      |   16 +
4401  include/linux/caif/caif_socket.h                   |    7 +-
4402  include/linux/can.h                                |    2 +-
4403  include/linux/can/bcm.h                            |    1 +
4404  include/linux/ethtool.h                            |  144 +-
4405  include/linux/ieee80211.h                          |   59 +-
4406  include/linux/if.h                                 |    1 +
4407  include/linux/if_ether.h                           |    1 +
4408  include/linux/if_packet.h                          |  119 +
4409  include/linux/if_pppol2tp.h                        |    2 +-
4410  include/linux/if_pppox.h                           |    9 +-
4411  include/linux/in.h                                 |    2 +-
4412  include/linux/ipx.h                                |    2 +-
4413  include/linux/irda.h                               |    9 +-
4414  include/linux/l2tp.h                               |    7 +-
4415  include/linux/llc.h                                |   10 +-
4416  include/linux/netdevice.h                          |   10 +-
4417  include/linux/netfilter/xt_connlimit.h             |    1 +
4418  include/linux/netfilter/xt_conntrack.h             |    1 +
4419  include/linux/netfilter/xt_iprange.h               |    1 +
4420  include/linux/netfilter_arp/arp_tables.h           |   14 +-
4421  include/linux/netfilter_decnet.h                   |    3 +
4422  include/linux/netfilter_ipv4.h                     |    3 +
4423  include/linux/netfilter_ipv4/ip_tables.h           |   20 +-
4424  include/linux/netfilter_ipv6.h                     |    3 +
4425  include/linux/netfilter_ipv6/ip6_tables.h          |   22 +-
4426  include/linux/netlink.h                            |    2 +-
4427  include/linux/netrom.h                             |    2 +
4428  include/linux/nfc.h                                |    2 +
4429  include/linux/nl80211.h                            |   93 +-
4430  include/linux/phonet.h                             |    5 +-
4431  include/linux/rose.h                               |    7 +-
4432  include/linux/skbuff.h                             |  181 +-
4433  include/linux/ssb/ssb_regs.h                       |   40 +
4434  {drivers/net => include/linux}/sungem_phy.h        |    2 +-
4435  include/linux/tcp.h                                |    4 +
4436  include/linux/tipc_config.h                        |    4 +
4437  include/linux/un.h                                 |    4 +-
4438  include/linux/x25.h                                |    3 +-
4439  include/net/addrconf.h                             |    2 +-
4440  include/net/cfg80211-wext.h                        |   55 +
4441  include/net/cfg80211.h                             |  287 +-
4442  include/net/dst.h                                  |    9 +-
4443  include/net/if_inet6.h                             |    1 +
4444  include/net/iucv/af_iucv.h                         |   52 +
4445  include/net/iucv/iucv.h                            |   36 +-
4446  include/net/lib80211.h                             |    3 -
4447  include/net/mac80211.h                             |   13 +-
4448  include/net/nfc.h                                  |    7 +-
4449  include/net/regulatory.h                           |   16 +-
4450  include/net/scm.h                                  |   22 +-
4451  include/net/sctp/structs.h                         |    1 +
4452  include/net/sock.h                                 |   15 +-
4453  net/802/garp.c                                     |    4 +-
4454  net/802/stp.c                                      |    4 +-
4455  net/8021q/vlan.c                                   |    2 +-
4456  net/8021q/vlan_dev.c                               |    1 -
4457  net/atm/lec.c                                      |    2 +-
4458  net/batman-adv/aggregation.h                       |    3 +-
4459  net/batman-adv/bat_sysfs.c                         |    2 +
4460  net/batman-adv/bitarray.c                          |    6 +-
4461  net/batman-adv/gateway_client.c                    |   10 +-
4462  net/batman-adv/hard-interface.c                    |   34 +-
4463  net/batman-adv/hard-interface.h                    |    1 +
4464  net/batman-adv/hash.h                              |   25 +-
4465  net/batman-adv/main.c                              |    2 +-
4466  net/batman-adv/main.h                              |    6 +-
4467  net/batman-adv/originator.c                        |    2 +-
4468  net/batman-adv/packet.h                            |    1 +
4469  net/batman-adv/routing.c                           |   77 +-
4470  net/batman-adv/send.c                              |   10 +-
4471  net/batman-adv/soft-interface.c                    |   13 +-
4472  net/batman-adv/translation-table.c                 |  199 +-
4473  net/batman-adv/translation-table.h                 |   21 +-
4474  net/batman-adv/types.h                             |    5 +-
4475  net/batman-adv/unicast.c                           |    6 +-
4476  net/batman-adv/unicast.h                           |    2 +-
4477  net/batman-adv/vis.c                               |    6 +-
4478  net/bluetooth/bnep/netdev.c                        |    2 +-
4479  net/bridge/br_device.c                             |    2 +-
4480  net/bridge/netfilter/ebtable_broute.c              |    4 +-
4481  net/caif/cfcnfg.c                                  |   15 +-
4482  net/caif/cfctrl.c                                  |   23 +-
4483  net/caif/cfdbgl.c                                  |    7 +-
4484  net/caif/cfdgml.c                                  |    7 +-
4485  net/caif/cffrml.c                                  |    7 +-
4486  net/caif/cfmuxl.c                                  |    6 +-
4487  net/caif/cfrfml.c                                  |    7 +-
4488  net/caif/cfserl.c                                  |    7 +-
4489  net/caif/cfsrvl.c                                  |    8 +-
4490  net/caif/cfutill.c                                 |    7 +-
4491  net/caif/cfveil.c                                  |    7 +-
4492  net/caif/cfvidl.c                                  |    7 +-
4493  net/can/af_can.c                                   |    4 +-
4494  net/core/datagram.c                                |    8 +-
4495  net/core/dev.c                                     |  120 +-
4496  net/core/dev_addr_lists.c                          |    4 +-
4497  net/core/dst.c                                     |   15 +-
4498  net/core/fib_rules.c                               |    4 +-
4499  net/core/filter.c                                  |    2 +-
4500  net/core/kmap_skb.h                                |    2 +-
4501  net/core/neighbour.c                               |   40 +-
4502  net/core/net-sysfs.c                               |    8 +-
4503  net/core/netpoll.c                                 |    4 +-
4504  net/core/pktgen.c                                  |    3 +-
4505  net/core/rtnetlink.c                               |    1 -
4506  net/core/skbuff.c                                  |   31 +-
4507  net/core/sock.c                                    |   16 +-
4508  net/core/user_dma.c                                |    2 +-
4509  net/dccp/ccids/ccid2.c                             |   84 +-
4510  net/dccp/ccids/ccid2.h                             |    6 +
4511  net/dccp/dccp.h                                    |    1 +
4512  net/dccp/feat.c                                    |  202 +-
4513  net/dccp/feat.h                                    |    1 +
4514  net/dccp/proto.c                                   |    1 -
4515  net/decnet/dn_dev.c                                |    6 +-
4516  net/dsa/slave.c                                    |    3 -
4517  net/ieee802154/6lowpan.c                           |  885 +++
4518  net/ieee802154/6lowpan.h                           |  212 +
4519  net/ieee802154/Kconfig                             |    6 +
4520  net/ieee802154/Makefile                            |    8 +-
4521  net/ipv4/devinet.c                                 |    6 +-
4522  net/ipv4/fib_trie.c                                |   12 +-
4523  net/ipv4/gre.c                                     |    4 +-
4524  net/ipv4/igmp.c                                    |   12 +-
4525  net/ipv4/inet_lro.c                                |    2 +-
4526  net/ipv4/ip_output.c                               |    7 +-
4527  net/ipv4/ipip.c                                    |   10 +-
4528  net/ipv4/ipmr.c                                    |    8 +-
4529  net/ipv4/netfilter/nf_nat_amanda.c                 |    4 +-
4530  net/ipv4/netfilter/nf_nat_core.c                   |   24 +-
4531  net/ipv4/netfilter/nf_nat_ftp.c                    |    4 +-
4532  net/ipv4/netfilter/nf_nat_h323.c                   |   36 +-
4533  net/ipv4/netfilter/nf_nat_irc.c                    |    4 +-
4534  net/ipv4/netfilter/nf_nat_pptp.c                   |   16 +-
4535  net/ipv4/netfilter/nf_nat_sip.c                    |   28 +-
4536  net/ipv4/netfilter/nf_nat_snmp_basic.c             |    4 +-
4537  net/ipv4/netfilter/nf_nat_standalone.c             |    6 +-
4538  net/ipv4/netfilter/nf_nat_tftp.c                   |    4 +-
4539  net/ipv4/route.c                                   |    6 +-
4540  net/ipv4/tcp.c                                     |    3 +-
4541  net/ipv4/tcp_input.c                               |   58 +-
4542  net/ipv4/tcp_ipv4.c                                |    6 +-
4543  net/ipv4/tcp_output.c                              |    9 +-
4544  net/ipv4/udp.c                                     |   11 +-
4545  net/ipv6/addrconf.c                                |   73 +-
4546  net/ipv6/exthdrs.c                                 |    7 +-
4547  net/ipv6/icmp.c                                    |   25 +-
4548  net/ipv6/inet6_connection_sock.c                   |    9 +-
4549  net/ipv6/ip6_output.c                              |    7 +-
4550  net/ipv6/ip6_tunnel.c                              |   37 +-
4551  net/ipv6/ndisc.c                                   |   31 +-
4552  net/ipv6/raw.c                                     |    8 +-
4553  net/ipv6/sit.c                                     |   12 +-
4554  net/ipv6/tcp_ipv6.c                                |    6 +-
4555  net/ipv6/udp.c                                     |    4 +-
4556  net/irda/irlan/irlan_eth.c                         |    2 +-
4557  net/iucv/Kconfig                                   |   14 +-
4558  net/iucv/af_iucv.c                                 |  868 +++-
4559  net/iucv/iucv.c                                    |   23 +
4560  net/mac80211/Kconfig                               |   13 +
4561  net/mac80211/agg-rx.c                              |    4 +-
4562  net/mac80211/agg-tx.c                              |   20 +-
4563  net/mac80211/cfg.c                                 |   66 +-
4564  net/mac80211/debugfs_netdev.c                      |    8 +-
4565  net/mac80211/driver-ops.h                          |   31 -
4566  net/mac80211/ibss.c                                |    6 +-
4567  net/mac80211/ieee80211_i.h                         |   65 +-
4568  net/mac80211/iface.c                               |    6 +-
4569  net/mac80211/main.c                                |    1 +
4570  net/mac80211/mesh.c                                |  259 +-
4571  net/mac80211/mesh.h                                |   36 +-
4572  net/mac80211/mesh_hwmp.c                           |  137 +-
4573  net/mac80211/mesh_pathtbl.c                        |  309 +-
4574  net/mac80211/mesh_plink.c                          |  241 +-
4575  net/mac80211/mlme.c                                |   59 +-
4576  net/mac80211/rc80211_minstrel_ht.c                 |    8 +-
4577  net/mac80211/rx.c                                  |   48 +-
4578  net/mac80211/sta_info.c                            |  337 +-
4579  net/mac80211/sta_info.h                            |   30 +-
4580  net/mac80211/status.c                              |   21 +-
4581  net/mac80211/tx.c                                  |   34 +-
4582  net/mac80211/util.c                                |  168 +-
4583  net/netfilter/core.c                               |    4 +-
4584  net/netfilter/nf_conntrack_core.c                  |   12 +-
4585  net/netfilter/nf_conntrack_ecache.c                |    8 +-
4586  net/netfilter/nf_conntrack_extend.c                |    4 +-
4587  net/netfilter/nf_conntrack_helper.c                |    6 +-
4588  net/netfilter/nf_conntrack_netlink.c               |    6 +-
4589  net/netfilter/nf_log.c                             |   10 +-
4590  net/netfilter/nf_queue.c                           |    6 +-
4591  net/netfilter/nfnetlink.c                          |    6 +-
4592  net/netlabel/netlabel_domainhash.c                 |    6 +-
4593  net/netlabel/netlabel_unlabeled.c                  |    6 +-
4594  net/netlink/af_netlink.c                           |    2 +-
4595  net/nfc/core.c                                     |    6 +-
4596  net/nfc/rawsock.c                                  |   13 +-
4597  net/packet/af_packet.c                             |  944 +++-
4598  net/phonet/af_phonet.c                             |    4 +-
4599  net/phonet/pn_dev.c                                |    6 +-
4600  net/phonet/socket.c                                |    6 +-
4601  net/sched/sch_sfb.c                                |   13 +-
4602  net/sctp/associola.c                               |    1 +
4603  net/sctp/outqueue.c                                |    4 +
4604  net/sctp/sm_make_chunk.c                           |    1 +
4605  net/sctp/sm_statefuns.c                            |    5 +
4606  net/socket.c                                       |    4 +-
4607  net/sunrpc/auth_gss/auth_gss.c                     |    4 +-
4608  net/unix/af_unix.c                                 |   45 +-
4609  net/wireless/lib80211.c                            |   15 +-
4610  net/wireless/mesh.c                                |    3 +
4611  net/wireless/nl80211.c                             |  128 +-
4612  net/wireless/reg.c                                 |   14 +-
4613  net/wireless/scan.c                                |    1 +
4614  net/wireless/util.c                                |  168 +
4615  net/wireless/wext-compat.c                         |  137 +-
4616  net/wireless/wext-compat.h                         |    8 +
4617  net/wireless/wext-sme.c                            |    3 +-
4618  net/xfrm/xfrm_ipcomp.c                             |   11 +-
4619  net/xfrm/xfrm_user.c                               |    4 +-
4620  1680 files changed, 52661 insertions(+), 77143 deletions(-)
4621  create mode 100644 Documentation/devicetree/bindings/net/smsc911x.txt
4622  create mode 100644 arch/mips/bcm47xx/Kconfig
4623  create mode 100644 drivers/bcma/driver_mips.c
4624  create mode 100644 drivers/bcma/host_soc.c
4625  rename drivers/net/{pcmcia => arcnet}/com20020_cs.c (100%)
4626  delete mode 100644 drivers/net/arm/Kconfig
4627  delete mode 100644 drivers/net/arm/Makefile
4628  delete mode 100644 drivers/net/benet/Kconfig
4629  delete mode 100644 drivers/net/bna/bfi_ctreg.h
4630  delete mode 100644 drivers/net/bna/bfi_ll.h
4631  delete mode 100644 drivers/net/bna/bna_ctrl.c
4632  delete mode 100644 drivers/net/bna/bna_hw.h
4633  delete mode 100644 drivers/net/bna/bna_txrx.c
4634  rename drivers/net/{ => ethernet/3com}/3c501.c (99%)
4635  rename drivers/net/{ => ethernet/3com}/3c501.h (100%)
4636  rename drivers/net/{ => ethernet/3com}/3c509.c (99%)
4637  rename drivers/net/{ => ethernet/3com}/3c515.c (99%)
4638  rename drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c (99%)
4639  rename drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c (99%)
4640  rename drivers/net/{ => ethernet/3com}/3c59x.c (99%)
4641  create mode 100644 drivers/net/ethernet/3com/Kconfig
4642  create mode 100644 drivers/net/ethernet/3com/Makefile
4643  rename drivers/net/{ => ethernet/3com}/typhoon.c (99%)
4644  rename drivers/net/{ => ethernet/3com}/typhoon.h (100%)
4645  rename drivers/net/{ => ethernet/8390}/3c503.c (99%)
4646  rename drivers/net/{ => ethernet/8390}/3c503.h (100%)
4647  rename drivers/net/{ => ethernet/8390}/8390.c (97%)
4648  rename drivers/net/{ => ethernet/8390}/8390.h (100%)
4649  rename drivers/net/{ => ethernet/8390}/8390p.c (97%)
4650  create mode 100644 drivers/net/ethernet/8390/Kconfig
4651  create mode 100644 drivers/net/ethernet/8390/Makefile
4652  rename drivers/net/{ => ethernet/8390}/ac3200.c (99%)
4653  rename drivers/net/{ => ethernet/8390}/apne.c (100%)
4654  rename drivers/net/{ => ethernet/8390}/ax88796.c (99%)
4655  rename drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c (99%)
4656  rename drivers/net/{ => ethernet/8390}/e2100.c (99%)
4657  rename drivers/net/{ => ethernet/8390}/es3210.c (100%)
4658  rename drivers/net/{arm => ethernet/8390}/etherh.c (99%)
4659  rename drivers/net/{ => ethernet/8390}/hp-plus.c (99%)
4660  rename drivers/net/{ => ethernet/8390}/hp.c (100%)
4661  rename drivers/net/{ => ethernet/8390}/hydra.c (99%)
4662  rename drivers/net/{ => ethernet/8390}/lib8390.c (100%)
4663  rename drivers/net/{ => ethernet/8390}/lne390.c (100%)
4664  rename drivers/net/{ => ethernet/8390}/mac8390.c (99%)
4665  rename drivers/net/{ => ethernet/8390}/ne-h8300.c (99%)
4666  rename drivers/net/{ => ethernet/8390}/ne.c (100%)
4667  rename drivers/net/{ => ethernet/8390}/ne2.c (100%)
4668  rename drivers/net/{ => ethernet/8390}/ne2k-pci.c (99%)
4669  rename drivers/net/{ => ethernet/8390}/ne3210.c (100%)
4670  rename drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c (99%)
4671  rename drivers/net/{ => ethernet/8390}/smc-mca.c (99%)
4672  rename drivers/net/{ => ethernet/8390}/smc-ultra.c (99%)
4673  rename drivers/net/{ => ethernet/8390}/smc-ultra32.c (99%)
4674  rename drivers/net/{ => ethernet/8390}/stnic.c (100%)
4675  rename drivers/net/{ => ethernet/8390}/wd.c (99%)
4676  rename drivers/net/{ => ethernet/8390}/zorro8390.c (99%)
4677  create mode 100644 drivers/net/ethernet/Kconfig
4678  create mode 100644 drivers/net/ethernet/Makefile
4679  create mode 100644 drivers/net/ethernet/adaptec/Kconfig
4680  create mode 100644 drivers/net/ethernet/adaptec/Makefile
4681  rename drivers/net/{ => ethernet/adaptec}/starfire.c (99%)
4682  create mode 100644 drivers/net/ethernet/adi/Kconfig
4683  create mode 100644 drivers/net/ethernet/adi/Makefile
4684  rename drivers/net/{ => ethernet/adi}/bfin_mac.c (99%)
4685  rename drivers/net/{ => ethernet/adi}/bfin_mac.h (100%)
4686  create mode 100644 drivers/net/ethernet/aeroflex/Kconfig
4687  create mode 100644 drivers/net/ethernet/aeroflex/Makefile
4688  rename drivers/net/{ => ethernet/aeroflex}/greth.c (99%)
4689  rename drivers/net/{ => ethernet/aeroflex}/greth.h (100%)
4690  create mode 100644 drivers/net/ethernet/alteon/Kconfig
4691  create mode 100644 drivers/net/ethernet/alteon/Makefile
4692  rename drivers/net/{ => ethernet/alteon}/acenic.c (99%)
4693  rename drivers/net/{ => ethernet/alteon}/acenic.h (100%)
4694  rename drivers/net/{ => ethernet/amd}/7990.c (100%)
4695  rename drivers/net/{ => ethernet/amd}/7990.h (100%)
4696  create mode 100644 drivers/net/ethernet/amd/Kconfig
4697  create mode 100644 drivers/net/ethernet/amd/Makefile
4698  rename drivers/net/{ => ethernet/amd}/a2065.c (99%)
4699  rename drivers/net/{ => ethernet/amd}/a2065.h (100%)
4700  rename drivers/net/{arm => ethernet/amd}/am79c961a.c (99%)
4701  rename drivers/net/{arm => ethernet/amd}/am79c961a.h (100%)
4702  rename drivers/net/{ => ethernet/amd}/amd8111e.c (99%)
4703  rename drivers/net/{ => ethernet/amd}/amd8111e.h (100%)
4704  rename drivers/net/{ => ethernet/amd}/ariadne.c (99%)
4705  rename drivers/net/{ => ethernet/amd}/ariadne.h (100%)
4706  rename drivers/net/{ => ethernet/amd}/atarilance.c (99%)
4707  rename drivers/net/{ => ethernet/amd}/au1000_eth.c (99%)
4708  rename drivers/net/{ => ethernet/amd}/au1000_eth.h (100%)
4709  rename drivers/net/{ => ethernet/amd}/declance.c (99%)
4710  rename drivers/net/{ => ethernet/amd}/depca.c (99%)
4711  rename drivers/net/{ => ethernet/amd}/depca.h (100%)
4712  rename drivers/net/{ => ethernet/amd}/hplance.c (99%)
4713  rename drivers/net/{ => ethernet/amd}/hplance.h (100%)
4714  rename drivers/net/{ => ethernet/amd}/lance.c (99%)
4715  rename drivers/net/{ => ethernet/amd}/mvme147.c (99%)
4716  rename drivers/net/{ => ethernet/amd}/ni65.c (99%)
4717  rename drivers/net/{ => ethernet/amd}/ni65.h (100%)
4718  rename drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c (99%)
4719  rename drivers/net/{ => ethernet/amd}/pcnet32.c (99%)
4720  rename drivers/net/{ => ethernet/amd}/sun3lance.c (99%)
4721  rename drivers/net/{ => ethernet/amd}/sunlance.c (99%)
4722  create mode 100644 drivers/net/ethernet/apple/Kconfig
4723  create mode 100644 drivers/net/ethernet/apple/Makefile
4724  rename drivers/net/{ => ethernet/apple}/bmac.c (99%)
4725  rename drivers/net/{ => ethernet/apple}/bmac.h (100%)
4726  rename drivers/net/{ => ethernet/apple}/cs89x0.c (99%)
4727  rename drivers/net/{ => ethernet/apple}/cs89x0.h (100%)
4728  rename drivers/net/{ => ethernet/apple}/mac89x0.c (99%)
4729  rename drivers/net/{ => ethernet/apple}/mace.c (99%)
4730  rename drivers/net/{ => ethernet/apple}/mace.h (100%)
4731  rename drivers/net/{ => ethernet/apple}/macmace.c (99%)
4732  create mode 100644 drivers/net/ethernet/atheros/Kconfig
4733  create mode 100644 drivers/net/ethernet/atheros/Makefile
4734  rename drivers/net/{ => ethernet/atheros}/atl1c/Makefile (100%)
4735  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h (100%)
4736  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_ethtool.c (100%)
4737  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.c (100%)
4738  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.h (100%)
4739  rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_main.c (99%)
4740  rename drivers/net/{ => ethernet/atheros}/atl1e/Makefile (100%)
4741  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h (100%)
4742  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_ethtool.c (100%)
4743  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.c (100%)
4744  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.h (100%)
4745  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_main.c (99%)
4746  rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_param.c (100%)
4747  rename drivers/net/{ => ethernet/atheros}/atlx/Makefile (100%)
4748  rename drivers/net/{ => ethernet/atheros}/atlx/atl1.c (99%)
4749  rename drivers/net/{ => ethernet/atheros}/atlx/atl1.h (100%)
4750  rename drivers/net/{ => ethernet/atheros}/atlx/atl2.c (99%)
4751  rename drivers/net/{ => ethernet/atheros}/atlx/atl2.h (100%)
4752  rename drivers/net/{ => ethernet/atheros}/atlx/atlx.c (100%)
4753  rename drivers/net/{ => ethernet/atheros}/atlx/atlx.h (100%)
4754  create mode 100644 drivers/net/ethernet/broadcom/Kconfig
4755  create mode 100644 drivers/net/ethernet/broadcom/Makefile
4756  rename drivers/net/{ => ethernet/broadcom}/b44.c (99%)
4757  rename drivers/net/{ => ethernet/broadcom}/b44.h (100%)
4758  rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c (99%)
4759  rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h (100%)
4760  rename drivers/net/{ => ethernet/broadcom}/bnx2.c (99%)
4761  rename drivers/net/{ => ethernet/broadcom}/bnx2.h (100%)
4762  rename drivers/net/{ => ethernet/broadcom}/bnx2_fw.h (100%)
4763  rename drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile (100%)
4764  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h (98%)
4765  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c (98%)
4766  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h (99%)
4767  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c (99%)
4768  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h (100%)
4769  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h (100%)
4770  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c (99%)
4771  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h (100%)
4772  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_file_hdr.h (100%)
4773  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h (99%)
4774  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h (100%)
4775  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h (100%)
4776  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c (99%)
4777  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h (100%)
4778  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c (99%)
4779  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h (100%)
4780  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c (98%)
4781  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h (100%)
4782  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c (98%)
4783  rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h (100%)
4784  rename drivers/net/{ => ethernet/broadcom}/cnic.c (99%)
4785  rename drivers/net/{ => ethernet/broadcom}/cnic.h (99%)
4786  rename drivers/net/{ => ethernet/broadcom}/cnic_defs.h (99%)
4787  rename drivers/net/{ => ethernet/broadcom}/cnic_if.h (100%)
4788  rename drivers/net/{ => ethernet/broadcom}/sb1250-mac.c (99%)
4789  rename drivers/net/{ => ethernet/broadcom}/tg3.c (98%)
4790  rename drivers/net/{ => ethernet/broadcom}/tg3.h (99%)
4791  create mode 100644 drivers/net/ethernet/brocade/Kconfig
4792  create mode 100644 drivers/net/ethernet/brocade/Makefile
4793  create mode 100644 drivers/net/ethernet/brocade/bna/Kconfig
4794  rename drivers/net/{ => ethernet/brocade}/bna/Makefile (52%)
4795  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c (98%)
4796  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h (100%)
4797  rename drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h (100%)
4798  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h (92%)
4799  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_cna.h (100%)
4800  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h (89%)
4801  rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_status.h (100%)
4802  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c (87%)
4803  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h (88%)
4804  rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c (76%)
4805  create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.c
4806  create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.h
4807  rename drivers/net/{ => ethernet/brocade}/bna/bfi.h (70%)
4808  rename drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h (100%)
4809  create mode 100644 drivers/net/ethernet/brocade/bna/bfi_enet.h
4810  create mode 100644 drivers/net/ethernet/brocade/bna/bfi_reg.h
4811  rename drivers/net/{ => ethernet/brocade}/bna/bna.h (67%)
4812  create mode 100644 drivers/net/ethernet/brocade/bna/bna_enet.c
4813  create mode 100644 drivers/net/ethernet/brocade/bna/bna_hw_defs.h
4814  create mode 100644 drivers/net/ethernet/brocade/bna/bna_tx_rx.c
4815  rename drivers/net/{ => ethernet/brocade}/bna/bna_types.h (58%)
4816  rename drivers/net/{ => ethernet/brocade}/bna/bnad.c (85%)
4817  rename drivers/net/{ => ethernet/brocade}/bna/bnad.h (89%)
4818  rename drivers/net/{ => ethernet/brocade}/bna/bnad_ethtool.c (67%)
4819  rename drivers/net/{ => ethernet/brocade}/bna/cna.h (68%)
4820  rename drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c (100%)
4821  create mode 100644 drivers/net/ethernet/cadence/Kconfig
4822  create mode 100644 drivers/net/ethernet/cadence/Makefile
4823  rename drivers/net/{arm => ethernet/cadence}/at91_ether.c (99%)
4824  rename drivers/net/{arm => ethernet/cadence}/at91_ether.h (100%)
4825  rename drivers/net/{ => ethernet/cadence}/macb.c (99%)
4826  rename drivers/net/{ => ethernet/cadence}/macb.h (100%)
4827  create mode 100644 drivers/net/ethernet/chelsio/Kconfig
4828  create mode 100644 drivers/net/ethernet/chelsio/Makefile
4829  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/Makefile (100%)
4830  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/common.h (100%)
4831  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cphy.h (100%)
4832  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h (100%)
4833  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c (99%)
4834  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/elmer0.h (100%)
4835  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.c (100%)
4836  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.h (100%)
4837  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h (100%)
4838  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/gmac.h (100%)
4839  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c (100%)
4840  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h (100%)
4841  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c (100%)
4842  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/my3126.c (100%)
4843  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/pm3393.c (100%)
4844  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/regs.h (100%)
4845  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.c (100%)
4846  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.h (100%)
4847  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/subr.c (100%)
4848  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/suni1x10gexp_regs.h (100%)
4849  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.c (100%)
4850  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.h (100%)
4851  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326.c (100%)
4852  rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326_reg.h (100%)
4853  rename drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile (100%)
4854  rename drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h (100%)
4855  rename drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c (100%)
4856  rename drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c (100%)
4857  rename drivers/net/{ => ethernet/chelsio}/cxgb3/common.h (100%)
4858  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h (100%)
4859  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h (100%)
4860  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h (100%)
4861  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c (99%)
4862  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c (100%)
4863  rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h (100%)
4864  rename drivers/net/{ => ethernet/chelsio}/cxgb3/firmware_exports.h (100%)
4865  rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c (100%)
4866  rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h (100%)
4867  rename drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c (100%)
4868  rename drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h (100%)
4869  rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c (100%)
4870  rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge_defs.h (100%)
4871  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h (100%)
4872  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c (100%)
4873  rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h (100%)
4874  rename drivers/net/{ => ethernet/chelsio}/cxgb3/version.h (100%)
4875  rename drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c (100%)
4876  rename drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c (100%)
4877  rename drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile (100%)
4878  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h (100%)
4879  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c (99%)
4880  rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h (100%)
4881  rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c (100%)
4882  rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h (100%)
4883  rename drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c (100%)
4884  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c (100%)
4885  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h (100%)
4886  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h (100%)
4887  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h (100%)
4888  rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h (100%)
4889  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/Makefile (100%)
4890  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/adapter.h (100%)
4891  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c (99%)
4892  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c (100%)
4893  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h (100%)
4894  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h (100%)
4895  rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c (100%)
4896  create mode 100644 drivers/net/ethernet/cirrus/Kconfig
4897  create mode 100644 drivers/net/ethernet/cirrus/Makefile
4898  rename drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c (100%)
4899  create mode 100644 drivers/net/ethernet/cisco/Kconfig
4900  create mode 100644 drivers/net/ethernet/cisco/Makefile
4901  create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig
4902  rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%)
4903  rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%)
4904  rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%)
4905  rename drivers/net/{ => ethernet/cisco}/enic/enic.h (100%)
4906  rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%)
4907  rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (100%)
4908  rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (99%)
4909  rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (100%)
4910  rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (100%)
4911  rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%)
4912  rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%)
4913  rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%)
4914  rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%)
4915  rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%)
4916  rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (100%)
4917  rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (100%)
4918  rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%)
4919  rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%)
4920  rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%)
4921  rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%)
4922  rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%)
4923  rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%)
4924  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%)
4925  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%)
4926  rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%)
4927  rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%)
4928  rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%)
4929  rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%)
4930  rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%)
4931  rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%)
4932  rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%)
4933  create mode 100644 drivers/net/ethernet/davicom/Kconfig
4934  create mode 100644 drivers/net/ethernet/davicom/Makefile
4935  rename drivers/net/{ => ethernet/davicom}/dm9000.c (99%)
4936  rename drivers/net/{ => ethernet/davicom}/dm9000.h (100%)
4937  create mode 100644 drivers/net/ethernet/dec/Kconfig
4938  create mode 100644 drivers/net/ethernet/dec/Makefile
4939  rename drivers/net/{ => ethernet/dec}/ewrk3.c (99%)
4940  rename drivers/net/{ => ethernet/dec}/ewrk3.h (100%)
4941  rename drivers/net/{ => ethernet/dec}/tulip/21142.c (100%)
4942  rename drivers/net/{ => ethernet/dec}/tulip/Kconfig (96%)
4943  rename drivers/net/{ => ethernet/dec}/tulip/Makefile (100%)
4944  rename drivers/net/{ => ethernet/dec}/tulip/de2104x.c (99%)
4945  rename drivers/net/{ => ethernet/dec}/tulip/de4x5.c (99%)
4946  rename drivers/net/{ => ethernet/dec}/tulip/de4x5.h (100%)
4947  rename drivers/net/{ => ethernet/dec}/tulip/dmfe.c (99%)
4948  rename drivers/net/{ => ethernet/dec}/tulip/eeprom.c (100%)
4949  rename drivers/net/{ => ethernet/dec}/tulip/interrupt.c (100%)
4950  rename drivers/net/{ => ethernet/dec}/tulip/media.c (100%)
4951  rename drivers/net/{ => ethernet/dec}/tulip/pnic.c (100%)
4952  rename drivers/net/{ => ethernet/dec}/tulip/pnic2.c (100%)
4953  rename drivers/net/{ => ethernet/dec}/tulip/timer.c (100%)
4954  rename drivers/net/{ => ethernet/dec}/tulip/tulip.h (100%)
4955  rename drivers/net/{ => ethernet/dec}/tulip/tulip_core.c (99%)
4956  rename drivers/net/{ => ethernet/dec}/tulip/uli526x.c (99%)
4957  rename drivers/net/{ => ethernet/dec}/tulip/winbond-840.c (99%)
4958  rename drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c (100%)
4959  create mode 100644 drivers/net/ethernet/dlink/Kconfig
4960  create mode 100644 drivers/net/ethernet/dlink/Makefile
4961  rename drivers/net/{ => ethernet/dlink}/de600.c (100%)
4962  rename drivers/net/{ => ethernet/dlink}/de600.h (100%)
4963  rename drivers/net/{ => ethernet/dlink}/de620.c (99%)
4964  rename drivers/net/{ => ethernet/dlink}/de620.h (100%)
4965  rename drivers/net/{ => ethernet/dlink}/dl2k.c (95%)
4966  rename drivers/net/{ => ethernet/dlink}/dl2k.h (81%)
4967  rename drivers/net/{ => ethernet/dlink}/sundance.c (99%)
4968  rename drivers/net/{ => ethernet}/dnet.c (100%)
4969  rename drivers/net/{ => ethernet}/dnet.h (100%)
4970  create mode 100644 drivers/net/ethernet/emulex/Kconfig
4971  create mode 100644 drivers/net/ethernet/emulex/Makefile
4972  create mode 100644 drivers/net/ethernet/emulex/benet/Kconfig
4973  rename drivers/net/{ => ethernet/emulex}/benet/Makefile (100%)
4974  rename drivers/net/{ => ethernet/emulex}/benet/be.h (84%)
4975  rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.c (94%)
4976  rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.h (95%)
4977  rename drivers/net/{ => ethernet/emulex}/benet/be_ethtool.c (85%)
4978  rename drivers/net/{ => ethernet/emulex}/benet/be_hw.h (94%)
4979  rename drivers/net/{ => ethernet/emulex}/benet/be_main.c (90%)
4980  rename drivers/net/{ => ethernet}/ethoc.c (99%)
4981  create mode 100644 drivers/net/ethernet/faraday/Kconfig
4982  create mode 100644 drivers/net/ethernet/faraday/Makefile
4983  rename drivers/net/{ => ethernet/faraday}/ftgmac100.c (100%)
4984  rename drivers/net/{ => ethernet/faraday}/ftgmac100.h (100%)
4985  rename drivers/net/{ => ethernet/faraday}/ftmac100.c (100%)
4986  rename drivers/net/{ => ethernet/faraday}/ftmac100.h (100%)
4987  rename drivers/net/{ => ethernet}/fealnx.c (99%)
4988  create mode 100644 drivers/net/ethernet/freescale/Kconfig
4989  create mode 100644 drivers/net/ethernet/freescale/Makefile
4990  rename drivers/net/{ => ethernet/freescale}/fec.c (99%)
4991  rename drivers/net/{ => ethernet/freescale}/fec.h (100%)
4992  rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c (99%)
4993  rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h (100%)
4994  rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx_phy.c (100%)
4995  rename drivers/net/{ => ethernet/freescale}/fs_enet/Kconfig (91%)
4996  rename drivers/net/{ => ethernet/freescale}/fs_enet/Makefile (100%)
4997  rename drivers/net/{ => ethernet/freescale}/fs_enet/fec.h (100%)
4998  rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet-main.c (99%)
4999  rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet.h (100%)
5000  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fcc.c (100%)
5001  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fec.c (100%)
5002  rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-scc.c (100%)
5003  rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-bitbang.c (100%)
5004  rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-fec.c (100%)
5005  rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c (100%)
5006  rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h (100%)
5007  rename drivers/net/{ => ethernet/freescale}/gianfar.c (99%)
5008  rename drivers/net/{ => ethernet/freescale}/gianfar.h (100%)
5009  rename drivers/net/{ => ethernet/freescale}/gianfar_ethtool.c (100%)
5010  rename drivers/net/{ => ethernet/freescale}/gianfar_ptp.c (100%)
5011  rename drivers/net/{ => ethernet/freescale}/gianfar_sysfs.c (100%)
5012  rename drivers/net/{ => ethernet/freescale}/ucc_geth.c (99%)
5013  rename drivers/net/{ => ethernet/freescale}/ucc_geth.h (100%)
5014  rename drivers/net/{ => ethernet/freescale}/ucc_geth_ethtool.c (100%)
5015  create mode 100644 drivers/net/ethernet/fujitsu/Kconfig
5016  create mode 100644 drivers/net/ethernet/fujitsu/Makefile
5017  rename drivers/net/{ => ethernet/fujitsu}/at1700.c (99%)
5018  rename drivers/net/{ => ethernet/fujitsu}/eth16i.c (99%)
5019  rename drivers/net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c (99%)
5020  create mode 100644 drivers/net/ethernet/hp/Kconfig
5021  create mode 100644 drivers/net/ethernet/hp/Makefile
5022  rename drivers/net/{ => ethernet/hp}/hp100.c (99%)
5023  rename drivers/net/{ => ethernet/hp}/hp100.h (100%)
5024  rename drivers/net/{ => ethernet/i825xx}/3c505.c (99%)
5025  rename drivers/net/{ => ethernet/i825xx}/3c505.h (100%)
5026  rename drivers/net/{ => ethernet/i825xx}/3c507.c (100%)
5027  rename drivers/net/{ => ethernet/i825xx}/3c523.c (99%)
5028  rename drivers/net/{ => ethernet/i825xx}/3c523.h (100%)
5029  rename drivers/net/{ => ethernet/i825xx}/3c527.c (99%)
5030  rename drivers/net/{ => ethernet/i825xx}/3c527.h (100%)
5031  rename drivers/net/{ => ethernet/i825xx}/82596.c (99%)
5032  create mode 100644 drivers/net/ethernet/i825xx/Kconfig
5033  create mode 100644 drivers/net/ethernet/i825xx/Makefile
5034  rename drivers/net/{ => ethernet/i825xx}/eepro.c (99%)
5035  rename drivers/net/{ => ethernet/i825xx}/eexpress.c (99%)
5036  rename drivers/net/{ => ethernet/i825xx}/eexpress.h (100%)
5037  rename drivers/net/{arm => ethernet/i825xx}/ether1.c (99%)
5038  rename drivers/net/{arm => ethernet/i825xx}/ether1.h (100%)
5039  rename drivers/net/{ => ethernet/i825xx}/lasi_82596.c (100%)
5040  rename drivers/net/{ => ethernet/i825xx}/lib82596.c (99%)
5041  rename drivers/net/{ => ethernet/i825xx}/lp486e.c (99%)
5042  rename drivers/net/{ => ethernet/i825xx}/ni52.c (99%)
5043  rename drivers/net/{ => ethernet/i825xx}/ni52.h (100%)
5044  rename drivers/net/{ => ethernet/i825xx}/sni_82596.c (100%)
5045  rename drivers/net/{ => ethernet/i825xx}/sun3_82586.c (99%)
5046  rename drivers/net/{ => ethernet/i825xx}/sun3_82586.h (100%)
5047  rename drivers/net/{ => ethernet/i825xx}/znet.c (99%)
5048  create mode 100644 drivers/net/ethernet/ibm/Kconfig
5049  create mode 100644 drivers/net/ethernet/ibm/Makefile
5050  rename drivers/net/{ => ethernet/ibm}/ehea/Makefile (100%)
5051  rename drivers/net/{ => ethernet/ibm}/ehea/ehea.h (100%)
5052  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c (100%)
5053  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h (100%)
5054  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c (99%)
5055  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c (100%)
5056  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h (100%)
5057  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c (100%)
5058  rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h (100%)
5059  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Kconfig (63%)
5060  create mode 100644 drivers/net/ethernet/ibm/emac/Makefile
5061  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.c (99%)
5062  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.h (97%)
5063  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.c (100%)
5064  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.h (98%)
5065  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/emac.h (100%)
5066  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.c (99%)
5067  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.h (99%)
5068  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.c (100%)
5069  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.h (100%)
5070  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c (100%)
5071  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h (96%)
5072  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.c (100%)
5073  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.h (97%)
5074  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.c (100%)
5075  rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.h (96%)
5076  rename drivers/net/{ => ethernet/ibm}/ibmveth.c (99%)
5077  rename drivers/net/{ => ethernet/ibm}/ibmveth.h (100%)
5078  rename drivers/net/{ => ethernet/ibm}/iseries_veth.c (99%)
5079  create mode 100644 drivers/net/ethernet/icplus/Kconfig
5080  create mode 100644 drivers/net/ethernet/icplus/Makefile
5081  rename drivers/net/{ => ethernet/icplus}/ipg.c (92%)
5082  rename drivers/net/{ => ethernet/icplus}/ipg.h (100%)
5083  create mode 100644 drivers/net/ethernet/intel/Kconfig
5084  create mode 100644 drivers/net/ethernet/intel/Makefile
5085  rename drivers/net/{ => ethernet/intel}/e100.c (99%)
5086  rename drivers/net/{ => ethernet/intel}/e1000/Makefile (100%)
5087  rename drivers/net/{ => ethernet/intel}/e1000/e1000.h (99%)
5088  rename drivers/net/{ => ethernet/intel}/e1000/e1000_ethtool.c (100%)
5089  rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c (100%)
5090  rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h (100%)
5091  rename drivers/net/{ => ethernet/intel}/e1000/e1000_main.c (99%)
5092  rename drivers/net/{ => ethernet/intel}/e1000/e1000_osdep.h (100%)
5093  rename drivers/net/{ => ethernet/intel}/e1000/e1000_param.c (100%)
5094  rename drivers/net/{e1000e/es2lan.c => ethernet/intel/e1000e/80003es2lan.c} (99%)
5095  rename drivers/net/{ => ethernet/intel}/e1000e/82571.c (99%)
5096  rename drivers/net/{ => ethernet/intel}/e1000e/Makefile (96%)
5097  rename drivers/net/{ => ethernet/intel}/e1000e/defines.h (100%)
5098  rename drivers/net/{ => ethernet/intel}/e1000e/e1000.h (99%)
5099  rename drivers/net/{ => ethernet/intel}/e1000e/ethtool.c (96%)
5100  rename drivers/net/{ => ethernet/intel}/e1000e/hw.h (100%)
5101  rename drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c (99%)
5102  rename drivers/net/{ => ethernet/intel}/e1000e/lib.c (100%)
5103  rename drivers/net/{ => ethernet/intel}/e1000e/netdev.c (96%)
5104  rename drivers/net/{ => ethernet/intel}/e1000e/param.c (100%)
5105  rename drivers/net/{ => ethernet/intel}/e1000e/phy.c (100%)
5106  rename drivers/net/{ => ethernet/intel}/igb/Makefile (100%)
5107  rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.c (100%)
5108  rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.h (100%)
5109  rename drivers/net/{ => ethernet/intel}/igb/e1000_defines.h (100%)
5110  rename drivers/net/{ => ethernet/intel}/igb/e1000_hw.h (100%)
5111  rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.c (100%)
5112  rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.h (100%)
5113  rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c (100%)
5114  rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h (100%)
5115  rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c (100%)
5116  rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h (100%)
5117  rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.c (100%)
5118  rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.h (100%)
5119  rename drivers/net/{ => ethernet/intel}/igb/e1000_regs.h (100%)
5120  rename drivers/net/{ => ethernet/intel}/igb/igb.h (100%)
5121  rename drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c (100%)
5122  rename drivers/net/{ => ethernet/intel}/igb/igb_main.c (99%)
5123  rename drivers/net/{ => ethernet/intel}/igbvf/Makefile (100%)
5124  rename drivers/net/{ => ethernet/intel}/igbvf/defines.h (100%)
5125  rename drivers/net/{ => ethernet/intel}/igbvf/ethtool.c (100%)
5126  rename drivers/net/{ => ethernet/intel}/igbvf/igbvf.h (100%)
5127  rename drivers/net/{ => ethernet/intel}/igbvf/mbx.c (100%)
5128  rename drivers/net/{ => ethernet/intel}/igbvf/mbx.h (100%)
5129  rename drivers/net/{ => ethernet/intel}/igbvf/netdev.c (99%)
5130  rename drivers/net/{ => ethernet/intel}/igbvf/regs.h (100%)
5131  rename drivers/net/{ => ethernet/intel}/igbvf/vf.c (100%)
5132  rename drivers/net/{ => ethernet/intel}/igbvf/vf.h (100%)
5133  rename drivers/net/{ => ethernet/intel}/ixgb/Makefile (100%)
5134  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb.h (100%)
5135  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c (100%)
5136  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h (100%)
5137  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c (100%)
5138  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c (100%)
5139  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h (100%)
5140  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h (100%)
5141  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c (99%)
5142  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h (100%)
5143  rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c (100%)
5144  rename drivers/net/{ => ethernet/intel}/ixgbe/Makefile (100%)
5145  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h (96%)
5146  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c (100%)
5147  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c (96%)
5148  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.c (99%)
5149  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.h (100%)
5150  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c (100%)
5151  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h (100%)
5152  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c (100%)
5153  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h (100%)
5154  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c (99%)
5155  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h (100%)
5156  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c (95%)
5157  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c (99%)
5158  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c (99%)
5159  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h (100%)
5160  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_main.c (94%)
5161  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c (100%)
5162  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h (100%)
5163  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c (100%)
5164  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h (100%)
5165  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c (100%)
5166  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h (100%)
5167  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_type.h (99%)
5168  rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c (100%)
5169  rename drivers/net/{ => ethernet/intel}/ixgbevf/Makefile (100%)
5170  rename drivers/net/{ => ethernet/intel}/ixgbevf/defines.h (100%)
5171  rename drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c (94%)
5172  rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h (98%)
5173  rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf_main.c (97%)
5174  rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c (100%)
5175  rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h (100%)
5176  rename drivers/net/{ => ethernet/intel}/ixgbevf/regs.h (100%)
5177  rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.c (100%)
5178  rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.h (100%)
5179  rename drivers/net/{ => ethernet}/jme.c (99%)
5180  rename drivers/net/{ => ethernet}/jme.h (100%)
5181  rename drivers/net/{ => ethernet}/korina.c (99%)
5182  rename drivers/net/{ => ethernet}/lantiq_etop.c (99%)
5183  create mode 100644 drivers/net/ethernet/marvell/Kconfig
5184  create mode 100644 drivers/net/ethernet/marvell/Makefile
5185  rename drivers/net/{ => ethernet/marvell}/mv643xx_eth.c (99%)
5186  rename drivers/net/{ => ethernet/marvell}/pxa168_eth.c (100%)
5187  rename drivers/net/{ => ethernet/marvell}/skge.c (99%)
5188  rename drivers/net/{ => ethernet/marvell}/skge.h (100%)
5189  rename drivers/net/{ => ethernet/marvell}/sky2.c (99%)
5190  rename drivers/net/{ => ethernet/marvell}/sky2.h (100%)
5191  create mode 100644 drivers/net/ethernet/mellanox/Kconfig
5192  create mode 100644 drivers/net/ethernet/mellanox/Makefile
5193  create mode 100644 drivers/net/ethernet/mellanox/mlx4/Kconfig
5194  rename drivers/net/{ => ethernet/mellanox}/mlx4/Makefile (100%)
5195  rename drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c (100%)
5196  rename drivers/net/{ => ethernet/mellanox}/mlx4/catas.c (100%)
5197  rename drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c (100%)
5198  rename drivers/net/{ => ethernet/mellanox}/mlx4/cq.c (100%)
5199  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c (100%)
5200  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_ethtool.c (100%)
5201  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c (100%)
5202  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_netdev.c (99%)
5203  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c (100%)
5204  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h (100%)
5205  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_resources.c (100%)
5206  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c (100%)
5207  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_selftest.c (100%)
5208  rename drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c (100%)
5209  rename drivers/net/{ => ethernet/mellanox}/mlx4/eq.c (100%)
5210  rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.c (100%)
5211  rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.h (100%)
5212  rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.c (100%)
5213  rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.h (100%)
5214  rename drivers/net/{ => ethernet/mellanox}/mlx4/intf.c (100%)
5215  rename drivers/net/{ => ethernet/mellanox}/mlx4/main.c (100%)
5216  rename drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c (100%)
5217  rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h (100%)
5218  rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h (100%)
5219  rename drivers/net/{ => ethernet/mellanox}/mlx4/mr.c (100%)
5220  rename drivers/net/{ => ethernet/mellanox}/mlx4/pd.c (100%)
5221  rename drivers/net/{ => ethernet/mellanox}/mlx4/port.c (100%)
5222  rename drivers/net/{ => ethernet/mellanox}/mlx4/profile.c (100%)
5223  rename drivers/net/{ => ethernet/mellanox}/mlx4/qp.c (100%)
5224  rename drivers/net/{ => ethernet/mellanox}/mlx4/reset.c (100%)
5225  rename drivers/net/{ => ethernet/mellanox}/mlx4/sense.c (100%)
5226  rename drivers/net/{ => ethernet/mellanox}/mlx4/srq.c (100%)
5227  create mode 100644 drivers/net/ethernet/micrel/Kconfig
5228  create mode 100644 drivers/net/ethernet/micrel/Makefile
5229  rename drivers/net/{arm => ethernet/micrel}/ks8695net.c (99%)
5230  rename drivers/net/{arm => ethernet/micrel}/ks8695net.h (100%)
5231  rename drivers/net/{ => ethernet/micrel}/ks8842.c (100%)
5232  rename drivers/net/{ => ethernet/micrel}/ks8851.c (100%)
5233  rename drivers/net/{ => ethernet/micrel}/ks8851.h (100%)
5234  rename drivers/net/{ => ethernet/micrel}/ks8851_mll.c (100%)
5235  rename drivers/net/{ => ethernet/micrel}/ksz884x.c (100%)
5236  create mode 100644 drivers/net/ethernet/microchip/Kconfig
5237  create mode 100644 drivers/net/ethernet/microchip/Makefile
5238  rename drivers/net/{ => ethernet/microchip}/enc28j60.c (99%)
5239  rename drivers/net/{ => ethernet/microchip}/enc28j60_hw.h (100%)
5240  rename drivers/net/{ => ethernet}/mipsnet.c (99%)
5241  create mode 100644 drivers/net/ethernet/myricom/Kconfig
5242  create mode 100644 drivers/net/ethernet/myricom/Makefile
5243  rename drivers/net/{ => ethernet/myricom}/myri10ge/Makefile (100%)
5244  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge.c (99%)
5245  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h (100%)
5246  rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp_gen_header.h (100%)
5247  create mode 100644 drivers/net/ethernet/natsemi/Kconfig
5248  create mode 100644 drivers/net/ethernet/natsemi/Makefile
5249  rename drivers/net/{ => ethernet/natsemi}/ibmlana.c (99%)
5250  rename drivers/net/{ => ethernet/natsemi}/ibmlana.h (100%)
5251  rename drivers/net/{ => ethernet/natsemi}/jazzsonic.c (99%)
5252  rename drivers/net/{ => ethernet/natsemi}/macsonic.c (99%)
5253  rename drivers/net/{ => ethernet/natsemi}/natsemi.c (99%)
5254  rename drivers/net/{ => ethernet/natsemi}/ns83820.c (99%)
5255  rename drivers/net/{ => ethernet/natsemi}/sonic.c (100%)
5256  rename drivers/net/{ => ethernet/natsemi}/sonic.h (100%)
5257  rename drivers/net/{ => ethernet/natsemi}/xtsonic.c (99%)
5258  create mode 100644 drivers/net/ethernet/neterion/Kconfig
5259  create mode 100644 drivers/net/ethernet/neterion/Makefile
5260  rename drivers/net/{ => ethernet/neterion}/s2io-regs.h (100%)
5261  rename drivers/net/{ => ethernet/neterion}/s2io.c (99%)
5262  rename drivers/net/{ => ethernet/neterion}/s2io.h (100%)
5263  rename drivers/net/{ => ethernet/neterion}/vxge/Makefile (100%)
5264  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.c (100%)
5265  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.h (100%)
5266  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.c (100%)
5267  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.h (100%)
5268  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.c (99%)
5269  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.h (100%)
5270  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-reg.h (100%)
5271  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.c (100%)
5272  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.h (100%)
5273  rename drivers/net/{ => ethernet/neterion}/vxge/vxge-version.h (100%)
5274  rename drivers/net/{ => ethernet}/netx-eth.c (99%)
5275  create mode 100644 drivers/net/ethernet/nuvoton/Kconfig
5276  create mode 100644 drivers/net/ethernet/nuvoton/Makefile
5277  rename drivers/net/{arm => ethernet/nuvoton}/w90p910_ether.c (99%)
5278  create mode 100644 drivers/net/ethernet/nvidia/Kconfig
5279  create mode 100644 drivers/net/ethernet/nvidia/Makefile
5280  rename drivers/net/{ => ethernet/nvidia}/forcedeth.c (99%)
5281  rename drivers/net/{ => ethernet}/octeon/Kconfig (85%)
5282  create mode 100644 drivers/net/ethernet/octeon/Makefile
5283  rename drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (99%)
5284  create mode 100644 drivers/net/ethernet/oki-semi/Kconfig
5285  create mode 100644 drivers/net/ethernet/oki-semi/Makefile
5286  create mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
5287  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/Makefile (100%)
5288  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h (100%)
5289  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c (100%)
5290  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h (100%)
5291  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_ethtool.c (100%)
5292  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c (99%)
5293  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_param.c (100%)
5294  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c (100%)
5295  rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h (100%)
5296  create mode 100644 drivers/net/ethernet/packetengines/Kconfig
5297  create mode 100644 drivers/net/ethernet/packetengines/Makefile
5298  rename drivers/net/{ => ethernet/packetengines}/hamachi.c (99%)
5299  rename drivers/net/{ => ethernet/packetengines}/yellowfin.c (99%)
5300  create mode 100644 drivers/net/ethernet/pasemi/Kconfig
5301  create mode 100644 drivers/net/ethernet/pasemi/Makefile
5302  rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.c (99%)
5303  rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.h (100%)
5304  rename drivers/net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c (100%)
5305  create mode 100644 drivers/net/ethernet/qlogic/Kconfig
5306  create mode 100644 drivers/net/ethernet/qlogic/Makefile
5307  rename drivers/net/{ => ethernet/qlogic}/netxen/Makefile (100%)
5308  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic.h (99%)
5309  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c (100%)
5310  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ethtool.c (100%)
5311  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h (100%)
5312  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.c (100%)
5313  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.h (100%)
5314  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_init.c (99%)
5315  rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_main.c (96%)
5316  rename drivers/net/{ => ethernet/qlogic}/qla3xxx.c (99%)
5317  rename drivers/net/{ => ethernet/qlogic}/qla3xxx.h (100%)
5318  rename drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile (100%)
5319  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h (98%)
5320  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c (92%)
5321  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c (96%)
5322  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h (99%)
5323  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c (99%)
5324  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c (98%)
5325  rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c (96%)
5326  rename drivers/net/{ => ethernet/qlogic}/qlge/Makefile (100%)
5327  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge.h (100%)
5328  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c (100%)
5329  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c (100%)
5330  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c (99%)
5331  rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c (100%)
5332  create mode 100644 drivers/net/ethernet/racal/Kconfig
5333  create mode 100644 drivers/net/ethernet/racal/Makefile
5334  rename drivers/net/{ => ethernet/racal}/ni5010.c (99%)
5335  rename drivers/net/{ => ethernet/racal}/ni5010.h (100%)
5336  create mode 100644 drivers/net/ethernet/rdc/Kconfig
5337  create mode 100644 drivers/net/ethernet/rdc/Makefile
5338  rename drivers/net/{ => ethernet/rdc}/r6040.c (99%)
5339  rename drivers/net/{ => ethernet/realtek}/8139cp.c (99%)
5340  rename drivers/net/{ => ethernet/realtek}/8139too.c (99%)
5341  create mode 100644 drivers/net/ethernet/realtek/Kconfig
5342  create mode 100644 drivers/net/ethernet/realtek/Makefile
5343  rename drivers/net/{ => ethernet/realtek}/atp.c (99%)
5344  rename drivers/net/{ => ethernet/realtek}/atp.h (100%)
5345  rename drivers/net/{ => ethernet/realtek}/r8169.c (99%)
5346  rename drivers/net/{ => ethernet/realtek}/sc92031.c (99%)
5347  create mode 100644 drivers/net/ethernet/renesas/Kconfig
5348  create mode 100644 drivers/net/ethernet/renesas/Makefile
5349  rename drivers/net/{ => ethernet/renesas}/sh_eth.c (99%)
5350  rename drivers/net/{ => ethernet/renesas}/sh_eth.h (100%)
5351  rename drivers/net/{ => ethernet}/s6gmac.c (100%)
5352  create mode 100644 drivers/net/ethernet/seeq/Kconfig
5353  create mode 100644 drivers/net/ethernet/seeq/Makefile
5354  rename drivers/net/{arm => ethernet/seeq}/ether3.c (99%)
5355  rename drivers/net/{arm => ethernet/seeq}/ether3.h (100%)
5356  rename drivers/net/{ => ethernet/seeq}/seeq8005.c (99%)
5357  rename drivers/net/{ => ethernet/seeq}/seeq8005.h (100%)
5358  rename drivers/net/{ => ethernet/seeq}/sgiseeq.c (99%)
5359  rename drivers/net/{ => ethernet/seeq}/sgiseeq.h (100%)
5360  rename drivers/net/{ => ethernet}/sfc/Kconfig (96%)
5361  rename drivers/net/{ => ethernet}/sfc/Makefile (100%)
5362  rename drivers/net/{ => ethernet}/sfc/bitfield.h (100%)
5363  rename drivers/net/{ => ethernet}/sfc/efx.c (99%)
5364  rename drivers/net/{ => ethernet}/sfc/efx.h (100%)
5365  rename drivers/net/{ => ethernet}/sfc/enum.h (100%)
5366  rename drivers/net/{ => ethernet}/sfc/ethtool.c (100%)
5367  rename drivers/net/{ => ethernet}/sfc/falcon.c (100%)
5368  rename drivers/net/{ => ethernet}/sfc/falcon_boards.c (100%)
5369  rename drivers/net/{ => ethernet}/sfc/falcon_xmac.c (100%)
5370  rename drivers/net/{ => ethernet}/sfc/filter.c (100%)
5371  rename drivers/net/{ => ethernet}/sfc/filter.h (100%)
5372  rename drivers/net/{ => ethernet}/sfc/io.h (100%)
5373  rename drivers/net/{ => ethernet}/sfc/mac.h (100%)
5374  rename drivers/net/{ => ethernet}/sfc/mcdi.c (100%)
5375  rename drivers/net/{ => ethernet}/sfc/mcdi.h (100%)
5376  rename drivers/net/{ => ethernet}/sfc/mcdi_mac.c (100%)
5377  rename drivers/net/{ => ethernet}/sfc/mcdi_pcol.h (100%)
5378  rename drivers/net/{ => ethernet}/sfc/mcdi_phy.c (100%)
5379  rename drivers/net/{ => ethernet}/sfc/mdio_10g.c (100%)
5380  rename drivers/net/{ => ethernet}/sfc/mdio_10g.h (100%)
5381  rename drivers/net/{ => ethernet}/sfc/mtd.c (100%)
5382  rename drivers/net/{ => ethernet}/sfc/net_driver.h (100%)
5383  rename drivers/net/{ => ethernet}/sfc/nic.c (100%)
5384  rename drivers/net/{ => ethernet}/sfc/nic.h (100%)
5385  rename drivers/net/{ => ethernet}/sfc/phy.h (100%)
5386  rename drivers/net/{ => ethernet}/sfc/qt202x_phy.c (100%)
5387  rename drivers/net/{ => ethernet}/sfc/regs.h (100%)
5388  rename drivers/net/{ => ethernet}/sfc/rx.c (100%)
5389  rename drivers/net/{ => ethernet}/sfc/selftest.c (100%)
5390  rename drivers/net/{ => ethernet}/sfc/selftest.h (100%)
5391  rename drivers/net/{ => ethernet}/sfc/siena.c (100%)
5392  rename drivers/net/{ => ethernet}/sfc/spi.h (100%)
5393  rename drivers/net/{ => ethernet}/sfc/tenxpress.c (100%)
5394  rename drivers/net/{ => ethernet}/sfc/tx.c (100%)
5395  rename drivers/net/{ => ethernet}/sfc/txc43128_phy.c (100%)
5396  rename drivers/net/{ => ethernet}/sfc/workarounds.h (100%)
5397  create mode 100644 drivers/net/ethernet/sgi/Kconfig
5398  create mode 100644 drivers/net/ethernet/sgi/Makefile
5399  rename drivers/net/{ => ethernet/sgi}/ioc3-eth.c (99%)
5400  rename drivers/net/{ => ethernet/sgi}/meth.c (100%)
5401  rename drivers/net/{ => ethernet/sgi}/meth.h (100%)
5402  create mode 100644 drivers/net/ethernet/sis/Kconfig
5403  create mode 100644 drivers/net/ethernet/sis/Makefile
5404  rename drivers/net/{ => ethernet/sis}/sis190.c (99%)
5405  rename drivers/net/{ => ethernet/sis}/sis900.c (99%)
5406  rename drivers/net/{ => ethernet/sis}/sis900.h (100%)
5407  create mode 100644 drivers/net/ethernet/smsc/Kconfig
5408  create mode 100644 drivers/net/ethernet/smsc/Makefile
5409  rename drivers/net/{ => ethernet/smsc}/epic100.c (99%)
5410  rename drivers/net/{ => ethernet/smsc}/smc911x.c (99%)
5411  rename drivers/net/{ => ethernet/smsc}/smc911x.h (100%)
5412  rename drivers/net/{ => ethernet/smsc}/smc9194.c (99%)
5413  rename drivers/net/{ => ethernet/smsc}/smc9194.h (100%)
5414  rename drivers/net/{pcmcia => ethernet/smsc}/smc91c92_cs.c (99%)
5415  rename drivers/net/{ => ethernet/smsc}/smc91x.c (99%)
5416  rename drivers/net/{ => ethernet/smsc}/smc91x.h (100%)
5417  rename drivers/net/{ => ethernet/smsc}/smsc911x.c (97%)
5418  rename drivers/net/{ => ethernet/smsc}/smsc911x.h (100%)
5419  rename drivers/net/{ => ethernet/smsc}/smsc9420.c (99%)
5420  rename drivers/net/{ => ethernet/smsc}/smsc9420.h (100%)
5421  create mode 100644 drivers/net/ethernet/stmicro/Kconfig
5422  create mode 100644 drivers/net/ethernet/stmicro/Makefile
5423  rename drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig (93%)
5424  rename drivers/net/{ => ethernet/stmicro}/stmmac/Makefile (100%)
5425  rename drivers/net/{ => ethernet/stmicro}/stmmac/common.h (100%)
5426  rename drivers/net/{ => ethernet/stmicro}/stmmac/descs.h (100%)
5427  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100.h (100%)
5428  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000.h (100%)
5429  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_core.c (100%)
5430  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c (100%)
5431  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_core.c (100%)
5432  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_dma.c (100%)
5433  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h (100%)
5434  rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c (100%)
5435  rename drivers/net/{ => ethernet/stmicro}/stmmac/enh_desc.c (100%)
5436  rename drivers/net/{ => ethernet/stmicro}/stmmac/norm_desc.c (100%)
5437  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h (100%)
5438  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c (100%)
5439  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_main.c (99%)
5440  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_mdio.c (100%)
5441  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.c (100%)
5442  rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.h (100%)
5443  create mode 100644 drivers/net/ethernet/sun/Kconfig
5444  create mode 100644 drivers/net/ethernet/sun/Makefile
5445  rename drivers/net/{ => ethernet/sun}/cassini.c (99%)
5446  rename drivers/net/{ => ethernet/sun}/cassini.h (100%)
5447  rename drivers/net/{ => ethernet/sun}/niu.c (99%)
5448  rename drivers/net/{ => ethernet/sun}/niu.h (100%)
5449  rename drivers/net/{ => ethernet/sun}/sunbmac.c (97%)
5450  rename drivers/net/{ => ethernet/sun}/sunbmac.h (95%)
5451  rename drivers/net/{ => ethernet/sun}/sungem.c (99%)
5452  rename drivers/net/{ => ethernet/sun}/sungem.h (100%)
5453  rename drivers/net/{ => ethernet/sun}/sunhme.c (99%)
5454  rename drivers/net/{ => ethernet/sun}/sunhme.h (100%)
5455  rename drivers/net/{ => ethernet/sun}/sunqe.c (99%)
5456  rename drivers/net/{ => ethernet/sun}/sunqe.h (100%)
5457  rename drivers/net/{ => ethernet/sun}/sunvnet.c (99%)
5458  rename drivers/net/{ => ethernet/sun}/sunvnet.h (100%)
5459  create mode 100644 drivers/net/ethernet/tehuti/Kconfig
5460  create mode 100644 drivers/net/ethernet/tehuti/Makefile
5461  rename drivers/net/{ => ethernet/tehuti}/tehuti.c (99%)
5462  rename drivers/net/{ => ethernet/tehuti}/tehuti.h (100%)
5463  create mode 100644 drivers/net/ethernet/ti/Kconfig
5464  create mode 100644 drivers/net/ethernet/ti/Makefile
5465  rename drivers/net/{ => ethernet/ti}/cpmac.c (99%)
5466  rename drivers/net/{ => ethernet/ti}/davinci_cpdma.c (100%)
5467  rename drivers/net/{ => ethernet/ti}/davinci_cpdma.h (100%)
5468  rename drivers/net/{ => ethernet/ti}/davinci_emac.c (99%)
5469  rename drivers/net/{ => ethernet/ti}/davinci_mdio.c (100%)
5470  rename drivers/net/{ => ethernet/ti}/tlan.c (99%)
5471  rename drivers/net/{ => ethernet/ti}/tlan.h (100%)
5472  create mode 100644 drivers/net/ethernet/tile/Kconfig
5473  rename drivers/net/{ => ethernet}/tile/Makefile (100%)
5474  rename drivers/net/{ => ethernet}/tile/tilepro.c (100%)
5475  create mode 100644 drivers/net/ethernet/toshiba/Kconfig
5476  create mode 100644 drivers/net/ethernet/toshiba/Makefile
5477  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c (99%)
5478  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h (100%)
5479  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.c (99%)
5480  rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.h (100%)
5481  rename drivers/net/{ => ethernet/toshiba}/spider_net.c (99%)
5482  rename drivers/net/{ => ethernet/toshiba}/spider_net.h (99%)
5483  rename drivers/net/{ => ethernet/toshiba}/spider_net_ethtool.c (100%)
5484  rename drivers/net/{ => ethernet/toshiba}/tc35815.c (99%)
5485  create mode 100644 drivers/net/ethernet/tundra/Kconfig
5486  create mode 100644 drivers/net/ethernet/tundra/Makefile
5487  rename drivers/net/{ => ethernet/tundra}/tsi108_eth.c (99%)
5488  rename drivers/net/{ => ethernet/tundra}/tsi108_eth.h (100%)
5489  create mode 100644 drivers/net/ethernet/via/Kconfig
5490  create mode 100644 drivers/net/ethernet/via/Makefile
5491  rename drivers/net/{ => ethernet/via}/via-rhine.c (99%)
5492  rename drivers/net/{ => ethernet/via}/via-velocity.c (97%)
5493  rename drivers/net/{ => ethernet/via}/via-velocity.h (100%)
5494  create mode 100644 drivers/net/ethernet/xilinx/Kconfig
5495  create mode 100644 drivers/net/ethernet/xilinx/Makefile
5496  rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%)
5497  rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (99%)
5498  rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%)
5499  rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%)
5500  create mode 100644 drivers/net/ethernet/xircom/Kconfig
5501  create mode 100644 drivers/net/ethernet/xircom/Makefile
5502  rename drivers/net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c (99%)
5503  create mode 100644 drivers/net/ethernet/xscale/Kconfig
5504  create mode 100644 drivers/net/ethernet/xscale/Makefile
5505  rename drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig (94%)
5506  rename drivers/net/{ => ethernet/xscale}/ixp2000/Makefile (100%)
5507  rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c (100%)
5508  rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h (100%)
5509  rename drivers/net/{ => ethernet/xscale}/ixp2000/enp2611.c (100%)
5510  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.c (100%)
5511  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.h (100%)
5512  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc (100%)
5513  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode (100%)
5514  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc (100%)
5515  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode (100%)
5516  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c (100%)
5517  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h (100%)
5518  rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev_priv.h (100%)
5519  rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c (100%)
5520  rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h (100%)
5521  rename drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c (99%)
5522  create mode 100644 drivers/net/fddi/Kconfig
5523  create mode 100644 drivers/net/fddi/Makefile
5524  rename drivers/net/{ => fddi}/defxx.c (99%)
5525  rename drivers/net/{ => fddi}/defxx.h (100%)
5526  rename drivers/net/{ => fddi}/skfp/Makefile (100%)
5527  rename drivers/net/{ => fddi}/skfp/cfm.c (100%)
5528  rename drivers/net/{ => fddi}/skfp/drvfbi.c (100%)
5529  rename drivers/net/{ => fddi}/skfp/ecm.c (100%)
5530  rename drivers/net/{ => fddi}/skfp/ess.c (100%)
5531  rename drivers/net/{ => fddi}/skfp/fplustm.c (100%)
5532  rename drivers/net/{ => fddi}/skfp/h/cmtdef.h (99%)
5533  rename drivers/net/{ => fddi}/skfp/h/fddi.h (100%)
5534  rename drivers/net/{ => fddi}/skfp/h/fddimib.h (100%)
5535  rename drivers/net/{ => fddi}/skfp/h/fplustm.h (100%)
5536  rename drivers/net/{ => fddi}/skfp/h/hwmtm.h (99%)
5537  rename drivers/net/{ => fddi}/skfp/h/mbuf.h (100%)
5538  rename drivers/net/{ => fddi}/skfp/h/osdef1st.h (100%)
5539  rename drivers/net/{ => fddi}/skfp/h/sba.h (98%)
5540  rename drivers/net/{ => fddi}/skfp/h/sba_def.h (100%)
5541  rename drivers/net/{ => fddi}/skfp/h/skfbi.h (100%)
5542  rename drivers/net/{ => fddi}/skfp/h/skfbiinc.h (99%)
5543  rename drivers/net/{ => fddi}/skfp/h/smc.h (98%)
5544  rename drivers/net/{ => fddi}/skfp/h/smt.h (100%)
5545  rename drivers/net/{ => fddi}/skfp/h/smt_p.h (100%)
5546  rename drivers/net/{ => fddi}/skfp/h/smtstate.h (100%)
5547  rename drivers/net/{ => fddi}/skfp/h/supern_2.h (100%)
5548  rename drivers/net/{ => fddi}/skfp/h/targethw.h (98%)
5549  rename drivers/net/{ => fddi}/skfp/h/targetos.h (99%)
5550  rename drivers/net/{ => fddi}/skfp/h/types.h (100%)
5551  rename drivers/net/{ => fddi}/skfp/hwmtm.c (100%)
5552  rename drivers/net/{ => fddi}/skfp/hwt.c (100%)
5553  rename drivers/net/{ => fddi}/skfp/pcmplc.c (100%)
5554  rename drivers/net/{ => fddi}/skfp/pmf.c (100%)
5555  rename drivers/net/{ => fddi}/skfp/queue.c (100%)
5556  rename drivers/net/{ => fddi}/skfp/rmt.c (100%)
5557  rename drivers/net/{ => fddi}/skfp/skfddi.c (99%)
5558  rename drivers/net/{ => fddi}/skfp/smt.c (100%)
5559  rename drivers/net/{ => fddi}/skfp/smtdef.c (100%)
5560  rename drivers/net/{ => fddi}/skfp/smtinit.c (100%)
5561  rename drivers/net/{ => fddi}/skfp/smttimer.c (100%)
5562  rename drivers/net/{ => fddi}/skfp/srf.c (100%)
5563  create mode 100644 drivers/net/hippi/Kconfig
5564  create mode 100644 drivers/net/hippi/Makefile
5565  rename drivers/net/{ => hippi}/rrunner.c (100%)
5566  rename drivers/net/{ => hippi}/rrunner.h (100%)
5567  delete mode 100644 drivers/net/ibm_newemac/Makefile
5568  delete mode 100644 drivers/net/octeon/Makefile
5569  delete mode 100644 drivers/net/pci-skeleton.c
5570  delete mode 100644 drivers/net/pcmcia/Kconfig
5571  delete mode 100644 drivers/net/pcmcia/Makefile
5572  create mode 100644 drivers/net/plip/Kconfig
5573  create mode 100644 drivers/net/plip/Makefile
5574  rename drivers/net/{ => plip}/plip.c (100%)
5575  create mode 100644 drivers/net/ppp/Kconfig
5576  create mode 100644 drivers/net/ppp/Makefile
5577  rename drivers/net/{ => ppp}/bsd_comp.c (100%)
5578  rename drivers/net/{ => ppp}/ppp_async.c (100%)
5579  rename drivers/net/{ => ppp}/ppp_deflate.c (100%)
5580  rename drivers/net/{ => ppp}/ppp_generic.c (100%)
5581  rename drivers/net/{ => ppp}/ppp_mppe.c (100%)
5582  rename drivers/net/{ => ppp}/ppp_mppe.h (100%)
5583  rename drivers/net/{ => ppp}/ppp_synctty.c (100%)
5584  rename drivers/net/{ => ppp}/pppoe.c (100%)
5585  rename drivers/net/{ => ppp}/pppox.c (100%)
5586  rename drivers/net/{ => ppp}/pptp.c (100%)
5587  create mode 100644 drivers/net/slip/Kconfig
5588  create mode 100644 drivers/net/slip/Makefile
5589  rename drivers/net/{ => slip}/slhc.c (100%)
5590  rename drivers/net/{ => slip}/slip.c (98%)
5591  rename drivers/net/{ => slip}/slip.h (94%)
5592  rename drivers/net/{pcmcia => tokenring}/ibmtr_cs.c (99%)
5593  create mode 100644 drivers/net/wireless/ath/ath6kl/Kconfig
5594  create mode 100644 drivers/net/wireless/ath/ath6kl/Makefile
5595  create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.c
5596  create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.h
5597  create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.c
5598  create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.h
5599  create mode 100644 drivers/net/wireless/ath/ath6kl/common.h
5600  create mode 100644 drivers/net/wireless/ath/ath6kl/core.h
5601  create mode 100644 drivers/net/wireless/ath/ath6kl/debug.c
5602  create mode 100644 drivers/net/wireless/ath/ath6kl/debug.h
5603  create mode 100644 drivers/net/wireless/ath/ath6kl/hif-ops.h
5604  create mode 100644 drivers/net/wireless/ath/ath6kl/hif.h
5605  create mode 100644 drivers/net/wireless/ath/ath6kl/htc.c
5606  create mode 100644 drivers/net/wireless/ath/ath6kl/htc.h
5607  create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.c
5608  create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.h
5609  create mode 100644 drivers/net/wireless/ath/ath6kl/init.c
5610  create mode 100644 drivers/net/wireless/ath/ath6kl/main.c
5611  create mode 100644 drivers/net/wireless/ath/ath6kl/node.c
5612  create mode 100644 drivers/net/wireless/ath/ath6kl/sdio.c
5613  create mode 100644 drivers/net/wireless/ath/ath6kl/target.h
5614  create mode 100644 drivers/net/wireless/ath/ath6kl/txrx.c
5615  create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.c
5616  create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.h
5617  create mode 100644 drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
5618  delete mode 100644 drivers/staging/ath6kl/Kconfig
5619  delete mode 100644 drivers/staging/ath6kl/Makefile
5620  delete mode 100644 drivers/staging/ath6kl/TODO
5621  delete mode 100644 drivers/staging/ath6kl/bmi/include/bmi_internal.h
5622  delete mode 100644 drivers/staging/ath6kl/bmi/src/bmi.c
5623  delete mode 100644 drivers/staging/ath6kl/hif/common/hif_sdio_common.h
5624  delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
5625  delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
5626  delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
5627  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.c
5628  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.h
5629  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
5630  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
5631  delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
5632  delete mode 100644 drivers/staging/ath6kl/htc2/htc.c
5633  delete mode 100644 drivers/staging/ath6kl/htc2/htc_debug.h
5634  delete mode 100644 drivers/staging/ath6kl/htc2/htc_internal.h
5635  delete mode 100644 drivers/staging/ath6kl/htc2/htc_recv.c
5636  delete mode 100644 drivers/staging/ath6kl/htc2/htc_send.c
5637  delete mode 100644 drivers/staging/ath6kl/htc2/htc_services.c
5638  delete mode 100644 drivers/staging/ath6kl/include/a_config.h
5639  delete mode 100644 drivers/staging/ath6kl/include/a_debug.h
5640  delete mode 100644 drivers/staging/ath6kl/include/a_drv.h
5641  delete mode 100644 drivers/staging/ath6kl/include/a_drv_api.h
5642  delete mode 100644 drivers/staging/ath6kl/include/a_osapi.h
5643  delete mode 100644 drivers/staging/ath6kl/include/aggr_recv_api.h
5644  delete mode 100644 drivers/staging/ath6kl/include/ar3kconfig.h
5645  delete mode 100644 drivers/staging/ath6kl/include/ar6000_api.h
5646  delete mode 100644 drivers/staging/ath6kl/include/ar6000_diag.h
5647  delete mode 100644 drivers/staging/ath6kl/include/ar6kap_common.h
5648  delete mode 100644 drivers/staging/ath6kl/include/athbtfilter.h
5649  delete mode 100644 drivers/staging/ath6kl/include/bmi.h
5650  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
5651  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/addrs.h
5652  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
5653  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
5654  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
5655  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
5656  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
5657  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
5658  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
5659  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
5660  delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
5661  delete mode 100644 drivers/staging/ath6kl/include/common/athdefs.h
5662  delete mode 100644 drivers/staging/ath6kl/include/common/bmi_msg.h
5663  delete mode 100644 drivers/staging/ath6kl/include/common/cnxmgmt.h
5664  delete mode 100644 drivers/staging/ath6kl/include/common/dbglog.h
5665  delete mode 100644 drivers/staging/ath6kl/include/common/dbglog_id.h
5666  delete mode 100644 drivers/staging/ath6kl/include/common/discovery.h
5667  delete mode 100644 drivers/staging/ath6kl/include/common/epping_test.h
5668  delete mode 100644 drivers/staging/ath6kl/include/common/gmboxif.h
5669  delete mode 100644 drivers/staging/ath6kl/include/common/gpio_reg.h
5670  delete mode 100644 drivers/staging/ath6kl/include/common/htc.h
5671  delete mode 100644 drivers/staging/ath6kl/include/common/htc_services.h
5672  delete mode 100644 drivers/staging/ath6kl/include/common/pkt_log.h
5673  delete mode 100644 drivers/staging/ath6kl/include/common/roaming.h
5674  delete mode 100644 drivers/staging/ath6kl/include/common/targaddrs.h
5675  delete mode 100644 drivers/staging/ath6kl/include/common/testcmd.h
5676  delete mode 100644 drivers/staging/ath6kl/include/common/tlpm.h
5677  delete mode 100644 drivers/staging/ath6kl/include/common/wlan_defs.h
5678  delete mode 100644 drivers/staging/ath6kl/include/common/wmi.h
5679  delete mode 100644 drivers/staging/ath6kl/include/common/wmix.h
5680  delete mode 100644 drivers/staging/ath6kl/include/common_drv.h
5681  delete mode 100644 drivers/staging/ath6kl/include/dbglog_api.h
5682  delete mode 100644 drivers/staging/ath6kl/include/dl_list.h
5683  delete mode 100644 drivers/staging/ath6kl/include/dset_api.h
5684  delete mode 100644 drivers/staging/ath6kl/include/hci_transport_api.h
5685  delete mode 100644 drivers/staging/ath6kl/include/hif.h
5686  delete mode 100644 drivers/staging/ath6kl/include/host_version.h
5687  delete mode 100644 drivers/staging/ath6kl/include/htc_api.h
5688  delete mode 100644 drivers/staging/ath6kl/include/htc_packet.h
5689  delete mode 100644 drivers/staging/ath6kl/include/wlan_api.h
5690  delete mode 100644 drivers/staging/ath6kl/include/wmi_api.h
5691  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kconfig.c
5692  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
5693  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
5694  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
5695  delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
5696  delete mode 100644 drivers/staging/ath6kl/miscdrv/common_drv.c
5697  delete mode 100644 drivers/staging/ath6kl/miscdrv/credit_dist.c
5698  delete mode 100644 drivers/staging/ath6kl/miscdrv/miscdrv.h
5699  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_drv.c
5700  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_pm.c
5701  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
5702  delete mode 100644 drivers/staging/ath6kl/os/linux/cfg80211.c
5703  delete mode 100644 drivers/staging/ath6kl/os/linux/export_hci_transport.c
5704  delete mode 100644 drivers/staging/ath6kl/os/linux/hci_bridge.c
5705  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
5706  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
5707  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
5708  delete mode 100644 drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
5709  delete mode 100644 drivers/staging/ath6kl/os/linux/include/cfg80211.h
5710  delete mode 100644 drivers/staging/ath6kl/os/linux/include/config_linux.h
5711  delete mode 100644 drivers/staging/ath6kl/os/linux/include/debug_linux.h
5712  delete mode 100644 drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
5713  delete mode 100644 drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
5714  delete mode 100644 drivers/staging/ath6kl/os/linux/include/osapi_linux.h
5715  delete mode 100644 drivers/staging/ath6kl/os/linux/include/wlan_config.h
5716  delete mode 100644 drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
5717  delete mode 100644 drivers/staging/ath6kl/os/linux/netbuf.c
5718  delete mode 100644 drivers/staging/ath6kl/reorder/aggr_rx_internal.h
5719  delete mode 100644 drivers/staging/ath6kl/reorder/rcv_aggr.c
5720  delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211.h
5721  delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211_node.h
5722  delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_node.c
5723  delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
5724  delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_utils.c
5725  delete mode 100644 drivers/staging/ath6kl/wmi/wmi.c
5726  delete mode 100644 drivers/staging/ath6kl/wmi/wmi_host.h
5727  create mode 100644 include/linux/bcma/bcma_driver_mips.h
5728  create mode 100644 include/linux/bcma/bcma_soc.h
5729  rename {drivers/net => include/linux}/sungem_phy.h (98%)
5730  create mode 100644 include/net/cfg80211-wext.h
5731  create mode 100644 net/ieee802154/6lowpan.c
5732  create mode 100644 net/ieee802154/6lowpan.h
5733 Merging wireless/master
5734 $ git merge wireless/master
5735 Recorded preimage for 'drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c'
5736 Resolved 'drivers/net/wireless/iwlwifi/iwl-pci.c' using previous resolution.
5737 Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
5738 Auto-merging drivers/net/wireless/ath/ath9k/main.c
5739 Auto-merging drivers/net/wireless/b43/dma.c
5740 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
5741 Auto-merging drivers/net/wireless/iwlwifi/iwl-pci.c
5742 CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-pci.c
5743 Auto-merging drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
5744 CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
5745 Auto-merging drivers/net/wireless/wl12xx/acx.c
5746 Auto-merging drivers/net/wireless/wl12xx/main.c
5747 Auto-merging drivers/net/wireless/wl12xx/sdio.c
5748 Auto-merging include/net/cfg80211.h
5749 Auto-merging net/mac80211/agg-rx.c
5750 Auto-merging net/mac80211/cfg.c
5751 Auto-merging net/mac80211/iface.c
5752 Auto-merging net/mac80211/mesh_pathtbl.c
5753 Automatic merge failed; fix conflicts and then commit the result.
5754 $ git commit -v -a
5755 Recorded resolution for 'drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c'.
5756 [master e1b7977] Merge remote-tracking branch 'wireless/master'
5757 $ git diff -M --stat --summary HEAD^..
5758  drivers/bcma/sprom.c                              |    9 +
5759  drivers/net/wireless/ath/ath.h                    |   48 +-
5760  drivers/net/wireless/ath/ath9k/ani.c              |    2 +-
5761  drivers/net/wireless/ath/ath9k/ani.h              |    5 +-
5762  drivers/net/wireless/ath/ath9k/ar5008_initvals.h  |  131 +-
5763  drivers/net/wireless/ath/ath9k/ar9001_initvals.h  |  266 +-
5764  drivers/net/wireless/ath/ath9k/ar9002_hw.c        |   48 +-
5765  drivers/net/wireless/ath/ath9k/ar9002_initvals.h  | 3403 +++++++++++----------
5766  drivers/net/wireless/ath/ath9k/ar9002_mac.c       |    2 +-
5767  drivers/net/wireless/ath/ath9k/ar9003_eeprom.c    |    2 +-
5768  drivers/net/wireless/ath/ath9k/ar9003_mac.c       |    2 +-
5769  drivers/net/wireless/ath/ath9k/ath9k.h            |    7 +-
5770  drivers/net/wireless/ath/ath9k/debug.c            |  312 ++-
5771  drivers/net/wireless/ath/ath9k/debug.h            |   47 +
5772  drivers/net/wireless/ath/ath9k/htc_drv_main.c     |    1 +
5773  drivers/net/wireless/ath/ath9k/hw.c               |   29 +-
5774  drivers/net/wireless/ath/ath9k/hw.h               |    2 +-
5775  drivers/net/wireless/ath/ath9k/init.c             |    1 +
5776  drivers/net/wireless/ath/ath9k/mac.h              |    3 +-
5777  drivers/net/wireless/ath/ath9k/main.c             |    2 +
5778  drivers/net/wireless/ath/ath9k/recv.c             |   24 +-
5779  drivers/net/wireless/ath/ath9k/reg.h              |    4 +-
5780  drivers/net/wireless/ath/ath9k/xmit.c             |  237 +-
5781  drivers/net/wireless/ath/main.c                   |    8 +-
5782  drivers/net/wireless/b43/Kconfig                  |    6 +-
5783  drivers/net/wireless/b43/b43.h                    |    2 +
5784  drivers/net/wireless/b43/dma.c                    |   31 +-
5785  drivers/net/wireless/b43/dma.h                    |    3 +-
5786  drivers/net/wireless/b43/main.c                   |    6 +-
5787  drivers/net/wireless/b43/phy_lcn.c                |  286 ++-
5788  drivers/net/wireless/b43/tables_phy_lcn.c         |   64 +-
5789  drivers/net/wireless/iwlwifi/iwl-1000.c           |   42 +-
5790  drivers/net/wireless/iwlwifi/iwl-2000.c           |   51 +-
5791  drivers/net/wireless/iwlwifi/iwl-5000.c           |   72 +-
5792  drivers/net/wireless/iwlwifi/iwl-6000.c           |   60 +-
5793  drivers/net/wireless/iwlwifi/iwl-agn-calib.c      |   43 +-
5794  drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c     |    6 +-
5795  drivers/net/wireless/iwlwifi/iwl-agn-hw.h         |   13 -
5796  drivers/net/wireless/iwlwifi/iwl-agn-lib.c        |  676 +----
5797  drivers/net/wireless/iwlwifi/iwl-agn-rs.c         |   93 +-
5798  drivers/net/wireless/iwlwifi/iwl-agn-rxon.c       |   65 +-
5799  drivers/net/wireless/iwlwifi/iwl-agn-sta.c        |   84 +-
5800  drivers/net/wireless/iwlwifi/iwl-agn-tt.c         |   68 +-
5801  drivers/net/wireless/iwlwifi/iwl-agn-tx.c         |  913 +++---
5802  drivers/net/wireless/iwlwifi/iwl-agn-ucode.c      |   52 +-
5803  drivers/net/wireless/iwlwifi/iwl-agn.c            |  938 ++----
5804  drivers/net/wireless/iwlwifi/iwl-agn.h            |   63 +-
5805  drivers/net/wireless/iwlwifi/iwl-bus.h            |   34 +-
5806  drivers/net/wireless/iwlwifi/iwl-commands.h       |    6 +-
5807  drivers/net/wireless/iwlwifi/iwl-core.c           |  284 +--
5808  drivers/net/wireless/iwlwifi/iwl-core.h           |  118 +-
5809  drivers/net/wireless/iwlwifi/iwl-debug.h          |   40 +-
5810  drivers/net/wireless/iwlwifi/iwl-debugfs.c        |  412 +---
5811  drivers/net/wireless/iwlwifi/iwl-dev.h            |  329 +--
5812  drivers/net/wireless/iwlwifi/iwl-devtrace.h       |    2 +
5813  drivers/net/wireless/iwlwifi/iwl-eeprom.c         |   62 +-
5814  drivers/net/wireless/iwlwifi/iwl-eeprom.h         |    1 -
5815  drivers/net/wireless/iwlwifi/iwl-fh.h             |   20 +-
5816  drivers/net/wireless/iwlwifi/iwl-helpers.h        |   91 +-
5817  drivers/net/wireless/iwlwifi/iwl-io.c             |  192 +-
5818  drivers/net/wireless/iwlwifi/iwl-io.h             |   61 +-
5819  drivers/net/wireless/iwlwifi/iwl-led.c            |   11 +-
5820  drivers/net/wireless/iwlwifi/iwl-pci.c            |   41 +-
5821  drivers/net/wireless/iwlwifi/iwl-pci.h            |  116 +
5822  drivers/net/wireless/iwlwifi/iwl-power.c          |   19 +-
5823  drivers/net/wireless/iwlwifi/iwl-prph.h           |    4 +-
5824  drivers/net/wireless/iwlwifi/iwl-rx.c             |   42 +-
5825  drivers/net/wireless/iwlwifi/iwl-scan.c           |   97 +-
5826  drivers/net/wireless/iwlwifi/iwl-shared.h         |  430 +++
5827  drivers/net/wireless/iwlwifi/iwl-sta.c            |  106 +-
5828  drivers/net/wireless/iwlwifi/iwl-sta.h            |    4 +-
5829  drivers/net/wireless/iwlwifi/iwl-sv-open.c        |   21 +-
5830  drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h |  314 ++-
5831  drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c  |  862 ++++--
5832  drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c  |  506 +++-
5833  drivers/net/wireless/iwlwifi/iwl-trans.c          | 1615 ++++++++---
5834  drivers/net/wireless/iwlwifi/iwl-trans.h          |  216 +-
5835  drivers/net/wireless/mwifiex/join.c               |    3 +-
5836  drivers/net/wireless/mwifiex/scan.c               |    6 +-
5837  drivers/net/wireless/mwifiex/sta_ioctl.c          |    9 +-
5838  drivers/net/wireless/mwl8k.c                      |    8 +
5839  drivers/net/wireless/p54/p54spi.c                 |    2 +-
5840  drivers/net/wireless/p54/txrx.c                   |   12 +-
5841  drivers/net/wireless/rt2x00/rt2800pci.c           |    1 +
5842  drivers/net/wireless/wl12xx/acx.c                 |  322 +--
5843  drivers/net/wireless/wl12xx/acx.h                 |  394 +--
5844  drivers/net/wireless/wl12xx/boot.c                |   43 +-
5845  drivers/net/wireless/wl12xx/boot.h                |    3 +-
5846  drivers/net/wireless/wl12xx/cmd.c                 |  793 ++++--
5847  drivers/net/wireless/wl12xx/cmd.h                 |  329 ++-
5848  drivers/net/wireless/wl12xx/conf.h                |  352 +--
5849  drivers/net/wireless/wl12xx/debugfs.c             |   17 +-
5850  drivers/net/wireless/wl12xx/event.c               |    6 +-
5851  drivers/net/wireless/wl12xx/event.h               |   80 +-
5852  drivers/net/wireless/wl12xx/init.c                |   91 +-
5853  drivers/net/wireless/wl12xx/io.h                  |    1 -
5854  drivers/net/wireless/wl12xx/main.c                |  961 ++++---
5855  drivers/net/wireless/wl12xx/ps.c                  |    4 +-
5856  drivers/net/wireless/wl12xx/reg.h                 |   75 -
5857  drivers/net/wireless/wl12xx/rx.c                  |   60 +-
5858  drivers/net/wireless/wl12xx/rx.h                  |   18 +-
5859  drivers/net/wireless/wl12xx/scan.c                |   38 +-
5860  drivers/net/wireless/wl12xx/scan.h                |   25 +-
5861  drivers/net/wireless/wl12xx/sdio.c                |    4 +-
5862  drivers/net/wireless/wl12xx/sdio_test.c           |    2 +-
5863  drivers/net/wireless/wl12xx/spi.c                 |    4 +-
5864  drivers/net/wireless/wl12xx/tx.c                  |  136 +-
5865  drivers/net/wireless/wl12xx/tx.h                  |   16 +-
5866  drivers/net/wireless/wl12xx/wl12xx.h              |  153 +-
5867  drivers/net/wireless/wl12xx/wl12xx_80211.h        |   25 -
5868  include/linux/nl80211.h                           |   51 +
5869  include/linux/ssb/ssb.h                           |    2 +-
5870  include/net/cfg80211.h                            |   26 +
5871  include/net/mac80211.h                            |    5 +
5872  net/mac80211/agg-rx.c                             |   19 +-
5873  net/mac80211/agg-tx.c                             |   38 +-
5874  net/mac80211/cfg.c                                |    2 +-
5875  net/mac80211/debugfs.c                            |   19 +-
5876  net/mac80211/ht.c                                 |    6 +-
5877  net/mac80211/iface.c                              |    6 +
5878  net/mac80211/mesh.c                               |    5 +-
5879  net/mac80211/mesh.h                               |    6 +-
5880  net/mac80211/mesh_hwmp.c                          |   32 +-
5881  net/mac80211/mesh_pathtbl.c                       |  196 +-
5882  net/mac80211/mlme.c                               |   17 +-
5883  net/mac80211/spectmgmt.c                          |    6 +-
5884  net/mac80211/sta_info.h                           |    5 +
5885  net/mac80211/status.c                             |   37 +-
5886  net/mac80211/tx.c                                 |   20 +-
5887  net/mac80211/util.c                               |   11 +-
5888  net/mac80211/work.c                               |    6 +-
5889  net/rfkill/rfkill-regulator.c                     |    1 -
5890  net/wireless/lib80211_crypt_ccmp.c                |    2 -
5891  net/wireless/lib80211_crypt_tkip.c                |    4 -
5892  net/wireless/lib80211_crypt_wep.c                 |    4 -
5893  net/wireless/nl80211.c                            |   68 +-
5894  net/wireless/reg.c                                |    3 +-
5895  net/wireless/util.c                               |    5 +-
5896  138 files changed, 10344 insertions(+), 8539 deletions(-)
5897  create mode 100644 drivers/net/wireless/iwlwifi/iwl-pci.h
5898  create mode 100644 drivers/net/wireless/iwlwifi/iwl-shared.h
5899 Merging bluetooth/master
5900 $ git merge bluetooth/master
5901 Merge made by recursive.
5902  drivers/bluetooth/btusb.c        |    3 +-
5903  include/net/bluetooth/hci_core.h |   23 +++-
5904  include/net/bluetooth/l2cap.h    |    3 +-
5905  include/net/bluetooth/mgmt.h     |   11 ++
5906  net/bluetooth/af_bluetooth.c     |   30 ++++-
5907  net/bluetooth/bnep/core.c        |    5 +-
5908  net/bluetooth/cmtp/core.c        |    5 +-
5909  net/bluetooth/hci_conn.c         |   14 +-
5910  net/bluetooth/hci_core.c         |   43 +++---
5911  net/bluetooth/hci_event.c        |    4 +-
5912  net/bluetooth/hci_sock.c         |   18 +++-
5913  net/bluetooth/hidp/core.c        |   10 +-
5914  net/bluetooth/l2cap_core.c       |  271 ++++++++++++++------------------------
5915  net/bluetooth/mgmt.c             |   80 ++++++++++--
5916  net/bluetooth/rfcomm/core.c      |    5 +-
5917  net/bluetooth/smp.c              |   59 +++++---
5918  16 files changed, 334 insertions(+), 250 deletions(-)
5919 Merging mtd/master
5920 $ git merge mtd/master
5921 Already up-to-date.
5922 Merging l2-mtd/master
5923 $ git merge l2-mtd/master
5924 Resolved 'drivers/mtd/maps/lantiq-flash.c' using previous resolution.
5925 Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
5926 Auto-merging arch/arm/mach-at91/board-cam60.c
5927 Auto-merging arch/arm/mach-at91/board-cap9adk.c
5928 Auto-merging arch/arm/mach-at91/board-kb9202.c
5929 Auto-merging arch/arm/mach-at91/board-neocore926.c
5930 Auto-merging arch/arm/mach-at91/board-qil-a9260.c
5931 Auto-merging arch/arm/mach-at91/board-rm9200dk.c
5932 Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
5933 Auto-merging arch/arm/mach-at91/board-sam9260ek.c
5934 Auto-merging arch/arm/mach-at91/board-sam9261ek.c
5935 Auto-merging arch/arm/mach-at91/board-sam9263ek.c
5936 Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
5937 Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
5938 Auto-merging arch/arm/mach-at91/board-sam9rlek.c
5939 CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in HEAD and modified in l2-mtd/master. Version l2-mtd/master of arch/arm/mach-at91/board-usb-a9260.c left in tree.
5940 Auto-merging arch/arm/mach-at91/board-usb-a926x.c
5941 Auto-merging arch/arm/mach-at91/board-yl-9200.c
5942 Auto-merging arch/arm/mach-at91/include/mach/board.h
5943 Auto-merging arch/arm/mach-davinci/board-da830-evm.c
5944 Auto-merging arch/arm/mach-davinci/board-da850-evm.c
5945 Auto-merging arch/arm/mach-davinci/board-dm355-evm.c
5946 Auto-merging arch/arm/mach-davinci/board-dm355-leopard.c
5947 Auto-merging arch/arm/mach-davinci/board-dm365-evm.c
5948 Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
5949 Auto-merging arch/arm/mach-davinci/board-mityomapl138.c
5950 Auto-merging arch/arm/mach-davinci/board-neuros-osd2.c
5951 Auto-merging arch/arm/mach-davinci/board-tnetv107x-evm.c
5952 Auto-merging arch/arm/mach-ep93xx/ts72xx.c
5953 Auto-merging arch/arm/mach-mmp/aspenite.c
5954 Auto-merging arch/arm/mach-orion5x/ts78xx-setup.c
5955 Auto-merging arch/arm/mach-pxa/cm-x300.c
5956 Auto-merging arch/arm/mach-pxa/littleton.c
5957 Auto-merging arch/arm/mach-pxa/raumfeld.c
5958 Auto-merging arch/arm/mach-pxa/zylonite.c
5959 Removing drivers/mtd/maps/ceiva.c
5960 Removing drivers/mtd/maps/edb7312.c
5961 Auto-merging drivers/mtd/maps/lantiq-flash.c
5962 CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
5963 Removing drivers/mtd/nand/edb7312.c
5964 Auto-merging drivers/mtd/onenand/omap2.c
5965 Automatic merge failed; fix conflicts and then commit the result.
5966 $ git rm -f arch/arm/mach-at91/board-usb-a9260.c
5967 arch/arm/mach-at91/board-usb-a9260.c: needs merge
5968 drivers/mtd/maps/lantiq-flash.c: needs merge
5969 rm 'arch/arm/mach-at91/board-usb-a9260.c'
5970 $ git commit -v -a
5971 [master 4d34533] Merge remote-tracking branch 'l2-mtd/master'
5972 $ git diff -M --stat --summary HEAD^..
5973  Documentation/DocBook/mtdnand.tmpl                 |   19 +-
5974  .../devicetree/bindings/mtd/atmel-dataflash.txt    |   14 +
5975  arch/arm/mach-at91/board-afeb-9260v1.c             |    9 +-
5976  arch/arm/mach-at91/board-cam60.c                   |    9 +-
5977  arch/arm/mach-at91/board-cap9adk.c                 |    9 +-
5978  arch/arm/mach-at91/board-kb9202.c                  |    9 +-
5979  arch/arm/mach-at91/board-neocore926.c              |    9 +-
5980  arch/arm/mach-at91/board-qil-a9260.c               |    9 +-
5981  arch/arm/mach-at91/board-rm9200dk.c                |    9 +-
5982  arch/arm/mach-at91/board-sam9-l9260.c              |    9 +-
5983  arch/arm/mach-at91/board-sam9260ek.c               |    9 +-
5984  arch/arm/mach-at91/board-sam9261ek.c               |    9 +-
5985  arch/arm/mach-at91/board-sam9263ek.c               |    9 +-
5986  arch/arm/mach-at91/board-sam9g20ek.c               |    9 +-
5987  arch/arm/mach-at91/board-sam9m10g45ek.c            |    9 +-
5988  arch/arm/mach-at91/board-sam9rlek.c                |    9 +-
5989  arch/arm/mach-at91/board-snapper9260.c             |   10 +-
5990  arch/arm/mach-at91/board-usb-a926x.c               |    9 +-
5991  arch/arm/mach-at91/board-yl-9200.c                 |    9 +-
5992  arch/arm/mach-at91/include/mach/board.h            |    3 +-
5993  arch/arm/mach-davinci/board-da830-evm.c            |    2 +-
5994  arch/arm/mach-davinci/board-da850-evm.c            |    2 +-
5995  arch/arm/mach-davinci/board-dm355-evm.c            |    2 +-
5996  arch/arm/mach-davinci/board-dm355-leopard.c        |    2 +-
5997  arch/arm/mach-davinci/board-dm365-evm.c            |    2 +-
5998  arch/arm/mach-davinci/board-dm644x-evm.c           |    2 +-
5999  arch/arm/mach-davinci/board-mityomapl138.c         |    3 +-
6000  arch/arm/mach-davinci/board-neuros-osd2.c          |    2 +-
6001  arch/arm/mach-davinci/board-tnetv107x-evm.c        |    2 +-
6002  arch/arm/mach-davinci/include/mach/nand.h          |    4 +-
6003  arch/arm/mach-ep93xx/ts72xx.c                      |   23 +-
6004  arch/arm/mach-mmp/aspenite.c                       |    5 +-
6005  arch/arm/mach-orion5x/ts78xx-setup.c               |    2 +-
6006  arch/arm/mach-pxa/cm-x300.c                        |    5 +-
6007  arch/arm/mach-pxa/colibri-pxa3xx.c                 |    5 +-
6008  arch/arm/mach-pxa/littleton.c                      |    5 +-
6009  arch/arm/mach-pxa/mxm8x10.c                        |    9 +-
6010  arch/arm/mach-pxa/raumfeld.c                       |    5 +-
6011  arch/arm/mach-pxa/zylonite.c                       |    5 +-
6012  arch/arm/plat-pxa/include/plat/pxa3xx_nand.h       |   20 +-
6013  arch/avr32/boards/atngw100/setup.c                 |    8 +-
6014  arch/avr32/boards/atstk1000/atstk1002.c            |    9 +-
6015  arch/avr32/mach-at32ap/include/mach/board.h        |    3 +-
6016  arch/cris/arch-v32/drivers/mach-a3/nandflash.c     |    2 +-
6017  arch/cris/arch-v32/drivers/mach-fs/nandflash.c     |    2 +-
6018  drivers/mtd/Kconfig                                |   16 +-
6019  drivers/mtd/Makefile                               |    2 +-
6020  drivers/mtd/afs.c                                  |    4 +-
6021  drivers/mtd/ar7part.c                              |    2 +-
6022  drivers/mtd/chips/cfi_cmdset_0002.c                |   31 +-
6023  drivers/mtd/chips/fwh_lock.h                       |    3 +-
6024  drivers/mtd/chips/jedec_probe.c                    |   34 +-
6025  drivers/mtd/cmdlinepart.c                          |    7 +-
6026  drivers/mtd/devices/doc2000.c                      |   17 +-
6027  drivers/mtd/devices/doc2001.c                      |   11 +-
6028  drivers/mtd/devices/doc2001plus.c                  |   11 +-
6029  drivers/mtd/devices/docecc.c                       |    2 +-
6030  drivers/mtd/devices/lart.c                         |   18 +-
6031  drivers/mtd/devices/m25p80.c                       |   84 +-
6032  drivers/mtd/devices/mtd_dataflash.c                |   91 +-
6033  drivers/mtd/devices/sst25l.c                       |   42 +-
6034  drivers/mtd/ftl.c                                  |   40 +-
6035  drivers/mtd/inftlcore.c                            |   65 +-
6036  drivers/mtd/inftlmount.c                           |  116 +-
6037  drivers/mtd/maps/Kconfig                           |   26 -
6038  drivers/mtd/maps/Makefile                          |    2 -
6039  drivers/mtd/maps/bfin-async-flash.c                |   16 +-
6040  drivers/mtd/maps/ceiva.c                           |  341 ----
6041  drivers/mtd/maps/dc21285.c                         |    9 +-
6042  drivers/mtd/maps/edb7312.c                         |  134 --
6043  drivers/mtd/maps/gpio-addr-flash.c                 |   16 +-
6044  drivers/mtd/maps/h720x-flash.c                     |   23 +-
6045  drivers/mtd/maps/impa7.c                           |   28 +-
6046  drivers/mtd/maps/intel_vr_nor.c                    |    7 +-
6047  drivers/mtd/maps/ixp2000.c                         |   11 +-
6048  drivers/mtd/maps/ixp4xx.c                          |   29 +-
6049  drivers/mtd/maps/lantiq-flash.c                    |   17 +-
6050  drivers/mtd/maps/latch-addr-flash.c                |   24 +-
6051  drivers/mtd/maps/pcmciamtd.c                       |  124 +-
6052  drivers/mtd/maps/physmap.c                         |   38 +-
6053  drivers/mtd/maps/physmap_of.c                      |   80 +-
6054  drivers/mtd/maps/plat-ram.c                        |   23 +-
6055  drivers/mtd/maps/pxa2xx-flash.c                    |   20 +-
6056  drivers/mtd/maps/rbtx4939-flash.c                  |   24 +-
6057  drivers/mtd/maps/sa1100-flash.c                    |   30 +-
6058  drivers/mtd/maps/solutionengine.c                  |   30 +-
6059  drivers/mtd/maps/wr_sbc82xx_flash.c                |   33 +-
6060  drivers/mtd/mtdblock.c                             |   18 +-
6061  drivers/mtd/mtdchar.c                              |  160 ++-
6062  drivers/mtd/mtdconcat.c                            |    2 +-
6063  drivers/mtd/mtdcore.c                              |   70 +-
6064  drivers/mtd/mtdcore.h                              |    3 +
6065  drivers/mtd/mtdpart.c                              |   54 +-
6066  drivers/mtd/mtdsuper.c                             |   20 +-
6067  drivers/mtd/mtdswap.c                              |   11 +-
6068  drivers/mtd/nand/Kconfig                           |   27 +-
6069  drivers/mtd/nand/Makefile                          |    2 +-
6070  drivers/mtd/nand/atmel_nand.c                      |   74 +-
6071  drivers/mtd/nand/au1550nd.c                        |   29 +-
6072  drivers/mtd/nand/autcpu12.c                        |    4 +-
6073  drivers/mtd/nand/bcm_umi_nand.c                    |   57 +-
6074  drivers/mtd/nand/cafe_nand.c                       |   21 +-
6075  drivers/mtd/nand/cmx270_nand.c                     |   23 +-
6076  drivers/mtd/nand/cs553x_nand.c                     |   15 +-
6077  drivers/mtd/nand/davinci_nand.c                    |   39 +-
6078  drivers/mtd/nand/denali.c                          |    6 +-
6079  drivers/mtd/nand/diskonchip.c                      |    6 +-
6080  drivers/mtd/nand/edb7312.c                         |  203 ---
6081  drivers/mtd/nand/fsl_elbc_nand.c                   |   75 +-
6082  drivers/mtd/nand/fsl_upm.c                         |   16 +-
6083  drivers/mtd/nand/fsmc_nand.c                       |   77 +-
6084  drivers/mtd/nand/gpmi-nand/Makefile                |    3 +
6085  drivers/mtd/nand/gpmi-nand/bch-regs.h              |   84 +
6086  drivers/mtd/nand/gpmi-nand/gpmi-lib.c              | 1057 +++++++++++++
6087  drivers/mtd/nand/gpmi-nand/gpmi-nand.c             | 1619 ++++++++++++++++++++
6088  drivers/mtd/nand/gpmi-nand/gpmi-nand.h             |  273 ++++
6089  drivers/mtd/nand/gpmi-nand/gpmi-regs.h             |  172 +++
6090  drivers/mtd/nand/h1910.c                           |   19 +-
6091  drivers/mtd/nand/jz4740_nand.c                     |   18 +-
6092  drivers/mtd/nand/mpc5121_nfc.c                     |   22 +-
6093  drivers/mtd/nand/mxc_nand.c                        |   35 +-
6094  drivers/mtd/nand/nand_base.c                       | 1093 +++++++-------
6095  drivers/mtd/nand/nand_bbt.c                        |  623 ++++-----
6096  drivers/mtd/nand/nand_bch.c                        |    4 +-
6097  drivers/mtd/nand/nand_ecc.c                        |   10 +-
6098  drivers/mtd/nand/nandsim.c                         |    4 +-
6099  drivers/mtd/nand/ndfc.c                            |   22 +-
6100  drivers/mtd/nand/nomadik_nand.c                    |    1 +
6101  drivers/mtd/nand/nuc900_nand.c                     |    1 +
6102  drivers/mtd/nand/omap2.c                           |   22 +-
6103  drivers/mtd/nand/orion_nand.c                      |   16 +-
6104  drivers/mtd/nand/pasemi_nand.c                     |    3 +-
6105  drivers/mtd/nand/plat_nand.c                       |   25 +-
6106  drivers/mtd/nand/ppchameleonevb.c                  |   47 +-
6107  drivers/mtd/nand/pxa3xx_nand.c                     |  471 ++++---
6108  drivers/mtd/nand/rtc_from4.c                       |    5 +-
6109  drivers/mtd/nand/s3c2410.c                         |   27 +-
6110  drivers/mtd/nand/sharpsl.c                         |   13 +-
6111  drivers/mtd/nand/sm_common.c                       |    2 +-
6112  drivers/mtd/nand/socrates_nand.c                   |   28 +-
6113  drivers/mtd/nand/tmio_nand.c                       |   17 +-
6114  drivers/mtd/nand/txx9ndfmc.c                       |    8 +-
6115  drivers/mtd/nftlcore.c                             |   33 +-
6116  drivers/mtd/nftlmount.c                            |   26 +-
6117  drivers/mtd/ofpart.c                               |  112 ++-
6118  drivers/mtd/onenand/generic.c                      |   14 +-
6119  drivers/mtd/onenand/omap2.c                        |   16 +-
6120  drivers/mtd/onenand/onenand_base.c                 |  104 +-
6121  drivers/mtd/onenand/onenand_bbt.c                  |    8 +-
6122  drivers/mtd/onenand/samsung.c                      |   13 +-
6123  drivers/mtd/redboot.c                              |   13 +-
6124  drivers/mtd/sm_ftl.c                               |   22 +-
6125  drivers/mtd/ssfdc.c                                |   46 +-
6126  drivers/mtd/tests/mtd_oobtest.c                    |   24 +-
6127  drivers/mtd/tests/mtd_readtest.c                   |    5 +-
6128  drivers/staging/spectra/lld_mtd.c                  |    6 +-
6129  fs/jffs2/scan.c                                    |    4 +-
6130  fs/jffs2/wbuf.c                                    |    9 +-
6131  include/linux/mtd/bbm.h                            |   39 +-
6132  include/linux/mtd/mtd.h                            |   72 +-
6133  include/linux/mtd/nand.h                           |   92 +-
6134  include/linux/mtd/onenand.h                        |    4 +
6135  include/linux/mtd/partitions.h                     |   46 +-
6136  include/linux/mtd/physmap.h                        |   17 -
6137  include/mtd/mtd-abi.h                              |  122 ++-
6138  165 files changed, 5713 insertions(+), 3892 deletions(-)
6139  create mode 100644 Documentation/devicetree/bindings/mtd/atmel-dataflash.txt
6140  delete mode 100644 drivers/mtd/maps/ceiva.c
6141  delete mode 100644 drivers/mtd/maps/edb7312.c
6142  delete mode 100644 drivers/mtd/nand/edb7312.c
6143  create mode 100644 drivers/mtd/nand/gpmi-nand/Makefile
6144  create mode 100644 drivers/mtd/nand/gpmi-nand/bch-regs.h
6145  create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-lib.c
6146  create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-nand.c
6147  create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-nand.h
6148  create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-regs.h
6149 Merging crypto/master
6150 $ git merge crypto/master
6151 Merge made by recursive.
6152  .../devicetree/bindings/crypto/picochip-spacc.txt  |   23 +
6153  arch/x86/crypto/Makefile                           |    8 +
6154  arch/x86/crypto/sha1_ssse3_asm.S                   |  558 ++++++++++++++++++++
6155  arch/x86/crypto/sha1_ssse3_glue.c                  |  240 +++++++++
6156  arch/x86/include/asm/cpufeature.h                  |    3 +
6157  crypto/Kconfig                                     |   10 +
6158  crypto/cryptd.c                                    |    2 +-
6159  crypto/sha1_generic.c                              |    9 +-
6160  drivers/crypto/n2_core.c                           |    4 +-
6161  drivers/crypto/padlock-aes.c                       |    4 +-
6162  drivers/crypto/picoxcell_crypto.c                  |  121 ++---
6163  include/crypto/sha.h                               |    5 +
6164  12 files changed, 915 insertions(+), 72 deletions(-)
6165  create mode 100644 Documentation/devicetree/bindings/crypto/picochip-spacc.txt
6166  create mode 100644 arch/x86/crypto/sha1_ssse3_asm.S
6167  create mode 100644 arch/x86/crypto/sha1_ssse3_glue.c
6168 Merging sound/for-next
6169 $ git merge sound/for-next
6170 Removing sound/pci/hda/alc268_quirks.c
6171 Removing sound/pci/hda/alc269_quirks.c
6172 Removing sound/pci/hda/alc662_quirks.c
6173 Removing sound/pci/hda/alc680_quirks.c
6174 Removing sound/pci/hda/alc861_quirks.c
6175 Removing sound/pci/hda/alc861vd_quirks.c
6176 Merge made by recursive.
6177  .../bindings/sound/soc/codecs/fsl-sgtl5000.txt     |   11 +
6178  Documentation/devicetree/bindings/sound/wm8510.txt |   18 +
6179  Documentation/devicetree/bindings/sound/wm8523.txt |   16 +
6180  Documentation/devicetree/bindings/sound/wm8580.txt |   16 +
6181  Documentation/devicetree/bindings/sound/wm8711.txt |   18 +
6182  Documentation/devicetree/bindings/sound/wm8728.txt |   18 +
6183  Documentation/devicetree/bindings/sound/wm8731.txt |   18 +
6184  Documentation/devicetree/bindings/sound/wm8737.txt |   18 +
6185  Documentation/devicetree/bindings/sound/wm8741.txt |   18 +
6186  Documentation/devicetree/bindings/sound/wm8750.txt |   18 +
6187  Documentation/devicetree/bindings/sound/wm8753.txt |   18 +
6188  Documentation/sound/alsa/ALSA-Configuration.txt    |    5 +
6189  Documentation/sound/alsa/HD-Audio-Models.txt       |   67 +-
6190  Documentation/sound/alsa/HD-Audio.txt              |   48 +
6191  arch/mips/alchemy/devboards/db1200/platform.c      |   16 +
6192  arch/mips/alchemy/devboards/db1x00/platform.c      |   48 +
6193  include/linux/mfd/wm8994/registers.h               |   84 ++
6194  include/sound/adau1373.h                           |   34 +
6195  include/sound/soc-dapm.h                           |    2 +
6196  include/sound/soc.h                                |   10 +
6197  sound/core/control.c                               |    4 +-
6198  sound/firewire/isight.c                            |    1 -
6199  sound/mips/Kconfig                                 |    5 +-
6200  sound/pci/ctxfi/ctpcm.c                            |    2 +-
6201  sound/pci/ctxfi/ctsrc.c                            |    2 +-
6202  sound/pci/ctxfi/ctvmem.h                           |    2 +-
6203  sound/pci/hda/Makefile                             |    3 +
6204  sound/pci/hda/alc260_quirks.c                      |  304 -----
6205  sound/pci/hda/alc262_quirks.c                      |  508 +-------
6206  sound/pci/hda/alc268_quirks.c                      |  636 ---------
6207  sound/pci/hda/alc269_quirks.c                      |  674 ----------
6208  sound/pci/hda/alc662_quirks.c                      | 1408 -------------------
6209  sound/pci/hda/alc680_quirks.c                      |  222 ---
6210  sound/pci/hda/alc861_quirks.c                      |  725 ----------
6211  sound/pci/hda/alc861vd_quirks.c                    |  605 ---------
6212  sound/pci/hda/hda_codec.c                          |   71 +-
6213  sound/pci/hda/hda_intel.c                          |   68 +-
6214  sound/pci/hda/hda_local.h                          |   24 +-
6215  sound/pci/hda/hda_trace.h                          |  117 ++
6216  sound/pci/hda/patch_conexant.c                     |   93 +-
6217  sound/pci/hda/patch_realtek.c                      |  946 +++++++++-----
6218  sound/pci/oxygen/xonar_pcm179x.c                   |    1 +
6219  sound/pci/rme9652/hdspm.c                          |  139 +-
6220  sound/soc/Kconfig                                  |    3 +
6221  sound/soc/Makefile                                 |    1 +
6222  sound/soc/au1x/Kconfig                             |   28 +
6223  sound/soc/au1x/Makefile                            |   10 +
6224  sound/soc/au1x/ac97c.c                             |  363 +++++
6225  sound/soc/au1x/db1000.c                            |   75 +
6226  sound/soc/au1x/db1200.c                            |   64 +-
6227  sound/soc/au1x/dbdma2.c                            |   91 +-
6228  sound/soc/au1x/dma.c                               |  377 ++++++
6229  sound/soc/au1x/i2sc.c                              |  346 +++++
6230  sound/soc/au1x/psc-ac97.c                          |   48 +-
6231  sound/soc/au1x/psc-i2s.c                           |   42 +-
6232  sound/soc/au1x/psc.h                               |   16 +-
6233  sound/soc/blackfin/Kconfig                         |   13 +
6234  sound/soc/blackfin/Makefile                        |    2 +
6235  sound/soc/blackfin/bfin-eval-adau1373.c            |  202 +++
6236  sound/soc/codecs/Kconfig                           |    4 +
6237  sound/soc/codecs/Makefile                          |    2 +
6238  sound/soc/codecs/adau1373.c                        | 1414 ++++++++++++++++++++
6239  sound/soc/codecs/adau1373.h                        |   29 +
6240  sound/soc/codecs/sgtl5000.c                        |    8 +
6241  sound/soc/codecs/sta32x.c                          |   21 +-
6242  sound/soc/codecs/wm1250-ev1.c                      |   20 +-
6243  sound/soc/codecs/wm8510.c                          |    8 +
6244  sound/soc/codecs/wm8523.c                          |   35 +-
6245  sound/soc/codecs/wm8580.c                          |    9 +-
6246  sound/soc/codecs/wm8711.c                          |   13 +-
6247  sound/soc/codecs/wm8728.c                          |   13 +-
6248  sound/soc/codecs/wm8731.c                          |   10 +
6249  sound/soc/codecs/wm8737.c                          |   10 +
6250  sound/soc/codecs/wm8741.c                          |  135 ++-
6251  sound/soc/codecs/wm8750.c                          |   14 +-
6252  sound/soc/codecs/wm8753.c                          |   13 +-
6253  sound/soc/codecs/wm8962.c                          |  187 +++-
6254  sound/soc/codecs/wm8993.c                          |    7 +-
6255  sound/soc/codecs/wm8994-tables.c                   |   16 +-
6256  sound/soc/codecs/wm8994.c                          |  270 +++-
6257  sound/soc/codecs/wm8994.h                          |    2 +
6258  sound/soc/codecs/wm8996.c                          |   12 +-
6259  sound/soc/codecs/wm_hubs.c                         |   48 +-
6260  sound/soc/codecs/wm_hubs.h                         |    3 +-
6261  sound/soc/fsl/fsl_dma.c                            |    1 -
6262  sound/soc/fsl/fsl_ssi.c                            |   61 +-
6263  sound/soc/fsl/mpc5200_dma.c                        |    6 +-
6264  sound/soc/mxs/Kconfig                              |   20 +
6265  sound/soc/mxs/Makefile                             |   10 +
6266  sound/soc/mxs/mxs-pcm.c                            |  359 +++++
6267  sound/soc/mxs/mxs-pcm.h                            |   43 +
6268  sound/soc/mxs/mxs-saif.c                           |  680 ++++++++++
6269  sound/soc/mxs/mxs-saif.h                           |  130 ++
6270  sound/soc/mxs/mxs-sgtl5000.c                       |  173 +++
6271  sound/soc/nuc900/nuc900-pcm.c                      |    1 -
6272  sound/soc/pxa/spitz.c                              |    2 +-
6273  sound/soc/pxa/z2.c                                 |    2 +-
6274  sound/soc/s6000/s6000-pcm.c                        |    1 -
6275  sound/soc/samsung/Kconfig                          |    6 +-
6276  sound/soc/samsung/jive_wm8750.c                    |    2 +-
6277  sound/soc/samsung/smartq_wm8987.c                  |    2 +-
6278  sound/soc/samsung/smdk_wm8580.c                    |    6 +-
6279  sound/soc/samsung/smdk_wm8580pcm.c                 |    4 +-
6280  sound/soc/samsung/speyside.c                       |    5 +-
6281  sound/soc/samsung/speyside_wm8962.c                |    4 +-
6282  sound/soc/soc-cache.c                              |    7 -
6283  sound/soc/soc-core.c                               |    6 +-
6284  sound/soc/soc-dapm.c                               |   12 +-
6285  sound/soc/soc-io.c                                 |  357 +-----
6286  sound/soc/soc-pcm.c                                |    2 -
6287  sound/usb/midi.c                                   |   27 +
6288  sound/usb/mixer.c                                  |   13 +-
6289  sound/usb/quirks-table.h                           |   11 +
6290  sound/usb/quirks.c                                 |    1 +
6291  sound/usb/usbaudio.h                               |    1 +
6292  115 files changed, 6742 insertions(+), 6258 deletions(-)
6293  create mode 100644 Documentation/devicetree/bindings/sound/soc/codecs/fsl-sgtl5000.txt
6294  create mode 100644 Documentation/devicetree/bindings/sound/wm8510.txt
6295  create mode 100644 Documentation/devicetree/bindings/sound/wm8523.txt
6296  create mode 100644 Documentation/devicetree/bindings/sound/wm8580.txt
6297  create mode 100644 Documentation/devicetree/bindings/sound/wm8711.txt
6298  create mode 100644 Documentation/devicetree/bindings/sound/wm8728.txt
6299  create mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt
6300  create mode 100644 Documentation/devicetree/bindings/sound/wm8737.txt
6301  create mode 100644 Documentation/devicetree/bindings/sound/wm8741.txt
6302  create mode 100644 Documentation/devicetree/bindings/sound/wm8750.txt
6303  create mode 100644 Documentation/devicetree/bindings/sound/wm8753.txt
6304  create mode 100644 include/sound/adau1373.h
6305  delete mode 100644 sound/pci/hda/alc268_quirks.c
6306  delete mode 100644 sound/pci/hda/alc269_quirks.c
6307  delete mode 100644 sound/pci/hda/alc662_quirks.c
6308  delete mode 100644 sound/pci/hda/alc680_quirks.c
6309  delete mode 100644 sound/pci/hda/alc861_quirks.c
6310  delete mode 100644 sound/pci/hda/alc861vd_quirks.c
6311  create mode 100644 sound/pci/hda/hda_trace.h
6312  create mode 100644 sound/soc/au1x/ac97c.c
6313  create mode 100644 sound/soc/au1x/db1000.c
6314  create mode 100644 sound/soc/au1x/dma.c
6315  create mode 100644 sound/soc/au1x/i2sc.c
6316  create mode 100644 sound/soc/blackfin/bfin-eval-adau1373.c
6317  create mode 100644 sound/soc/codecs/adau1373.c
6318  create mode 100644 sound/soc/codecs/adau1373.h
6319  create mode 100644 sound/soc/mxs/Kconfig
6320  create mode 100644 sound/soc/mxs/Makefile
6321  create mode 100644 sound/soc/mxs/mxs-pcm.c
6322  create mode 100644 sound/soc/mxs/mxs-pcm.h
6323  create mode 100644 sound/soc/mxs/mxs-saif.c
6324  create mode 100644 sound/soc/mxs/mxs-saif.h
6325  create mode 100644 sound/soc/mxs/mxs-sgtl5000.c
6326 Merging sound-asoc/for-next
6327 $ git merge sound-asoc/for-next
6328 Auto-merging MAINTAINERS
6329 Auto-merging drivers/base/regmap/regmap.c
6330 Merge made by recursive.
6331  Documentation/devicetree/bindings/sound/wm8770.txt |   16 +++++
6332  Documentation/devicetree/bindings/sound/wm8776.txt |   18 ++++++
6333  Documentation/devicetree/bindings/sound/wm8804.txt |   18 ++++++
6334  MAINTAINERS                                        |    4 +
6335  drivers/base/regmap/regmap.c                       |    9 +++
6336  include/linux/regmap.h                             |   52 ++++++++++++++++
6337  include/sound/soc.h                                |    6 +-
6338  sound/soc/atmel/playpaq_wm8510.c                   |    5 +-
6339  sound/soc/blackfin/bf5xx-ad193x.c                  |    4 +-
6340  sound/soc/codecs/ad193x.c                          |   65 ++++++++++++++++---
6341  sound/soc/codecs/ad193x.h                          |   34 +++++-----
6342  sound/soc/codecs/ad1980.c                          |   10 ++-
6343  sound/soc/codecs/adav80x.c                         |    3 +-
6344  sound/soc/codecs/alc5623.c                         |    2 -
6345  sound/soc/codecs/sn95031.c                         |    8 +--
6346  sound/soc/codecs/wm8770.c                          |    8 +++
6347  sound/soc/codecs/wm8776.c                          |   13 +++-
6348  sound/soc/codecs/wm8804.c                          |    9 +++
6349  sound/soc/codecs/wm8996.c                          |   35 +++++++++--
6350  sound/soc/codecs/wm9081.c                          |    4 +-
6351  sound/soc/codecs/wm9090.c                          |    2 -
6352  sound/soc/davinci/davinci-mcasp.c                  |   20 ++++--
6353  sound/soc/fsl/p1022_ds.c                           |    2 +-
6354  sound/soc/imx/imx-pcm-fiq.c                        |   12 ++--
6355  sound/soc/imx/imx-ssi.c                            |    8 +-
6356  sound/soc/mid-x86/sst_platform.c                   |   17 +++--
6357  sound/soc/pxa/raumfeld.c                           |    4 +-
6358  sound/soc/samsung/speyside.c                       |    2 +-
6359  sound/soc/soc-cache.c                              |   12 ++--
6360  sound/soc/soc-core.c                               |   18 +++---
6361  sound/soc/soc-dapm.c                               |    2 +-
6362  sound/soc/soc-jack.c                               |    2 +-
6363  32 files changed, 321 insertions(+), 103 deletions(-)
6364  create mode 100644 Documentation/devicetree/bindings/sound/wm8770.txt
6365  create mode 100644 Documentation/devicetree/bindings/sound/wm8776.txt
6366  create mode 100644 Documentation/devicetree/bindings/sound/wm8804.txt
6367 Merging cpufreq/next
6368 $ git merge cpufreq/next
6369 Merge made by recursive.
6370  Documentation/cpu-freq/governors.txt |    2 +-
6371  drivers/cpufreq/cpufreq_ondemand.c   |    2 +-
6372  drivers/cpufreq/db8500-cpufreq.c     |    7 +-
6373  drivers/cpufreq/e_powersaver.c       |  135 +++++++++++++++++++++++++++++++---
6374  drivers/cpufreq/exynos4210-cpufreq.c |  129 +++++++++++++++++++++++++++++++-
6375  5 files changed, 254 insertions(+), 21 deletions(-)
6376 Merging quilt/rr
6377 $ git merge quilt/rr
6378 Auto-merging drivers/net/virtio_net.c
6379 Merge made by recursive.
6380  arch/x86/lguest/boot.c        |   10 ++++++++++
6381  drivers/char/virtio_console.c |   10 ++++------
6382  drivers/lguest/core.c         |    2 +-
6383  drivers/net/virtio_net.c      |   14 +++++---------
6384  include/linux/virtio.h        |    4 ++--
6385  include/linux/virtio_config.h |    3 +++
6386  include/linux/virtio_ring.h   |    6 +++---
6387  7 files changed, 28 insertions(+), 21 deletions(-)
6388 Merging input/next
6389 $ git merge input/next
6390 Auto-merging drivers/input/misc/Kconfig
6391 Auto-merging drivers/input/misc/Makefile
6392 Auto-merging drivers/input/misc/ad714x-i2c.c
6393 Auto-merging include/linux/input.h
6394 Merge made by recursive.
6395  Documentation/input/multi-touch-protocol.txt |   14 +
6396  drivers/input/input-mt.c                     |    1 +
6397  drivers/input/input-polldev.c                |    6 +-
6398  drivers/input/misc/Kconfig                   |   45 ++-
6399  drivers/input/misc/Makefile                  |    4 +-
6400  drivers/input/misc/ad714x-i2c.c              |    4 +-
6401  drivers/input/misc/bma150.c                  |  691 ++++++++++++++++++++++++++
6402  drivers/input/misc/pm8xxx-vibrator.c         |  296 +++++++++++
6403  drivers/input/mouse/synaptics.c              |  527 ++++++++++++++++++--
6404  drivers/input/mouse/synaptics.h              |   27 +-
6405  drivers/input/touchscreen/tsc2007.c          |  194 ++++----
6406  drivers/input/touchscreen/wacom_w8001.c      |   29 +-
6407  include/linux/bma150.h                       |   46 ++
6408  include/linux/input.h                        |    1 +
6409  14 files changed, 1722 insertions(+), 163 deletions(-)
6410  create mode 100644 drivers/input/misc/bma150.c
6411  create mode 100644 drivers/input/misc/pm8xxx-vibrator.c
6412  create mode 100644 include/linux/bma150.h
6413 Merging input-mt/next
6414 $ git merge input-mt/next
6415 Already up-to-date.
6416 Merging lsm/for-next
6417 $ git merge lsm/for-next
6418 Already up-to-date.
6419 Merging block/for-next
6420 $ git merge block/for-next
6421 Auto-merging block/genhd.c
6422 Auto-merging fs/block_dev.c
6423 Auto-merging fs/ext4/inode.c
6424 Auto-merging fs/ext4/namei.c
6425 Auto-merging fs/gfs2/quota.c
6426 Auto-merging include/linux/fs.h
6427 Auto-merging include/linux/genhd.h
6428 Merge made by recursive.
6429  .../ABI/testing/sysfs-bus-pci-devices-cciss        |    7 +
6430  Documentation/blockdev/cciss.txt                   |   10 +
6431  block/blk-core.c                                   |   15 +-
6432  block/blk-sysfs.c                                  |   10 +-
6433  block/cfq-iosched.c                                |   20 +-
6434  block/genhd.c                                      |    4 +-
6435  block/ioctl.c                                      |    2 +-
6436  drivers/block/Kconfig                              |    2 +
6437  drivers/block/Makefile                             |    1 +
6438  drivers/block/cciss.c                              |   69 +-
6439  drivers/block/cciss.h                              |    1 +
6440  drivers/block/loop.c                               |  104 +-
6441  drivers/block/mtip32xx/Kconfig                     |    9 +
6442  drivers/block/mtip32xx/Makefile                    |    5 +
6443  drivers/block/mtip32xx/mtip32xx.c                  | 3581 ++++++++++++++++++++
6444  drivers/block/mtip32xx/mtip32xx.h                  |  445 +++
6445  drivers/block/nbd.c                                |   69 +-
6446  drivers/block/xen-blkback/common.h                 |    2 +-
6447  drivers/block/xen-blkback/xenbus.c                 |    6 +-
6448  drivers/mmc/card/block.c                           |    3 +
6449  fs/block_dev.c                                     |    2 +-
6450  fs/ext3/inode.c                                    |    4 +-
6451  fs/ext3/namei.c                                    |    3 +-
6452  fs/ext4/inode.c                                    |    4 +-
6453  fs/ext4/namei.c                                    |    3 +-
6454  fs/gfs2/log.c                                      |    4 +-
6455  fs/gfs2/meta_io.c                                  |    6 +-
6456  fs/gfs2/ops_fstype.c                               |    2 +-
6457  fs/gfs2/quota.c                                    |    2 +-
6458  include/linux/blk_types.h                          |    6 +-
6459  include/linux/blkdev.h                             |    1 -
6460  include/linux/fs.h                                 |    2 -
6461  include/linux/genhd.h                              |    6 +-
6462  include/linux/loop.h                               |    1 +
6463  34 files changed, 4312 insertions(+), 99 deletions(-)
6464  create mode 100644 drivers/block/mtip32xx/Kconfig
6465  create mode 100644 drivers/block/mtip32xx/Makefile
6466  create mode 100644 drivers/block/mtip32xx/mtip32xx.c
6467  create mode 100644 drivers/block/mtip32xx/mtip32xx.h
6468 Merging quilt/device-mapper
6469 $ git merge quilt/device-mapper
6470 Merge made by recursive.
6471  Documentation/device-mapper/persistent-data.txt    |   84 +
6472  Documentation/device-mapper/thin-provisioning.txt  |  275 +++
6473  drivers/md/Kconfig                                 |    9 +
6474  drivers/md/Makefile                                |    3 +
6475  drivers/md/dm-crypt.c                              |    1 +
6476  drivers/md/dm-flakey.c                             |    4 +-
6477  drivers/md/dm-kcopyd.c                             |   31 +-
6478  drivers/md/dm-raid.c                               |    2 +-
6479  drivers/md/dm-table.c                              |   84 +-
6480  drivers/md/dm-thin-metadata.c                      | 1406 ++++++++++++
6481  drivers/md/dm-thin-metadata.h                      |  168 ++
6482  drivers/md/dm-thin.c                               | 2280 ++++++++++++++++++++
6483  drivers/md/dm.c                                    |   12 +-
6484  drivers/md/persistent-data/Kconfig                 |    7 +
6485  drivers/md/persistent-data/Makefile                |    9 +
6486  drivers/md/persistent-data/dm-block-manager.c      |  998 +++++++++
6487  drivers/md/persistent-data/dm-block-manager.h      |  134 ++
6488  drivers/md/persistent-data/dm-btree-internal.h     |  133 ++
6489  drivers/md/persistent-data/dm-btree-remove.c       |  571 +++++
6490  drivers/md/persistent-data/dm-btree-spine.c        |  222 ++
6491  drivers/md/persistent-data/dm-btree.c              |  861 ++++++++
6492  drivers/md/persistent-data/dm-btree.h              |  158 ++
6493  .../persistent-data/dm-persistent-data-internal.h  |   20 +
6494  drivers/md/persistent-data/dm-space-map-common.h   |   94 +
6495  drivers/md/persistent-data/dm-space-map-disk.c     |  663 ++++++
6496  drivers/md/persistent-data/dm-space-map-disk.h     |   25 +
6497  drivers/md/persistent-data/dm-space-map-metadata.c |  956 ++++++++
6498  drivers/md/persistent-data/dm-space-map-metadata.h |   33 +
6499  drivers/md/persistent-data/dm-space-map.h          |  118 +
6500  .../md/persistent-data/dm-transaction-manager.c    |  414 ++++
6501  .../md/persistent-data/dm-transaction-manager.h    |  130 ++
6502  include/linux/device-mapper.h                      |   40 +-
6503  include/linux/dm-kcopyd.h                          |    4 +
6504  33 files changed, 9927 insertions(+), 22 deletions(-)
6505  create mode 100644 Documentation/device-mapper/persistent-data.txt
6506  create mode 100644 Documentation/device-mapper/thin-provisioning.txt
6507  create mode 100644 drivers/md/dm-thin-metadata.c
6508  create mode 100644 drivers/md/dm-thin-metadata.h
6509  create mode 100644 drivers/md/dm-thin.c
6510  create mode 100644 drivers/md/persistent-data/Kconfig
6511  create mode 100644 drivers/md/persistent-data/Makefile
6512  create mode 100644 drivers/md/persistent-data/dm-block-manager.c
6513  create mode 100644 drivers/md/persistent-data/dm-block-manager.h
6514  create mode 100644 drivers/md/persistent-data/dm-btree-internal.h
6515  create mode 100644 drivers/md/persistent-data/dm-btree-remove.c
6516  create mode 100644 drivers/md/persistent-data/dm-btree-spine.c
6517  create mode 100644 drivers/md/persistent-data/dm-btree.c
6518  create mode 100644 drivers/md/persistent-data/dm-btree.h
6519  create mode 100644 drivers/md/persistent-data/dm-persistent-data-internal.h
6520  create mode 100644 drivers/md/persistent-data/dm-space-map-common.h
6521  create mode 100644 drivers/md/persistent-data/dm-space-map-disk.c
6522  create mode 100644 drivers/md/persistent-data/dm-space-map-disk.h
6523  create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.c
6524  create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.h
6525  create mode 100644 drivers/md/persistent-data/dm-space-map.h
6526  create mode 100644 drivers/md/persistent-data/dm-transaction-manager.c
6527  create mode 100644 drivers/md/persistent-data/dm-transaction-manager.h
6528 Merging embedded/master
6529 $ git merge embedded/master
6530 Already up-to-date.
6531 Merging firmware/master
6532 $ git merge firmware/master
6533 Already up-to-date.
6534 Merging pcmcia/master
6535 $ git merge pcmcia/master
6536 Already up-to-date.
6537 Merging battery/master
6538 $ git merge battery/master
6539 Merge made by recursive.
6540  .../bindings/power_supply/olpc_battery.txt         |    5 +
6541  drivers/power/ds2780_battery.c                     |    2 +-
6542  drivers/power/max17042_battery.c                   |   17 ++--
6543  drivers/power/max8903_charger.c                    |    2 +-
6544  drivers/power/max8997_charger.c                    |    1 +
6545  drivers/power/max8998_charger.c                    |    2 +
6546  drivers/power/olpc_battery.c                       |   79 ++++++++++++++-----
6547  drivers/power/pda_power.c                          |   74 ++++++++++++++++--
6548  drivers/power/power_supply_sysfs.c                 |    4 +-
6549  drivers/power/wm831x_power.c                       |   44 +++++++----
6550  drivers/power/z2_battery.c                         |    2 +-
6551  include/linux/pda_power.h                          |    2 +
6552  12 files changed, 175 insertions(+), 59 deletions(-)
6553  create mode 100644 Documentation/devicetree/bindings/power_supply/olpc_battery.txt
6554 Merging leds/for-mm
6555 $ git merge leds/for-mm
6556 Resolved 'drivers/leds/Kconfig' using previous resolution.
6557 Auto-merging drivers/leds/Kconfig
6558 CONFLICT (content): Merge conflict in drivers/leds/Kconfig
6559 Automatic merge failed; fix conflicts and then commit the result.
6560 $ git commit -v -a
6561 [master b11ec7f] Merge remote-tracking branch 'leds/for-mm'
6562 $ git diff -M --stat --summary HEAD^..
6563 Merging backlight/for-mm
6564 $ git merge backlight/for-mm
6565 Already up-to-date.
6566 Merging mmc/mmc-next
6567 $ git merge mmc/mmc-next
6568 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
6569 Auto-merging arch/arm/mach-shmobile/board-ag5evm.c
6570 Auto-merging arch/arm/mach-shmobile/board-mackerel.c
6571 Auto-merging drivers/mmc/card/block.c
6572 Auto-merging drivers/mmc/core/core.c
6573 Auto-merging drivers/mmc/core/host.c
6574 Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c
6575 Auto-merging drivers/mmc/host/sdhci-tegra.c
6576 Auto-merging drivers/mmc/host/sh_mobile_sdhi.c
6577 Merge made by recursive.
6578  .../devicetree/bindings/mmc/nvidia-sdhci.txt       |   27 +
6579  Documentation/fault-injection/fault-injection.txt  |    8 +-
6580  arch/arm/mach-at91/at91sam9260_devices.c           |    2 +-
6581  arch/arm/mach-msm/devices-msm7x00.c                |   24 -
6582  arch/arm/mach-msm/devices-qsd8x50.c                |   24 -
6583  arch/arm/mach-msm/include/mach/mmc.h               |    9 +-
6584  arch/arm/mach-shmobile/board-ag5evm.c              |    6 +
6585  arch/arm/mach-shmobile/board-mackerel.c            |    6 +
6586  drivers/mmc/card/block.c                           |    4 +-
6587  drivers/mmc/card/queue.c                           |    2 +-
6588  drivers/mmc/core/core.c                            |   43 +-
6589  drivers/mmc/core/debugfs.c                         |   25 +
6590  drivers/mmc/core/host.c                            |   11 +
6591  drivers/mmc/core/mmc_ops.c                         |    4 +-
6592  drivers/mmc/core/sd_ops.c                          |    8 +-
6593  drivers/mmc/core/sdio_ops.c                        |    2 +-
6594  drivers/mmc/host/Kconfig                           |   12 +-
6595  drivers/mmc/host/at91_mci.c                        |    6 +-
6596  drivers/mmc/host/atmel-mci-regs.h                  |  220 +++---
6597  drivers/mmc/host/atmel-mci.c                       |  823 +++++++++++++-------
6598  drivers/mmc/host/dw_mmc.c                          |   36 +-
6599  drivers/mmc/host/dw_mmc.h                          |    2 +-
6600  drivers/mmc/host/msm_sdcc.c                        |   78 ++-
6601  drivers/mmc/host/msm_sdcc.h                        |    6 +-
6602  drivers/mmc/host/sdhci-esdhc-imx.c                 |   44 +-
6603  drivers/mmc/host/sdhci-tegra.c                     |   54 +-
6604  drivers/mmc/host/sh_mobile_sdhi.c                  |   98 ++-
6605  drivers/mmc/host/tmio_mmc.h                        |    7 +
6606  drivers/mmc/host/tmio_mmc_pio.c                    |  149 +++--
6607  include/linux/atmel-mci.h                          |    4 +-
6608  include/linux/atmel_pdc.h                          |    2 +
6609  include/linux/mmc/host.h                           |    5 +
6610  include/linux/mmc/sh_mobile_sdhi.h                 |    4 +
6611  lib/Kconfig.debug                                  |   11 +
6612  lib/fault-inject.c                                 |    2 +
6613  35 files changed, 1197 insertions(+), 571 deletions(-)
6614  create mode 100644 Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt
6615 Merging kgdb/kgdb-next
6616 $ git merge kgdb/kgdb-next
6617 Merge made by recursive.
6618 Merging slab/for-next
6619 $ git merge slab/for-next
6620 Merge made by recursive.
6621  Documentation/vm/00-INDEX |    2 -
6622  Documentation/vm/slub.txt |    2 +-
6623  include/linux/mm_types.h  |   14 +-
6624  include/linux/slub_def.h  |    4 +
6625  mm/slab.c                 |   17 +-
6626  mm/slub.c                 |  551 +++++++++++++++++++++++++++++++-------------
6627  tools/slub/slabinfo.c     |    8 +
6628  7 files changed, 420 insertions(+), 178 deletions(-)
6629 Merging uclinux/for-next
6630 $ git merge uclinux/for-next
6631 Already up-to-date.
6632 Merging md/for-next
6633 $ git merge md/for-next
6634 Merge made by recursive.
6635  drivers/md/bitmap.c |   71 +++++++++++++++++++++++++++-----------------------
6636  drivers/md/md.h     |    2 +-
6637  2 files changed, 39 insertions(+), 34 deletions(-)
6638 Merging mfd/for-next
6639 $ git merge mfd/for-next
6640 Resolved 'drivers/rtc/rtc-twl.c' using previous resolution.
6641 Auto-merging arch/arm/mach-omap2/board-omap3beagle.c
6642 Auto-merging drivers/rtc/rtc-twl.c
6643 CONFLICT (content): Merge conflict in drivers/rtc/rtc-twl.c
6644 Automatic merge failed; fix conflicts and then commit the result.
6645 $ git commit -v -a
6646 [master f1fcd45] Merge remote-tracking branch 'mfd/for-next'
6647 $ git diff -M --stat --summary HEAD^..
6648  arch/arm/mach-omap2/board-omap3beagle.c |    9 +-
6649  drivers/leds/leds-asic3.c               |   35 +++-
6650  drivers/mfd/Kconfig                     |    1 +
6651  drivers/mfd/ab3550-core.c               |   10 +-
6652  drivers/mfd/ab8500-gpadc.c              |   56 ++++--
6653  drivers/mfd/asic3.c                     |   26 ++-
6654  drivers/mfd/max8997.c                   |   32 +++-
6655  drivers/mfd/omap-usb-host.c             |    2 +-
6656  drivers/mfd/pcf50633-core.c             |  114 +++-------
6657  drivers/mfd/tc3589x.c                   |    2 +
6658  drivers/mfd/timberdale.c                |    9 +-
6659  drivers/mfd/tps65910-irq.c              |    2 +
6660  drivers/mfd/twl4030-irq.c               |  342 ++++++++++++-------------------
6661  drivers/mfd/twl4030-madc.c              |   27 +++-
6662  drivers/mfd/twl6030-irq.c               |   18 +-
6663  drivers/mfd/wm831x-irq.c                |    2 -
6664  drivers/mfd/wm8350-gpio.c               |    4 +-
6665  drivers/mfd/wm8994-core.c               |   53 +++++
6666  include/linux/i2c/twl4030-madc.h        |    4 +
6667  include/linux/mfd/ab8500/gpadc.h        |    5 +-
6668  include/linux/mfd/max8997-private.h     |    1 -
6669  include/linux/mfd/pcf50633/core.h       |    3 +-
6670  include/linux/mfd/wm8994/core.h         |    2 +
6671  include/linux/mfd/wm8994/pdata.h        |    9 +-
6672  24 files changed, 432 insertions(+), 336 deletions(-)
6673 Merging hdlc/hdlc-next
6674 $ git merge hdlc/hdlc-next
6675 Already up-to-date.
6676 Merging drm/drm-next
6677 $ git merge drm/drm-next
6678 Already up-to-date.
6679 Merging fbdev/fbdev-next
6680 $ git merge fbdev/fbdev-next
6681 Auto-merging MAINTAINERS
6682 Auto-merging arch/arm/mach-shmobile/board-mackerel.c
6683 Auto-merging drivers/video/atmel_lcdfb.c
6684 Auto-merging drivers/video/backlight/adp8870_bl.c
6685 Removing drivers/video/sh_mobile_meram.h
6686 Merge made by recursive.
6687  Documentation/fb/udlfb.txt                   |   39 +-
6688  MAINTAINERS                                  |    6 +
6689  arch/arm/mach-shmobile/board-mackerel.c      |    1 +
6690  arch/powerpc/platforms/512x/mpc512x_shared.c |   22 +-
6691  arch/powerpc/platforms/85xx/p1022_ds.c       |   47 +-
6692  arch/powerpc/platforms/86xx/mpc8610_hpcd.c   |   55 +-
6693  arch/powerpc/sysdev/fsl_soc.h                |   25 +-
6694  drivers/staging/xgifb/XGI_main_26.c          |   22 +-
6695  drivers/video/68328fb.c                      |    4 +-
6696  drivers/video/Kconfig                        |   34 +-
6697  drivers/video/Makefile                       |    2 +
6698  drivers/video/acornfb.c                      |    5 +-
6699  drivers/video/arkfb.c                        |    9 +-
6700  drivers/video/atmel_lcdfb.c                  |   15 +-
6701  drivers/video/aty/radeon_base.c              |   10 +-
6702  drivers/video/au1200fb.c                     |  299 ++---
6703  drivers/video/backlight/adp8860_bl.c         |    1 -
6704  drivers/video/backlight/adp8870_bl.c         |    1 -
6705  drivers/video/carminefb.c                    |    6 +-
6706  drivers/video/controlfb.c                    |    2 +-
6707  drivers/video/da8xx-fb.c                     |  155 ++-
6708  drivers/video/fb-puv3.c                      |    4 +-
6709  drivers/video/fb_defio.c                     |    3 +-
6710  drivers/video/fbmem.c                        |    3 -
6711  drivers/video/fbmon.c                        |   21 +-
6712  drivers/video/fbsysfs.c                      |    3 +
6713  drivers/video/fsl-diu-fb.c                   |   74 +-
6714  drivers/video/g364fb.c                       |    5 +-
6715  drivers/video/grvga.c                        |  579 ++++++++
6716  drivers/video/gxt4500.c                      |    4 +-
6717  drivers/video/hgafb.c                        |    4 +-
6718  drivers/video/imsttfb.c                      |    2 +-
6719  drivers/video/intelfb/intelfbhw.c            |    6 +-
6720  drivers/video/mb862xx/mb862xx-i2c.c          |    2 +-
6721  drivers/video/mb862xx/mb862xxfbdrv.c         |    2 +-
6722  drivers/video/msm/mdp.c                      |    4 +-
6723  drivers/video/mx3fb.c                        |    6 +-
6724  drivers/video/mxsfb.c                        |    1 +
6725  drivers/video/neofb.c                        |    4 +-
6726  drivers/video/nuc900fb.c                     |    1 -
6727  drivers/video/platinumfb.c                   |    2 +-
6728  drivers/video/pm2fb.c                        |    6 +-
6729  drivers/video/pm3fb.c                        |    6 +-
6730  drivers/video/pxa3xx-gcu.c                   |    2 -
6731  drivers/video/s3c-fb.c                       |   90 ++-
6732  drivers/video/s3c2410fb.c                    |    1 -
6733  drivers/video/s3fb.c                         |    9 +-
6734  drivers/video/savage/savagefb_driver.c       |   16 +-
6735  drivers/video/sh_mobile_hdmi.c               |   47 +-
6736  drivers/video/sh_mobile_lcdcfb.c             | 1160 ++++++++--------
6737  drivers/video/sh_mobile_lcdcfb.h             |   12 +-
6738  drivers/video/sh_mobile_meram.c              |  208 +++-
6739  drivers/video/sh_mobile_meram.h              |   41 -
6740  drivers/video/sis/sis_main.c                 |   30 +-
6741  drivers/video/skeletonfb.c                   |    2 +-
6742  drivers/video/sm501fb.c                      |    6 +-
6743  drivers/video/smscufx.c                      | 1994 ++++++++++++++++++++++++++
6744  drivers/video/tridentfb.c                    |    4 +-
6745  drivers/video/udlfb.c                        |  187 ++-
6746  drivers/video/valkyriefb.c                   |    2 +-
6747  drivers/video/vfb.c                          |    4 +-
6748  drivers/video/vga16fb.c                      |    2 +-
6749  drivers/video/via/via_modesetting.h          |    5 +
6750  drivers/video/via/viafbdev.c                 |   16 +-
6751  drivers/video/vt8500lcdfb.c                  |    4 +-
6752  drivers/video/vt8623fb.c                     |    9 +-
6753  drivers/video/xilinxfb.c                     |    1 -
6754  include/video/sh_mobile_lcdc.h               |  135 ++-
6755  include/video/udlfb.h                        |    1 +
6756  69 files changed, 4293 insertions(+), 1197 deletions(-)
6757  create mode 100644 drivers/video/grvga.c
6758  delete mode 100644 drivers/video/sh_mobile_meram.h
6759  create mode 100644 drivers/video/smscufx.c
6760 Merging viafb/viafb-next
6761 $ git merge viafb/viafb-next
6762 Merge made by recursive.
6763  drivers/video/via/dvi.c             |   34 +--
6764  drivers/video/via/dvi.h             |    3 +-
6765  drivers/video/via/global.c          |    2 +
6766  drivers/video/via/global.h          |    2 +
6767  drivers/video/via/hw.c              |  544 ++++++-----------------------------
6768  drivers/video/via/hw.h              |  285 +------------------
6769  drivers/video/via/lcd.c             |   53 ++--
6770  drivers/video/via/lcd.h             |    7 +-
6771  drivers/video/via/share.h           |   23 +--
6772  drivers/video/via/via-core.c        |    2 +-
6773  drivers/video/via/via_modesetting.c |  104 +++++++
6774  drivers/video/via/via_modesetting.h |   18 ++
6775  drivers/video/via/viafbdev.c        |  166 ++++++------
6776  drivers/video/via/viamode.c         |   60 +++-
6777  drivers/video/via/viamode.h         |    4 +-
6778  15 files changed, 391 insertions(+), 916 deletions(-)
6779 Merging omap_dss2/for-next
6780 $ git merge omap_dss2/for-next
6781 Already up-to-date.
6782 Merging voltage/for-next
6783 $ git merge voltage/for-next
6784 Merge made by recursive.
6785  drivers/regulator/88pm8607.c           |    2 +-
6786  drivers/regulator/aat2870-regulator.c  |    1 +
6787  drivers/regulator/core.c               |   41 +++++++
6788  drivers/regulator/max8649.c            |    2 +-
6789  drivers/regulator/max8952.c            |    3 -
6790  drivers/regulator/tps65023-regulator.c |  190 +++++++++++++++++++++++++++----
6791  drivers/regulator/tps6507x-regulator.c |    8 +-
6792  drivers/regulator/tps6586x-regulator.c |   32 +++++-
6793  drivers/regulator/tps65912-regulator.c |    2 -
6794  include/linux/mfd/tps6586x.h           |   16 +++
6795  10 files changed, 257 insertions(+), 40 deletions(-)
6796 Merging security/next
6797 $ git merge security/next
6798 Resolved 'fs/ocfs2/xattr.c' using previous resolution.
6799 Auto-merging Documentation/kernel-parameters.txt
6800 Auto-merging MAINTAINERS
6801 Auto-merging fs/btrfs/xattr.c
6802 Auto-merging fs/gfs2/inode.c
6803 Auto-merging fs/ocfs2/xattr.c
6804 CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
6805 Auto-merging fs/xfs/xfs_iops.c
6806 Auto-merging kernel/cred.c
6807 Removing security/integrity/ima/ima_iint.c
6808 Auto-merging security/tomoyo/common.c
6809 Automatic merge failed; fix conflicts and then commit the result.
6810 $ git commit -v -a
6811 [master 82b2351] Merge remote-tracking branch 'security/next'
6812 $ git diff -M --stat --summary HEAD^..
6813  Documentation/ABI/testing/evm       |   23 +
6814  Documentation/kernel-parameters.txt |    6 +
6815  MAINTAINERS                         |    5 +
6816  drivers/char/tpm/tpm.c              |    3 +
6817  fs/attr.c                           |    5 +-
6818  fs/btrfs/xattr.c                    |   50 ++--
6819  fs/cifs/xattr.c                     |   40 +-
6820  fs/ext2/xattr_security.c            |   34 +-
6821  fs/ext3/xattr_security.c            |   36 +-
6822  fs/ext4/xattr_security.c            |   36 +-
6823  fs/gfs2/inode.c                     |   38 +-
6824  fs/jffs2/security.c                 |   35 +-
6825  fs/jfs/xattr.c                      |   57 ++--
6826  fs/ocfs2/xattr.c                    |   41 ++-
6827  fs/reiserfs/xattr_security.c        |    4 +-
6828  fs/xattr.c                          |   63 +++-
6829  fs/xfs/xfs_iops.c                   |   39 +-
6830  include/linux/evm.h                 |   92 +++++
6831  include/linux/ima.h                 |   13 -
6832  include/linux/integrity.h           |   38 ++
6833  include/linux/security.h            |   32 ++-
6834  include/linux/xattr.h               |   14 +-
6835  kernel/cred.c                       |   18 +-
6836  mm/shmem.c                          |    4 +-
6837  security/Kconfig                    |    2 +-
6838  security/Makefile                   |    4 +-
6839  security/apparmor/apparmorfs.c      |    2 +-
6840  security/apparmor/ipc.c             |    1 +
6841  security/apparmor/lib.c             |    1 +
6842  security/apparmor/policy_unpack.c   |   12 +-
6843  security/apparmor/procattr.c        |    1 +
6844  security/commoncap.c                |   16 +-
6845  security/integrity/Kconfig          |    7 +
6846  security/integrity/Makefile         |   12 +
6847  security/integrity/evm/Kconfig      |   14 +
6848  security/integrity/evm/Makefile     |    6 +
6849  security/integrity/evm/evm.h        |   38 ++
6850  security/integrity/evm/evm_crypto.c |  216 ++++++++++
6851  security/integrity/evm/evm_main.c   |  384 +++++++++++++++++
6852  security/integrity/evm/evm_secfs.c  |  108 +++++
6853  security/integrity/iint.c           |  171 ++++++++
6854  security/integrity/ima/Kconfig      |    1 +
6855  security/integrity/ima/Makefile     |    2 +-
6856  security/integrity/ima/ima.h        |   30 +-
6857  security/integrity/ima/ima_api.c    |    7 +-
6858  security/integrity/ima/ima_fs.c     |    2 +-
6859  security/integrity/ima/ima_iint.c   |  169 --------
6860  security/integrity/ima/ima_main.c   |   13 +-
6861  security/integrity/integrity.h      |   50 +++
6862  security/keys/gc.c                  |  386 +++++++++++++-----
6863  security/keys/internal.h            |    4 +
6864  security/keys/key.c                 |  121 +------
6865  security/keys/keyring.c             |    3 +-
6866  security/keys/process_keys.c        |   16 +-
6867  security/security.c                 |   74 +++-
6868  security/selinux/exports.c          |    1 +
6869  security/selinux/hooks.c            |   13 +-
6870  security/selinux/include/avc_ss.h   |    6 +
6871  security/selinux/include/security.h |    8 +
6872  security/selinux/netlink.c          |    2 +
6873  security/selinux/nlmsgtab.c         |    1 +
6874  security/selinux/selinuxfs.c        |    5 +-
6875  security/selinux/ss/conditional.c   |    2 +-
6876  security/selinux/ss/conditional.h   |    1 +
6877  security/selinux/ss/policydb.c      |    2 -
6878  security/selinux/ss/services.c      |    3 -
6879  security/tomoyo/Kconfig             |    2 +
6880  security/tomoyo/Makefile            |    2 +-
6881  security/tomoyo/audit.c             |    7 +-
6882  security/tomoyo/common.c            |  195 ++++++++--
6883  security/tomoyo/common.h            |  169 ++++++++-
6884  security/tomoyo/condition.c         |   15 +
6885  security/tomoyo/domain.c            |  152 ++++++--
6886  security/tomoyo/environ.c           |  122 ++++++
6887  security/tomoyo/gc.c                |   51 +++-
6888  security/tomoyo/group.c             |   61 +++-
6889  security/tomoyo/network.c           |  771 +++++++++++++++++++++++++++++++++++
6890  security/tomoyo/realpath.c          |   32 ++-
6891  security/tomoyo/securityfs_if.c     |  122 ++++++-
6892  security/tomoyo/tomoyo.c            |   62 +++
6893  security/tomoyo/util.c              |   69 +++-
6894  81 files changed, 3686 insertions(+), 789 deletions(-)
6895  create mode 100644 Documentation/ABI/testing/evm
6896  create mode 100644 include/linux/evm.h
6897  create mode 100644 include/linux/integrity.h
6898  create mode 100644 security/integrity/Kconfig
6899  create mode 100644 security/integrity/Makefile
6900  create mode 100644 security/integrity/evm/Kconfig
6901  create mode 100644 security/integrity/evm/Makefile
6902  create mode 100644 security/integrity/evm/evm.h
6903  create mode 100644 security/integrity/evm/evm_crypto.c
6904  create mode 100644 security/integrity/evm/evm_main.c
6905  create mode 100644 security/integrity/evm/evm_secfs.c
6906  create mode 100644 security/integrity/iint.c
6907  delete mode 100644 security/integrity/ima/ima_iint.c
6908  create mode 100644 security/integrity/integrity.h
6909  create mode 100644 security/tomoyo/environ.c
6910  create mode 100644 security/tomoyo/network.c
6911 Merging selinux/master
6912 $ git merge selinux/master
6913 Already up-to-date.
6914 Merging lblnet/master
6915 $ git merge lblnet/master
6916 Already up-to-date.
6917 Merging agp/agp-next
6918 $ git merge agp/agp-next
6919 Merge made by recursive.
6920 Merging watchdog/master
6921 $ git merge watchdog/master
6922 Merge made by recursive.
6923  drivers/watchdog/hpwdt.c        |    9 +++++----
6924  drivers/watchdog/watchdog_dev.c |   14 +++++++-------
6925  2 files changed, 12 insertions(+), 11 deletions(-)
6926 Merging bdev/master
6927 $ git merge bdev/master
6928 Already up-to-date.
6929 Merging dwmw2-iommu/master
6930 $ git merge dwmw2-iommu/master
6931 Already up-to-date.
6932 Merging iommu/next
6933 $ git merge iommu/next
6934 Auto-merging arch/arm/plat-omap/include/plat/iopgtable.h
6935 Auto-merging drivers/iommu/omap-iommu-debug.c
6936 Auto-merging drivers/iommu/omap-iommu.c
6937 Auto-merging drivers/iommu/omap-iovmm.c
6938 Merge made by recursive.
6939  arch/arm/mach-omap2/iommu2.c                       |   31 +-
6940  arch/arm/plat-omap/Kconfig                         |   12 -
6941  arch/arm/plat-omap/Makefile                        |    2 -
6942  arch/arm/plat-omap/include/plat/iommu.h            |   77 ++--
6943  arch/arm/plat-omap/include/plat/iommu2.h           |    4 +-
6944  arch/arm/plat-omap/{ => include/plat}/iopgtable.h  |   20 +-
6945  arch/arm/plat-omap/include/plat/iovmm.h            |   30 +-
6946  drivers/iommu/Kconfig                              |   19 +
6947  drivers/iommu/Makefile                             |    3 +
6948  drivers/iommu/iommu.c                              |    9 +-
6949  drivers/iommu/msm_iommu.c                          |    7 +
6950  .../iommu/omap-iommu-debug.c                       |   36 +-
6951  .../iommu.c => drivers/iommu/omap-iommu.c          |  510 +++++++++++++-------
6952  .../iovmm.c => drivers/iommu/omap-iovmm.c          |  370 ++++----------
6953  drivers/media/video/Kconfig                        |    2 +-
6954  drivers/media/video/omap3isp/isp.c                 |   45 ++-
6955  drivers/media/video/omap3isp/isp.h                 |    5 +-
6956  drivers/media/video/omap3isp/ispccdc.c             |   25 +-
6957  drivers/media/video/omap3isp/ispstat.c             |   11 +-
6958  drivers/media/video/omap3isp/ispvideo.c            |    4 +-
6959  lib/dma-debug.c                                    |   68 +++-
6960  21 files changed, 704 insertions(+), 586 deletions(-)
6961  rename arch/arm/plat-omap/{ => include/plat}/iopgtable.h (82%)
6962  rename arch/arm/plat-omap/iommu-debug.c => drivers/iommu/omap-iommu-debug.c (91%)
6963  rename arch/arm/plat-omap/iommu.c => drivers/iommu/omap-iommu.c (61%)
6964  rename arch/arm/plat-omap/iovmm.c => drivers/iommu/omap-iovmm.c (62%)
6965 Merging cputime/cputime
6966 $ git merge cputime/cputime
6967 Already up-to-date.
6968 Merging osd/linux-next
6969 $ git merge osd/linux-next
6970 Merge made by recursive.
6971  fs/exofs/exofs.h       |    3 --
6972  fs/exofs/super.c       |   57 ++++++++++++++++++-----------------------------
6973  include/scsi/osd_ore.h |    2 +
6974  3 files changed, 24 insertions(+), 38 deletions(-)
6975 Merging jc_docs/docs-next
6976 $ git merge jc_docs/docs-next
6977 Already up-to-date.
6978 Merging nommu/master
6979 $ git merge nommu/master
6980 Already up-to-date.
6981 Merging trivial/for-next
6982 $ git merge trivial/for-next
6983 Auto-merging fs/eventpoll.c
6984 Auto-merging lib/Kconfig.debug
6985 Auto-merging lib/idr.c
6986 Auto-merging mm/vmscan.c
6987 Merge made by recursive.
6988  Documentation/ABI/removed/o2cb                     |    2 +-
6989  Documentation/ABI/testing/sysfs-bus-bcma           |    8 ++++----
6990  .../testing/sysfs-class-backlight-driver-adp8870   |   16 ++++++++--------
6991  drivers/usb/serial/mos7720.c                       |    1 -
6992  drivers/usb/serial/mos7840.c                       |    1 -
6993  fs/eventpoll.c                                     |    2 +-
6994  lib/Kconfig.debug                                  |    2 +-
6995  lib/idr.c                                          |    2 +-
6996  mm/vmscan.c                                        |    2 +-
6997  9 files changed, 17 insertions(+), 19 deletions(-)
6998 Merging audit/for-next
6999 $ git merge audit/for-next
7000 Already up-to-date.
7001 Merging pm/linux-next
7002 $ git merge pm/linux-next
7003 Resolved 'arch/arm/mach-shmobile/board-ap4evb.c' using previous resolution.
7004 Resolved 'arch/s390/include/asm/thread_info.h' using previous resolution.
7005 Resolved 'drivers/mfd/twl4030-irq.c' using previous resolution.
7006 Auto-merging arch/alpha/include/asm/thread_info.h
7007 Auto-merging arch/arm/mach-shmobile/board-ap4evb.c
7008 CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c
7009 Auto-merging arch/arm/mach-shmobile/board-mackerel.c
7010 Auto-merging arch/arm/mach-shmobile/include/mach/sh7372.h
7011 Auto-merging arch/arm/mach-shmobile/setup-sh7372.c
7012 Auto-merging arch/s390/Kconfig
7013 Auto-merging arch/s390/include/asm/thread_info.h
7014 CONFLICT (content): Merge conflict in arch/s390/include/asm/thread_info.h
7015 Auto-merging drivers/bluetooth/btusb.c
7016 Auto-merging drivers/media/video/via-camera.c
7017 Auto-merging drivers/mfd/twl4030-irq.c
7018 CONFLICT (content): Merge conflict in drivers/mfd/twl4030-irq.c
7019 Auto-merging drivers/mfd/twl6030-irq.c
7020 Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
7021 Auto-merging drivers/usb/core/hcd.c
7022 Auto-merging fs/ext4/super.c
7023 Auto-merging fs/gfs2/log.c
7024 Auto-merging fs/gfs2/quota.c
7025 Auto-merging fs/xfs/xfs_buf.c
7026 Auto-merging include/linux/netdevice.h
7027 Removing include/linux/pm_qos_params.h
7028 Auto-merging kernel/power/qos.c
7029 Auto-merging net/mac80211/main.c
7030 Auto-merging net/mac80211/mlme.c
7031 Automatic merge failed; fix conflicts and then commit the result.
7032 $ git commit -v -a
7033 [master 8b130a7] Merge remote-tracking branch 'pm/linux-next'
7034 $ git diff -M --stat --summary HEAD^..
7035  Documentation/power/basic-pm-debugging.txt   |   24 ++
7036  Documentation/power/freezing-of-tasks.txt    |   14 +-
7037  Documentation/power/runtime_pm.txt           |    1 +
7038  Documentation/usb/power-management.txt       |    8 +-
7039  arch/alpha/include/asm/thread_info.h         |    2 -
7040  arch/arm/include/asm/thread_info.h           |    2 -
7041  arch/arm/mach-msm/clock.c                    |    2 +-
7042  arch/arm/mach-omap1/pm_bus.c                 |    1 +
7043  arch/arm/mach-shmobile/board-ap4evb.c        |    1 +
7044  arch/arm/mach-shmobile/board-mackerel.c      |    2 +-
7045  arch/arm/mach-shmobile/include/mach/sh7372.h |    3 +
7046  arch/arm/mach-shmobile/pm-sh7372.c           |   57 +---
7047  arch/arm/mach-shmobile/pm_runtime.c          |    1 +
7048  arch/arm/mach-shmobile/setup-sh7372.c        |    3 +
7049  arch/avr32/include/asm/thread_info.h         |    2 -
7050  arch/blackfin/include/asm/thread_info.h      |    2 -
7051  arch/cris/include/asm/thread_info.h          |    2 -
7052  arch/frv/include/asm/thread_info.h           |    2 -
7053  arch/h8300/include/asm/thread_info.h         |    2 -
7054  arch/ia64/include/asm/thread_info.h          |    2 -
7055  arch/m32r/include/asm/thread_info.h          |    2 -
7056  arch/m68k/include/asm/thread_info.h          |    1 -
7057  arch/microblaze/include/asm/thread_info.h    |    2 -
7058  arch/mips/include/asm/thread_info.h          |    2 -
7059  arch/mn10300/include/asm/thread_info.h       |    2 -
7060  arch/parisc/include/asm/thread_info.h        |    2 -
7061  arch/powerpc/include/asm/thread_info.h       |    2 -
7062  arch/s390/Kconfig                            |    1 +
7063  arch/s390/include/asm/thread_info.h          |    2 -
7064  arch/s390/kernel/suspend.c                   |  118 ++++++++
7065  arch/s390/kernel/swsusp_asm64.S              |    3 +
7066  arch/sh/include/asm/thread_info.h            |    2 -
7067  arch/sparc/include/asm/thread_info_32.h      |    2 -
7068  arch/sparc/include/asm/thread_info_64.h      |    2 -
7069  arch/um/include/asm/thread_info.h            |    2 -
7070  arch/unicore32/include/asm/thread_info.h     |    2 -
7071  arch/x86/include/asm/thread_info.h           |    2 -
7072  arch/xtensa/include/asm/thread_info.h        |    2 -
7073  drivers/acpi/processor_idle.c                |    2 +-
7074  drivers/base/power/Makefile                  |    4 +-
7075  drivers/base/power/clock_ops.c               |  122 ++++-----
7076  drivers/base/power/common.c                  |   86 ++++++
7077  drivers/base/power/domain.c                  |  346 +++++++++++++----------
7078  drivers/base/power/main.c                    |   34 ++-
7079  drivers/base/power/qos.c                     |  399 ++++++++++++++++++++++++++
7080  drivers/base/power/runtime.c                 |   15 +-
7081  drivers/bluetooth/btmrvl_main.c              |    2 -
7082  drivers/bluetooth/btusb.c                    |    2 +-
7083  drivers/cpuidle/cpuidle.c                    |    2 +-
7084  drivers/cpuidle/governors/ladder.c           |    2 +-
7085  drivers/cpuidle/governors/menu.c             |    2 +-
7086  drivers/hid/hid-picolcd.c                    |    2 +-
7087  drivers/hid/usbhid/hid-core.c                |    7 +-
7088  drivers/media/video/via-camera.c             |    4 +-
7089  drivers/mfd/twl6030-irq.c                    |    2 -
7090  drivers/net/ethernet/intel/e1000e/netdev.c   |    2 +-
7091  drivers/net/irda/stir4200.c                  |    2 +-
7092  drivers/net/usb/usbnet.c                     |    2 +-
7093  drivers/net/wimax/i2400m/usb.c               |    4 +-
7094  drivers/net/wireless/ipw2x00/ipw2100.c       |    4 +-
7095  drivers/platform/x86/thinkpad_acpi.c         |   15 +-
7096  drivers/staging/rts_pstor/rtsx.c             |    2 -
7097  drivers/usb/class/cdc-acm.c                  |    2 +-
7098  drivers/usb/class/cdc-wdm.c                  |    6 +-
7099  drivers/usb/core/driver.c                    |    9 +-
7100  drivers/usb/core/hcd.c                       |    4 +-
7101  drivers/usb/core/hub.c                       |   10 +-
7102  drivers/usb/serial/sierra.c                  |    2 +-
7103  drivers/usb/serial/usb_wwan.c                |    2 +-
7104  fs/btrfs/async-thread.c                      |    2 +-
7105  fs/btrfs/disk-io.c                           |    8 +-
7106  fs/ext4/super.c                              |    3 +-
7107  fs/fs-writeback.c                            |    4 +-
7108  fs/gfs2/log.c                                |    4 +-
7109  fs/gfs2/quota.c                              |    4 +-
7110  fs/jbd/journal.c                             |    2 +-
7111  fs/jbd2/journal.c                            |    2 +-
7112  fs/jfs/jfs_logmgr.c                          |    2 +-
7113  fs/jfs/jfs_txnmgr.c                          |    4 +-
7114  fs/nilfs2/segment.c                          |    2 +-
7115  fs/xfs/xfs_buf.c                             |    2 +-
7116  include/linux/device.h                       |    5 +
7117  include/linux/freezer.h                      |   78 ++---
7118  include/linux/kthread.h                      |    1 +
7119  include/linux/netdevice.h                    |    4 +-
7120  include/linux/pm.h                           |   32 ++-
7121  include/linux/pm_clock.h                     |   71 +++++
7122  include/linux/pm_domain.h                    |   18 +-
7123  include/linux/pm_qos.h                       |  147 ++++++++++
7124  include/linux/pm_qos_params.h                |   38 ---
7125  include/linux/pm_runtime.h                   |   42 ---
7126  include/linux/sched.h                        |    3 +-
7127  include/linux/suspend.h                      |   86 ++++++
7128  include/sound/pcm.h                          |    4 +-
7129  kernel/Makefile                              |    2 +-
7130  kernel/cgroup_freezer.c                      |   51 ++--
7131  kernel/exit.c                                |    8 +-
7132  kernel/fork.c                                |    1 -
7133  kernel/freezer.c                             |  179 +++++++-----
7134  kernel/kthread.c                             |   25 ++
7135  kernel/power/Kconfig                         |    3 +
7136  kernel/power/Makefile                        |    2 +-
7137  kernel/power/hibernate.c                     |   15 +-
7138  kernel/power/main.c                          |  102 +++++++
7139  kernel/power/process.c                       |   65 ++---
7140  kernel/{pm_qos_params.c => power/qos.c}      |  273 +++++++++---------
7141  kernel/power/snapshot.c                      |   18 ++
7142  kernel/power/suspend.c                       |   17 +-
7143  kernel/power/user.c                          |    4 +-
7144  mm/backing-dev.c                             |    8 +-
7145  net/mac80211/main.c                          |    2 +-
7146  net/mac80211/mlme.c                          |    2 +-
7147  net/mac80211/scan.c                          |    2 +-
7148  sound/core/pcm_native.c                      |    2 +-
7149  sound/usb/card.c                             |    2 +-
7150  115 files changed, 1875 insertions(+), 859 deletions(-)
7151  create mode 100644 drivers/base/power/common.c
7152  create mode 100644 drivers/base/power/qos.c
7153  create mode 100644 include/linux/pm_clock.h
7154  create mode 100644 include/linux/pm_qos.h
7155  delete mode 100644 include/linux/pm_qos_params.h
7156  rename kernel/{pm_qos_params.c => power/qos.c} (71%)
7157 Merging apm/for-next
7158 $ git merge apm/for-next
7159 Auto-merging drivers/char/apm-emulation.c
7160 Merge made by recursive.
7161  drivers/char/apm-emulation.c |   16 ++++++----------
7162  1 files changed, 6 insertions(+), 10 deletions(-)
7163 Merging fsnotify/for-next
7164 $ git merge fsnotify/for-next
7165 Auto-merging fs/cachefiles/namei.c
7166 Auto-merging fs/nfsd/vfs.c
7167 Auto-merging fs/notify/fanotify/fanotify_user.c
7168 Auto-merging fs/notify/group.c
7169 Auto-merging fs/notify/mark.c
7170 Auto-merging include/linux/fsnotify_backend.h
7171 Merge made by recursive.
7172  fs/cachefiles/namei.c              |    1 -
7173  fs/cachefiles/xattr.c              |    1 -
7174  fs/nfsd/vfs.c                      |    3 -
7175  fs/notify/dnotify/dnotify.c        |   15 +++---
7176  fs/notify/fanotify/fanotify.c      |   24 +++++----
7177  fs/notify/fanotify/fanotify_user.c |  101 +++++++++++++++++++++++++-----------
7178  fs/notify/group.c                  |    1 +
7179  fs/notify/mark.c                   |   36 +++++--------
7180  include/linux/fanotify.h           |    5 ++-
7181  include/linux/fsnotify_backend.h   |   14 ++++-
7182  10 files changed, 121 insertions(+), 80 deletions(-)
7183 Merging irda/for-next
7184 $ git merge irda/for-next
7185 Already up-to-date.
7186 Merging i7core_edac/linux_next
7187 $ git merge i7core_edac/linux_next
7188 Auto-merging drivers/edac/i7core_edac.c
7189 Merge made by recursive.
7190  drivers/edac/i7core_edac.c |   23 ++++++++++++++++++++---
7191  1 files changed, 20 insertions(+), 3 deletions(-)
7192 Merging i7300_edac/linux_next
7193 $ git merge i7300_edac/linux_next
7194 Resolved 'arch/x86/kernel/cpu/mcheck/mce.c' using previous resolution.
7195 Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
7196 CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
7197 Removing drivers/edac/edac_mce.c
7198 Auto-merging drivers/edac/i7core_edac.c
7199 Auto-merging include/linux/edac.h
7200 Removing include/linux/edac_mce.h
7201 Automatic merge failed; fix conflicts and then commit the result.
7202 $ git commit -v -a
7203 [master 141aad7] Merge remote-tracking branch 'i7300_edac/linux_next'
7204 $ git diff -M --stat --summary HEAD^..
7205  arch/x86/kernel/cpu/mcheck/mce.c |   18 +--
7206  drivers/edac/Kconfig             |    8 +-
7207  drivers/edac/Makefile            |    1 -
7208  drivers/edac/edac_core.h         |  350 +----------------------------------
7209  drivers/edac/edac_mce.c          |   61 ------
7210  drivers/edac/i7core_edac.c       |  385 ++++++++++++++++++++++++++++++++++----
7211  include/linux/edac.h             |  350 ++++++++++++++++++++++++++++++++++
7212  include/linux/edac_mce.h         |   31 ---
7213  8 files changed, 709 insertions(+), 495 deletions(-)
7214  delete mode 100644 drivers/edac/edac_mce.c
7215  delete mode 100644 include/linux/edac_mce.h
7216 Merging devicetree/devicetree/next
7217 $ git merge devicetree/devicetree/next
7218 Resolved 'drivers/of/base.c' using previous resolution.
7219 Auto-merging drivers/of/base.c
7220 CONFLICT (content): Merge conflict in drivers/of/base.c
7221 Automatic merge failed; fix conflicts and then commit the result.
7222 $ git commit -v -a
7223 [master f93dc4e] Merge remote-tracking branch 'devicetree/devicetree/next'
7224 $ git diff -M --stat --summary HEAD^..
7225 Merging spi/spi/next
7226 $ git merge spi/spi/next
7227 Already up-to-date.
7228 Merging gpio/gpio/next
7229 $ git merge gpio/gpio/next
7230 Already up-to-date.
7231 Merging tip/auto-latest
7232 $ git merge tip/auto-latest
7233 Auto-merging Documentation/kernel-parameters.txt
7234 Auto-merging arch/arm/common/gic.c
7235 Auto-merging arch/arm/kernel/smp.c
7236 Auto-merging arch/arm/kernel/traps.c
7237 Auto-merging arch/arm/mach-footbridge/netwinder-hw.c
7238 Auto-merging arch/arm/mach-integrator/core.c
7239 Auto-merging arch/arm/mach-ixp4xx/common-pci.c
7240 Auto-merging arch/arm/mm/cache-l2x0.c
7241 Auto-merging arch/arm/mm/context.c
7242 Auto-merging arch/x86/include/asm/cpufeature.h
7243 Auto-merging drivers/acpi/processor_idle.c
7244 Auto-merging drivers/cpufreq/cpufreq_ondemand.c
7245 Removing drivers/staging/hv/hv_timesource.c
7246 Auto-merging include/linux/sched.h
7247 Merge made by recursive.
7248  Documentation/kernel-parameters.txt              |   18 +
7249  Documentation/scheduler/sched-bwc.txt            |  122 ++++
7250  Documentation/x86/entry_64.txt                   |    3 -
7251  arch/arm/common/gic.c                            |   26 +-
7252  arch/arm/include/asm/dma.h                       |    6 +-
7253  arch/arm/include/asm/mmu.h                       |    4 +-
7254  arch/arm/kernel/dma.c                            |    2 +-
7255  arch/arm/kernel/smp.c                            |    6 +-
7256  arch/arm/kernel/traps.c                          |   20 +-
7257  arch/arm/mach-footbridge/include/mach/hardware.h |    2 +-
7258  arch/arm/mach-footbridge/netwinder-hw.c          |   14 +-
7259  arch/arm/mach-footbridge/netwinder-leds.c        |   10 +-
7260  arch/arm/mach-integrator/core.c                  |    6 +-
7261  arch/arm/mach-integrator/pci_v3.c                |   14 +-
7262  arch/arm/mach-ixp4xx/common-pci.c                |   22 +-
7263  arch/arm/mach-shark/leds.c                       |    6 +-
7264  arch/arm/mm/cache-l2x0.c                         |   46 +-
7265  arch/arm/mm/context.c                            |   14 +-
7266  arch/arm/mm/copypage-v4mc.c                      |    6 +-
7267  arch/arm/mm/copypage-v6.c                        |   10 +-
7268  arch/arm/mm/copypage-xscale.c                    |    6 +-
7269  arch/powerpc/sysdev/uic.c                        |   24 +-
7270  arch/s390/kernel/time.c                          |   13 +-
7271  arch/x86/Kconfig                                 |   10 +
7272  arch/x86/include/asm/amd_nb.h                    |    6 +
7273  arch/x86/include/asm/archrandom.h                |   75 +++
7274  arch/x86/include/asm/cpufeature.h                |    1 +
7275  arch/x86/include/asm/elf.h                       |   31 +
7276  arch/x86/include/asm/pgtable_types.h             |    1 -
7277  arch/x86/include/asm/unistd_64.h                 |    1 -
7278  arch/x86/include/asm/x86_init.h                  |   12 -
7279  arch/x86/kernel/cpu/Makefile                     |    1 +
7280  arch/x86/kernel/cpu/amd.c                        |   47 +-
7281  arch/x86/kernel/cpu/common.c                     |    5 +
7282  arch/x86/kernel/cpu/cpu.h                        |    1 +
7283  arch/x86/kernel/cpu/intel_cacheinfo.c            |  127 ++---
7284  arch/x86/kernel/cpu/mcheck/mce_intel.c           |   10 +-
7285  arch/x86/kernel/cpu/mshyperv.c                   |   23 +
7286  arch/x86/kernel/cpu/perf_event.c                 |    8 +
7287  arch/x86/kernel/cpu/perf_event_amd.c             |    2 +-
7288  arch/x86/kernel/cpu/perf_event_intel.c           |    2 +-
7289  arch/x86/kernel/cpu/rdrand.c                     |   73 +++
7290  arch/x86/kernel/process.c                        |    2 +-
7291  arch/x86/kernel/sys_x86_64.c                     |   77 +++-
7292  arch/x86/kernel/x86_init.c                       |    4 -
7293  arch/x86/mm/fault.c                              |    2 +-
7294  arch/x86/mm/init.c                               |  147 ++++--
7295  arch/x86/mm/mmap.c                               |   20 +-
7296  arch/x86/mm/mmio-mod.c                           |    1 -
7297  arch/x86/oprofile/nmi_int.c                      |    4 +-
7298  arch/x86/vdso/vma.c                              |    9 +
7299  arch/x86/xen/mmu.c                               |   15 -
7300  drivers/acpi/processor_idle.c                    |   10 +-
7301  drivers/char/random.c                            |   23 +-
7302  drivers/cpufreq/cpufreq_conservative.c           |    4 +-
7303  drivers/cpufreq/cpufreq_ondemand.c               |    4 +-
7304  drivers/dca/dca-core.c                           |   78 ++-
7305  drivers/dma/ipu/ipu_irq.c                        |   48 +-
7306  drivers/iommu/dmar.c                             |   48 +-
7307  drivers/iommu/intel-iommu.c                      |   36 +-
7308  drivers/iommu/intr_remapping.c                   |   40 +-
7309  drivers/oprofile/event_buffer.c                  |    4 +-
7310  drivers/oprofile/oprofile_perf.c                 |    4 +-
7311  drivers/oprofile/oprofilefs.c                    |    6 +-
7312  drivers/staging/hv/Makefile                      |    2 +-
7313  drivers/staging/hv/hv_timesource.c               |  101 ----
7314  drivers/video/console/vgacon.c                   |   42 +-
7315  fs/proc/stat.c                                   |   41 +-
7316  include/asm-generic/cputime.h                    |    4 +-
7317  include/linux/alarmtimer.h                       |   51 ++-
7318  include/linux/clockchips.h                       |   12 +-
7319  include/linux/init_task.h                        |    2 +-
7320  include/linux/intel-iommu.h                      |    4 +-
7321  include/linux/irq.h                              |    2 +
7322  include/linux/kprobes.h                          |    2 +-
7323  include/linux/oprofile.h                         |    2 +-
7324  include/linux/percpu_counter.h                   |    2 +-
7325  include/linux/posix-timers.h                     |    5 +-
7326  include/linux/proportions.h                      |    6 +-
7327  include/linux/random.h                           |   13 +
7328  include/linux/ratelimit.h                        |    6 +-
7329  include/linux/rwsem-spinlock.h                   |    2 +-
7330  include/linux/rwsem.h                            |   10 +-
7331  include/linux/sched.h                            |    9 +-
7332  include/linux/semaphore.h                        |    4 +-
7333  init/Kconfig                                     |   12 +
7334  kernel/cgroup.c                                  |   18 +-
7335  kernel/events/core.c                             |  101 +++-
7336  kernel/irq/chip.c                                |    2 +-
7337  kernel/irq/manage.c                              |    3 +
7338  kernel/kprobes.c                                 |   34 +-
7339  kernel/latencytop.c                              |   14 +-
7340  kernel/posix-cpu-timers.c                        |   17 +-
7341  kernel/printk.c                                  |   46 +-
7342  kernel/rtmutex-debug.c                           |   75 +--
7343  kernel/sched.c                                   |  583 +++++++++++++++---
7344  kernel/sched_cpupri.c                            |   89 ++-
7345  kernel/sched_cpupri.h                            |    7 +-
7346  kernel/sched_fair.c                              |  700 +++++++++++++++++++++-
7347  kernel/sched_features.h                          |    5 -
7348  kernel/sched_rt.c                                |   91 ++--
7349  kernel/sched_stats.h                             |   12 +-
7350  kernel/sched_stoptask.c                          |    2 +
7351  kernel/semaphore.c                               |   28 +-
7352  kernel/sysctl.c                                  |   10 +
7353  kernel/time/Kconfig                              |    2 +
7354  kernel/time/alarmtimer.c                         |  235 +++++---
7355  kernel/time/clockevents.c                        |  129 ++++-
7356  kernel/time/clocksource.c                        |   38 +-
7357  kernel/time/tick-broadcast.c                     |    4 +-
7358  kernel/time/tick-common.c                        |    4 +-
7359  kernel/time/tick-internal.h                      |    2 -
7360  kernel/time/tick-oneshot.c                       |   77 +---
7361  kernel/time/tick-sched.c                         |   55 ++-
7362  kernel/time/timer_stats.c                        |    6 +-
7363  kernel/trace/ring_buffer.c                       |   52 +-
7364  kernel/trace/trace.c                             |   10 +-
7365  kernel/trace/trace_irqsoff.c                     |    6 +-
7366  kernel/watchdog.c                                |    2 +-
7367  lib/atomic64.c                                   |   44 +-
7368  lib/percpu_counter.c                             |   18 +-
7369  lib/proportions.c                                |   12 +-
7370  lib/ratelimit.c                                  |    4 +-
7371  lib/rwsem-spinlock.c                             |   38 +-
7372  lib/rwsem.c                                      |   14 +-
7373  tools/perf/Documentation/perf-annotate.txt       |   11 +
7374  tools/perf/Documentation/perf-stat.txt           |    7 +
7375  tools/perf/builtin-annotate.c                    |    6 +
7376  tools/perf/builtin-stat.c                        |  155 +++--
7377  tools/perf/util/annotate.c                       |    5 +-
7378  tools/perf/util/color.c                          |    2 +-
7379  tools/perf/util/symbol.c                         |    2 +
7380  tools/perf/util/symbol.h                         |    4 +-
7381  133 files changed, 3178 insertions(+), 1359 deletions(-)
7382  create mode 100644 Documentation/scheduler/sched-bwc.txt
7383  create mode 100644 arch/x86/include/asm/archrandom.h
7384  create mode 100644 arch/x86/kernel/cpu/rdrand.c
7385  delete mode 100644 drivers/staging/hv/hv_timesource.c
7386 Merging rcu/rcu/next
7387 $ git merge rcu/rcu/next
7388 Auto-merging Documentation/RCU/NMI-RCU.txt
7389 Auto-merging arch/powerpc/platforms/pseries/lpar.c
7390 Auto-merging include/linux/rcupdate.h
7391 Auto-merging include/linux/sched.h
7392 Auto-merging init/Kconfig
7393 Auto-merging kernel/lockdep.c
7394 Auto-merging kernel/pid.c
7395 Auto-merging kernel/rcupdate.c
7396 Auto-merging kernel/rcutorture.c
7397 Auto-merging kernel/rcutree_trace.c
7398 Auto-merging kernel/rtmutex.c
7399 Auto-merging kernel/sched.c
7400 Auto-merging kernel/time/tick-sched.c
7401 Merge made by recursive.
7402  Documentation/RCU/NMI-RCU.txt         |    2 +-
7403  Documentation/RCU/lockdep-splat.txt   |  110 ++++++++
7404  Documentation/RCU/lockdep.txt         |   34 ++-
7405  Documentation/RCU/torture.txt         |  137 ++++++++---
7406  Documentation/RCU/trace.txt           |   38 ++--
7407  arch/powerpc/include/asm/synch.h      |    6 +-
7408  arch/powerpc/platforms/pseries/lpar.c |    6 +
7409  include/linux/lockdep.h               |    2 +-
7410  include/linux/rcupdate.h              |  384 ++++++++++++++--------------
7411  include/linux/rcutiny.h               |   20 ++-
7412  include/linux/rcutree.h               |    2 +
7413  include/linux/sched.h                 |    4 -
7414  include/linux/srcu.h                  |   30 ++-
7415  include/linux/types.h                 |   10 +
7416  include/trace/events/rcu.h            |  459 +++++++++++++++++++++++++++++++++
7417  init/Kconfig                          |    6 +-
7418  kernel/lockdep.c                      |  104 +++++---
7419  kernel/pid.c                          |    4 +-
7420  kernel/rcu.h                          |   85 ++++++
7421  kernel/rcupdate.c                     |   43 +++-
7422  kernel/rcutiny.c                      |  131 +++-------
7423  kernel/rcutiny_plugin.h               |  134 +++++++----
7424  kernel/rcutorture.c                   |   77 +++---
7425  kernel/rcutree.c                      |  309 +++++++++++++++--------
7426  kernel/rcutree.h                      |   17 +-
7427  kernel/rcutree_plugin.h               |  151 ++++++-----
7428  kernel/rcutree_trace.c                |   13 +-
7429  kernel/rtmutex.c                      |    8 +
7430  kernel/sched.c                        |   13 +-
7431  kernel/time/tick-sched.c              |    6 -
7432  30 files changed, 1644 insertions(+), 701 deletions(-)
7433  create mode 100644 Documentation/RCU/lockdep-splat.txt
7434  create mode 100644 include/trace/events/rcu.h
7435  create mode 100644 kernel/rcu.h
7436 Merging kvm/linux-next
7437 $ git merge kvm/linux-next
7438 Auto-merging Documentation/kernel-parameters.txt
7439 Merge made by recursive.
7440  Documentation/kernel-parameters.txt |    4 +
7441  Documentation/virtual/kvm/api.txt   |   24 ++++-
7442  arch/x86/include/asm/kvm_host.h     |    7 +-
7443  arch/x86/kvm/emulate.c              |   95 +++++++++--------
7444  arch/x86/kvm/i8254.c                |    6 +-
7445  arch/x86/kvm/i8259.c                |  108 +++++++++++++++----
7446  arch/x86/kvm/irq.h                  |    4 +-
7447  arch/x86/kvm/kvm_cache_regs.h       |    7 --
7448  arch/x86/kvm/mmu.c                  |    5 +-
7449  arch/x86/kvm/paging_tmpl.h          |   24 +++--
7450  arch/x86/kvm/svm.c                  |   88 +++++----------
7451  arch/x86/kvm/trace.h                |  118 ++++++++++++++++++--
7452  arch/x86/kvm/vmx.c                  |   94 +++++++----------
7453  arch/x86/kvm/x86.c                  |  205 ++++++++++++++++++++++-------------
7454  include/linux/kvm.h                 |    3 +-
7455  include/linux/kvm_host.h            |   23 ++--
7456  virt/kvm/coalesced_mmio.c           |  131 ++++++++++------------
7457  virt/kvm/coalesced_mmio.h           |    7 +-
7458  virt/kvm/eventfd.c                  |    3 +-
7459  virt/kvm/ioapic.c                   |    3 +-
7460  virt/kvm/kvm_main.c                 |  112 +++++++++++++++++--
7461  21 files changed, 678 insertions(+), 393 deletions(-)
7462 Merging oprofile/for-next
7463 $ git merge oprofile/for-next
7464 Already up-to-date.
7465 Merging ptrace/ptrace
7466 $ git merge ptrace/ptrace
7467 Auto-merging arch/mips/kernel/signal.c
7468 Auto-merging arch/openrisc/kernel/signal.c
7469 Auto-merging arch/sparc/kernel/signal32.c
7470 Auto-merging arch/sparc/kernel/signal_32.c
7471 Auto-merging arch/sparc/kernel/signal_64.c
7472 Auto-merging include/linux/sched.h
7473 Auto-merging kernel/fork.c
7474 Merge made by recursive.
7475  arch/alpha/kernel/signal.c         |   31 ++++++------------
7476  arch/arm/kernel/signal.c           |   24 +++++---------
7477  arch/avr32/kernel/signal.c         |   26 +++++----------
7478  arch/blackfin/kernel/signal.c      |   17 ++--------
7479  arch/cris/arch-v10/kernel/signal.c |   34 +++++++-------------
7480  arch/cris/arch-v32/kernel/signal.c |   37 ++++++---------------
7481  arch/frv/kernel/signal.c           |   32 ++++++-------------
7482  arch/h8300/kernel/signal.c         |   33 +++++--------------
7483  arch/ia64/kernel/signal.c          |   15 +--------
7484  arch/m32r/kernel/signal.c          |   12 +------
7485  arch/m68k/kernel/signal_mm.c       |   22 +++++--------
7486  arch/m68k/kernel/signal_no.c       |   28 +++++-----------
7487  arch/microblaze/kernel/signal.c    |   42 ++++++++++---------------
7488  arch/mips/kernel/signal.c          |   27 +++-------------
7489  arch/mips/kernel/signal32.c        |   20 ++---------
7490  arch/mips/kernel/signal_n32.c      |   10 +-----
7491  arch/mn10300/kernel/signal.c       |   32 ++++++-------------
7492  arch/openrisc/kernel/signal.c      |   45 +++++++++++---------------
7493  arch/parisc/kernel/signal.c        |   12 +------
7494  arch/powerpc/kernel/signal.c       |   13 +------
7495  arch/powerpc/kernel/signal_32.c    |   11 +++---
7496  arch/s390/kernel/compat_signal.c   |    6 +---
7497  arch/s390/kernel/signal.c          |    6 +---
7498  arch/score/kernel/signal.c         |   13 ++------
7499  arch/sh/kernel/signal_32.c         |   35 ++++++---------------
7500  arch/sh/kernel/signal_64.c         |   40 ++++++-----------------
7501  arch/sparc/include/asm/signal.h    |    3 +-
7502  arch/sparc/kernel/signal32.c       |   17 ++--------
7503  arch/sparc/kernel/signal_32.c      |   28 +++++-----------
7504  arch/sparc/kernel/signal_64.c      |   29 ++++++-----------
7505  arch/tile/kernel/compat_signal.c   |    5 +--
7506  arch/tile/kernel/signal.c          |   13 +------
7507  arch/um/kernel/signal.c            |   28 +++++-----------
7508  arch/um/sys-i386/signal.c          |   12 +------
7509  arch/um/sys-x86_64/signal.c        |    6 +---
7510  arch/unicore32/kernel/signal.c     |   13 +------
7511  arch/x86/kernel/signal.c           |    6 +---
7512  arch/xtensa/kernel/signal.c        |   35 ++++++--------------
7513  fs/autofs4/waitq.c                 |   14 ++------
7514  fs/coda/upcall.c                   |   19 +++++------
7515  fs/dlm/user.c                      |    1 -
7516  fs/exec.c                          |   18 +---------
7517  fs/ncpfs/sock.c                    |   15 +++------
7518  include/linux/sched.h              |    3 +-
7519  include/linux/signal.h             |    1 +
7520  kernel/fork.c                      |   61 +++++++++++++++++++++++-------------
7521  kernel/signal.c                    |   22 +++++++++++++
7522  47 files changed, 321 insertions(+), 651 deletions(-)
7523 Merging xen/upstream/xen
7524 $ git merge xen/upstream/xen
7525 Merge made by recursive.
7526  arch/x86/include/asm/atomic.h         |    8 +-
7527  arch/x86/include/asm/atomic64_64.h    |    6 +-
7528  arch/x86/include/asm/cmpxchg.h        |  205 +++++++++++++++++++++++++++++++++
7529  arch/x86/include/asm/cmpxchg_32.h     |  114 ------------------
7530  arch/x86/include/asm/cmpxchg_64.h     |  131 ---------------------
7531  arch/x86/include/asm/rwsem.h          |    8 +-
7532  arch/x86/include/asm/spinlock.h       |  114 +++++--------------
7533  arch/x86/include/asm/spinlock_types.h |   22 +++-
7534  arch/x86/include/asm/uv/uv_bau.h      |    6 +-
7535  9 files changed, 257 insertions(+), 357 deletions(-)
7536 Merging xen-two/linux-next
7537 $ git merge xen-two/linux-next
7538 Auto-merging arch/x86/xen/mmu.c
7539 Auto-merging drivers/block/xen-blkback/common.h
7540 Auto-merging drivers/block/xen-blkback/xenbus.c
7541 Merge made by recursive.
7542  arch/x86/xen/Kconfig                        |    8 --
7543  arch/x86/xen/mmu.c                          |   38 ---------
7544  arch/x86/xen/setup.c                        |   10 ++-
7545  drivers/block/xen-blkback/blkback.c         |   86 ++++++++++++++++---
7546  drivers/block/xen-blkback/common.h          |   93 +++++++++++++++++----
7547  drivers/block/xen-blkback/xenbus.c          |   58 +++++++++++++
7548  drivers/block/xen-blkfront.c                |  111 +++++++++++++++++++-----
7549  drivers/pci/xen-pcifront.c                  |    5 +-
7550  drivers/xen/balloon.c                       |   15 ++--
7551  drivers/xen/events.c                        |   46 ++++++++--
7552  drivers/xen/gntdev.c                        |    3 +-
7553  drivers/xen/grant-table.c                   |    2 +-
7554  drivers/xen/pci.c                           |   15 ++--
7555  drivers/xen/swiotlb-xen.c                   |   70 ++++++++++++----
7556  drivers/xen/xen-balloon.c                   |   17 ++--
7557  drivers/xen/xen-pciback/conf_space_header.c |    2 +-
7558  drivers/xen/xenbus/xenbus_comms.c           |    4 +-
7559  drivers/xen/xenbus/xenbus_probe.c           |    7 +-
7560  drivers/xen/xenbus/xenbus_probe.h           |    3 +-
7561  drivers/xen/xenbus/xenbus_probe_frontend.c  |  121 +++++++++++++++++++++++++++
7562  drivers/xen/xenbus/xenbus_xs.c              |    3 +-
7563  include/xen/interface/io/blkif.h            |   36 ++++++++
7564  22 files changed, 583 insertions(+), 170 deletions(-)
7565 Merging xen-pvhvm/linux-next
7566 $ git merge xen-pvhvm/linux-next
7567 Already up-to-date.
7568 Merging edac-amd/for-next
7569 $ git merge edac-amd/for-next
7570 Merge made by recursive.
7571  drivers/edac/amd64_edac.c |    6 ++----
7572  drivers/edac/mce_amd.c    |   44 +++++++++++++-------------------------------
7573  drivers/edac/mce_amd.h    |    6 +++---
7574  3 files changed, 18 insertions(+), 38 deletions(-)
7575 Merging percpu/for-next
7576 $ git merge percpu/for-next
7577 Merge made by recursive.
7578  mm/percpu-vm.c |    5 ++---
7579  mm/percpu.c    |   17 +++++++++--------
7580  2 files changed, 11 insertions(+), 11 deletions(-)
7581 Merging workqueues/for-next
7582 $ git merge workqueues/for-next
7583 Already up-to-date.
7584 Merging sfi/sfi-test
7585 $ git merge sfi/sfi-test
7586 Already up-to-date.
7587 Merging asm-generic/next
7588 $ git merge asm-generic/next
7589 Already up-to-date.
7590 Merging drivers-x86/linux-next
7591 $ git merge drivers-x86/linux-next
7592 Already up-to-date.
7593 Merging hwpoison/hwpoison
7594 $ git merge hwpoison/hwpoison
7595 Already up-to-date.
7596 Merging sysctl/master
7597 $ git merge sysctl/master
7598 Auto-merging fs/proc/proc_sysctl.c
7599 Merge made by recursive.
7600  fs/proc/proc_sysctl.c |   14 ++------------
7601  1 files changed, 2 insertions(+), 12 deletions(-)
7602 Merging namespace/master
7603 $ git merge namespace/master
7604 Auto-merging fs/proc/inode.c
7605 Merge made by recursive.
7606  fs/proc/inode.c      |    6 +-
7607  fs/proc/namespaces.c |  160 +++++++++++++++++++++++++++++++++++++++++++-------
7608  2 files changed, 142 insertions(+), 24 deletions(-)
7609 Merging regmap/for-next
7610 $ git merge regmap/for-next
7611 Auto-merging drivers/base/regmap/regmap-spi.c
7612 Auto-merging drivers/mfd/Kconfig
7613 Auto-merging drivers/mfd/wm8994-core.c
7614 Auto-merging include/linux/mfd/wm8994/core.h
7615 Merge made by recursive.
7616  drivers/base/regmap/Makefile         |    1 +
7617  drivers/base/regmap/internal.h       |   69 ++++++
7618  drivers/base/regmap/regmap-debugfs.c |  209 +++++++++++++++++
7619  drivers/base/regmap/regmap-i2c.c     |    2 -
7620  drivers/base/regmap/regmap-spi.c     |    2 -
7621  drivers/base/regmap/regmap.c         |  155 +++++++++----
7622  drivers/mfd/Kconfig                  |    3 +
7623  drivers/mfd/wm831x-core.c            |  424 +++++++++++++++++++++++++++++-----
7624  drivers/mfd/wm831x-i2c.c             |   68 +-----
7625  drivers/mfd/wm831x-spi.c             |  196 +++-------------
7626  drivers/mfd/wm8400-core.c            |  106 +++------
7627  drivers/mfd/wm8994-core.c            |  178 +++------------
7628  include/linux/mfd/wm831x/core.h      |    9 +-
7629  include/linux/mfd/wm8400-private.h   |    7 +-
7630  include/linux/mfd/wm8994/core.h      |    9 +-
7631  include/linux/regmap.h               |    7 -
7632  include/trace/events/regmap.h        |  112 +++++++++
7633  17 files changed, 993 insertions(+), 564 deletions(-)
7634  create mode 100644 drivers/base/regmap/internal.h
7635  create mode 100644 drivers/base/regmap/regmap-debugfs.c
7636  create mode 100644 include/trace/events/regmap.h
7637 Merging driver-core/driver-core-next
7638 $ git merge driver-core/driver-core-next
7639 Resolved 'arch/arm/plat-mxc/devices.c' using previous resolution.
7640 Auto-merging MAINTAINERS
7641 Auto-merging arch/arm/plat-mxc/devices.c
7642 CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices.c
7643 Auto-merging arch/arm/plat-mxc/include/mach/devices-common.h
7644 Auto-merging drivers/base/platform.c
7645 Auto-merging include/linux/device.h
7646 Auto-merging include/linux/netdevice.h
7647 Auto-merging net/core/dev.c
7648 Automatic merge failed; fix conflicts and then commit the result.
7649 $ git commit -v -a
7650 [master 9e98adb] Merge remote-tracking branch 'driver-core/driver-core-next'
7651 $ git diff -M --stat --summary HEAD^..
7652  Documentation/driver-model/binding.txt          |    4 -
7653  Documentation/driver-model/device.txt           |   65 +++++-----
7654  Documentation/filesystems/sysfs.txt             |   10 ++-
7655  MAINTAINERS                                     |    6 +
7656  arch/arm/plat-mxc/devices.c                     |   53 -------
7657  arch/arm/plat-mxc/include/mach/devices-common.h |   16 ++-
7658  drivers/base/core.c                             |    5 +-
7659  drivers/base/platform.c                         |   54 +++++---
7660  drivers/misc/pch_phub.c                         |   10 +-
7661  drivers/uio/uio.c                               |    7 +-
7662  drivers/uio/uio_pci_generic.c                   |    5 -
7663  drivers/uio/uio_pdrv_genirq.c                   |    2 +-
7664  fs/debugfs/inode.c                              |    2 +-
7665  fs/sysfs/dir.c                                  |  167 +++++++++++++++--------
7666  fs/sysfs/inode.c                                |   14 +--
7667  fs/sysfs/sysfs.h                                |   17 ++-
7668  include/linux/device.h                          |    5 +
7669  include/linux/dynamic_debug.h                   |   34 ++++--
7670  include/linux/netdevice.h                       |   10 +-
7671  include/linux/platform_device.h                 |   48 ++++++-
7672  lib/dynamic_debug.c                             |  158 +++++++++++++++------
7673  lib/kobject_uevent.c                            |    2 +-
7674  net/core/dev.c                                  |    3 +-
7675  23 files changed, 432 insertions(+), 265 deletions(-)
7676 Merging tty/tty-next
7677 $ git merge tty/tty-next
7678 Auto-merging arch/arm/Kconfig
7679 Auto-merging arch/arm/plat-samsung/Makefile
7680 Removing arch/arm/plat-samsung/irq-uart.c
7681 Auto-merging arch/x86/platform/mrst/mrst.c
7682 Auto-merging drivers/tty/serial/8250.c
7683 Auto-merging drivers/tty/serial/atmel_serial.c
7684 Auto-merging drivers/tty/serial/bfin_uart.c
7685 Auto-merging drivers/tty/serial/mrst_max3110.c
7686 Auto-merging drivers/tty/serial/msm_serial.c
7687 Auto-merging drivers/tty/serial/samsung.c
7688 Auto-merging drivers/tty/serial/serial_core.c
7689 Auto-merging include/linux/tty.h
7690 Merge made by recursive.
7691  .../bindings/tty/serial/snps-dw-apb-uart.txt       |   25 +
7692  Documentation/serial/serial-rs485.txt              |    3 +
7693  arch/arm/Kconfig                                   |    1 -
7694  arch/arm/mach-s3c64xx/dev-uart.c                   |   60 +--
7695  arch/arm/mach-s3c64xx/include/mach/irqs.h          |   30 -
7696  arch/arm/mach-s3c64xx/irq.c                        |   25 -
7697  arch/arm/plat-s5p/Kconfig                          |    1 -
7698  arch/arm/plat-s5p/dev-uart.c                       |   84 +--
7699  arch/arm/plat-s5p/include/plat/irqs.h              |   35 -
7700  arch/arm/plat-s5p/irq.c                            |   34 -
7701  arch/arm/plat-samsung/Kconfig                      |    5 -
7702  arch/arm/plat-samsung/Makefile                     |    1 -
7703  arch/arm/plat-samsung/include/plat/regs-serial.h   |    5 +
7704  arch/arm/plat-samsung/irq-uart.c                   |   96 ---
7705  arch/mips/pmc-sierra/msp71xx/msp_serial.c          |   73 ++-
7706  arch/powerpc/include/asm/udbg.h                    |    1 +
7707  arch/powerpc/kernel/udbg.c                         |    2 +
7708  arch/x86/platform/mrst/mrst.c                      |    3 +
7709  drivers/isdn/i4l/isdn_tty.c                        |    2 +-
7710  drivers/tty/Kconfig                                |   34 +
7711  drivers/tty/Makefile                               |    1 +
7712  drivers/tty/amiserial.c                            |   10 +-
7713  drivers/tty/cyclades.c                             |   12 +-
7714  drivers/tty/ehv_bytechan.c                         |  884 ++++++++++++++++++++
7715  drivers/tty/hvc/hvc_console.c                      |    2 +-
7716  drivers/tty/hvc/hvcs.c                             |    2 +-
7717  drivers/tty/mxser.c                                |   13 +-
7718  drivers/tty/n_gsm.c                                |    9 +-
7719  drivers/tty/serial/8250.c                          |  108 +--
7720  drivers/tty/serial/8250_dw.c                       |  194 +++++
7721  drivers/tty/serial/Kconfig                         |   13 +-
7722  drivers/tty/serial/Makefile                        |    3 +-
7723  drivers/tty/serial/atmel_serial.c                  |    9 +-
7724  drivers/tty/serial/{bfin_5xx.c => bfin_uart.c}     |   61 +-
7725  drivers/tty/serial/imx.c                           |   10 +-
7726  drivers/tty/serial/jsm/jsm.h                       |   10 -
7727  drivers/tty/serial/jsm/jsm_driver.c                |   19 -
7728  drivers/tty/serial/jsm/jsm_neo.c                   |   29 +-
7729  drivers/tty/serial/jsm/jsm_tty.c                   |   94 +--
7730  drivers/tty/serial/mfd.c                           |   47 +
7731  drivers/tty/serial/mrst_max3110.c                  |  115 ++--
7732  drivers/tty/serial/mrst_max3110.h                  |    1 +
7733  drivers/tty/serial/msm_serial.c                    |    2 -
7734  drivers/tty/serial/samsung.c                       |  107 +++-
7735  drivers/tty/serial/samsung.h                       |    1 +
7736  drivers/tty/serial/serial_core.c                   |   64 +--
7737  drivers/tty/synclink.c                             |    1 -
7738  drivers/tty/tty_ldisc.c                            |    1 -
7739  drivers/tty/tty_mutex.c                            |   12 -
7740  drivers/tty/tty_port.c                             |    2 +-
7741  drivers/tty/vt/selection.c                         |    4 +-
7742  drivers/tty/vt/vt.c                                |    2 +-
7743  include/linux/serial.h                             |    1 +
7744  include/linux/serial_8250.h                        |    2 +
7745  include/linux/serial_core.h                        |    6 +-
7746  include/linux/tty.h                                |   20 +-
7747  net/irda/ircomm/ircomm_tty.c                       |    2 +-
7748  57 files changed, 1619 insertions(+), 774 deletions(-)
7749  create mode 100644 Documentation/devicetree/bindings/tty/serial/snps-dw-apb-uart.txt
7750  delete mode 100644 arch/arm/plat-samsung/irq-uart.c
7751  create mode 100644 drivers/tty/ehv_bytechan.c
7752  create mode 100644 drivers/tty/serial/8250_dw.c
7753  rename drivers/tty/serial/{bfin_5xx.c => bfin_uart.c} (97%)
7754 Merging usb/usb-next
7755 $ git merge usb/usb-next
7756 Auto-merging MAINTAINERS
7757 Auto-merging arch/arm/mach-mmp/pxa168.c
7758 Auto-merging drivers/usb/class/cdc-acm.c
7759 Auto-merging drivers/usb/class/cdc-wdm.c
7760 Auto-merging drivers/usb/core/hub.c
7761 Merge made by recursive.
7762  Documentation/usb/dwc3.txt              |   53 +
7763  MAINTAINERS                             |    8 +
7764  arch/arm/mach-mmp/include/mach/pxa168.h |    7 +
7765  arch/arm/mach-mmp/pxa168.c              |   46 +
7766  drivers/usb/Kconfig                     |    3 +
7767  drivers/usb/Makefile                    |    2 +
7768  drivers/usb/class/cdc-acm.c             |    6 +-
7769  drivers/usb/class/cdc-wdm.c             |    2 +-
7770  drivers/usb/class/usbtmc.c              |    5 +-
7771  drivers/usb/core/config.c               |    8 +-
7772  drivers/usb/core/devices.c              |    4 +-
7773  drivers/usb/core/endpoint.c             |    2 +-
7774  drivers/usb/core/hub.c                  |    7 +-
7775  drivers/usb/core/urb.c                  |    2 +-
7776  drivers/usb/dwc3/Kconfig                |   25 +
7777  drivers/usb/dwc3/Makefile               |   36 +
7778  drivers/usb/dwc3/core.c                 |  467 +++++++
7779  drivers/usb/dwc3/core.h                 |  709 +++++++++++
7780  drivers/usb/dwc3/debug.h                |   51 +
7781  drivers/usb/dwc3/debugfs.c              |  534 ++++++++
7782  drivers/usb/dwc3/dwc3-omap.c            |  410 ++++++
7783  drivers/usb/dwc3/dwc3-pci.c             |  220 ++++
7784  drivers/usb/dwc3/ep0.c                  |  782 ++++++++++++
7785  drivers/usb/dwc3/gadget.c               | 2062 +++++++++++++++++++++++++++++++
7786  drivers/usb/dwc3/gadget.h               |  297 +++++
7787  drivers/usb/dwc3/io.h                   |   55 +
7788  drivers/usb/gadget/Kconfig              |   21 +-
7789  drivers/usb/gadget/amd5536udc.c         |    2 +-
7790  drivers/usb/gadget/at91_udc.c           |    2 +-
7791  drivers/usb/gadget/atmel_usba_udc.c     |    4 +-
7792  drivers/usb/gadget/ci13xxx_udc.c        |    2 +-
7793  drivers/usb/gadget/composite.c          |    2 +-
7794  drivers/usb/gadget/dummy_hcd.c          |    4 +-
7795  drivers/usb/gadget/epautoconf.c         |    2 +-
7796  drivers/usb/gadget/f_mass_storage.c     |    3 +-
7797  drivers/usb/gadget/file_storage.c       |    2 +-
7798  drivers/usb/gadget/fsl_qe_udc.c         |    2 +-
7799  drivers/usb/gadget/fsl_udc_core.c       |    2 +-
7800  drivers/usb/gadget/fusb300_udc.c        |    2 +-
7801  drivers/usb/gadget/gadget_chips.h       |    3 +
7802  drivers/usb/gadget/imx_udc.c            |    2 +-
7803  drivers/usb/gadget/langwell_udc.c       |    2 +-
7804  drivers/usb/gadget/m66592-udc.c         |    4 +-
7805  drivers/usb/gadget/mv_udc_core.c        |    2 +-
7806  drivers/usb/gadget/net2272.c            |    2 +-
7807  drivers/usb/gadget/net2280.c            |    4 +-
7808  drivers/usb/gadget/omap_udc.c           |    7 +-
7809  drivers/usb/gadget/pch_udc.c            |    6 +-
7810  drivers/usb/gadget/pxa25x_udc.c         |   14 +-
7811  drivers/usb/gadget/pxa27x_udc.c         |    2 +-
7812  drivers/usb/gadget/r8a66597-udc.c       |    4 +-
7813  drivers/usb/gadget/s3c-hsotg.c          |    2 +-
7814  drivers/usb/gadget/s3c-hsudc.c          |   55 +-
7815  drivers/usb/gadget/s3c2410_udc.c        |    2 +-
7816  drivers/usb/host/Kconfig                |   13 +-
7817  drivers/usb/host/ehci-au1xxx.c          |    2 +-
7818  drivers/usb/host/ehci-dbg.c             |   17 +-
7819  drivers/usb/host/ehci-fsl.c             |    4 +-
7820  drivers/usb/host/ehci-hcd.c             |   30 +-
7821  drivers/usb/host/ehci-hub.c             |   10 +-
7822  drivers/usb/host/ehci-pci.c             |    2 +-
7823  drivers/usb/host/ehci-pxa168.c          |  363 ++++++
7824  drivers/usb/host/ehci-q.c               |   22 +-
7825  drivers/usb/host/ehci-s5p.c             |    2 +-
7826  drivers/usb/host/ehci-sched.c           |   11 +-
7827  drivers/usb/host/ehci-xls.c             |  161 +++
7828  drivers/usb/host/ehci.h                 |    7 +
7829  drivers/usb/host/fhci-hcd.c             |    5 +-
7830  drivers/usb/host/isp1362-hcd.c          |    6 +-
7831  drivers/usb/host/isp1760-hcd.c          |  401 ++++---
7832  drivers/usb/host/isp1760-hcd.h          |    3 +-
7833  drivers/usb/host/ohci-hcd.c             |    5 +
7834  drivers/usb/host/ohci-omap3.c           |    2 +-
7835  drivers/usb/host/ohci-q.c               |    4 +-
7836  drivers/usb/host/ohci-xls.c             |  151 +++
7837  drivers/usb/host/r8a66597-hcd.c         |    2 +-
7838  drivers/usb/host/uhci-q.c               |    6 +-
7839  drivers/usb/host/xhci-mem.c             |   10 +-
7840  drivers/usb/host/xhci-ring.c            |    8 +-
7841  drivers/usb/host/xhci.c                 |    2 +-
7842  drivers/usb/misc/adutux.c               |   14 +-
7843  drivers/usb/misc/ftdi-elan.c            |    2 +-
7844  drivers/usb/misc/idmouse.c              |    2 +-
7845  drivers/usb/misc/iowarrior.c            |    2 +-
7846  drivers/usb/misc/ldusb.c                |    4 +-
7847  drivers/usb/misc/legousbtower.c         |    4 +-
7848  drivers/usb/misc/usblcd.c               |  129 ++-
7849  drivers/usb/misc/usbled.c               |   25 +-
7850  drivers/usb/misc/usbtest.c              |   10 +-
7851  drivers/usb/musb/musb_gadget.c          |    2 +-
7852  drivers/usb/musb/musb_host.c            |    2 +-
7853  drivers/usb/otg/twl6030-usb.c           |   16 -
7854  drivers/usb/renesas_usbhs/pipe.c        |    2 +-
7855  drivers/usb/serial/Kconfig              |    1 +
7856  drivers/usb/serial/ftdi_sio.c           |    2 +-
7857  drivers/usb/serial/io_edgeport.c        |    4 +-
7858  drivers/usb/serial/ipw.c                |   33 +-
7859  drivers/usb/serial/opticon.c            |    2 +-
7860  drivers/usb/serial/pl2303.c             |    3 -
7861  drivers/usb/serial/symbolserial.c       |    2 +-
7862  drivers/usb/serial/usb-serial.c         |    8 +-
7863  drivers/usb/storage/realtek_cr.c        |   35 +-
7864  drivers/usb/storage/usb.c               |   16 +-
7865  drivers/usb/usb-skeleton.c              |    2 +-
7866  drivers/usb/wusbcore/wa-hc.c            |    2 +-
7867  include/linux/usb.h                     |    2 +-
7868  include/linux/usb/ch9.h                 |   17 +
7869  107 files changed, 7127 insertions(+), 429 deletions(-)
7870  create mode 100644 Documentation/usb/dwc3.txt
7871  create mode 100644 drivers/usb/dwc3/Kconfig
7872  create mode 100644 drivers/usb/dwc3/Makefile
7873  create mode 100644 drivers/usb/dwc3/core.c
7874  create mode 100644 drivers/usb/dwc3/core.h
7875  create mode 100644 drivers/usb/dwc3/debug.h
7876  create mode 100644 drivers/usb/dwc3/debugfs.c
7877  create mode 100644 drivers/usb/dwc3/dwc3-omap.c
7878  create mode 100644 drivers/usb/dwc3/dwc3-pci.c
7879  create mode 100644 drivers/usb/dwc3/ep0.c
7880  create mode 100644 drivers/usb/dwc3/gadget.c
7881  create mode 100644 drivers/usb/dwc3/gadget.h
7882  create mode 100644 drivers/usb/dwc3/io.h
7883  create mode 100644 drivers/usb/host/ehci-pxa168.c
7884  create mode 100644 drivers/usb/host/ehci-xls.c
7885  create mode 100644 drivers/usb/host/ohci-xls.c
7886 Merging staging/staging-next
7887 $ git merge staging/staging-next
7888 Resolved 'drivers/staging/xgifb/XGI_main_26.c' using previous resolution.
7889 Auto-merging MAINTAINERS
7890 Removing drivers/char/scc.h
7891 Auto-merging drivers/staging/Kconfig
7892 Auto-merging drivers/staging/Makefile
7893 Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_linux.c
7894 Removing drivers/staging/brcm80211/brcmsmac/bmac.c
7895 Removing drivers/staging/brcm80211/brcmsmac/bmac.h
7896 Auto-merging drivers/staging/et131x/et131x_netdev.c
7897 Auto-merging drivers/staging/hv/Makefile
7898 Removing drivers/staging/hv/blkvsc_drv.c
7899 Removing drivers/staging/hv/hyperv_storage.h
7900 Auto-merging drivers/staging/hv/netvsc_drv.c
7901 Removing drivers/staging/hv/storvsc.c
7902 Removing drivers/staging/iio/accel/accel.h
7903 Removing drivers/staging/iio/accel/inclinometer.h
7904 Removing drivers/staging/iio/adc/adc.h
7905 Removing drivers/staging/iio/gyro/gyro.h
7906 Removing drivers/staging/iio/magnetometer/magnet.h
7907 Removing drivers/staging/rtl8192e/ieee80211/dot11d.c
7908 Removing drivers/staging/rtl8192e/ieee80211/dot11d.h
7909 Removing drivers/staging/rtl8192e/ieee80211/ieee80211.h
7910 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
7911 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
7912 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
7913 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c
7914 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
7915 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h
7916 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c
7917 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h
7918 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c
7919 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h
7920 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h
7921 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c
7922 Removing drivers/staging/rtl8192e/r8180_93cx6.c
7923 Removing drivers/staging/rtl8192e/r8180_93cx6.h
7924 Removing drivers/staging/rtl8192e/r8190_rtl8256.c
7925 Removing drivers/staging/rtl8192e/r8190_rtl8256.h
7926 Removing drivers/staging/rtl8192e/r8192E.h
7927 CONFLICT (delete/modify): drivers/staging/rtl8192e/r8192E_core.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8192e/r8192E_core.c left in tree.
7928 Removing drivers/staging/rtl8192e/r8192E_dm.c
7929 Removing drivers/staging/rtl8192e/r8192E_dm.h
7930 Removing drivers/staging/rtl8192e/r8192E_wx.c
7931 Removing drivers/staging/rtl8192e/r8192E_wx.h
7932 Removing drivers/staging/rtl8192e/r8192_pm.c
7933 Removing drivers/staging/rtl8192e/r8192_pm.h
7934 Removing drivers/staging/rtl8192e/r819xE_cmdpkt.c
7935 Removing drivers/staging/rtl8192e/r819xE_cmdpkt.h
7936 Removing drivers/staging/rtl8192e/r819xE_firmware.c
7937 Removing drivers/staging/rtl8192e/r819xE_phy.c
7938 Removing drivers/staging/rtl8192e/r819xE_phy.h
7939 Auto-merging drivers/staging/rtl8192e/rtl_crypto.h
7940 Auto-merging drivers/staging/rtl8192e/rtllib_crypt.c
7941 Auto-merging drivers/staging/rtl8192e/rtllib_crypt.h
7942 Auto-merging drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
7943 Auto-merging drivers/staging/rtl8192e/rtllib_crypt_tkip.c
7944 Auto-merging drivers/staging/rtl8192e/rtllib_crypt_wep.c
7945 Auto-merging drivers/staging/rtl8192e/rtllib_softmac_wx.c
7946 Auto-merging drivers/staging/vt6655/device_main.c
7947 Auto-merging drivers/staging/vt6656/main_usb.c
7948 Auto-merging drivers/staging/xgifb/XGI_main_26.c
7949 CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_main_26.c
7950 Automatic merge failed; fix conflicts and then commit the result.
7951 $ git rm -f drivers/staging/rtl8192e/r8192E_core.c
7952 drivers/staging/rtl8192e/r8192E_core.c: needs merge
7953 drivers/staging/xgifb/XGI_main_26.c: needs merge
7954 rm 'drivers/staging/rtl8192e/r8192E_core.c'
7955 $ git commit -v -a
7956 [master bd3c6d4] Merge remote-tracking branch 'staging/staging-next'
7957 $ git diff -M --stat --summary HEAD^..
7958  MAINTAINERS                                        |    5 +
7959  arch/x86/include/asm/hyperv.h                      |    1 +
7960  drivers/char/scc.h                                 |  613 -
7961  drivers/staging/Kconfig                            |    2 +
7962  drivers/staging/Makefile                           |    1 +
7963  drivers/staging/altera-stapl/altera.c              |    3 +-
7964  drivers/staging/bcm/Bcmchar.c                      | 3170 ++--
7965  drivers/staging/bcm/Macros.h                       |  337 +-
7966  drivers/staging/bcm/headers.h                      |    2 +
7967  drivers/staging/bcm/nvm.c                          |   13 +-
7968  drivers/staging/brcm80211/Kconfig                  |    7 +-
7969  drivers/staging/brcm80211/Makefile                 |    1 -
7970  drivers/staging/brcm80211/TODO                     |    4 -
7971  drivers/staging/brcm80211/brcmfmac/Makefile        |    5 -
7972  drivers/staging/brcm80211/brcmfmac/bcmsdh.c        |  549 +-
7973  drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c  |  994 +-
7974  drivers/staging/brcm80211/brcmfmac/dhd.h           |  228 +-
7975  drivers/staging/brcm80211/brcmfmac/dhd_bus.h       |    7 +-
7976  drivers/staging/brcm80211/brcmfmac/dhd_cdc.c       |   66 +-
7977  drivers/staging/brcm80211/brcmfmac/dhd_common.c    |  338 +-
7978  drivers/staging/brcm80211/brcmfmac/dhd_dbg.h       |   46 +-
7979  drivers/staging/brcm80211/brcmfmac/dhd_linux.c     |  448 +-
7980  drivers/staging/brcm80211/brcmfmac/dhd_proto.h     |    5 -
7981  drivers/staging/brcm80211/brcmfmac/dhd_sdio.c      | 2440 +--
7982  drivers/staging/brcm80211/brcmfmac/sdio_host.h     |  278 +-
7983  drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c   |  301 +-
7984  drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h   |   14 +-
7985  drivers/staging/brcm80211/brcmsmac/Makefile        |    8 -
7986  drivers/staging/brcm80211/brcmsmac/aiutils.c       |  774 +-
7987  drivers/staging/brcm80211/brcmsmac/aiutils.h       |   75 +-
7988  drivers/staging/brcm80211/brcmsmac/alloc.c         |    9 +-
7989  drivers/staging/brcm80211/brcmsmac/ampdu.c         |  230 +-
7990  drivers/staging/brcm80211/brcmsmac/antsel.c        |   25 +-
7991  drivers/staging/brcm80211/brcmsmac/bmac.c          | 3593 ---
7992  drivers/staging/brcm80211/brcmsmac/bmac.h          |  174 -
7993  drivers/staging/brcm80211/brcmsmac/channel.c       |  400 +-
7994  drivers/staging/brcm80211/brcmsmac/channel.h       |   25 +-
7995  drivers/staging/brcm80211/brcmsmac/d11.h           |  645 +-
7996  drivers/staging/brcm80211/brcmsmac/dma.c           | 1078 +-
7997  drivers/staging/brcm80211/brcmsmac/dma.h           |  186 +-
7998  drivers/staging/brcm80211/brcmsmac/mac80211_if.c   |  184 +-
7999  drivers/staging/brcm80211/brcmsmac/mac80211_if.h   |   20 +-
8000  drivers/staging/brcm80211/brcmsmac/main.c          | 4876 ++++-
8001  drivers/staging/brcm80211/brcmsmac/main.h          |  852 +-
8002  drivers/staging/brcm80211/brcmsmac/nicpci.c        |   75 +-
8003  drivers/staging/brcm80211/brcmsmac/nicpci.h        |   30 +-
8004  drivers/staging/brcm80211/brcmsmac/otp.c           |  154 +-
8005  drivers/staging/brcm80211/brcmsmac/otp.h           |   15 +-
8006  drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c   | 1035 +-
8007  drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h   |   85 +-
8008  drivers/staging/brcm80211/brcmsmac/phy/phy_int.h   |  208 +-
8009  drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c   | 5653 +++---
8010  drivers/staging/brcm80211/brcmsmac/phy/phy_n.c     |23096 ++++++++++----------
8011  drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.c |  172 +-
8012  .../staging/brcm80211/brcmsmac/phy/phytbl_lcn.c    | 1168 +-
8013  drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.c  |    3 +-
8014  drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.h  |   24 +-
8015  drivers/staging/brcm80211/brcmsmac/phy_shim.c      |   24 +-
8016  drivers/staging/brcm80211/brcmsmac/phy_shim.h      |   69 +-
8017  drivers/staging/brcm80211/brcmsmac/pmu.c           |   54 +-
8018  drivers/staging/brcm80211/brcmsmac/pub.h           |  280 +-
8019  drivers/staging/brcm80211/brcmsmac/rate.c          |  163 +-
8020  drivers/staging/brcm80211/brcmsmac/rate.h          |  186 +-
8021  drivers/staging/brcm80211/brcmsmac/scb.h           |   36 +-
8022  drivers/staging/brcm80211/brcmsmac/srom.c          |  126 +-
8023  drivers/staging/brcm80211/brcmsmac/srom.h          |    4 +-
8024  drivers/staging/brcm80211/brcmsmac/stf.c           |  100 +-
8025  drivers/staging/brcm80211/brcmsmac/stf.h           |    6 +-
8026  drivers/staging/brcm80211/brcmsmac/types.h         |  283 +-
8027  drivers/staging/brcm80211/brcmutil/utils.c         |  110 +-
8028  drivers/staging/brcm80211/brcmutil/wifi.c          |   37 +-
8029  drivers/staging/brcm80211/include/brcmu_utils.h    |   25 +-
8030  drivers/staging/brcm80211/include/brcmu_wifi.h     |  145 +-
8031  drivers/staging/brcm80211/include/chipcommon.h     |   13 +-
8032  drivers/staging/brcm80211/include/defs.h           |   24 +-
8033  drivers/staging/brcm80211/include/soc.h            |    9 +-
8034  drivers/staging/comedi/Kconfig                     |   18 +-
8035  drivers/staging/comedi/comedi_fops.c               |    2 +-
8036  drivers/staging/comedi/drivers/Makefile            |    1 +
8037  drivers/staging/comedi/drivers/adv_pci_dio.c       |    2 +-
8038  drivers/staging/comedi/drivers/ni_labpc.c          |   20 +-
8039  drivers/staging/comedi/drivers/ni_pcidio.c         |    2 +-
8040  drivers/staging/comedi/drivers/usbduxsigma.c       | 2880 +++
8041  drivers/staging/cxd2099/Makefile                   |    6 +-
8042  drivers/staging/dt3155v4l/dt3155v4l.c              |    1 +
8043  drivers/staging/easycap/easycap_ioctl.c            |   30 +-
8044  drivers/staging/easycap/easycap_main.c             |    4 +-
8045  drivers/staging/et131x/Makefile                    |    1 +
8046  drivers/staging/et131x/et1310_address_map.h        |    6 +-
8047  drivers/staging/et131x/et1310_eeprom.c             |   32 +-
8048  drivers/staging/et131x/et1310_mac.c                |  379 +-
8049  drivers/staging/et131x/et1310_phy.c                |  601 +-
8050  drivers/staging/et131x/et1310_phy.h                |    4 +-
8051  drivers/staging/et131x/et1310_pm.c                 |   48 +-
8052  drivers/staging/et131x/et1310_rx.c                 |  628 +-
8053  drivers/staging/et131x/et1310_rx.h                 |   62 +-
8054  drivers/staging/et131x/et1310_tx.c                 |  464 +-
8055  drivers/staging/et131x/et131x.h                    |   78 +-
8056  drivers/staging/et131x/et131x_adapter.h            |   97 +-
8057  drivers/staging/et131x/et131x_ethtool.c            |   71 +
8058  drivers/staging/et131x/et131x_initpci.c            |  404 +-
8059  drivers/staging/et131x/et131x_isr.c                |   63 +-
8060  drivers/staging/et131x/et131x_netdev.c             |  144 +-
8061  drivers/staging/ft1000/ft1000-pcmcia/ft1000.h      |   10 +
8062  drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c   |    8 +-
8063  drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c |    3 +-
8064  drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c   |   24 +-
8065  drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c |    4 +-
8066  drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      |    2 +-
8067  drivers/staging/gma500/accel_2d.c                  |   14 +-
8068  drivers/staging/gma500/cdv_device.c                |    1 -
8069  drivers/staging/gma500/framebuffer.c               |    7 +-
8070  drivers/staging/gma500/gem.c                       |    5 +-
8071  drivers/staging/gma500/gtt.c                       |   30 +-
8072  drivers/staging/gma500/intel_opregion.c            |    1 +
8073  drivers/staging/gma500/mdfld_intel_display.c       |   12 +-
8074  drivers/staging/gma500/mrst_crtc.c                 |   16 +-
8075  drivers/staging/gma500/power.c                     |    8 +-
8076  drivers/staging/gma500/psb_device.c                |   32 -
8077  drivers/staging/gma500/psb_drv.c                   |   47 +-
8078  drivers/staging/gma500/psb_drv.h                   |    4 +
8079  drivers/staging/gma500/psb_intel_display.c         |    4 -
8080  drivers/staging/gma500/psb_intel_lvds.c            |   61 +-
8081  drivers/staging/gma500/psb_irq.c                   |   71 +-
8082  drivers/staging/gma500/psb_lid.c                   |    2 -
8083  drivers/staging/go7007/Makefile                    |    8 +-
8084  drivers/staging/go7007/wis-tw2804.c                |    6 +-
8085  drivers/staging/hv/Kconfig                         |    7 -
8086  drivers/staging/hv/Makefile                        |    4 +-
8087  drivers/staging/hv/blkvsc_drv.c                    | 1026 -
8088  drivers/staging/hv/channel.c                       |  120 +-
8089  drivers/staging/hv/channel_mgmt.c                  |   50 +-
8090  drivers/staging/hv/connection.c                    |   40 +-
8091  drivers/staging/hv/hv.c                            |   21 +-
8092  drivers/staging/hv/hv_mouse.c                      |  330 +-
8093  drivers/staging/hv/hv_util.c                       |   98 +-
8094  drivers/staging/hv/hyperv.h                        |   45 +-
8095  drivers/staging/hv/hyperv_net.h                    |    3 +-
8096  drivers/staging/hv/hyperv_storage.h                |  334 -
8097  drivers/staging/hv/hyperv_vmbus.h                  |    8 +-
8098  drivers/staging/hv/netvsc.c                        |  166 +-
8099  drivers/staging/hv/netvsc_drv.c                    |   60 +-
8100  drivers/staging/hv/ring_buffer.c                   |    9 +-
8101  drivers/staging/hv/rndis_filter.c                  |   49 +-
8102  drivers/staging/hv/storvsc.c                       |  564 -
8103  drivers/staging/hv/storvsc_drv.c                   |  894 +-
8104  drivers/staging/hv/tools/hv_kvp_daemon.c           |   19 +-
8105  drivers/staging/hv/vmbus_drv.c                     |  284 +-
8106  drivers/staging/iio/Documentation/sysfs-bus-iio    |   23 +-
8107  .../iio/Documentation/sysfs-bus-iio-adc-ad7280a    |   21 +
8108  .../sysfs-bus-iio-impedance-analyzer-ad5933        |   30 +
8109  drivers/staging/iio/Kconfig                        |    1 +
8110  drivers/staging/iio/Makefile                       |    1 +
8111  drivers/staging/iio/accel/accel.h                  |   87 -
8112  drivers/staging/iio/accel/adis16201_core.c         |    5 +-
8113  drivers/staging/iio/accel/adis16201_ring.c         |   19 +-
8114  drivers/staging/iio/accel/adis16201_trigger.c      |   13 +-
8115  drivers/staging/iio/accel/adis16203_core.c         |    4 +-
8116  drivers/staging/iio/accel/adis16203_ring.c         |   12 +-
8117  drivers/staging/iio/accel/adis16203_trigger.c      |   14 +-
8118  drivers/staging/iio/accel/adis16204_core.c         |   48 +-
8119  drivers/staging/iio/accel/adis16204_ring.c         |   12 +-
8120  drivers/staging/iio/accel/adis16204_trigger.c      |   14 +-
8121  drivers/staging/iio/accel/adis16209_core.c         |    4 +-
8122  drivers/staging/iio/accel/adis16209_ring.c         |   12 +-
8123  drivers/staging/iio/accel/adis16209_trigger.c      |   14 +-
8124  drivers/staging/iio/accel/adis16220_core.c         |  343 +-
8125  drivers/staging/iio/accel/adis16240_core.c         |    3 +-
8126  drivers/staging/iio/accel/adis16240_ring.c         |   12 +-
8127  drivers/staging/iio/accel/adis16240_trigger.c      |   14 +-
8128  drivers/staging/iio/accel/inclinometer.h           |   25 -
8129  drivers/staging/iio/accel/kxsd9.c                  |  269 +-
8130  drivers/staging/iio/accel/lis3l02dq_core.c         |   27 +-
8131  drivers/staging/iio/accel/lis3l02dq_ring.c         |   18 +-
8132  drivers/staging/iio/accel/sca3000_core.c           |   20 +-
8133  drivers/staging/iio/accel/sca3000_ring.c           |   71 -
8134  drivers/staging/iio/adc/Kconfig                    |   24 +
8135  drivers/staging/iio/adc/Makefile                   |    2 +
8136  drivers/staging/iio/adc/ad7150.c                   |   11 +-
8137  drivers/staging/iio/adc/ad7152.c                   |    1 +
8138  drivers/staging/iio/adc/ad7192.c                   | 1184 +
8139  drivers/staging/iio/adc/ad7192.h                   |   47 +
8140  drivers/staging/iio/adc/ad7280a.c                  |  992 +
8141  drivers/staging/iio/adc/ad7280a.h                  |   38 +
8142  drivers/staging/iio/adc/ad7291.c                   |    1 +
8143  drivers/staging/iio/adc/ad7298_core.c              |    2 +-
8144  drivers/staging/iio/adc/ad7298_ring.c              |   12 +-
8145  drivers/staging/iio/adc/ad7314.c                   |    1 +
8146  drivers/staging/iio/adc/ad7476_core.c              |    2 +-
8147  drivers/staging/iio/adc/ad7476_ring.c              |   12 +-
8148  drivers/staging/iio/adc/ad7606_core.c              |    2 +-
8149  drivers/staging/iio/adc/ad7606_ring.c              |   12 +-
8150  drivers/staging/iio/adc/ad7745.c                   |    1 +
8151  drivers/staging/iio/adc/ad7780.c                   |    2 +-
8152  drivers/staging/iio/adc/ad7793.c                   |   10 +-
8153  drivers/staging/iio/adc/ad7816.c                   |    3 +-
8154  drivers/staging/iio/adc/ad7887_core.c              |    3 +-
8155  drivers/staging/iio/adc/ad7887_ring.c              |   13 +-
8156  drivers/staging/iio/adc/ad799x_core.c              |   14 +-
8157  drivers/staging/iio/adc/ad799x_ring.c              |   13 +-
8158  drivers/staging/iio/adc/adc.h                      |   42 -
8159  drivers/staging/iio/adc/adt7310.c                  |    1 +
8160  drivers/staging/iio/adc/adt7410.c                  |    1 +
8161  drivers/staging/iio/adc/adt75.c                    |    3 +-
8162  drivers/staging/iio/adc/max1363_core.c             |   20 +-
8163  drivers/staging/iio/adc/max1363_ring.c             |   13 +-
8164  drivers/staging/iio/addac/adt7316-i2c.c            |    1 +
8165  drivers/staging/iio/addac/adt7316.c                |    3 +-
8166  drivers/staging/iio/dac/ad5446.c                   |    1 +
8167  drivers/staging/iio/dac/ad5504.c                   |    5 +-
8168  drivers/staging/iio/dac/ad5624r_spi.c              |    1 +
8169  drivers/staging/iio/dac/ad5686.c                   |    1 +
8170  drivers/staging/iio/dac/ad5791.c                   |    2 +-
8171  drivers/staging/iio/dds/ad5930.c                   |    1 +
8172  drivers/staging/iio/dds/ad9832.c                   |    1 +
8173  drivers/staging/iio/dds/ad9834.c                   |    1 +
8174  drivers/staging/iio/dds/ad9850.c                   |    1 +
8175  drivers/staging/iio/dds/ad9852.c                   |    2 +-
8176  drivers/staging/iio/dds/ad9910.c                   |    2 +-
8177  drivers/staging/iio/dds/ad9951.c                   |    2 +-
8178  drivers/staging/iio/gyro/adis16060_core.c          |  116 +-
8179  drivers/staging/iio/gyro/adis16080_core.c          |   93 +-
8180  drivers/staging/iio/gyro/adis16130_core.c          |  145 +-
8181  drivers/staging/iio/gyro/adis16260_core.c          |    3 +-
8182  drivers/staging/iio/gyro/adis16260_ring.c          |   12 +-
8183  drivers/staging/iio/gyro/adis16260_trigger.c       |   14 +-
8184  drivers/staging/iio/gyro/adxrs450_core.c           |  253 +-
8185  drivers/staging/iio/gyro/gyro.h                    |   85 -
8186  drivers/staging/iio/iio.h                          |   91 +-
8187  drivers/staging/iio/iio_core.h                     |   48 +
8188  drivers/staging/iio/iio_core_trigger.h             |   46 +
8189  drivers/staging/iio/impedance-analyzer/Kconfig     |   16 +
8190  drivers/staging/iio/impedance-analyzer/Makefile    |    5 +
8191  drivers/staging/iio/impedance-analyzer/ad5933.c    |  818 +
8192  drivers/staging/iio/impedance-analyzer/ad5933.h    |   28 +
8193  drivers/staging/iio/imu/adis16400_core.c           |   73 +-
8194  drivers/staging/iio/imu/adis16400_ring.c           |   12 +-
8195  drivers/staging/iio/imu/adis16400_trigger.c        |   14 +-
8196  drivers/staging/iio/industrialio-core.c            |  211 +-
8197  drivers/staging/iio/industrialio-ring.c            |    1 +
8198  drivers/staging/iio/industrialio-trigger.c         |   82 +-
8199  drivers/staging/iio/light/isl29018.c               |   46 +
8200  drivers/staging/iio/light/tsl2563.c                |    4 +-
8201  drivers/staging/iio/light/tsl2583.c                |  221 +-
8202  drivers/staging/iio/magnetometer/ak8975.c          |  214 +-
8203  drivers/staging/iio/magnetometer/hmc5843.c         |   96 +-
8204  drivers/staging/iio/magnetometer/magnet.h          |   31 -
8205  drivers/staging/iio/meter/ade7753.c                |    1 +
8206  drivers/staging/iio/meter/ade7754.c                |    1 +
8207  drivers/staging/iio/meter/ade7758_core.c           |    1 +
8208  drivers/staging/iio/meter/ade7758_ring.c           |   19 +-
8209  drivers/staging/iio/meter/ade7758_trigger.c        |   16 +-
8210  drivers/staging/iio/meter/ade7759.c                |    1 +
8211  drivers/staging/iio/meter/ade7854-i2c.c            |    1 +
8212  drivers/staging/iio/meter/ade7854-spi.c            |    1 +
8213  drivers/staging/iio/meter/ade7854.c                |    3 +-
8214  drivers/staging/iio/resolver/ad2s120x.c            |    1 +
8215  drivers/staging/iio/resolver/ad2s1210.c            |    2 +-
8216  drivers/staging/iio/resolver/ad2s90.c              |    2 +-
8217  drivers/staging/iio/sysfs.h                        |   79 +-
8218  drivers/staging/iio/trigger.h                      |  116 +-
8219  drivers/staging/iio/trigger/iio-trig-bfin-timer.c  |    6 +-
8220  drivers/staging/iio/trigger/iio-trig-gpio.c        |    6 +-
8221  .../staging/iio/trigger/iio-trig-periodic-rtc.c    |    7 +-
8222  drivers/staging/iio/trigger/iio-trig-sysfs.c       |   13 +-
8223  drivers/staging/iio/trigger_consumer.h             |   71 +-
8224  drivers/staging/keucr/scsiglue.c                   |    5 +-
8225  drivers/staging/keucr/smil.h                       |    6 +-
8226  drivers/staging/keucr/smilsub.c                    | 1574 +--
8227  drivers/staging/keucr/smscsi.c                     |  117 +-
8228  drivers/staging/mei/interrupt.c                    |    6 +
8229  drivers/staging/mei/main.c                         |   30 +-
8230  drivers/staging/nvec/nvec.c                        |  168 +-
8231  drivers/staging/nvec/nvec.h                        |   13 +-
8232  drivers/staging/nvec/nvec_kbd.c                    |   41 +-
8233  drivers/staging/nvec/nvec_ps2.c                    |   19 +-
8234  drivers/staging/olpc_dcon/olpc_dcon.c              |   47 +-
8235  drivers/staging/pohmelfs/trans.c                   |    6 +-
8236  drivers/staging/rtl8187se/Makefile                 |    6 +-
8237  drivers/staging/rtl8187se/ieee80211/ieee80211.h    |    4 +-
8238  .../rtl8187se/ieee80211/ieee80211_softmac.c        |   14 +-
8239  drivers/staging/rtl8187se/r8180_rtl8225z2.c        |    4 +-
8240  drivers/staging/rtl8192e/Makefile                  |   67 +-
8241  drivers/staging/rtl8192e/TODO                      |    2 +
8242  drivers/staging/rtl8192e/dot11d.c                  |  216 +
8243  drivers/staging/rtl8192e/dot11d.h                  |  113 +-
8244  drivers/staging/rtl8192e/ieee80211/dot11d.c        |  218 -
8245  drivers/staging/rtl8192e/ieee80211/dot11d.h        |  102 -
8246  drivers/staging/rtl8192e/ieee80211/ieee80211.h     | 2636 ---
8247  .../staging/rtl8192e/ieee80211/ieee80211_module.c  |  352 -
8248  drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c  | 2676 ---
8249  .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 3278 ---
8250  drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c  |  955 -
8251  drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c  |  872 -
8252  drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h    |   69 -
8253  .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c    |  676 -
8254  drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h    |  483 -
8255  .../staging/rtl8192e/ieee80211/rtl819x_HTProc.c    | 1732 --
8256  drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h   |  582 -
8257  drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h    |   56 -
8258  .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c    |  627 -
8259  drivers/staging/rtl8192e/license                   |  339 +
8260  drivers/staging/rtl8192e/r8180_93cx6.c             |  141 -
8261  drivers/staging/rtl8192e/r8180_93cx6.h             |   41 -
8262  drivers/staging/rtl8192e/r8190P_def.h              |  410 +
8263  drivers/staging/rtl8192e/r8190P_rtl8256.c          |  306 +
8264  drivers/staging/rtl8192e/r8190P_rtl8256.h          |   31 +
8265  drivers/staging/rtl8192e/r8190_rtl8256.c           |  677 -
8266  drivers/staging/rtl8192e/r8190_rtl8256.h           |   29 -
8267  drivers/staging/rtl8192e/r8192E.h                  | 1148 -
8268  drivers/staging/rtl8192e/r8192E_cmdpkt.c           |  420 +
8269  drivers/staging/rtl8192e/r8192E_cmdpkt.h           |  159 +
8270  drivers/staging/rtl8192e/r8192E_core.c             | 5039 -----
8271  drivers/staging/rtl8192e/r8192E_dev.c              | 2413 ++
8272  drivers/staging/rtl8192e/r8192E_dev.h              |   62 +
8273  drivers/staging/rtl8192e/r8192E_dm.c               | 2554 ---
8274  drivers/staging/rtl8192e/r8192E_dm.h               |  228 -
8275  drivers/staging/rtl8192e/r8192E_firmware.c         |  348 +
8276  drivers/staging/rtl8192e/r8192E_firmware.h         |   73 +
8277  drivers/staging/rtl8192e/r8192E_hw.h               |  552 +-
8278  drivers/staging/rtl8192e/r8192E_hwimg.c            | 3336 +++
8279  drivers/staging/rtl8192e/r8192E_hwimg.h            |   51 +
8280  drivers/staging/rtl8192e/r8192E_phy.c              | 1633 ++
8281  drivers/staging/rtl8192e/r8192E_phy.h              |  144 +
8282  drivers/staging/rtl8192e/r8192E_phyreg.h           |  852 +
8283  drivers/staging/rtl8192e/r8192E_wx.c               | 1163 -
8284  drivers/staging/rtl8192e/r8192E_wx.h               |   18 -
8285  drivers/staging/rtl8192e/r8192_pm.c                |  123 -
8286  drivers/staging/rtl8192e/r8192_pm.h                |   24 -
8287  drivers/staging/rtl8192e/r819xE_cmdpkt.c           |  444 -
8288  drivers/staging/rtl8192e/r819xE_cmdpkt.h           |  207 -
8289  drivers/staging/rtl8192e/r819xE_firmware.c         |  351 -
8290  drivers/staging/rtl8192e/r819xE_phy.c              | 2225 --
8291  drivers/staging/rtl8192e/r819xE_phy.h              |  131 -
8292  drivers/staging/rtl8192e/rtl819x_BA.h              |   77 +
8293  drivers/staging/rtl8192e/rtl819x_BAProc.c          |  566 +
8294  drivers/staging/rtl8192e/rtl819x_HT.h              |  475 +
8295  drivers/staging/rtl8192e/rtl819x_HTProc.c          | 1075 +
8296  drivers/staging/rtl8192e/rtl819x_Qos.h             |  444 +
8297  drivers/staging/rtl8192e/rtl819x_TS.h              |   73 +
8298  drivers/staging/rtl8192e/rtl819x_TSProc.c          |  549 +
8299  drivers/staging/rtl8192e/rtl_cam.c                 |  304 +
8300  drivers/staging/rtl8192e/rtl_cam.h                 |   46 +
8301  drivers/staging/rtl8192e/rtl_core.c                | 3230 +++
8302  drivers/staging/rtl8192e/rtl_core.h                | 1124 +
8303  .../staging/rtl8192e/{ieee80211 => }/rtl_crypto.h  |  105 +-
8304  drivers/staging/rtl8192e/rtl_debug.c               | 1108 +
8305  drivers/staging/rtl8192e/rtl_debug.h               |  299 +
8306  drivers/staging/rtl8192e/rtl_dm.c                  | 2995 +++
8307  drivers/staging/rtl8192e/rtl_dm.h                  |  324 +
8308  drivers/staging/rtl8192e/rtl_eeprom.c              |  139 +
8309  drivers/staging/rtl8192e/rtl_eeprom.h              |   29 +
8310  drivers/staging/rtl8192e/rtl_ethtool.c             |   53 +
8311  drivers/staging/rtl8192e/rtl_pci.c                 |   97 +
8312  drivers/staging/rtl8192e/rtl_pci.h                 |  104 +
8313  drivers/staging/rtl8192e/rtl_pm.c                  |  136 +
8314  drivers/staging/rtl8192e/rtl_pm.h                  |   35 +
8315  drivers/staging/rtl8192e/rtl_ps.c                  |  310 +
8316  drivers/staging/rtl8192e/rtl_ps.h                  |   47 +
8317  drivers/staging/rtl8192e/rtl_wx.c                  | 1332 ++
8318  drivers/staging/rtl8192e/rtl_wx.h                  |   31 +
8319  drivers/staging/rtl8192e/rtllib.h                  | 3112 +++
8320  .../ieee80211_crypt.c => rtllib_crypt.c}           |   91 +-
8321  .../ieee80211_crypt.h => rtllib_crypt.h}           |   32 +-
8322  .../ieee80211_crypt_ccmp.c => rtllib_crypt_ccmp.c} |  170 +-
8323  .../ieee80211_crypt_tkip.c => rtllib_crypt_tkip.c} |  310 +-
8324  .../ieee80211_crypt_wep.c => rtllib_crypt_wep.c}   |  116 +-
8325  drivers/staging/rtl8192e/rtllib_endianfree.h       |  160 +
8326  drivers/staging/rtl8192e/rtllib_module.c           |  290 +
8327  drivers/staging/rtl8192e/rtllib_rx.c               | 2722 +++
8328  drivers/staging/rtl8192e/rtllib_softmac.c          | 3743 ++++
8329  .../ieee80211_softmac_wx.c => rtllib_softmac_wx.c} |  381 +-
8330  drivers/staging/rtl8192e/rtllib_tx.c               |  967 +
8331  drivers/staging/rtl8192e/rtllib_wx.c               |  876 +
8332  drivers/staging/rtl8192u/ieee80211/compress.c      |    4 +-
8333  drivers/staging/rtl8192u/ieee80211/ieee80211.h     |    4 +-
8334  .../staging/rtl8192u/ieee80211/ieee80211_softmac.c |   14 +-
8335  drivers/staging/rtl8712/big_endian.h               |   25 +
8336  drivers/staging/rtl8712/drv_types.h                |    5 +
8337  drivers/staging/rtl8712/ethernet.h                 |   25 +
8338  drivers/staging/rtl8712/generic.h                  |   25 +
8339  drivers/staging/rtl8712/if_ether.h                 |   25 +
8340  drivers/staging/rtl8712/little_endian.h            |   25 +
8341  drivers/staging/rtl8712/mlme_osdep.h               |   25 +
8342  drivers/staging/rtl8712/mp_custom_oid.h            |   25 +
8343  drivers/staging/rtl8712/os_intfs.c                 |   14 +
8344  drivers/staging/rtl8712/osdep_service.h            |    1 -
8345  drivers/staging/rtl8712/recv_osdep.h               |   25 +
8346  drivers/staging/rtl8712/rtl8712_bitdef.h           |   21 +
8347  drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h   |   19 +
8348  drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h   |   19 +
8349  drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h |   19 +
8350  drivers/staging/rtl8712/rtl8712_debugctrl_regdef.h |   19 +
8351  .../staging/rtl8712/rtl8712_edcasetting_bitdef.h   |   25 +
8352  .../staging/rtl8712/rtl8712_edcasetting_regdef.h   |   19 +
8353  drivers/staging/rtl8712/rtl8712_fifoctrl_bitdef.h  |   19 +
8354  drivers/staging/rtl8712/rtl8712_fifoctrl_regdef.h  |   19 +
8355  drivers/staging/rtl8712/rtl8712_gp_bitdef.h        |   25 +
8356  drivers/staging/rtl8712/rtl8712_gp_regdef.h        |   25 +
8357  drivers/staging/rtl8712/rtl8712_hal.h              |   25 +
8358  drivers/staging/rtl8712/rtl8712_interrupt_bitdef.h |   19 +
8359  .../staging/rtl8712/rtl8712_macsetting_bitdef.h    |   19 +
8360  .../staging/rtl8712/rtl8712_macsetting_regdef.h    |   19 +
8361  drivers/staging/rtl8712/rtl8712_powersave_bitdef.h |   19 +
8362  drivers/staging/rtl8712/rtl8712_powersave_regdef.h |   19 +
8363  drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h  |   19 +
8364  drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h  |   25 +
8365  drivers/staging/rtl8712/rtl8712_regdef.h           |   25 +
8366  drivers/staging/rtl8712/rtl8712_security_bitdef.h  |   19 +
8367  drivers/staging/rtl8712/rtl8712_spec.h             |   25 +
8368  drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h    |   25 +
8369  drivers/staging/rtl8712/rtl8712_syscfg_regdef.h    |   25 +
8370  drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h  |   19 +
8371  drivers/staging/rtl8712/rtl8712_timectrl_regdef.h  |   19 +
8372  drivers/staging/rtl8712/rtl8712_wmac_bitdef.h      |   25 +
8373  drivers/staging/rtl8712/rtl8712_wmac_regdef.h      |   25 +
8374  drivers/staging/rtl8712/rtl871x_byteorder.h        |   19 +
8375  drivers/staging/rtl8712/rtl871x_eeprom.h           |   19 +
8376  drivers/staging/rtl8712/rtl871x_event.h            |   25 +
8377  drivers/staging/rtl8712/rtl871x_ht.h               |   25 +
8378  drivers/staging/rtl8712/rtl871x_ioctl_linux.c      |   28 +-
8379  drivers/staging/rtl8712/rtl871x_ioctl_set.h        |   25 +
8380  drivers/staging/rtl8712/rtl871x_mp.h               |   25 +
8381  drivers/staging/rtl8712/rtl871x_pwrctrl.h          |   25 +
8382  drivers/staging/rtl8712/rtl871x_rf.h               |   25 +
8383  drivers/staging/rtl8712/rtl871x_security.h         |   25 +
8384  drivers/staging/rtl8712/rtl871x_wlan_sme.h         |   25 +
8385  drivers/staging/rtl8712/swab.h                     |   25 +
8386  drivers/staging/rtl8712/usb_ops.h                  |   25 +
8387  drivers/staging/rtl8712/usb_osintf.h               |   25 +
8388  drivers/staging/rtl8712/usb_vendor_req.h           |   25 +
8389  drivers/staging/rts5139/Kconfig                    |   16 +
8390  drivers/staging/rts5139/Makefile                   |   37 +
8391  drivers/staging/rts5139/TODO                       |    5 +
8392  drivers/staging/rts5139/debug.h                    |   46 +
8393  drivers/staging/rts5139/ms.c                       | 4191 ++++
8394  drivers/staging/rts5139/ms.h                       |  263 +
8395  drivers/staging/rts5139/ms_mg.c                    |  642 +
8396  drivers/staging/rts5139/ms_mg.h                    |   41 +
8397  drivers/staging/rts5139/rts51x.c                   |  967 +
8398  drivers/staging/rts5139/rts51x.h                   |  205 +
8399  drivers/staging/rts5139/rts51x_card.c              |  986 +
8400  drivers/staging/rts5139/rts51x_card.h              |  881 +
8401  drivers/staging/rts5139/rts51x_chip.c              | 1167 +
8402  drivers/staging/rts5139/rts51x_chip.h              |  904 +
8403  drivers/staging/rts5139/rts51x_fop.c               |  298 +
8404  drivers/staging/rts5139/rts51x_fop.h               |   62 +
8405  drivers/staging/rts5139/rts51x_scsi.c              | 2234 ++
8406  drivers/staging/rts5139/rts51x_scsi.h              |  162 +
8407  drivers/staging/rts5139/rts51x_sys.h               |   54 +
8408  drivers/staging/rts5139/rts51x_transport.c         | 1000 +
8409  drivers/staging/rts5139/rts51x_transport.h         |   80 +
8410  drivers/staging/rts5139/sd.c                       | 3400 +++
8411  drivers/staging/rts5139/sd.h                       |  304 +
8412  drivers/staging/rts5139/sd_cprm.c                  | 1215 +
8413  drivers/staging/rts5139/sd_cprm.h                  |   54 +
8414  drivers/staging/rts5139/trace.h                    |  137 +
8415  drivers/staging/rts5139/xd.c                       | 2255 ++
8416  drivers/staging/rts5139/xd.h                       |  193 +
8417  drivers/staging/rts_pstor/Makefile                 |    2 +-
8418  drivers/staging/rts_pstor/rtsx_scsi.c              |    2 +-
8419  drivers/staging/rts_pstor/sd.c                     |    4 +-
8420  drivers/staging/rts_pstor/spi.c                    |    2 +-
8421  drivers/staging/serqt_usb2/serqt_usb2.c            |   37 +-
8422  drivers/staging/sm7xx/smtcfb.c                     |    2 +
8423  drivers/staging/spectra/ffsport.c                  |   15 +-
8424  drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c      |    1 +
8425  drivers/staging/tidspbridge/gen/gh.c               |    2 +-
8426  drivers/staging/usbip/stub.h                       |    5 +
8427  drivers/staging/usbip/stub_dev.c                   |    7 +-
8428  drivers/staging/usbip/stub_main.c                  |    1 +
8429  drivers/staging/usbip/stub_rx.c                    |    5 +-
8430  drivers/staging/usbip/usbip_protocol.txt           |  358 +
8431  .../staging/usbip/userspace/libsrc/vhci_driver.c   |    2 +-
8432  drivers/staging/usbip/userspace/src/usbip_attach.c |    4 +-
8433  drivers/staging/usbip/userspace/src/utils.h        |    1 +
8434  drivers/staging/usbip/vhci.h                       |    5 +
8435  drivers/staging/vme/bridges/vme_ca91cx42.c         |   24 +
8436  drivers/staging/vme/bridges/vme_tsi148.c           |   24 +
8437  drivers/staging/vme/devices/vme_user.c             |    4 +-
8438  drivers/staging/vme/vme.c                          |   74 +-
8439  drivers/staging/vme/vme_bridge.h                   |   11 +-
8440  drivers/staging/vt6655/IEEE11h.c                   |  406 +-
8441  drivers/staging/vt6655/device_main.c               |   10 +-
8442  drivers/staging/vt6655/dpc.c                       |   30 +-
8443  drivers/staging/vt6655/wmgr.c                      |   49 +-
8444  drivers/staging/vt6656/dpc.c                       |   30 +-
8445  drivers/staging/vt6656/main_usb.c                  |   11 +-
8446  drivers/staging/vt6656/wmgr.c                      |   49 +-
8447  drivers/staging/winbond/phy_calibration.c          |   12 +-
8448  drivers/staging/xgifb/XGI_main.h                   |  128 +-
8449  drivers/staging/xgifb/XGI_main_26.c                |  544 +-
8450  drivers/staging/xgifb/XGIfb.h                      |   12 -
8451  drivers/staging/xgifb/vb_def.h                     |  590 +-
8452  drivers/staging/xgifb/vb_ext.h                     |   20 -
8453  drivers/staging/xgifb/vb_setmode.c                 |    3 -
8454  drivers/staging/xgifb/vb_struct.h                  |   71 -
8455  drivers/staging/xgifb/vb_table.h                   |  729 -
8456  drivers/staging/xgifb/vgatypes.h                   |    5 -
8457  drivers/staging/zcache/zcache-main.c               |    6 +-
8458  drivers/staging/zram/zram_drv.c                    |   36 +-
8459  drivers/staging/zram/zram_drv.h                    |    4 +-
8460  drivers/staging/zram/zram_sysfs.c                  |    4 +-
8461  include/linux/mod_devicetable.h                    |    9 +
8462  scripts/mod/file2alias.c                           |   25 +
8463  505 files changed, 100318 insertions(+), 71355 deletions(-)
8464  delete mode 100644 drivers/char/scc.h
8465  delete mode 100644 drivers/staging/brcm80211/brcmsmac/bmac.c
8466  delete mode 100644 drivers/staging/brcm80211/brcmsmac/bmac.h
8467  create mode 100644 drivers/staging/comedi/drivers/usbduxsigma.c
8468  create mode 100644 drivers/staging/et131x/et131x_ethtool.c
8469  delete mode 100644 drivers/staging/hv/blkvsc_drv.c
8470  delete mode 100644 drivers/staging/hv/hyperv_storage.h
8471  delete mode 100644 drivers/staging/hv/storvsc.c
8472  create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-adc-ad7280a
8473  create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-impedance-analyzer-ad5933
8474  delete mode 100644 drivers/staging/iio/accel/accel.h
8475  delete mode 100644 drivers/staging/iio/accel/inclinometer.h
8476  create mode 100644 drivers/staging/iio/adc/ad7192.c
8477  create mode 100644 drivers/staging/iio/adc/ad7192.h
8478  create mode 100644 drivers/staging/iio/adc/ad7280a.c
8479  create mode 100644 drivers/staging/iio/adc/ad7280a.h
8480  delete mode 100644 drivers/staging/iio/adc/adc.h
8481  delete mode 100644 drivers/staging/iio/gyro/gyro.h
8482  create mode 100644 drivers/staging/iio/iio_core.h
8483  create mode 100644 drivers/staging/iio/iio_core_trigger.h
8484  create mode 100644 drivers/staging/iio/impedance-analyzer/Kconfig
8485  create mode 100644 drivers/staging/iio/impedance-analyzer/Makefile
8486  create mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.c
8487  create mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.h
8488  delete mode 100644 drivers/staging/iio/magnetometer/magnet.h
8489  create mode 100644 drivers/staging/rtl8192e/TODO
8490  create mode 100644 drivers/staging/rtl8192e/dot11d.c
8491  delete mode 100644 drivers/staging/rtl8192e/ieee80211/dot11d.c
8492  delete mode 100644 drivers/staging/rtl8192e/ieee80211/dot11d.h
8493  delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211.h
8494  delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
8495  delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
8496  delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
8497  delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c
8498  delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
8499  delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h
8500  delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c
8501  delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h
8502  delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c
8503  delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h
8504  delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h
8505  delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c
8506  create mode 100644 drivers/staging/rtl8192e/license
8507  delete mode 100644 drivers/staging/rtl8192e/r8180_93cx6.c
8508  delete mode 100644 drivers/staging/rtl8192e/r8180_93cx6.h
8509  create mode 100644 drivers/staging/rtl8192e/r8190P_def.h
8510  create mode 100644 drivers/staging/rtl8192e/r8190P_rtl8256.c
8511  create mode 100644 drivers/staging/rtl8192e/r8190P_rtl8256.h
8512  delete mode 100644 drivers/staging/rtl8192e/r8190_rtl8256.c
8513  delete mode 100644 drivers/staging/rtl8192e/r8190_rtl8256.h
8514  delete mode 100644 drivers/staging/rtl8192e/r8192E.h
8515  create mode 100644 drivers/staging/rtl8192e/r8192E_cmdpkt.c
8516  create mode 100644 drivers/staging/rtl8192e/r8192E_cmdpkt.h
8517  delete mode 100644 drivers/staging/rtl8192e/r8192E_core.c
8518  create mode 100644 drivers/staging/rtl8192e/r8192E_dev.c
8519  create mode 100644 drivers/staging/rtl8192e/r8192E_dev.h
8520  delete mode 100644 drivers/staging/rtl8192e/r8192E_dm.c
8521  delete mode 100644 drivers/staging/rtl8192e/r8192E_dm.h
8522  create mode 100644 drivers/staging/rtl8192e/r8192E_firmware.c
8523  create mode 100644 drivers/staging/rtl8192e/r8192E_firmware.h
8524  create mode 100644 drivers/staging/rtl8192e/r8192E_hwimg.c
8525  create mode 100644 drivers/staging/rtl8192e/r8192E_hwimg.h
8526  create mode 100644 drivers/staging/rtl8192e/r8192E_phy.c
8527  create mode 100644 drivers/staging/rtl8192e/r8192E_phy.h
8528  create mode 100644 drivers/staging/rtl8192e/r8192E_phyreg.h
8529  delete mode 100644 drivers/staging/rtl8192e/r8192E_wx.c
8530  delete mode 100644 drivers/staging/rtl8192e/r8192E_wx.h
8531  delete mode 100644 drivers/staging/rtl8192e/r8192_pm.c
8532  delete mode 100644 drivers/staging/rtl8192e/r8192_pm.h
8533  delete mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.c
8534  delete mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.h
8535  delete mode 100644 drivers/staging/rtl8192e/r819xE_firmware.c
8536  delete mode 100644 drivers/staging/rtl8192e/r819xE_phy.c
8537  delete mode 100644 drivers/staging/rtl8192e/r819xE_phy.h
8538  create mode 100644 drivers/staging/rtl8192e/rtl819x_BA.h
8539  create mode 100644 drivers/staging/rtl8192e/rtl819x_BAProc.c
8540  create mode 100644 drivers/staging/rtl8192e/rtl819x_HT.h
8541  create mode 100644 drivers/staging/rtl8192e/rtl819x_HTProc.c
8542  create mode 100644 drivers/staging/rtl8192e/rtl819x_Qos.h
8543  create mode 100644 drivers/staging/rtl8192e/rtl819x_TS.h
8544  create mode 100644 drivers/staging/rtl8192e/rtl819x_TSProc.c
8545  create mode 100644 drivers/staging/rtl8192e/rtl_cam.c
8546  create mode 100644 drivers/staging/rtl8192e/rtl_cam.h
8547  create mode 100644 drivers/staging/rtl8192e/rtl_core.c
8548  create mode 100644 drivers/staging/rtl8192e/rtl_core.h
8549  rename drivers/staging/rtl8192e/{ieee80211 => }/rtl_crypto.h (74%)
8550  create mode 100644 drivers/staging/rtl8192e/rtl_debug.c
8551  create mode 100644 drivers/staging/rtl8192e/rtl_debug.h
8552  create mode 100644 drivers/staging/rtl8192e/rtl_dm.c
8553  create mode 100644 drivers/staging/rtl8192e/rtl_dm.h
8554  create mode 100644 drivers/staging/rtl8192e/rtl_eeprom.c
8555  create mode 100644 drivers/staging/rtl8192e/rtl_eeprom.h
8556  create mode 100644 drivers/staging/rtl8192e/rtl_ethtool.c
8557  create mode 100644 drivers/staging/rtl8192e/rtl_pci.c
8558  create mode 100644 drivers/staging/rtl8192e/rtl_pci.h
8559  create mode 100644 drivers/staging/rtl8192e/rtl_pm.c
8560  create mode 100644 drivers/staging/rtl8192e/rtl_pm.h
8561  create mode 100644 drivers/staging/rtl8192e/rtl_ps.c
8562  create mode 100644 drivers/staging/rtl8192e/rtl_ps.h
8563  create mode 100644 drivers/staging/rtl8192e/rtl_wx.c
8564  create mode 100644 drivers/staging/rtl8192e/rtl_wx.h
8565  create mode 100644 drivers/staging/rtl8192e/rtllib.h
8566  rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt.c => rtllib_crypt.c} (63%)
8567  rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt.h => rtllib_crypt.h} (74%)
8568  rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt_ccmp.c => rtllib_crypt_ccmp.c} (67%)
8569  rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt_tkip.c => rtllib_crypt_tkip.c} (71%)
8570  rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt_wep.c => rtllib_crypt_wep.c} (71%)
8571  create mode 100644 drivers/staging/rtl8192e/rtllib_endianfree.h
8572  create mode 100644 drivers/staging/rtl8192e/rtllib_module.c
8573  create mode 100644 drivers/staging/rtl8192e/rtllib_rx.c
8574  create mode 100644 drivers/staging/rtl8192e/rtllib_softmac.c
8575  rename drivers/staging/rtl8192e/{ieee80211/ieee80211_softmac_wx.c => rtllib_softmac_wx.c} (50%)
8576  create mode 100644 drivers/staging/rtl8192e/rtllib_tx.c
8577  create mode 100644 drivers/staging/rtl8192e/rtllib_wx.c
8578  create mode 100644 drivers/staging/rts5139/Kconfig
8579  create mode 100644 drivers/staging/rts5139/Makefile
8580  create mode 100644 drivers/staging/rts5139/TODO
8581  create mode 100644 drivers/staging/rts5139/debug.h
8582  create mode 100644 drivers/staging/rts5139/ms.c
8583  create mode 100644 drivers/staging/rts5139/ms.h
8584  create mode 100644 drivers/staging/rts5139/ms_mg.c
8585  create mode 100644 drivers/staging/rts5139/ms_mg.h
8586  create mode 100644 drivers/staging/rts5139/rts51x.c
8587  create mode 100644 drivers/staging/rts5139/rts51x.h
8588  create mode 100644 drivers/staging/rts5139/rts51x_card.c
8589  create mode 100644 drivers/staging/rts5139/rts51x_card.h
8590  create mode 100644 drivers/staging/rts5139/rts51x_chip.c
8591  create mode 100644 drivers/staging/rts5139/rts51x_chip.h
8592  create mode 100644 drivers/staging/rts5139/rts51x_fop.c
8593  create mode 100644 drivers/staging/rts5139/rts51x_fop.h
8594  create mode 100644 drivers/staging/rts5139/rts51x_scsi.c
8595  create mode 100644 drivers/staging/rts5139/rts51x_scsi.h
8596  create mode 100644 drivers/staging/rts5139/rts51x_sys.h
8597  create mode 100644 drivers/staging/rts5139/rts51x_transport.c
8598  create mode 100644 drivers/staging/rts5139/rts51x_transport.h
8599  create mode 100644 drivers/staging/rts5139/sd.c
8600  create mode 100644 drivers/staging/rts5139/sd.h
8601  create mode 100644 drivers/staging/rts5139/sd_cprm.c
8602  create mode 100644 drivers/staging/rts5139/sd_cprm.h
8603  create mode 100644 drivers/staging/rts5139/trace.h
8604  create mode 100644 drivers/staging/rts5139/xd.c
8605  create mode 100644 drivers/staging/rts5139/xd.h
8606  create mode 100644 drivers/staging/usbip/usbip_protocol.txt
8607 Merging bkl-config/config
8608 $ git merge bkl-config/config
8609 Already up-to-date.
8610 Merging tmem/linux-next
8611 $ git merge tmem/linux-next
8612 Merge made by recursive.
8613  .../ABI/testing/sysfs-kernel-mm-frontswap          |   16 +
8614  Documentation/vm/frontswap.txt                     |  215 ++++++++++++
8615  include/linux/frontswap.h                          |  125 +++++++
8616  include/linux/swap.h                               |    4 +
8617  include/linux/swapfile.h                           |   13 +
8618  mm/Kconfig                                         |   17 +
8619  mm/Makefile                                        |    1 +
8620  mm/frontswap.c                                     |  351 ++++++++++++++++++++
8621  mm/page_io.c                                       |   12 +
8622  mm/swapfile.c                                      |   64 +++-
8623  10 files changed, 805 insertions(+), 13 deletions(-)
8624  create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-frontswap
8625  create mode 100644 Documentation/vm/frontswap.txt
8626  create mode 100644 include/linux/frontswap.h
8627  create mode 100644 include/linux/swapfile.h
8628  create mode 100644 mm/frontswap.c
8629 Merging writeback/next
8630 $ git merge writeback/next
8631 Merge made by recursive.
8632  include/trace/events/writeback.h |   10 +++++-----
8633  1 files changed, 5 insertions(+), 5 deletions(-)
8634 Merging arm-dt/devicetree/arm-next
8635 $ git merge arm-dt/devicetree/arm-next
8636 Already up-to-date.
8637 Merging moduleh/module.h-split
8638 $ git merge moduleh/module.h-split
8639 Auto-merging arch/arm/common/scoop.c
8640 Auto-merging arch/arm/kernel/armksyms.c
8641 Auto-merging arch/arm/kernel/process.c
8642 Auto-merging arch/arm/kernel/setup.c
8643 Auto-merging arch/arm/mach-bcmring/mm.c
8644 CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c
8645 Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
8646 Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c
8647 Auto-merging arch/arm/mach-imx/mach-mx31lilly.c
8648 Auto-merging arch/arm/mach-imx/mach-mx31lite.c
8649 Auto-merging arch/arm/mach-imx/mach-mx31moboard.c
8650 Auto-merging arch/arm/mach-ixp2000/core.c
8651 Auto-merging arch/arm/mach-ixp4xx/common-pci.c
8652 Auto-merging arch/arm/mach-omap1/board-ams-delta.c
8653 Auto-merging arch/arm/mach-omap1/board-sx1.c
8654 Auto-merging arch/arm/mach-omap1/board-voiceblue.c
8655 Auto-merging arch/arm/mach-omap2/board-omap3evm.c
8656 Auto-merging arch/arm/mach-omap2/clockdomain.c
8657 Auto-merging arch/arm/mach-omap2/pm.c
8658 Auto-merging arch/arm/mach-s3c2410/mach-h1940.c
8659 Auto-merging arch/arm/mach-sa1100/jornada720.c
8660 Auto-merging arch/arm/mm/init.c
8661 Auto-merging arch/arm/plat-samsung/dev-ts.c
8662 Auto-merging arch/arm/plat-samsung/platformdata.c
8663 Auto-merging arch/blackfin/mach-bf518/boards/ezbrd.c
8664 Auto-merging arch/blackfin/mach-bf527/boards/ad7160eval.c
8665 Auto-merging arch/blackfin/mach-bf527/boards/ezkit.c
8666 Auto-merging arch/blackfin/mach-bf527/boards/tll6527m.c
8667 Auto-merging arch/blackfin/mach-bf537/boards/dnp5370.c
8668 Auto-merging arch/mips/bcm47xx/gpio.c
8669 Auto-merging arch/mips/bcm47xx/setup.c
8670 Auto-merging arch/mips/kernel/traps.c
8671 Auto-merging arch/powerpc/platforms/pseries/lpar.c
8672 Auto-merging arch/powerpc/sysdev/fsl_rio.c
8673 Auto-merging arch/sparc/kernel/pcic.c
8674 Auto-merging arch/sparc/kernel/setup_64.c
8675 Auto-merging arch/x86/kernel/cpu/amd.c
8676 Auto-merging block/ioctl.c
8677 Auto-merging drivers/ata/libata-eh.c
8678 Auto-merging drivers/base/power/main.c
8679 Auto-merging drivers/base/power/runtime.c
8680 Auto-merging drivers/bcma/core.c
8681 Auto-merging drivers/bcma/driver_chipcommon.c
8682 Auto-merging drivers/bcma/driver_pci.c
8683 Auto-merging drivers/bcma/main.c
8684 Auto-merging drivers/char/virtio_console.c
8685 Auto-merging drivers/clocksource/sh_cmt.c
8686 Auto-merging drivers/dca/dca-core.c
8687 Auto-merging drivers/dma/ste_dma40.c
8688 Auto-merging drivers/firmware/google/gsmi.c
8689 Auto-merging drivers/gpio/gpio-ep93xx.c
8690 Auto-merging drivers/gpio/gpio-mxc.c
8691 Auto-merging drivers/gpio/gpio-mxs.c
8692 Auto-merging drivers/hid/hid-axff.c
8693 Auto-merging drivers/hid/hid-debug.c
8694 Auto-merging drivers/hid/hid-picolcd.c
8695 Auto-merging drivers/hid/hid-sjoy.c
8696 Auto-merging drivers/hid/usbhid/hid-quirks.c
8697 Auto-merging drivers/i2c/busses/i2c-pxa-pci.c
8698 Auto-merging drivers/i2c/busses/i2c-tegra.c
8699 Auto-merging drivers/input/input-mt.c
8700 Auto-merging drivers/input/input-polldev.c
8701 Auto-merging drivers/input/misc/ad714x.c
8702 Auto-merging drivers/leds/leds-asic3.c
8703 Auto-merging drivers/md/dm-raid.c
8704 Auto-merging drivers/md/md.c
8705 Auto-merging drivers/md/raid1.c
8706 Auto-merging drivers/md/raid10.c
8707 Auto-merging drivers/md/raid5.c
8708 Auto-merging drivers/mfd/ab3550-core.c
8709 Auto-merging drivers/mfd/asic3.c
8710 Auto-merging drivers/mfd/max8997.c
8711 Auto-merging drivers/mfd/twl6030-irq.c
8712 Auto-merging drivers/mfd/wm8400-core.c
8713 Auto-merging drivers/misc/ab8500-pwm.c
8714 Auto-merging drivers/misc/ti-st/st_kim.c
8715 Auto-merging drivers/mmc/core/debugfs.c
8716 Auto-merging drivers/mmc/core/host.c
8717 Auto-merging drivers/mmc/core/mmc_ops.c
8718 Auto-merging drivers/mmc/core/sd.c
8719 Auto-merging drivers/mmc/core/sd_ops.c
8720 Auto-merging drivers/mmc/host/sdhci-tegra.c
8721 Auto-merging drivers/mmc/host/sh_mobile_sdhi.c
8722 Auto-merging drivers/mtd/ar7part.c
8723 Auto-merging drivers/mtd/cmdlinepart.c
8724 Auto-merging drivers/mtd/mtdsuper.c
8725 Auto-merging drivers/mtd/nand/cafe_nand.c
8726 Auto-merging drivers/mtd/nand/cmx270_nand.c
8727 Auto-merging drivers/mtd/nand/diskonchip.c
8728 Auto-merging drivers/mtd/nand/nand_bbt.c
8729 Auto-merging drivers/mtd/nand/omap2.c
8730 Auto-merging drivers/mtd/nand/sm_common.c
8731 Auto-merging drivers/mtd/onenand/onenand_bbt.c
8732 Auto-merging drivers/mtd/redboot.c
8733 Auto-merging drivers/net/ethernet/mellanox/mlx4/alloc.c
8734 Auto-merging drivers/net/ethernet/mellanox/mlx4/catas.c
8735 Auto-merging drivers/net/ethernet/mellanox/mlx4/cmd.c
8736 Auto-merging drivers/net/ethernet/mellanox/mlx4/cq.c
8737 Auto-merging drivers/net/ethernet/mellanox/mlx4/eq.c
8738 Auto-merging drivers/net/ethernet/mellanox/mlx4/fw.c
8739 Auto-merging drivers/net/ethernet/mellanox/mlx4/intf.c
8740 Auto-merging drivers/net/ethernet/mellanox/mlx4/mr.c
8741 Auto-merging drivers/net/ethernet/mellanox/mlx4/pd.c
8742 Auto-merging drivers/net/ethernet/mellanox/mlx4/port.c
8743 Auto-merging drivers/net/ethernet/mellanox/mlx4/qp.c
8744 Auto-merging drivers/net/ethernet/mellanox/mlx4/srq.c
8745 Auto-merging drivers/pci/hotplug/pcihp_slot.c
8746 Auto-merging drivers/pci/setup-res.c
8747 Auto-merging drivers/power/max17042_battery.c
8748 Auto-merging drivers/power/max8903_charger.c
8749 Auto-merging drivers/power/max8997_charger.c
8750 Auto-merging drivers/power/max8998_charger.c
8751 Auto-merging drivers/power/power_supply_sysfs.c
8752 Auto-merging drivers/regulator/88pm8607.c
8753 Auto-merging drivers/regulator/tps6586x-regulator.c
8754 Auto-merging drivers/rtc/interface.c
8755 Auto-merging drivers/s390/char/vmur.c
8756 CONFLICT (content): Merge conflict in drivers/s390/char/vmur.c
8757 Auto-merging drivers/s390/cio/qdio_debug.c
8758 Auto-merging drivers/s390/scsi/zfcp_dbf.c
8759 Auto-merging drivers/s390/scsi/zfcp_scsi.c
8760 Auto-merging drivers/scsi/device_handler/scsi_dh.c
8761 Auto-merging drivers/scsi/device_handler/scsi_dh_alua.c
8762 Auto-merging drivers/scsi/libfc/fc_exch.c
8763 Auto-merging drivers/scsi/libfc/fc_lport.c
8764 CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
8765 Auto-merging drivers/scsi/libsas/sas_scsi_host.c
8766 Auto-merging drivers/scsi/lpfc/lpfc_attr.c
8767 Auto-merging drivers/scsi/lpfc/lpfc_init.c
8768 Auto-merging drivers/scsi/lpfc/lpfc_scsi.c
8769 Auto-merging drivers/ssb/main.c
8770 Auto-merging drivers/staging/brcm80211/brcmutil/wifi.c
8771 Auto-merging drivers/staging/iio/industrialio-ring.c
8772 Auto-merging drivers/tty/serial/jsm/jsm_driver.c
8773 Auto-merging drivers/tty/serial/max3107-aava.c
8774 Auto-merging drivers/tty/serial/max3107.c
8775 Auto-merging drivers/uio/uio_pdrv_genirq.c
8776 Auto-merging drivers/usb/core/driver.c
8777 Auto-merging drivers/usb/gadget/composite.c
8778 Auto-merging drivers/usb/gadget/file_storage.c
8779 Auto-merging drivers/usb/gadget/fusb300_udc.c
8780 Auto-merging drivers/usb/host/xhci-hub.c
8781 Auto-merging drivers/usb/wusbcore/wa-hc.c
8782 Auto-merging drivers/video/atmel_lcdfb.c
8783 Auto-merging drivers/video/backlight/ep93xx_bl.c
8784 Auto-merging drivers/video/carminefb.c
8785 Auto-merging drivers/video/mb862xx/mb862xx-i2c.c
8786 Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
8787 Auto-merging drivers/video/msm/mdp.c
8788 Auto-merging drivers/video/sh_mobile_lcdcfb.c
8789 Auto-merging drivers/w1/w1_family.c
8790 Auto-merging drivers/xen/balloon.c
8791 Auto-merging drivers/xen/swiotlb-xen.c
8792 Auto-merging drivers/xen/xen-selfballoon.c
8793 Auto-merging drivers/xen/xenbus/xenbus_probe.c
8794 Auto-merging drivers/xen/xenbus/xenbus_probe_frontend.c
8795 Auto-merging fs/exofs/super.c
8796 Auto-merging fs/gfs2/ops_fstype.c
8797 Auto-merging fs/jfs/jfs_logmgr.c
8798 Auto-merging fs/logfs/super.c
8799 Auto-merging include/linux/bcma/bcma.h
8800 Auto-merging include/linux/blkdev.h
8801 Auto-merging include/linux/device.h
8802 Auto-merging include/linux/dmaengine.h
8803 CONFLICT (content): Merge conflict in include/linux/dmaengine.h
8804 Auto-merging include/linux/hid.h
8805 Auto-merging include/linux/mtd/mtd.h
8806 Auto-merging include/linux/pm_runtime.h
8807 Auto-merging include/linux/ssb/ssb.h
8808 Auto-merging include/linux/usb.h
8809 Auto-merging include/net/lib80211.h
8810 Auto-merging include/net/sock.h
8811 Auto-merging kernel/cgroup_freezer.c
8812 Auto-merging kernel/crash_dump.c
8813 Auto-merging kernel/cred.c
8814 Auto-merging kernel/events/core.c
8815 Auto-merging kernel/exit.c
8816 Auto-merging kernel/fork.c
8817 Auto-merging kernel/freezer.c
8818 Auto-merging kernel/kprobes.c
8819 Auto-merging kernel/kthread.c
8820 Auto-merging kernel/latencytop.c
8821 Auto-merging kernel/lockdep.c
8822 Auto-merging kernel/pid.c
8823 Auto-merging kernel/power/hibernate.c
8824 Auto-merging kernel/power/main.c
8825 Auto-merging kernel/power/suspend.c
8826 Auto-merging kernel/rcupdate.c
8827 Auto-merging kernel/rcutiny.c
8828 Auto-merging kernel/rcutorture.c
8829 Auto-merging kernel/rcutree.c
8830 Auto-merging kernel/rcutree_trace.c
8831 Auto-merging kernel/rtmutex-debug.c
8832 Auto-merging kernel/rtmutex.c
8833 Auto-merging kernel/sched.c
8834 Auto-merging kernel/semaphore.c
8835 Auto-merging kernel/signal.c
8836 ARecorded preimage for 'drivers/s390/char/vmur.c'
8837 Resolved 'arch/arm/mach-bcmring/mm.c' using previous resolution.
8838 Resolved 'drivers/scsi/libfc/fc_lport.c' using previous resolution.
8839 Resolved 'include/linux/dmaengine.h' using previous resolution.
8840 uto-merging kernel/sys.c
8841 Auto-merging kernel/sysctl.c
8842 Auto-merging kernel/trace/blktrace.c
8843 Auto-merging kernel/watchdog.c
8844 Auto-merging lib/dma-debug.c
8845 Auto-merging mm/memcontrol.c
8846 Auto-merging mm/swapfile.c
8847 Auto-merging security/selinux/netlink.c
8848 Auto-merging sound/core/control.c
8849 Auto-merging sound/usb/midi.c
8850 Automatic merge failed; fix conflicts and then commit the result.
8851 $ git commit -v -a
8852 Recorded resolution for 'drivers/s390/char/vmur.c'.
8853 [master f7fdbb2] Merge remote-tracking branch 'moduleh/module.h-split'
8854 $ git diff -M --stat --summary HEAD^..
8855  arch/alpha/kernel/core_irongate.c                  |    1 +
8856  arch/alpha/kernel/pci-sysfs.c                      |    1 +
8857  arch/alpha/kernel/pci_iommu.c                      |    1 +
8858  arch/alpha/kernel/setup.c                          |    1 +
8859  arch/arm/common/it8152.c                           |    1 +
8860  arch/arm/common/scoop.c                            |    1 +
8861  arch/arm/kernel/armksyms.c                         |    2 +-
8862  arch/arm/kernel/bios32.c                           |    2 +-
8863  arch/arm/kernel/devtree.c                          |    2 +-
8864  arch/arm/kernel/elf.c                              |    2 +-
8865  arch/arm/kernel/io.c                               |    2 +-
8866  arch/arm/kernel/irq.c                              |    1 -
8867  arch/arm/kernel/leds.c                             |    3 +-
8868  arch/arm/kernel/perf_event.c                       |    2 +-
8869  arch/arm/kernel/pj4-cp0.c                          |    1 -
8870  arch/arm/kernel/process.c                          |    2 +-
8871  arch/arm/kernel/ptrace.c                           |    1 +
8872  arch/arm/kernel/return_address.c                   |    2 +-
8873  arch/arm/kernel/setup.c                            |    2 +-
8874  arch/arm/kernel/stacktrace.c                       |    2 +-
8875  arch/arm/kernel/sys_arm.c                          |    2 +-
8876  arch/arm/kernel/time.c                             |    2 +-
8877  arch/arm/kernel/unwind.c                           |    2 +-
8878  arch/arm/kernel/xscale-cp0.c                       |    1 -
8879  arch/arm/mach-at91/cpuidle.c                       |    1 +
8880  arch/arm/mach-bcmring/dma.c                        |    1 +
8881  arch/arm/mach-bcmring/mm.c                         |    1 +
8882  arch/arm/mach-davinci/board-dm644x-evm.c           |    1 +
8883  arch/arm/mach-davinci/board-dm646x-evm.c           |    1 +
8884  arch/arm/mach-davinci/cdce949.c                    |    1 +
8885  arch/arm/mach-davinci/cpufreq.c                    |    1 +
8886  arch/arm/mach-davinci/cpuidle.c                    |    1 +
8887  arch/arm/mach-ep93xx/core.c                        |    1 +
8888  arch/arm/mach-exynos4/dev-sysmmu.c                 |    1 +
8889  arch/arm/mach-imx/mach-mx31lilly.c                 |    1 +
8890  arch/arm/mach-imx/mach-mx31lite.c                  |    1 +
8891  arch/arm/mach-imx/mach-mx31moboard.c               |    1 +
8892  arch/arm/mach-iop13xx/pci.c                        |    1 +
8893  arch/arm/mach-ixp2000/core.c                       |    1 +
8894  arch/arm/mach-ixp4xx/common-pci.c                  |    1 +
8895  arch/arm/mach-ixp4xx/common.c                      |    1 +
8896  arch/arm/mach-kirkwood/cpuidle.c                   |    1 +
8897  arch/arm/mach-msm/io.c                             |    1 +
8898  arch/arm/mach-netx/xc.c                            |    1 +
8899  arch/arm/mach-omap1/board-ams-delta.c              |    1 +
8900  arch/arm/mach-omap1/board-sx1.c                    |    1 +
8901  arch/arm/mach-omap1/board-voiceblue.c              |    1 +
8902  arch/arm/mach-omap1/mailbox.c                      |    1 +
8903  arch/arm/mach-omap2/board-omap3evm.c               |    1 +
8904  arch/arm/mach-omap2/clockdomain.c                  |    1 +
8905  arch/arm/mach-omap2/display.c                      |    1 +
8906  arch/arm/mach-omap2/gpmc-onenand.c                 |    1 +
8907  arch/arm/mach-omap2/pm.c                           |    1 +
8908  arch/arm/mach-omap2/prcm.c                         |    1 +
8909  arch/arm/mach-omap2/usb-tusb6010.c                 |    2 +
8910  arch/arm/mach-omap2/voltage.c                      |    1 +
8911  arch/arm/mach-pxa/corgi.c                          |    1 +
8912  arch/arm/mach-pxa/poodle.c                         |    1 +
8913  arch/arm/mach-pxa/spitz.c                          |    1 +
8914  arch/arm/mach-s3c2410/mach-h1940.c                 |    1 +
8915  arch/arm/mach-s3c64xx/dev-audio.c                  |    1 +
8916  arch/arm/mach-sa1100/collie.c                      |    1 +
8917  arch/arm/mach-sa1100/jornada720.c                  |    1 +
8918  arch/arm/mach-shmobile/clock.c                     |    1 +
8919  arch/arm/mach-tegra/pcie.c                         |    1 +
8920  arch/arm/mm/fault-armv.c                           |    1 -
8921  arch/arm/mm/init.c                                 |    1 +
8922  arch/arm/plat-iop/gpio.c                           |    1 +
8923  arch/arm/plat-iop/time.c                           |    1 +
8924  arch/arm/plat-omap/clock.c                         |    1 +
8925  arch/arm/plat-omap/mailbox.c                       |    1 +
8926  arch/arm/plat-s3c24xx/devs.c                       |    1 +
8927  arch/arm/plat-s5p/dev-ehci.c                       |    1 +
8928  arch/arm/plat-s5p/dev-onenand.c                    |    2 +
8929  arch/arm/plat-samsung/dev-adc.c                    |    2 +
8930  arch/arm/plat-samsung/dev-asocdma.c                |    1 +
8931  arch/arm/plat-samsung/dev-backlight.c              |    1 +
8932  arch/arm/plat-samsung/dev-ide.c                    |    2 +
8933  arch/arm/plat-samsung/dev-nand.c                   |    1 +
8934  arch/arm/plat-samsung/dev-pwm.c                    |    1 +
8935  arch/arm/plat-samsung/dev-rtc.c                    |    1 +
8936  arch/arm/plat-samsung/dev-ts.c                     |    2 +
8937  arch/arm/plat-samsung/dev-usb.c                    |    1 +
8938  arch/arm/plat-samsung/dev-wdt.c                    |    3 +
8939  arch/arm/plat-samsung/platformdata.c               |    1 +
8940  arch/arm/vfp/vfpmodule.c                           |    1 -
8941  arch/avr32/mach-at32ap/clock.c                     |    1 +
8942  arch/avr32/mach-at32ap/cpufreq.c                   |    1 +
8943  arch/avr32/mach-at32ap/intc.c                      |    1 +
8944  arch/avr32/mach-at32ap/pio.c                       |    1 +
8945  arch/avr32/mm/dma-coherent.c                       |    1 +
8946  arch/blackfin/kernel/dma-mapping.c                 |    1 +
8947  arch/blackfin/kernel/perf_event.c                  |    1 +
8948  arch/blackfin/kernel/sys_bfin.c                    |    1 +
8949  arch/blackfin/mach-bf518/boards/ezbrd.c            |    1 +
8950  arch/blackfin/mach-bf527/boards/ad7160eval.c       |    1 +
8951  arch/blackfin/mach-bf527/boards/ezkit.c            |    1 +
8952  arch/blackfin/mach-bf527/boards/tll6527m.c         |    1 +
8953  arch/blackfin/mach-bf537/boards/dnp5370.c          |    1 +
8954  arch/blackfin/mach-common/cpufreq.c                |    1 +
8955  arch/blackfin/mm/init.c                            |    1 +
8956  arch/ia64/hp/common/hwsw_iommu.c                   |    1 +
8957  arch/ia64/kernel/dma-mapping.c                     |    1 +
8958  arch/ia64/kernel/topology.c                        |    1 +
8959  arch/ia64/sn/kernel/io_init.c                      |    1 +
8960  arch/ia64/sn/pci/pcibr/pcibr_dma.c                 |    1 +
8961  arch/ia64/sn/pci/pcibr/pcibr_provider.c            |    1 +
8962  arch/ia64/sn/pci/tioca_provider.c                  |    1 +
8963  arch/m68k/atari/time.c                             |    1 +
8964  arch/m68k/kernel/dma_mm.c                          |    1 +
8965  arch/m68k/kernel/dma_no.c                          |    1 +
8966  arch/mips/bcm47xx/gpio.c                           |    1 +
8967  arch/mips/bcm47xx/setup.c                          |    1 +
8968  arch/mips/cavium-octeon/csrc-octeon.c              |    1 +
8969  arch/mips/cavium-octeon/dma-octeon.c               |    1 +
8970  arch/mips/cavium-octeon/flash_setup.c              |    1 +
8971  arch/mips/kernel/8250-platform.c                   |    1 -
8972  arch/mips/kernel/cpu-probe.c                       |    3 +-
8973  arch/mips/kernel/i8253.c                           |    2 +-
8974  arch/mips/kernel/init_task.c                       |    2 +-
8975  arch/mips/kernel/irq-msc01.c                       |    1 -
8976  arch/mips/kernel/irq.c                             |    1 -
8977  arch/mips/kernel/mips-mt.c                         |    2 +-
8978  arch/mips/kernel/mips_ksyms.c                      |    2 +-
8979  arch/mips/kernel/module.c                          |    1 -
8980  arch/mips/kernel/process.c                         |    2 +-
8981  arch/mips/kernel/prom.c                            |    2 +-
8982  arch/mips/kernel/reset.c                           |    2 +-
8983  arch/mips/kernel/rtlx.c                            |    1 -
8984  arch/mips/kernel/setup.c                           |    2 +-
8985  arch/mips/kernel/spinlock_test.c                   |    2 +-
8986  arch/mips/kernel/stacktrace.c                      |    2 +-
8987  arch/mips/kernel/time.c                            |    2 +-
8988  arch/mips/kernel/traps.c                           |    1 -
8989  arch/mips/kernel/unaligned.c                       |    1 -
8990  arch/mips/kernel/vpe.c                             |    1 -
8991  arch/mips/loongson/common/platform.c               |    1 +
8992  arch/mips/pci/pci-ip27.c                           |    1 +
8993  arch/mips/pci/pci.c                                |    1 +
8994  arch/mips/powertv/pci/fixup-powertv.c              |    1 +
8995  arch/mips/powertv/powertv-usb.c                    |    1 +
8996  arch/mips/rb532/gpio.c                             |    1 +
8997  arch/mips/rb532/setup.c                            |    1 +
8998  arch/mips/txx9/generic/spi_eeprom.c                |    1 +
8999  arch/mips/txx9/rbtx4939/setup.c                    |    1 +
9000  arch/mips/vr41xx/common/giu.c                      |    1 +
9001  arch/mips/vr41xx/common/rtc.c                      |    1 +
9002  arch/parisc/kernel/drivers.c                       |    1 +
9003  arch/parisc/kernel/pci-dma.c                       |    1 +
9004  arch/parisc/kernel/setup.c                         |    1 +
9005  arch/parisc/lib/iomap.c                            |    1 +
9006  arch/powerpc/include/asm/lv1call.h                 |    1 +
9007  arch/powerpc/include/asm/machdep.h                 |    1 +
9008  arch/powerpc/include/asm/spu.h                     |    1 +
9009  arch/powerpc/kernel/btext.c                        |    2 +-
9010  arch/powerpc/kernel/clock.c                        |    2 +-
9011  arch/powerpc/kernel/cputable.c                     |    2 +-
9012  arch/powerpc/kernel/crash.c                        |    1 +
9013  arch/powerpc/kernel/dma-iommu.c                    |    1 +
9014  arch/powerpc/kernel/dma.c                          |    1 +
9015  arch/powerpc/kernel/firmware.c                     |    3 +-
9016  arch/powerpc/kernel/hw_breakpoint.c                |    1 -
9017  arch/powerpc/kernel/ibmebus.c                      |    2 +
9018  arch/powerpc/kernel/init_task.c                    |    2 +-
9019  arch/powerpc/kernel/io-workarounds.c               |    1 +
9020  arch/powerpc/kernel/io.c                           |    2 +-
9021  arch/powerpc/kernel/iomap.c                        |    1 +
9022  arch/powerpc/kernel/irq.c                          |    2 +-
9023  arch/powerpc/kernel/isa-bridge.c                   |    1 +
9024  arch/powerpc/kernel/kvm.c                          |    1 +
9025  arch/powerpc/kernel/module.c                       |    1 -
9026  arch/powerpc/kernel/of_platform.c                  |    2 +-
9027  arch/powerpc/kernel/paca.c                         |    2 +-
9028  arch/powerpc/kernel/pci-common.c                   |    1 +
9029  arch/powerpc/kernel/pci_32.c                       |    1 +
9030  arch/powerpc/kernel/pci_64.c                       |    1 +
9031  arch/powerpc/kernel/pci_dn.c                       |    1 +
9032  arch/powerpc/kernel/pci_of_scan.c                  |    1 +
9033  arch/powerpc/kernel/pmc.c                          |    2 +-
9034  arch/powerpc/kernel/ppc_ksyms.c                    |    2 +-
9035  arch/powerpc/kernel/process.c                      |    2 +-
9036  arch/powerpc/kernel/prom.c                         |    2 +-
9037  arch/powerpc/kernel/prom_parse.c                   |    1 -
9038  arch/powerpc/kernel/ptrace.c                       |    1 -
9039  arch/powerpc/kernel/rtas.c                         |    2 +-
9040  arch/powerpc/kernel/setup-common.c                 |    2 +-
9041  arch/powerpc/kernel/setup_64.c                     |    2 +-
9042  arch/powerpc/kernel/signal_64.c                    |    1 -
9043  arch/powerpc/kernel/smp.c                          |    2 +-
9044  arch/powerpc/kernel/stacktrace.c                   |    2 +-
9045  arch/powerpc/kernel/swsusp_64.c                    |    1 +
9046  arch/powerpc/kernel/sysfs.c                        |    2 +-
9047  arch/powerpc/kernel/time.c                         |    2 +-
9048  arch/powerpc/kernel/vdso.c                         |    1 -
9049  arch/powerpc/kernel/vio.c                          |    3 +-
9050  arch/powerpc/kvm/44x.c                             |    1 +
9051  arch/powerpc/kvm/book3s.c                          |    1 +
9052  arch/powerpc/kvm/book3s_exports.c                  |    2 +-
9053  arch/powerpc/kvm/book3s_hv.c                       |    1 +
9054  arch/powerpc/kvm/book3s_hv_builtin.c               |    1 +
9055  arch/powerpc/kvm/book3s_pr.c                       |    1 +
9056  arch/powerpc/kvm/powerpc.c                         |    1 -
9057  arch/powerpc/lib/checksum_wrappers_64.c            |    2 +-
9058  arch/powerpc/lib/devres.c                          |    2 +-
9059  arch/powerpc/lib/locks.c                           |    2 +-
9060  arch/powerpc/lib/rheap.c                           |    2 +-
9061  arch/powerpc/mm/dma-noncoherent.c                  |    1 +
9062  arch/powerpc/mm/hash_utils_64.c                    |    1 +
9063  arch/powerpc/mm/mem.c                              |    2 +-
9064  arch/powerpc/mm/mmu_context_hash32.c               |    1 +
9065  arch/powerpc/mm/mmu_context_hash64.c               |    2 +-
9066  arch/powerpc/mm/numa.c                             |    2 +-
9067  arch/powerpc/mm/pgtable_64.c                       |    1 +
9068  arch/powerpc/mm/slice.c                            |    2 +-
9069  arch/powerpc/mm/tlb_hash32.c                       |    1 +
9070  arch/powerpc/mm/tlb_nohash.c                       |    1 +
9071  arch/powerpc/platforms/44x/warp.c                  |    1 +
9072  arch/powerpc/platforms/512x/clock.c                |    1 +
9073  arch/powerpc/platforms/52xx/mpc52xx_common.c       |    1 +
9074  arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c      |    1 +
9075  arch/powerpc/platforms/83xx/suspend.c              |    1 +
9076  arch/powerpc/platforms/85xx/mpc85xx_cds.c          |    1 -
9077  arch/powerpc/platforms/85xx/mpc85xx_mds.c          |    1 -
9078  arch/powerpc/platforms/85xx/sbc8548.c              |    1 -
9079  arch/powerpc/platforms/86xx/gef_gpio.c             |    1 +
9080  arch/powerpc/platforms/8xx/tqm8xx_setup.c          |    1 -
9081  arch/powerpc/platforms/cell/axon_msi.c             |    1 +
9082  arch/powerpc/platforms/cell/beat.c                 |    2 +-
9083  arch/powerpc/platforms/cell/beat_spu_priv1.c       |    2 -
9084  arch/powerpc/platforms/cell/beat_wrapper.h         |    1 +
9085  arch/powerpc/platforms/cell/cbe_cpufreq.c          |    1 +
9086  arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c      |    1 +
9087  arch/powerpc/platforms/cell/cbe_powerbutton.c      |    1 +
9088  arch/powerpc/platforms/cell/cbe_regs.c             |    2 +-
9089  arch/powerpc/platforms/cell/celleb_setup.c         |    1 +
9090  arch/powerpc/platforms/cell/cpufreq_spudemand.c    |    1 +
9091  arch/powerpc/platforms/cell/interrupt.c            |    2 +-
9092  arch/powerpc/platforms/cell/pmu.c                  |    1 +
9093  arch/powerpc/platforms/cell/qpace_setup.c          |    1 +
9094  arch/powerpc/platforms/cell/setup.c                |    1 +
9095  arch/powerpc/platforms/cell/smp.c                  |    1 -
9096  arch/powerpc/platforms/cell/spu_callbacks.c        |    2 +-
9097  arch/powerpc/platforms/cell/spu_fault.c            |    2 +-
9098  arch/powerpc/platforms/cell/spu_manage.c           |    2 +-
9099  arch/powerpc/platforms/cell/spu_notify.c           |    3 +-
9100  arch/powerpc/platforms/cell/spu_priv1_mmio.c       |    1 -
9101  arch/powerpc/platforms/cell/spufs/backing_ops.c    |    1 -
9102  arch/powerpc/platforms/cell/spufs/context.c        |    2 +-
9103  arch/powerpc/platforms/cell/spufs/coredump.c       |    1 -
9104  arch/powerpc/platforms/cell/spufs/fault.c          |    1 -
9105  arch/powerpc/platforms/cell/spufs/file.c           |    2 +-
9106  arch/powerpc/platforms/cell/spufs/hw_ops.c         |    1 -
9107  arch/powerpc/platforms/cell/spufs/sched.c          |    1 -
9108  arch/powerpc/platforms/cell/spufs/switch.c         |    2 +-
9109  arch/powerpc/platforms/cell/spufs/syscalls.c       |    2 +-
9110  arch/powerpc/platforms/embedded6xx/holly.c         |    1 +
9111  arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c  |    1 +
9112  arch/powerpc/platforms/iseries/hvlpconfig.c        |    2 +-
9113  arch/powerpc/platforms/iseries/iommu.c             |    2 +-
9114  arch/powerpc/platforms/iseries/ksyms.c             |    2 +-
9115  arch/powerpc/platforms/iseries/lpardata.c          |    1 -
9116  arch/powerpc/platforms/iseries/lpevents.c          |    2 +-
9117  arch/powerpc/platforms/iseries/mf.c                |    1 +
9118  arch/powerpc/platforms/iseries/pci.c               |    1 -
9119  arch/powerpc/platforms/iseries/setup.c             |    1 +
9120  arch/powerpc/platforms/iseries/smp.c               |    1 -
9121  arch/powerpc/platforms/iseries/vio.c               |    2 +-
9122  arch/powerpc/platforms/iseries/viopath.c           |    2 +-
9123  arch/powerpc/platforms/maple/setup.c               |    1 +
9124  arch/powerpc/platforms/pasemi/cpufreq.c            |    1 +
9125  arch/powerpc/platforms/pasemi/dma_lib.c            |    3 +-
9126  arch/powerpc/platforms/pasemi/setup.c              |    1 +
9127  arch/powerpc/platforms/powermac/backlight.c        |    1 +
9128  arch/powerpc/platforms/powermac/feature.c          |    1 +
9129  arch/powerpc/platforms/powermac/low_i2c.c          |    2 +-
9130  arch/powerpc/platforms/powermac/nvram.c            |    2 +-
9131  arch/powerpc/platforms/powermac/pic.c              |    1 -
9132  arch/powerpc/platforms/powermac/setup.c            |    1 +
9133  arch/powerpc/platforms/ps3/exports.c               |    2 -
9134  arch/powerpc/platforms/ps3/interrupt.c             |    2 +-
9135  arch/powerpc/platforms/ps3/mm.c                    |    2 +-
9136  arch/powerpc/platforms/ps3/os-area.c               |    1 +
9137  arch/powerpc/platforms/ps3/setup.c                 |    1 +
9138  arch/powerpc/platforms/ps3/spu.c                   |    1 +
9139  arch/powerpc/platforms/ps3/system-bus.c            |    2 +-
9140  arch/powerpc/platforms/pseries/eeh.c               |    2 +
9141  arch/powerpc/platforms/pseries/eeh_event.c         |    1 +
9142  arch/powerpc/platforms/pseries/eeh_sysfs.c         |    1 +
9143  arch/powerpc/platforms/pseries/hotplug-cpu.c       |    1 +
9144  arch/powerpc/platforms/pseries/hvconsole.c         |    3 +-
9145  arch/powerpc/platforms/pseries/io_event_irq.c      |    2 +-
9146  arch/powerpc/platforms/pseries/iommu.c             |    1 +
9147  arch/powerpc/platforms/pseries/lpar.c              |    1 +
9148  arch/powerpc/platforms/pseries/mobility.c          |    1 +
9149  arch/powerpc/platforms/pseries/pci_dlpar.c         |    1 +
9150  arch/powerpc/platforms/pseries/plpar_wrappers.h    |    3 +
9151  arch/powerpc/platforms/pseries/setup.c             |    2 +-
9152  arch/powerpc/platforms/pseries/smp.c               |    1 -
9153  arch/powerpc/platforms/pseries/suspend.c           |    1 +
9154  arch/powerpc/sysdev/bestcomm/sram.c                |    2 +-
9155  arch/powerpc/sysdev/cpm_common.c                   |    1 +
9156  arch/powerpc/sysdev/dcr.c                          |    1 +
9157  arch/powerpc/sysdev/fsl_gtm.c                      |    1 +
9158  arch/powerpc/sysdev/fsl_lbc.c                      |    3 +-
9159  arch/powerpc/sysdev/fsl_pmc.c                      |    1 +
9160  arch/powerpc/sysdev/fsl_rio.c                      |    2 +-
9161  arch/powerpc/sysdev/fsl_soc.c                      |    2 +-
9162  arch/powerpc/sysdev/mpc5xxx_clocks.c               |    1 +
9163  arch/powerpc/sysdev/mpc8xx_pic.c                   |    1 -
9164  arch/powerpc/sysdev/mv64x60_pci.c                  |    1 +
9165  arch/powerpc/sysdev/pmi.c                          |    1 +
9166  arch/powerpc/sysdev/ppc4xx_msi.c                   |    1 +
9167  arch/powerpc/sysdev/qe_lib/gpio.c                  |    1 +
9168  arch/powerpc/sysdev/qe_lib/ucc.c                   |    2 +-
9169  arch/powerpc/sysdev/qe_lib/ucc_fast.c              |    2 +-
9170  arch/powerpc/sysdev/qe_lib/ucc_slow.c              |    2 +-
9171  arch/powerpc/sysdev/qe_lib/usb.c                   |    1 +
9172  arch/powerpc/sysdev/rtc_cmos_setup.c               |    1 +
9173  arch/powerpc/sysdev/scom.c                         |    1 +
9174  arch/powerpc/sysdev/simple_gpio.c                  |    1 -
9175  arch/powerpc/sysdev/tsi108_dev.c                   |    2 +-
9176  arch/powerpc/xmon/xmon.c                           |    2 +-
9177  arch/s390/crypto/sha_common.c                      |    1 +
9178  arch/s390/mm/init.c                                |    1 +
9179  arch/sh/drivers/dma/dma-sysfs.c                    |    1 +
9180  arch/sh/drivers/pci/pci.c                          |    1 +
9181  arch/sh/kernel/cpu/shmobile/cpuidle.c              |    1 +
9182  arch/sh/kernel/perf_event.c                        |    1 +
9183  arch/sh/kernel/topology.c                          |    1 +
9184  arch/sh/mm/init.c                                  |    1 +
9185  arch/sparc/include/asm/termios.h                   |    1 -
9186  arch/sparc/kernel/auxio_32.c                       |    1 +
9187  arch/sparc/kernel/btext.c                          |    1 -
9188  arch/sparc/kernel/central.c                        |    1 +
9189  arch/sparc/kernel/cpu.c                            |    2 +-
9190  arch/sparc/kernel/cpumap.c                         |    2 +-
9191  arch/sparc/kernel/dma.c                            |    1 -
9192  arch/sparc/kernel/ebus.c                           |    2 +-
9193  arch/sparc/kernel/hvapi.c                          |    2 +-
9194  arch/sparc/kernel/idprom.c                         |    2 +-
9195  arch/sparc/kernel/iommu.c                          |    2 +-
9196  arch/sparc/kernel/irq_32.c                         |    1 +
9197  arch/sparc/kernel/irq_64.c                         |    1 -
9198  arch/sparc/kernel/ldc.c                            |    2 +-
9199  arch/sparc/kernel/leon_kernel.c                    |    1 -
9200  arch/sparc/kernel/leon_pci_grpci2.c                |    1 -
9201  arch/sparc/kernel/nmi.c                            |    2 +-
9202  arch/sparc/kernel/of_device_32.c                   |    1 -
9203  arch/sparc/kernel/of_device_64.c                   |    3 +-
9204  arch/sparc/kernel/of_device_common.c               |    2 +-
9205  arch/sparc/kernel/pci.c                            |    2 +-
9206  arch/sparc/kernel/pci_fire.c                       |    1 +
9207  arch/sparc/kernel/pci_psycho.c                     |    1 +
9208  arch/sparc/kernel/pci_sabre.c                      |    1 +
9209  arch/sparc/kernel/pci_schizo.c                     |    1 +
9210  arch/sparc/kernel/pci_sun4v.c                      |    1 +
9211  arch/sparc/kernel/pcic.c                           |    1 +
9212  arch/sparc/kernel/pcr.c                            |    3 +-
9213  arch/sparc/kernel/pmc.c                            |    1 +
9214  arch/sparc/kernel/power.c                          |    2 +-
9215  arch/sparc/kernel/process_64.c                     |    2 +-
9216  arch/sparc/kernel/prom_32.c                        |    1 -
9217  arch/sparc/kernel/prom_64.c                        |    1 -
9218  arch/sparc/kernel/prom_common.c                    |    2 +-
9219  arch/sparc/kernel/reboot.c                         |    2 +-
9220  arch/sparc/kernel/sbus.c                           |    1 +
9221  arch/sparc/kernel/setup_32.c                       |    1 +
9222  arch/sparc/kernel/setup_64.c                       |    1 +
9223  arch/sparc/kernel/smp_64.c                         |    2 +-
9224  arch/sparc/kernel/sparc_ksyms_64.c                 |    2 +-
9225  arch/sparc/kernel/stacktrace.c                     |    2 +-
9226  arch/sparc/kernel/sys_sparc32.c                    |    1 -
9227  arch/sparc/kernel/sys_sparc_64.c                   |    2 +-
9228  arch/sparc/kernel/time_64.c                        |    2 +-
9229  arch/sparc/kernel/traps_32.c                       |    1 +
9230  arch/sparc/kernel/unaligned_32.c                   |    1 -
9231  arch/sparc/kernel/vio.c                            |    1 +
9232  arch/sparc/kernel/viohs.c                          |    2 +-
9233  arch/sparc/mm/fault_32.c                           |    1 -
9234  arch/sparc/mm/generic_32.c                         |    1 +
9235  arch/sparc/mm/generic_64.c                         |    1 +
9236  arch/sparc/mm/highmem.c                            |    1 +
9237  arch/sparc/mm/hugetlbpage.c                        |    1 -
9238  arch/x86/crypto/aes_glue.c                         |    1 +
9239  arch/x86/crypto/aesni-intel_glue.c                 |    1 +
9240  arch/x86/kernel/cpu/amd.c                          |    1 +
9241  arch/x86/kernel/cpu/mcheck/therm_throt.c           |    1 +
9242  arch/x86/kernel/devicetree.c                       |    1 +
9243  arch/x86/kernel/e820.c                             |    1 +
9244  arch/x86/kernel/hpet.c                             |    1 +
9245  arch/x86/kernel/irq.c                              |    1 +
9246  arch/x86/kernel/pci-dma.c                          |    1 +
9247  arch/x86/kernel/probe_roms.c                       |    4 +-
9248  arch/x86/kernel/rtc.c                              |    1 +
9249  arch/x86/kernel/smp.c                              |    1 +
9250  arch/x86/kernel/time.c                             |    1 +
9251  arch/x86/kernel/topology.c                         |    1 +
9252  arch/x86/kernel/vsyscall_64.c                      |    1 +
9253  arch/x86/pci/i386.c                                |    1 +
9254  arch/x86/pci/legacy.c                              |    1 +
9255  arch/x86/platform/efi/efi.c                        |    1 +
9256  arch/x86/platform/efi/efi_32.c                     |    1 +
9257  arch/x86/platform/mrst/vrtc.c                      |    1 +
9258  arch/x86/platform/olpc/olpc-xo1-pm.c               |    1 +
9259  arch/x86/platform/uv/bios_uv.c                     |    1 +
9260  arch/x86/power/cpu.c                               |    1 +
9261  arch/x86/video/fbdev.c                             |    1 +
9262  block/blk-integrity.c                              |    1 +
9263  block/ioctl.c                                      |    1 +
9264  crypto/async_tx/async_memcpy.c                     |    1 +
9265  crypto/async_tx/async_pq.c                         |    1 +
9266  crypto/async_tx/async_raid6_recov.c                |    1 +
9267  crypto/async_tx/async_tx.c                         |    1 +
9268  crypto/async_tx/async_xor.c                        |    1 +
9269  crypto/async_tx/raid6test.c                        |    1 +
9270  crypto/crypto_wq.c                                 |    1 +
9271  crypto/md4.c                                       |    1 +
9272  crypto/proc.c                                      |    1 +
9273  crypto/vmac.c                                      |    1 +
9274  crypto/xcbc.c                                      |    1 +
9275  drivers/acpi/acpica/hwsleep.c                      |    1 +
9276  drivers/acpi/ec_sys.c                              |    1 +
9277  drivers/acpi/sbshc.c                               |    1 +
9278  drivers/acpi/sysfs.c                               |    2 +-
9279  drivers/ata/libata-eh.c                            |    1 +
9280  drivers/ata/libata-pmp.c                           |    1 +
9281  drivers/ata/libata-scsi.c                          |    1 +
9282  drivers/ata/libata-sff.c                           |    1 +
9283  drivers/base/base.h                                |    1 +
9284  drivers/base/dma-coherent.c                        |    1 +
9285  drivers/base/dma-mapping.c                         |    1 +
9286  drivers/base/hypervisor.c                          |    1 +
9287  drivers/base/power/generic_ops.c                   |    1 +
9288  drivers/base/power/main.c                          |    1 +
9289  drivers/base/power/runtime.c                       |    1 +
9290  drivers/base/power/sysfs.c                         |    1 +
9291  drivers/base/power/trace.c                         |    1 +
9292  drivers/base/power/wakeup.c                        |    1 +
9293  drivers/base/transport_class.c                     |    1 +
9294  drivers/bcma/core.c                                |    1 +
9295  drivers/bcma/driver_chipcommon.c                   |    1 +
9296  drivers/bcma/driver_pci.c                          |    1 +
9297  drivers/bcma/host_pci.c                            |    1 +
9298  drivers/bcma/main.c                                |    1 +
9299  drivers/block/aoe/aoechr.c                         |    1 +
9300  drivers/block/ps3disk.c                            |    1 +
9301  drivers/block/ps3vram.c                            |    1 +
9302  drivers/block/virtio_blk.c                         |    1 +
9303  drivers/char/hw_random/virtio-rng.c                |    1 +
9304  drivers/char/ramoops.c                             |    1 +
9305  drivers/char/ttyprintk.c                           |    1 +
9306  drivers/char/virtio_console.c                      |    1 +
9307  drivers/clocksource/sh_cmt.c                       |    1 +
9308  drivers/clocksource/sh_mtu2.c                      |    1 +
9309  drivers/clocksource/sh_tmu.c                       |    1 +
9310  drivers/cpufreq/cpufreq_stats.c                    |    1 +
9311  drivers/cpufreq/s3c64xx-cpufreq.c                  |    1 +
9312  drivers/crypto/mv_cesa.c                           |    1 +
9313  drivers/dca/dca-core.c                             |    1 +
9314  drivers/dca/dca-sysfs.c                            |    1 +
9315  drivers/dma/intel_mid_dma.c                        |    1 +
9316  drivers/dma/ipu/ipu_idmac.c                        |    1 +
9317  drivers/dma/ste_dma40.c                            |    1 +
9318  drivers/edac/mce_amd_inj.c                         |    1 +
9319  drivers/firewire/core-iso.c                        |    1 +
9320  drivers/firmware/google/gsmi.c                     |    1 +
9321  drivers/firmware/sigma.c                           |    1 +
9322  drivers/gpio/gpio-74x164.c                         |    1 +
9323  drivers/gpio/gpio-ep93xx.c                         |    1 +
9324  drivers/gpio/gpio-mc33880.c                        |    1 +
9325  drivers/gpio/gpio-mcp23s08.c                       |    1 +
9326  drivers/gpio/gpio-ml-ioh.c                         |    1 +
9327  drivers/gpio/gpio-mpc5200.c                        |    1 +
9328  drivers/gpio/gpio-mxc.c                            |    1 +
9329  drivers/gpio/gpio-mxs.c                            |    1 +
9330  drivers/gpio/gpio-pcf857x.c                        |    1 +
9331  drivers/gpio/gpio-pch.c                            |    1 +
9332  drivers/gpio/gpio-xilinx.c                         |    1 +
9333  drivers/gpu/drm/ttm/ttm_tt.c                       |    1 +
9334  drivers/hid/hid-axff.c                             |    1 +
9335  drivers/hid/hid-debug.c                            |    1 +
9336  drivers/hid/hid-dr.c                               |    1 +
9337  drivers/hid/hid-emsff.c                            |    1 +
9338  drivers/hid/hid-gaff.c                             |    1 +
9339  drivers/hid/hid-holtekff.c                         |    1 +
9340  drivers/hid/hid-picolcd.c                          |    1 +
9341  drivers/hid/hid-pl.c                               |    1 +
9342  drivers/hid/hid-roccat-common.c                    |    1 +
9343  drivers/hid/hid-roccat.c                           |    1 +
9344  drivers/hid/hid-sjoy.c                             |    1 +
9345  drivers/hid/hid-tmff.c                             |    1 +
9346  drivers/hid/hid-zpff.c                             |    1 +
9347  drivers/hid/usbhid/hid-quirks.c                    |    1 +
9348  drivers/hwmon/ultra45_env.c                        |    1 +
9349  drivers/i2c/busses/i2c-pxa-pci.c                   |    1 +
9350  drivers/i2c/busses/i2c-sh7760.c                    |    1 +
9351  drivers/i2c/busses/i2c-tegra.c                     |    1 +
9352  drivers/i2c/i2c-boardinfo.c                        |    1 +
9353  drivers/ide/buddha.c                               |    1 +
9354  drivers/ide/cmd640.c                               |    1 +
9355  drivers/ide/ide-acpi.c                             |    1 +
9356  drivers/ide/ide-atapi.c                            |    1 +
9357  drivers/ide/ide-disk_proc.c                        |    1 +
9358  drivers/ide/ide-dma-sff.c                          |    1 +
9359  drivers/ide/ide-dma.c                              |    1 +
9360  drivers/ide/ide-eh.c                               |    1 +
9361  drivers/ide/ide-floppy_proc.c                      |    1 +
9362  drivers/ide/ide-io-std.c                           |    1 +
9363  drivers/ide/ide-ioctls.c                           |    1 +
9364  drivers/ide/ide-legacy.c                           |    1 +
9365  drivers/ide/ide-lib.c                              |    1 +
9366  drivers/ide/ide-pnp.c                              |    1 +
9367  drivers/ide/ide-taskfile.c                         |    1 +
9368  drivers/ide/ide-xfer-mode.c                        |    1 +
9369  drivers/ide/macide.c                               |    1 +
9370  drivers/ide/pmac.c                                 |    1 +
9371  drivers/ide/q40ide.c                               |    1 +
9372  drivers/ide/setup-pci.c                            |    1 +
9373  drivers/ide/tc86c001.c                             |    1 +
9374  drivers/idle/intel_idle.c                          |    1 +
9375  drivers/infiniband/core/cm.c                       |    1 +
9376  drivers/infiniband/core/fmr_pool.c                 |    1 +
9377  drivers/infiniband/core/mad.c                      |    1 +
9378  drivers/infiniband/core/multicast.c                |    1 +
9379  drivers/infiniband/core/packer.c                   |    1 +
9380  drivers/infiniband/core/sysfs.c                    |    1 +
9381  drivers/infiniband/core/ud_header.c                |    1 +
9382  drivers/infiniband/core/umem.c                     |    1 +
9383  drivers/infiniband/core/uverbs_marshall.c          |    1 +
9384  drivers/infiniband/core/verbs.c                    |    1 +
9385  drivers/infiniband/hw/ipath/ipath_diag.c           |    1 +
9386  drivers/infiniband/hw/ipath/ipath_file_ops.c       |    1 +
9387  drivers/infiniband/hw/ipath/ipath_sysfs.c          |    1 +
9388  drivers/infiniband/hw/ipath/ipath_verbs.c          |    1 +
9389  drivers/infiniband/hw/mthca/mthca_catas.c          |    1 +
9390  drivers/infiniband/hw/mthca/mthca_cmd.c            |    1 +
9391  drivers/infiniband/hw/mthca/mthca_provider.c       |    2 +
9392  drivers/infiniband/hw/qib/qib_diag.c               |    1 +
9393  drivers/infiniband/hw/qib/qib_file_ops.c           |    1 +
9394  drivers/infiniband/hw/qib/qib_iba7220.c            |    1 +
9395  drivers/infiniband/hw/qib/qib_iba7322.c            |    1 +
9396  drivers/infiniband/hw/qib/qib_pcie.c               |    1 +
9397  drivers/infiniband/hw/qib/qib_sd7220.c             |    1 +
9398  drivers/infiniband/hw/qib/qib_verbs.c              |    1 +
9399  drivers/input/input-compat.c                       |    1 +
9400  drivers/input/input-mt.c                           |    1 +
9401  drivers/input/input-polldev.c                      |    1 +
9402  drivers/input/joystick/as5011.c                    |    1 +
9403  drivers/input/keyboard/nomadik-ske-keypad.c        |    1 +
9404  drivers/input/keyboard/tnetv107x-keypad.c          |    1 +
9405  drivers/input/misc/ad714x.c                        |    1 +
9406  drivers/input/misc/adxl34x.c                       |    1 +
9407  drivers/input/misc/ati_remote2.c                   |    1 +
9408  drivers/input/misc/cma3000_d0x.c                   |    1 +
9409  drivers/input/misc/dm355evm_keys.c                 |    1 +
9410  drivers/input/sparse-keymap.c                      |    1 +
9411  drivers/input/touchscreen/ad7877.c                 |    1 +
9412  drivers/input/touchscreen/ad7879-spi.c             |    1 +
9413  drivers/input/touchscreen/ad7879.c                 |    1 +
9414  drivers/input/touchscreen/ads7846.c                |    1 +
9415  drivers/input/touchscreen/bu21013_ts.c             |    1 +
9416  drivers/isdn/capi/kcapi_proc.c                     |    1 +
9417  drivers/leds/dell-led.c                            |    1 +
9418  drivers/leds/leds-88pm860x.c                       |    1 +
9419  drivers/leds/leds-asic3.c                          |    1 +
9420  drivers/leds/leds-atmel-pwm.c                      |    1 +
9421  drivers/leds/leds-cobalt-raq.c                     |    1 +
9422  drivers/leds/leds-fsg.c                            |    1 +
9423  drivers/leds/leds-gpio.c                           |    1 +
9424  drivers/leds/leds-lm3530.c                         |    1 +
9425  drivers/leds/leds-locomo.c                         |    1 +
9426  drivers/leds/leds-lt3593.c                         |    1 +
9427  drivers/leds/leds-net48xx.c                        |    1 +
9428  drivers/leds/leds-net5501.c                        |    1 +
9429  drivers/leds/leds-ns2.c                            |    1 +
9430  drivers/leds/leds-s3c24xx.c                        |    1 +
9431  drivers/leds/leds-wm831x-status.c                  |    1 +
9432  drivers/leds/leds-wm8350.c                         |    1 +
9433  drivers/leds/leds-wrap.c                           |    1 +
9434  drivers/lguest/lguest_device.c                     |    1 +
9435  drivers/md/dm-exception-store.c                    |    1 +
9436  drivers/md/dm-log-userspace-base.c                 |    1 +
9437  drivers/md/dm-path-selector.c                      |    1 +
9438  drivers/md/dm-raid.c                               |    1 +
9439  drivers/md/dm-round-robin.c                        |    1 +
9440  drivers/md/dm-service-time.c                       |    1 +
9441  drivers/md/dm-snap-persistent.c                    |    1 +
9442  drivers/md/dm-snap-transient.c                     |    1 +
9443  drivers/md/dm-uevent.c                             |    1 +
9444  drivers/md/faulty.c                                |    1 +
9445  drivers/md/linear.c                                |    1 +
9446  drivers/md/md.c                                    |    1 +
9447  drivers/md/multipath.c                             |    1 +
9448  drivers/md/raid0.c                                 |    1 +
9449  drivers/md/raid1.c                                 |    1 +
9450  drivers/md/raid10.c                                |    1 +
9451  drivers/md/raid5.c                                 |    1 +
9452  drivers/media/common/saa7146_core.c                |    1 +
9453  drivers/media/common/saa7146_fops.c                |    1 +
9454  drivers/media/common/saa7146_hlp.c                 |    1 +
9455  drivers/media/common/saa7146_video.c               |    1 +
9456  drivers/media/common/tuners/tuner-types.c          |    1 +
9457  drivers/media/dvb/frontends/dibx000_common.c       |    1 +
9458  drivers/media/dvb/siano/sms-cards.c                |    1 +
9459  drivers/media/dvb/siano/smsendian.c                |    1 +
9460  drivers/media/dvb/siano/smssdio.c                  |    1 +
9461  drivers/media/dvb/siano/smsusb.c                   |    1 +
9462  drivers/media/media-device.c                       |    1 +
9463  drivers/media/radio/radio-timb.c                   |    1 +
9464  drivers/media/radio/radio-wl1273.c                 |    1 +
9465  drivers/media/radio/si4713-i2c.c                   |    1 +
9466  drivers/media/radio/wl128x/fmdrv_v4l2.c            |    2 +
9467  drivers/media/rc/ir-jvc-decoder.c                  |    1 +
9468  drivers/media/rc/ir-lirc-codec.c                   |    1 +
9469  drivers/media/rc/ir-nec-decoder.c                  |    1 +
9470  drivers/media/rc/ir-raw.c                          |    2 +
9471  drivers/media/rc/ir-rc5-decoder.c                  |    1 +
9472  drivers/media/rc/ir-rc5-sz-decoder.c               |    1 +
9473  drivers/media/rc/ir-rc6-decoder.c                  |    1 +
9474  drivers/media/rc/ir-sony-decoder.c                 |    1 +
9475  drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c    |    1 +
9476  drivers/media/rc/keymaps/rc-alink-dtu-m.c          |    1 +
9477  drivers/media/rc/keymaps/rc-anysee.c               |    1 +
9478  drivers/media/rc/keymaps/rc-apac-viewcomp.c        |    1 +
9479  drivers/media/rc/keymaps/rc-asus-pc39.c            |    1 +
9480  drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c |    1 +
9481  drivers/media/rc/keymaps/rc-avermedia-a16d.c       |    1 +
9482  drivers/media/rc/keymaps/rc-avermedia-cardbus.c    |    1 +
9483  drivers/media/rc/keymaps/rc-avermedia-dvbt.c       |    1 +
9484  drivers/media/rc/keymaps/rc-avermedia-m135a.c      |    1 +
9485  .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c    |    1 +
9486  drivers/media/rc/keymaps/rc-avermedia-rm-ks.c      |    1 +
9487  drivers/media/rc/keymaps/rc-avermedia.c            |    1 +
9488  drivers/media/rc/keymaps/rc-avertv-303.c           |    1 +
9489  drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c   |    1 +
9490  drivers/media/rc/keymaps/rc-behold-columbus.c      |    1 +
9491  drivers/media/rc/keymaps/rc-behold.c               |    1 +
9492  drivers/media/rc/keymaps/rc-budget-ci-old.c        |    1 +
9493  drivers/media/rc/keymaps/rc-cinergy-1400.c         |    1 +
9494  drivers/media/rc/keymaps/rc-cinergy.c              |    1 +
9495  drivers/media/rc/keymaps/rc-dib0700-nec.c          |    1 +
9496  drivers/media/rc/keymaps/rc-dib0700-rc5.c          |    1 +
9497  drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c  |    1 +
9498  drivers/media/rc/keymaps/rc-digittrade.c           |    1 +
9499  drivers/media/rc/keymaps/rc-dm1105-nec.c           |    1 +
9500  drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c      |    1 +
9501  drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c   |    1 +
9502  drivers/media/rc/keymaps/rc-em-terratec.c          |    1 +
9503  drivers/media/rc/keymaps/rc-encore-enltv-fm53.c    |    1 +
9504  drivers/media/rc/keymaps/rc-encore-enltv.c         |    1 +
9505  drivers/media/rc/keymaps/rc-encore-enltv2.c        |    1 +
9506  drivers/media/rc/keymaps/rc-evga-indtube.c         |    1 +
9507  drivers/media/rc/keymaps/rc-eztv.c                 |    1 +
9508  drivers/media/rc/keymaps/rc-flydvb.c               |    1 +
9509  drivers/media/rc/keymaps/rc-flyvideo.c             |    1 +
9510  drivers/media/rc/keymaps/rc-fusionhdtv-mce.c       |    1 +
9511  drivers/media/rc/keymaps/rc-gadmei-rm008z.c        |    1 +
9512  drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c   |    1 +
9513  drivers/media/rc/keymaps/rc-gotview7135.c          |    1 +
9514  drivers/media/rc/keymaps/rc-hauppauge.c            |    1 +
9515  drivers/media/rc/keymaps/rc-imon-mce.c             |    1 +
9516  drivers/media/rc/keymaps/rc-imon-pad.c             |    1 +
9517  drivers/media/rc/keymaps/rc-iodata-bctv7e.c        |    1 +
9518  drivers/media/rc/keymaps/rc-kaiomy.c               |    1 +
9519  drivers/media/rc/keymaps/rc-kworld-315u.c          |    1 +
9520  .../media/rc/keymaps/rc-kworld-plus-tv-analog.c    |    1 +
9521  drivers/media/rc/keymaps/rc-leadtek-y04g0051.c     |    1 +
9522  drivers/media/rc/keymaps/rc-lirc.c                 |    1 +
9523  drivers/media/rc/keymaps/rc-lme2510.c              |    1 +
9524  drivers/media/rc/keymaps/rc-manli.c                |    1 +
9525  drivers/media/rc/keymaps/rc-msi-digivox-ii.c       |    1 +
9526  drivers/media/rc/keymaps/rc-msi-digivox-iii.c      |    1 +
9527  drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c  |    1 +
9528  drivers/media/rc/keymaps/rc-msi-tvanywhere.c       |    1 +
9529  drivers/media/rc/keymaps/rc-nebula.c               |    1 +
9530  .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c  |    1 +
9531  drivers/media/rc/keymaps/rc-norwood.c              |    1 +
9532  drivers/media/rc/keymaps/rc-npgtech.c              |    1 +
9533  drivers/media/rc/keymaps/rc-pctv-sedna.c           |    1 +
9534  drivers/media/rc/keymaps/rc-pinnacle-color.c       |    1 +
9535  drivers/media/rc/keymaps/rc-pinnacle-grey.c        |    1 +
9536  drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c     |    1 +
9537  drivers/media/rc/keymaps/rc-pixelview-002t.c       |    1 +
9538  drivers/media/rc/keymaps/rc-pixelview-mk12.c       |    1 +
9539  drivers/media/rc/keymaps/rc-pixelview-new.c        |    1 +
9540  drivers/media/rc/keymaps/rc-pixelview.c            |    1 +
9541  .../media/rc/keymaps/rc-powercolor-real-angel.c    |    1 +
9542  drivers/media/rc/keymaps/rc-proteus-2309.c         |    1 +
9543  drivers/media/rc/keymaps/rc-purpletv.c             |    1 +
9544  drivers/media/rc/keymaps/rc-pv951.c                |    1 +
9545  drivers/media/rc/keymaps/rc-rc6-mce.c              |    1 +
9546  .../media/rc/keymaps/rc-real-audio-220-32-keys.c   |    1 +
9547  drivers/media/rc/keymaps/rc-streamzap.c            |    1 +
9548  drivers/media/rc/keymaps/rc-tbs-nec.c              |    1 +
9549  drivers/media/rc/keymaps/rc-technisat-usb2.c       |    1 +
9550  drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c  |    1 +
9551  drivers/media/rc/keymaps/rc-terratec-slim-2.c      |    1 +
9552  drivers/media/rc/keymaps/rc-terratec-slim.c        |    1 +
9553  drivers/media/rc/keymaps/rc-tevii-nec.c            |    1 +
9554  drivers/media/rc/keymaps/rc-tivo.c                 |    1 +
9555  drivers/media/rc/keymaps/rc-total-media-in-hand.c  |    1 +
9556  drivers/media/rc/keymaps/rc-trekstor.c             |    1 +
9557  drivers/media/rc/keymaps/rc-tt-1500.c              |    1 +
9558  drivers/media/rc/keymaps/rc-twinhan1027.c          |    1 +
9559  drivers/media/rc/keymaps/rc-videomate-m1f.c        |    1 +
9560  drivers/media/rc/keymaps/rc-videomate-s350.c       |    1 +
9561  drivers/media/rc/keymaps/rc-videomate-tv-pvr.c     |    1 +
9562  drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c |    1 +
9563  drivers/media/rc/keymaps/rc-winfast.c              |    1 +
9564  drivers/media/rc/rc-main.c                         |    1 +
9565  drivers/media/video/adp1653.c                      |    1 +
9566  drivers/media/video/ak881x.c                       |    1 +
9567  drivers/media/video/cpia2/cpia2_usb.c              |    1 +
9568  drivers/media/video/cx25840/cx25840-ir.c           |    1 +
9569  drivers/media/video/davinci/dm355_ccdc.c           |    1 +
9570  drivers/media/video/davinci/dm644x_ccdc.c          |    1 +
9571  drivers/media/video/hdpvr/hdpvr-i2c.c              |    1 +
9572  drivers/media/video/hexium_gemini.c                |    1 +
9573  drivers/media/video/hexium_orion.c                 |    1 +
9574  drivers/media/video/imx074.c                       |    1 +
9575  drivers/media/video/m5mols/m5mols_core.c           |    1 +
9576  drivers/media/video/mt9m001.c                      |    1 +
9577  drivers/media/video/mt9m111.c                      |    1 +
9578  drivers/media/video/mt9t031.c                      |    1 +
9579  drivers/media/video/mt9v011.c                      |    1 +
9580  drivers/media/video/mt9v022.c                      |    1 +
9581  drivers/media/video/mt9v032.c                      |    1 +
9582  drivers/media/video/mxb.c                          |    1 +
9583  drivers/media/video/noon010pc30.c                  |    1 +
9584  drivers/media/video/omap24xxcam.c                  |    1 +
9585  drivers/media/video/ov6650.c                       |    1 +
9586  drivers/media/video/pvrusb2/pvrusb2-devattr.c      |    1 +
9587  drivers/media/video/pvrusb2/pvrusb2-hdw.c          |    1 +
9588  drivers/media/video/pvrusb2/pvrusb2-i2c-core.c     |    1 +
9589  drivers/media/video/pvrusb2/pvrusb2-v4l2.c         |    1 +
9590  drivers/media/video/rj54n1cb0c.c                   |    1 +
9591  drivers/media/video/sh_mobile_csi2.c               |    1 +
9592  drivers/media/video/sh_vou.c                       |    1 +
9593  drivers/media/video/sr030pc30.c                    |    1 +
9594  drivers/media/video/tcm825x.c                      |    1 +
9595  drivers/media/video/timblogiw.c                    |    1 +
9596  drivers/media/video/tvp514x.c                      |    1 +
9597  drivers/media/video/tvp5150.c                      |    1 +
9598  drivers/media/video/tvp7002.c                      |    1 +
9599  drivers/media/video/usbvision/usbvision-cards.c    |    1 +
9600  drivers/media/video/v4l2-ctrls.c                   |    1 +
9601  drivers/media/video/v4l2-device.c                  |    1 +
9602  drivers/media/video/v4l2-event.c                   |    1 +
9603  drivers/media/video/v4l2-fh.c                      |    1 +
9604  drivers/media/video/v4l2-int-device.c              |    1 +
9605  drivers/media/video/v4l2-subdev.c                  |    1 +
9606  drivers/memstick/core/memstick.c                   |    1 +
9607  drivers/memstick/core/mspro_block.c                |    1 +
9608  drivers/memstick/host/jmb38x_ms.c                  |    1 +
9609  drivers/memstick/host/tifm_ms.c                    |    1 +
9610  drivers/message/i2o/pci.c                          |    1 +
9611  drivers/mfd/ab3100-core.c                          |    1 +
9612  drivers/mfd/ab3550-core.c                          |    1 +
9613  drivers/mfd/ab8500-debugfs.c                       |    1 +
9614  drivers/mfd/ab8500-sysctrl.c                       |    1 +
9615  drivers/mfd/abx500-core.c                          |    1 +
9616  drivers/mfd/asic3.c                                |    1 +
9617  drivers/mfd/dm355evm_msp.c                         |    1 +
9618  drivers/mfd/max8997.c                              |    1 +
9619  drivers/mfd/mfd-core.c                             |    1 +
9620  drivers/mfd/pcf50633-irq.c                         |    1 +
9621  drivers/mfd/tmio_core.c                            |    1 +
9622  drivers/mfd/twl-core.c                             |    1 +
9623  drivers/mfd/twl6030-irq.c                          |    1 +
9624  drivers/mfd/wl1273-core.c                          |    1 +
9625  drivers/mfd/wm8400-core.c                          |    1 +
9626  drivers/misc/ab8500-pwm.c                          |    1 +
9627  drivers/misc/atmel-ssc.c                           |    1 +
9628  drivers/misc/atmel_tclib.c                         |    1 +
9629  drivers/misc/bh1780gli.c                           |    1 +
9630  drivers/misc/kgdbts.c                              |    1 +
9631  drivers/misc/ti-st/st_kim.c                        |    1 +
9632  drivers/misc/tifm_7xx1.c                           |    1 +
9633  drivers/misc/tifm_core.c                           |    1 +
9634  drivers/mmc/card/mmc_test.c                        |    1 +
9635  drivers/mmc/core/bus.c                             |    2 +
9636  drivers/mmc/core/debugfs.c                         |    1 +
9637  drivers/mmc/core/host.c                            |    1 +
9638  drivers/mmc/core/mmc.c                             |    1 +
9639  drivers/mmc/core/mmc_ops.c                         |    1 +
9640  drivers/mmc/core/quirks.c                          |    1 +
9641  drivers/mmc/core/sd.c                              |    1 +
9642  drivers/mmc/core/sd_ops.c                          |    1 +
9643  drivers/mmc/core/sdio_bus.c                        |    1 +
9644  drivers/mmc/core/sdio_io.c                         |    1 +
9645  drivers/mmc/core/sdio_irq.c                        |    1 +
9646  drivers/mmc/host/mmc_spi.c                         |    1 +
9647  drivers/mmc/host/mxs-mmc.c                         |    1 +
9648  drivers/mmc/host/sdhci-of-esdhc.c                  |    1 +
9649  drivers/mmc/host/sdhci-of-hlwd.c                   |    1 +
9650  drivers/mmc/host/sdhci-pci.c                       |    1 +
9651  drivers/mmc/host/sdhci-pltfm.c                     |    1 +
9652  drivers/mmc/host/sdhci-pxav2.c                     |    1 +
9653  drivers/mmc/host/sdhci-pxav3.c                     |    1 +
9654  drivers/mmc/host/sdhci-spear.c                     |    1 +
9655  drivers/mmc/host/sdhci-tegra.c                     |    1 +
9656  drivers/mmc/host/sdhci.c                           |    1 +
9657  drivers/mmc/host/sdricoh_cs.c                      |    1 +
9658  drivers/mmc/host/sh_mmcif.c                        |    1 +
9659  drivers/mmc/host/sh_mobile_sdhi.c                  |    1 +
9660  drivers/mmc/host/tifm_sd.c                         |    1 +
9661  drivers/mmc/host/via-sdmmc.c                       |    1 +
9662  drivers/mtd/ar7part.c                              |    1 +
9663  drivers/mtd/cmdlinepart.c                          |    1 +
9664  drivers/mtd/lpddr/lpddr_cmds.c                     |    1 +
9665  drivers/mtd/mtdblock_ro.c                          |    1 +
9666  drivers/mtd/mtdsuper.c                             |    1 +
9667  drivers/mtd/nand/cafe_nand.c                       |    1 +
9668  drivers/mtd/nand/cmx270_nand.c                     |    1 +
9669  drivers/mtd/nand/diskonchip.c                      |    1 +
9670  drivers/mtd/nand/nand_bbt.c                        |    1 +
9671  drivers/mtd/nand/omap2.c                           |    1 +
9672  drivers/mtd/nand/sm_common.c                       |    1 +
9673  drivers/mtd/onenand/onenand_bbt.c                  |    1 +
9674  drivers/mtd/redboot.c                              |    1 +
9675  drivers/mtd/rfd_ftl.c                              |    1 +
9676  drivers/mtd/ubi/vmt.c                              |    1 +
9677  drivers/net/ethernet/mellanox/mlx4/alloc.c         |    1 +
9678  drivers/net/ethernet/mellanox/mlx4/catas.c         |    1 +
9679  drivers/net/ethernet/mellanox/mlx4/cmd.c           |    1 +
9680  drivers/net/ethernet/mellanox/mlx4/cq.c            |    1 +
9681  drivers/net/ethernet/mellanox/mlx4/eq.c            |    1 +
9682  drivers/net/ethernet/mellanox/mlx4/fw.c            |    1 +
9683  drivers/net/ethernet/mellanox/mlx4/intf.c          |    1 +
9684  drivers/net/ethernet/mellanox/mlx4/mr.c            |    1 +
9685  drivers/net/ethernet/mellanox/mlx4/pd.c            |    1 +
9686  drivers/net/ethernet/mellanox/mlx4/port.c          |    1 +
9687  drivers/net/ethernet/mellanox/mlx4/qp.c            |    1 +
9688  drivers/net/ethernet/mellanox/mlx4/srq.c           |    1 +
9689  drivers/net/phy/realtek.c                          |    1 +
9690  drivers/net/wireless/b43/pcmcia.c                  |    1 +
9691  drivers/of/of_pci.c                                |    1 +
9692  drivers/of/of_pci_irq.c                            |    1 +
9693  drivers/of/of_spi.c                                |    1 +
9694  drivers/parisc/ccio-dma.c                          |    1 +
9695  drivers/parisc/sba_iommu.c                         |    1 +
9696  drivers/pci/hotplug-pci.c                          |    1 +
9697  drivers/pci/hotplug/pciehp_acpi.c                  |    1 +
9698  drivers/pci/hotplug/pcihp_slot.c                   |    1 +
9699  drivers/pci/hotplug/rpadlpar_core.c                |    1 +
9700  drivers/pci/htirq.c                                |    1 +
9701  drivers/pci/iov.c                                  |    1 +
9702  drivers/pci/irq.c                                  |    1 +
9703  drivers/pci/msi.c                                  |    1 +
9704  drivers/pci/pci-sysfs.c                            |    1 +
9705  drivers/pci/quirks.c                               |    1 +
9706  drivers/pci/rom.c                                  |    1 +
9707  drivers/pci/setup-res.c                            |    1 +
9708  drivers/pci/slot.c                                 |    1 +
9709  drivers/pci/vpd.c                                  |    1 +
9710  drivers/pcmcia/db1xxx_ss.c                         |    1 +
9711  drivers/pcmcia/pxa2xx_cm_x255.c                    |    1 +
9712  drivers/pcmcia/pxa2xx_cm_x270.c                    |    1 +
9713  drivers/platform/x86/intel_scu_ipc.c               |    1 +
9714  drivers/platform/x86/msi-wmi.c                     |    1 +
9715  drivers/platform/x86/wmi.c                         |    1 +
9716  drivers/power/max17042_battery.c                   |    1 +
9717  drivers/power/max8903_charger.c                    |    1 +
9718  drivers/power/max8997_charger.c                    |    1 +
9719  drivers/power/max8998_charger.c                    |    1 +
9720  drivers/power/power_supply_sysfs.c                 |    1 +
9721  drivers/ps3/ps3stor_lib.c                          |    1 +
9722  drivers/ps3/sys-manager-core.c                     |    1 +
9723  drivers/rapidio/switches/idt_gen2.c                |    1 +
9724  drivers/regulator/88pm8607.c                       |    1 +
9725  drivers/regulator/ab8500.c                         |    1 +
9726  drivers/regulator/bq24022.c                        |    1 +
9727  drivers/regulator/da903x.c                         |    1 +
9728  drivers/regulator/db8500-prcmu.c                   |    1 +
9729  drivers/regulator/dummy.c                          |    1 +
9730  drivers/regulator/fixed.c                          |    1 +
9731  drivers/regulator/lp3971.c                         |    1 +
9732  drivers/regulator/lp3972.c                         |    1 +
9733  drivers/regulator/max8925-regulator.c              |    1 +
9734  drivers/regulator/max8997.c                        |    1 +
9735  drivers/regulator/mc13783-regulator.c              |    1 +
9736  drivers/regulator/mc13892-regulator.c              |    1 +
9737  drivers/regulator/mc13xxx-regulator-core.c         |    1 +
9738  drivers/regulator/tps6586x-regulator.c             |    1 +
9739  drivers/regulator/userspace-consumer.c             |    1 +
9740  drivers/regulator/virtual.c                        |    1 +
9741  drivers/regulator/wm8400-regulator.c               |    1 +
9742  drivers/rtc/interface.c                            |    1 +
9743  drivers/rtc/rtc-dm355evm.c                         |    1 +
9744  drivers/rtc/rtc-ds1305.c                           |    1 +
9745  drivers/rtc/rtc-ds1511.c                           |    1 +
9746  drivers/rtc/rtc-ds1553.c                           |    1 +
9747  drivers/rtc/rtc-ds1672.c                           |    1 +
9748  drivers/rtc/rtc-ds1742.c                           |    1 +
9749  drivers/rtc/rtc-em3027.c                           |    1 +
9750  drivers/rtc/rtc-isl12022.c                         |    1 +
9751  drivers/rtc/rtc-mv.c                               |    1 +
9752  drivers/rtc/rtc-pcf2123.c                          |    1 +
9753  drivers/rtc/rtc-pcf8563.c                          |    1 +
9754  drivers/rtc/rtc-rs5c348.c                          |    1 +
9755  drivers/rtc/rtc-rs5c372.c                          |    1 +
9756  drivers/rtc/rtc-stk17ta8.c                         |    1 +
9757  drivers/rtc/rtc-tx4939.c                           |    1 +
9758  drivers/rtc/rtc-x1205.c                            |    1 +
9759  drivers/s390/char/fs3270.c                         |    1 +
9760  drivers/s390/char/sclp_cpi_sys.c                   |    1 +
9761  drivers/s390/char/vmur.c                           |    1 +
9762  drivers/s390/cio/chp.c                             |    2 +
9763  drivers/s390/cio/qdio_debug.c                      |    2 +
9764  drivers/s390/kvm/kvm_virtio.c                      |    1 +
9765  drivers/s390/scsi/zfcp_ccw.c                       |    1 +
9766  drivers/s390/scsi/zfcp_dbf.c                       |    1 +
9767  drivers/s390/scsi/zfcp_scsi.c                      |    1 +
9768  drivers/scsi/a2091.c                               |    1 +
9769  drivers/scsi/a3000.c                               |    1 +
9770  drivers/scsi/aacraid/aachba.c                      |    1 +
9771  drivers/scsi/bfa/bfad_debugfs.c                    |    1 +
9772  drivers/scsi/bfa/bfad_im.c                         |    2 +
9773  drivers/scsi/device_handler/scsi_dh.c              |    1 +
9774  drivers/scsi/device_handler/scsi_dh_alua.c         |    1 +
9775  drivers/scsi/device_handler/scsi_dh_emc.c          |    1 +
9776  drivers/scsi/device_handler/scsi_dh_hp_sw.c        |    1 +
9777  drivers/scsi/device_handler/scsi_dh_rdac.c         |    1 +
9778  drivers/scsi/gvp11.c                               |    1 +
9779  drivers/scsi/libfc/fc_disc.c                       |    1 +
9780  drivers/scsi/libfc/fc_elsct.c                      |    1 +
9781  drivers/scsi/libfc/fc_exch.c                       |    1 +
9782  drivers/scsi/libfc/fc_libfc.c                      |    1 +
9783  drivers/scsi/libfc/fc_lport.c                      |    1 +
9784  drivers/scsi/libfc/fc_npiv.c                       |    1 +
9785  drivers/scsi/libfc/fc_rport.c                      |    1 +
9786  drivers/scsi/libsas/sas_scsi_host.c                |    1 +
9787  drivers/scsi/libsas/sas_task.c                     |    1 +
9788  drivers/scsi/libsrp.c                              |    1 +
9789  drivers/scsi/lpfc/lpfc_attr.c                      |    1 +
9790  drivers/scsi/lpfc/lpfc_debugfs.c                   |    1 +
9791  drivers/scsi/lpfc/lpfc_init.c                      |    1 +
9792  drivers/scsi/lpfc/lpfc_scsi.c                      |    1 +
9793  drivers/scsi/mac53c94.c                            |    1 +
9794  drivers/scsi/megaraid/megaraid_mbox.c              |    1 +
9795  drivers/scsi/osd/osd_initiator.c                   |    1 +
9796  drivers/scsi/ps3rom.c                              |    1 +
9797  drivers/scsi/scsi_lib.c                            |    1 +
9798  drivers/scsi/scsi_lib_dma.c                        |    1 +
9799  drivers/scsi/scsi_pm.c                             |    1 +
9800  drivers/scsi/sr_ioctl.c                            |    1 +
9801  drivers/sfi/sfi_core.h                             |    3 +
9802  drivers/sh/intc/core.c                             |    1 +
9803  drivers/sh/intc/virq.c                             |    1 +
9804  drivers/sh/maple/maple.c                           |    1 +
9805  drivers/spi/spi-altera.c                           |    1 +
9806  drivers/spi/spi-au1550.c                           |    1 +
9807  drivers/spi/spi-bitbang.c                          |    1 +
9808  drivers/spi/spi-butterfly.c                        |    1 +
9809  drivers/spi/spi-dw-mmio.c                          |    1 +
9810  drivers/spi/spi-dw-pci.c                           |    1 +
9811  drivers/spi/spi-dw.c                               |    1 +
9812  drivers/spi/spi-gpio.c                             |    1 +
9813  drivers/spi/spi-oc-tiny.c                          |    1 +
9814  drivers/spi/spi-omap-uwire.c                       |    1 +
9815  drivers/spi/spi-orion.c                            |    1 +
9816  drivers/spi/spi-pxa2xx-pci.c                       |    1 +
9817  drivers/spi/spi-s3c24xx.c                          |    1 +
9818  drivers/spi/spi-sh-msiof.c                         |    1 +
9819  drivers/spi/spi-sh-sci.c                           |    1 +
9820  drivers/spi/spi-ti-ssp.c                           |    1 +
9821  drivers/spi/spi-tle62x0.c                          |    1 +
9822  drivers/spi/spi-txx9.c                             |    1 +
9823  drivers/spi/spi.c                                  |    1 +
9824  drivers/ssb/b43_pci_bridge.c                       |    1 +
9825  drivers/ssb/driver_chipcommon.c                    |    1 +
9826  drivers/ssb/driver_chipcommon_pmu.c                |    1 +
9827  drivers/ssb/driver_gige.c                          |    1 +
9828  drivers/ssb/driver_pcicore.c                       |    1 +
9829  drivers/ssb/embedded.c                             |    1 +
9830  drivers/ssb/main.c                                 |    1 +
9831  drivers/ssb/pcihost_wrapper.c                      |    1 +
9832  drivers/staging/brcm80211/brcmutil/wifi.c          |    1 +
9833  drivers/staging/iio/industrialio-ring.c            |    1 +
9834  .../staging/intel_sst/intel_sst_drv_interface.c    |    1 +
9835  drivers/staging/line6/audio.c                      |    1 +
9836  drivers/staging/usbip/usbip_event.c                |    1 +
9837  drivers/tty/hvc/hvc_iseries.c                      |    1 +
9838  drivers/tty/hvc/hvc_vio.c                          |    1 +
9839  drivers/tty/serial/jsm/jsm_driver.c                |    2 +-
9840  drivers/tty/serial/kgdboc.c                        |    1 +
9841  drivers/tty/serial/max3100.c                       |    1 +
9842  drivers/tty/serial/max3107-aava.c                  |    1 +
9843  drivers/tty/serial/max3107.c                       |    1 +
9844  drivers/tty/serial/nwpserial.c                     |    1 +
9845  drivers/tty/serial/timbuart.c                      |    1 +
9846  drivers/tty/serial/xilinx_uartps.c                 |    1 +
9847  drivers/tty/vt/vc_screen.c                         |    1 +
9848  drivers/uio/uio_pdrv.c                             |    1 +
9849  drivers/uio/uio_pdrv_genirq.c                      |    1 +
9850  drivers/usb/c67x00/c67x00-drv.c                    |    1 +
9851  drivers/usb/core/driver.c                          |    1 +
9852  drivers/usb/core/notify.c                          |    1 +
9853  drivers/usb/gadget/cdc2.c                          |    1 +
9854  drivers/usb/gadget/composite.c                     |    1 +
9855  drivers/usb/gadget/dbgp.c                          |    1 +
9856  drivers/usb/gadget/f_fs.c                          |    1 +
9857  drivers/usb/gadget/f_obex.c                        |    1 +
9858  drivers/usb/gadget/f_sourcesink.c                  |    1 +
9859  drivers/usb/gadget/file_storage.c                  |    1 +
9860  drivers/usb/gadget/fusb300_udc.c                   |    1 +
9861  drivers/usb/gadget/gmidi.c                         |    1 +
9862  drivers/usb/gadget/u_serial.c                      |    1 +
9863  drivers/usb/host/fsl-mph-dr-of.c                   |    1 +
9864  drivers/usb/host/isp1760-if.c                      |    1 +
9865  drivers/usb/host/pci-quirks.c                      |    1 +
9866  drivers/usb/host/whci/debug.c                      |    1 +
9867  drivers/usb/host/whci/hcd.c                        |    1 +
9868  drivers/usb/host/xhci-hub.c                        |    1 +
9869  drivers/usb/host/xhci-pci.c                        |    1 +
9870  drivers/usb/mon/mon_bin.c                          |    1 +
9871  drivers/usb/mon/mon_stat.c                         |    1 +
9872  drivers/usb/mon/mon_text.c                         |    1 +
9873  drivers/usb/otg/gpio_vbus.c                        |    1 +
9874  drivers/usb/otg/otg.c                              |    1 +
9875  drivers/usb/otg/ulpi.c                             |    1 +
9876  drivers/usb/serial/aircable.c                      |    1 +
9877  drivers/usb/serial/qcserial.c                      |    1 +
9878  drivers/usb/storage/option_ms.c                    |    1 +
9879  drivers/usb/storage/protocol.c                     |    1 +
9880  drivers/usb/storage/sierra_ms.c                    |    1 +
9881  drivers/usb/storage/transport.c                    |    1 +
9882  drivers/usb/storage/uas.c                          |    1 +
9883  drivers/usb/wusbcore/devconnect.c                  |    1 +
9884  drivers/usb/wusbcore/mmc.c                         |    1 +
9885  drivers/usb/wusbcore/rh.c                          |    1 +
9886  drivers/usb/wusbcore/security.c                    |    1 +
9887  drivers/usb/wusbcore/wa-hc.c                       |    1 +
9888  drivers/usb/wusbcore/wa-rpipe.c                    |    1 +
9889  drivers/usb/wusbcore/wa-xfer.c                     |    1 +
9890  drivers/uwb/est.c                                  |    1 +
9891  drivers/uwb/i1480/dfu/dfu.c                        |    1 +
9892  drivers/uwb/ie.c                                   |    1 +
9893  drivers/uwb/lc-dev.c                               |    2 +
9894  drivers/uwb/neh.c                                  |    1 +
9895  drivers/uwb/pal.c                                  |    1 +
9896  drivers/uwb/radio.c                                |    1 +
9897  drivers/uwb/reset.c                                |    1 +
9898  drivers/uwb/rsv.c                                  |    1 +
9899  drivers/uwb/scan.c                                 |    1 +
9900  drivers/uwb/umc-bus.c                              |    1 +
9901  drivers/uwb/umc-dev.c                              |    1 +
9902  drivers/uwb/umc-drv.c                              |    1 +
9903  drivers/uwb/whci.c                                 |    1 +
9904  drivers/video/atmel_lcdfb.c                        |    1 +
9905  drivers/video/backlight/88pm860x_bl.c              |    1 +
9906  drivers/video/backlight/adp5520_bl.c               |    1 +
9907  drivers/video/backlight/ams369fg06.c               |    1 +
9908  drivers/video/backlight/da903x_bl.c                |    1 +
9909  drivers/video/backlight/ep93xx_bl.c                |    1 +
9910  drivers/video/backlight/l4f00242t03.c              |    1 +
9911  drivers/video/backlight/ld9040.c                   |    1 +
9912  drivers/video/backlight/lms283gf05.c               |    1 +
9913  drivers/video/backlight/max8925_bl.c               |    1 +
9914  drivers/video/backlight/s6e63m0.c                  |    1 +
9915  drivers/video/backlight/wm831x_bl.c                |    1 +
9916  drivers/video/carminefb.c                          |    1 +
9917  drivers/video/cobalt_lcdfb.c                       |    1 +
9918  drivers/video/ep93xx-fb.c                          |    1 +
9919  drivers/video/fb_ddc.c                             |    3 +-
9920  drivers/video/fb_notify.c                          |    1 +
9921  drivers/video/mb862xx/mb862xx-i2c.c                |    1 +
9922  drivers/video/mb862xx/mb862xxfbdrv.c               |    1 +
9923  drivers/video/msm/mdp.c                            |    1 +
9924  drivers/video/omap/lcd_mipid.c                     |    1 +
9925  drivers/video/omap/omapfb_main.c                   |    1 +
9926  drivers/video/omap2/dss/dispc.c                    |    1 +
9927  drivers/video/omap2/dss/dpi.c                      |    1 +
9928  drivers/video/omap2/dss/dsi.c                      |    1 +
9929  drivers/video/omap2/dss/dss.c                      |    1 +
9930  drivers/video/omap2/dss/rfbi.c                     |    1 +
9931  drivers/video/omap2/dss/sdi.c                      |    1 +
9932  drivers/video/omap2/omapfb/omapfb-ioctl.c          |    1 +
9933  drivers/video/savage/savagefb_accel.c              |    1 +
9934  drivers/video/sh_mipi_dsi.c                        |    1 +
9935  drivers/video/sh_mobile_lcdcfb.c                   |    1 +
9936  drivers/video/via/via-gpio.c                       |    1 +
9937  drivers/video/w100fb.c                             |    1 +
9938  drivers/virtio/virtio.c                            |    1 +
9939  drivers/virtio/virtio_balloon.c                    |    1 +
9940  drivers/virtio/virtio_ring.c                       |    1 +
9941  drivers/w1/w1_family.c                             |    1 +
9942  drivers/xen/balloon.c                              |    1 +
9943  drivers/xen/manage.c                               |    1 +
9944  drivers/xen/swiotlb-xen.c                          |    1 +
9945  drivers/xen/xen-pciback/conf_space.c               |    1 +
9946  drivers/xen/xen-selfballoon.c                      |    2 +
9947  drivers/xen/xenbus/xenbus_client.c                 |    1 +
9948  drivers/xen/xenbus/xenbus_probe.c                  |    1 +
9949  drivers/xen/xenbus/xenbus_probe_backend.c          |    1 +
9950  drivers/xen/xenbus/xenbus_probe_frontend.c         |    1 +
9951  drivers/zorro/proc.c                               |    1 +
9952  fs/bio-integrity.c                                 |    1 +
9953  fs/exofs/super.c                                   |    1 +
9954  fs/gfs2/ops_fstype.c                               |    1 +
9955  fs/ioprio.c                                        |    1 +
9956  fs/jfs/jfs_logmgr.c                                |    1 +
9957  fs/logfs/super.c                                   |    1 +
9958  fs/nfsd/nfssvc.c                                   |    1 +
9959  fs/proc/vmcore.c                                   |    1 +
9960  include/acpi/platform/aclinux.h                    |    2 +-
9961  include/drm/drmP.h                                 |    3 +-
9962  include/linux/bcma/bcma.h                          |    7 +-
9963  include/linux/blkdev.h                             |    2 +-
9964  include/linux/cpuidle.h                            |    3 +-
9965  include/linux/crypto.h                             |    6 --
9966  include/linux/device.h                             |   15 ++-
9967  include/linux/device_cgroup.h                      |    1 -
9968  include/linux/dmaengine.h                          |    2 +
9969  include/linux/export.h                             |   89 ++++++++++++++++++++
9970  include/linux/firmware.h                           |    2 +-
9971  include/linux/ftrace.h                             |    2 +-
9972  include/linux/gameport.h                           |   17 ++--
9973  include/linux/hid.h                                |    9 +-
9974  include/linux/i2c.h                                |   10 +-
9975  include/linux/ipmi.h                               |    3 +-
9976  include/linux/ipmi_smi.h                           |    1 -
9977  include/linux/mdio-bitbang.h                       |    3 +-
9978  include/linux/module.h                             |   68 +---------------
9979  include/linux/mtd/mtd.h                            |    3 +-
9980  include/linux/of_platform.h                        |    1 -
9981  include/linux/pci_hotplug.h                        |   10 +--
9982  include/linux/pm_runtime.h                         |    1 +
9983  include/linux/regulator/driver.h                   |    1 +
9984  include/linux/serio.h                              |   20 +++--
9985  include/linux/ssb/ssb.h                            |    7 +-
9986  include/linux/stop_machine.h                       |    1 +
9987  include/linux/sunrpc/svc_xprt.h                    |    3 +-
9988  include/linux/sysdev.h                             |    1 -
9989  include/linux/textsearch.h                         |    3 +-
9990  include/linux/uio_driver.h                         |   12 ++--
9991  include/linux/usb.h                                |    9 +-
9992  include/linux/uwb.h                                |    1 +
9993  include/linux/uwb/umc.h                            |    7 +-
9994  include/linux/vermagic.h                           |    1 -
9995  include/linux/vlynq.h                              |    3 +-
9996  include/media/saa7146.h                            |    3 +-
9997  include/media/v4l2-int-device.h                    |    3 +-
9998  include/net/inet_timewait_sock.h                   |    1 -
9999  include/net/lib80211.h                             |    3 +-
10000  include/net/sch_generic.h                          |    1 -
10001  include/net/sock.h                                 |    2 +-
10002  include/sound/core.h                               |    2 +-
10003  include/trace/define_trace.h                       |    2 +-
10004  include/trace/events/module.h                      |    2 +-
10005  include/xen/xenbus.h                               |    1 +
10006  kernel/async.c                                     |    2 +-
10007  kernel/audit.c                                     |    2 +-
10008  kernel/auditsc.c                                   |    2 +-
10009  kernel/capability.c                                |    2 +-
10010  kernel/cgroup_freezer.c                            |    2 +-
10011  kernel/compat.c                                    |    1 +
10012  kernel/cpu.c                                       |    2 +-
10013  kernel/cpuset.c                                    |    2 +-
10014  kernel/crash_dump.c                                |    2 +-
10015  kernel/cred.c                                      |    2 +-
10016  kernel/debug/kdb/kdb_debugger.c                    |    1 +
10017  kernel/dma.c                                       |    2 +-
10018  kernel/events/core.c                               |    1 +
10019  kernel/exit.c                                      |    3 +-
10020  kernel/fork.c                                      |    3 +-
10021  kernel/freezer.c                                   |    2 +-
10022  kernel/futex.c                                     |    2 +-
10023  kernel/groups.c                                    |    2 +-
10024  kernel/hrtimer.c                                   |    2 +-
10025  kernel/hung_task.c                                 |    2 +-
10026  kernel/irq_work.c                                  |    4 +-
10027  kernel/kfifo.c                                     |    2 +-
10028  kernel/kprobes.c                                   |    2 +-
10029  kernel/ksysfs.c                                    |    3 +-
10030  kernel/kthread.c                                   |    2 +-
10031  kernel/latencytop.c                                |    2 +-
10032  kernel/lockdep.c                                   |    2 +-
10033  kernel/lockdep_proc.c                              |    2 +-
10034  kernel/module.c                                    |    2 +-
10035  kernel/mutex-debug.c                               |    2 +-
10036  kernel/mutex.c                                     |    2 +-
10037  kernel/notifier.c                                  |    2 +-
10038  kernel/nsproxy.c                                   |    2 +-
10039  kernel/padata.c                                    |    2 +-
10040  kernel/params.c                                    |    4 +-
10041  kernel/pid.c                                       |    2 +-
10042  kernel/posix-timers.c                              |    2 +-
10043  kernel/power/hibernate.c                           |    1 +
10044  kernel/power/main.c                                |    1 +
10045  kernel/power/suspend.c                             |    2 +
10046  kernel/profile.c                                   |    2 +-
10047  kernel/ptrace.c                                    |    2 +-
10048  kernel/range.c                                     |    2 +-
10049  kernel/rcupdate.c                                  |    2 +-
10050  kernel/rcutiny.c                                   |    4 +-
10051  kernel/rcutorture.c                                |    3 +-
10052  kernel/rcutree.c                                   |    2 +-
10053  kernel/rcutree_trace.c                             |    3 +-
10054  kernel/relay.c                                     |    2 +-
10055  kernel/resource.c                                  |    2 +-
10056  kernel/rtmutex-debug.c                             |    2 +-
10057  kernel/rtmutex-tester.c                            |    2 +-
10058  kernel/rtmutex.c                                   |    2 +-
10059  kernel/rwsem.c                                     |    2 +-
10060  kernel/sched.c                                     |    2 +-
10061  kernel/sched_clock.c                               |    2 +-
10062  kernel/semaphore.c                                 |    2 +-
10063  kernel/signal.c                                    |    2 +-
10064  kernel/smp.c                                       |    2 +-
10065  kernel/softirq.c                                   |    2 +-
10066  kernel/spinlock.c                                  |    2 +-
10067  kernel/srcu.c                                      |    2 +-
10068  kernel/stacktrace.c                                |    2 +-
10069  kernel/stop_machine.c                              |    2 +-
10070  kernel/sys.c                                       |    3 +-
10071  kernel/sysctl.c                                    |    2 +-
10072  kernel/time.c                                      |    2 +-
10073  kernel/time/posix-clock.c                          |    1 +
10074  kernel/timer.c                                     |    2 +-
10075  kernel/trace/blktrace.c                            |    1 +
10076  kernel/trace/ftrace.c                              |    1 +
10077  kernel/trace/trace_syscalls.c                      |    1 +
10078  kernel/up.c                                        |    2 +-
10079  kernel/user-return-notifier.c                      |    2 +-
10080  kernel/user.c                                      |    2 +-
10081  kernel/user_namespace.c                            |    2 +-
10082  kernel/utsname.c                                   |    2 +-
10083  kernel/utsname_sysctl.c                            |    2 +-
10084  kernel/wait.c                                      |    2 +-
10085  kernel/watchdog.c                                  |    3 +-
10086  kernel/workqueue.c                                 |    2 +-
10087  lib/dma-debug.c                                    |    1 +
10088  lib/raid6/algos.c                                  |    1 +
10089  lib/raid6/mktables.c                               |    1 +
10090  lib/raid6/recov.c                                  |    1 +
10091  mm/fremap.c                                        |    1 -
10092  mm/memcontrol.c                                    |    1 +
10093  mm/memory-failure.c                                |    1 +
10094  mm/mmzone.c                                        |    1 -
10095  mm/quicklist.c                                     |    1 -
10096  mm/sparse-vmemmap.c                                |    1 -
10097  mm/swap_state.c                                    |    1 -
10098  mm/swapfile.c                                      |    1 -
10099  net/caif/cfpkt_skbuff.c                            |    1 +
10100  net/netfilter/ipset/pfxlen.c                       |    1 +
10101  net/rfkill/input.c                                 |    1 +
10102  security/selinux/netlink.c                         |    1 +
10103  sound/core/control.c                               |    1 +
10104  sound/core/device.c                                |    1 +
10105  sound/core/hwdep.c                                 |    1 +
10106  sound/core/info.c                                  |    1 +
10107  sound/core/info_oss.c                              |    1 +
10108  sound/core/init.c                                  |    1 +
10109  sound/core/isadma.c                                |    1 +
10110  sound/core/jack.c                                  |    1 +
10111  sound/core/memory.c                                |    1 +
10112  sound/core/misc.c                                  |    1 +
10113  sound/core/oss/mixer_oss.c                         |    1 +
10114  sound/core/rawmidi.c                               |    1 +
10115  sound/core/seq/oss/seq_oss.c                       |    2 +-
10116  sound/core/seq/oss/seq_oss_init.c                  |    2 +-
10117  sound/core/seq/oss/seq_oss_synth.c                 |    1 +
10118  sound/core/seq/seq.c                               |    2 +-
10119  sound/core/seq/seq_clientmgr.c                     |    1 +
10120  sound/core/seq/seq_device.c                        |    1 +
10121  sound/core/seq/seq_dummy.c                         |    2 +-
10122  sound/core/seq/seq_info.c                          |    1 +
10123  sound/core/seq/seq_lock.c                          |    1 +
10124  sound/core/seq/seq_memory.c                        |    1 +
10125  sound/core/seq/seq_midi.c                          |    2 +-
10126  sound/core/seq/seq_midi_emul.c                     |    1 +
10127  sound/core/seq/seq_midi_event.c                    |    1 +
10128  sound/core/seq/seq_ports.c                         |    1 +
10129  sound/core/seq/seq_system.c                        |    1 +
10130  sound/core/seq/seq_virmidi.c                       |    1 +
10131  sound/core/sound.c                                 |    2 +-
10132  sound/core/sound_oss.c                             |    1 +
10133  sound/core/timer.c                                 |    2 +-
10134  sound/core/vmaster.c                               |    1 +
10135  sound/drivers/mpu401/mpu401.c                      |    2 +-
10136  sound/drivers/mpu401/mpu401_uart.c                 |    1 +
10137  sound/drivers/mtpav.c                              |    1 +
10138  sound/drivers/mts64.c                              |    1 +
10139  sound/drivers/opl3/opl3_lib.c                      |    1 +
10140  sound/drivers/opl3/opl3_oss.c                      |    1 +
10141  sound/drivers/opl3/opl3_seq.c                      |    1 +
10142  sound/drivers/opl3/opl3_synth.c                    |    1 +
10143  sound/drivers/opl4/opl4_lib.c                      |    1 +
10144  sound/drivers/opl4/opl4_proc.c                     |    1 +
10145  sound/drivers/opl4/opl4_seq.c                      |    1 +
10146  sound/drivers/portman2x4.c                         |    1 +
10147  sound/drivers/serial-u16550.c                      |    2 +-
10148  sound/drivers/virmidi.c                            |    2 +-
10149  sound/firewire/iso-resources.c                     |    1 +
10150  sound/firewire/packets-buffer.c                    |    1 +
10151  sound/i2c/i2c.c                                    |    1 +
10152  sound/i2c/other/ak4xxx-adda.c                      |    1 +
10153  sound/i2c/other/pt2258.c                           |    1 +
10154  sound/i2c/other/tea575x-tuner.c                    |    1 +
10155  sound/i2c/tea6330t.c                               |    1 +
10156  sound/isa/sb/emu8000.c                             |    1 +
10157  sound/isa/sb/emu8000_callback.c                    |    1 +
10158  sound/isa/sb/emu8000_patch.c                       |    1 +
10159  sound/isa/sb/emu8000_synth.c                       |    1 +
10160  sound/isa/wavefront/wavefront_fx.c                 |    1 +
10161  sound/isa/wavefront/wavefront_synth.c              |    1 +
10162  sound/pci/als4000.c                                |    2 +-
10163  sound/pci/asihpi/hpioctl.c                         |    1 +
10164  sound/pci/ctxfi/xfi.c                              |    1 +
10165  sound/pci/oxygen/oxygen_io.c                       |    1 +
10166  sound/soc/blackfin/bf5xx-sport.c                   |    1 +
10167  sound/soc/tegra/tegra_asoc_utils.c                 |    1 +
10168  sound/synth/emux/emux.c                            |    1 +
10169  sound/synth/emux/emux_oss.c                        |    1 +
10170  sound/synth/emux/emux_seq.c                        |    2 +-
10171  sound/synth/emux/emux_synth.c                      |    1 +
10172  sound/synth/emux/soundfont.c                       |    1 +
10173  sound/synth/util_mem.c                             |    1 +
10174  sound/usb/6fire/firmware.c                         |    1 +
10175  sound/usb/midi.c                                   |    1 +
10176  virt/kvm/iommu.c                                   |    2 +
10177  1322 files changed, 1453 insertions(+), 424 deletions(-)
10178  create mode 100644 include/linux/export.h
10179 $ git am -3 ../patches/0001-dm-use-export.h-instead-of-module.h-where-possible.patch
10180 Applying: dm: use export.h instead of module.h where possible
10181 $ git reset HEAD^
10182 Unstaged changes after reset:
10183 M       drivers/md/persistent-data/dm-btree-remove.c
10184 M       drivers/md/persistent-data/dm-btree.c
10185 M       drivers/md/persistent-data/dm-space-map-disk.c
10186 M       drivers/md/persistent-data/dm-transaction-manager.c
10187 $ git add .
10188 $ git commit -v -a --amend
10189 [master 0aed4e3] Merge remote-tracking branch 'moduleh/module.h-split'
10190 $ git am -3 ../patches/0001-block-bsg-lib.c-needs-export.h-not-module.h.patch
10191 Applying: block: bsg-lib.c needs export.h not module.h
10192 $ git reset HEAD^
10193 Unstaged changes after reset:
10194 M       block/bsg-lib.c
10195 $ git add .
10196 $ git commit -v -a --amend
10197 [master 1847244] Merge remote-tracking branch 'moduleh/module.h-split'
10198 $ git am -3 ../patches/0001-PM-EXPORT_SYMBOL-needs-export.h.patch
10199 Applying: PM: EXPORT_SYMBOL needs export.h
10200 $ git reset HEAD^
10201 Unstaged changes after reset:
10202 M       drivers/base/power/common.c
10203 $ git add .
10204 $ git commit -v -a --amend
10205 [master 183825d1] Merge remote-tracking branch 'moduleh/module.h-split'
10206 Merging kvmtool/master
10207 $ git merge kvmtool/master
10208 Resolved 'include/net/9p/9p.h' using previous resolution.
10209 Auto-merging MAINTAINERS
10210 Auto-merging include/net/9p/9p.h
10211 CONFLICT (content): Merge conflict in include/net/9p/9p.h
10212 Automatic merge failed; fix conflicts and then commit the result.
10213 $ git commit -v -a
10214 [master 16c0945] Merge remote-tracking branch 'kvmtool/master'
10215 $ git diff -M --stat --summary HEAD^..
10216  MAINTAINERS                             |    8 +
10217  tools/kvm/.gitignore                    |   10 +
10218  tools/kvm/CREDITS-Git                   |   30 +
10219  tools/kvm/Documentation/kvm-balloon.txt |   24 +
10220  tools/kvm/Documentation/kvm-debug.txt   |   16 +
10221  tools/kvm/Documentation/kvm-list.txt    |   16 +
10222  tools/kvm/Documentation/kvm-pause.txt   |   16 +
10223  tools/kvm/Documentation/kvm-resume.txt  |   16 +
10224  tools/kvm/Documentation/kvm-run.txt     |   62 ++
10225  tools/kvm/Documentation/kvm-setup.txt   |   15 +
10226  tools/kvm/Documentation/kvm-stat.txt    |   19 +
10227  tools/kvm/Documentation/kvm-stop.txt    |   16 +
10228  tools/kvm/Documentation/kvm-version.txt |   21 +
10229  tools/kvm/Makefile                      |  285 +++++++
10230  tools/kvm/README                        |  109 +++
10231  tools/kvm/bios.c                        |  157 ++++
10232  tools/kvm/bios/.gitignore               |    3 +
10233  tools/kvm/bios/bios-rom.S               |   12 +
10234  tools/kvm/bios/e820.c                   |   73 ++
10235  tools/kvm/bios/entry.S                  |   90 +++
10236  tools/kvm/bios/gen-offsets.sh           |   14 +
10237  tools/kvm/bios/int10.c                  |  151 ++++
10238  tools/kvm/bios/int15.c                  |   18 +
10239  tools/kvm/bios/local.S                  |    7 +
10240  tools/kvm/bios/macro.S                  |   25 +
10241  tools/kvm/bios/rom.ld.S                 |   17 +
10242  tools/kvm/builtin-balloon.c             |   75 ++
10243  tools/kvm/builtin-debug.c               |   66 ++
10244  tools/kvm/builtin-help.c                |   61 ++
10245  tools/kvm/builtin-list.c                |   66 ++
10246  tools/kvm/builtin-pause.c               |   66 ++
10247  tools/kvm/builtin-resume.c              |   66 ++
10248  tools/kvm/builtin-run.c                 |  907 ++++++++++++++++++++++
10249  tools/kvm/builtin-setup.c               |  218 ++++++
10250  tools/kvm/builtin-stat.c                |   79 ++
10251  tools/kvm/builtin-stop.c                |   66 ++
10252  tools/kvm/builtin-version.c             |   15 +
10253  tools/kvm/code16gcc.h                   |   15 +
10254  tools/kvm/command-list.txt              |   14 +
10255  tools/kvm/config/feature-tests.mak      |  148 ++++
10256  tools/kvm/config/utilities.mak          |  188 +++++
10257  tools/kvm/cpuid.c                       |   51 ++
10258  tools/kvm/disk/blk.c                    |   39 +
10259  tools/kvm/disk/core.c                   |  222 ++++++
10260  tools/kvm/disk/qcow.c                   | 1099 +++++++++++++++++++++++++++
10261  tools/kvm/disk/raw.c                    |   82 ++
10262  tools/kvm/framebuffer.c                 |   68 ++
10263  tools/kvm/guest/init.c                  |   44 ++
10264  tools/kvm/guest/setnet.sh               |   22 +
10265  tools/kvm/guest_compat.c                |  104 +++
10266  tools/kvm/hw/i8042.c                    |  348 +++++++++
10267  tools/kvm/hw/pci-shmem.c                |  264 +++++++
10268  tools/kvm/hw/rtc.c                      |   87 +++
10269  tools/kvm/hw/serial.c                   |  358 +++++++++
10270  tools/kvm/hw/vesa.c                     |   77 ++
10271  tools/kvm/include/asm/hweight.h         |    8 +
10272  tools/kvm/include/kvm/8250-serial.h     |   10 +
10273  tools/kvm/include/kvm/apic.h            |   17 +
10274  tools/kvm/include/kvm/assembly.h        |   24 +
10275  tools/kvm/include/kvm/barrier.h         |   15 +
10276  tools/kvm/include/kvm/bios-export.h     |   13 +
10277  tools/kvm/include/kvm/bios.h            |   83 ++
10278  tools/kvm/include/kvm/boot-protocol.h   |   16 +
10279  tools/kvm/include/kvm/brlock.h          |   41 +
10280  tools/kvm/include/kvm/builtin-balloon.h |    7 +
10281  tools/kvm/include/kvm/builtin-debug.h   |    7 +
10282  tools/kvm/include/kvm/builtin-help.h    |    6 +
10283  tools/kvm/include/kvm/builtin-list.h    |    7 +
10284  tools/kvm/include/kvm/builtin-pause.h   |    7 +
10285  tools/kvm/include/kvm/builtin-resume.h  |    7 +
10286  tools/kvm/include/kvm/builtin-run.h     |    7 +
10287  tools/kvm/include/kvm/builtin-setup.h   |    8 +
10288  tools/kvm/include/kvm/builtin-stat.h    |    7 +
10289  tools/kvm/include/kvm/builtin-stop.h    |    7 +
10290  tools/kvm/include/kvm/builtin-version.h |    6 +
10291  tools/kvm/include/kvm/compiler.h        |    6 +
10292  tools/kvm/include/kvm/cpufeature.h      |   41 +
10293  tools/kvm/include/kvm/disk-image.h      |   73 ++
10294  tools/kvm/include/kvm/e820.h            |   12 +
10295  tools/kvm/include/kvm/framebuffer.h     |   34 +
10296  tools/kvm/include/kvm/guest_compat.h    |    9 +
10297  tools/kvm/include/kvm/i8042.h           |   12 +
10298  tools/kvm/include/kvm/interrupt.h       |   26 +
10299  tools/kvm/include/kvm/ioeventfd.h       |   27 +
10300  tools/kvm/include/kvm/ioport.h          |   65 ++
10301  tools/kvm/include/kvm/irq.h             |   29 +
10302  tools/kvm/include/kvm/kvm-cmd.h         |   17 +
10303  tools/kvm/include/kvm/kvm-cpu.h         |   44 ++
10304  tools/kvm/include/kvm/kvm.h             |  112 +++
10305  tools/kvm/include/kvm/mptable.h         |    8 +
10306  tools/kvm/include/kvm/mutex.h           |   33 +
10307  tools/kvm/include/kvm/parse-options.h   |  213 ++++++
10308  tools/kvm/include/kvm/pci-shmem.h       |   28 +
10309  tools/kvm/include/kvm/pci.h             |   75 ++
10310  tools/kvm/include/kvm/qcow.h            |  122 +++
10311  tools/kvm/include/kvm/rbtree-interval.h |   27 +
10312  tools/kvm/include/kvm/read-write.h      |   32 +
10313  tools/kvm/include/kvm/rtc.h             |    6 +
10314  tools/kvm/include/kvm/rwsem.h           |   39 +
10315  tools/kvm/include/kvm/sdl.h             |   17 +
10316  tools/kvm/include/kvm/segment.h         |   16 +
10317  tools/kvm/include/kvm/strbuf.h          |    6 +
10318  tools/kvm/include/kvm/symbol.h          |   22 +
10319  tools/kvm/include/kvm/term.h            |   17 +
10320  tools/kvm/include/kvm/threadpool.h      |   37 +
10321  tools/kvm/include/kvm/types.h           |    7 +
10322  tools/kvm/include/kvm/uip.h             |  356 +++++++++
10323  tools/kvm/include/kvm/util.h            |   78 ++
10324  tools/kvm/include/kvm/vesa.h            |   18 +
10325  tools/kvm/include/kvm/virtio-9p.h       |   75 ++
10326  tools/kvm/include/kvm/virtio-balloon.h  |    8 +
10327  tools/kvm/include/kvm/virtio-blk.h      |   12 +
10328  tools/kvm/include/kvm/virtio-console.h  |    9 +
10329  tools/kvm/include/kvm/virtio-net.h      |   21 +
10330  tools/kvm/include/kvm/virtio-pci-dev.h  |   27 +
10331  tools/kvm/include/kvm/virtio-pci.h      |   59 ++
10332  tools/kvm/include/kvm/virtio-rng.h      |    9 +
10333  tools/kvm/include/kvm/virtio.h          |   65 ++
10334  tools/kvm/include/kvm/vnc.h             |   14 +
10335  tools/kvm/include/linux/bitops.h        |   33 +
10336  tools/kvm/include/linux/byteorder.h     |    7 +
10337  tools/kvm/include/linux/kernel.h        |   39 +
10338  tools/kvm/include/linux/module.h        |    6 +
10339  tools/kvm/include/linux/prefetch.h      |    6 +
10340  tools/kvm/include/linux/types.h         |   50 ++
10341  tools/kvm/interrupt.c                   |   27 +
10342  tools/kvm/ioeventfd.c                   |  128 ++++
10343  tools/kvm/ioport.c                      |  192 +++++
10344  tools/kvm/irq.c                         |  193 +++++
10345  tools/kvm/kvm-cmd.c                     |   91 +++
10346  tools/kvm/kvm-cpu.c                     |  509 +++++++++++++
10347  tools/kvm/kvm.c                         |  749 ++++++++++++++++++
10348  tools/kvm/main.c                        |   14 +
10349  tools/kvm/mmio.c                        |  132 ++++
10350  tools/kvm/mptable.c                     |  284 +++++++
10351  tools/kvm/net/uip/arp.c                 |   30 +
10352  tools/kvm/net/uip/buf.c                 |  114 +++
10353  tools/kvm/net/uip/core.c                |  190 +++++
10354  tools/kvm/net/uip/csum.c                |   92 +++
10355  tools/kvm/net/uip/dhcp.c                |  195 +++++
10356  tools/kvm/net/uip/icmp.c                |   29 +
10357  tools/kvm/net/uip/ipv4.c                |   29 +
10358  tools/kvm/net/uip/tcp.c                 |  317 ++++++++
10359  tools/kvm/net/uip/udp.c                 |  236 ++++++
10360  tools/kvm/pci.c                         |  169 ++++
10361  tools/kvm/read-write.c                  |  318 ++++++++
10362  tools/kvm/symbol.c                      |   98 +++
10363  tools/kvm/term.c                        |  127 +++
10364  tools/kvm/tests/Makefile                |   19 +
10365  tools/kvm/tests/boot/Makefile           |   13 +
10366  tools/kvm/tests/boot/init.c             |   11 +
10367  tools/kvm/tests/kernel/.gitignore       |    2 +
10368  tools/kvm/tests/kernel/Makefile         |   20 +
10369  tools/kvm/tests/kernel/README           |   16 +
10370  tools/kvm/tests/kernel/kernel.S         |    8 +
10371  tools/kvm/tests/pit/.gitignore          |    2 +
10372  tools/kvm/tests/pit/Makefile            |   20 +
10373  tools/kvm/tests/pit/README              |   16 +
10374  tools/kvm/tests/pit/tick.S              |  109 +++
10375  tools/kvm/threadpool.c                  |  146 ++++
10376  tools/kvm/ui/sdl.c                      |  158 ++++
10377  tools/kvm/ui/vnc.c                      |  218 ++++++
10378  tools/kvm/util.c                        |  101 +++
10379  tools/kvm/util/KVMTOOLS-VERSION-GEN     |   40 +
10380  tools/kvm/util/generate-cmdlist.sh      |   23 +
10381  tools/kvm/util/kvm-ifup-vbr0            |    6 +
10382  tools/kvm/util/parse-options.c          |  631 +++++++++++++++
10383  tools/kvm/util/rbtree-interval.c        |   90 +++
10384  tools/kvm/util/set_private_br.sh        |   51 ++
10385  tools/kvm/util/strbuf.c                 |   13 +
10386  tools/kvm/virtio/9p-pdu.c               |  287 +++++++
10387  tools/kvm/virtio/9p.c                   | 1263 +++++++++++++++++++++++++++++++
10388  tools/kvm/virtio/balloon.c              |  288 +++++++
10389  tools/kvm/virtio/blk.c                  |  247 ++++++
10390  tools/kvm/virtio/console.c              |  196 +++++
10391  tools/kvm/virtio/core.c                 |  123 +++
10392  tools/kvm/virtio/net.c                  |  406 ++++++++++
10393  tools/kvm/virtio/pci.c                  |  313 ++++++++
10394  tools/kvm/virtio/rng.c                  |  183 +++++
10395  179 files changed, 17834 insertions(+), 0 deletions(-)
10396  create mode 100644 tools/kvm/.gitignore
10397  create mode 100644 tools/kvm/CREDITS-Git
10398  create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
10399  create mode 100644 tools/kvm/Documentation/kvm-debug.txt
10400  create mode 100644 tools/kvm/Documentation/kvm-list.txt
10401  create mode 100644 tools/kvm/Documentation/kvm-pause.txt
10402  create mode 100644 tools/kvm/Documentation/kvm-resume.txt
10403  create mode 100644 tools/kvm/Documentation/kvm-run.txt
10404  create mode 100644 tools/kvm/Documentation/kvm-setup.txt
10405  create mode 100644 tools/kvm/Documentation/kvm-stat.txt
10406  create mode 100644 tools/kvm/Documentation/kvm-stop.txt
10407  create mode 100644 tools/kvm/Documentation/kvm-version.txt
10408  create mode 100644 tools/kvm/Makefile
10409  create mode 100644 tools/kvm/README
10410  create mode 100644 tools/kvm/bios.c
10411  create mode 100644 tools/kvm/bios/.gitignore
10412  create mode 100644 tools/kvm/bios/bios-rom.S
10413  create mode 100644 tools/kvm/bios/e820.c
10414  create mode 100644 tools/kvm/bios/entry.S
10415  create mode 100644 tools/kvm/bios/gen-offsets.sh
10416  create mode 100644 tools/kvm/bios/int10.c
10417  create mode 100644 tools/kvm/bios/int15.c
10418  create mode 100644 tools/kvm/bios/local.S
10419  create mode 100644 tools/kvm/bios/macro.S
10420  create mode 100644 tools/kvm/bios/rom.ld.S
10421  create mode 100644 tools/kvm/builtin-balloon.c
10422  create mode 100644 tools/kvm/builtin-debug.c
10423  create mode 100644 tools/kvm/builtin-help.c
10424  create mode 100644 tools/kvm/builtin-list.c
10425  create mode 100644 tools/kvm/builtin-pause.c
10426  create mode 100644 tools/kvm/builtin-resume.c
10427  create mode 100644 tools/kvm/builtin-run.c
10428  create mode 100644 tools/kvm/builtin-setup.c
10429  create mode 100644 tools/kvm/builtin-stat.c
10430  create mode 100644 tools/kvm/builtin-stop.c
10431  create mode 100644 tools/kvm/builtin-version.c
10432  create mode 100644 tools/kvm/code16gcc.h
10433  create mode 100644 tools/kvm/command-list.txt
10434  create mode 100644 tools/kvm/config/feature-tests.mak
10435  create mode 100644 tools/kvm/config/utilities.mak
10436  create mode 100644 tools/kvm/cpuid.c
10437  create mode 100644 tools/kvm/disk/blk.c
10438  create mode 100644 tools/kvm/disk/core.c
10439  create mode 100644 tools/kvm/disk/qcow.c
10440  create mode 100644 tools/kvm/disk/raw.c
10441  create mode 100644 tools/kvm/framebuffer.c
10442  create mode 100644 tools/kvm/guest/init.c
10443  create mode 100755 tools/kvm/guest/setnet.sh
10444  create mode 100644 tools/kvm/guest_compat.c
10445  create mode 100644 tools/kvm/hw/i8042.c
10446  create mode 100644 tools/kvm/hw/pci-shmem.c
10447  create mode 100644 tools/kvm/hw/rtc.c
10448  create mode 100644 tools/kvm/hw/serial.c
10449  create mode 100644 tools/kvm/hw/vesa.c
10450  create mode 100644 tools/kvm/include/asm/hweight.h
10451  create mode 100644 tools/kvm/include/kvm/8250-serial.h
10452  create mode 100644 tools/kvm/include/kvm/apic.h
10453  create mode 100644 tools/kvm/include/kvm/assembly.h
10454  create mode 100644 tools/kvm/include/kvm/barrier.h
10455  create mode 100644 tools/kvm/include/kvm/bios-export.h
10456  create mode 100644 tools/kvm/include/kvm/bios.h
10457  create mode 100644 tools/kvm/include/kvm/boot-protocol.h
10458  create mode 100644 tools/kvm/include/kvm/brlock.h
10459  create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
10460  create mode 100644 tools/kvm/include/kvm/builtin-debug.h
10461  create mode 100644 tools/kvm/include/kvm/builtin-help.h
10462  create mode 100644 tools/kvm/include/kvm/builtin-list.h
10463  create mode 100644 tools/kvm/include/kvm/builtin-pause.h
10464  create mode 100644 tools/kvm/include/kvm/builtin-resume.h
10465  create mode 100644 tools/kvm/include/kvm/builtin-run.h
10466  create mode 100644 tools/kvm/include/kvm/builtin-setup.h
10467  create mode 100644 tools/kvm/include/kvm/builtin-stat.h
10468  create mode 100644 tools/kvm/include/kvm/builtin-stop.h
10469  create mode 100644 tools/kvm/include/kvm/builtin-version.h
10470  create mode 100644 tools/kvm/include/kvm/compiler.h
10471  create mode 100644 tools/kvm/include/kvm/cpufeature.h
10472  create mode 100644 tools/kvm/include/kvm/disk-image.h
10473  create mode 100644 tools/kvm/include/kvm/e820.h
10474  create mode 100644 tools/kvm/include/kvm/framebuffer.h
10475  create mode 100644 tools/kvm/include/kvm/guest_compat.h
10476  create mode 100644 tools/kvm/include/kvm/i8042.h
10477  create mode 100644 tools/kvm/include/kvm/interrupt.h
10478  create mode 100644 tools/kvm/include/kvm/ioeventfd.h
10479  create mode 100644 tools/kvm/include/kvm/ioport.h
10480  create mode 100644 tools/kvm/include/kvm/irq.h
10481  create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
10482  create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
10483  create mode 100644 tools/kvm/include/kvm/kvm.h
10484  create mode 100644 tools/kvm/include/kvm/mptable.h
10485  create mode 100644 tools/kvm/include/kvm/mutex.h
10486  create mode 100644 tools/kvm/include/kvm/parse-options.h
10487  create mode 100644 tools/kvm/include/kvm/pci-shmem.h
10488  create mode 100644 tools/kvm/include/kvm/pci.h
10489  create mode 100644 tools/kvm/include/kvm/qcow.h
10490  create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
10491  create mode 100644 tools/kvm/include/kvm/read-write.h
10492  create mode 100644 tools/kvm/include/kvm/rtc.h
10493  create mode 100644 tools/kvm/include/kvm/rwsem.h
10494  create mode 100644 tools/kvm/include/kvm/sdl.h
10495  create mode 100644 tools/kvm/include/kvm/segment.h
10496  create mode 100644 tools/kvm/include/kvm/strbuf.h
10497  create mode 100644 tools/kvm/include/kvm/symbol.h
10498  create mode 100644 tools/kvm/include/kvm/term.h
10499  create mode 100644 tools/kvm/include/kvm/threadpool.h
10500  create mode 100644 tools/kvm/include/kvm/types.h
10501  create mode 100644 tools/kvm/include/kvm/uip.h
10502  create mode 100644 tools/kvm/include/kvm/util.h
10503  create mode 100644 tools/kvm/include/kvm/vesa.h
10504  create mode 100644 tools/kvm/include/kvm/virtio-9p.h
10505  create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
10506  create mode 100644 tools/kvm/include/kvm/virtio-blk.h
10507  create mode 100644 tools/kvm/include/kvm/virtio-console.h
10508  create mode 100644 tools/kvm/include/kvm/virtio-net.h
10509  create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
10510  create mode 100644 tools/kvm/include/kvm/virtio-pci.h
10511  create mode 100644 tools/kvm/include/kvm/virtio-rng.h
10512  create mode 100644 tools/kvm/include/kvm/virtio.h
10513  create mode 100644 tools/kvm/include/kvm/vnc.h
10514  create mode 100644 tools/kvm/include/linux/bitops.h
10515  create mode 100644 tools/kvm/include/linux/byteorder.h
10516  create mode 100644 tools/kvm/include/linux/kernel.h
10517  create mode 100644 tools/kvm/include/linux/module.h
10518  create mode 100644 tools/kvm/include/linux/prefetch.h
10519  create mode 100644 tools/kvm/include/linux/types.h
10520  create mode 100644 tools/kvm/interrupt.c
10521  create mode 100644 tools/kvm/ioeventfd.c
10522  create mode 100644 tools/kvm/ioport.c
10523  create mode 100644 tools/kvm/irq.c
10524  create mode 100644 tools/kvm/kvm-cmd.c
10525  create mode 100644 tools/kvm/kvm-cpu.c
10526  create mode 100644 tools/kvm/kvm.c
10527  create mode 100644 tools/kvm/main.c
10528  create mode 100644 tools/kvm/mmio.c
10529  create mode 100644 tools/kvm/mptable.c
10530  create mode 100644 tools/kvm/net/uip/arp.c
10531  create mode 100644 tools/kvm/net/uip/buf.c
10532  create mode 100644 tools/kvm/net/uip/core.c
10533  create mode 100644 tools/kvm/net/uip/csum.c
10534  create mode 100644 tools/kvm/net/uip/dhcp.c
10535  create mode 100644 tools/kvm/net/uip/icmp.c
10536  create mode 100644 tools/kvm/net/uip/ipv4.c
10537  create mode 100644 tools/kvm/net/uip/tcp.c
10538  create mode 100644 tools/kvm/net/uip/udp.c
10539  create mode 100644 tools/kvm/pci.c
10540  create mode 100644 tools/kvm/read-write.c
10541  create mode 100644 tools/kvm/symbol.c
10542  create mode 100644 tools/kvm/term.c
10543  create mode 100644 tools/kvm/tests/Makefile
10544  create mode 100644 tools/kvm/tests/boot/Makefile
10545  create mode 100644 tools/kvm/tests/boot/init.c
10546  create mode 100644 tools/kvm/tests/kernel/.gitignore
10547  create mode 100644 tools/kvm/tests/kernel/Makefile
10548  create mode 100644 tools/kvm/tests/kernel/README
10549  create mode 100644 tools/kvm/tests/kernel/kernel.S
10550  create mode 100644 tools/kvm/tests/pit/.gitignore
10551  create mode 100644 tools/kvm/tests/pit/Makefile
10552  create mode 100644 tools/kvm/tests/pit/README
10553  create mode 100644 tools/kvm/tests/pit/tick.S
10554  create mode 100644 tools/kvm/threadpool.c
10555  create mode 100644 tools/kvm/ui/sdl.c
10556  create mode 100644 tools/kvm/ui/vnc.c
10557  create mode 100644 tools/kvm/util.c
10558  create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
10559  create mode 100755 tools/kvm/util/generate-cmdlist.sh
10560  create mode 100755 tools/kvm/util/kvm-ifup-vbr0
10561  create mode 100644 tools/kvm/util/parse-options.c
10562  create mode 100644 tools/kvm/util/rbtree-interval.c
10563  create mode 100755 tools/kvm/util/set_private_br.sh
10564  create mode 100644 tools/kvm/util/strbuf.c
10565  create mode 100644 tools/kvm/virtio/9p-pdu.c
10566  create mode 100644 tools/kvm/virtio/9p.c
10567  create mode 100644 tools/kvm/virtio/balloon.c
10568  create mode 100644 tools/kvm/virtio/blk.c
10569  create mode 100644 tools/kvm/virtio/console.c
10570  create mode 100644 tools/kvm/virtio/core.c
10571  create mode 100644 tools/kvm/virtio/net.c
10572  create mode 100644 tools/kvm/virtio/pci.c
10573  create mode 100644 tools/kvm/virtio/rng.c
10574 Merging scsi-post-merge/merge-base:master
10575 $ git clone -s -l -n -q . ../rebase-tmp
10576 $ cd ../rebase-tmp
10577 $ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm
10578 From ../next
10579  * [new branch]      quilt/akpm -> akpm
10580 $ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base
10581 From ../next
10582  * [new branch]      quilt/akpm-base -> akpm-base
10583 $ git checkout akpm
10584 Switched to branch 'akpm'
10585 $ git rebase --onto master akpm-base
10586 First, rewinding head to replay your work on top of it...
10587 Applying: Because of x86-implement-strict-user-copy-checks-for-x86_64.patch
10588 Applying: When no floppy is found the module code can be released while a timer
10589 Applying: Fix kconfig unmet dependency warning.  BACKLIGHT_CLASS_DEVICE depends on
10590 Applying: The parameter's origin type is long.  On an i386 architecture, it can
10591 Applying: Since the commit below which added O_PATH support to the *at() calls, the
10592 Applying: Add support for Aspire 1410 BIOS v1.3314.  Fixes the following error:
10593 Applying: This makes the iris driver use the platform API, so it is properly exposed
10594 Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
10595 Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
10596 Applying: Cc: Ed Wildgoose <git@wildgooses.com>
10597 Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
10598 Applying: The x86 timer interrupt handler is the only handler not traced in the
10599 Applying: The current interrupt traces from irq_handler_entry and irq_handler_exit
10600 Applying: Don't allow everybody to use a modem.
10601 Applying: The address limit is already set in flush_old_exec() so this
10602 Applying: A call to va_copy() should always be followed by a call to va_end() in the
10603 Applying: Don't dereference em if it's NULL or an error pointer.
10604 Applying: Some messing with error codes to return 0 on out id's and match
10605 Applying: kbuf is a buffer that is local to this function, so all of the error paths
10606 Applying: fb_set_suspend() must be called with the console semaphore held, which
10607 Applying: hwmon was using an idr with a NULL pointer, so convert to an
10608 Applying: A straightforward looking use of idr for a device id.
10609 Applying: The address limit is already set in flush_old_exec() so this
10610 Applying: The address limit is already set in flush_old_exec() so this
10611 Applying: Add new check (assert_init) to make sure objects are initialized and
10612 Applying: del_timer_sync() calls debug_object_assert_init() to assert that a timer
10613 Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
10614 Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
10615 Applying: The address limit is already set in flush_old_exec() so those calls to
10616 Applying: When do pci remove/rescan on system that have more iommus, got
10617 Applying: The current implementation of dmi_name_in_vendors() is an invitation to
10618 Applying: For headers that get exported to userland and make use of u32 style
10619 Applying: Fix sparse warnings of right shift bigger than source value size:
10620 Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
10621 Applying: Some mangling of errors was necessary to maintain current interface.
10622 Applying: This does involve additional use of the spin lock in idr.c.  Is this an
10623 Applying: Instead of open coding this function use kstrtoul_from_user() directly.
10624 Applying: brd_make_request() always returns 0, which doesn't make much sense.
10625 Applying: The address limit is already set in flush_old_exec() so this assignment of
10626 Applying: Unbreak the alpha build.
10627 Applying: Unbreak alpha build.
10628 Applying: Unbreak alpha build.
10629 Applying: When we get corruption reports, it's useful to see if the kernel was
10630 Using index info to reconstruct a base tree...
10631 Falling back to patching base and 3-way merge...
10632 Auto-merging mm/slab.c
10633 CONFLICT (content): Merge conflict in mm/slab.c
10634 Failed to merge in the changes.
10635 Patch failed at 0047 When we get corruption reports, it's useful to see if the kernel was
10636
10637 When you have resolved this problem run "git rebase --continue".
10638 If you would prefer to skip this patch, instead run "git rebase --skip".
10639 To restore the original branch and stop rebasing run "git rebase --abort".
10640
10641 $ git rebase --continue
10642 Applying: When we get corruption reports, it's useful to see if the kernel was
10643 Applying: The basic idea behind cross memory attach is to allow MPI programs doing
10644 Applying: - Add x86_64 specific wire up
10645 Applying: > You might get some speed benefit by optimising for the small copies
10646 Applying: acct_isolated of compaction uses page_lru_base_type which returns only
10647 Applying: Change ISOLATE_XXX macro with bitwise isolate_mode_t type.  Normally,
10648 Applying: In async mode, compaction doesn't migrate dirty or writeback pages.  So,
10649 Applying: In __zone_reclaim case, we don't want to shrink mapped page.  Nonetheless,
10650 Applying: unmap_and_move() is one a big messy function.  Clean it up.
10651 Applying: radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was
10652 Applying: per-task block plug can reduce block queue lock contention and increase
10653 Applying: The tracing ring-buffer used this function briefly, but not anymore.
10654 Applying: After selecting a task to kill, the oom killer iterates all processes and
10655 Applying: Add the leading word "tmpfs" to the Kconfig string to make it blindingly
10656 Applying: When we get a bad_page bug report, it's useful to see what modules the
10657 Applying: Without swap, anonymous pages are not scanned.  As such, they should not
10658 Applying: fix comment
10659 Applying: The nr_force_scan[] tuple holds the effective scan numbers for anon and
10660 Applying: Some kernel components pin user space memory (infiniband and perf) (by
10661 Applying: Add comments to explain the page statistics field in the mm_struct.
10662 Applying: add missing ;
10663 Applying: Testing from the XFS folk revealed that there is still too much I/O from
10664 Applying: Lumpy reclaim worked with two passes - the first which queued pages for IO
10665 Applying: Direct reclaim should never writeback pages.  For now, handle the
10666 Applying: Direct reclaim should never writeback pages.  Warn if an attempt is made.
10667 Applying: It is preferable that no dirty pages are dispatched for cleaning from the
10668 Applying: Workloads that are allocating frequently and writing files place a large
10669 Applying: When direct reclaim encounters a dirty page, it gets recycled around the
10670 Applying: It's possible a zone watermark is ok when entering the balance_pgdat()
10671 Applying: printk_ratelimit() should not be used, because it shares ratelimiting
10672 Applying: memchr_inv() is mainly used to check whether the whole buffer is filled
10673 Applying: Use newly introduced memchr_inv() for page verification.
10674 Applying: A shrinker function can return -1, means that it cannot do anything
10675 Applying: Use atomic-long operations instead of looping around cmpxchg().
10676 Applying: massage atomic.h inclusions
10677 Applying: The /proc/vmallocinfo shows information about vmalloc allocations in
10678 Applying: Commit 645747462435 ("vmscan: detect mapped file pages used only once")
10679 Applying: Logic added in commit 8cab4754d24a0 ("vmscan: make mapped executable pages
10680 Applying: SPARC32 require access to the start address.  Add a new helper
10681 Applying: With the NO_BOOTMEM symbol added architectures may now use the following
10682 Applying: Using "- 1" relies on the old_end to be page aligned and PAGE_SIZE > 1,
10683 Applying: This replaces ptep_clear_flush() with ptep_get_and_clear() and a single
10684 Applying: This adds THP support to mremap (decreases the number of split_huge_page()
10685 Applying: coding-style nitpicking
10686 Applying: Cc: Andrea Arcangeli <aarcange@redhat.com>
10687 Applying: Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10688 Applying: vmstat_text is only available when PROC_FS or SYSFS is enabled.  This
10689 Applying: reduce ifdeffery
10690 Applying: Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
10691 Applying: Make the security_inode_init_security() initxattrs arg const, to match the
10692 Applying: The current implementation of the /dev/hpet driver couples opening the
10693 Applying: smp_call_function() only lets all other CPUs execute a specific function,
10694 Applying: auto_demotion_disable is called only for online CPUs.  For hotplugged
10695 Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:
10696 Applying: Strict user copy checks are only really supported on x86_32 even though
10697 Applying: The help text for this config is duplicated across the x86, parisc, and
10698 Applying: s/lib-/obj-/ for usercopy.o
10699 Applying: After an "unexpected" reboot, I found this Oops in my logs:
10700 Applying: In the move of the lis3 driver, the hp_accel.c file got dropped from the
10701 Applying: Add axis correction for HP EliteBook 2730p.
10702 Applying: Add axis correction for HP EliteBook 8540w.
10703 Applying: Add axis correction for HP ProBook 6555b.
10704 Applying: Adapt the help text for CONFIG_HP_ACCEL to the move of
10705 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
10706 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
10707 Applying: Change exported functions to use the device given as parameter
10708 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
10709 Applying: We are enabling some power features on medfield.  To test suspend-2-RAM
10710 Applying: We are enabling some power features on medfield.  To test suspend-2-RAM
10711 Applying: We are enabling some power features on medfield.  To test suspend-2-RAM
10712 Applying: Cc: Al Viro <viro@zeniv.linux.org.uk>
10713 Applying: Add V2 of the LED driver for a single timer channel for the TPU hardware
10714 Applying: include linux/module.h
10715 Applying: The memory for struct led_trigger should be kfreed in the
10716 Applying: Currently termination logic (\0 or \n\0) is hardcoded in _kstrtoull(),
10717 Applying: Add support for slice by 8 to existing crc32 algorithm.  Also modify
10718 Applying: don't include asm/msr.h
10719 Applying: epoll can acquire recursively acquire ep->mtx on multiple "struct
10720 Applying: Currently in oprofilefs, files that use ulong_fops mis-handle writes of
10721 Applying: This is the one use of an ida that doesn't retry on receiving -EAGAIN.
10722 Applying: One can get this information from minix/inode.c, but adding the
10723 Applying: The memcg code sometimes uses "struct mem_cgroup *mem" and sometimes uses
10724 Applying: Before calling schedule_timeout(), task state should be changed.
10725 Applying: Signed-off-by: Bob Liu <lliubbo@gmail.com>
10726 Applying: While back-porting Johannes Weiner's patch "mm: memcg-aware global
10727 Applying: If somebody is touching data too early, it might be easier to diagnose a
10728 Applying: Both mem_cgroup_charge_statistics() and mem_cgroup_move_account() were
10729 Applying: On reading sysctl dirs we should return -EISDIR instead of -EINVAL.
10730 Applying: Force this on for -next/mm testing purposes.
10731 Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
10732 Applying: After merging the akpm tree, today's linux-next build (lost of them)
10733 Applying: The discovered bit in PGCCSR register indicates if the device has been
10734 Applying: Add RapidIO mport driver for IDT TSI721 PCI Express-to-SRIO bridge device.
10735 Applying: When I tried to send a patch to remove it, Andi told me we still need to
10736 Applying: A default echo function has been provided so it is no longer an error when
10737 Applying: This client driver allows you to use a GPIO pin as a source for PPS
10738 Applying: remove unneeded cast of void*
10739 Applying: Straightforward.  As an aside, the ida_init calls are not needed as far as
10740 Applying: Simply creates one point to call the w1 interface.
10741 Applying: Adds a nolock function to the w1 interface to avoid locking the
10742 Applying: Fixes the deadlock when inserting and removing the ds2780.
10743 $ cd ../next
10744 $ git fetch -f ../rebase-tmp akpm:akpm
10745 From ../rebase-tmp
10746  + 376e615...2641bf6 akpm       -> akpm  (forced update)
10747 $ rm -rf ../rebase-tmp
10748 Merging akpm
10749 $ git merge --no-ff akpm
10750 Removing arch/sparc/lib/usercopy.c
10751 Removing drivers/leds/leds-alix2.c
10752 Merge made by recursive.
10753  Documentation/DocBook/debugobjects.tmpl            |   50 +
10754  Documentation/feature-removal-schedule.txt         |   35 -
10755  Documentation/kernel-parameters.txt                |    8 +
10756  Documentation/rapidio/tsi721.txt                   |   49 +
10757  .../trace/postprocess/trace-vmscan-postprocess.pl  |    8 +-
10758  MAINTAINERS                                        |    1 +
10759  arch/arm/include/asm/processor.h                   |    1 -
10760  arch/arm/mach-ux500/mbox-db5500.c                  |    2 +-
10761  arch/ia64/include/asm/processor.h                  |    1 -
10762  arch/parisc/Kconfig                                |    1 +
10763  arch/parisc/Kconfig.debug                          |   14 -
10764  arch/parisc/include/asm/processor.h                |    2 -
10765  arch/parisc/kernel/process.c                       |    1 -
10766  arch/powerpc/include/asm/systbl.h                  |    2 +
10767  arch/powerpc/include/asm/unistd.h                  |    4 +-
10768  arch/s390/Kconfig                                  |    1 +
10769  arch/s390/Kconfig.debug                            |   14 -
10770  arch/s390/lib/Makefile                             |    1 -
10771  arch/sparc/kernel/process_32.c                     |    3 +-
10772  arch/sparc/kernel/process_64.c                     |    3 -
10773  arch/sparc/lib/Makefile                            |    1 -
10774  arch/sparc/lib/usercopy.c                          |    8 -
10775  arch/tile/Kconfig                                  |    8 +-
10776  arch/tile/include/asm/uaccess.h                    |    7 +-
10777  arch/tile/lib/uaccess.c                            |    8 -
10778  arch/unicore32/include/asm/processor.h             |    1 -
10779  arch/x86/Kconfig                                   |   15 +
10780  arch/x86/Kconfig.debug                             |   14 -
10781  arch/x86/ia32/ia32entry.S                          |    2 +
10782  arch/x86/include/asm/irq_vectors.h                 |   50 +
10783  arch/x86/include/asm/uaccess_64.h                  |   12 +-
10784  arch/x86/include/asm/unistd_32.h                   |    4 +-
10785  arch/x86/include/asm/unistd_64.h                   |    4 +
10786  arch/x86/kernel/apic/apic.c                        |    7 +
10787  arch/x86/kernel/cpu/mcheck/therm_throt.c           |    3 +
10788  arch/x86/kernel/cpu/mcheck/threshold.c             |    3 +
10789  arch/x86/kernel/e820.c                             |   59 +-
10790  arch/x86/kernel/irq.c                              |    6 +-
10791  arch/x86/kernel/irq_work.c                         |    3 +
10792  arch/x86/kernel/smp.c                              |    7 +
10793  arch/x86/kernel/syscall_table_32.S                 |    2 +
10794  arch/x86/kernel/time.c                             |   15 +-
10795  arch/x86/kernel/traps.c                            |    3 +
10796  arch/x86/lib/usercopy_32.c                         |    6 -
10797  arch/x86/mm/mmap.c                                 |    4 +-
10798  arch/x86/mm/tlb.c                                  |    3 +
10799  arch/x86/platform/Makefile                         |    1 +
10800  arch/x86/platform/geode/Makefile                   |    1 +
10801  arch/x86/platform/geode/alix.c                     |  142 ++
10802  arch/x86/platform/iris/iris.c                      |   67 +-
10803  drivers/base/node.c                                |    6 +-
10804  drivers/block/brd.c                                |    2 +-
10805  drivers/block/floppy.c                             |    8 +-
10806  drivers/char/hpet.c                                |   56 +-
10807  drivers/firmware/dmi_scan.c                        |    6 +-
10808  drivers/gpu/drm/Kconfig                            |    1 +
10809  drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c      |   34 +-
10810  drivers/gpu/vga/vgaarb.c                           |   18 +-
10811  drivers/hwmon/hwmon.c                              |   32 +-
10812  drivers/hwmon/ibmaem.c                             |   47 +-
10813  drivers/idle/intel_idle.c                          |   59 +-
10814  drivers/infiniband/core/umem.c                     |    6 +-
10815  drivers/infiniband/hw/ipath/ipath_user_pages.c     |    6 +-
10816  drivers/infiniband/hw/qib/qib_user_pages.c         |    4 +-
10817  drivers/iommu/dmar.c                               |    7 +-
10818  drivers/iommu/intel-iommu.c                        |  177 ++-
10819  drivers/leds/Kconfig                               |   20 +-
10820  drivers/leds/Makefile                              |    2 +-
10821  drivers/leds/led-triggers.c                        |    5 +-
10822  drivers/leds/leds-alix2.c                          |  239 --
10823  drivers/leds/leds-renesas-tpu.c                    |  344 +++
10824  drivers/misc/lis3lv02d/lis3lv02d.c                 |  389 ++--
10825  drivers/misc/lis3lv02d/lis3lv02d.h                 |    9 +-
10826  drivers/misc/lis3lv02d/lis3lv02d_i2c.c             |   11 +-
10827  drivers/misc/lis3lv02d/lis3lv02d_spi.c             |    2 +-
10828  drivers/oprofile/oprofilefs.c                      |    5 +-
10829  drivers/platform/x86/Kconfig                       |    2 +-
10830  drivers/platform/x86/acerhdf.c                     |    1 +
10831  drivers/platform/x86/hp_accel.c                    |   10 +-
10832  drivers/power/ds2780_battery.c                     |   86 +-
10833  drivers/pps/clients/Kconfig                        |    9 +
10834  drivers/pps/clients/Makefile                       |    1 +
10835  drivers/pps/clients/pps-gpio.c                     |  227 ++
10836  drivers/pps/clients/pps-ktimer.c                   |   12 -
10837  drivers/pps/clients/pps_parport.c                  |    9 -
10838  drivers/pps/kapi.c                                 |   20 +-
10839  drivers/rapidio/Kconfig                            |    6 +-
10840  drivers/rapidio/Makefile                           |    1 +
10841  drivers/rapidio/devices/Kconfig                    |   10 +
10842  drivers/rapidio/devices/Makefile                   |    5 +
10843  drivers/rapidio/devices/tsi721.c                   | 2337 ++++++++++++++++++++
10844  drivers/rapidio/devices/tsi721.h                   |  762 +++++++
10845  drivers/rapidio/rio-scan.c                         |    4 +-
10846  drivers/rtc/class.c                                |   32 +-
10847  drivers/scsi/aacraid/commctrl.c                    |    1 +
10848  drivers/scsi/megaraid.c                            |    8 +-
10849  drivers/scsi/osd/osd_uld.c                         |   22 +-
10850  drivers/scsi/sd.c                                  |   32 +-
10851  drivers/scsi/sg.c                                  |   25 +-
10852  drivers/staging/rts5139/ms.c                       |    1 +
10853  drivers/staging/rts5139/rts51x_scsi.c              |    1 +
10854  drivers/staging/rts5139/xd.c                       |    1 +
10855  drivers/video/fbmem.c                              |   24 +-
10856  drivers/w1/slaves/w1_ds2760.c                      |   48 +-
10857  drivers/w1/slaves/w1_ds2780.c                      |   96 +-
10858  drivers/w1/slaves/w1_ds2780.h                      |    2 +
10859  fs/Kconfig                                         |    2 +-
10860  fs/aio.c                                           |    4 +-
10861  fs/btrfs/inode.c                                   |    3 +-
10862  fs/compat.c                                        |    7 +-
10863  fs/eventpoll.c                                     |   25 +-
10864  fs/ext4/ext4.h                                     |    7 +-
10865  fs/ext4/ialloc.c                                   |    4 +-
10866  fs/ext4/inode.c                                    |    6 +-
10867  fs/logfs/logfs.h                                   |    1 -
10868  fs/logfs/super.c                                   |   22 -
10869  fs/namei.c                                         |   19 +-
10870  fs/ocfs2/ocfs2.h                                   |   47 +
10871  fs/ocfs2/quota_local.c                             |   10 +-
10872  fs/proc/proc_sysctl.c                              |    1 +
10873  fs/proc/task_mmu.c                                 |    2 +
10874  fs/read_write.c                                    |    8 +-
10875  fs/stat.c                                          |    5 +-
10876  fs/xfs/xfs_aops.c                                  |    8 +-
10877  include/linux/cgroup.h                             |    2 +-
10878  include/linux/compat.h                             |    3 +-
10879  include/linux/debugobjects.h                       |    6 +
10880  include/linux/dmar.h                               |    5 +
10881  include/linux/fs.h                                 |    9 +-
10882  include/linux/hpet.h                               |    1 +
10883  include/linux/huge_mm.h                            |    5 +
10884  include/linux/jiffies.h                            |    2 +-
10885  include/linux/leds-renesas-tpu.h                   |   14 +
10886  include/linux/magic.h                              |   10 +-
10887  include/linux/memblock.h                           |    1 +
10888  include/linux/memcontrol.h                         |   37 +-
10889  include/linux/mm.h                                 |    1 +
10890  include/linux/mm_types.h                           |   11 +-
10891  include/linux/mmzone.h                             |   13 +
10892  include/linux/namei.h                              |    1 +
10893  include/linux/pps-gpio.h                           |   32 +
10894  include/linux/rio_ids.h                            |    1 +
10895  include/linux/security.h                           |    2 +-
10896  include/linux/shrinker.h                           |    2 +-
10897  include/linux/string.h                             |    1 +
10898  include/linux/swap.h                               |    7 +-
10899  include/linux/syscalls.h                           |   13 +
10900  include/linux/sysdev.h                             |   14 +
10901  include/linux/vmalloc.h                            |    1 +
10902  include/linux/writeback.h                          |    2 -
10903  include/scsi/scsi_netlink.h                        |    2 +-
10904  include/trace/events/irq_vectors.h                 |   56 +
10905  include/trace/events/vmscan.h                      |    8 +-
10906  init/Kconfig                                       |    4 +-
10907  init/do_mounts.c                                   |   48 +-
10908  ipc/shm.c                                          |    2 +-
10909  kernel/audit.c                                     |    5 +-
10910  kernel/cgroup.c                                    |   18 +-
10911  kernel/events/core.c                               |    6 +-
10912  kernel/kprobes.c                                   |    2 +-
10913  kernel/printk.c                                    |    7 +
10914  kernel/sys_ni.c                                    |    4 +
10915  kernel/time.c                                      |    2 +-
10916  kernel/timer.c                                     |   54 +-
10917  lib/Kconfig.debug                                  |   18 +
10918  lib/Makefile                                       |    1 +
10919  lib/crc32.c                                        |  370 +++-
10920  lib/crc32defs.h                                    |   16 +-
10921  lib/debugobjects.c                                 |   33 +
10922  lib/gen_crc32table.c                               |   59 +-
10923  lib/kstrtox.c                                      |   75 +-
10924  lib/kstrtox.h                                      |    8 +
10925  lib/radix-tree.c                                   |   10 +-
10926  lib/string.c                                       |   54 +
10927  {arch/s390/lib => lib}/usercopy.c                  |    0
10928  lib/vsprintf.c                                     |   33 +-
10929  mm/Kconfig                                         |    3 +
10930  mm/Makefile                                        |    3 +-
10931  mm/compaction.c                                    |   24 +-
10932  mm/debug-pagealloc.c                               |   12 +-
10933  mm/huge_memory.c                                   |   45 +
10934  mm/memblock.c                                      |    6 +
10935  mm/memcontrol.c                                    |  994 +++++-----
10936  mm/mempolicy.c                                     |    4 +-
10937  mm/migrate.c                                       |   75 +-
10938  mm/mremap.c                                        |   42 +-
10939  mm/oom_kill.c                                      |    5 +-
10940  mm/page-writeback.c                                |  122 +-
10941  mm/page_alloc.c                                    |    1 +
10942  mm/page_cgroup.c                                   |    3 +-
10943  mm/process_vm_access.c                             |  496 +++++
10944  mm/slab.c                                          |    8 +-
10945  mm/slub.c                                          |   49 +-
10946  mm/vmalloc.c                                       |   65 +-
10947  mm/vmscan.c                                        |  225 ++-
10948  mm/vmstat.c                                        |    1 +
10949  security/keys/compat.c                             |    2 +-
10950  security/keys/keyctl.c                             |    2 +-
10951  security/selinux/selinuxfs.c                       |   14 +-
10952  199 files changed, 7282 insertions(+), 2148 deletions(-)
10953  create mode 100644 Documentation/rapidio/tsi721.txt
10954  delete mode 100644 arch/sparc/lib/usercopy.c
10955  create mode 100644 arch/x86/platform/geode/Makefile
10956  create mode 100644 arch/x86/platform/geode/alix.c
10957  delete mode 100644 drivers/leds/leds-alix2.c
10958  create mode 100644 drivers/leds/leds-renesas-tpu.c
10959  create mode 100644 drivers/pps/clients/pps-gpio.c
10960  create mode 100644 drivers/rapidio/devices/Kconfig
10961  create mode 100644 drivers/rapidio/devices/Makefile
10962  create mode 100644 drivers/rapidio/devices/tsi721.c
10963  create mode 100644 drivers/rapidio/devices/tsi721.h
10964  create mode 100644 include/linux/leds-renesas-tpu.h
10965  create mode 100644 include/linux/pps-gpio.h
10966  create mode 100644 include/trace/events/irq_vectors.h
10967  create mode 100644 lib/kstrtox.h
10968  rename {arch/s390/lib => lib}/usercopy.c (100%)
10969  create mode 100644 mm/process_vm_access.c