]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Add linux-next specific files for 20110817 next-20110817
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Aug 2011 04:23:01 +0000 (14:23 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Aug 2011 04:23:01 +0000 (14:23 +1000)
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Next/SHA1s [new file with mode: 0644]
Next/Trees [new file with mode: 0644]
Next/merge.log [new file with mode: 0644]
Next/quilt-import.log [new file with mode: 0644]
localversion-next [new file with mode: 0644]

diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644 (file)
index 0000000..0950384
--- /dev/null
@@ -0,0 +1,201 @@
+Name           SHA1
+----           ----
+origin         4bc9b0796b5abe6dffa16faaa7f6b9b25dd4b251
+fixes          c2f340a69cabe0fb7b9f02d1a2495927db225a06
+kbuild-current 322a8b034003c0d46d39af85bf24fee27b902f48
+arm-current    93ee7a9340d64f20295aacc3fb6a22b759323280
+m68k-current   d3690f8b713f9710e68214ca38fb8b07b587a2a7
+powerpc-merge  a85fe3fce84335f83be17a7659bfbb3a71dc2fc4
+52xx-and-virtex-current        c49f8789f532ae39019135ca038e9bc0d15aaa4a
+sparc-current  178a29600340bef5b13cd4157053679debe35351
+scsi-rc-fixes  e6a99d312687a42c077a9b8cb5e757f186edb1b9
+net-current    588dc91151d99e9307c2f9a8468453274fe43ecd
+sound-current  c012cdc858db36ff2314469930bfcfb00eef6f29
+pci-current    debc3b778508f59696ff188f0feca271dcbfa7d9
+wireless-current       16a9d06c753abc44f66f88e03bbecb3f1e45d71b
+driver-core.current    f9e0b159dbff693bacb64a929e04f442df985b50
+tty.current    b882fc1b03d46e67ffe06133f4f4532db6e8dd0d
+usb.current    93ee7a9340d64f20295aacc3fb6a22b759323280
+staging.current        93ee7a9340d64f20295aacc3fb6a22b759323280
+cpufreq-current        2f84dd70916ccadd25e94d28363182a978f569b6
+input-current  3b48c91cdf2d6827ce315b3b112310fa02198db0
+md-current     58c54fcca3bac5bf9290cfed31c76e4c4bfbabaf
+audit-current  def57543418a5f47debae28a0a9dea2effc11692
+crypto-current acdca31dba86c4f426460aa000d13930a00549b7
+ide-curent     0302899e144296d6ce8cb3679a9a42d5c6436910
+dwmw2          244dc4e54b73567fae7f8fd9ba56584be9375442
+sh-current     e80ca144ea902efa7aed446780fd9fad421fd8d3
+rmobile-current        fe43756143c4efa6f8fdef07aa3ca4dc0be24ada
+fbdev-current  b63d10130e68aa6480cc1b2483d7c5ce57a05481
+devicetree-current     89272b8c0d427021bed70b1b83e1a16be375ccf5
+spi-current    620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc
+arm            9fd0af949610ed09f9e0f7a121c7e734c20e6593
+arm-lpae       5a70cc044e74e72550c806a1b0fc82fc11130dc3
+arm-soc                696314cf53b7b2d1f91af6da259533eb9611e7bf
+at91           c5efefac659870744f6e203e28abd095ac0f590b
+davinci                fe0d42203cb5616eeff68b14576a0f7e2dd56625
+i.MX           95b6886526bb510b8370b625a49bc0ab3b8ff10f
+linux-spec     5111711d3ed8f4f1012cac3ec3f2b463b549fbfd
+msm            f2ba30560a71b39b4ad3230f5deb96fefaaa6417
+omap           322a8b034003c0d46d39af85bf24fee27b902f48
+pxa            19d6c13b56a78b3757e747f469285c2a546d634a
+samsung                9edb240696bacd53f4331119d2dfd13d4cd4852f
+s5p            e167a4f31da79d15655493871682d556a8f538b9
+tegra          681e6edc25a452e26e263386caaa4afb02b5f131
+ux500-core     322a8b034003c0d46d39af85bf24fee27b902f48
+xilinx         b85a3ef4ac65169b65fd2fe9bec7912bbf475ba4
+blackfin       3312cd952ff6d540605ffcfe64913b523502e646
+cris           ea78f5b898555ddfbab494c7755130362fe3cf46
+ia64           62cc6adeea8c5787a2fa7d80f496647e90c82a61
+m68k           d691b15549ae34e38972e18d90fb2ec28e052269
+m68knommu      4c54431ab85066f2601beac3d36e848d51c80d5d
+microblaze     95b6886526bb510b8370b625a49bc0ab3b8ff10f
+mips           7fbb6fceccf7eaa94fd6ff891957f90ca7f2672c
+openrisc       19f9d392365113f74286b1721c7c032c12cf5abd
+parisc         205e9a2106b934ea39049bab28f0896c17a2cb30
+powerpc                53d1e658df6e26d62500410719aaee2b82067c03
+4xx            9fcd768d0cc88b41ea459e25d2db12d3e25fa9dd
+52xx-and-virtex        c1395f4cf4a1944236f0f28cdf718c4aacc88f2d
+galak          f1f4ee01c0d3dce0e3aa7d04e4332677db7af478
+s390           a59d9b0b6f8f5eb06e1c4096ca81aaba5ef42056
+sh             9f0fa7991af382bfa8c9575d2457a0b6ad03ac4c
+rmobile                fe43756143c4efa6f8fdef07aa3ca4dc0be24ada
+sparc          1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c
+tile           0124538885485603ac1fbabe3aff570147f7c8a3
+unicore32      aa5eb56cf1bacc45ba31404b5dc8f3464c0d0289
+xtensa         95b6886526bb510b8370b625a49bc0ab3b8ff10f
+ceph           a0feec750e1664f17862c503a241dcb11823bc86
+cifs           fa71f447065f676157ba6a2c121ba419818fc559
+configfs       420118caa32c8ccdf9fce5a623b9de3f951573c5
+ecryptfs       985ca0e626e195ea08a1a82b8dbeb6719747429a
+ext3           2ac232f37fa0e8551856a575fe299c47b65b4d66
+ext4           1fc95c49bde577ad952160ea7ed875e0b2af55fe
+fatfs          1adffbae22332bb558c2a29de19d9aca391869f6
+fuse           478e0841b3dce3edc2c67bf0fc51af30f582e9e2
+gfs2           bd3a160369f94e54af8e20c9d4cc35a84666b94a
+hfsplus                6596528e391ad978a6a120142cba97a1d7324cb6
+jfs            1c8007b0769d37aa5fcb343b383b0af89ade2f71
+logfs          cc417cd06e2f496d64ac46041bd08287c677ad3d
+nfs            910ac68a2b80c7de95bc8488734067b1bb15d583
+nfsd           0c12eaffdf09466f36a9ffe970dda8f4aeb6efc0
+nilfs2         93ee7a9340d64f20295aacc3fb6a22b759323280
+ocfs2          730e663bd82c1a10a85ff00728d34152a5a67ec8
+omfs           31be83aeaee22fa165862ad449c7131ceaf1cf91
+squashfs       cc6d3497141adedb71de8ddce62bf4cd4817832d
+udf            6f644e5f97cc8dcb8dc7133562159cc20d27c38f
+v9fs           c0be173c8c0ca5cb214c3c0c41356067b04eae8f
+ubifs          cc8f9b99ed9b728e4dd154337a4332cda9e6d38b
+xfs            c59d87c460767bc35dafd490139d3cfe78fb8da4
+vfs            206b1d09a56dcd2db1052245c4131879c410eaf8
+vfs-scale      32385c7cf60a78375b63afc4f02001df84dfd1a0
+pci            9e8bf93a7f416a3fa8fb6d76177d90e67bd45496
+hid            90d025f5074a12c2deb50c14ff269c1e720be2cc
+i2c            93ee7a9340d64f20295aacc3fb6a22b759323280
+bjdooks-i2c    07e729ce894487e92405d3b221cffe587420a376
+jdelvare-hwmon 93ee7a9340d64f20295aacc3fb6a22b759323280
+hwmon-staging  66a89b2164e2d30661edbd1953eacf0594d8203a
+kernel-doc     02f8c6aee8df3cdc935e9bdd4f2d020306035dbe
+docs           52884b2be5aa9a4a8f7a62525051c095718b014f
+v4l-dvb                f7acc4bb86594d78aa41c07b7670df3e03738b18
+kbuild         245a11ed4477f55cf23b9c6ed9cc5b20809ffa23
+kconfig                eae1c36aea9cfe4d123b8af3ffe54109c6579810
+ide            56a210526adb2854d5b7c398a40260720390ee05
+libata         2f84dd70916ccadd25e94d28363182a978f569b6
+infiniband     22cfb0bf6721bb1f865f67bc21e3c36c272faf36
+acpi           fb9d40270cc7680856461bccb1eefee01478df63
+idle-test      a0bfa1373859e9d11dc92561a8667588803e42d8
+powertools     d30c4b7a87e8b19583d5ef1402d9b38f51e30f44
+cpupowerutils  9ee31f618a3c8209b2bd4bedd71fd5f2be7786bd
+ieee1394       aaff12039ffd812d0c8bbff50b87b6f1f09bec3e
+ubi            01dc9cc314ad1009f5b7356399b386015fdb0400
+dlm            10d1459fafbb02a18e7bc8f2c384a9e973560b00
+swiotlb                25b84fa6892ba6517f292a6254bed39de77da1b5
+ibft           f1b1e067b999aa141229a2a524b7be080f999795
+scsi           d272281c390eb6c3f1e70ed0337c9e619d99cd9c
+iscsi-target   dcd998ccdbf74a7d8fe0f0a44e85da1ed5975946
+slave-dma      ef298c21c0d9c06ed89ea2fa724c3a018acfff39
+async_tx       21ef4b8b7a7d59a995bf44382de38c95587767d4
+net            19e2f6fe9601ca5c846b7163e6d6d00f87b34760
+wireless       af2bf4b4ee58d262a9a5c1d4ce6f81835058f8b5
+bluetooth      a6a7f878a274fd4995a9f0acb301acd393567aa9
+mtd            3f303103b884ca577908d3e5c0650ad12e40c586
+l2-mtd         3ef7c9905acb7db155099dba4b3d01a1ce4527bc
+crypto         4619b6bdb71362d95810f475cc61a6de9d0b1904
+sound          b2db38d0e81cbb9c6e8520fc3172f54f71e92335
+sound-asoc     f049ffb3f8cf682df405f029914938f95d667695
+cpufreq                7e87e5425c76c9f81adf52a9a5e151179fa4263f
+rr             69010e5a92b07451dc0922c2417e7e586f895e76
+input          c17ca3f5a2c98784739bbbcc3f6b6ee177f4f201
+input-mt       02f8c6aee8df3cdc935e9bdd4f2d020306035dbe
+lsm            ca05a99a54db1db5bca72eccb5866d2a86f8517f
+block          4853abaae7e4a2af938115ce9071ef8684fb7af4
+device-mapper  c0e517ae52bb4a1c0dc446b02ca51d090e319d8b
+embedded       4744b43431e8613f920c5cba88346756f53c5165
+firmware       6e03a201bbe8137487f340d26aa662110e324b20
+pcmcia         74411c04540404a1ff29d254584ef393e150aeda
+battery                f8c63918c9a3004bd052fa4af08aa1cefbcd79ac
+leds           a4b4433c511cf4361bb0afabba69e16632002d32
+backlight      67e67df8da723debf24f7763605776891203e8d5
+mmc            1a39a8d787c90144f47562365dc91454e862c122
+kgdb           cab0e03ea1bde9b9199235e3d7cdf6d08334733e
+slab           c2fedb1adfcdfff1454ee4bd2399270f2a7166e0
+uclinux                6e86841d05f371b5b9b86ce76c02aaee83352298
+md             f5d912d100ea7078bd28668aa3265ebd2bb53a84
+mfd            e178ccb33569da17dc897a08a3865441b813bdfb
+hdlc           4a6908a3a050aacc9c3a2f36b276b46c0629ad91
+drm            bcc65fd8e929a9d9d34d814d6efc1d2793546922
+fbdev          fa514fbc57419505d0e9423dbb8742f2775f882e
+viafb          5dd72f12df00cbabc16de770b79b17ced63138be
+omap_dss2      56299378726d5f2ba8d3c8cbbd13cb280ba45e4f
+voltage                fc999b83799074832367d3cfd724c341c849a7da
+security       09f464bf0961aba3cd917d4939597bafb269fb95
+selinux                ded509880f6a0213b09f8ae7bef84acb16eaccbf
+lblnet         7e27d6e778cd87b6f2415515d7127eba53fe5d02
+agp            7f32e2e05c240201b42b58dec1b4a072e2127792
+watchdog       518c579c263cb6bfc7c42e30940cb8aa72648600
+bdev           feaf3848a813a106f163013af6fcf6c4bfec92d9
+dwmw2-iommu    f0f52a9463839c52a63c05d6e7d4a330d94a9794
+cputime                96830a57de1197519b62af6a4c9ceea556c18c3d
+osd            e70f11e701c5db211f98a785880e8eca5250bbb4
+jc_docs                5c050fb96380a87a85aad9084b68fdcd2b84c193
+nommu          0ce790e7d736cedc563e1fb4e998babf5a4dbc3d
+trivial                6580a67b9b67a9d3aac0ad5cb0b775cba6f9a1cf
+audit          def57543418a5f47debae28a0a9dea2effc11692
+pm             9584fc77cf99cbf9b08239a8f0a45bdbc033fdca
+apm            51414d41084496aaefd06d7f19eb8206e8bfac2d
+fsnotify       ef9bf3b7144bee6ce1da5616015cabc8771206af
+irda           94d57c4cfaa43e29ca5fa5ff874048cfc67276f5
+i7core_edac    24c70a0e06fbadbe66fbb26f41b64153c5c1efbd
+i7300_edac     c74040a22704c873388906bc4f26c8e435f4ffbe
+devicetree     79787f21b37b2cd359689384239bc5385aef9298
+spi            50658b6602dad6dc76c226917f5d8cec0f680eab
+gpio           867f503d580eafbcc342141bae53cf6a27d413b1
+tip            8e90efd32e55cd625e4b50471ea9b01c46afb210
+rcu            0697a6c28e520ef4ce3ce9b7532e4374d47be90c
+kvm            df3d8ae1f8780166a16dd7d08b4842a4d5b5f2b4
+oprofile       4d4abdcb1dee03a4f9d6d2021622ed07e14dfd17
+ptrace         eac1b5e57d7abc836e78fd3fbcf77dbeed01edc9
+xen            09b15c5917a6438307f29dbf0d7a708e869b0710
+xen-two                aec65e04f4f31b707ba68e39206b20928a3919e8
+xen-pvhvm      b056b6a0144de90707cd22cf7b4f60bf69c86d59
+edac-amd       8c6da9e4955d72748a85e360cbae4c1d676a4978
+percpu         bc499f9bdc7009a2c7045885960053bdf58f5655
+workqueues     9c5a2ba70251ecaab18c7a83e38b3c620223476c
+sfi            5b026c4e3af52fda22c9313a3388344f82f3ba15
+asm-generic    35dbc0e020c6587f78a6c17693beca73aead7b54
+drivers-x86    15b956a0b5651bbb1217ec374fdd67291dabb2af
+hwpoison       46e387bbd82d438b9131e237e6e2cb55a825da49
+sysctl         c2f5631aceb700224d0cfe0465cee18df564a29e
+namespace      7e05c935c50ab5c9ee488c411252076825ec2919
+regmap         449e38427fe57a6120fecd1051981c89ee862b3d
+driver-core    322a8b034003c0d46d39af85bf24fee27b902f48
+tty            322a8b034003c0d46d39af85bf24fee27b902f48
+usb            93ee7a9340d64f20295aacc3fb6a22b759323280
+staging                93ee7a9340d64f20295aacc3fb6a22b759323280
+bkl-config     4ba8216cd90560bc402f52076f64d8546e8aefcb
+tmem           4cc79b3c0519fa50270c72be2ce480c59669eba8
+writeback      bcff25fc8aa47a13faff8b4b992589813f7b450a
+arm-dt         ede338f4ce2fb5ee99d18751df32fbd3b10df268
+scsi-post-merge        c66ac9db8d4ad9994a02b3e933ea2ccc643e1fe5
+moduleh                3e8e5642c4e67314606f10c67046c257a40b04e0
+akpm           158954085b435e17a68c3da334b33aa6c74ccbb1
diff --git a/Next/Trees b/Next/Trees
new file mode 100644 (file)
index 0000000..cd252be
--- /dev/null
@@ -0,0 +1,203 @@
+Trees included into this release:
+
+Name           Type    URL
+----           ----    ---
+origin         git     git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master
+fixes          git     -#fixes
+kbuild-current git     git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#rc-fixes
+arm-current    git     ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master
+m68k-current   git     git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus
+powerpc-merge  git     git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge
+52xx-and-virtex-current        git     git://git.secretlab.ca/git/linux-2.6#powerpc/merge
+sparc-current  git     git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master
+scsi-rc-fixes  git     git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master
+net-current    git     git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master
+sound-current  git     git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus
+pci-current    git     git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus
+wireless-current       git     git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git#master
+driver-core.current    git     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-linus
+tty.current    git     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-linus
+usb.current    git     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-linus
+staging.current        git     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-linus
+cpufreq-current        git     git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes
+input-current  git     git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus
+md-current     git     git://neil.brown.name/md#for-linus
+audit-current  git     git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus
+crypto-current git     git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6#master
+ide-curent     git     git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master
+dwmw2          git     git://git.infradead.org/users/dwmw2/random-2.6.git#master
+sh-current     git     git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#sh-fixes-for-linus
+rmobile-current        git     git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-fixes-for-linus
+fbdev-current  git     git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git#fbdev-fixes-for-linus
+devicetree-current     git     git://git.secretlab.ca/git/linux-2.6#devicetree/merge
+spi-current    git     git://git.secretlab.ca/git/linux-2.6#spi/merge
+arm            git     ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#for-next
+arm-lpae       git     git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm.git#for-next
+arm-soc                git     git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc.git#for-next
+at91           git     git://github.com/at91linux/linux-2.6-at91.git#at91-next
+davinci                git     git://gitorious.org/linux-davinci/linux-davinci.git#davinci-next
+i.MX           git     git://git.pengutronix.de/git/imx/linux-2.6.git#for-next
+linux-spec     git     http://git.kernel.org/pub/scm/linux/kernel/git/dwalker/linux-spec#for-next
+msm            git     git://codeaurora.org/quic/kernel/davidb/linux-msm.git#for-next
+omap           git     git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next
+pxa            git     git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next
+samsung                git     git://git.fluff.org/bjdooks/linux.git#next-samsung
+s5p            git     git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next
+tegra          git     git://android.git.kernel.org/kernel/tegra.git#for-next
+ux500-core     git     git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git#ux500-core
+xilinx         git     git://git.xilinx.com/linux-2.6-xlnx.git#arm-next
+blackfin       git     git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin.git#for-linus
+cris           git     git://www.jni.nu/cris.git#for-next
+ia64           git     git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test
+m68k           git     git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next
+m68knommu      git     git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next
+microblaze     git     git://git.monstr.eu/linux-2.6-microblaze.git#next
+mips           git     git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next
+openrisc       git     git://openrisc.net/jonas/linux#for-upstream
+parisc         git     git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next
+powerpc                git     git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next
+4xx            git     git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next
+52xx-and-virtex        git     git://git.secretlab.ca/git/linux-2.6#powerpc/next
+galak          git     git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next
+s390           git     git://git390.marist.edu/pub/scm/linux-2.6.git#features
+sh             git     git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#sh-latest
+rmobile                git     git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-latest
+sparc          git     git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master
+tile           git     git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master
+unicore32      git     git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git#unicore32
+xtensa         git     git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master
+ceph           git     git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git#for-next
+cifs           git     git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master
+configfs       git     git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next
+ecryptfs       git     git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git#next
+ext3           git     git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6.git#for_next
+ext4           git     git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev
+fatfs          git     git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6.git#master
+fuse           git     git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next
+gfs2           git     git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master
+hfsplus                git     git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus.git#for-next
+jfs            git     git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next
+logfs          git     git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs.git#master
+nfs            git     git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next
+nfsd           git     git://git.linux-nfs.org/~bfields/linux.git#nfsd-next
+nilfs2         git     git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git#for-next
+ocfs2          git     git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next
+omfs           git     git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs.git#for-next
+squashfs       git     git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master
+udf            git     git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next
+v9fs           git     git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next
+ubifs          git     git://git.infradead.org/ubifs-2.6.git#linux-next
+xfs            git     git://oss.sgi.com/xfs/xfs#master
+vfs            git     git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next
+vfs-scale      git     git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin.git#vfs-scale-working
+pci            git     git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next
+hid            git     git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next
+i2c            quilt   http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
+bjdooks-i2c    git     git://git.fluff.org/bjdooks/linux.git#next-i2c
+jdelvare-hwmon quilt   http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
+hwmon-staging  git     git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next
+kernel-doc     quilt   http://userweb.kernel.org/~rdunlap/kernel-doc-patches/current/
+docs           git     git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs.git#docs-move
+v4l-dvb                git     git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master
+kbuild         git     git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#for-next
+kconfig                git     git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git#for-next
+ide            git     git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next.git#master
+libata         git     git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT
+infiniband     git     git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next
+acpi           git     git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test
+idle-test      git     git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git#idle-test
+powertools     git     git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git#tools-test
+cpupowerutils  git     git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master
+ieee1394       git     git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next
+ubi            git     git://git.infradead.org/ubi-2.6.git#linux-next
+dlm            git     git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next
+swiotlb                git     git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git#master
+ibft           git     git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6.git#master
+scsi           git     git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master
+iscsi-target   git     git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next
+slave-dma      git     git://git.infradead.org/users/vkoul/slave-dma.git#next
+async_tx       git     git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next
+net            git     git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master
+wireless       git     git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git#master
+bluetooth      git     git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6.git#master
+mtd            git     git://git.infradead.org/mtd-2.6.git#master
+l2-mtd         git     git://git.infradead.org/users/dedekind/l2-mtd-2.6.git#master
+crypto         git     git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master
+sound          git     git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next
+sound-asoc     git     git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git#for-next
+cpufreq                git     git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next
+rr             quilt   http://ozlabs.org/~rusty/kernel/rr-latest/
+input          git     git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next
+input-mt       git     git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git#next
+lsm            git     git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next
+block          git     git://git.kernel.dk/linux-2.6-block.git#for-next
+device-mapper  quilt   http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/
+embedded       git     git://git.infradead.org/embedded-2.6.git#master
+firmware       git     git://git.infradead.org/users/dwmw2/firmware-2.6.git#master
+pcmcia         git     git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master
+battery                git     git://git.infradead.org/battery-2.6.git#master
+leds           git     git://git.o-hand.com/linux-rpurdie-leds#for-mm
+backlight      git     git://git.o-hand.com/linux-rpurdie-backlight#for-mm
+mmc            git     git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next
+kgdb           git     git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next
+slab           git     git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next
+uclinux                git     git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next
+md             git     git://neil.brown.name/md#for-next
+mfd            git     git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next
+hdlc           git     git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next
+drm            git     git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next
+fbdev          git     git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git#master
+viafb          git     git://github.com/schandinat/linux-2.6.git#viafb-next
+omap_dss2      git     git://gitorious.org/linux-omap-dss2/linux.git#for-next
+voltage                git     git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next
+security       git     git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next
+selinux                git     git://git.infradead.org/users/eparis/selinux.git#master
+lblnet         git     git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master
+agp            git     git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next
+watchdog       git     git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog-next.git#master
+bdev           git     git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master
+dwmw2-iommu    git     git://git.infradead.org/iommu-2.6.git#master
+cputime                git     git://git390.marist.edu/pub/scm/linux-2.6.git#cputime
+osd            git     git://git.open-osd.org/linux-open-osd.git#linux-next
+jc_docs                git     git://git.lwn.net/linux-2.6.git#docs-next
+nommu          git     git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master
+trivial                git     git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next
+audit          git     git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next
+pm             git     git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next
+apm            git     git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next
+fsnotify       git     git://git.infradead.org/users/eparis/notify.git#for-next
+irda           git     git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next
+i7core_edac    git     git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git#linux_next
+i7300_edac     git     git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac.git#linux_next
+devicetree     git     git://git.secretlab.ca/git/linux-2.6#devicetree/next
+spi            git     git://git.secretlab.ca/git/linux-2.6#spi/next
+gpio           git     git://git.secretlab.ca/git/linux-2.6#gpio/next
+tip            git     git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest
+rcu            git     git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git#rcu/next
+kvm            git     git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#linux-next
+oprofile       git     git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next
+ptrace         git     git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc.git#ptrace
+xen            git     git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git#upstream/xen
+xen-two                git     git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#linux-next
+xen-pvhvm      git     git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git#linux-next
+edac-amd       git     git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next
+percpu         git     git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next
+workqueues     git     git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next
+sfi            git     git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git#sfi-test
+asm-generic    git     git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#next
+drivers-x86    git     git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86#linux-next
+hwpoison       git     git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison
+sysctl         git     git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6.git#master
+namespace      git     git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd.git#master
+regmap         git     git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next
+driver-core    git     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-next
+tty            git     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-next
+usb            git     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-next
+staging                git     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-next
+bkl-config     git     git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#config
+tmem           git     git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem.git#linux-next
+writeback      git     git://git.kernel.org/pub/scm/linux/kernel/git/wfg/writeback.git#next
+arm-dt         git     git://git.secretlab.ca/git/linux-2.6#devicetree/arm-next
+scsi-post-merge        git     git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master
+moduleh                git     git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux.git#module.h-split
+akpm           mmotm   http://userweb.kernel.org/~akpm/mmotm/
diff --git a/Next/merge.log b/Next/merge.log
new file mode 100644 (file)
index 0000000..b52415c
--- /dev/null
@@ -0,0 +1,6705 @@
+$ date
+Wed Aug 17 10:41:20 EST 2011
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 2f6a123 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
+Merging origin/master
+$ git merge origin/master
+Updating 2f6a123..4bc9b07
+Fast-forward
+ Documentation/PCI/MSI-HOWTO.txt           |   89 +++++++-------
+ arch/ia64/Kconfig                         |    1 -
+ arch/ia64/configs/generic_defconfig       |    1 +
+ arch/sparc/Kconfig                        |    1 +
+ arch/sparc/include/asm/spinlock_32.h      |   11 ++-
+ arch/sparc/include/asm/spinlock_64.h      |    6 -
+ arch/x86/mm/fault.c                       |    1 +
+ drivers/base/regmap/regmap-spi.c          |    1 +
+ drivers/gpu/drm/i915/i915_debugfs.c       |    2 +-
+ drivers/gpu/drm/i915/i915_drv.h           |    4 +
+ drivers/gpu/drm/i915/i915_irq.c           |    6 +-
+ drivers/gpu/drm/i915/i915_reg.h           |   13 +--
+ drivers/gpu/drm/i915/i915_suspend.c       |    3 +-
+ drivers/gpu/drm/i915/intel_display.c      |  187 +++++++++++++++++++++--------
+ drivers/gpu/drm/i915/intel_dp.c           |    7 +
+ drivers/gpu/drm/i915/intel_drv.h          |    3 +-
+ drivers/gpu/drm/i915/intel_lvds.c         |   82 ++++++-------
+ drivers/gpu/drm/i915/intel_opregion.c     |    1 -
+ drivers/gpu/drm/i915/intel_panel.c        |   72 +++++++++++-
+ drivers/staging/gma500/mdfld_dsi_dbi.c    |    3 +-
+ drivers/staging/gma500/mdfld_dsi_dbi.h    |    3 -
+ drivers/staging/gma500/mdfld_dsi_dpi.c    |    7 +-
+ drivers/staging/gma500/mdfld_dsi_output.c |    4 +-
+ drivers/staging/gma500/medfield.h         |    2 -
+ drivers/staging/gma500/psb_drv.h          |    1 -
+ drivers/xen/xen-selfballoon.c             |    1 +
+ 26 files changed, 333 insertions(+), 179 deletions(-)
+Merging fixes/fixes
+$ git merge fixes/fixes
+Already up-to-date.
+Merging kbuild-current/rc-fixes
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arm-current/master
+$ git merge arm-current/master
+Already up-to-date.
+Merging m68k-current/for-linus
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging powerpc-merge/merge
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging 52xx-and-virtex-current/powerpc/merge
+$ git merge 52xx-and-virtex-current/powerpc/merge
+Already up-to-date.
+Merging sparc-current/master
+$ git merge sparc-current/master
+Already up-to-date.
+Merging scsi-rc-fixes/master
+$ git merge scsi-rc-fixes/master
+Already up-to-date.
+Merging net-current/master
+$ git merge net-current/master
+Merge made by recursive.
+ Documentation/networking/00-INDEX    |  116 ++++++++++++++++++++++++++++++++++
+ Documentation/networking/scaling.txt |   23 +++++---
+ drivers/net/can/sja1000/plx_pci.c    |    4 +-
+ drivers/net/e1000e/e1000.h           |    4 +
+ drivers/net/e1000e/ich8lan.c         |   65 +++++++++++++++----
+ drivers/net/e1000e/netdev.c          |   80 ++++++++++++++++++++++-
+ drivers/net/gianfar.c                |    9 ++-
+ drivers/net/gianfar_ethtool.c        |   26 ++++++--
+ drivers/net/ixgbe/ixgbe_main.c       |    4 +-
+ drivers/net/sh_eth.c                 |    1 +
+ drivers/net/usb/cdc_ncm.c            |   47 +++++++++++---
+ drivers/net/vmxnet3/vmxnet3_drv.c    |   34 ++++++----
+ 12 files changed, 355 insertions(+), 58 deletions(-)
+Merging sound-current/for-linus
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging pci-current/for-linus
+$ git merge pci-current/for-linus
+Merge made by recursive.
+ arch/x86/pci/acpi.c              |    9 ++
+ drivers/pci/hotplug/pcihp_slot.c |   45 +----------
+ drivers/pci/pci.c                |   67 +++++++++++++++
+ drivers/pci/pci.h                |    4 +
+ drivers/pci/probe.c              |  146 +++++++++++++++++++++++++++++++++
+ drivers/pci/setup-bus.c          |  166 ++++++++++++++++++++++++++-----------
+ drivers/pci/setup-res.c          |  152 ++++++++++++++++++++++-------------
+ include/linux/pci.h              |   16 ++++-
+ 8 files changed, 453 insertions(+), 152 deletions(-)
+Merging wireless-current/master
+$ git merge wireless-current/master
+Merge made by recursive.
+ drivers/net/wireless/iwlwifi/iwl-pci.c  |   25 ++++++++++---------------
+ drivers/net/wireless/rt2x00/rt2800usb.c |   20 +++++++++++++++-----
+ drivers/net/wireless/rt2x00/rt2x00usb.c |   17 +++++++----------
+ drivers/net/wireless/wl12xx/acx.c       |    6 +-----
+ drivers/net/wireless/wl12xx/testmode.c  |    5 ++++-
+ 5 files changed, 37 insertions(+), 36 deletions(-)
+Merging driver-core.current/driver-core-linus
+$ git merge driver-core.current/driver-core-linus
+Merge made by recursive.
+ drivers/base/devtmpfs.c        |    2 +-
+ drivers/base/platform.c        |    2 +-
+ drivers/firmware/google/gsmi.c |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+Merging tty.current/tty-linus
+$ git merge tty.current/tty-linus
+Merge made by recursive.
+ drivers/tty/serial/samsung.c |    8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+Merging usb.current/usb-linus
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging staging.current/staging-linus
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging cpufreq-current/fixes
+$ git merge cpufreq-current/fixes
+Already up-to-date.
+Merging input-current/for-linus
+$ git merge input-current/for-linus
+Auto-merging drivers/input/joystick/analog.c
+Merge made by recursive.
+ drivers/input/joystick/analog.c    |    2 +-
+ drivers/input/keyboard/tegra-kbc.c |    2 +-
+ drivers/input/misc/mma8450.c       |    2 +-
+ drivers/input/misc/mpu3050.c       |    2 +-
+ drivers/input/mouse/bcm5974.c      |   20 ++++++++++++++++++++
+ drivers/input/tablet/wacom_sys.c   |   17 ++++++++++-------
+ drivers/input/tablet/wacom_wac.c   |    4 ++++
+ 7 files changed, 38 insertions(+), 11 deletions(-)
+Merging md-current/for-linus
+$ git merge md-current/for-linus
+Already up-to-date.
+Merging audit-current/for-linus
+$ git merge audit-current/for-linus
+Already up-to-date.
+Merging crypto-current/master
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide-curent/master
+$ git merge ide-curent/master
+Already up-to-date.
+Merging dwmw2/master
+$ git merge dwmw2/master
+Already up-to-date.
+Merging sh-current/sh-fixes-for-linus
+$ git merge sh-current/sh-fixes-for-linus
+Merge made by recursive.
+ arch/sh/include/asm/ptrace.h |    2 +-
+ arch/sh/kernel/idle.c        |    2 +-
+ drivers/clocksource/sh_cmt.c |   34 +++++++++++++++++++-
+ drivers/sh/intc/chip.c       |    3 ++
+ drivers/tty/serial/sh-sci.c  |   69 +++++++++++++++++++++++++++++++++++------
+ 5 files changed, 96 insertions(+), 14 deletions(-)
+Merging rmobile-current/rmobile-fixes-for-linus
+$ git merge rmobile-current/rmobile-fixes-for-linus
+Merge made by recursive.
+ arch/arm/boot/compressed/mmcif-sh7372.c |    2 +-
+ arch/arm/boot/compressed/sdhi-sh7372.c  |    2 +-
+ arch/arm/mach-shmobile/board-ag5evm.c   |    3 ++-
+ arch/arm/mach-shmobile/board-mackerel.c |    4 ++++
+ arch/arm/mach-shmobile/clock-sh7372.c   |    8 ++++----
+ arch/arm/mach-shmobile/setup-sh7372.c   |   30 +++++++++++++++---------------
+ 6 files changed, 27 insertions(+), 22 deletions(-)
+Merging fbdev-current/fbdev-fixes-for-linus
+$ git merge fbdev-current/fbdev-fixes-for-linus
+Auto-merging drivers/video/msm/mdp.c
+Auto-merging drivers/video/udlfb.c
+Merge made by recursive.
+ drivers/video/carminefb.c |    6 +++---
+ drivers/video/msm/mdp.c   |    4 +++-
+ drivers/video/s3c2410fb.c |    1 -
+ drivers/video/udlfb.c     |   21 +++++++++++++++------
+ 4 files changed, 21 insertions(+), 11 deletions(-)
+Merging devicetree-current/devicetree/merge
+$ git merge devicetree-current/devicetree/merge
+Already up-to-date.
+Merging spi-current/spi/merge
+$ git merge spi-current/spi/merge
+Already up-to-date.
+Merging arm/for-next
+$ git merge arm/for-next
+Removing arch/arm/include/asm/auxvec.h
+Removing arch/arm/include/asm/bitsperlong.h
+Removing arch/arm/include/asm/cputime.h
+Removing arch/arm/include/asm/emergency-restart.h
+Removing arch/arm/include/asm/errno.h
+Removing arch/arm/include/asm/ioctl.h
+Removing arch/arm/include/asm/irq_regs.h
+Removing arch/arm/include/asm/kdebug.h
+Removing arch/arm/include/asm/local.h
+Removing arch/arm/include/asm/local64.h
+Removing arch/arm/include/asm/percpu.h
+Removing arch/arm/include/asm/poll.h
+Removing arch/arm/include/asm/resource.h
+Removing arch/arm/include/asm/sections.h
+Removing arch/arm/include/asm/siginfo.h
+Removing arch/arm/include/asm/sizes.h
+Merge made by recursive.
+ Documentation/devicetree/bindings/arm/l2cc.txt   |   42 +++
+ arch/arm/Kconfig                                 |   55 +++-
+ arch/arm/Makefile                                |    3 +
+ arch/arm/common/scoop.c                          |    2 +-
+ arch/arm/include/asm/Kbuild                      |   17 +
+ arch/arm/include/asm/auxvec.h                    |    4 -
+ arch/arm/include/asm/bitsperlong.h               |    1 -
+ arch/arm/include/asm/cputime.h                   |    6 -
+ arch/arm/include/asm/cputype.h                   |    6 +
+ arch/arm/include/asm/emergency-restart.h         |    6 -
+ arch/arm/include/asm/errno.h                     |    6 -
+ arch/arm/include/asm/gpio.h                      |   19 ++
+ arch/arm/include/asm/hardware/cache-l2x0.h       |   19 ++-
+ arch/arm/include/asm/hardware/iop3xx-gpio.h      |    2 +
+ arch/arm/include/asm/ioctl.h                     |    1 -
+ arch/arm/include/asm/irq_regs.h                  |    1 -
+ arch/arm/include/asm/kdebug.h                    |    1 -
+ arch/arm/include/asm/local.h                     |    1 -
+ arch/arm/include/asm/local64.h                   |    1 -
+ arch/arm/include/asm/memory.h                    |    7 -
+ arch/arm/include/asm/module.h                    |    4 -
+ arch/arm/include/asm/percpu.h                    |    6 -
+ arch/arm/include/asm/pgalloc.h                   |    2 +-
+ arch/arm/include/asm/pgtable.h                   |   23 +-
+ arch/arm/include/asm/pmu.h                       |   10 +-
+ arch/arm/include/asm/poll.h                      |    1 -
+ arch/arm/include/asm/resource.h                  |    6 -
+ arch/arm/include/asm/sections.h                  |    1 -
+ arch/arm/include/asm/siginfo.h                   |    6 -
+ arch/arm/include/asm/sizes.h                     |   21 --
+ arch/arm/include/asm/tlb.h                       |    1 +
+ arch/arm/include/asm/topology.h                  |   33 ++
+ arch/arm/kernel/Makefile                         |    1 +
+ arch/arm/kernel/head.S                           |   61 +---
+ arch/arm/kernel/pmu.c                            |   26 +-
+ arch/arm/kernel/setup.c                          |   15 +-
+ arch/arm/kernel/smp.c                            |    5 +
+ arch/arm/kernel/smp_twd.c                        |    4 +-
+ arch/arm/kernel/topology.c                       |  148 +++++++++
+ arch/arm/mach-at91/at91cap9_devices.c            |    2 +-
+ arch/arm/mach-at91/at91rm9200_devices.c          |    2 +-
+ arch/arm/mach-at91/at91sam9260_devices.c         |    2 +-
+ arch/arm/mach-at91/at91sam9261_devices.c         |    2 +-
+ arch/arm/mach-at91/at91sam9263_devices.c         |    2 +-
+ arch/arm/mach-at91/at91sam9g45_devices.c         |    2 +-
+ arch/arm/mach-at91/at91sam9rl_devices.c          |    2 +-
+ arch/arm/mach-at91/board-1arm.c                  |    2 +-
+ arch/arm/mach-at91/board-afeb-9260v1.c           |    2 +-
+ arch/arm/mach-at91/board-cam60.c                 |    2 +-
+ arch/arm/mach-at91/board-cap9adk.c               |    2 +-
+ arch/arm/mach-at91/board-carmeva.c               |    2 +-
+ arch/arm/mach-at91/board-cpu9krea.c              |    2 +-
+ arch/arm/mach-at91/board-cpuat91.c               |    2 +-
+ arch/arm/mach-at91/board-csb337.c                |    2 +-
+ arch/arm/mach-at91/board-csb637.c                |    2 +-
+ arch/arm/mach-at91/board-eb9200.c                |    2 +-
+ arch/arm/mach-at91/board-ecbat91.c               |    2 +-
+ arch/arm/mach-at91/board-kafa.c                  |    2 +-
+ arch/arm/mach-at91/board-kb9202.c                |    2 +-
+ arch/arm/mach-at91/board-neocore926.c            |    2 +-
+ arch/arm/mach-at91/board-picotux200.c            |    2 +-
+ arch/arm/mach-at91/board-qil-a9260.c             |    2 +-
+ arch/arm/mach-at91/board-rm9200dk.c              |    2 +-
+ arch/arm/mach-at91/board-rm9200ek.c              |    2 +-
+ arch/arm/mach-at91/board-sam9-l9260.c            |    2 +-
+ arch/arm/mach-at91/board-sam9260ek.c             |    2 +-
+ arch/arm/mach-at91/board-sam9261ek.c             |    2 +-
+ arch/arm/mach-at91/board-sam9263ek.c             |    2 +-
+ arch/arm/mach-at91/board-sam9g20ek.c             |    2 +-
+ arch/arm/mach-at91/board-sam9m10g45ek.c          |    2 +-
+ arch/arm/mach-at91/board-sam9rlek.c              |    2 +-
+ arch/arm/mach-at91/board-usb-a9260.c             |    2 +-
+ arch/arm/mach-at91/board-usb-a9263.c             |    2 +-
+ arch/arm/mach-at91/board-yl-9200.c               |    2 +-
+ arch/arm/mach-at91/gpio.c                        |    4 +-
+ arch/arm/mach-at91/include/mach/gpio.h           |    5 -
+ arch/arm/mach-at91/leds.c                        |    2 +-
+ arch/arm/mach-at91/pm.c                          |    2 +-
+ arch/arm/mach-davinci/da830.c                    |    2 +-
+ arch/arm/mach-davinci/da850.c                    |    2 +-
+ arch/arm/mach-davinci/gpio.c                     |    4 +-
+ arch/arm/mach-davinci/include/mach/gpio.h        |    7 +-
+ arch/arm/mach-davinci/tnetv107x.c                |    2 +-
+ arch/arm/mach-ep93xx/include/mach/gpio.h         |    8 -
+ arch/arm/mach-exynos4/include/mach/gpio.h        |    7 -
+ arch/arm/mach-gemini/include/mach/gpio.h         |    5 -
+ arch/arm/mach-imx/iomux-imx31.c                  |    3 +-
+ arch/arm/mach-imx/mach-mx27ads.c                 |    3 +-
+ arch/arm/mach-ixp2000/core.c                     |    4 +-
+ arch/arm/mach-ixp2000/ixdp2x00.c                 |    3 +-
+ arch/arm/mach-ixp4xx/common-pci.c                |    3 +-
+ arch/arm/mach-ixp4xx/dsmg600-setup.c             |    3 +-
+ arch/arm/mach-ixp4xx/fsg-setup.c                 |    3 +-
+ arch/arm/mach-ixp4xx/include/mach/gpio.h         |    3 +
+ arch/arm/mach-ixp4xx/nas100d-setup.c             |    3 +-
+ arch/arm/mach-ixp4xx/nslu2-setup.c               |    3 +-
+ arch/arm/mach-kirkwood/irq.c                     |    3 +-
+ arch/arm/mach-kirkwood/mpp.c                     |    3 +-
+ arch/arm/mach-ks8695/board-acs5k.c               |    3 +-
+ arch/arm/mach-ks8695/board-dsm320.c              |    3 +-
+ arch/arm/mach-ks8695/board-micrel.c              |    3 +-
+ arch/arm/mach-ks8695/gpio.c                      |    3 +-
+ arch/arm/mach-ks8695/include/mach/gpio.h         |   11 -
+ arch/arm/mach-ks8695/leds.c                      |    3 +-
+ arch/arm/mach-lpc32xx/include/mach/gpio.h        |   22 --
+ arch/arm/mach-mmp/aspenite.c                     |    5 +-
+ arch/arm/mach-mmp/mmp2.c                         |    3 +-
+ arch/arm/mach-mmp/pxa168.c                       |    3 +-
+ arch/arm/mach-mmp/pxa910.c                       |    3 +-
+ arch/arm/mach-mmp/tavorevb.c                     |    3 +-
+ arch/arm/mach-mmp/ttc_dkb.c                      |    2 +-
+ arch/arm/mach-msm/board-msm7x27.c                |    3 +-
+ arch/arm/mach-msm/board-msm7x30.c                |   25 ++-
+ arch/arm/mach-msm/board-msm8960.c                |   22 ++
+ arch/arm/mach-msm/board-msm8x60.c                |   25 ++
+ arch/arm/mach-msm/board-qsd8x50.c                |    3 +-
+ arch/arm/mach-msm/board-sapphire.c               |    3 +-
+ arch/arm/mach-msm/board-trout-mmc.c              |    3 +-
+ arch/arm/mach-msm/board-trout-panel.c            |    3 +-
+ arch/arm/mach-msm/include/mach/gpio.h            |   27 +--
+ arch/arm/mach-msm/include/mach/memory.h          |    6 +-
+ arch/arm/mach-mv78xx0/irq.c                      |    3 +-
+ arch/arm/mach-mv78xx0/mpp.c                      |    3 +-
+ arch/arm/mach-mxs/include/mach/gpio.h            |    8 -
+ arch/arm/mach-omap1/board-ams-delta.c            |    3 +-
+ arch/arm/mach-omap1/board-fsample.c              |    3 +-
+ arch/arm/mach-omap1/board-generic.c              |    3 +-
+ arch/arm/mach-omap1/board-h2-mmc.c               |    3 +-
+ arch/arm/mach-omap1/board-h2.c                   |    3 +-
+ arch/arm/mach-omap1/board-h3-mmc.c               |    3 +-
+ arch/arm/mach-omap1/board-h3.c                   |    3 +-
+ arch/arm/mach-omap1/board-htcherald.c            |    1 -
+ arch/arm/mach-omap1/board-innovator.c            |    3 +-
+ arch/arm/mach-omap1/board-nokia770.c             |    3 +-
+ arch/arm/mach-omap1/board-osk.c                  |    3 +-
+ arch/arm/mach-omap1/board-palmte.c               |    3 +-
+ arch/arm/mach-omap1/board-palmtt.c               |    2 +-
+ arch/arm/mach-omap1/board-palmz71.c              |    2 +-
+ arch/arm/mach-omap1/board-perseus2.c             |    3 +-
+ arch/arm/mach-omap1/board-sx1-mmc.c              |    2 +-
+ arch/arm/mach-omap1/board-sx1.c                  |    3 +-
+ arch/arm/mach-omap1/board-voiceblue.c            |    2 +-
+ arch/arm/mach-omap1/devices.c                    |    2 +-
+ arch/arm/mach-omap1/fpga.c                       |    2 +-
+ arch/arm/mach-omap1/irq.c                        |    3 +-
+ arch/arm/mach-omap1/leds-h2p2-debug.c            |    2 +-
+ arch/arm/mach-omap1/leds-osk.c                   |    3 +-
+ arch/arm/mach-omap1/leds.c                       |    2 +-
+ arch/arm/mach-omap1/serial.c                     |    3 +-
+ arch/arm/mach-omap2/board-generic.c              |    3 +-
+ arch/arm/mach-omap2/board-h4.c                   |    3 +-
+ arch/arm/mach-omap2/board-ldp.c                  |    3 +-
+ arch/arm/mach-omap2/devices.c                    |    3 +-
+ arch/arm/mach-orion5x/db88f5281-setup.c          |    3 +-
+ arch/arm/mach-orion5x/dns323-setup.c             |    3 +-
+ arch/arm/mach-orion5x/irq.c                      |    3 +-
+ arch/arm/mach-orion5x/kurobox_pro-setup.c        |    3 +-
+ arch/arm/mach-orion5x/mv2120-setup.c             |    3 +-
+ arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c     |    3 +-
+ arch/arm/mach-orion5x/rd88f5181l-ge-setup.c      |    3 +-
+ arch/arm/mach-orion5x/rd88f5182-setup.c          |    3 +-
+ arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c     |    3 +-
+ arch/arm/mach-orion5x/terastation_pro2-setup.c   |    3 +-
+ arch/arm/mach-orion5x/ts209-setup.c              |    3 +-
+ arch/arm/mach-orion5x/ts409-setup.c              |    3 +-
+ arch/arm/mach-orion5x/wnr854t-setup.c            |    3 +-
+ arch/arm/mach-orion5x/wrt350n-v2-setup.c         |    3 +-
+ arch/arm/mach-pnx4008/gpio.c                     |    3 +-
+ arch/arm/mach-pnx4008/serial.c                   |    3 +-
+ arch/arm/mach-pxa/generic.c                      |    2 +-
+ arch/arm/mach-pxa/include/mach/littleton.h       |    2 +-
+ arch/arm/mach-pxa/irq.c                          |    3 +-
+ arch/arm/mach-pxa/lpd270.c                       |    3 +-
+ arch/arm/mach-pxa/lubbock.c                      |    2 +-
+ arch/arm/mach-pxa/mainstone.c                    |    3 +-
+ arch/arm/mach-pxa/mfp-pxa2xx.c                   |    3 +-
+ arch/arm/mach-pxa/pcm990-baseboard.c             |    3 +-
+ arch/arm/mach-pxa/pxa25x.c                       |    2 +-
+ arch/arm/mach-pxa/pxa27x.c                       |    2 +-
+ arch/arm/mach-pxa/pxa3xx.c                       |    3 +-
+ arch/arm/mach-pxa/pxa95x.c                       |    3 +-
+ arch/arm/mach-pxa/saar.c                         |    2 +-
+ arch/arm/mach-pxa/saarb.c                        |    3 +-
+ arch/arm/mach-realview/include/mach/gpio.h       |    7 +-
+ arch/arm/mach-realview/include/mach/system.h     |    1 +
+ arch/arm/mach-s3c2410/include/mach/gpio.h        |    6 -
+ arch/arm/mach-s3c2410/include/mach/h1940-latch.h |    2 +-
+ arch/arm/mach-s3c64xx/include/mach/gpio.h        |    7 -
+ arch/arm/mach-s5p64x0/include/mach/gpio.h        |    7 -
+ arch/arm/mach-s5pc100/include/mach/gpio.h        |    7 -
+ arch/arm/mach-s5pv210/include/mach/gpio.h        |    7 -
+ arch/arm/mach-sa1100/generic.c                   |    2 +-
+ arch/arm/mach-sa1100/gpio.c                      |    3 +-
+ arch/arm/mach-sa1100/include/mach/gpio.h         |    2 +
+ arch/arm/mach-shmobile/include/mach/gpio.h       |   24 +--
+ arch/arm/mach-tegra/board-trimslice-pinmux.c     |    3 +-
+ arch/arm/mach-tegra/include/mach/gpio.h          |    7 +-
+ arch/arm/mach-u300/include/mach/gpio.h           |    3 +
+ arch/arm/mach-ux500/board-mop500-u8500uib.c      |    3 +-
+ arch/arm/mach-versatile/include/mach/gpio.h      |    7 +-
+ arch/arm/mach-vt8500/include/mach/gpio.h         |    7 +-
+ arch/arm/mach-w90x900/include/mach/gpio.h        |    6 +-
+ arch/arm/mm/cache-l2x0.c                         |  103 +++++++
+ arch/arm/mm/proc-v6.S                            |   16 +
+ arch/arm/plat-mxc/include/mach/gpio.h            |    6 -
+ arch/arm/plat-nomadik/include/plat/gpio.h        |   12 +-
+ arch/arm/plat-omap/debug-devices.c               |    3 +-
+ arch/arm/plat-omap/debug-leds.c                  |    3 +-
+ arch/arm/plat-omap/devices.c                     |    3 +-
+ arch/arm/plat-omap/include/plat/gpio.h           |   20 --
+ arch/arm/plat-orion/include/plat/gpio.h          |    9 -
+ arch/arm/plat-pxa/gpio.c                         |    4 +-
+ arch/arm/plat-pxa/include/plat/gpio.h            |    2 +
+ arch/arm/plat-spear/include/plat/gpio.h          |   25 +--
+ arch/arm/tools/mach-types                        |  348 ++++++++++++----------
+ drivers/ata/pata_at91.c                          |    2 +-
+ drivers/gpio/gpio-nomadik.c                      |    2 +-
+ drivers/gpio/gpio-omap.c                         |    2 +-
+ drivers/i2c/busses/i2c-ixp2000.c                 |    2 +-
+ drivers/ide/at91_ide.c                           |    2 +-
+ drivers/input/keyboard/omap-keypad.c             |    2 +-
+ drivers/mfd/menelaus.c                           |    2 +-
+ drivers/mmc/host/omap.c                          |    2 +-
+ drivers/mmc/host/sdhci-tegra.c                   |    2 +-
+ drivers/mtd/nand/ams-delta.c                     |    2 +-
+ drivers/mtd/onenand/omap2.c                      |    2 +-
+ drivers/net/arm/at91_ether.c                     |    2 +-
+ drivers/pcmcia/pxa2xx_vpac270.c                  |    2 +-
+ drivers/spi/spi-atmel.c                          |    2 +-
+ drivers/tty/serial/atmel_serial.c                |    2 +-
+ drivers/usb/host/ohci-pnx4008.c                  |    2 +-
+ drivers/usb/musb/davinci.c                       |    2 +-
+ drivers/video/atmel_lcdfb.c                      |    2 +-
+ drivers/video/omap/lcd_apollon.c                 |    2 +-
+ drivers/video/omap/lcd_h3.c                      |    2 +-
+ drivers/video/omap/lcd_inn1610.c                 |    2 +-
+ drivers/video/omap/lcd_ldp.c                     |    2 +-
+ drivers/video/omap/lcd_osk.c                     |    2 +-
+ drivers/video/omap/lcd_overo.c                   |    2 +-
+ drivers/video/omap/lcd_palmtt.c                  |    2 +-
+ drivers/video/pnx4008/sdum.c                     |    2 +-
+ tools/perf/arch/arm/util/dwarf-regs.c            |    3 +
+ 242 files changed, 966 insertions(+), 847 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/l2cc.txt
+ delete mode 100644 arch/arm/include/asm/auxvec.h
+ delete mode 100644 arch/arm/include/asm/bitsperlong.h
+ delete mode 100644 arch/arm/include/asm/cputime.h
+ delete mode 100644 arch/arm/include/asm/emergency-restart.h
+ delete mode 100644 arch/arm/include/asm/errno.h
+ delete mode 100644 arch/arm/include/asm/ioctl.h
+ delete mode 100644 arch/arm/include/asm/irq_regs.h
+ delete mode 100644 arch/arm/include/asm/kdebug.h
+ delete mode 100644 arch/arm/include/asm/local.h
+ delete mode 100644 arch/arm/include/asm/local64.h
+ delete mode 100644 arch/arm/include/asm/percpu.h
+ delete mode 100644 arch/arm/include/asm/poll.h
+ delete mode 100644 arch/arm/include/asm/resource.h
+ delete mode 100644 arch/arm/include/asm/sections.h
+ delete mode 100644 arch/arm/include/asm/siginfo.h
+ delete mode 100644 arch/arm/include/asm/sizes.h
+ create mode 100644 arch/arm/kernel/topology.c
+Merging arm-lpae/for-next
+$ git merge arm-lpae/for-next
+Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution.
+Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution.
+Resolved 'arch/arm/include/asm/tlb.h' using previous resolution.
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arm/include/asm/pgalloc.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
+Auto-merging arch/arm/include/asm/pgtable.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
+Auto-merging arch/arm/include/asm/tlb.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
+Auto-merging arch/arm/kernel/head.S
+Auto-merging arch/arm/kernel/module.c
+Auto-merging arch/arm/kernel/setup.c
+Auto-merging arch/arm/mm/alignment.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 0635a13] Merge remote-tracking branch 'arm-lpae/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/Kconfig                            |    2 +-
+ arch/arm/boot/compressed/head.S             |    1 +
+ arch/arm/include/asm/assembler.h            |   11 +
+ arch/arm/include/asm/dma-mapping.h          |    2 +-
+ arch/arm/include/asm/page.h                 |   44 +---
+ arch/arm/include/asm/pgalloc.h              |   28 ++-
+ arch/arm/include/asm/pgtable-2level-hwdef.h |   93 ++++++
+ arch/arm/include/asm/pgtable-2level-types.h |   67 +++++
+ arch/arm/include/asm/pgtable-2level.h       |  143 +++++++++
+ arch/arm/include/asm/pgtable-3level-hwdef.h |   82 ++++++
+ arch/arm/include/asm/pgtable-3level-types.h |   70 +++++
+ arch/arm/include/asm/pgtable-3level.h       |  107 +++++++
+ arch/arm/include/asm/pgtable-hwdef.h        |   81 +-----
+ arch/arm/include/asm/pgtable.h              |  211 +++++---------
+ arch/arm/include/asm/proc-fns.h             |   21 ++
+ arch/arm/include/asm/setup.h                |    8 +
+ arch/arm/include/asm/tlb.h                  |   11 +-
+ arch/arm/include/asm/tlbflush.h             |    4 +-
+ arch/arm/kernel/head.S                      |  119 ++++++---
+ arch/arm/kernel/module.c                    |    2 +-
+ arch/arm/kernel/setup.c                     |   10 +
+ arch/arm/kernel/sleep.S                     |    2 +
+ arch/arm/mm/Kconfig                         |   13 +
+ arch/arm/mm/Makefile                        |    4 +
+ arch/arm/mm/alignment.c                     |    8 +-
+ arch/arm/mm/context.c                       |   19 +-
+ arch/arm/mm/dma-mapping.c                   |    6 +-
+ arch/arm/mm/fault.c                         |   87 ++++++
+ arch/arm/mm/idmap.c                         |   36 +++-
+ arch/arm/mm/ioremap.c                       |   39 ++-
+ arch/arm/mm/mm.h                            |    4 +-
+ arch/arm/mm/mmu.c                           |   53 +++-
+ arch/arm/mm/pgd.c                           |   51 +++-
+ arch/arm/mm/proc-macros.S                   |    5 +-
+ arch/arm/mm/proc-v7lpae.S                   |  422 +++++++++++++++++++++++++++
+ 35 files changed, 1523 insertions(+), 343 deletions(-)
+ create mode 100644 arch/arm/include/asm/pgtable-2level-hwdef.h
+ create mode 100644 arch/arm/include/asm/pgtable-2level-types.h
+ create mode 100644 arch/arm/include/asm/pgtable-2level.h
+ create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h
+ create mode 100644 arch/arm/include/asm/pgtable-3level-types.h
+ create mode 100644 arch/arm/include/asm/pgtable-3level.h
+ create mode 100644 arch/arm/mm/proc-v7lpae.S
+Merging arm-soc/for-next
+$ git merge arm-soc/for-next
+Already up-to-date.
+Merging at91/at91-next
+$ git merge at91/at91-next
+Already up-to-date.
+Merging davinci/davinci-next
+$ git merge davinci/davinci-next
+Already up-to-date.
+Merging i.MX/for-next
+$ git merge i.MX/for-next
+Already up-to-date.
+Merging linux-spec/for-next
+$ git merge linux-spec/for-next
+Already up-to-date.
+Merging msm/for-next
+$ git merge msm/for-next
+Resolved 'arch/arm/mach-msm/io.c' using previous resolution.
+Auto-merging arch/arm/mach-msm/Makefile
+Auto-merging arch/arm/mach-msm/acpuclock-arm11.c
+Auto-merging arch/arm/mach-msm/board-msm7x30.c
+Auto-merging arch/arm/mach-msm/board-msm8960.c
+Auto-merging arch/arm/mach-msm/board-msm8x60.c
+Auto-merging arch/arm/mach-msm/board-qsd8x50.c
+Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
+Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
+Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
+Auto-merging arch/arm/mach-msm/io.c
+CONFLICT (content): Merge conflict in arch/arm/mach-msm/io.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master a0ace39] Merge remote-tracking branch 'msm/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-msm/Makefile                      |    5 +-
+ arch/arm/mach-msm/acpuclock-arm11.c             |    2 +-
+ arch/arm/mach-msm/board-halibut.c               |    1 +
+ arch/arm/mach-msm/board-mahimahi.c              |    1 +
+ arch/arm/mach-msm/board-msm7x30.c               |    1 +
+ arch/arm/mach-msm/board-msm8960.c               |   18 +
+ arch/arm/mach-msm/board-msm8x60.c               |    9 +-
+ arch/arm/mach-msm/board-qsd8x50.c               |    1 +
+ arch/arm/mach-msm/board-trout.c                 |    1 +
+ arch/arm/mach-msm/clock-dummy.c                 |   81 +++++
+ arch/arm/mach-msm/clock.h                       |   11 +
+ arch/arm/mach-msm/devices-msm7x00.c             |   21 ++-
+ arch/arm/mach-msm/devices-msm7x30.c             |   21 ++-
+ arch/arm/mach-msm/devices-msm8960.c             |  181 +++++++++++
+ arch/arm/mach-msm/devices-msm8x60.c             |   56 ++++
+ arch/arm/mach-msm/devices-qsd8x50.c             |   21 ++-
+ arch/arm/mach-msm/devices.h                     |    8 +
+ arch/arm/mach-msm/dma.c                         |  391 ++++++++++++++++++-----
+ arch/arm/mach-msm/include/mach/dma.h            |   84 +++---
+ arch/arm/mach-msm/include/mach/msm_iomap-7x00.h |    5 +-
+ arch/arm/mach-msm/include/mach/msm_iomap-7x30.h |    5 +-
+ arch/arm/mach-msm/include/mach/msm_iomap-8960.h |    3 +
+ arch/arm/mach-msm/include/mach/msm_iomap-8x50.h |    5 +-
+ arch/arm/mach-msm/include/mach/msm_iomap-8x60.h |    6 +
+ arch/arm/mach-msm/io.c                          |    3 -
+ 25 files changed, 808 insertions(+), 133 deletions(-)
+ create mode 100644 arch/arm/mach-msm/clock-dummy.c
+ create mode 100644 arch/arm/mach-msm/devices-msm8x60.c
+Merging omap/for-next
+$ git merge omap/for-next
+Already up-to-date.
+Merging pxa/for-next
+$ git merge pxa/for-next
+Already up-to-date.
+Merging samsung/next-samsung
+$ git merge samsung/next-samsung
+Already up-to-date.
+Merging s5p/for-next
+$ git merge s5p/for-next
+Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
+Merge made by recursive.
+ arch/arm/mach-exynos4/Kconfig                  |    6 ++++
+ arch/arm/mach-exynos4/clock.c                  |    2 +-
+ arch/arm/mach-exynos4/cpu.c                    |    1 -
+ arch/arm/mach-exynos4/include/mach/irqs.h      |    5 +--
+ arch/arm/mach-exynos4/irq-eint.c               |    7 ++++
+ arch/arm/mach-exynos4/mach-nuri.c              |   34 +++++++++++++++++++++
+ arch/arm/mach-exynos4/mach-smdkv310.c          |   11 +++++++
+ arch/arm/mach-exynos4/mach-universal_c210.c    |   38 ++++++++++++++++++++++-
+ arch/arm/mach-s3c64xx/mach-crag6410.c          |    9 +++++
+ arch/arm/mach-s3c64xx/pm.c                     |    1 +
+ arch/arm/mach-s5p64x0/irq-eint.c               |    2 +-
+ arch/arm/mach-s5pv210/Kconfig                  |    6 ----
+ arch/arm/mach-s5pv210/Makefile                 |    2 +-
+ arch/arm/mach-s5pv210/pm.c                     |    2 +-
+ arch/arm/plat-s5p/irq-gpioint.c                |    6 ++++
+ arch/arm/plat-samsung/include/plat/backlight.h |    2 +-
+ 16 files changed, 117 insertions(+), 17 deletions(-)
+Merging tegra/for-next
+$ git merge tegra/for-next
+Already up-to-date.
+Merging ux500-core/ux500-core
+$ git merge ux500-core/ux500-core
+Already up-to-date.
+Merging xilinx/arm-next
+$ git merge xilinx/arm-next
+Already up-to-date.
+Merging blackfin/for-linus
+$ git merge blackfin/for-linus
+Merge made by recursive.
+ arch/blackfin/include/asm/uaccess.h     |    6 +++---
+ arch/blackfin/mach-bf533/boards/H8606.c |    3 ++-
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+Merging cris/for-next
+$ git merge cris/for-next
+Auto-merging arch/cris/arch-v32/drivers/cryptocop.c
+Auto-merging drivers/net/cris/eth_v10.c
+Merge made by recursive.
+ Documentation/cris/README               |   62 +++++++++++++++---------------
+ arch/cris/arch-v32/drivers/cryptocop.c  |    6 +--
+ arch/cris/arch-v32/kernel/ptrace.c      |    2 -
+ arch/cris/include/arch-v32/arch/cache.h |    2 +-
+ drivers/net/cris/eth_v10.c              |    1 -
+ 5 files changed, 34 insertions(+), 39 deletions(-)
+Merging ia64/test
+$ git merge ia64/test
+Merge made by recursive.
+ arch/ia64/sn/kernel/sn2/sn_hwperf.c |   12 +++--
+ drivers/acpi/apei/erst.c            |    2 +-
+ drivers/firmware/efivars.c          |    2 +-
+ fs/pstore/inode.c                   |   40 +++++++++++++++--
+ fs/pstore/internal.h                |    2 +-
+ fs/pstore/platform.c                |   82 ++++++++++++++++++++++++++++-------
+ include/linux/pstore.h              |    2 +-
+ 7 files changed, 114 insertions(+), 28 deletions(-)
+Merging m68k/for-next
+$ git merge m68k/for-next
+Merge made by recursive.
+ arch/m68k/mac/macints.c      |    2 +-
+ arch/m68k/mac/misc.c         |   40 +++++++++++++++++++++++-----------------
+ drivers/zorro/zorro-driver.c |    8 ++++----
+ 3 files changed, 28 insertions(+), 22 deletions(-)
+Merging m68knommu/for-next
+$ git merge m68knommu/for-next
+Merge made by recursive.
+ arch/m68k/include/asm/m520xsim.h |   26 +++++++++----------
+ arch/m68k/include/asm/mcfqspi.h  |    8 ++++--
+ arch/m68k/lib/memcpy.c           |    9 +++++++
+ arch/m68k/platform/520x/config.c |    6 ++--
+ arch/m68k/platform/520x/gpio.c   |   50 +++++--------------------------------
+ 5 files changed, 36 insertions(+), 63 deletions(-)
+Merging microblaze/next
+$ git merge microblaze/next
+Already up-to-date.
+Merging mips/mips-for-linux-next
+$ git merge mips/mips-for-linux-next
+Removing arch/mips/nxp/pnx8550/common/pci.c
+Removing arch/mips/nxp/pnx8550/common/setup.c
+Merge made by recursive.
+ arch/mips/Kconfig                                  |    1 +
+ arch/mips/Makefile                                 |    2 +
+ arch/mips/alchemy/common/platform.c                |    2 +-
+ arch/mips/alchemy/common/power.c                   |   22 ++-
+ arch/mips/ar7/irq.c                                |    3 +-
+ arch/mips/bcm63xx/irq.c                            |    1 +
+ arch/mips/cobalt/irq.c                             |    1 +
+ arch/mips/dec/setup.c                              |    4 +
+ arch/mips/emma/markeins/irq.c                      |    2 +-
+ arch/mips/include/asm/cacheflush.h                 |   24 ++++
+ arch/mips/include/asm/io.h                         |   12 +--
+ .../asm/mach-cavium-octeon/cpu-feature-overrides.h |    1 -
+ arch/mips/include/asm/mipsprom.h                   |    6 +-
+ arch/mips/include/asm/prom.h                       |    6 +-
+ arch/mips/kernel/ftrace.c                          |   39 +++---
+ arch/mips/kernel/scall32-o32.S                     |    2 +-
+ arch/mips/kernel/signal.c                          |    3 +
+ arch/mips/kernel/traps.c                           |    6 +-
+ arch/mips/lantiq/irq.c                             |    6 +-
+ arch/mips/lasat/interrupt.c                        |    1 +
+ arch/mips/loongson/fuloong-2e/irq.c                |    1 +
+ arch/mips/loongson/lemote-2f/irq.c                 |    3 +-
+ arch/mips/mm/c-octeon.c                            |    6 +
+ arch/mips/mm/c-r3k.c                               |    7 +
+ arch/mips/mm/c-r4k.c                               |   35 +++++
+ arch/mips/mm/c-tx39.c                              |    7 +
+ arch/mips/mm/cache.c                               |    5 +
+ arch/mips/mm/tlbex.c                               |    3 +-
+ arch/mips/mti-malta/malta-int.c                    |    6 +-
+ arch/mips/netlogic/Platform                        |    5 +
+ arch/mips/netlogic/xlr/setup.c                     |    4 +-
+ arch/mips/netlogic/xlr/smp.c                       |    2 +-
+ arch/mips/netlogic/xlr/smpboot.S                   |   16 ++-
+ arch/mips/nxp/pnx8550/common/pci.c                 |  134 ------------------
+ arch/mips/nxp/pnx8550/common/setup.c               |  143 --------------------
+ arch/mips/pci/pci-lantiq.c                         |    9 +-
+ arch/mips/pci/pci-rc32434.c                        |    2 +-
+ arch/mips/pmc-sierra/msp71xx/msp_irq.c             |    6 +-
+ arch/mips/pmc-sierra/msp71xx/msp_setup.c           |    1 +
+ arch/mips/pmc-sierra/yosemite/py-console.c         |   12 +--
+ arch/mips/pnx8550/common/int.c                     |    2 +-
+ arch/mips/pnx8550/common/prom.c                    |    2 +-
+ arch/mips/sgi-ip22/ip22-int.c                      |   10 +-
+ arch/mips/sgi-ip27/ip27-irq.c                      |    4 +-
+ arch/mips/sni/rm200.c                              |    1 +
+ arch/mips/vr41xx/common/irq.c                      |    1 +
+ drivers/mtd/maps/lantiq-flash.c                    |    4 +-
+ 47 files changed, 204 insertions(+), 371 deletions(-)
+ delete mode 100644 arch/mips/nxp/pnx8550/common/pci.c
+ delete mode 100644 arch/mips/nxp/pnx8550/common/setup.c
+Merging openrisc/for-upstream
+$ git merge openrisc/for-upstream
+Already up-to-date.
+Merging parisc/for-next
+$ git merge parisc/for-next
+Already up-to-date.
+Merging powerpc/next
+$ git merge powerpc/next
+Already up-to-date.
+Merging 4xx/next
+$ git merge 4xx/next
+Removing arch/powerpc/boot/dts/hcu4.dts
+Removing arch/powerpc/configs/40x/hcu4_defconfig
+Removing arch/powerpc/platforms/40x/hcu4.c
+Auto-merging arch/powerpc/sysdev/ppc4xx_pci.c
+Merge made by recursive.
+ arch/powerpc/Kconfig                    |    2 +-
+ arch/powerpc/boot/dts/hcu4.dts          |  168 ------------------------------
+ arch/powerpc/boot/dts/yosemite.dts      |   36 +++++++
+ arch/powerpc/configs/40x/hcu4_defconfig |   80 --------------
+ arch/powerpc/configs/ppc40x_defconfig   |    1 -
+ arch/powerpc/include/asm/kexec.h        |    2 +-
+ arch/powerpc/kernel/misc_32.S           |  171 +++++++++++++++++++++++++++++++
+ arch/powerpc/platforms/40x/Kconfig      |    8 --
+ arch/powerpc/platforms/40x/Makefile     |    1 -
+ arch/powerpc/platforms/40x/hcu4.c       |   61 -----------
+ arch/powerpc/sysdev/ppc4xx_pci.c        |   89 +++++++++++++---
+ arch/powerpc/sysdev/ppc4xx_pci.h        |   12 ++
+ drivers/edac/ppc4xx_edac.c              |    2 +-
+ 13 files changed, 294 insertions(+), 339 deletions(-)
+ delete mode 100644 arch/powerpc/boot/dts/hcu4.dts
+ delete mode 100644 arch/powerpc/configs/40x/hcu4_defconfig
+ delete mode 100644 arch/powerpc/platforms/40x/hcu4.c
+Merging 52xx-and-virtex/powerpc/next
+$ git merge 52xx-and-virtex/powerpc/next
+Merge made by recursive.
+ arch/powerpc/boot/dts/charon.dts             |  236 ++++++++++++++++++++++++++
+ arch/powerpc/configs/52xx/tqm5200_defconfig  |   20 ++-
+ arch/powerpc/platforms/52xx/mpc5200_simple.c |    1 +
+ 3 files changed, 249 insertions(+), 8 deletions(-)
+ create mode 100644 arch/powerpc/boot/dts/charon.dts
+Merging galak/next
+$ git merge galak/next
+Already up-to-date.
+Merging s390/features
+$ git merge s390/features
+Merge made by recursive.
+ arch/s390/kernel/early.c        |   14 ++++++++------
+ drivers/s390/block/dasd_ioctl.c |   10 +++++++---
+ drivers/s390/cio/ccwreq.c       |   23 ++++++++++++++++++++---
+ 3 files changed, 35 insertions(+), 12 deletions(-)
+Merging sh/sh-latest
+$ git merge sh/sh-latest
+Merge made by recursive.
+ arch/sh/boards/mach-ecovec24/setup.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+Merging rmobile/rmobile-latest
+$ git merge rmobile/rmobile-latest
+Already up-to-date.
+Merging sparc/master
+$ git merge sparc/master
+Already up-to-date.
+Merging tile/master
+$ git merge tile/master
+Merge made by recursive.
+ arch/tile/kernel/intvec_32.S     |    2 +-
+ arch/tile/lib/atomic_asm_32.S    |    2 +-
+ fs/nfs/blocklayout/blocklayout.c |    1 +
+ fs/nfs/nfs4filelayout.c          |    6 +++---
+ 4 files changed, 6 insertions(+), 5 deletions(-)
+Merging unicore32/unicore32
+$ git merge unicore32/unicore32
+Merge made by recursive.
+ arch/unicore32/include/asm/bitops.h |   12 ++++++------
+ arch/unicore32/kernel/ksyms.c       |    4 ++--
+ arch/unicore32/lib/findbit.S        |   14 ++++++++------
+ 3 files changed, 16 insertions(+), 14 deletions(-)
+Merging xtensa/master
+$ git merge xtensa/master
+Already up-to-date.
+Merging ceph/for-next
+$ git merge ceph/for-next
+Auto-merging fs/ceph/caps.c
+Auto-merging fs/ceph/super.h
+Auto-merging include/linux/ceph/libceph.h
+Merge made by recursive.
+ drivers/block/rbd.c            |    2 +-
+ fs/ceph/addr.c                 |  192 +++++++++++++++++++++++++---------------
+ fs/ceph/caps.c                 |    2 +-
+ fs/ceph/ioctl.h                |   55 +++++++++++-
+ fs/ceph/mds_client.c           |   11 ++-
+ fs/ceph/super.c                |   23 ++++--
+ fs/ceph/super.h                |    8 +-
+ include/linux/ceph/libceph.h   |    4 +-
+ include/linux/ceph/messenger.h |    3 +-
+ net/ceph/ceph_common.c         |   47 +++++-----
+ net/ceph/messenger.c           |   16 +++-
+ net/ceph/mon_client.c          |   71 ++++++++-------
+ net/ceph/msgpool.c             |   42 ++++++---
+ net/ceph/osd_client.c          |    8 +-
+ 14 files changed, 318 insertions(+), 166 deletions(-)
+Merging cifs/master
+$ git merge cifs/master
+Merge made by recursive.
+ fs/cifs/dir.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+Merging configfs/linux-next
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next
+$ git merge ecryptfs/next
+Already up-to-date.
+Merging ext3/for_next
+$ git merge ext3/for_next
+Already up-to-date.
+Merging ext4/dev
+$ git merge ext4/dev
+Merge made by recursive.
+ fs/ext4/ext4.h          |    5 +++--
+ fs/ext4/ext4_jbd2.h     |    4 ++--
+ fs/ext4/file.c          |   10 ++++++++++
+ fs/ext4/inode.c         |   11 +++++++++++
+ fs/ext4/super.c         |    7 ++++---
+ fs/jbd2/transaction.c   |   42 +++++++++++++++++++++++++++++++++++++-----
+ include/linux/ext2_fs.h |    4 ++--
+ include/linux/ext3_fs.h |    4 ++--
+ 8 files changed, 71 insertions(+), 16 deletions(-)
+Merging fatfs/master
+$ git merge fatfs/master
+Already up-to-date.
+Merging fuse/for-next
+$ git merge fuse/for-next
+Auto-merging fs/fuse/file.c
+Auto-merging fs/fuse/fuse_i.h
+Auto-merging fs/fuse/inode.c
+Merge made by recursive.
+ fs/fuse/file.c       |   84 ++++++++------------------------------------------
+ fs/fuse/fuse_i.h     |    8 ++++-
+ fs/fuse/inode.c      |   10 +++++-
+ include/linux/fuse.h |    9 +++++-
+ 4 files changed, 36 insertions(+), 75 deletions(-)
+Merging gfs2/master
+$ git merge gfs2/master
+Auto-merging fs/gfs2/acl.c
+Merge made by recursive.
+ fs/gfs2/acl.c    |    5 +-
+ fs/gfs2/aops.c   |    6 ---
+ fs/gfs2/dir.c    |   42 +++++---------------
+ fs/gfs2/file.c   |   37 +++++++++++++-----
+ fs/gfs2/glops.c  |   29 +++++++++++---
+ fs/gfs2/incore.h |    1 +
+ fs/gfs2/inode.c  |   49 ++++++++---------------
+ fs/gfs2/inode.h  |    2 +-
+ fs/gfs2/quota.c  |   13 +-----
+ fs/gfs2/super.c  |  111 +++++++++++++++++++++++++++++++++++-------------------
+ fs/gfs2/xattr.c  |    5 +-
+ 11 files changed, 157 insertions(+), 143 deletions(-)
+Merging hfsplus/for-next
+$ git merge hfsplus/for-next
+Already up-to-date.
+Merging jfs/next
+$ git merge jfs/next
+Already up-to-date.
+Merging logfs/master
+$ git merge logfs/master
+Auto-merging fs/logfs/logfs.h
+Merge made by recursive.
+ fs/logfs/dev_mtd.c   |   26 ++++++++++++--------------
+ fs/logfs/logfs.h     |    1 +
+ fs/logfs/readwrite.c |    4 ++++
+ fs/logfs/segment.c   |   14 ++++++++++----
+ fs/logfs/super.c     |    1 +
+ 5 files changed, 28 insertions(+), 18 deletions(-)
+Merging nfs/linux-next
+$ git merge nfs/linux-next
+Merge made by recursive.
+ fs/nfs/callback.h                   |    2 +-
+ fs/nfs/callback_proc.c              |   25 +++++++++++++++++++------
+ fs/nfs/callback_xdr.c               |   24 +++++++-----------------
+ fs/nfs/objlayout/objio_osd.c        |   28 ++++++++++++----------------
+ fs/nfs/objlayout/pnfs_osd_xdr_cli.c |    3 +++
+ 5 files changed, 42 insertions(+), 40 deletions(-)
+Merging nfsd/nfsd-next
+$ git merge nfsd/nfsd-next
+Already up-to-date.
+Merging nilfs2/for-next
+$ git merge nilfs2/for-next
+Already up-to-date.
+Merging ocfs2/linux-next
+$ git merge ocfs2/linux-next
+Auto-merging fs/ocfs2/move_extents.c
+Auto-merging fs/ocfs2/super.c
+Merge made by recursive.
+ fs/ocfs2/dlmglue.c      |   21 +++++++++++++++------
+ fs/ocfs2/ioctl.c        |    8 ++++----
+ fs/ocfs2/move_extents.c |    2 +-
+ fs/ocfs2/ocfs2.h        |    4 ++--
+ fs/ocfs2/super.c        |    3 ++-
+ 5 files changed, 24 insertions(+), 14 deletions(-)
+Merging omfs/for-next
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master
+$ git merge squashfs/master
+Already up-to-date.
+Merging udf/for_next
+$ git merge udf/for_next
+Already up-to-date.
+Merging v9fs/for-next
+$ git merge v9fs/for-next
+Merge made by recursive.
+ fs/9p/v9fs.c           |    2 -
+ fs/9p/v9fs_vfs.h       |    4 +-
+ fs/9p/vfs_inode.c      |   95 ++++++++++++++++++++++++++----------------------
+ fs/9p/vfs_inode_dotl.c |   31 ++++++++++------
+ fs/9p/vfs_super.c      |    2 +-
+ include/net/9p/9p.h    |    6 ---
+ net/9p/Kconfig         |    5 ---
+ net/9p/mod.c           |    2 -
+ net/9p/protocol.c      |    7 ----
+ net/9p/trans_virtio.c  |   12 +++++--
+ 10 files changed, 82 insertions(+), 84 deletions(-)
+Merging ubifs/linux-next
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/master
+$ git merge xfs/master
+Auto-merging fs/xfs/xfs_linux.h
+Auto-merging fs/xfs/xfs_quotaops.c
+Auto-merging fs/xfs/xfs_trace.c
+Merge made by recursive.
+ fs/xfs/Makefile                       |  117 ++++++++++++++++-----------------
+ fs/xfs/{linux-2.6 => }/kmem.c         |    0
+ fs/xfs/{linux-2.6 => }/kmem.h         |    0
+ fs/xfs/{linux-2.6 => }/mrlock.h       |    0
+ fs/xfs/{linux-2.6 => }/time.h         |    0
+ fs/xfs/{support => }/uuid.c           |    0
+ fs/xfs/{support => }/uuid.h           |    0
+ fs/xfs/xfs.h                          |    3 +-
+ fs/xfs/{linux-2.6 => }/xfs_acl.c      |    0
+ fs/xfs/{linux-2.6 => }/xfs_aops.c     |    0
+ fs/xfs/{linux-2.6 => }/xfs_aops.h     |    0
+ fs/xfs/{linux-2.6 => }/xfs_buf.c      |    0
+ fs/xfs/{linux-2.6 => }/xfs_buf.h      |    0
+ fs/xfs/{linux-2.6 => }/xfs_discard.c  |    0
+ fs/xfs/{linux-2.6 => }/xfs_discard.h  |    0
+ fs/xfs/{quota => }/xfs_dquot.c        |    0
+ fs/xfs/{quota => }/xfs_dquot.h        |    0
+ fs/xfs/{quota => }/xfs_dquot_item.c   |    0
+ fs/xfs/{quota => }/xfs_dquot_item.h   |    0
+ fs/xfs/{linux-2.6 => }/xfs_export.c   |    0
+ fs/xfs/{linux-2.6 => }/xfs_export.h   |    0
+ fs/xfs/{linux-2.6 => }/xfs_file.c     |    0
+ fs/xfs/{linux-2.6 => }/xfs_fs_subr.c  |    0
+ fs/xfs/{linux-2.6 => }/xfs_globals.c  |    0
+ fs/xfs/{linux-2.6 => }/xfs_ioctl.c    |    0
+ fs/xfs/{linux-2.6 => }/xfs_ioctl.h    |    0
+ fs/xfs/{linux-2.6 => }/xfs_ioctl32.c  |    0
+ fs/xfs/{linux-2.6 => }/xfs_ioctl32.h  |    0
+ fs/xfs/{linux-2.6 => }/xfs_iops.c     |    0
+ fs/xfs/{linux-2.6 => }/xfs_iops.h     |    0
+ fs/xfs/{linux-2.6 => }/xfs_linux.h    |   27 ++++----
+ fs/xfs/{linux-2.6 => }/xfs_message.c  |    0
+ fs/xfs/{linux-2.6 => }/xfs_message.h  |    0
+ fs/xfs/{quota => }/xfs_qm.c           |    0
+ fs/xfs/{quota => }/xfs_qm.h           |    0
+ fs/xfs/{quota => }/xfs_qm_bhv.c       |    0
+ fs/xfs/{quota => }/xfs_qm_stats.c     |    0
+ fs/xfs/{quota => }/xfs_qm_stats.h     |    0
+ fs/xfs/{quota => }/xfs_qm_syscalls.c  |    0
+ fs/xfs/{quota => }/xfs_quota_priv.h   |    0
+ fs/xfs/{linux-2.6 => }/xfs_quotaops.c |    2 +-
+ fs/xfs/{linux-2.6 => }/xfs_stats.c    |    0
+ fs/xfs/{linux-2.6 => }/xfs_stats.h    |    0
+ fs/xfs/{linux-2.6 => }/xfs_super.c    |    0
+ fs/xfs/{linux-2.6 => }/xfs_super.h    |    0
+ fs/xfs/{linux-2.6 => }/xfs_sync.c     |    0
+ fs/xfs/{linux-2.6 => }/xfs_sync.h     |    0
+ fs/xfs/{linux-2.6 => }/xfs_sysctl.c   |    0
+ fs/xfs/{linux-2.6 => }/xfs_sysctl.h   |    0
+ fs/xfs/{linux-2.6 => }/xfs_trace.c    |    4 +-
+ fs/xfs/{linux-2.6 => }/xfs_trace.h    |    0
+ fs/xfs/{quota => }/xfs_trans_dquot.c  |    0
+ fs/xfs/{linux-2.6 => }/xfs_vnode.h    |    0
+ fs/xfs/{linux-2.6 => }/xfs_xattr.c    |    0
+ kernel/sysctl_binary.c                |    2 +-
+ kernel/sysctl_check.c                 |    2 +-
+ 56 files changed, 76 insertions(+), 81 deletions(-)
+ rename fs/xfs/{linux-2.6 => }/kmem.c (100%)
+ rename fs/xfs/{linux-2.6 => }/kmem.h (100%)
+ rename fs/xfs/{linux-2.6 => }/mrlock.h (100%)
+ rename fs/xfs/{linux-2.6 => }/time.h (100%)
+ rename fs/xfs/{support => }/uuid.c (100%)
+ rename fs/xfs/{support => }/uuid.h (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_acl.c (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_aops.c (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_aops.h (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_buf.c (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_buf.h (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_discard.c (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_discard.h (100%)
+ rename fs/xfs/{quota => }/xfs_dquot.c (100%)
+ rename fs/xfs/{quota => }/xfs_dquot.h (100%)
+ rename fs/xfs/{quota => }/xfs_dquot_item.c (100%)
+ rename fs/xfs/{quota => }/xfs_dquot_item.h (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_export.c (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_export.h (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_file.c (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_fs_subr.c (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_globals.c (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_ioctl.c (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_ioctl.h (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_ioctl32.c (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_ioctl32.h (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_iops.c (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_iops.h (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_linux.h (96%)
+ rename fs/xfs/{linux-2.6 => }/xfs_message.c (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_message.h (100%)
+ rename fs/xfs/{quota => }/xfs_qm.c (100%)
+ rename fs/xfs/{quota => }/xfs_qm.h (100%)
+ rename fs/xfs/{quota => }/xfs_qm_bhv.c (100%)
+ rename fs/xfs/{quota => }/xfs_qm_stats.c (100%)
+ rename fs/xfs/{quota => }/xfs_qm_stats.h (100%)
+ rename fs/xfs/{quota => }/xfs_qm_syscalls.c (100%)
+ rename fs/xfs/{quota => }/xfs_quota_priv.h (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_quotaops.c (99%)
+ rename fs/xfs/{linux-2.6 => }/xfs_stats.c (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_stats.h (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_super.c (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_super.h (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_sync.c (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_sync.h (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_sysctl.c (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_sysctl.h (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_trace.c (96%)
+ rename fs/xfs/{linux-2.6 => }/xfs_trace.h (100%)
+ rename fs/xfs/{quota => }/xfs_trans_dquot.c (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_vnode.h (100%)
+ rename fs/xfs/{linux-2.6 => }/xfs_xattr.c (100%)
+$ git am -3 ../patches/xfs_fix_tracing_build.patch
+Applying: xfs: fix tracing builds inside the source tree
+$ git reset HEAD^
+Unstaged changes after reset:
+M      fs/xfs/Makefile
+$ git add .
+$ git commit -v -a --amend
+[master 23d3ad9] Merge remote-tracking branch 'xfs/master'
+Merging vfs/for-next
+$ git merge vfs/for-next
+Already up-to-date.
+Merging vfs-scale/vfs-scale-working
+$ git merge vfs-scale/vfs-scale-working
+Already up-to-date.
+Merging pci/linux-next
+$ git merge pci/linux-next
+Already up-to-date.
+Merging hid/for-next
+$ git merge hid/for-next
+Merge made by recursive.
+ .../ABI/testing/sysfs-driver-hid-logitech-lg4ff    |    7 +
+ drivers/hid/Kconfig                                |   19 +-
+ drivers/hid/Makefile                               |    2 +-
+ drivers/hid/hid-apple.c                            |    9 +
+ drivers/hid/hid-axff.c                             |   36 ++-
+ drivers/hid/hid-core.c                             |   50 ++-
+ drivers/hid/hid-debug.c                            |    5 +
+ drivers/hid/hid-ids.h                              |    7 +
+ drivers/hid/hid-lg.c                               |   29 +-
+ drivers/hid/hid-lg.h                               |    4 +-
+ drivers/hid/hid-lg4ff.c                            |  403 ++++++++++++++++++--
+ drivers/hid/hid-lgff.c                             |   13 -
+ drivers/hid/hid-magicmouse.c                       |   56 +++-
+ drivers/hid/hid-multitouch.c                       |   15 +
+ drivers/hid/hid-prodikeys.c                        |    8 +-
+ drivers/hid/hid-sjoy.c                             |   68 ++--
+ drivers/hid/hid-zydacron.c                         |    4 +-
+ drivers/hid/usbhid/hid-quirks.c                    |    1 -
+ include/linux/hid.h                                |    2 +
+ 19 files changed, 615 insertions(+), 123 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
+Merging quilt/i2c
+$ git merge quilt/i2c
+Already up-to-date.
+Merging bjdooks-i2c/next-i2c
+$ git merge bjdooks-i2c/next-i2c
+Already up-to-date.
+Merging quilt/jdelvare-hwmon
+$ git merge quilt/jdelvare-hwmon
+Already up-to-date.
+Merging hwmon-staging/hwmon-next
+$ git merge hwmon-staging/hwmon-next
+Already up-to-date.
+Merging quilt/kernel-doc
+$ git merge quilt/kernel-doc
+Already up-to-date.
+Merging docs/docs-move
+$ git merge docs/docs-move
+Already up-to-date.
+Merging v4l-dvb/master
+$ git merge v4l-dvb/master
+Already up-to-date.
+Merging kbuild/for-next
+$ git merge kbuild/for-next
+Merge made by recursive.
+ scripts/kconfig/menu.c  |   13 +++++--------
+ scripts/kconfig/nconf.c |    2 --
+ 2 files changed, 5 insertions(+), 10 deletions(-)
+Merging kconfig/for-next
+$ git merge kconfig/for-next
+Already up-to-date!
+Merge made by recursive.
+Merging ide/master
+$ git merge ide/master
+Already up-to-date.
+Merging libata/NEXT
+$ git merge libata/NEXT
+Already up-to-date.
+Merging infiniband/for-next
+$ git merge infiniband/for-next
+Merge made by recursive.
+ drivers/infiniband/ulp/ipoib/ipoib_main.c |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+Merging acpi/test
+$ git merge acpi/test
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by recursive.
+ Documentation/kernel-parameters.txt |    9 ++++++---
+ drivers/acpi/acpica/hwxface.c       |    3 +--
+ drivers/acpi/apei/Kconfig           |    1 +
+ drivers/acpi/apei/apei-base.c       |    2 +-
+ drivers/acpi/reboot.c               |    3 +--
+ drivers/acpi/scan.c                 |    3 +--
+ 6 files changed, 11 insertions(+), 10 deletions(-)
+Merging idle-test/idle-test
+$ git merge idle-test/idle-test
+Already up-to-date.
+Merging powertools/tools-test
+$ git merge powertools/tools-test
+Already up-to-date.
+Merging cpupowerutils/master
+$ git merge cpupowerutils/master
+Removing tools/power/cpupower/debug/x86_64/centrino-decode.c
+Removing tools/power/cpupower/debug/x86_64/powernow-k8-decode.c
+Merge made by recursive.
+ tools/power/cpupower/Makefile                      |    2 +-
+ tools/power/cpupower/debug/x86_64/Makefile         |    8 +-
+ .../power/cpupower/debug/x86_64/centrino-decode.c  |    1 -
+ .../cpupower/debug/x86_64/powernow-k8-decode.c     |    1 -
+ tools/power/cpupower/utils/helpers/helpers.h       |    3 +
+ tools/power/cpupower/utils/helpers/sysfs.c         |   50 ++++++
+ tools/power/cpupower/utils/helpers/sysfs.h         |    2 +
+ tools/power/cpupower/utils/helpers/topology.c      |    5 +-
+ .../cpupower/utils/idle_monitor/cpuidle_sysfs.c    |    2 +-
+ .../cpupower/utils/idle_monitor/cpupower-monitor.c |   18 ++-
+ .../cpupower/utils/idle_monitor/mperf_monitor.c    |  177 ++++++++++++++-----
+ 11 files changed, 210 insertions(+), 59 deletions(-)
+ delete mode 120000 tools/power/cpupower/debug/x86_64/centrino-decode.c
+ delete mode 120000 tools/power/cpupower/debug/x86_64/powernow-k8-decode.c
+Merging ieee1394/for-next
+$ git merge ieee1394/for-next
+Auto-merging drivers/firewire/core-device.c
+Merge made by recursive.
+ drivers/firewire/core-device.c |   15 ++++++++++-----
+ 1 files changed, 10 insertions(+), 5 deletions(-)
+Merging ubi/linux-next
+$ git merge ubi/linux-next
+Already up-to-date.
+Merging dlm/next
+$ git merge dlm/next
+Already up-to-date.
+Merging swiotlb/master
+$ git merge swiotlb/master
+Merge made by recursive.
+Merging ibft/master
+$ git merge ibft/master
+Merge made by recursive.
+Merging scsi/master
+$ git merge scsi/master
+Already up-to-date.
+Merging iscsi-target/for-next
+$ git merge iscsi-target/for-next
+Already up-to-date.
+Merging slave-dma/next
+$ git merge slave-dma/next
+Merge made by recursive.
+ drivers/dma/dmatest.c     |    6 ++++++
+ drivers/dma/mxs-dma.c     |   45 ++++++++++++++++++++++++---------------------
+ include/linux/dmaengine.h |   13 +++++++++++--
+ 3 files changed, 41 insertions(+), 23 deletions(-)
+Merging async_tx/next
+$ git merge async_tx/next
+Already up-to-date.
+Merging net/master
+$ git merge net/master
+Auto-merging MAINTAINERS
+Removing drivers/net/arm/Kconfig
+Removing drivers/net/arm/Makefile
+Removing drivers/net/benet/Kconfig
+Removing drivers/net/bna/bfi_ctreg.h
+Removing drivers/net/bna/bfi_ll.h
+Removing drivers/net/bna/bna_ctrl.c
+Removing drivers/net/bna/bna_hw.h
+Removing drivers/net/bna/bna_txrx.c
+Auto-merging drivers/net/ethernet/8390/axnet_cs.c
+Auto-merging drivers/net/ethernet/8390/etherh.c
+Auto-merging drivers/net/ethernet/8390/pcnet_cs.c
+Auto-merging drivers/net/ethernet/broadcom/cnic.c
+Auto-merging drivers/net/ethernet/brocade/bna/Makefile
+Auto-merging drivers/net/ethernet/brocade/bna/bfa_cee.c
+Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs.h
+Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
+Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.c
+Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.h
+Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
+Auto-merging drivers/net/ethernet/brocade/bna/bfi.h
+Auto-merging drivers/net/ethernet/brocade/bna/bna.h
+Auto-merging drivers/net/ethernet/brocade/bna/bna_types.h
+Auto-merging drivers/net/ethernet/brocade/bna/bnad.c
+Auto-merging drivers/net/ethernet/brocade/bna/bnad.h
+Auto-merging drivers/net/ethernet/brocade/bna/bnad_ethtool.c
+Auto-merging drivers/net/ethernet/brocade/bna/cna.h
+Auto-merging drivers/net/ethernet/dec/tulip/Kconfig
+Auto-merging drivers/net/ethernet/emulex/benet/be.h
+Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.c
+Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.h
+Auto-merging drivers/net/ethernet/emulex/benet/be_ethtool.c
+Auto-merging drivers/net/ethernet/emulex/benet/be_hw.h
+Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
+Auto-merging drivers/net/ethernet/freescale/fs_enet/Kconfig
+Auto-merging drivers/net/ethernet/freescale/ucc_geth.c
+Auto-merging drivers/net/ethernet/ibm/emac/Kconfig
+Auto-merging drivers/net/ethernet/icplus/ipg.c
+Auto-merging drivers/net/ethernet/intel/e1000e/Makefile
+Auto-merging drivers/net/ethernet/octeon/Kconfig
+Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic.h
+Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
+Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+Auto-merging drivers/net/ethernet/qlogic/qla3xxx.c
+Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
+Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
+Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+Auto-merging drivers/net/ethernet/sfc/Kconfig
+Auto-merging drivers/net/ethernet/smsc/smsc911x.c
+Auto-merging drivers/net/ethernet/stmicro/stmmac/Kconfig
+Auto-merging drivers/net/ethernet/sun/sungem.c
+Auto-merging drivers/net/ethernet/toshiba/spider_net.c
+Auto-merging drivers/net/ethernet/toshiba/spider_net.h
+Auto-merging drivers/net/ethernet/via/via-velocity.c
+Auto-merging drivers/net/ethernet/xscale/ixp2000/Kconfig
+Removing drivers/net/octeon/Makefile
+Removing drivers/net/pci-skeleton.c
+Auto-merging include/linux/sungem_phy.h
+Auto-merging net/ipv4/route.c
+Merge made by recursive.
+ Documentation/devicetree/bindings/net/smsc911x.txt |   38 +
+ MAINTAINERS                                        |  158 +-
+ arch/s390/include/asm/qdio.h                       |   78 +-
+ drivers/infiniband/hw/cxgb3/Makefile               |    2 +-
+ drivers/infiniband/hw/cxgb4/Makefile               |    2 +-
+ drivers/infiniband/hw/mlx4/Kconfig                 |    3 +-
+ drivers/net/Kconfig                                | 2829 +-------------
+ drivers/net/Makefile                               |  235 +--
+ drivers/net/arm/Kconfig                            |   74 -
+ drivers/net/arm/Makefile                           |   14 -
+ drivers/net/benet/Kconfig                          |    6 -
+ drivers/net/bna/bfi_ctreg.h                        |  646 ---
+ drivers/net/bna/bfi_ll.h                           |  438 --
+ drivers/net/bna/bna_ctrl.c                         | 3076 --------------
+ drivers/net/bna/bna_hw.h                           | 1490 -------
+ drivers/net/bna/bna_txrx.c                         | 4185 --------------------
+ drivers/net/bonding/bond_main.c                    |    9 +
+ drivers/net/{ => ethernet/3com}/3c501.c            |    0
+ drivers/net/{ => ethernet/3com}/3c501.h            |    0
+ drivers/net/{ => ethernet/3com}/3c509.c            |    0
+ drivers/net/{ => ethernet/3com}/3c515.c            |    0
+ drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c   |    0
+ drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c   |    0
+ drivers/net/{ => ethernet/3com}/3c59x.c            |    0
+ drivers/net/ethernet/3com/Kconfig                  |  120 +
+ drivers/net/ethernet/3com/Makefile                 |   11 +
+ drivers/net/{ => ethernet/3com}/typhoon.c          |    0
+ drivers/net/{ => ethernet/3com}/typhoon.h          |    0
+ drivers/net/{ => ethernet/8390}/3c503.c            |    0
+ drivers/net/{ => ethernet/8390}/3c503.h            |    0
+ drivers/net/{ => ethernet/8390}/8390.c             |    0
+ drivers/net/{ => ethernet/8390}/8390.h             |    0
+ drivers/net/{ => ethernet/8390}/8390p.c            |    0
+ drivers/net/ethernet/8390/Kconfig                  |  336 ++
+ drivers/net/ethernet/8390/Makefile                 |   29 +
+ drivers/net/{ => ethernet/8390}/ac3200.c           |    0
+ drivers/net/{ => ethernet/8390}/apne.c             |    0
+ drivers/net/{ => ethernet/8390}/ax88796.c          |    0
+ drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c   |    2 +-
+ drivers/net/{ => ethernet/8390}/e2100.c            |    0
+ drivers/net/{ => ethernet/8390}/es3210.c           |    0
+ drivers/net/{arm => ethernet/8390}/etherh.c        |    2 +-
+ drivers/net/{ => ethernet/8390}/hp-plus.c          |    0
+ drivers/net/{ => ethernet/8390}/hp.c               |    0
+ drivers/net/{ => ethernet/8390}/hydra.c            |    0
+ drivers/net/{ => ethernet/8390}/lib8390.c          |    0
+ drivers/net/{ => ethernet/8390}/lne390.c           |    0
+ drivers/net/{ => ethernet/8390}/mac8390.c          |    0
+ drivers/net/{ => ethernet/8390}/ne-h8300.c         |    0
+ drivers/net/{ => ethernet/8390}/ne.c               |    0
+ drivers/net/{ => ethernet/8390}/ne2.c              |    0
+ drivers/net/{ => ethernet/8390}/ne2k-pci.c         |    0
+ drivers/net/{ => ethernet/8390}/ne3210.c           |    0
+ drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c   |    2 +-
+ drivers/net/{ => ethernet/8390}/smc-mca.c          |    0
+ drivers/net/{ => ethernet/8390}/smc-ultra.c        |    0
+ drivers/net/{ => ethernet/8390}/smc-ultra32.c      |    0
+ drivers/net/{ => ethernet/8390}/stnic.c            |    0
+ drivers/net/{ => ethernet/8390}/wd.c               |    0
+ drivers/net/{ => ethernet/8390}/zorro8390.c        |    0
+ drivers/net/ethernet/Kconfig                       |  173 +
+ drivers/net/ethernet/Makefile                      |   74 +
+ drivers/net/ethernet/adaptec/Kconfig               |   34 +
+ drivers/net/ethernet/adaptec/Makefile              |    5 +
+ drivers/net/{ => ethernet/adaptec}/starfire.c      |    0
+ drivers/net/ethernet/adi/Kconfig                   |   68 +
+ drivers/net/ethernet/adi/Makefile                  |    5 +
+ drivers/net/{ => ethernet/adi}/bfin_mac.c          |    0
+ drivers/net/{ => ethernet/adi}/bfin_mac.h          |    0
+ drivers/net/ethernet/aeroflex/Kconfig              |   11 +
+ drivers/net/ethernet/aeroflex/Makefile             |    5 +
+ drivers/net/{ => ethernet/aeroflex}/greth.c        |    0
+ drivers/net/{ => ethernet/aeroflex}/greth.h        |    0
+ drivers/net/ethernet/alteon/Kconfig                |   47 +
+ drivers/net/ethernet/alteon/Makefile               |    5 +
+ drivers/net/{ => ethernet/alteon}/acenic.c         |    0
+ drivers/net/{ => ethernet/alteon}/acenic.h         |    0
+ drivers/net/{ => ethernet/amd}/7990.c              |    0
+ drivers/net/{ => ethernet/amd}/7990.h              |    0
+ drivers/net/ethernet/amd/Kconfig                   |  192 +
+ drivers/net/ethernet/amd/Makefile                  |   20 +
+ drivers/net/{ => ethernet/amd}/a2065.c             |    0
+ drivers/net/{ => ethernet/amd}/a2065.h             |    0
+ drivers/net/{arm => ethernet/amd}/am79c961a.c      |    0
+ drivers/net/{arm => ethernet/amd}/am79c961a.h      |    0
+ drivers/net/{ => ethernet/amd}/amd8111e.c          |    0
+ drivers/net/{ => ethernet/amd}/amd8111e.h          |    0
+ drivers/net/{ => ethernet/amd}/ariadne.c           |    0
+ drivers/net/{ => ethernet/amd}/ariadne.h           |    0
+ drivers/net/{ => ethernet/amd}/atarilance.c        |    0
+ drivers/net/{ => ethernet/amd}/au1000_eth.c        |    0
+ drivers/net/{ => ethernet/amd}/au1000_eth.h        |    0
+ drivers/net/{ => ethernet/amd}/declance.c          |    0
+ drivers/net/{ => ethernet/amd}/depca.c             |    0
+ drivers/net/{ => ethernet/amd}/depca.h             |    0
+ drivers/net/{ => ethernet/amd}/hplance.c           |    0
+ drivers/net/{ => ethernet/amd}/hplance.h           |    0
+ drivers/net/{ => ethernet/amd}/lance.c             |    0
+ drivers/net/{ => ethernet/amd}/mvme147.c           |    0
+ drivers/net/{ => ethernet/amd}/ni65.c              |    0
+ drivers/net/{ => ethernet/amd}/ni65.h              |    0
+ drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c   |    0
+ drivers/net/{ => ethernet/amd}/pcnet32.c           |    0
+ drivers/net/{ => ethernet/amd}/sun3lance.c         |    0
+ drivers/net/{ => ethernet/amd}/sunlance.c          |    0
+ drivers/net/ethernet/apple/Kconfig                 |   96 +
+ drivers/net/ethernet/apple/Makefile                |    9 +
+ drivers/net/{ => ethernet/apple}/bmac.c            |    0
+ drivers/net/{ => ethernet/apple}/bmac.h            |    0
+ drivers/net/{ => ethernet/apple}/cs89x0.c          |    0
+ drivers/net/{ => ethernet/apple}/cs89x0.h          |    0
+ drivers/net/{ => ethernet/apple}/mac89x0.c         |    0
+ drivers/net/{ => ethernet/apple}/mace.c            |    0
+ drivers/net/{ => ethernet/apple}/mace.h            |    0
+ drivers/net/{ => ethernet/apple}/macmace.c         |    0
+ drivers/net/ethernet/atheros/Kconfig               |   65 +
+ drivers/net/ethernet/atheros/Makefile              |    8 +
+ drivers/net/{ => ethernet/atheros}/atl1c/Makefile  |    0
+ drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h   |    0
+ .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c   |    0
+ .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c    |    0
+ .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h    |    0
+ .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c  |    0
+ drivers/net/{ => ethernet/atheros}/atl1e/Makefile  |    0
+ drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h   |    0
+ .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c   |    0
+ .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c    |    0
+ .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h    |    0
+ .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c  |    0
+ .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c |    0
+ drivers/net/{ => ethernet/atheros}/atlx/Makefile   |    0
+ drivers/net/{ => ethernet/atheros}/atlx/atl1.c     |    0
+ drivers/net/{ => ethernet/atheros}/atlx/atl1.h     |    0
+ drivers/net/{ => ethernet/atheros}/atlx/atl2.c     |    0
+ drivers/net/{ => ethernet/atheros}/atlx/atl2.h     |    0
+ drivers/net/{ => ethernet/atheros}/atlx/atlx.c     |    0
+ drivers/net/{ => ethernet/atheros}/atlx/atlx.h     |    0
+ drivers/net/ethernet/broadcom/Kconfig              |  119 +
+ drivers/net/ethernet/broadcom/Makefile             |   11 +
+ drivers/net/{ => ethernet/broadcom}/b44.c          |    0
+ drivers/net/{ => ethernet/broadcom}/b44.h          |    0
+ drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c |    0
+ drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h |    0
+ drivers/net/{ => ethernet/broadcom}/bnx2.c         |    0
+ drivers/net/{ => ethernet/broadcom}/bnx2.h         |    0
+ drivers/net/{ => ethernet/broadcom}/bnx2_fw.h      |    0
+ drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile |    0
+ drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h  |    0
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c  |    0
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h  |    0
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c  |    0
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h  |    0
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h |    0
+ .../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c  |    0
+ .../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h  |    0
+ .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h            |    0
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h  |    0
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h |    0
+ .../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h |    0
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c |    0
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h |    0
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c |    0
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h  |    0
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c   |    0
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h   |    0
+ .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c    |    0
+ .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h    |    0
+ drivers/net/{ => ethernet/broadcom}/cnic.c         |    4 +-
+ drivers/net/{ => ethernet/broadcom}/cnic.h         |    0
+ drivers/net/{ => ethernet/broadcom}/cnic_defs.h    |    0
+ drivers/net/{ => ethernet/broadcom}/cnic_if.h      |    0
+ drivers/net/{ => ethernet/broadcom}/sb1250-mac.c   |    0
+ drivers/net/{ => ethernet/broadcom}/tg3.c          |    0
+ drivers/net/{ => ethernet/broadcom}/tg3.h          |    0
+ drivers/net/ethernet/brocade/Kconfig               |   22 +
+ drivers/net/ethernet/brocade/Makefile              |    5 +
+ drivers/net/ethernet/brocade/bna/Kconfig           |   17 +
+ drivers/net/{ => ethernet/brocade}/bna/Makefile    |    5 +-
+ drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c   |    3 -
+ drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h   |    0
+ drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h    |    0
+ drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h  |   25 +-
+ .../net/{ => ethernet/brocade}/bna/bfa_defs_cna.h  |    0
+ .../{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h |   28 +-
+ .../{ => ethernet/brocade}/bna/bfa_defs_status.h   |    0
+ drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c   |  405 ++-
+ drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h   |   45 +-
+ .../net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c    |  157 +-
+ drivers/net/ethernet/brocade/bna/bfa_msgq.c        |  669 ++++
+ drivers/net/ethernet/brocade/bna/bfa_msgq.h        |  130 +
+ drivers/net/{ => ethernet/brocade}/bna/bfi.h       |  195 +-
+ drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h   |    0
+ drivers/net/ethernet/brocade/bna/bfi_enet.h        |  901 +++++
+ drivers/net/ethernet/brocade/bna/bfi_reg.h         |  452 +++
+ drivers/net/{ => ethernet/brocade}/bna/bna.h       |  337 +-
+ drivers/net/ethernet/brocade/bna/bna_enet.c        | 2129 ++++++++++
+ drivers/net/ethernet/brocade/bna/bna_hw_defs.h     |  413 ++
+ drivers/net/ethernet/brocade/bna/bna_tx_rx.c       | 3787 ++++++++++++++++++
+ drivers/net/{ => ethernet/brocade}/bna/bna_types.h |  654 ++--
+ drivers/net/{ => ethernet/brocade}/bna/bnad.c      |  643 ++--
+ drivers/net/{ => ethernet/brocade}/bna/bnad.h      |   38 +-
+ .../net/{ => ethernet/brocade}/bna/bnad_ethtool.c  |  384 +--
+ drivers/net/{ => ethernet/brocade}/bna/cna.h       |   31 +-
+ drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c |    0
+ drivers/net/ethernet/cadence/Kconfig               |   44 +
+ drivers/net/ethernet/cadence/Makefile              |    6 +
+ drivers/net/{arm => ethernet/cadence}/at91_ether.c |    0
+ drivers/net/{arm => ethernet/cadence}/at91_ether.h |    0
+ drivers/net/{ => ethernet/cadence}/macb.c          |    0
+ drivers/net/{ => ethernet/cadence}/macb.h          |    0
+ drivers/net/ethernet/chelsio/Kconfig               |  106 +
+ drivers/net/ethernet/chelsio/Makefile              |    8 +
+ .../{chelsio => ethernet/chelsio/cxgb}/Makefile    |    0
+ .../{chelsio => ethernet/chelsio/cxgb}/common.h    |    0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h  |    0
+ .../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h  |    0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c |    0
+ .../{chelsio => ethernet/chelsio/cxgb}/elmer0.h    |    0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/espi.c  |    0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/espi.h  |    0
+ .../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h |    0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h  |    0
+ .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c |    0
+ .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h |    0
+ .../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c |    0
+ .../{chelsio => ethernet/chelsio/cxgb}/my3126.c    |    0
+ .../{chelsio => ethernet/chelsio/cxgb}/pm3393.c    |    0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/regs.h  |    0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/sge.c   |    0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/sge.h   |    0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/subr.c  |    0
+ .../chelsio/cxgb}/suni1x10gexp_regs.h              |    0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/tp.c    |    0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/tp.h    |    0
+ .../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c   |    0
+ .../chelsio/cxgb}/vsc7326_reg.h                    |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile  |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c  |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/common.h  |    0
+ .../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h  |    0
+ .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h  |    0
+ .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h |    0
+ .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c  |    0
+ .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c   |    0
+ .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h   |    0
+ .../chelsio}/cxgb3/firmware_exports.h              |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c     |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h     |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c     |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h    |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c     |    0
+ .../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h    |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h  |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c   |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h  |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/version.h |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c   |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile  |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h   |    0
+ .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c  |    0
+ .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h   |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c     |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h     |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c     |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c   |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h   |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h  |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h |    0
+ .../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h    |    0
+ .../net/{ => ethernet/chelsio}/cxgb4vf/Makefile    |    0
+ .../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h   |    0
+ .../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c  |    0
+ drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c   |    0
+ .../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h   |    0
+ .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h |    0
+ .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c   |    0
+ drivers/net/ethernet/cirrus/Kconfig                |   28 +
+ drivers/net/ethernet/cirrus/Makefile               |    5 +
+ drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c  |    0
+ drivers/net/ethernet/cisco/Kconfig                 |   22 +
+ drivers/net/ethernet/cisco/Makefile                |    5 +
+ drivers/net/ethernet/cisco/enic/Kconfig            |    9 +
+ drivers/net/{ => ethernet/cisco}/enic/Makefile     |    0
+ drivers/net/{ => ethernet/cisco}/enic/cq_desc.h    |    0
+ .../net/{ => ethernet/cisco}/enic/cq_enet_desc.h   |    0
+ drivers/net/{ => ethernet/cisco}/enic/enic.h       |    0
+ drivers/net/{ => ethernet/cisco}/enic/enic_dev.c   |    0
+ drivers/net/{ => ethernet/cisco}/enic/enic_dev.h   |    0
+ drivers/net/{ => ethernet/cisco}/enic/enic_main.c  |    0
+ drivers/net/{ => ethernet/cisco}/enic/enic_pp.c    |    0
+ drivers/net/{ => ethernet/cisco}/enic/enic_pp.h    |    0
+ drivers/net/{ => ethernet/cisco}/enic/enic_res.c   |    0
+ drivers/net/{ => ethernet/cisco}/enic/enic_res.h   |    0
+ .../net/{ => ethernet/cisco}/enic/rq_enet_desc.h   |    0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c    |    0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h    |    0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c   |    0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h   |    0
+ .../net/{ => ethernet/cisco}/enic/vnic_devcmd.h    |    0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h  |    0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c  |    0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h  |    0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h   |    0
+ .../net/{ => ethernet/cisco}/enic/vnic_resource.h  |    0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c    |    0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h    |    0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h   |    0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h |    0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c   |    0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h   |    0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c    |    0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h    |    0
+ .../net/{ => ethernet/cisco}/enic/wq_enet_desc.h   |    0
+ drivers/net/ethernet/davicom/Kconfig               |   31 +
+ drivers/net/ethernet/davicom/Makefile              |    5 +
+ drivers/net/{ => ethernet/davicom}/dm9000.c        |    0
+ drivers/net/{ => ethernet/davicom}/dm9000.h        |    0
+ drivers/net/ethernet/dec/Kconfig                   |   36 +
+ drivers/net/ethernet/dec/Makefile                  |    6 +
+ drivers/net/{ => ethernet/dec}/ewrk3.c             |    0
+ drivers/net/{ => ethernet/dec}/ewrk3.h             |    0
+ drivers/net/{ => ethernet/dec}/tulip/21142.c       |    0
+ drivers/net/{ => ethernet/dec}/tulip/Kconfig       |   20 +-
+ drivers/net/{ => ethernet/dec}/tulip/Makefile      |    0
+ drivers/net/{ => ethernet/dec}/tulip/de2104x.c     |    0
+ drivers/net/{ => ethernet/dec}/tulip/de4x5.c       |    0
+ drivers/net/{ => ethernet/dec}/tulip/de4x5.h       |    0
+ drivers/net/{ => ethernet/dec}/tulip/dmfe.c        |    0
+ drivers/net/{ => ethernet/dec}/tulip/eeprom.c      |    0
+ drivers/net/{ => ethernet/dec}/tulip/interrupt.c   |    0
+ drivers/net/{ => ethernet/dec}/tulip/media.c       |    0
+ drivers/net/{ => ethernet/dec}/tulip/pnic.c        |    0
+ drivers/net/{ => ethernet/dec}/tulip/pnic2.c       |    0
+ drivers/net/{ => ethernet/dec}/tulip/timer.c       |    0
+ drivers/net/{ => ethernet/dec}/tulip/tulip.h       |    0
+ drivers/net/{ => ethernet/dec}/tulip/tulip_core.c  |    0
+ drivers/net/{ => ethernet/dec}/tulip/uli526x.c     |    0
+ drivers/net/{ => ethernet/dec}/tulip/winbond-840.c |    0
+ drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c   |    0
+ drivers/net/ethernet/dlink/Kconfig                 |   84 +
+ drivers/net/ethernet/dlink/Makefile                |    8 +
+ drivers/net/{ => ethernet/dlink}/de600.c           |    0
+ drivers/net/{ => ethernet/dlink}/de600.h           |    0
+ drivers/net/{ => ethernet/dlink}/de620.c           |    0
+ drivers/net/{ => ethernet/dlink}/de620.h           |    0
+ drivers/net/{ => ethernet/dlink}/dl2k.c            |    0
+ drivers/net/{ => ethernet/dlink}/dl2k.h            |    0
+ drivers/net/{ => ethernet/dlink}/sundance.c        |    0
+ drivers/net/{ => ethernet}/dnet.c                  |    0
+ drivers/net/{ => ethernet}/dnet.h                  |    0
+ drivers/net/ethernet/emulex/Kconfig                |   22 +
+ drivers/net/ethernet/emulex/Makefile               |    5 +
+ drivers/net/ethernet/emulex/benet/Kconfig          |    6 +
+ drivers/net/{ => ethernet/emulex}/benet/Makefile   |    0
+ drivers/net/{ => ethernet/emulex}/benet/be.h       |  123 +-
+ drivers/net/{ => ethernet/emulex}/benet/be_cmds.c  |  160 +-
+ drivers/net/{ => ethernet/emulex}/benet/be_cmds.h  |   91 +-
+ .../net/{ => ethernet/emulex}/benet/be_ethtool.c   |  154 +-
+ drivers/net/{ => ethernet/emulex}/benet/be_hw.h    |   21 +-
+ drivers/net/{ => ethernet/emulex}/benet/be_main.c  |  481 +--
+ drivers/net/{ => ethernet}/ethoc.c                 |    0
+ drivers/net/ethernet/faraday/Kconfig               |   38 +
+ drivers/net/ethernet/faraday/Makefile              |    6 +
+ drivers/net/{ => ethernet/faraday}/ftgmac100.c     |    0
+ drivers/net/{ => ethernet/faraday}/ftgmac100.h     |    0
+ drivers/net/{ => ethernet/faraday}/ftmac100.c      |    0
+ drivers/net/{ => ethernet/faraday}/ftmac100.h      |    0
+ drivers/net/{ => ethernet}/fealnx.c                |    0
+ drivers/net/ethernet/freescale/Kconfig             |   88 +
+ drivers/net/ethernet/freescale/Makefile            |   18 +
+ drivers/net/{ => ethernet/freescale}/fec.c         |    0
+ drivers/net/{ => ethernet/freescale}/fec.h         |    0
+ drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c |    0
+ drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h |    0
+ .../net/{ => ethernet/freescale}/fec_mpc52xx_phy.c |    0
+ .../net/{ => ethernet/freescale}/fs_enet/Kconfig   |    2 +-
+ .../net/{ => ethernet/freescale}/fs_enet/Makefile  |    0
+ drivers/net/{ => ethernet/freescale}/fs_enet/fec.h |    0
+ .../freescale}/fs_enet/fs_enet-main.c              |    0
+ .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h |    0
+ .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c |    0
+ .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c |    0
+ .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c |    0
+ .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c |    0
+ .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c |    0
+ drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c |    0
+ drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h |    0
+ drivers/net/{ => ethernet/freescale}/gianfar.c     |    0
+ drivers/net/{ => ethernet/freescale}/gianfar.h     |    0
+ .../net/{ => ethernet/freescale}/gianfar_ethtool.c |    0
+ drivers/net/{ => ethernet/freescale}/gianfar_ptp.c |    0
+ .../net/{ => ethernet/freescale}/gianfar_sysfs.c   |    0
+ drivers/net/{ => ethernet/freescale}/ucc_geth.c    |   10 +-
+ drivers/net/{ => ethernet/freescale}/ucc_geth.h    |    0
+ .../{ => ethernet/freescale}/ucc_geth_ethtool.c    |    0
+ drivers/net/ethernet/fujitsu/Kconfig               |   53 +
+ drivers/net/ethernet/fujitsu/Makefile              |    7 +
+ drivers/net/{ => ethernet/fujitsu}/at1700.c        |    0
+ drivers/net/{ => ethernet/fujitsu}/eth16i.c        |    0
+ .../net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c  |    0
+ drivers/net/ethernet/hp/Kconfig                    |   31 +
+ drivers/net/ethernet/hp/Makefile                   |    5 +
+ drivers/net/{ => ethernet/hp}/hp100.c              |    0
+ drivers/net/{ => ethernet/hp}/hp100.h              |    0
+ drivers/net/{ => ethernet/i825xx}/3c505.c          |    0
+ drivers/net/{ => ethernet/i825xx}/3c505.h          |    0
+ drivers/net/{ => ethernet/i825xx}/3c507.c          |    0
+ drivers/net/{ => ethernet/i825xx}/3c523.c          |    0
+ drivers/net/{ => ethernet/i825xx}/3c523.h          |    0
+ drivers/net/{ => ethernet/i825xx}/3c527.c          |    0
+ drivers/net/{ => ethernet/i825xx}/3c527.h          |    0
+ drivers/net/{ => ethernet/i825xx}/82596.c          |    0
+ drivers/net/ethernet/i825xx/Kconfig                |  182 +
+ drivers/net/ethernet/i825xx/Makefile               |   20 +
+ drivers/net/{ => ethernet/i825xx}/eepro.c          |    0
+ drivers/net/{ => ethernet/i825xx}/eexpress.c       |    0
+ drivers/net/{ => ethernet/i825xx}/eexpress.h       |    0
+ drivers/net/{arm => ethernet/i825xx}/ether1.c      |    0
+ drivers/net/{arm => ethernet/i825xx}/ether1.h      |    0
+ drivers/net/{ => ethernet/i825xx}/lasi_82596.c     |    0
+ drivers/net/{ => ethernet/i825xx}/lib82596.c       |    0
+ drivers/net/{ => ethernet/i825xx}/lp486e.c         |    0
+ drivers/net/{ => ethernet/i825xx}/ni52.c           |    0
+ drivers/net/{ => ethernet/i825xx}/ni52.h           |    0
+ drivers/net/{ => ethernet/i825xx}/sni_82596.c      |    0
+ drivers/net/{ => ethernet/i825xx}/sun3_82586.c     |    0
+ drivers/net/{ => ethernet/i825xx}/sun3_82586.h     |    0
+ drivers/net/{ => ethernet/i825xx}/znet.c           |    0
+ drivers/net/ethernet/ibm/Kconfig                   |   47 +
+ drivers/net/ethernet/ibm/Makefile                  |    8 +
+ drivers/net/{ => ethernet/ibm}/ehea/Makefile       |    0
+ drivers/net/{ => ethernet/ibm}/ehea/ehea.h         |    0
+ drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c |    0
+ drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h      |    0
+ drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c    |    0
+ drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c    |    0
+ drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h    |    0
+ drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c     |    0
+ drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h     |    0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/Kconfig |   40 +-
+ .../{ibm_newemac => ethernet/ibm/emac}/Makefile    |    0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/core.c  |    0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/core.h  |    0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/debug.c |    0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/debug.h |    0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/emac.h  |    0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/mal.c   |    0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/mal.h   |    0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/phy.c   |    0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/phy.h   |    0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c |    0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h |    0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/tah.c   |    0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/tah.h   |    0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.c  |    0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.h  |    0
+ drivers/net/{ => ethernet/ibm}/ibmveth.c           |    0
+ drivers/net/{ => ethernet/ibm}/ibmveth.h           |    0
+ drivers/net/{ => ethernet/ibm}/iseries_veth.c      |    0
+ drivers/net/ethernet/icplus/Kconfig                |   13 +
+ drivers/net/ethernet/icplus/Makefile               |    5 +
+ drivers/net/{ => ethernet/icplus}/ipg.c            |  197 +-
+ drivers/net/{ => ethernet/icplus}/ipg.h            |    0
+ drivers/net/ethernet/intel/Kconfig                 |  220 +
+ drivers/net/ethernet/intel/Makefile                |   12 +
+ drivers/net/{ => ethernet/intel}/e100.c            |    0
+ drivers/net/{ => ethernet/intel}/e1000/Makefile    |    0
+ drivers/net/{ => ethernet/intel}/e1000/e1000.h     |    0
+ .../net/{ => ethernet/intel}/e1000/e1000_ethtool.c |    0
+ drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c  |    0
+ drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h  |    0
+ .../net/{ => ethernet/intel}/e1000/e1000_main.c    |    0
+ .../net/{ => ethernet/intel}/e1000/e1000_osdep.h   |    0
+ .../net/{ => ethernet/intel}/e1000/e1000_param.c   |    0
+ .../intel/e1000e/80003es2lan.c}                    |    0
+ drivers/net/{ => ethernet/intel}/e1000e/82571.c    |    0
+ drivers/net/{ => ethernet/intel}/e1000e/Makefile   |    2 +-
+ drivers/net/{ => ethernet/intel}/e1000e/defines.h  |    0
+ drivers/net/{ => ethernet/intel}/e1000e/e1000.h    |    0
+ drivers/net/{ => ethernet/intel}/e1000e/ethtool.c  |    0
+ drivers/net/{ => ethernet/intel}/e1000e/hw.h       |    0
+ drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c  |    0
+ drivers/net/{ => ethernet/intel}/e1000e/lib.c      |    0
+ drivers/net/{ => ethernet/intel}/e1000e/netdev.c   |    0
+ drivers/net/{ => ethernet/intel}/e1000e/param.c    |    0
+ drivers/net/{ => ethernet/intel}/e1000e/phy.c      |    0
+ drivers/net/{ => ethernet/intel}/igb/Makefile      |    0
+ drivers/net/{ => ethernet/intel}/igb/e1000_82575.c |    0
+ drivers/net/{ => ethernet/intel}/igb/e1000_82575.h |    0
+ .../net/{ => ethernet/intel}/igb/e1000_defines.h   |    0
+ drivers/net/{ => ethernet/intel}/igb/e1000_hw.h    |    0
+ drivers/net/{ => ethernet/intel}/igb/e1000_mac.c   |    0
+ drivers/net/{ => ethernet/intel}/igb/e1000_mac.h   |    0
+ drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c   |    0
+ drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h   |    0
+ drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c   |    0
+ drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h   |    0
+ drivers/net/{ => ethernet/intel}/igb/e1000_phy.c   |    0
+ drivers/net/{ => ethernet/intel}/igb/e1000_phy.h   |    0
+ drivers/net/{ => ethernet/intel}/igb/e1000_regs.h  |    0
+ drivers/net/{ => ethernet/intel}/igb/igb.h         |    0
+ drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c |    0
+ drivers/net/{ => ethernet/intel}/igb/igb_main.c    |    0
+ drivers/net/{ => ethernet/intel}/igbvf/Makefile    |    0
+ drivers/net/{ => ethernet/intel}/igbvf/defines.h   |    0
+ drivers/net/{ => ethernet/intel}/igbvf/ethtool.c   |    0
+ drivers/net/{ => ethernet/intel}/igbvf/igbvf.h     |    0
+ drivers/net/{ => ethernet/intel}/igbvf/mbx.c       |    0
+ drivers/net/{ => ethernet/intel}/igbvf/mbx.h       |    0
+ drivers/net/{ => ethernet/intel}/igbvf/netdev.c    |    0
+ drivers/net/{ => ethernet/intel}/igbvf/regs.h      |    0
+ drivers/net/{ => ethernet/intel}/igbvf/vf.c        |    0
+ drivers/net/{ => ethernet/intel}/igbvf/vf.h        |    0
+ drivers/net/{ => ethernet/intel}/ixgb/Makefile     |    0
+ drivers/net/{ => ethernet/intel}/ixgb/ixgb.h       |    0
+ drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c    |    0
+ drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h    |    0
+ .../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c   |    0
+ drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c    |    0
+ drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h    |    0
+ drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h   |    0
+ drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c  |    0
+ drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h |    0
+ drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c |    0
+ drivers/net/{ => ethernet/intel}/ixgbe/Makefile    |    0
+ drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h     |    0
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c   |    0
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c   |    0
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c  |    0
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h  |    0
+ drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c |    0
+ drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h |    0
+ .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c   |    0
+ .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h   |    0
+ .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c   |    0
+ .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h   |    0
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c  |    0
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c |    0
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c    |    0
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h    |    0
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c    |    0
+ drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c |    0
+ drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h |    0
+ drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c |    0
+ drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h |    0
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c   |    0
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h   |    0
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h    |    0
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c    |    0
+ drivers/net/{ => ethernet/intel}/ixgbevf/Makefile  |    0
+ drivers/net/{ => ethernet/intel}/ixgbevf/defines.h |    0
+ drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c |    0
+ drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h |    0
+ .../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c    |    0
+ drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c     |    0
+ drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h     |    0
+ drivers/net/{ => ethernet/intel}/ixgbevf/regs.h    |    0
+ drivers/net/{ => ethernet/intel}/ixgbevf/vf.c      |    0
+ drivers/net/{ => ethernet/intel}/ixgbevf/vf.h      |    0
+ drivers/net/{ => ethernet}/jme.c                   |    0
+ drivers/net/{ => ethernet}/jme.h                   |    0
+ drivers/net/{ => ethernet}/korina.c                |    0
+ drivers/net/{ => ethernet}/lantiq_etop.c           |    0
+ drivers/net/ethernet/marvell/Kconfig               |  110 +
+ drivers/net/ethernet/marvell/Makefile              |    8 +
+ drivers/net/{ => ethernet/marvell}/mv643xx_eth.c   |    0
+ drivers/net/{ => ethernet/marvell}/pxa168_eth.c    |    0
+ drivers/net/{ => ethernet/marvell}/skge.c          |    0
+ drivers/net/{ => ethernet/marvell}/skge.h          |    0
+ drivers/net/{ => ethernet/marvell}/sky2.c          |    0
+ drivers/net/{ => ethernet/marvell}/sky2.h          |    0
+ drivers/net/ethernet/mellanox/Kconfig              |   22 +
+ drivers/net/ethernet/mellanox/Makefile             |    5 +
+ drivers/net/ethernet/mellanox/mlx4/Kconfig         |   27 +
+ drivers/net/{ => ethernet/mellanox}/mlx4/Makefile  |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c   |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/catas.c   |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c     |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/cq.c      |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c   |    0
+ .../net/{ => ethernet/mellanox}/mlx4/en_ethtool.c  |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c |    0
+ .../net/{ => ethernet/mellanox}/mlx4/en_netdev.c   |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h |    0
+ .../{ => ethernet/mellanox}/mlx4/en_resources.c    |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c   |    0
+ .../net/{ => ethernet/mellanox}/mlx4/en_selftest.c |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c   |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/eq.c      |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/fw.c      |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/fw.h      |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/icm.c     |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/icm.h     |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/intf.c    |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/main.c    |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c     |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h    |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/mr.c      |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/pd.c      |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/port.c    |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/profile.c |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/qp.c      |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/reset.c   |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/sense.c   |    0
+ drivers/net/{ => ethernet/mellanox}/mlx4/srq.c     |    0
+ drivers/net/ethernet/micrel/Kconfig                |   64 +
+ drivers/net/ethernet/micrel/Makefile               |    9 +
+ drivers/net/{arm => ethernet/micrel}/ks8695net.c   |    0
+ drivers/net/{arm => ethernet/micrel}/ks8695net.h   |    0
+ drivers/net/{ => ethernet/micrel}/ks8842.c         |    0
+ drivers/net/{ => ethernet/micrel}/ks8851.c         |    0
+ drivers/net/{ => ethernet/micrel}/ks8851.h         |    0
+ drivers/net/{ => ethernet/micrel}/ks8851_mll.c     |    0
+ drivers/net/{ => ethernet/micrel}/ksz884x.c        |    0
+ drivers/net/ethernet/microchip/Kconfig             |   37 +
+ drivers/net/ethernet/microchip/Makefile            |    5 +
+ drivers/net/{ => ethernet/microchip}/enc28j60.c    |    0
+ drivers/net/{ => ethernet/microchip}/enc28j60_hw.h |    0
+ drivers/net/{ => ethernet}/mipsnet.c               |    0
+ drivers/net/ethernet/myricom/Kconfig               |   46 +
+ drivers/net/ethernet/myricom/Makefile              |    5 +
+ .../net/{ => ethernet/myricom}/myri10ge/Makefile   |    0
+ .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c |    0
+ .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h |    0
+ .../myricom}/myri10ge/myri10ge_mcp_gen_header.h    |    0
+ drivers/net/ethernet/natsemi/Kconfig               |   82 +
+ drivers/net/ethernet/natsemi/Makefile              |   10 +
+ drivers/net/{ => ethernet/natsemi}/ibmlana.c       |    0
+ drivers/net/{ => ethernet/natsemi}/ibmlana.h       |    0
+ drivers/net/{ => ethernet/natsemi}/jazzsonic.c     |    0
+ drivers/net/{ => ethernet/natsemi}/macsonic.c      |    0
+ drivers/net/{ => ethernet/natsemi}/natsemi.c       |    0
+ drivers/net/{ => ethernet/natsemi}/ns83820.c       |    0
+ drivers/net/{ => ethernet/natsemi}/sonic.c         |    0
+ drivers/net/{ => ethernet/natsemi}/sonic.h         |    0
+ drivers/net/{ => ethernet/natsemi}/xtsonic.c       |    0
+ drivers/net/ethernet/neterion/Kconfig              |   54 +
+ drivers/net/ethernet/neterion/Makefile             |    6 +
+ drivers/net/{ => ethernet/neterion}/s2io-regs.h    |    0
+ drivers/net/{ => ethernet/neterion}/s2io.c         |    0
+ drivers/net/{ => ethernet/neterion}/s2io.h         |    0
+ drivers/net/{ => ethernet/neterion}/vxge/Makefile  |    0
+ .../net/{ => ethernet/neterion}/vxge/vxge-config.c |    0
+ .../net/{ => ethernet/neterion}/vxge/vxge-config.h |    0
+ .../{ => ethernet/neterion}/vxge/vxge-ethtool.c    |    0
+ .../{ => ethernet/neterion}/vxge/vxge-ethtool.h    |    0
+ .../net/{ => ethernet/neterion}/vxge/vxge-main.c   |    0
+ .../net/{ => ethernet/neterion}/vxge/vxge-main.h   |    0
+ .../net/{ => ethernet/neterion}/vxge/vxge-reg.h    |    0
+ .../{ => ethernet/neterion}/vxge/vxge-traffic.c    |    0
+ .../{ => ethernet/neterion}/vxge/vxge-traffic.h    |    0
+ .../{ => ethernet/neterion}/vxge/vxge-version.h    |    0
+ drivers/net/{ => ethernet}/netx-eth.c              |    0
+ drivers/net/ethernet/nuvoton/Kconfig               |   29 +
+ drivers/net/ethernet/nuvoton/Makefile              |    5 +
+ .../net/{arm => ethernet/nuvoton}/w90p910_ether.c  |    0
+ drivers/net/ethernet/nvidia/Kconfig                |   31 +
+ drivers/net/ethernet/nvidia/Makefile               |    5 +
+ drivers/net/{ => ethernet/nvidia}/forcedeth.c      |    0
+ drivers/net/{ => ethernet}/octeon/Kconfig          |    6 +-
+ drivers/net/ethernet/octeon/Makefile               |    5 +
+ drivers/net/{ => ethernet}/octeon/octeon_mgmt.c    |    0
+ drivers/net/ethernet/oki-semi/Kconfig              |   22 +
+ drivers/net/ethernet/oki-semi/Makefile             |    5 +
+ drivers/net/ethernet/oki-semi/pch_gbe/Kconfig      |   20 +
+ .../net/{ => ethernet/oki-semi}/pch_gbe/Makefile   |    0
+ .../net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h  |    0
+ .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c  |    0
+ .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h  |    0
+ .../oki-semi}/pch_gbe/pch_gbe_ethtool.c            |    0
+ .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c |    0
+ .../oki-semi}/pch_gbe/pch_gbe_param.c              |    0
+ .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c  |    0
+ .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h  |    0
+ drivers/net/ethernet/packetengines/Kconfig         |   46 +
+ drivers/net/ethernet/packetengines/Makefile        |    6 +
+ drivers/net/{ => ethernet/packetengines}/hamachi.c |    0
+ .../net/{ => ethernet/packetengines}/yellowfin.c   |    0
+ drivers/net/ethernet/pasemi/Kconfig                |   29 +
+ drivers/net/ethernet/pasemi/Makefile               |    5 +
+ drivers/net/{ => ethernet/pasemi}/pasemi_mac.c     |    0
+ drivers/net/{ => ethernet/pasemi}/pasemi_mac.h     |    0
+ .../net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c |    0
+ drivers/net/ethernet/qlogic/Kconfig                |   53 +
+ drivers/net/ethernet/qlogic/Makefile               |    8 +
+ drivers/net/{ => ethernet/qlogic}/netxen/Makefile  |    0
+ .../net/{ => ethernet/qlogic}/netxen/netxen_nic.h  |    6 +
+ .../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c  |    0
+ .../qlogic}/netxen/netxen_nic_ethtool.c            |    0
+ .../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h  |    0
+ .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c   |    0
+ .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h   |    0
+ .../{ => ethernet/qlogic}/netxen/netxen_nic_init.c |    8 +-
+ .../{ => ethernet/qlogic}/netxen/netxen_nic_main.c |  103 +-
+ drivers/net/{ => ethernet/qlogic}/qla3xxx.c        |    2 +-
+ drivers/net/{ => ethernet/qlogic}/qla3xxx.h        |    0
+ drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile  |    0
+ drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h  |    6 +-
+ .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c  |    0
+ .../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c  |   22 +-
+ .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h  |    0
+ .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c   |    4 +-
+ .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c |    3 +-
+ .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c |   40 +-
+ drivers/net/{ => ethernet/qlogic}/qlge/Makefile    |    0
+ drivers/net/{ => ethernet/qlogic}/qlge/qlge.h      |    0
+ drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c  |    0
+ .../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c  |    0
+ drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c |    0
+ drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c  |    0
+ drivers/net/ethernet/racal/Kconfig                 |   32 +
+ drivers/net/ethernet/racal/Makefile                |    5 +
+ drivers/net/{ => ethernet/racal}/ni5010.c          |    0
+ drivers/net/{ => ethernet/racal}/ni5010.h          |    0
+ drivers/net/ethernet/rdc/Kconfig                   |   33 +
+ drivers/net/ethernet/rdc/Makefile                  |    5 +
+ drivers/net/{ => ethernet/rdc}/r6040.c             |    0
+ drivers/net/{ => ethernet/realtek}/8139cp.c        |    0
+ drivers/net/{ => ethernet/realtek}/8139too.c       |    0
+ drivers/net/ethernet/realtek/Kconfig               |  126 +
+ drivers/net/ethernet/realtek/Makefile              |    9 +
+ drivers/net/{ => ethernet/realtek}/atp.c           |    0
+ drivers/net/{ => ethernet/realtek}/atp.h           |    0
+ drivers/net/{ => ethernet/realtek}/r8169.c         |    0
+ drivers/net/{ => ethernet/realtek}/sc92031.c       |    0
+ drivers/net/ethernet/renesas/Kconfig               |   18 +
+ drivers/net/ethernet/renesas/Makefile              |    5 +
+ drivers/net/{ => ethernet/renesas}/sh_eth.c        |    0
+ drivers/net/{ => ethernet/renesas}/sh_eth.h        |    0
+ drivers/net/{ => ethernet}/s6gmac.c                |    0
+ drivers/net/ethernet/seeq/Kconfig                  |   45 +
+ drivers/net/ethernet/seeq/Makefile                 |    7 +
+ drivers/net/{arm => ethernet/seeq}/ether3.c        |    0
+ drivers/net/{arm => ethernet/seeq}/ether3.h        |    0
+ drivers/net/{ => ethernet/seeq}/seeq8005.c         |    0
+ drivers/net/{ => ethernet/seeq}/seeq8005.h         |    0
+ drivers/net/{ => ethernet/seeq}/sgiseeq.c          |    0
+ drivers/net/{ => ethernet/seeq}/sgiseeq.h          |    0
+ drivers/net/{ => ethernet}/sfc/Kconfig             |    4 +-
+ drivers/net/{ => ethernet}/sfc/Makefile            |    0
+ drivers/net/{ => ethernet}/sfc/bitfield.h          |    0
+ drivers/net/{ => ethernet}/sfc/efx.c               |    0
+ drivers/net/{ => ethernet}/sfc/efx.h               |    0
+ drivers/net/{ => ethernet}/sfc/enum.h              |    0
+ drivers/net/{ => ethernet}/sfc/ethtool.c           |    0
+ drivers/net/{ => ethernet}/sfc/falcon.c            |    0
+ drivers/net/{ => ethernet}/sfc/falcon_boards.c     |    0
+ drivers/net/{ => ethernet}/sfc/falcon_xmac.c       |    0
+ drivers/net/{ => ethernet}/sfc/filter.c            |    0
+ drivers/net/{ => ethernet}/sfc/filter.h            |    0
+ drivers/net/{ => ethernet}/sfc/io.h                |    0
+ drivers/net/{ => ethernet}/sfc/mac.h               |    0
+ drivers/net/{ => ethernet}/sfc/mcdi.c              |    0
+ drivers/net/{ => ethernet}/sfc/mcdi.h              |    0
+ drivers/net/{ => ethernet}/sfc/mcdi_mac.c          |    0
+ drivers/net/{ => ethernet}/sfc/mcdi_pcol.h         |    0
+ drivers/net/{ => ethernet}/sfc/mcdi_phy.c          |    0
+ drivers/net/{ => ethernet}/sfc/mdio_10g.c          |    0
+ drivers/net/{ => ethernet}/sfc/mdio_10g.h          |    0
+ drivers/net/{ => ethernet}/sfc/mtd.c               |    0
+ drivers/net/{ => ethernet}/sfc/net_driver.h        |    0
+ drivers/net/{ => ethernet}/sfc/nic.c               |    0
+ drivers/net/{ => ethernet}/sfc/nic.h               |    0
+ drivers/net/{ => ethernet}/sfc/phy.h               |    0
+ drivers/net/{ => ethernet}/sfc/qt202x_phy.c        |    0
+ drivers/net/{ => ethernet}/sfc/regs.h              |    0
+ drivers/net/{ => ethernet}/sfc/rx.c                |    0
+ drivers/net/{ => ethernet}/sfc/selftest.c          |    0
+ drivers/net/{ => ethernet}/sfc/selftest.h          |    0
+ drivers/net/{ => ethernet}/sfc/siena.c             |    0
+ drivers/net/{ => ethernet}/sfc/spi.h               |    0
+ drivers/net/{ => ethernet}/sfc/tenxpress.c         |    0
+ drivers/net/{ => ethernet}/sfc/tx.c                |    0
+ drivers/net/{ => ethernet}/sfc/txc43128_phy.c      |    0
+ drivers/net/{ => ethernet}/sfc/workarounds.h       |    0
+ drivers/net/ethernet/sgi/Kconfig                   |   34 +
+ drivers/net/ethernet/sgi/Makefile                  |    6 +
+ drivers/net/{ => ethernet/sgi}/ioc3-eth.c          |    0
+ drivers/net/{ => ethernet/sgi}/meth.c              |    0
+ drivers/net/{ => ethernet/sgi}/meth.h              |    0
+ drivers/net/ethernet/sis/Kconfig                   |   50 +
+ drivers/net/ethernet/sis/Makefile                  |    6 +
+ drivers/net/{ => ethernet/sis}/sis190.c            |    0
+ drivers/net/{ => ethernet/sis}/sis900.c            |    0
+ drivers/net/{ => ethernet/sis}/sis900.h            |    0
+ drivers/net/ethernet/smsc/Kconfig                  |  131 +
+ drivers/net/ethernet/smsc/Makefile                 |   11 +
+ drivers/net/{ => ethernet/smsc}/epic100.c          |    0
+ drivers/net/{ => ethernet/smsc}/smc911x.c          |    0
+ drivers/net/{ => ethernet/smsc}/smc911x.h          |    0
+ drivers/net/{ => ethernet/smsc}/smc9194.c          |    0
+ drivers/net/{ => ethernet/smsc}/smc9194.h          |    0
+ .../net/{pcmcia => ethernet/smsc}/smc91c92_cs.c    |    0
+ drivers/net/{ => ethernet/smsc}/smc91x.c           |    0
+ drivers/net/{ => ethernet/smsc}/smc91x.h           |    0
+ drivers/net/{ => ethernet/smsc}/smsc911x.c         |   85 +-
+ drivers/net/{ => ethernet/smsc}/smsc911x.h         |    0
+ drivers/net/{ => ethernet/smsc}/smsc9420.c         |    0
+ drivers/net/{ => ethernet/smsc}/smsc9420.h         |    0
+ drivers/net/ethernet/stmicro/Kconfig               |   22 +
+ drivers/net/ethernet/stmicro/Makefile              |    5 +
+ drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig  |   14 +-
+ drivers/net/{ => ethernet/stmicro}/stmmac/Makefile |    0
+ drivers/net/{ => ethernet/stmicro}/stmmac/common.h |    0
+ drivers/net/{ => ethernet/stmicro}/stmmac/descs.h  |    0
+ .../net/{ => ethernet/stmicro}/stmmac/dwmac100.h   |    0
+ .../net/{ => ethernet/stmicro}/stmmac/dwmac1000.h  |    0
+ .../{ => ethernet/stmicro}/stmmac/dwmac1000_core.c |    0
+ .../{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c  |    0
+ .../{ => ethernet/stmicro}/stmmac/dwmac100_core.c  |    0
+ .../{ => ethernet/stmicro}/stmmac/dwmac100_dma.c   |    0
+ .../net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h  |    0
+ .../net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c  |    0
+ .../net/{ => ethernet/stmicro}/stmmac/enh_desc.c   |    0
+ .../net/{ => ethernet/stmicro}/stmmac/norm_desc.c  |    0
+ drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h |    0
+ .../{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c |    0
+ .../{ => ethernet/stmicro}/stmmac/stmmac_main.c    |    0
+ .../{ => ethernet/stmicro}/stmmac/stmmac_mdio.c    |    0
+ .../{ => ethernet/stmicro}/stmmac/stmmac_timer.c   |    0
+ .../{ => ethernet/stmicro}/stmmac/stmmac_timer.h   |    0
+ drivers/net/ethernet/sun/Kconfig                   |   87 +
+ drivers/net/ethernet/sun/Makefile                  |   11 +
+ drivers/net/{ => ethernet/sun}/cassini.c           |    0
+ drivers/net/{ => ethernet/sun}/cassini.h           |    0
+ drivers/net/{ => ethernet/sun}/niu.c               |    0
+ drivers/net/{ => ethernet/sun}/niu.h               |    0
+ drivers/net/{ => ethernet/sun}/sunbmac.c           |    0
+ drivers/net/{ => ethernet/sun}/sunbmac.h           |    0
+ drivers/net/{ => ethernet/sun}/sungem.c            |    4 +-
+ drivers/net/{ => ethernet/sun}/sungem.h            |    0
+ drivers/net/{ => ethernet/sun}/sunhme.c            |    0
+ drivers/net/{ => ethernet/sun}/sunhme.h            |    0
+ drivers/net/{ => ethernet/sun}/sunqe.c             |    0
+ drivers/net/{ => ethernet/sun}/sunqe.h             |    0
+ drivers/net/{ => ethernet/sun}/sunvnet.c           |    0
+ drivers/net/{ => ethernet/sun}/sunvnet.h           |    0
+ drivers/net/ethernet/tehuti/Kconfig                |   26 +
+ drivers/net/ethernet/tehuti/Makefile               |    5 +
+ drivers/net/{ => ethernet/tehuti}/tehuti.c         |    0
+ drivers/net/{ => ethernet/tehuti}/tehuti.h         |    0
+ drivers/net/ethernet/ti/Kconfig                    |   76 +
+ drivers/net/ethernet/ti/Makefile                   |    9 +
+ drivers/net/{ => ethernet/ti}/cpmac.c              |    0
+ drivers/net/{ => ethernet/ti}/davinci_cpdma.c      |    0
+ drivers/net/{ => ethernet/ti}/davinci_cpdma.h      |    0
+ drivers/net/{ => ethernet/ti}/davinci_emac.c       |    0
+ drivers/net/{ => ethernet/ti}/davinci_mdio.c       |    0
+ drivers/net/{ => ethernet/ti}/tlan.c               |    0
+ drivers/net/{ => ethernet/ti}/tlan.h               |    0
+ drivers/net/ethernet/tile/Kconfig                  |   15 +
+ drivers/net/{ => ethernet}/tile/Makefile           |    0
+ drivers/net/{ => ethernet}/tile/tilepro.c          |    0
+ drivers/net/ethernet/toshiba/Kconfig               |   56 +
+ drivers/net/ethernet/toshiba/Makefile              |   10 +
+ drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c |    0
+ drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h |    0
+ .../{ => ethernet/toshiba}/ps3_gelic_wireless.c    |    0
+ .../{ => ethernet/toshiba}/ps3_gelic_wireless.h    |    0
+ drivers/net/{ => ethernet/toshiba}/spider_net.c    |    4 +-
+ drivers/net/{ => ethernet/toshiba}/spider_net.h    |    2 +-
+ .../{ => ethernet/toshiba}/spider_net_ethtool.c    |    0
+ drivers/net/{ => ethernet/toshiba}/tc35815.c       |    0
+ drivers/net/ethernet/tundra/Kconfig                |   28 +
+ drivers/net/ethernet/tundra/Makefile               |    5 +
+ drivers/net/{ => ethernet/tundra}/tsi108_eth.c     |    0
+ drivers/net/{ => ethernet/tundra}/tsi108_eth.h     |    0
+ drivers/net/ethernet/via/Kconfig                   |   56 +
+ drivers/net/ethernet/via/Makefile                  |    6 +
+ drivers/net/{ => ethernet/via}/via-rhine.c         |    0
+ drivers/net/{ => ethernet/via}/via-velocity.c      |  146 +-
+ drivers/net/{ => ethernet/via}/via-velocity.h      |    0
+ drivers/net/ethernet/xilinx/Kconfig                |   35 +
+ drivers/net/ethernet/xilinx/Makefile               |    7 +
+ drivers/net/{ => ethernet/xilinx}/ll_temac.h       |    0
+ drivers/net/{ => ethernet/xilinx}/ll_temac_main.c  |    0
+ drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c  |    0
+ .../net/{ => ethernet/xilinx}/xilinx_emaclite.c    |    0
+ drivers/net/ethernet/xircom/Kconfig                |   30 +
+ drivers/net/ethernet/xircom/Makefile               |    5 +
+ .../net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c   |    0
+ drivers/net/ethernet/xscale/Kconfig                |   31 +
+ drivers/net/ethernet/xscale/Makefile               |    6 +
+ drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig  |    2 +-
+ drivers/net/{ => ethernet/xscale}/ixp2000/Makefile |    0
+ drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c  |    0
+ drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h  |    0
+ .../net/{ => ethernet/xscale}/ixp2000/enp2611.c    |    0
+ .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.c    |    0
+ .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.h    |    0
+ .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc    |    0
+ .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode |    0
+ .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc    |    0
+ .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode |    0
+ drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c |    0
+ drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h |    0
+ .../{ => ethernet/xscale}/ixp2000/ixpdev_priv.h    |    0
+ drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c |    0
+ drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h |    0
+ drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c  |    0
+ drivers/net/octeon/Makefile                        |    2 -
+ drivers/net/pci-skeleton.c                         | 1923 ---------
+ drivers/net/pcmcia/Kconfig                         |   78 -
+ drivers/net/pcmcia/Makefile                        |    8 -
+ drivers/net/slip.c                                 |   29 +-
+ drivers/net/slip.h                                 |    9 -
+ drivers/net/sungem_phy.c                           |    7 +-
+ drivers/net/usb/lg-vl600.c                         |   19 +
+ drivers/s390/cio/qdio.h                            |   38 +-
+ drivers/s390/cio/qdio_debug.c                      |    3 +
+ drivers/s390/cio/qdio_main.c                       |  208 +-
+ drivers/s390/cio/qdio_setup.c                      |   83 +-
+ drivers/s390/cio/qdio_thinint.c                    |   88 +-
+ drivers/s390/net/qeth_core.h                       |   50 +-
+ drivers/s390/net/qeth_core_main.c                  |  777 ++++-
+ drivers/s390/net/qeth_l2_main.c                    |    2 +-
+ drivers/s390/net/qeth_l3.h                         |    4 +
+ drivers/s390/net/qeth_l3_main.c                    |   88 +-
+ drivers/s390/net/qeth_l3_sys.c                     |  110 +-
+ drivers/scsi/bnx2fc/Kconfig                        |    3 +-
+ drivers/scsi/bnx2fc/bnx2fc.h                       |    2 +-
+ drivers/scsi/bnx2i/Kconfig                         |    3 +-
+ drivers/scsi/bnx2i/bnx2i.h                         |    2 +-
+ drivers/scsi/cxgbi/cxgb3i/Kbuild                   |    2 +-
+ drivers/scsi/cxgbi/cxgb3i/Kconfig                  |    3 +-
+ drivers/scsi/cxgbi/cxgb4i/Kbuild                   |    2 +-
+ drivers/scsi/cxgbi/cxgb4i/Kconfig                  |    3 +-
+ include/linux/if_ether.h                           |    1 +
+ {drivers/net => include/linux}/sungem_phy.h        |    2 +-
+ include/net/addrconf.h                             |    2 +-
+ include/net/if_inet6.h                             |    1 +
+ include/net/iucv/af_iucv.h                         |   52 +
+ include/net/iucv/iucv.h                            |   36 +-
+ net/802/garp.c                                     |    4 +-
+ net/802/stp.c                                      |    4 +-
+ net/8021q/vlan.c                                   |    2 +-
+ net/bridge/netfilter/ebtable_broute.c              |    4 +-
+ net/caif/cfmuxl.c                                  |    6 +-
+ net/can/af_can.c                                   |    4 +-
+ net/core/dev.c                                     |   14 +-
+ net/core/dst.c                                     |   15 +-
+ net/core/fib_rules.c                               |    4 +-
+ net/core/filter.c                                  |    2 +-
+ net/core/neighbour.c                               |   40 +-
+ net/core/net-sysfs.c                               |    8 +-
+ net/core/netpoll.c                                 |    4 +-
+ net/core/rtnetlink.c                               |    1 -
+ net/core/sock.c                                    |    4 +-
+ net/dccp/ccids/ccid2.c                             |   84 +-
+ net/dccp/ccids/ccid2.h                             |    6 +
+ net/dccp/dccp.h                                    |    1 +
+ net/dccp/feat.c                                    |  202 +-
+ net/dccp/feat.h                                    |    1 +
+ net/dccp/proto.c                                   |    1 -
+ net/decnet/dn_dev.c                                |    6 +-
+ net/ipv4/devinet.c                                 |    6 +-
+ net/ipv4/fib_trie.c                                |   12 +-
+ net/ipv4/gre.c                                     |    4 +-
+ net/ipv4/igmp.c                                    |   10 +-
+ net/ipv4/ipip.c                                    |   10 +-
+ net/ipv4/ipmr.c                                    |    8 +-
+ net/ipv4/netfilter/nf_nat_amanda.c                 |    4 +-
+ net/ipv4/netfilter/nf_nat_core.c                   |   24 +-
+ net/ipv4/netfilter/nf_nat_ftp.c                    |    4 +-
+ net/ipv4/netfilter/nf_nat_h323.c                   |   36 +-
+ net/ipv4/netfilter/nf_nat_irc.c                    |    4 +-
+ net/ipv4/netfilter/nf_nat_pptp.c                   |   16 +-
+ net/ipv4/netfilter/nf_nat_sip.c                    |   28 +-
+ net/ipv4/netfilter/nf_nat_snmp_basic.c             |    4 +-
+ net/ipv4/netfilter/nf_nat_standalone.c             |    6 +-
+ net/ipv4/netfilter/nf_nat_tftp.c                   |    4 +-
+ net/ipv4/route.c                                   |    6 +-
+ net/ipv4/udp.c                                     |    7 +-
+ net/ipv6/addrconf.c                                |   73 +-
+ net/ipv6/exthdrs.c                                 |    7 +-
+ net/ipv6/icmp.c                                    |   25 +-
+ net/ipv6/inet6_connection_sock.c                   |    9 +-
+ net/ipv6/ip6_tunnel.c                              |   37 +-
+ net/ipv6/ndisc.c                                   |   31 +-
+ net/ipv6/raw.c                                     |    8 +-
+ net/ipv6/sit.c                                     |   12 +-
+ net/ipv6/udp.c                                     |    2 +-
+ net/iucv/Kconfig                                   |   14 +-
+ net/iucv/af_iucv.c                                 |  868 ++++-
+ net/iucv/iucv.c                                    |   23 +
+ net/mac80211/agg-rx.c                              |    4 +-
+ net/mac80211/cfg.c                                 |    8 +-
+ net/mac80211/ibss.c                                |    6 +-
+ net/mac80211/iface.c                               |    2 +-
+ net/mac80211/mesh_pathtbl.c                        |    4 +-
+ net/mac80211/sta_info.c                            |    8 +-
+ net/netfilter/core.c                               |    4 +-
+ net/netfilter/nf_conntrack_core.c                  |   12 +-
+ net/netfilter/nf_conntrack_ecache.c                |    8 +-
+ net/netfilter/nf_conntrack_extend.c                |    4 +-
+ net/netfilter/nf_conntrack_helper.c                |    6 +-
+ net/netfilter/nf_conntrack_netlink.c               |    6 +-
+ net/netfilter/nf_log.c                             |   10 +-
+ net/netfilter/nf_queue.c                           |    6 +-
+ net/netfilter/nfnetlink.c                          |    6 +-
+ net/netlabel/netlabel_domainhash.c                 |    6 +-
+ net/netlabel/netlabel_unlabeled.c                  |    6 +-
+ net/netlink/af_netlink.c                           |    2 +-
+ net/phonet/af_phonet.c                             |    4 +-
+ net/phonet/pn_dev.c                                |    6 +-
+ net/phonet/socket.c                                |    6 +-
+ net/socket.c                                       |    4 +-
+ net/sunrpc/auth_gss/auth_gss.c                     |    4 +-
+ net/xfrm/xfrm_user.c                               |    4 +-
+ 1014 files changed, 18388 insertions(+), 18082 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/smsc911x.txt
+ delete mode 100644 drivers/net/arm/Kconfig
+ delete mode 100644 drivers/net/arm/Makefile
+ delete mode 100644 drivers/net/benet/Kconfig
+ delete mode 100644 drivers/net/bna/bfi_ctreg.h
+ delete mode 100644 drivers/net/bna/bfi_ll.h
+ delete mode 100644 drivers/net/bna/bna_ctrl.c
+ delete mode 100644 drivers/net/bna/bna_hw.h
+ delete mode 100644 drivers/net/bna/bna_txrx.c
+ rename drivers/net/{ => ethernet/3com}/3c501.c (100%)
+ rename drivers/net/{ => ethernet/3com}/3c501.h (100%)
+ rename drivers/net/{ => ethernet/3com}/3c509.c (100%)
+ rename drivers/net/{ => ethernet/3com}/3c515.c (100%)
+ rename drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c (100%)
+ rename drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c (100%)
+ rename drivers/net/{ => ethernet/3com}/3c59x.c (100%)
+ create mode 100644 drivers/net/ethernet/3com/Kconfig
+ create mode 100644 drivers/net/ethernet/3com/Makefile
+ rename drivers/net/{ => ethernet/3com}/typhoon.c (100%)
+ rename drivers/net/{ => ethernet/3com}/typhoon.h (100%)
+ rename drivers/net/{ => ethernet/8390}/3c503.c (100%)
+ rename drivers/net/{ => ethernet/8390}/3c503.h (100%)
+ rename drivers/net/{ => ethernet/8390}/8390.c (100%)
+ rename drivers/net/{ => ethernet/8390}/8390.h (100%)
+ rename drivers/net/{ => ethernet/8390}/8390p.c (100%)
+ create mode 100644 drivers/net/ethernet/8390/Kconfig
+ create mode 100644 drivers/net/ethernet/8390/Makefile
+ rename drivers/net/{ => ethernet/8390}/ac3200.c (100%)
+ rename drivers/net/{ => ethernet/8390}/apne.c (100%)
+ rename drivers/net/{ => ethernet/8390}/ax88796.c (100%)
+ rename drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c (99%)
+ rename drivers/net/{ => ethernet/8390}/e2100.c (100%)
+ rename drivers/net/{ => ethernet/8390}/es3210.c (100%)
+ rename drivers/net/{arm => ethernet/8390}/etherh.c (99%)
+ rename drivers/net/{ => ethernet/8390}/hp-plus.c (100%)
+ rename drivers/net/{ => ethernet/8390}/hp.c (100%)
+ rename drivers/net/{ => ethernet/8390}/hydra.c (100%)
+ rename drivers/net/{ => ethernet/8390}/lib8390.c (100%)
+ rename drivers/net/{ => ethernet/8390}/lne390.c (100%)
+ rename drivers/net/{ => ethernet/8390}/mac8390.c (100%)
+ rename drivers/net/{ => ethernet/8390}/ne-h8300.c (100%)
+ rename drivers/net/{ => ethernet/8390}/ne.c (100%)
+ rename drivers/net/{ => ethernet/8390}/ne2.c (100%)
+ rename drivers/net/{ => ethernet/8390}/ne2k-pci.c (100%)
+ rename drivers/net/{ => ethernet/8390}/ne3210.c (100%)
+ rename drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c (99%)
+ rename drivers/net/{ => ethernet/8390}/smc-mca.c (100%)
+ rename drivers/net/{ => ethernet/8390}/smc-ultra.c (100%)
+ rename drivers/net/{ => ethernet/8390}/smc-ultra32.c (100%)
+ rename drivers/net/{ => ethernet/8390}/stnic.c (100%)
+ rename drivers/net/{ => ethernet/8390}/wd.c (100%)
+ rename drivers/net/{ => ethernet/8390}/zorro8390.c (100%)
+ create mode 100644 drivers/net/ethernet/Kconfig
+ create mode 100644 drivers/net/ethernet/Makefile
+ create mode 100644 drivers/net/ethernet/adaptec/Kconfig
+ create mode 100644 drivers/net/ethernet/adaptec/Makefile
+ rename drivers/net/{ => ethernet/adaptec}/starfire.c (100%)
+ create mode 100644 drivers/net/ethernet/adi/Kconfig
+ create mode 100644 drivers/net/ethernet/adi/Makefile
+ rename drivers/net/{ => ethernet/adi}/bfin_mac.c (100%)
+ rename drivers/net/{ => ethernet/adi}/bfin_mac.h (100%)
+ create mode 100644 drivers/net/ethernet/aeroflex/Kconfig
+ create mode 100644 drivers/net/ethernet/aeroflex/Makefile
+ rename drivers/net/{ => ethernet/aeroflex}/greth.c (100%)
+ rename drivers/net/{ => ethernet/aeroflex}/greth.h (100%)
+ create mode 100644 drivers/net/ethernet/alteon/Kconfig
+ create mode 100644 drivers/net/ethernet/alteon/Makefile
+ rename drivers/net/{ => ethernet/alteon}/acenic.c (100%)
+ rename drivers/net/{ => ethernet/alteon}/acenic.h (100%)
+ rename drivers/net/{ => ethernet/amd}/7990.c (100%)
+ rename drivers/net/{ => ethernet/amd}/7990.h (100%)
+ create mode 100644 drivers/net/ethernet/amd/Kconfig
+ create mode 100644 drivers/net/ethernet/amd/Makefile
+ rename drivers/net/{ => ethernet/amd}/a2065.c (100%)
+ rename drivers/net/{ => ethernet/amd}/a2065.h (100%)
+ rename drivers/net/{arm => ethernet/amd}/am79c961a.c (100%)
+ rename drivers/net/{arm => ethernet/amd}/am79c961a.h (100%)
+ rename drivers/net/{ => ethernet/amd}/amd8111e.c (100%)
+ rename drivers/net/{ => ethernet/amd}/amd8111e.h (100%)
+ rename drivers/net/{ => ethernet/amd}/ariadne.c (100%)
+ rename drivers/net/{ => ethernet/amd}/ariadne.h (100%)
+ rename drivers/net/{ => ethernet/amd}/atarilance.c (100%)
+ rename drivers/net/{ => ethernet/amd}/au1000_eth.c (100%)
+ rename drivers/net/{ => ethernet/amd}/au1000_eth.h (100%)
+ rename drivers/net/{ => ethernet/amd}/declance.c (100%)
+ rename drivers/net/{ => ethernet/amd}/depca.c (100%)
+ rename drivers/net/{ => ethernet/amd}/depca.h (100%)
+ rename drivers/net/{ => ethernet/amd}/hplance.c (100%)
+ rename drivers/net/{ => ethernet/amd}/hplance.h (100%)
+ rename drivers/net/{ => ethernet/amd}/lance.c (100%)
+ rename drivers/net/{ => ethernet/amd}/mvme147.c (100%)
+ rename drivers/net/{ => ethernet/amd}/ni65.c (100%)
+ rename drivers/net/{ => ethernet/amd}/ni65.h (100%)
+ rename drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c (100%)
+ rename drivers/net/{ => ethernet/amd}/pcnet32.c (100%)
+ rename drivers/net/{ => ethernet/amd}/sun3lance.c (100%)
+ rename drivers/net/{ => ethernet/amd}/sunlance.c (100%)
+ create mode 100644 drivers/net/ethernet/apple/Kconfig
+ create mode 100644 drivers/net/ethernet/apple/Makefile
+ rename drivers/net/{ => ethernet/apple}/bmac.c (100%)
+ rename drivers/net/{ => ethernet/apple}/bmac.h (100%)
+ rename drivers/net/{ => ethernet/apple}/cs89x0.c (100%)
+ rename drivers/net/{ => ethernet/apple}/cs89x0.h (100%)
+ rename drivers/net/{ => ethernet/apple}/mac89x0.c (100%)
+ rename drivers/net/{ => ethernet/apple}/mace.c (100%)
+ rename drivers/net/{ => ethernet/apple}/mace.h (100%)
+ rename drivers/net/{ => ethernet/apple}/macmace.c (100%)
+ create mode 100644 drivers/net/ethernet/atheros/Kconfig
+ create mode 100644 drivers/net/ethernet/atheros/Makefile
+ rename drivers/net/{ => ethernet/atheros}/atl1c/Makefile (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.c (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.h (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_main.c (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1e/Makefile (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.c (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.h (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_main.c (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_param.c (100%)
+ rename drivers/net/{ => ethernet/atheros}/atlx/Makefile (100%)
+ rename drivers/net/{ => ethernet/atheros}/atlx/atl1.c (100%)
+ rename drivers/net/{ => ethernet/atheros}/atlx/atl1.h (100%)
+ rename drivers/net/{ => ethernet/atheros}/atlx/atl2.c (100%)
+ rename drivers/net/{ => ethernet/atheros}/atlx/atl2.h (100%)
+ rename drivers/net/{ => ethernet/atheros}/atlx/atlx.c (100%)
+ rename drivers/net/{ => ethernet/atheros}/atlx/atlx.h (100%)
+ create mode 100644 drivers/net/ethernet/broadcom/Kconfig
+ create mode 100644 drivers/net/ethernet/broadcom/Makefile
+ rename drivers/net/{ => ethernet/broadcom}/b44.c (100%)
+ rename drivers/net/{ => ethernet/broadcom}/b44.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2.c (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2_fw.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_file_hdr.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/cnic.c (99%)
+ rename drivers/net/{ => ethernet/broadcom}/cnic.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/cnic_defs.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/cnic_if.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/sb1250-mac.c (100%)
+ rename drivers/net/{ => ethernet/broadcom}/tg3.c (100%)
+ rename drivers/net/{ => ethernet/broadcom}/tg3.h (100%)
+ create mode 100644 drivers/net/ethernet/brocade/Kconfig
+ create mode 100644 drivers/net/ethernet/brocade/Makefile
+ create mode 100644 drivers/net/ethernet/brocade/bna/Kconfig
+ rename drivers/net/{ => ethernet/brocade}/bna/Makefile (52%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c (98%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h (100%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h (100%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h (92%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_cna.h (100%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h (89%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_status.h (100%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c (87%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h (88%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c (76%)
+ create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.c
+ create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.h
+ rename drivers/net/{ => ethernet/brocade}/bna/bfi.h (70%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h (100%)
+ create mode 100644 drivers/net/ethernet/brocade/bna/bfi_enet.h
+ create mode 100644 drivers/net/ethernet/brocade/bna/bfi_reg.h
+ rename drivers/net/{ => ethernet/brocade}/bna/bna.h (67%)
+ create mode 100644 drivers/net/ethernet/brocade/bna/bna_enet.c
+ create mode 100644 drivers/net/ethernet/brocade/bna/bna_hw_defs.h
+ create mode 100644 drivers/net/ethernet/brocade/bna/bna_tx_rx.c
+ rename drivers/net/{ => ethernet/brocade}/bna/bna_types.h (58%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bnad.c (85%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bnad.h (89%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bnad_ethtool.c (67%)
+ rename drivers/net/{ => ethernet/brocade}/bna/cna.h (68%)
+ rename drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c (100%)
+ create mode 100644 drivers/net/ethernet/cadence/Kconfig
+ create mode 100644 drivers/net/ethernet/cadence/Makefile
+ rename drivers/net/{arm => ethernet/cadence}/at91_ether.c (100%)
+ rename drivers/net/{arm => ethernet/cadence}/at91_ether.h (100%)
+ rename drivers/net/{ => ethernet/cadence}/macb.c (100%)
+ rename drivers/net/{ => ethernet/cadence}/macb.h (100%)
+ create mode 100644 drivers/net/ethernet/chelsio/Kconfig
+ create mode 100644 drivers/net/ethernet/chelsio/Makefile
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/Makefile (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/common.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cphy.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/elmer0.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.c (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/gmac.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/my3126.c (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/pm3393.c (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/regs.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.c (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/subr.c (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/suni1x10gexp_regs.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.c (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326.c (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326_reg.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/common.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/firmware_exports.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge_defs.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/version.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/Makefile (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/adapter.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c (100%)
+ create mode 100644 drivers/net/ethernet/cirrus/Kconfig
+ create mode 100644 drivers/net/ethernet/cirrus/Makefile
+ rename drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c (100%)
+ create mode 100644 drivers/net/ethernet/cisco/Kconfig
+ create mode 100644 drivers/net/ethernet/cisco/Makefile
+ create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig
+ rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/enic.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%)
+ create mode 100644 drivers/net/ethernet/davicom/Kconfig
+ create mode 100644 drivers/net/ethernet/davicom/Makefile
+ rename drivers/net/{ => ethernet/davicom}/dm9000.c (100%)
+ rename drivers/net/{ => ethernet/davicom}/dm9000.h (100%)
+ create mode 100644 drivers/net/ethernet/dec/Kconfig
+ create mode 100644 drivers/net/ethernet/dec/Makefile
+ rename drivers/net/{ => ethernet/dec}/ewrk3.c (100%)
+ rename drivers/net/{ => ethernet/dec}/ewrk3.h (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/21142.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/Kconfig (96%)
+ rename drivers/net/{ => ethernet/dec}/tulip/Makefile (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/de2104x.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/de4x5.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/de4x5.h (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/dmfe.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/eeprom.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/interrupt.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/media.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/pnic.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/pnic2.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/timer.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/tulip.h (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/tulip_core.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/uli526x.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/winbond-840.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c (100%)
+ create mode 100644 drivers/net/ethernet/dlink/Kconfig
+ create mode 100644 drivers/net/ethernet/dlink/Makefile
+ rename drivers/net/{ => ethernet/dlink}/de600.c (100%)
+ rename drivers/net/{ => ethernet/dlink}/de600.h (100%)
+ rename drivers/net/{ => ethernet/dlink}/de620.c (100%)
+ rename drivers/net/{ => ethernet/dlink}/de620.h (100%)
+ rename drivers/net/{ => ethernet/dlink}/dl2k.c (100%)
+ rename drivers/net/{ => ethernet/dlink}/dl2k.h (100%)
+ rename drivers/net/{ => ethernet/dlink}/sundance.c (100%)
+ rename drivers/net/{ => ethernet}/dnet.c (100%)
+ rename drivers/net/{ => ethernet}/dnet.h (100%)
+ create mode 100644 drivers/net/ethernet/emulex/Kconfig
+ create mode 100644 drivers/net/ethernet/emulex/Makefile
+ create mode 100644 drivers/net/ethernet/emulex/benet/Kconfig
+ rename drivers/net/{ => ethernet/emulex}/benet/Makefile (100%)
+ rename drivers/net/{ => ethernet/emulex}/benet/be.h (85%)
+ rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.c (94%)
+ rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.h (95%)
+ rename drivers/net/{ => ethernet/emulex}/benet/be_ethtool.c (85%)
+ rename drivers/net/{ => ethernet/emulex}/benet/be_hw.h (94%)
+ rename drivers/net/{ => ethernet/emulex}/benet/be_main.c (91%)
+ rename drivers/net/{ => ethernet}/ethoc.c (100%)
+ create mode 100644 drivers/net/ethernet/faraday/Kconfig
+ create mode 100644 drivers/net/ethernet/faraday/Makefile
+ rename drivers/net/{ => ethernet/faraday}/ftgmac100.c (100%)
+ rename drivers/net/{ => ethernet/faraday}/ftgmac100.h (100%)
+ rename drivers/net/{ => ethernet/faraday}/ftmac100.c (100%)
+ rename drivers/net/{ => ethernet/faraday}/ftmac100.h (100%)
+ rename drivers/net/{ => ethernet}/fealnx.c (100%)
+ create mode 100644 drivers/net/ethernet/freescale/Kconfig
+ create mode 100644 drivers/net/ethernet/freescale/Makefile
+ rename drivers/net/{ => ethernet/freescale}/fec.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/fec.h (100%)
+ rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h (100%)
+ rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx_phy.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/Kconfig (91%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/Makefile (100%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/fec.h (100%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet-main.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet.h (100%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fcc.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fec.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-scc.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-bitbang.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-fec.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h (100%)
+ rename drivers/net/{ => ethernet/freescale}/gianfar.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/gianfar.h (100%)
+ rename drivers/net/{ => ethernet/freescale}/gianfar_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/gianfar_ptp.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/gianfar_sysfs.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/ucc_geth.c (99%)
+ rename drivers/net/{ => ethernet/freescale}/ucc_geth.h (100%)
+ rename drivers/net/{ => ethernet/freescale}/ucc_geth_ethtool.c (100%)
+ create mode 100644 drivers/net/ethernet/fujitsu/Kconfig
+ create mode 100644 drivers/net/ethernet/fujitsu/Makefile
+ rename drivers/net/{ => ethernet/fujitsu}/at1700.c (100%)
+ rename drivers/net/{ => ethernet/fujitsu}/eth16i.c (100%)
+ rename drivers/net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c (100%)
+ create mode 100644 drivers/net/ethernet/hp/Kconfig
+ create mode 100644 drivers/net/ethernet/hp/Makefile
+ rename drivers/net/{ => ethernet/hp}/hp100.c (100%)
+ rename drivers/net/{ => ethernet/hp}/hp100.h (100%)
+ rename drivers/net/{ => ethernet/i825xx}/3c505.c (100%)
+ rename drivers/net/{ => ethernet/i825xx}/3c505.h (100%)
+ rename drivers/net/{ => ethernet/i825xx}/3c507.c (100%)
+ rename drivers/net/{ => ethernet/i825xx}/3c523.c (100%)
+ rename drivers/net/{ => ethernet/i825xx}/3c523.h (100%)
+ rename drivers/net/{ => ethernet/i825xx}/3c527.c (100%)
+ rename drivers/net/{ => ethernet/i825xx}/3c527.h (100%)
+ rename drivers/net/{ => ethernet/i825xx}/82596.c (100%)
+ create mode 100644 drivers/net/ethernet/i825xx/Kconfig
+ create mode 100644 drivers/net/ethernet/i825xx/Makefile
+ rename drivers/net/{ => ethernet/i825xx}/eepro.c (100%)
+ rename drivers/net/{ => ethernet/i825xx}/eexpress.c (100%)
+ rename drivers/net/{ => ethernet/i825xx}/eexpress.h (100%)
+ rename drivers/net/{arm => ethernet/i825xx}/ether1.c (100%)
+ rename drivers/net/{arm => ethernet/i825xx}/ether1.h (100%)
+ rename drivers/net/{ => ethernet/i825xx}/lasi_82596.c (100%)
+ rename drivers/net/{ => ethernet/i825xx}/lib82596.c (100%)
+ rename drivers/net/{ => ethernet/i825xx}/lp486e.c (100%)
+ rename drivers/net/{ => ethernet/i825xx}/ni52.c (100%)
+ rename drivers/net/{ => ethernet/i825xx}/ni52.h (100%)
+ rename drivers/net/{ => ethernet/i825xx}/sni_82596.c (100%)
+ rename drivers/net/{ => ethernet/i825xx}/sun3_82586.c (100%)
+ rename drivers/net/{ => ethernet/i825xx}/sun3_82586.h (100%)
+ rename drivers/net/{ => ethernet/i825xx}/znet.c (100%)
+ create mode 100644 drivers/net/ethernet/ibm/Kconfig
+ create mode 100644 drivers/net/ethernet/ibm/Makefile
+ rename drivers/net/{ => ethernet/ibm}/ehea/Makefile (100%)
+ rename drivers/net/{ => ethernet/ibm}/ehea/ehea.h (100%)
+ rename drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h (100%)
+ rename drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c (100%)
+ rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c (100%)
+ rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h (100%)
+ rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c (100%)
+ rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Kconfig (63%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Makefile (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.c (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.h (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.c (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.h (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/emac.h (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.c (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.h (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.c (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.h (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.c (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.h (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.c (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.h (100%)
+ rename drivers/net/{ => ethernet/ibm}/ibmveth.c (100%)
+ rename drivers/net/{ => ethernet/ibm}/ibmveth.h (100%)
+ rename drivers/net/{ => ethernet/ibm}/iseries_veth.c (100%)
+ create mode 100644 drivers/net/ethernet/icplus/Kconfig
+ create mode 100644 drivers/net/ethernet/icplus/Makefile
+ rename drivers/net/{ => ethernet/icplus}/ipg.c (92%)
+ rename drivers/net/{ => ethernet/icplus}/ipg.h (100%)
+ create mode 100644 drivers/net/ethernet/intel/Kconfig
+ create mode 100644 drivers/net/ethernet/intel/Makefile
+ rename drivers/net/{ => ethernet/intel}/e100.c (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000/Makefile (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000/e1000.h (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000/e1000_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000/e1000_main.c (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000/e1000_osdep.h (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000/e1000_param.c (100%)
+ rename drivers/net/{e1000e/es2lan.c => ethernet/intel/e1000e/80003es2lan.c} (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/82571.c (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/Makefile (96%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/defines.h (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/e1000.h (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/ethtool.c (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/hw.h (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/lib.c (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/netdev.c (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/param.c (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/phy.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/Makefile (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_defines.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_hw.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_regs.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/igb.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/igb_main.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/Makefile (100%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/defines.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/ethtool.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/igbvf.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/mbx.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/mbx.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/netdev.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/regs.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/vf.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/vf.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/Makefile (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/Makefile (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_main.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_type.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/Makefile (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/defines.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf_main.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/regs.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.h (100%)
+ rename drivers/net/{ => ethernet}/jme.c (100%)
+ rename drivers/net/{ => ethernet}/jme.h (100%)
+ rename drivers/net/{ => ethernet}/korina.c (100%)
+ rename drivers/net/{ => ethernet}/lantiq_etop.c (100%)
+ create mode 100644 drivers/net/ethernet/marvell/Kconfig
+ create mode 100644 drivers/net/ethernet/marvell/Makefile
+ rename drivers/net/{ => ethernet/marvell}/mv643xx_eth.c (100%)
+ rename drivers/net/{ => ethernet/marvell}/pxa168_eth.c (100%)
+ rename drivers/net/{ => ethernet/marvell}/skge.c (100%)
+ rename drivers/net/{ => ethernet/marvell}/skge.h (100%)
+ rename drivers/net/{ => ethernet/marvell}/sky2.c (100%)
+ rename drivers/net/{ => ethernet/marvell}/sky2.h (100%)
+ create mode 100644 drivers/net/ethernet/mellanox/Kconfig
+ create mode 100644 drivers/net/ethernet/mellanox/Makefile
+ create mode 100644 drivers/net/ethernet/mellanox/mlx4/Kconfig
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/Makefile (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/catas.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/cq.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_netdev.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_resources.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_selftest.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/eq.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.h (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.h (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/intf.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/main.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/mr.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/pd.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/port.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/profile.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/qp.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/reset.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/sense.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/srq.c (100%)
+ create mode 100644 drivers/net/ethernet/micrel/Kconfig
+ create mode 100644 drivers/net/ethernet/micrel/Makefile
+ rename drivers/net/{arm => ethernet/micrel}/ks8695net.c (100%)
+ rename drivers/net/{arm => ethernet/micrel}/ks8695net.h (100%)
+ rename drivers/net/{ => ethernet/micrel}/ks8842.c (100%)
+ rename drivers/net/{ => ethernet/micrel}/ks8851.c (100%)
+ rename drivers/net/{ => ethernet/micrel}/ks8851.h (100%)
+ rename drivers/net/{ => ethernet/micrel}/ks8851_mll.c (100%)
+ rename drivers/net/{ => ethernet/micrel}/ksz884x.c (100%)
+ create mode 100644 drivers/net/ethernet/microchip/Kconfig
+ create mode 100644 drivers/net/ethernet/microchip/Makefile
+ rename drivers/net/{ => ethernet/microchip}/enc28j60.c (100%)
+ rename drivers/net/{ => ethernet/microchip}/enc28j60_hw.h (100%)
+ rename drivers/net/{ => ethernet}/mipsnet.c (100%)
+ create mode 100644 drivers/net/ethernet/myricom/Kconfig
+ create mode 100644 drivers/net/ethernet/myricom/Makefile
+ rename drivers/net/{ => ethernet/myricom}/myri10ge/Makefile (100%)
+ rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge.c (100%)
+ rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h (100%)
+ rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp_gen_header.h (100%)
+ create mode 100644 drivers/net/ethernet/natsemi/Kconfig
+ create mode 100644 drivers/net/ethernet/natsemi/Makefile
+ rename drivers/net/{ => ethernet/natsemi}/ibmlana.c (100%)
+ rename drivers/net/{ => ethernet/natsemi}/ibmlana.h (100%)
+ rename drivers/net/{ => ethernet/natsemi}/jazzsonic.c (100%)
+ rename drivers/net/{ => ethernet/natsemi}/macsonic.c (100%)
+ rename drivers/net/{ => ethernet/natsemi}/natsemi.c (100%)
+ rename drivers/net/{ => ethernet/natsemi}/ns83820.c (100%)
+ rename drivers/net/{ => ethernet/natsemi}/sonic.c (100%)
+ rename drivers/net/{ => ethernet/natsemi}/sonic.h (100%)
+ rename drivers/net/{ => ethernet/natsemi}/xtsonic.c (100%)
+ create mode 100644 drivers/net/ethernet/neterion/Kconfig
+ create mode 100644 drivers/net/ethernet/neterion/Makefile
+ rename drivers/net/{ => ethernet/neterion}/s2io-regs.h (100%)
+ rename drivers/net/{ => ethernet/neterion}/s2io.c (100%)
+ rename drivers/net/{ => ethernet/neterion}/s2io.h (100%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/Makefile (100%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.c (100%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.h (100%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.c (100%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.h (100%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.c (100%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.h (100%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-reg.h (100%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.c (100%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.h (100%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-version.h (100%)
+ rename drivers/net/{ => ethernet}/netx-eth.c (100%)
+ create mode 100644 drivers/net/ethernet/nuvoton/Kconfig
+ create mode 100644 drivers/net/ethernet/nuvoton/Makefile
+ rename drivers/net/{arm => ethernet/nuvoton}/w90p910_ether.c (100%)
+ create mode 100644 drivers/net/ethernet/nvidia/Kconfig
+ create mode 100644 drivers/net/ethernet/nvidia/Makefile
+ rename drivers/net/{ => ethernet/nvidia}/forcedeth.c (100%)
+ rename drivers/net/{ => ethernet}/octeon/Kconfig (85%)
+ create mode 100644 drivers/net/ethernet/octeon/Makefile
+ rename drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (100%)
+ create mode 100644 drivers/net/ethernet/oki-semi/Kconfig
+ create mode 100644 drivers/net/ethernet/oki-semi/Makefile
+ create mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
+ rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/Makefile (100%)
+ rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h (100%)
+ rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c (100%)
+ rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h (100%)
+ rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c (100%)
+ rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_param.c (100%)
+ rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c (100%)
+ rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h (100%)
+ create mode 100644 drivers/net/ethernet/packetengines/Kconfig
+ create mode 100644 drivers/net/ethernet/packetengines/Makefile
+ rename drivers/net/{ => ethernet/packetengines}/hamachi.c (100%)
+ rename drivers/net/{ => ethernet/packetengines}/yellowfin.c (100%)
+ create mode 100644 drivers/net/ethernet/pasemi/Kconfig
+ create mode 100644 drivers/net/ethernet/pasemi/Makefile
+ rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.c (100%)
+ rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.h (100%)
+ rename drivers/net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c (100%)
+ create mode 100644 drivers/net/ethernet/qlogic/Kconfig
+ create mode 100644 drivers/net/ethernet/qlogic/Makefile
+ rename drivers/net/{ => ethernet/qlogic}/netxen/Makefile (100%)
+ rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic.h (99%)
+ rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c (100%)
+ rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h (100%)
+ rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.c (100%)
+ rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.h (100%)
+ rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_init.c (99%)
+ rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_main.c (96%)
+ rename drivers/net/{ => ethernet/qlogic}/qla3xxx.c (99%)
+ rename drivers/net/{ => ethernet/qlogic}/qla3xxx.h (100%)
+ rename drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile (100%)
+ rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h (99%)
+ rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c (100%)
+ rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c (98%)
+ rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h (100%)
+ rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c (99%)
+ rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c (99%)
+ rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c (98%)
+ rename drivers/net/{ => ethernet/qlogic}/qlge/Makefile (100%)
+ rename drivers/net/{ => ethernet/qlogic}/qlge/qlge.h (100%)
+ rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c (100%)
+ rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c (100%)
+ rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c (100%)
+ create mode 100644 drivers/net/ethernet/racal/Kconfig
+ create mode 100644 drivers/net/ethernet/racal/Makefile
+ rename drivers/net/{ => ethernet/racal}/ni5010.c (100%)
+ rename drivers/net/{ => ethernet/racal}/ni5010.h (100%)
+ create mode 100644 drivers/net/ethernet/rdc/Kconfig
+ create mode 100644 drivers/net/ethernet/rdc/Makefile
+ rename drivers/net/{ => ethernet/rdc}/r6040.c (100%)
+ rename drivers/net/{ => ethernet/realtek}/8139cp.c (100%)
+ rename drivers/net/{ => ethernet/realtek}/8139too.c (100%)
+ create mode 100644 drivers/net/ethernet/realtek/Kconfig
+ create mode 100644 drivers/net/ethernet/realtek/Makefile
+ rename drivers/net/{ => ethernet/realtek}/atp.c (100%)
+ rename drivers/net/{ => ethernet/realtek}/atp.h (100%)
+ rename drivers/net/{ => ethernet/realtek}/r8169.c (100%)
+ rename drivers/net/{ => ethernet/realtek}/sc92031.c (100%)
+ create mode 100644 drivers/net/ethernet/renesas/Kconfig
+ create mode 100644 drivers/net/ethernet/renesas/Makefile
+ rename drivers/net/{ => ethernet/renesas}/sh_eth.c (100%)
+ rename drivers/net/{ => ethernet/renesas}/sh_eth.h (100%)
+ rename drivers/net/{ => ethernet}/s6gmac.c (100%)
+ create mode 100644 drivers/net/ethernet/seeq/Kconfig
+ create mode 100644 drivers/net/ethernet/seeq/Makefile
+ rename drivers/net/{arm => ethernet/seeq}/ether3.c (100%)
+ rename drivers/net/{arm => ethernet/seeq}/ether3.h (100%)
+ rename drivers/net/{ => ethernet/seeq}/seeq8005.c (100%)
+ rename drivers/net/{ => ethernet/seeq}/seeq8005.h (100%)
+ rename drivers/net/{ => ethernet/seeq}/sgiseeq.c (100%)
+ rename drivers/net/{ => ethernet/seeq}/sgiseeq.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/Kconfig (96%)
+ rename drivers/net/{ => ethernet}/sfc/Makefile (100%)
+ rename drivers/net/{ => ethernet}/sfc/bitfield.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/efx.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/efx.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/enum.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/ethtool.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/falcon.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/falcon_boards.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/falcon_xmac.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/filter.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/filter.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/io.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/mac.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/mcdi.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/mcdi.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/mcdi_mac.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/mcdi_pcol.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/mcdi_phy.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/mdio_10g.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/mdio_10g.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/mtd.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/net_driver.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/nic.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/nic.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/phy.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/qt202x_phy.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/regs.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/rx.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/selftest.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/selftest.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/siena.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/spi.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/tenxpress.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/tx.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/txc43128_phy.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/workarounds.h (100%)
+ create mode 100644 drivers/net/ethernet/sgi/Kconfig
+ create mode 100644 drivers/net/ethernet/sgi/Makefile
+ rename drivers/net/{ => ethernet/sgi}/ioc3-eth.c (100%)
+ rename drivers/net/{ => ethernet/sgi}/meth.c (100%)
+ rename drivers/net/{ => ethernet/sgi}/meth.h (100%)
+ create mode 100644 drivers/net/ethernet/sis/Kconfig
+ create mode 100644 drivers/net/ethernet/sis/Makefile
+ rename drivers/net/{ => ethernet/sis}/sis190.c (100%)
+ rename drivers/net/{ => ethernet/sis}/sis900.c (100%)
+ rename drivers/net/{ => ethernet/sis}/sis900.h (100%)
+ create mode 100644 drivers/net/ethernet/smsc/Kconfig
+ create mode 100644 drivers/net/ethernet/smsc/Makefile
+ rename drivers/net/{ => ethernet/smsc}/epic100.c (100%)
+ rename drivers/net/{ => ethernet/smsc}/smc911x.c (100%)
+ rename drivers/net/{ => ethernet/smsc}/smc911x.h (100%)
+ rename drivers/net/{ => ethernet/smsc}/smc9194.c (100%)
+ rename drivers/net/{ => ethernet/smsc}/smc9194.h (100%)
+ rename drivers/net/{pcmcia => ethernet/smsc}/smc91c92_cs.c (100%)
+ rename drivers/net/{ => ethernet/smsc}/smc91x.c (100%)
+ rename drivers/net/{ => ethernet/smsc}/smc91x.h (100%)
+ rename drivers/net/{ => ethernet/smsc}/smsc911x.c (97%)
+ rename drivers/net/{ => ethernet/smsc}/smsc911x.h (100%)
+ rename drivers/net/{ => ethernet/smsc}/smsc9420.c (100%)
+ rename drivers/net/{ => ethernet/smsc}/smsc9420.h (100%)
+ create mode 100644 drivers/net/ethernet/stmicro/Kconfig
+ create mode 100644 drivers/net/ethernet/stmicro/Makefile
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig (93%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/Makefile (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/common.h (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/descs.h (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100.h (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000.h (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_core.c (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_core.c (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_dma.c (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/enh_desc.c (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/norm_desc.c (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_main.c (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_mdio.c (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.c (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.h (100%)
+ create mode 100644 drivers/net/ethernet/sun/Kconfig
+ create mode 100644 drivers/net/ethernet/sun/Makefile
+ rename drivers/net/{ => ethernet/sun}/cassini.c (100%)
+ rename drivers/net/{ => ethernet/sun}/cassini.h (100%)
+ rename drivers/net/{ => ethernet/sun}/niu.c (100%)
+ rename drivers/net/{ => ethernet/sun}/niu.h (100%)
+ rename drivers/net/{ => ethernet/sun}/sunbmac.c (100%)
+ rename drivers/net/{ => ethernet/sun}/sunbmac.h (100%)
+ rename drivers/net/{ => ethernet/sun}/sungem.c (99%)
+ rename drivers/net/{ => ethernet/sun}/sungem.h (100%)
+ rename drivers/net/{ => ethernet/sun}/sunhme.c (100%)
+ rename drivers/net/{ => ethernet/sun}/sunhme.h (100%)
+ rename drivers/net/{ => ethernet/sun}/sunqe.c (100%)
+ rename drivers/net/{ => ethernet/sun}/sunqe.h (100%)
+ rename drivers/net/{ => ethernet/sun}/sunvnet.c (100%)
+ rename drivers/net/{ => ethernet/sun}/sunvnet.h (100%)
+ create mode 100644 drivers/net/ethernet/tehuti/Kconfig
+ create mode 100644 drivers/net/ethernet/tehuti/Makefile
+ rename drivers/net/{ => ethernet/tehuti}/tehuti.c (100%)
+ rename drivers/net/{ => ethernet/tehuti}/tehuti.h (100%)
+ create mode 100644 drivers/net/ethernet/ti/Kconfig
+ create mode 100644 drivers/net/ethernet/ti/Makefile
+ rename drivers/net/{ => ethernet/ti}/cpmac.c (100%)
+ rename drivers/net/{ => ethernet/ti}/davinci_cpdma.c (100%)
+ rename drivers/net/{ => ethernet/ti}/davinci_cpdma.h (100%)
+ rename drivers/net/{ => ethernet/ti}/davinci_emac.c (100%)
+ rename drivers/net/{ => ethernet/ti}/davinci_mdio.c (100%)
+ rename drivers/net/{ => ethernet/ti}/tlan.c (100%)
+ rename drivers/net/{ => ethernet/ti}/tlan.h (100%)
+ create mode 100644 drivers/net/ethernet/tile/Kconfig
+ rename drivers/net/{ => ethernet}/tile/Makefile (100%)
+ rename drivers/net/{ => ethernet}/tile/tilepro.c (100%)
+ create mode 100644 drivers/net/ethernet/toshiba/Kconfig
+ create mode 100644 drivers/net/ethernet/toshiba/Makefile
+ rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c (100%)
+ rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h (100%)
+ rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.c (100%)
+ rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.h (100%)
+ rename drivers/net/{ => ethernet/toshiba}/spider_net.c (99%)
+ rename drivers/net/{ => ethernet/toshiba}/spider_net.h (99%)
+ rename drivers/net/{ => ethernet/toshiba}/spider_net_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/toshiba}/tc35815.c (100%)
+ create mode 100644 drivers/net/ethernet/tundra/Kconfig
+ create mode 100644 drivers/net/ethernet/tundra/Makefile
+ rename drivers/net/{ => ethernet/tundra}/tsi108_eth.c (100%)
+ rename drivers/net/{ => ethernet/tundra}/tsi108_eth.h (100%)
+ create mode 100644 drivers/net/ethernet/via/Kconfig
+ create mode 100644 drivers/net/ethernet/via/Makefile
+ rename drivers/net/{ => ethernet/via}/via-rhine.c (100%)
+ rename drivers/net/{ => ethernet/via}/via-velocity.c (97%)
+ rename drivers/net/{ => ethernet/via}/via-velocity.h (100%)
+ create mode 100644 drivers/net/ethernet/xilinx/Kconfig
+ create mode 100644 drivers/net/ethernet/xilinx/Makefile
+ rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%)
+ rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (100%)
+ rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%)
+ rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%)
+ create mode 100644 drivers/net/ethernet/xircom/Kconfig
+ create mode 100644 drivers/net/ethernet/xircom/Makefile
+ rename drivers/net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c (100%)
+ create mode 100644 drivers/net/ethernet/xscale/Kconfig
+ create mode 100644 drivers/net/ethernet/xscale/Makefile
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig (94%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/Makefile (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/enp2611.c (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.c (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.h (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev_priv.h (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h (100%)
+ rename drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c (100%)
+ delete mode 100644 drivers/net/octeon/Makefile
+ delete mode 100644 drivers/net/pci-skeleton.c
+ rename {drivers/net => include/linux}/sungem_phy.h (98%)
+Merging wireless/master
+$ git merge wireless/master
+Auto-merging arch/mips/Kconfig
+Auto-merging drivers/net/wireless/ath/ath5k/base.c
+Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+Removing drivers/staging/ath6kl/Kconfig
+Removing drivers/staging/ath6kl/Makefile
+Removing drivers/staging/ath6kl/TODO
+Removing drivers/staging/ath6kl/bmi/include/bmi_internal.h
+Removing drivers/staging/ath6kl/bmi/src/bmi.c
+Removing drivers/staging/ath6kl/hif/common/hif_sdio_common.h
+Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
+Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
+Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
+Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.c
+Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.h
+Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
+Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
+Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
+Removing drivers/staging/ath6kl/htc2/htc.c
+Removing drivers/staging/ath6kl/htc2/htc_debug.h
+Removing drivers/staging/ath6kl/htc2/htc_internal.h
+Removing drivers/staging/ath6kl/htc2/htc_recv.c
+Removing drivers/staging/ath6kl/htc2/htc_send.c
+Removing drivers/staging/ath6kl/htc2/htc_services.c
+Removing drivers/staging/ath6kl/include/a_config.h
+Removing drivers/staging/ath6kl/include/a_debug.h
+Removing drivers/staging/ath6kl/include/a_drv.h
+Removing drivers/staging/ath6kl/include/a_drv_api.h
+Removing drivers/staging/ath6kl/include/a_osapi.h
+Removing drivers/staging/ath6kl/include/aggr_recv_api.h
+Removing drivers/staging/ath6kl/include/ar3kconfig.h
+Removing drivers/staging/ath6kl/include/ar6000_api.h
+Removing drivers/staging/ath6kl/include/ar6000_diag.h
+Removing drivers/staging/ath6kl/include/ar6kap_common.h
+Removing drivers/staging/ath6kl/include/athbtfilter.h
+Removing drivers/staging/ath6kl/include/bmi.h
+Removing drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
+Removing drivers/staging/ath6kl/include/common/AR6002/addrs.h
+Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
+Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
+Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
+Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
+Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
+Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
+Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
+Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
+Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
+Removing drivers/staging/ath6kl/include/common/athdefs.h
+Removing drivers/staging/ath6kl/include/common/bmi_msg.h
+Removing drivers/staging/ath6kl/include/common/cnxmgmt.h
+Removing drivers/staging/ath6kl/include/common/dbglog.h
+Removing drivers/staging/ath6kl/include/common/dbglog_id.h
+Removing drivers/staging/ath6kl/include/common/discovery.h
+Removing drivers/staging/ath6kl/include/common/epping_test.h
+Removing drivers/staging/ath6kl/include/common/gmboxif.h
+Removing drivers/staging/ath6kl/include/common/gpio_reg.h
+Removing drivers/staging/ath6kl/include/common/htc.h
+Removing drivers/staging/ath6kl/include/common/htc_services.h
+Removing drivers/staging/ath6kl/include/common/pkt_log.h
+Removing drivers/staging/ath6kl/include/common/roaming.h
+Removing drivers/staging/ath6kl/include/common/targaddrs.h
+Removing drivers/staging/ath6kl/include/common/testcmd.h
+Removing drivers/staging/ath6kl/include/common/tlpm.h
+Removing drivers/staging/ath6kl/include/common/wlan_defs.h
+Removing drivers/staging/ath6kl/include/common/wmi.h
+Removing drivers/staging/ath6kl/include/common/wmix.h
+Removing drivers/staging/ath6kl/include/common_drv.h
+Removing drivers/staging/ath6kl/include/dbglog_api.h
+Removing drivers/staging/ath6kl/include/dl_list.h
+Removing drivers/staging/ath6kl/include/dset_api.h
+Removing drivers/staging/ath6kl/include/hci_transport_api.h
+Removing drivers/staging/ath6kl/include/hif.h
+Removing drivers/staging/ath6kl/include/host_version.h
+Removing drivers/staging/ath6kl/include/htc_api.h
+Removing drivers/staging/ath6kl/include/htc_packet.h
+Removing drivers/staging/ath6kl/include/wlan_api.h
+Removing drivers/staging/ath6kl/include/wmi_api.h
+Removing drivers/staging/ath6kl/miscdrv/ar3kconfig.c
+Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
+Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
+CONFLICT (delete/modify): drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c deleted in wireless/master and modified in HEAD. Version HEAD of drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c left in tree.
+Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
+Removing drivers/staging/ath6kl/miscdrv/common_drv.c
+Removing drivers/staging/ath6kl/miscdrv/credit_dist.c
+Removing drivers/staging/ath6kl/miscdrv/miscdrv.h
+Removing drivers/staging/ath6kl/os/linux/ar6000_drv.c
+Removing drivers/staging/ath6kl/os/linux/ar6000_pm.c
+Removing drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
+Removing drivers/staging/ath6kl/os/linux/cfg80211.c
+Removing drivers/staging/ath6kl/os/linux/export_hci_transport.c
+Removing drivers/staging/ath6kl/os/linux/hci_bridge.c
+Removing drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
+Removing drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
+Removing drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
+Removing drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
+Removing drivers/staging/ath6kl/os/linux/include/cfg80211.h
+Removing drivers/staging/ath6kl/os/linux/include/config_linux.h
+Removing drivers/staging/ath6kl/os/linux/include/debug_linux.h
+Removing drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
+Removing drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
+Removing drivers/staging/ath6kl/os/linux/include/osapi_linux.h
+Removing drivers/staging/ath6kl/os/linux/include/wlan_config.h
+Removing drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
+Removing drivers/staging/ath6kl/os/linux/netbuf.c
+Removing drivers/staging/ath6kl/reorder/aggr_rx_internal.h
+Removing drivers/staging/ath6kl/reorder/rcv_aggr.c
+Removing drivers/staging/ath6kl/wlan/include/ieee80211.h
+Removing drivers/staging/ath6kl/wlan/include/ieee80211_node.h
+Removing drivers/staging/ath6kl/wlan/src/wlan_node.c
+Removing drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
+Removing drivers/staging/ath6kl/wlan/src/wlan_utils.c
+Removing drivers/staging/ath6kl/wmi/wmi.c
+Removing drivers/staging/ath6kl/wmi/wmi_host.h
+Auto-merging net/mac80211/cfg.c
+Auto-merging net/mac80211/sta_info.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
+drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c: needs merge
+rm 'drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c'
+$ git commit -v -a
+[master 50027d2] Merge remote-tracking branch 'wireless/master'
+$ git diff -M --stat --summary HEAD^..
+ arch/mips/Kconfig                                  |    8 +-
+ arch/mips/bcm47xx/Kconfig                          |   31 +
+ arch/mips/bcm47xx/Makefile                         |    3 +-
+ arch/mips/bcm47xx/gpio.c                           |   82 +-
+ arch/mips/bcm47xx/irq.c                            |   12 +
+ arch/mips/bcm47xx/nvram.c                          |   29 +-
+ arch/mips/bcm47xx/serial.c                         |   46 +-
+ arch/mips/bcm47xx/setup.c                          |   90 +-
+ arch/mips/bcm47xx/time.c                           |   16 +-
+ arch/mips/bcm47xx/wgt634u.c                        |   14 +-
+ arch/mips/include/asm/mach-bcm47xx/bcm47xx.h       |   26 +-
+ arch/mips/include/asm/mach-bcm47xx/gpio.h          |  108 +-
+ arch/mips/pci/pci-bcm47xx.c                        |    6 +
+ drivers/bcma/Kconfig                               |   13 +
+ drivers/bcma/Makefile                              |    2 +
+ drivers/bcma/bcma_private.h                        |   16 +
+ drivers/bcma/core.c                                |    2 +
+ drivers/bcma/driver_chipcommon.c                   |   53 +
+ drivers/bcma/driver_chipcommon_pmu.c               |  133 +
+ drivers/bcma/driver_mips.c                         |  256 +
+ drivers/bcma/driver_pci.c                          |   16 +-
+ drivers/bcma/host_soc.c                            |  183 +
+ drivers/bcma/main.c                                |   70 +-
+ drivers/bcma/scan.c                                |  348 +-
+ drivers/net/wireless/ath/Kconfig                   |    1 +
+ drivers/net/wireless/ath/Makefile                  |    1 +
+ drivers/net/wireless/ath/ath5k/ahb.c               |    4 +-
+ drivers/net/wireless/ath/ath5k/ani.c               |    1 -
+ drivers/net/wireless/ath/ath5k/ani.h               |    4 +
+ drivers/net/wireless/ath/ath5k/ath5k.h             |   98 +-
+ drivers/net/wireless/ath/ath5k/attach.c            |   18 +-
+ drivers/net/wireless/ath/ath5k/base.c              |   31 +-
+ drivers/net/wireless/ath/ath5k/base.h              |   55 +-
+ drivers/net/wireless/ath/ath5k/caps.c              |    2 +-
+ drivers/net/wireless/ath/ath5k/debug.c             |   15 +-
+ drivers/net/wireless/ath/ath5k/desc.c              |    1 -
+ drivers/net/wireless/ath/ath5k/dma.c               |    1 -
+ drivers/net/wireless/ath/ath5k/eeprom.c            |   10 +-
+ drivers/net/wireless/ath/ath5k/gpio.c              |    1 -
+ drivers/net/wireless/ath/ath5k/initvals.c          |    1 -
+ drivers/net/wireless/ath/ath5k/led.c               |    1 -
+ drivers/net/wireless/ath/ath5k/mac80211-ops.c      |    5 +-
+ drivers/net/wireless/ath/ath5k/pci.c               |    4 +-
+ drivers/net/wireless/ath/ath5k/pcu.c               |    5 +-
+ drivers/net/wireless/ath/ath5k/phy.c               |   91 +-
+ drivers/net/wireless/ath/ath5k/qcu.c               |   10 +-
+ drivers/net/wireless/ath/ath5k/reset.c             |   79 +-
+ drivers/net/wireless/ath/ath5k/rfkill.c            |    2 +-
+ drivers/net/wireless/ath/ath5k/sysfs.c             |    1 -
+ drivers/net/wireless/ath/ath5k/trace.h             |    3 +-
+ drivers/net/wireless/ath/ath6kl/Kconfig            |   15 +
+ drivers/net/wireless/ath/ath6kl/Makefile           |   35 +
+ drivers/net/wireless/ath/ath6kl/bmi.c              |  692 +++
+ drivers/net/wireless/ath/ath6kl/bmi.h              |  250 +
+ drivers/net/wireless/ath/ath6kl/cfg80211.c         | 1538 +++++
+ drivers/net/wireless/ath/ath6kl/cfg80211.h         |   39 +
+ drivers/net/wireless/ath/ath6kl/common.h           |  180 +
+ drivers/net/wireless/ath/ath6kl/core.h             |  544 ++
+ drivers/net/wireless/ath/ath6kl/debug.c            |  150 +
+ drivers/net/wireless/ath/ath6kl/debug.h            |  105 +
+ drivers/net/wireless/ath/ath6kl/hif-ops.h          |   72 +
+ drivers/net/wireless/ath/ath6kl/hif.h              |  207 +
+ drivers/net/wireless/ath/ath6kl/htc.c              | 2457 ++++++++
+ drivers/net/wireless/ath/ath6kl/htc.h              |  607 ++
+ drivers/net/wireless/ath/ath6kl/htc_hif.c          |  641 ++
+ drivers/net/wireless/ath/ath6kl/htc_hif.h          |   92 +
+ drivers/net/wireless/ath/ath6kl/init.c             | 1303 ++++
+ drivers/net/wireless/ath/ath6kl/main.c             | 1337 ++++
+ drivers/net/wireless/ath/ath6kl/node.c             |  234 +
+ drivers/net/wireless/ath/ath6kl/sdio.c             |  912 +++
+ drivers/net/wireless/ath/ath6kl/target.h           |  331 +
+ drivers/net/wireless/ath/ath6kl/txrx.c             | 1457 +++++
+ drivers/net/wireless/ath/ath6kl/wmi.c              | 2743 +++++++++
+ drivers/net/wireless/ath/ath6kl/wmi.h              | 2018 ++++++
+ drivers/net/wireless/ath/ath9k/ahb.c               |    2 +-
+ .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h   |  190 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |  150 +-
+ drivers/net/wireless/ath/ath9k/ar9003_mac.c        |   15 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.c        |    4 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h             |    6 +-
+ drivers/net/wireless/ath/ath9k/beacon.c            |   18 +-
+ drivers/net/wireless/ath/ath9k/calib.c             |   15 +
+ drivers/net/wireless/ath/ath9k/calib.h             |    1 +
+ drivers/net/wireless/ath/ath9k/debug.c             |   60 +
+ drivers/net/wireless/ath/ath9k/eeprom.h            |    2 +
+ drivers/net/wireless/ath/ath9k/eeprom_4k.c         |  135 +-
+ drivers/net/wireless/ath/ath9k/eeprom_9287.c       |  122 +-
+ drivers/net/wireless/ath/ath9k/eeprom_def.c        |  150 +-
+ drivers/net/wireless/ath/ath9k/gpio.c              |    2 +
+ drivers/net/wireless/ath/ath9k/htc.h               |    3 -
+ drivers/net/wireless/ath/ath9k/htc_drv_init.c      |    1 -
+ drivers/net/wireless/ath/ath9k/hw.c                |   10 +-
+ drivers/net/wireless/ath/ath9k/hw.h                |    9 +-
+ drivers/net/wireless/ath/ath9k/init.c              |    8 +-
+ drivers/net/wireless/ath/ath9k/mac.c               |   16 +-
+ drivers/net/wireless/ath/ath9k/main.c              |   10 +-
+ drivers/net/wireless/ath/ath9k/pci.c               |    4 +-
+ drivers/net/wireless/ath/ath9k/rc.c                |    4 +-
+ drivers/net/wireless/ath/ath9k/rc.h                |    6 -
+ drivers/net/wireless/ath/ath9k/recv.c              |   10 +-
+ drivers/net/wireless/ath/ath9k/xmit.c              |   12 +-
+ drivers/net/wireless/ath/regd.h                    |    2 +-
+ drivers/net/wireless/ath/regd_common.h             |    2 +-
+ drivers/net/wireless/b43/Kconfig                   |    6 +-
+ drivers/net/wireless/b43/main.c                    |    2 +-
+ drivers/net/wireless/b43legacy/b43legacy.h         |    1 -
+ drivers/net/wireless/b43legacy/dma.c               |  374 +-
+ drivers/net/wireless/b43legacy/dma.h               |  107 -
+ drivers/net/wireless/b43legacy/main.c              |    4 +-
+ drivers/net/wireless/ipw2x00/ipw2200.c             |    1 +
+ drivers/net/wireless/iwlegacy/iwl-3945-led.c       |    1 -
+ drivers/net/wireless/iwlegacy/iwl-3945-rs.c        |    1 -
+ drivers/net/wireless/iwlegacy/iwl-3945.c           |    1 -
+ drivers/net/wireless/iwlegacy/iwl-4965-led.c       |    1 -
+ drivers/net/wireless/iwlegacy/iwl-4965-rs.c        |    1 -
+ drivers/net/wireless/iwlegacy/iwl-4965.c           |    1 -
+ drivers/net/wireless/iwlegacy/iwl-led.c            |    1 -
+ drivers/net/wireless/iwlegacy/iwl3945-base.c       |    1 -
+ drivers/net/wireless/iwlegacy/iwl4965-base.c       |    1 -
+ drivers/net/wireless/iwlwifi/Kconfig               |   17 -
+ drivers/net/wireless/iwlwifi/iwl-1000.c            |   16 +-
+ drivers/net/wireless/iwlwifi/iwl-2000.c            |   24 +-
+ drivers/net/wireless/iwlwifi/iwl-5000.c            |   13 +-
+ drivers/net/wireless/iwlwifi/iwl-6000.c            |   20 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-calib.c       |   69 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-hw.h          |    4 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-lib.c         |   47 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |    1 -
+ drivers/net/wireless/iwlwifi/iwl-agn-rxon.c        |   23 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |   30 +-
+ drivers/net/wireless/iwlwifi/iwl-agn.c             |  388 +-
+ drivers/net/wireless/iwlwifi/iwl-agn.h             |    1 +
+ drivers/net/wireless/iwlwifi/iwl-commands.h        |   34 +-
+ drivers/net/wireless/iwlwifi/iwl-core.c            |    5 +
+ drivers/net/wireless/iwlwifi/iwl-core.h            |    5 +
+ drivers/net/wireless/iwlwifi/iwl-dev.h             |   29 +-
+ drivers/net/wireless/iwlwifi/iwl-led.c             |    1 -
+ drivers/net/wireless/iwlwifi/iwl-scan.c            |   19 +-
+ drivers/net/wireless/iwlwifi/iwl-trans.c           |   10 +-
+ drivers/net/wireless/libertas/cfg.c                |   69 +-
+ drivers/net/wireless/libertas/cfg.h                |    1 +
+ drivers/net/wireless/libertas/cmd.c                |    6 +-
+ drivers/net/wireless/libertas/decl.h               |    4 +
+ drivers/net/wireless/libertas/dev.h                |   28 +-
+ drivers/net/wireless/libertas/ethtool.c            |    1 +
+ drivers/net/wireless/libertas/if_sdio.c            |  277 +-
+ drivers/net/wireless/libertas/if_spi.c             |    4 -
+ drivers/net/wireless/libertas/if_usb.c             |   13 +-
+ drivers/net/wireless/libertas/main.c               |  180 +-
+ drivers/net/wireless/libertas/mesh.c               |   77 +-
+ drivers/net/wireless/libertas/mesh.h               |   27 +-
+ drivers/net/wireless/libertas/rx.c                 |    1 +
+ drivers/net/wireless/libertas/tx.c                 |    1 +
+ drivers/net/wireless/mac80211_hwsim.c              |    6 +
+ drivers/net/wireless/mwifiex/cfg80211.c            |  209 +-
+ drivers/net/wireless/mwifiex/fw.h                  |   15 +-
+ drivers/net/wireless/mwifiex/init.c                |   21 -
+ drivers/net/wireless/mwifiex/ioctl.h               |    5 +-
+ drivers/net/wireless/mwifiex/join.c                |   32 -
+ drivers/net/wireless/mwifiex/main.c                |    4 +
+ drivers/net/wireless/mwifiex/main.h                |   55 +-
+ drivers/net/wireless/mwifiex/scan.c                | 1578 +----
+ drivers/net/wireless/mwifiex/sta_event.c           |    9 +-
+ drivers/net/wireless/mwifiex/sta_ioctl.c           |  230 +-
+ drivers/net/wireless/orinoco/wext.c                |    1 +
+ drivers/net/wireless/rndis_wlan.c                  |    2 -
+ drivers/net/wireless/rt2x00/rt2400pci.c            |   39 +-
+ drivers/net/wireless/rt2x00/rt2500pci.c            |   39 +-
+ drivers/net/wireless/rt2x00/rt2800pci.c            |   46 +-
+ drivers/net/wireless/rt2x00/rt2x00dev.c            |    1 -
+ drivers/net/wireless/rt2x00/rt61pci.c              |   34 +-
+ drivers/net/wireless/rtlwifi/pci.c                 |   37 +-
+ drivers/net/wireless/rtlwifi/pci.h                 |   26 -
+ drivers/net/wireless/wl1251/cmd.h                  |    2 +-
+ drivers/net/wireless/wl1251/wl12xx_80211.h         |    2 +-
+ drivers/net/wireless/wl12xx/cmd.h                  |    4 +-
+ drivers/net/wireless/wl12xx/main.c                 |    2 +-
+ drivers/net/wireless/wl12xx/scan.h                 |    6 +-
+ drivers/net/wireless/wl12xx/wl12xx.h               |    4 +-
+ drivers/net/wireless/wl12xx/wl12xx_80211.h         |    2 +-
+ drivers/staging/Kconfig                            |    2 -
+ drivers/staging/Makefile                           |    1 -
+ drivers/staging/ath6kl/Kconfig                     |  158 -
+ drivers/staging/ath6kl/Makefile                    |  122 -
+ drivers/staging/ath6kl/TODO                        |   25 -
+ drivers/staging/ath6kl/bmi/include/bmi_internal.h  |   54 -
+ drivers/staging/ath6kl/bmi/src/bmi.c               | 1010 ---
+ .../staging/ath6kl/hif/common/hif_sdio_common.h    |   87 -
+ .../hif/sdio/linux_sdio/include/hif_internal.h     |  131 -
+ .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c   | 1273 ----
+ .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c   |  393 --
+ drivers/staging/ath6kl/htc2/AR6000/ar6k.c          | 1479 -----
+ drivers/staging/ath6kl/htc2/AR6000/ar6k.h          |  401 --
+ drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c   |  783 ---
+ drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c    |  755 ---
+ .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c        | 1284 ----
+ drivers/staging/ath6kl/htc2/htc.c                  |  575 --
+ drivers/staging/ath6kl/htc2/htc_debug.h            |   38 -
+ drivers/staging/ath6kl/htc2/htc_internal.h         |  211 -
+ drivers/staging/ath6kl/htc2/htc_recv.c             | 1572 -----
+ drivers/staging/ath6kl/htc2/htc_send.c             | 1018 ---
+ drivers/staging/ath6kl/htc2/htc_services.c         |  450 --
+ drivers/staging/ath6kl/include/a_config.h          |   31 -
+ drivers/staging/ath6kl/include/a_debug.h           |  195 -
+ drivers/staging/ath6kl/include/a_drv.h             |   32 -
+ drivers/staging/ath6kl/include/a_drv_api.h         |  204 -
+ drivers/staging/ath6kl/include/a_osapi.h           |   32 -
+ drivers/staging/ath6kl/include/aggr_recv_api.h     |  140 -
+ drivers/staging/ath6kl/include/ar3kconfig.h        |   65 -
+ drivers/staging/ath6kl/include/ar6000_api.h        |   32 -
+ drivers/staging/ath6kl/include/ar6000_diag.h       |   48 -
+ drivers/staging/ath6kl/include/ar6kap_common.h     |   44 -
+ drivers/staging/ath6kl/include/athbtfilter.h       |  135 -
+ drivers/staging/ath6kl/include/bmi.h               |  134 -
+ .../ath6kl/include/common/AR6002/AR6K_version.h    |   52 -
+ .../staging/ath6kl/include/common/AR6002/addrs.h   |   90 -
+ .../common/AR6002/hw4.0/hw/apb_athr_wlan_map.h     |   40 -
+ .../include/common/AR6002/hw4.0/hw/apb_map.h       |   40 -
+ .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h |   24 -
+ .../include/common/AR6002/hw4.0/hw/mbox_reg.h      |  552 --
+ .../common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h    |  471 --
+ .../include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h |  589 --
+ .../include/common/AR6002/hw4.0/hw/rtc_reg.h       |  187 -
+ .../include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h  |  162 -
+ .../include/common/AR6002/hw4.0/hw/uart_reg.h      |   40 -
+ drivers/staging/ath6kl/include/common/athdefs.h    |   75 -
+ drivers/staging/ath6kl/include/common/bmi_msg.h    |  233 -
+ drivers/staging/ath6kl/include/common/cnxmgmt.h    |   36 -
+ drivers/staging/ath6kl/include/common/dbglog.h     |  126 -
+ drivers/staging/ath6kl/include/common/dbglog_id.h  |  558 --
+ drivers/staging/ath6kl/include/common/discovery.h  |   75 -
+ .../staging/ath6kl/include/common/epping_test.h    |  111 -
+ drivers/staging/ath6kl/include/common/gmboxif.h    |   70 -
+ drivers/staging/ath6kl/include/common/gpio_reg.h   |    9 -
+ drivers/staging/ath6kl/include/common/htc.h        |  227 -
+ .../staging/ath6kl/include/common/htc_services.h   |   52 -
+ drivers/staging/ath6kl/include/common/pkt_log.h    |   45 -
+ drivers/staging/ath6kl/include/common/roaming.h    |   41 -
+ drivers/staging/ath6kl/include/common/targaddrs.h  |  395 --
+ drivers/staging/ath6kl/include/common/testcmd.h    |  185 -
+ drivers/staging/ath6kl/include/common/tlpm.h       |   38 -
+ drivers/staging/ath6kl/include/common/wlan_defs.h  |   79 -
+ drivers/staging/ath6kl/include/common/wmi.h        | 3220 ----------
+ drivers/staging/ath6kl/include/common/wmix.h       |  271 -
+ drivers/staging/ath6kl/include/common_drv.h        |  104 -
+ drivers/staging/ath6kl/include/dbglog_api.h        |   52 -
+ drivers/staging/ath6kl/include/dl_list.h           |  153 -
+ drivers/staging/ath6kl/include/dset_api.h          |   65 -
+ drivers/staging/ath6kl/include/hci_transport_api.h |  259 -
+ drivers/staging/ath6kl/include/hif.h               |  456 --
+ drivers/staging/ath6kl/include/host_version.h      |   52 -
+ drivers/staging/ath6kl/include/htc_api.h           |  575 --
+ drivers/staging/ath6kl/include/htc_packet.h        |  227 -
+ drivers/staging/ath6kl/include/wlan_api.h          |  128 -
+ drivers/staging/ath6kl/include/wmi_api.h           |  441 --
+ drivers/staging/ath6kl/miscdrv/ar3kconfig.c        |  565 --
+ .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c   |  572 --
+ .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h   |   75 -
+ .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c   |  969 ---
+ .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h   |  113 -
+ drivers/staging/ath6kl/miscdrv/common_drv.c        |  910 ---
+ drivers/staging/ath6kl/miscdrv/credit_dist.c       |  417 --
+ drivers/staging/ath6kl/miscdrv/miscdrv.h           |   42 -
+ drivers/staging/ath6kl/os/linux/ar6000_drv.c       | 6267 -------------------
+ drivers/staging/ath6kl/os/linux/ar6000_pm.c        |  626 --
+ drivers/staging/ath6kl/os/linux/ar6000_raw_if.c    |  455 --
+ drivers/staging/ath6kl/os/linux/cfg80211.c         | 1892 ------
+ .../staging/ath6kl/os/linux/export_hci_transport.c |  124 -
+ drivers/staging/ath6kl/os/linux/hci_bridge.c       | 1141 ----
+ .../staging/ath6kl/os/linux/include/ar6000_drv.h   |  776 ---
+ drivers/staging/ath6kl/os/linux/include/ar6k_pal.h |   36 -
+ .../ath6kl/os/linux/include/ar6xapi_linux.h        |  190 -
+ .../staging/ath6kl/os/linux/include/athdrv_linux.h | 1217 ----
+ drivers/staging/ath6kl/os/linux/include/cfg80211.h |   61 -
+ .../staging/ath6kl/os/linux/include/config_linux.h |   51 -
+ .../staging/ath6kl/os/linux/include/debug_linux.h  |   50 -
+ .../ath6kl/os/linux/include/export_hci_transport.h |   76 -
+ .../ath6kl/os/linux/include/ieee80211_ioctl.h      |  177 -
+ .../staging/ath6kl/os/linux/include/osapi_linux.h  |  339 -
+ .../staging/ath6kl/os/linux/include/wlan_config.h  |  108 -
+ .../ath6kl/os/linux/include/wmi_filter_linux.h     |  300 -
+ drivers/staging/ath6kl/os/linux/netbuf.c           |  231 -
+ drivers/staging/ath6kl/reorder/aggr_rx_internal.h  |  117 -
+ drivers/staging/ath6kl/reorder/rcv_aggr.c          |  661 --
+ drivers/staging/ath6kl/wlan/include/ieee80211.h    |  397 --
+ .../staging/ath6kl/wlan/include/ieee80211_node.h   |   93 -
+ drivers/staging/ath6kl/wlan/src/wlan_node.c        |  636 --
+ drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c |  199 -
+ drivers/staging/ath6kl/wlan/src/wlan_utils.c       |   58 -
+ drivers/staging/ath6kl/wmi/wmi.c                   | 6444 --------------------
+ drivers/staging/ath6kl/wmi/wmi_host.h              |  102 -
+ drivers/watchdog/bcm47xx_wdt.c                     |   27 +-
+ include/linux/bcma/bcma.h                          |    9 +-
+ include/linux/bcma/bcma_driver_chipcommon.h        |   67 +
+ include/linux/bcma/bcma_driver_mips.h              |   51 +
+ include/linux/bcma/bcma_soc.h                      |   16 +
+ include/linux/nl80211.h                            |   61 +-
+ include/linux/ssb/ssb_regs.h                       |   40 +
+ include/net/cfg80211-wext.h                        |   55 +
+ include/net/cfg80211.h                             |  279 +-
+ include/net/lib80211.h                             |    3 -
+ include/net/mac80211.h                             |   11 -
+ net/mac80211/agg-tx.c                              |   18 +-
+ net/mac80211/cfg.c                                 |   39 -
+ net/mac80211/driver-ops.h                          |   31 -
+ net/mac80211/ieee80211_i.h                         |   64 -
+ net/mac80211/main.c                                |    1 +
+ net/mac80211/mesh_hwmp.c                           |    7 +-
+ net/mac80211/rc80211_minstrel_ht.c                 |    8 +-
+ net/mac80211/sta_info.c                            |    1 +
+ net/mac80211/status.c                              |    3 -
+ net/mac80211/tx.c                                  |   20 +
+ net/mac80211/util.c                                |  168 +-
+ net/wireless/lib80211.c                            |   15 +-
+ net/wireless/nl80211.c                             |   86 +-
+ net/wireless/reg.c                                 |   14 +-
+ net/wireless/scan.c                                |    1 +
+ net/wireless/util.c                                |  168 +
+ net/wireless/wext-compat.c                         |  137 +-
+ net/wireless/wext-compat.h                         |    8 +
+ net/wireless/wext-sme.c                            |    3 +-
+ 321 files changed, 22561 insertions(+), 54152 deletions(-)
+ create mode 100644 arch/mips/bcm47xx/Kconfig
+ create mode 100644 drivers/bcma/driver_mips.c
+ create mode 100644 drivers/bcma/host_soc.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/Kconfig
+ create mode 100644 drivers/net/wireless/ath/ath6kl/Makefile
+ create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/common.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/core.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/debug.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/debug.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/hif-ops.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/hif.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/htc.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/htc.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/init.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/main.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/node.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/sdio.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/target.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/txrx.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.h
+ delete mode 100644 drivers/staging/ath6kl/Kconfig
+ delete mode 100644 drivers/staging/ath6kl/Makefile
+ delete mode 100644 drivers/staging/ath6kl/TODO
+ delete mode 100644 drivers/staging/ath6kl/bmi/include/bmi_internal.h
+ delete mode 100644 drivers/staging/ath6kl/bmi/src/bmi.c
+ delete mode 100644 drivers/staging/ath6kl/hif/common/hif_sdio_common.h
+ delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
+ delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
+ delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
+ delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.c
+ delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.h
+ delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
+ delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
+ delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
+ delete mode 100644 drivers/staging/ath6kl/htc2/htc.c
+ delete mode 100644 drivers/staging/ath6kl/htc2/htc_debug.h
+ delete mode 100644 drivers/staging/ath6kl/htc2/htc_internal.h
+ delete mode 100644 drivers/staging/ath6kl/htc2/htc_recv.c
+ delete mode 100644 drivers/staging/ath6kl/htc2/htc_send.c
+ delete mode 100644 drivers/staging/ath6kl/htc2/htc_services.c
+ delete mode 100644 drivers/staging/ath6kl/include/a_config.h
+ delete mode 100644 drivers/staging/ath6kl/include/a_debug.h
+ delete mode 100644 drivers/staging/ath6kl/include/a_drv.h
+ delete mode 100644 drivers/staging/ath6kl/include/a_drv_api.h
+ delete mode 100644 drivers/staging/ath6kl/include/a_osapi.h
+ delete mode 100644 drivers/staging/ath6kl/include/aggr_recv_api.h
+ delete mode 100644 drivers/staging/ath6kl/include/ar3kconfig.h
+ delete mode 100644 drivers/staging/ath6kl/include/ar6000_api.h
+ delete mode 100644 drivers/staging/ath6kl/include/ar6000_diag.h
+ delete mode 100644 drivers/staging/ath6kl/include/ar6kap_common.h
+ delete mode 100644 drivers/staging/ath6kl/include/athbtfilter.h
+ delete mode 100644 drivers/staging/ath6kl/include/bmi.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/addrs.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/athdefs.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/bmi_msg.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/cnxmgmt.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/dbglog.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/dbglog_id.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/discovery.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/epping_test.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/gmboxif.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/gpio_reg.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/htc.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/htc_services.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/pkt_log.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/roaming.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/targaddrs.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/testcmd.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/tlpm.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/wlan_defs.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/wmi.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/wmix.h
+ delete mode 100644 drivers/staging/ath6kl/include/common_drv.h
+ delete mode 100644 drivers/staging/ath6kl/include/dbglog_api.h
+ delete mode 100644 drivers/staging/ath6kl/include/dl_list.h
+ delete mode 100644 drivers/staging/ath6kl/include/dset_api.h
+ delete mode 100644 drivers/staging/ath6kl/include/hci_transport_api.h
+ delete mode 100644 drivers/staging/ath6kl/include/hif.h
+ delete mode 100644 drivers/staging/ath6kl/include/host_version.h
+ delete mode 100644 drivers/staging/ath6kl/include/htc_api.h
+ delete mode 100644 drivers/staging/ath6kl/include/htc_packet.h
+ delete mode 100644 drivers/staging/ath6kl/include/wlan_api.h
+ delete mode 100644 drivers/staging/ath6kl/include/wmi_api.h
+ delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kconfig.c
+ delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
+ delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
+ delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
+ delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
+ delete mode 100644 drivers/staging/ath6kl/miscdrv/common_drv.c
+ delete mode 100644 drivers/staging/ath6kl/miscdrv/credit_dist.c
+ delete mode 100644 drivers/staging/ath6kl/miscdrv/miscdrv.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_drv.c
+ delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_pm.c
+ delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
+ delete mode 100644 drivers/staging/ath6kl/os/linux/cfg80211.c
+ delete mode 100644 drivers/staging/ath6kl/os/linux/export_hci_transport.c
+ delete mode 100644 drivers/staging/ath6kl/os/linux/hci_bridge.c
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/cfg80211.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/config_linux.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/debug_linux.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/osapi_linux.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/wlan_config.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/netbuf.c
+ delete mode 100644 drivers/staging/ath6kl/reorder/aggr_rx_internal.h
+ delete mode 100644 drivers/staging/ath6kl/reorder/rcv_aggr.c
+ delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211.h
+ delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211_node.h
+ delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_node.c
+ delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
+ delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_utils.c
+ delete mode 100644 drivers/staging/ath6kl/wmi/wmi.c
+ delete mode 100644 drivers/staging/ath6kl/wmi/wmi_host.h
+ create mode 100644 include/linux/bcma/bcma_driver_mips.h
+ create mode 100644 include/linux/bcma/bcma_soc.h
+ create mode 100644 include/net/cfg80211-wext.h
+Merging bluetooth/master
+$ git merge bluetooth/master
+Merge made by recursive.
+ drivers/bluetooth/ath3k.c     |    1 +
+ drivers/bluetooth/btusb.c     |   16 ++-
+ include/net/bluetooth/l2cap.h |    3 +-
+ net/bluetooth/af_bluetooth.c  |   36 +++++-
+ net/bluetooth/bnep/bnep.h     |    1 +
+ net/bluetooth/bnep/core.c     |   18 ++-
+ net/bluetooth/cmtp/capi.c     |    3 +-
+ net/bluetooth/cmtp/cmtp.h     |    1 +
+ net/bluetooth/cmtp/core.c     |   25 +++--
+ net/bluetooth/hci_conn.c      |   14 +-
+ net/bluetooth/hci_core.c      |    8 +-
+ net/bluetooth/hidp/core.c     |   29 +++--
+ net/bluetooth/l2cap_core.c    |  263 ++++++++++++++---------------------------
+ net/bluetooth/l2cap_sock.c    |   30 +++---
+ net/bluetooth/rfcomm/core.c   |   22 ++--
+ net/bluetooth/rfcomm/sock.c   |   28 ++--
+ net/bluetooth/sco.c           |   28 ++--
+ 17 files changed, 249 insertions(+), 277 deletions(-)
+Merging mtd/master
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master
+$ git merge l2-mtd/master
+Resolved 'drivers/mtd/maps/lantiq-flash.c' using previous resolution.
+Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
+Auto-merging arch/arm/mach-at91/board-cam60.c
+Auto-merging arch/arm/mach-at91/board-cap9adk.c
+Auto-merging arch/arm/mach-at91/board-kb9202.c
+Auto-merging arch/arm/mach-at91/board-neocore926.c
+Auto-merging arch/arm/mach-at91/board-qil-a9260.c
+Auto-merging arch/arm/mach-at91/board-rm9200dk.c
+Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
+Auto-merging arch/arm/mach-at91/board-sam9260ek.c
+Auto-merging arch/arm/mach-at91/board-sam9261ek.c
+Auto-merging arch/arm/mach-at91/board-sam9263ek.c
+Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
+Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
+Auto-merging arch/arm/mach-at91/board-sam9rlek.c
+Auto-merging arch/arm/mach-at91/board-usb-a9260.c
+Auto-merging arch/arm/mach-at91/board-usb-a9263.c
+Auto-merging arch/arm/mach-at91/board-yl-9200.c
+Auto-merging arch/arm/mach-mmp/aspenite.c
+Removing drivers/mtd/maps/ceiva.c
+Removing drivers/mtd/maps/edb7312.c
+Auto-merging drivers/mtd/maps/lantiq-flash.c
+CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
+Removing drivers/mtd/nand/edb7312.c
+Auto-merging drivers/mtd/onenand/omap2.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9586116] Merge remote-tracking branch 'l2-mtd/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/mtdnand.tmpl                 |    5 +-
+ .../devicetree/bindings/mtd/atmel-dataflash.txt    |   14 +
+ arch/arm/mach-at91/board-afeb-9260v1.c             |    9 +-
+ arch/arm/mach-at91/board-cam60.c                   |    9 +-
+ arch/arm/mach-at91/board-cap9adk.c                 |    9 +-
+ arch/arm/mach-at91/board-kb9202.c                  |    9 +-
+ arch/arm/mach-at91/board-neocore926.c              |    9 +-
+ arch/arm/mach-at91/board-qil-a9260.c               |    9 +-
+ arch/arm/mach-at91/board-rm9200dk.c                |    9 +-
+ arch/arm/mach-at91/board-sam9-l9260.c              |    9 +-
+ arch/arm/mach-at91/board-sam9260ek.c               |    9 +-
+ arch/arm/mach-at91/board-sam9261ek.c               |    9 +-
+ arch/arm/mach-at91/board-sam9263ek.c               |    9 +-
+ arch/arm/mach-at91/board-sam9g20ek.c               |    9 +-
+ arch/arm/mach-at91/board-sam9m10g45ek.c            |    9 +-
+ arch/arm/mach-at91/board-sam9rlek.c                |    9 +-
+ arch/arm/mach-at91/board-snapper9260.c             |   10 +-
+ arch/arm/mach-at91/board-usb-a9260.c               |    9 +-
+ arch/arm/mach-at91/board-usb-a9263.c               |    9 +-
+ arch/arm/mach-at91/board-yl-9200.c                 |    9 +-
+ arch/arm/mach-at91/include/mach/board.h            |    3 +-
+ arch/arm/mach-davinci/board-da830-evm.c            |    2 +-
+ arch/arm/mach-davinci/board-da850-evm.c            |    2 +-
+ arch/arm/mach-davinci/board-dm355-evm.c            |    2 +-
+ arch/arm/mach-davinci/board-dm355-leopard.c        |    2 +-
+ arch/arm/mach-davinci/board-dm365-evm.c            |    2 +-
+ arch/arm/mach-davinci/board-dm644x-evm.c           |    2 +-
+ arch/arm/mach-davinci/board-mityomapl138.c         |    3 +-
+ arch/arm/mach-davinci/board-neuros-osd2.c          |    2 +-
+ arch/arm/mach-davinci/board-tnetv107x-evm.c        |    2 +-
+ arch/arm/mach-davinci/include/mach/nand.h          |    4 +-
+ arch/arm/mach-ep93xx/ts72xx.c                      |   23 +-
+ arch/arm/mach-mmp/aspenite.c                       |    5 +-
+ arch/arm/mach-orion5x/ts78xx-setup.c               |    2 +-
+ arch/arm/mach-pxa/cm-x300.c                        |    5 +-
+ arch/arm/mach-pxa/colibri-pxa3xx.c                 |    5 +-
+ arch/arm/mach-pxa/littleton.c                      |    5 +-
+ arch/arm/mach-pxa/mxm8x10.c                        |    9 +-
+ arch/arm/mach-pxa/raumfeld.c                       |    5 +-
+ arch/arm/mach-pxa/zylonite.c                       |    5 +-
+ arch/arm/plat-pxa/include/plat/pxa3xx_nand.h       |   20 +-
+ arch/avr32/boards/atngw100/setup.c                 |    8 +-
+ arch/avr32/boards/atstk1000/atstk1002.c            |    9 +-
+ arch/avr32/mach-at32ap/include/mach/board.h        |    3 +-
+ arch/cris/arch-v32/drivers/mach-a3/nandflash.c     |    2 +-
+ arch/cris/arch-v32/drivers/mach-fs/nandflash.c     |    2 +-
+ drivers/mtd/Kconfig                                |   16 +-
+ drivers/mtd/Makefile                               |    2 +-
+ drivers/mtd/afs.c                                  |    4 +-
+ drivers/mtd/ar7part.c                              |    2 +-
+ drivers/mtd/chips/cfi_cmdset_0002.c                |   31 +-
+ drivers/mtd/chips/fwh_lock.h                       |    3 +-
+ drivers/mtd/chips/jedec_probe.c                    |   34 +-
+ drivers/mtd/cmdlinepart.c                          |    7 +-
+ drivers/mtd/devices/doc2000.c                      |   13 +-
+ drivers/mtd/devices/doc2001.c                      |    7 +-
+ drivers/mtd/devices/doc2001plus.c                  |    7 +-
+ drivers/mtd/devices/docecc.c                       |    2 +-
+ drivers/mtd/devices/lart.c                         |   18 +-
+ drivers/mtd/devices/m25p80.c                       |   84 +--
+ drivers/mtd/devices/mtd_dataflash.c                |   91 +-
+ drivers/mtd/devices/sst25l.c                       |   42 +-
+ drivers/mtd/ftl.c                                  |   40 +-
+ drivers/mtd/inftlcore.c                            |   59 +-
+ drivers/mtd/inftlmount.c                           |  116 +--
+ drivers/mtd/maps/Kconfig                           |   22 -
+ drivers/mtd/maps/Makefile                          |    2 -
+ drivers/mtd/maps/bfin-async-flash.c                |   16 +-
+ drivers/mtd/maps/ceiva.c                           |  341 -------
+ drivers/mtd/maps/dc21285.c                         |    9 +-
+ drivers/mtd/maps/edb7312.c                         |  134 ---
+ drivers/mtd/maps/gpio-addr-flash.c                 |   16 +-
+ drivers/mtd/maps/h720x-flash.c                     |   23 +-
+ drivers/mtd/maps/impa7.c                           |   28 +-
+ drivers/mtd/maps/intel_vr_nor.c                    |    7 +-
+ drivers/mtd/maps/ixp2000.c                         |   11 +-
+ drivers/mtd/maps/ixp4xx.c                          |   29 +-
+ drivers/mtd/maps/lantiq-flash.c                    |   17 +-
+ drivers/mtd/maps/latch-addr-flash.c                |   24 +-
+ drivers/mtd/maps/pcmciamtd.c                       |  124 +--
+ drivers/mtd/maps/physmap.c                         |   38 +-
+ drivers/mtd/maps/physmap_of.c                      |   80 +--
+ drivers/mtd/maps/plat-ram.c                        |   23 +-
+ drivers/mtd/maps/pxa2xx-flash.c                    |   20 +-
+ drivers/mtd/maps/rbtx4939-flash.c                  |   24 +-
+ drivers/mtd/maps/sa1100-flash.c                    |   30 +-
+ drivers/mtd/maps/solutionengine.c                  |   30 +-
+ drivers/mtd/maps/wr_sbc82xx_flash.c                |   33 +-
+ drivers/mtd/mtdblock.c                             |   18 +-
+ drivers/mtd/mtdchar.c                              |   37 +-
+ drivers/mtd/mtdconcat.c                            |    2 +-
+ drivers/mtd/mtdcore.c                              |   69 +-
+ drivers/mtd/mtdcore.h                              |    3 +
+ drivers/mtd/mtdpart.c                              |   52 +-
+ drivers/mtd/mtdsuper.c                             |   20 +-
+ drivers/mtd/mtdswap.c                              |    5 +-
+ drivers/mtd/nand/Kconfig                           |   14 +-
+ drivers/mtd/nand/Makefile                          |    1 -
+ drivers/mtd/nand/atmel_nand.c                      |   74 +--
+ drivers/mtd/nand/au1550nd.c                        |   29 +-
+ drivers/mtd/nand/autcpu12.c                        |    4 +-
+ drivers/mtd/nand/bcm_umi_nand.c                    |   24 +-
+ drivers/mtd/nand/cafe_nand.c                       |   21 +-
+ drivers/mtd/nand/cmx270_nand.c                     |   23 +-
+ drivers/mtd/nand/cs553x_nand.c                     |   15 +-
+ drivers/mtd/nand/davinci_nand.c                    |   39 +-
+ drivers/mtd/nand/denali.c                          |    6 +-
+ drivers/mtd/nand/diskonchip.c                      |    6 +-
+ drivers/mtd/nand/edb7312.c                         |  203 ----
+ drivers/mtd/nand/fsl_elbc_nand.c                   |   75 +-
+ drivers/mtd/nand/fsl_upm.c                         |   16 +-
+ drivers/mtd/nand/fsmc_nand.c                       |   77 +--
+ drivers/mtd/nand/h1910.c                           |   19 +-
+ drivers/mtd/nand/jz4740_nand.c                     |   18 +-
+ drivers/mtd/nand/mpc5121_nfc.c                     |   22 +-
+ drivers/mtd/nand/mxc_nand.c                        |   33 +-
+ drivers/mtd/nand/nand_base.c                       |  996 ++++++++++----------
+ drivers/mtd/nand/nand_bbt.c                        |  516 +++++------
+ drivers/mtd/nand/nand_bch.c                        |    4 +-
+ drivers/mtd/nand/nand_ecc.c                        |   10 +-
+ drivers/mtd/nand/nandsim.c                         |    4 +-
+ drivers/mtd/nand/ndfc.c                            |   22 +-
+ drivers/mtd/nand/nomadik_nand.c                    |    1 +
+ drivers/mtd/nand/nuc900_nand.c                     |    1 +
+ drivers/mtd/nand/omap2.c                           |   22 +-
+ drivers/mtd/nand/orion_nand.c                      |   16 +-
+ drivers/mtd/nand/pasemi_nand.c                     |    3 +-
+ drivers/mtd/nand/plat_nand.c                       |   24 +-
+ drivers/mtd/nand/ppchameleonevb.c                  |   47 +-
+ drivers/mtd/nand/pxa3xx_nand.c                     |  471 ++++++----
+ drivers/mtd/nand/rtc_from4.c                       |    5 +-
+ drivers/mtd/nand/s3c2410.c                         |   27 +-
+ drivers/mtd/nand/sharpsl.c                         |   13 +-
+ drivers/mtd/nand/socrates_nand.c                   |   28 +-
+ drivers/mtd/nand/tmio_nand.c                       |   17 +-
+ drivers/mtd/nand/txx9ndfmc.c                       |    8 +-
+ drivers/mtd/nftlcore.c                             |   27 +-
+ drivers/mtd/nftlmount.c                            |   26 +-
+ drivers/mtd/ofpart.c                               |  112 +++-
+ drivers/mtd/onenand/generic.c                      |   14 +-
+ drivers/mtd/onenand/omap2.c                        |   16 +-
+ drivers/mtd/onenand/onenand_base.c                 |   62 +-
+ drivers/mtd/onenand/onenand_bbt.c                  |    6 +-
+ drivers/mtd/onenand/samsung.c                      |   13 +-
+ drivers/mtd/redboot.c                              |   13 +-
+ drivers/mtd/sm_ftl.c                               |   18 +-
+ drivers/mtd/ssfdc.c                                |   44 +-
+ drivers/mtd/tests/mtd_readtest.c                   |    3 +-
+ fs/jffs2/scan.c                                    |    4 +-
+ fs/jffs2/wbuf.c                                    |    3 +-
+ include/linux/mtd/bbm.h                            |   39 +-
+ include/linux/mtd/mtd.h                            |   38 +-
+ include/linux/mtd/nand.h                           |   76 +-
+ include/linux/mtd/onenand.h                        |    4 +
+ include/linux/mtd/partitions.h                     |   46 +-
+ include/linux/mtd/physmap.h                        |   17 -
+ 156 files changed, 2090 insertions(+), 3626 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/atmel-dataflash.txt
+ delete mode 100644 drivers/mtd/maps/ceiva.c
+ delete mode 100644 drivers/mtd/maps/edb7312.c
+ delete mode 100644 drivers/mtd/nand/edb7312.c
+Merging crypto/master
+$ git merge crypto/master
+Merge made by recursive.
+ .../devicetree/bindings/crypto/picochip-spacc.txt  |   23 +
+ arch/x86/crypto/Makefile                           |    8 +
+ arch/x86/crypto/sha1_ssse3_asm.S                   |  558 ++++++++++++++++++++
+ arch/x86/crypto/sha1_ssse3_glue.c                  |  240 +++++++++
+ arch/x86/include/asm/cpufeature.h                  |    3 +
+ crypto/Kconfig                                     |   10 +
+ crypto/sha1_generic.c                              |    9 +-
+ drivers/crypto/n2_core.c                           |    4 +-
+ drivers/crypto/padlock-aes.c                       |    4 +-
+ drivers/crypto/picoxcell_crypto.c                  |  121 ++---
+ include/crypto/sha.h                               |    5 +
+ 11 files changed, 914 insertions(+), 71 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/crypto/picochip-spacc.txt
+ create mode 100644 arch/x86/crypto/sha1_ssse3_asm.S
+ create mode 100644 arch/x86/crypto/sha1_ssse3_glue.c
+Merging sound/for-next
+$ git merge sound/for-next
+Removing sound/pci/hda/alc268_quirks.c
+Removing sound/pci/hda/alc680_quirks.c
+Merge made by recursive.
+ .../bindings/sound/soc/codecs/fsl-sgtl5000.txt     |   11 +
+ Documentation/devicetree/bindings/sound/wm8731.txt |   18 +
+ Documentation/sound/alsa/ALSA-Configuration.txt    |    5 +
+ Documentation/sound/alsa/HD-Audio-Models.txt       |   27 +-
+ Documentation/sound/alsa/HD-Audio.txt              |   48 ++
+ arch/mips/alchemy/devboards/db1200/platform.c      |   16 +
+ arch/mips/alchemy/devboards/db1x00/platform.c      |   48 ++
+ include/linux/mfd/wm8994/registers.h               |   39 ++
+ include/sound/soc-dapm.h                           |    2 +
+ include/sound/soc.h                                |    9 +
+ sound/firewire/isight.c                            |    1 -
+ sound/mips/Kconfig                                 |    5 +-
+ sound/pci/ac97/ac97_patch.c                        |    1 +
+ sound/pci/hda/Makefile                             |    3 +
+ sound/pci/hda/alc260_quirks.c                      |  304 ---------
+ sound/pci/hda/alc262_quirks.c                      |  508 +--------------
+ sound/pci/hda/alc268_quirks.c                      |  636 ------------------
+ sound/pci/hda/alc269_quirks.c                      |  250 -------
+ sound/pci/hda/alc662_quirks.c                      |  131 ----
+ sound/pci/hda/alc680_quirks.c                      |  222 -------
+ sound/pci/hda/alc861vd_quirks.c                    |  217 -------
+ sound/pci/hda/hda_codec.c                          |   35 +-
+ sound/pci/hda/hda_intel.c                          |   68 ++-
+ sound/pci/hda/hda_local.h                          |    2 +
+ sound/pci/hda/hda_trace.h                          |  117 ++++
+ sound/pci/hda/patch_realtek.c                      |  152 ++---
+ sound/pci/oxygen/xonar_pcm179x.c                   |    1 +
+ sound/pci/rme9652/hdspm.c                          |  139 +++--
+ sound/soc/Kconfig                                  |    3 +
+ sound/soc/Makefile                                 |    1 +
+ sound/soc/au1x/Kconfig                             |   28 +
+ sound/soc/au1x/Makefile                            |   10 +
+ sound/soc/au1x/ac97c.c                             |  365 +++++++++++
+ sound/soc/au1x/db1000.c                            |   75 +++
+ sound/soc/au1x/db1200.c                            |   64 ++-
+ sound/soc/au1x/dbdma2.c                            |   91 +---
+ sound/soc/au1x/dma.c                               |  377 +++++++++++
+ sound/soc/au1x/i2sc.c                              |  347 ++++++++++
+ sound/soc/au1x/psc-ac97.c                          |   48 +-
+ sound/soc/au1x/psc-i2s.c                           |   42 +-
+ sound/soc/au1x/psc.h                               |   16 +-
+ sound/soc/codecs/sgtl5000.c                        |    8 +
+ sound/soc/codecs/wm1250-ev1.c                      |   20 +-
+ sound/soc/codecs/wm8523.c                          |    2 +-
+ sound/soc/codecs/wm8580.c                          |    2 +-
+ sound/soc/codecs/wm8711.c                          |    4 +-
+ sound/soc/codecs/wm8728.c                          |    4 +-
+ sound/soc/codecs/wm8731.c                          |   10 +
+ sound/soc/codecs/wm8741.c                          |  126 +++-
+ sound/soc/codecs/wm8753.c                          |    4 +-
+ sound/soc/codecs/wm8993.c                          |    3 +-
+ sound/soc/codecs/wm8994-tables.c                   |    4 +-
+ sound/soc/codecs/wm8994.c                          |    6 +-
+ sound/soc/codecs/wm_hubs.c                         |   32 +-
+ sound/soc/codecs/wm_hubs.h                         |    3 +-
+ sound/soc/mxs/Kconfig                              |   20 +
+ sound/soc/mxs/Makefile                             |   10 +
+ sound/soc/mxs/mxs-pcm.c                            |  359 +++++++++++
+ sound/soc/mxs/mxs-pcm.h                            |   43 ++
+ sound/soc/mxs/mxs-saif.c                           |  677 ++++++++++++++++++++
+ sound/soc/mxs/mxs-saif.h                           |  130 ++++
+ sound/soc/mxs/mxs-sgtl5000.c                       |  165 +++++
+ sound/soc/samsung/smdk_wm8580.c                    |    6 +-
+ sound/soc/samsung/smdk_wm8580pcm.c                 |    4 +-
+ sound/soc/samsung/speyside.c                       |    5 +-
+ sound/soc/soc-core.c                               |    4 +-
+ sound/soc/soc-dapm.c                               |    6 +-
+ sound/soc/soc-io.c                                 |  323 ++--------
+ sound/usb/caiaq/audio.c                            |   31 +-
+ sound/usb/caiaq/device.h                           |    1 +
+ 70 files changed, 3555 insertions(+), 2939 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/soc/codecs/fsl-sgtl5000.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt
+ delete mode 100644 sound/pci/hda/alc268_quirks.c
+ delete mode 100644 sound/pci/hda/alc680_quirks.c
+ create mode 100644 sound/pci/hda/hda_trace.h
+ create mode 100644 sound/soc/au1x/ac97c.c
+ create mode 100644 sound/soc/au1x/db1000.c
+ create mode 100644 sound/soc/au1x/dma.c
+ create mode 100644 sound/soc/au1x/i2sc.c
+ create mode 100644 sound/soc/mxs/Kconfig
+ create mode 100644 sound/soc/mxs/Makefile
+ create mode 100644 sound/soc/mxs/mxs-pcm.c
+ create mode 100644 sound/soc/mxs/mxs-pcm.h
+ create mode 100644 sound/soc/mxs/mxs-saif.c
+ create mode 100644 sound/soc/mxs/mxs-saif.h
+ create mode 100644 sound/soc/mxs/mxs-sgtl5000.c
+Merging sound-asoc/for-next
+$ git merge sound-asoc/for-next
+Merge made by recursive.
+ Documentation/devicetree/bindings/sound/wm8510.txt |   18 +
+ Documentation/devicetree/bindings/sound/wm8523.txt |   16 +
+ Documentation/devicetree/bindings/sound/wm8580.txt |   16 +
+ Documentation/devicetree/bindings/sound/wm8711.txt |   18 +
+ Documentation/devicetree/bindings/sound/wm8728.txt |   18 +
+ Documentation/devicetree/bindings/sound/wm8737.txt |   18 +
+ Documentation/devicetree/bindings/sound/wm8741.txt |   18 +
+ Documentation/devicetree/bindings/sound/wm8750.txt |   18 +
+ Documentation/devicetree/bindings/sound/wm8753.txt |   18 +
+ include/linux/mfd/wm8994/registers.h               |   45 +
+ include/sound/adau1373.h                           |   34 +
+ sound/soc/blackfin/Kconfig                         |   13 +
+ sound/soc/blackfin/Makefile                        |    2 +
+ sound/soc/blackfin/bf5xx-ad193x.c                  |    2 +-
+ sound/soc/blackfin/bfin-eval-adau1373.c            |  202 +++
+ sound/soc/codecs/Kconfig                           |    4 +
+ sound/soc/codecs/Makefile                          |    2 +
+ sound/soc/codecs/ad193x.c                          |   11 +-
+ sound/soc/codecs/ad193x.h                          |    5 +-
+ sound/soc/codecs/adau1373.c                        | 1414 ++++++++++++++++++++
+ sound/soc/codecs/adau1373.h                        |   29 +
+ sound/soc/codecs/sta32x.c                          |    9 +-
+ sound/soc/codecs/wm1250-ev1.c                      |    2 +-
+ sound/soc/codecs/wm8510.c                          |    8 +
+ sound/soc/codecs/wm8523.c                          |    7 +
+ sound/soc/codecs/wm8580.c                          |    7 +
+ sound/soc/codecs/wm8711.c                          |    9 +
+ sound/soc/codecs/wm8728.c                          |    9 +
+ sound/soc/codecs/wm8737.c                          |   10 +
+ sound/soc/codecs/wm8741.c                          |    9 +
+ sound/soc/codecs/wm8750.c                          |   14 +-
+ sound/soc/codecs/wm8753.c                          |    9 +
+ sound/soc/codecs/wm8962.c                          |    8 +-
+ sound/soc/codecs/wm8993.c                          |    4 +
+ sound/soc/codecs/wm8994-tables.c                   |   12 +-
+ sound/soc/codecs/wm8994.c                          |  264 +++-
+ sound/soc/codecs/wm8994.h                          |    2 +
+ sound/soc/codecs/wm_hubs.c                         |   16 +
+ sound/soc/nuc900/nuc900-pcm.c                      |    1 -
+ sound/soc/pxa/spitz.c                              |    2 +-
+ sound/soc/pxa/z2.c                                 |    2 +-
+ sound/soc/s6000/s6000-pcm.c                        |    1 -
+ sound/soc/samsung/h1940_uda1380.c                  |    1 +
+ sound/soc/samsung/jive_wm8750.c                    |    2 +-
+ sound/soc/samsung/rx1950_uda1380.c                 |    1 +
+ sound/soc/samsung/smartq_wm8987.c                  |    2 +-
+ sound/soc/samsung/speyside_wm8962.c                |    4 +-
+ sound/soc/soc-cache.c                              |    7 -
+ sound/soc/soc-dapm.c                               |    6 +-
+ sound/soc/soc-io.c                                 |   11 +-
+ sound/soc/soc-jack.c                               |    2 +-
+ sound/soc/soc-pcm.c                                |    2 -
+ 52 files changed, 2262 insertions(+), 102 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8510.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8523.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8580.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8711.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8728.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8737.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8741.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8750.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8753.txt
+ create mode 100644 include/sound/adau1373.h
+ create mode 100644 sound/soc/blackfin/bfin-eval-adau1373.c
+ create mode 100644 sound/soc/codecs/adau1373.c
+ create mode 100644 sound/soc/codecs/adau1373.h
+Merging cpufreq/next
+$ git merge cpufreq/next
+Merge made by recursive.
+ Documentation/cpu-freq/governors.txt |    2 +-
+ drivers/cpufreq/cpufreq_ondemand.c   |    2 +-
+ drivers/cpufreq/e_powersaver.c       |  135 +++++++++++++++++++++++++++++++---
+ drivers/cpufreq/exynos4210-cpufreq.c |   23 ++++++-
+ 4 files changed, 148 insertions(+), 14 deletions(-)
+Merging quilt/rr
+$ git merge quilt/rr
+Merge made by recursive.
+ arch/x86/lguest/boot.c        |   10 ++++++++++
+ drivers/char/virtio_console.c |   10 ++++------
+ drivers/lguest/core.c         |    2 +-
+ drivers/net/virtio_net.c      |   14 +++++---------
+ include/linux/virtio_config.h |    3 +++
+ 5 files changed, 23 insertions(+), 16 deletions(-)
+Merging input/next
+$ git merge input/next
+Auto-merging drivers/input/misc/Kconfig
+Auto-merging drivers/input/misc/Makefile
+Merge made by recursive.
+ drivers/input/input-polldev.c        |    6 +-
+ drivers/input/misc/Kconfig           |   45 ++-
+ drivers/input/misc/Makefile          |    4 +-
+ drivers/input/misc/bma150.c          |  691 ++++++++++++++++++++++++++++++++++
+ drivers/input/misc/pm8xxx-vibrator.c |  296 +++++++++++++++
+ include/linux/bma150.h               |   46 +++
+ 6 files changed, 1074 insertions(+), 14 deletions(-)
+ create mode 100644 drivers/input/misc/bma150.c
+ create mode 100644 drivers/input/misc/pm8xxx-vibrator.c
+ create mode 100644 include/linux/bma150.h
+Merging input-mt/next
+$ git merge input-mt/next
+Already up-to-date.
+Merging lsm/for-next
+$ git merge lsm/for-next
+Already up-to-date.
+Merging block/for-next
+$ git merge block/for-next
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging block/blk-core.c
+Merge made by recursive.
+ Documentation/block/cfq-iosched.txt |   71 +++++++++
+ Documentation/kernel-parameters.txt |    9 +-
+ block/Kconfig                       |   10 ++
+ block/Makefile                      |    1 +
+ block/blk-core.c                    |    8 +-
+ block/blk-flush.c                   |   25 +++-
+ block/blk-softirq.c                 |    8 +
+ block/blk-throttle.c                |    4 +-
+ block/blk.h                         |    2 +
+ block/bsg-lib.c                     |  298 +++++++++++++++++++++++++++++++++++
+ block/cfq-iosched.c                 |    3 +
+ block/genhd.c                       |    8 +-
+ drivers/block/Kconfig               |   17 ++-
+ drivers/block/drbd/drbd_nl.c        |    4 +-
+ drivers/block/loop.c                |  297 ++++++++++++++++++++++++-----------
+ drivers/block/swim3.c               |    1 +
+ drivers/block/xen-blkfront.c        |    6 +-
+ drivers/cdrom/cdrom.c               |    8 +-
+ include/linux/blk_types.h           |    7 +-
+ include/linux/blkdev.h              |    5 +
+ include/linux/blktrace_api.h        |    5 +-
+ include/linux/bsg-lib.h             |   73 +++++++++
+ include/linux/loop.h                |    5 +-
+ include/linux/miscdevice.h          |    1 +
+ include/trace/events/block.h        |   20 ++-
+ kernel/trace/blktrace.c             |   21 ++-
+ 26 files changed, 782 insertions(+), 135 deletions(-)
+ create mode 100644 block/bsg-lib.c
+ create mode 100644 include/linux/bsg-lib.h
+Merging quilt/device-mapper
+$ git merge quilt/device-mapper
+Merge made by recursive.
+ Documentation/device-mapper/persistent-data.txt    |   84 +
+ Documentation/device-mapper/thin-provisioning.txt  |  275 +++
+ drivers/md/Kconfig                                 |    9 +
+ drivers/md/Makefile                                |    3 +
+ drivers/md/dm-crypt.c                              |    1 +
+ drivers/md/dm-flakey.c                             |    4 +-
+ drivers/md/dm-kcopyd.c                             |   31 +-
+ drivers/md/dm-raid.c                               |    2 +-
+ drivers/md/dm-table.c                              |   84 +-
+ drivers/md/dm-thin-metadata.c                      | 1404 ++++++++++++
+ drivers/md/dm-thin-metadata.h                      |  168 ++
+ drivers/md/dm-thin.c                               | 2279 ++++++++++++++++++++
+ drivers/md/dm.c                                    |   11 +
+ drivers/md/persistent-data/Kconfig                 |    7 +
+ drivers/md/persistent-data/Makefile                |    9 +
+ drivers/md/persistent-data/dm-block-manager.c      |  998 +++++++++
+ drivers/md/persistent-data/dm-block-manager.h      |  134 ++
+ drivers/md/persistent-data/dm-btree-internal.h     |  133 ++
+ drivers/md/persistent-data/dm-btree-remove.c       |  571 +++++
+ drivers/md/persistent-data/dm-btree-spine.c        |  222 ++
+ drivers/md/persistent-data/dm-btree.c              |  861 ++++++++
+ drivers/md/persistent-data/dm-btree.h              |  158 ++
+ .../persistent-data/dm-persistent-data-internal.h  |   20 +
+ drivers/md/persistent-data/dm-space-map-common.h   |   94 +
+ drivers/md/persistent-data/dm-space-map-disk.c     |  663 ++++++
+ drivers/md/persistent-data/dm-space-map-disk.h     |   25 +
+ drivers/md/persistent-data/dm-space-map-metadata.c |  956 ++++++++
+ drivers/md/persistent-data/dm-space-map-metadata.h |   33 +
+ drivers/md/persistent-data/dm-space-map.h          |  118 +
+ .../md/persistent-data/dm-transaction-manager.c    |  414 ++++
+ .../md/persistent-data/dm-transaction-manager.h    |  130 ++
+ include/linux/device-mapper.h                      |   40 +-
+ include/linux/dm-kcopyd.h                          |    4 +
+ 33 files changed, 9924 insertions(+), 21 deletions(-)
+ create mode 100644 Documentation/device-mapper/persistent-data.txt
+ create mode 100644 Documentation/device-mapper/thin-provisioning.txt
+ create mode 100644 drivers/md/dm-thin-metadata.c
+ create mode 100644 drivers/md/dm-thin-metadata.h
+ create mode 100644 drivers/md/dm-thin.c
+ create mode 100644 drivers/md/persistent-data/Kconfig
+ create mode 100644 drivers/md/persistent-data/Makefile
+ create mode 100644 drivers/md/persistent-data/dm-block-manager.c
+ create mode 100644 drivers/md/persistent-data/dm-block-manager.h
+ create mode 100644 drivers/md/persistent-data/dm-btree-internal.h
+ create mode 100644 drivers/md/persistent-data/dm-btree-remove.c
+ create mode 100644 drivers/md/persistent-data/dm-btree-spine.c
+ create mode 100644 drivers/md/persistent-data/dm-btree.c
+ create mode 100644 drivers/md/persistent-data/dm-btree.h
+ create mode 100644 drivers/md/persistent-data/dm-persistent-data-internal.h
+ create mode 100644 drivers/md/persistent-data/dm-space-map-common.h
+ create mode 100644 drivers/md/persistent-data/dm-space-map-disk.c
+ create mode 100644 drivers/md/persistent-data/dm-space-map-disk.h
+ create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.c
+ create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.h
+ create mode 100644 drivers/md/persistent-data/dm-space-map.h
+ create mode 100644 drivers/md/persistent-data/dm-transaction-manager.c
+ create mode 100644 drivers/md/persistent-data/dm-transaction-manager.h
+Merging embedded/master
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master
+$ git merge firmware/master
+Already up-to-date.
+Merging pcmcia/master
+$ git merge pcmcia/master
+Already up-to-date.
+Merging battery/master
+$ git merge battery/master
+Already up-to-date.
+Merging leds/for-mm
+$ git merge leds/for-mm
+Resolved 'drivers/leds/Kconfig' using previous resolution.
+Auto-merging drivers/leds/Kconfig
+CONFLICT (content): Merge conflict in drivers/leds/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8c12173] Merge remote-tracking branch 'leds/for-mm'
+$ git diff -M --stat --summary HEAD^..
+Merging backlight/for-mm
+$ git merge backlight/for-mm
+Already up-to-date.
+Merging mmc/mmc-next
+$ git merge mmc/mmc-next
+Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c
+Merge made by recursive.
+ drivers/mmc/core/host.c            |   11 ++++++++
+ drivers/mmc/host/sdhci-esdhc-imx.c |   45 +++++++++++++++++++++++++++++++++--
+ 2 files changed, 53 insertions(+), 3 deletions(-)
+Merging kgdb/kgdb-next
+$ git merge kgdb/kgdb-next
+Merge made by recursive.
+Merging slab/for-next
+$ git merge slab/for-next
+Already up-to-date!
+Merge made by recursive.
+Merging uclinux/for-next
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next
+$ git merge md/for-next
+Merge made by recursive.
+ drivers/md/md.c    |   12 +++++++++++-
+ drivers/md/raid5.c |    6 ++----
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+Merging mfd/for-next
+$ git merge mfd/for-next
+Already up-to-date.
+Merging hdlc/hdlc-next
+$ git merge hdlc/hdlc-next
+Already up-to-date.
+Merging drm/drm-next
+$ git merge drm/drm-next
+Already up-to-date.
+Merging fbdev/master
+$ git merge fbdev/master
+Auto-merging arch/powerpc/platforms/85xx/p1022_ds.c
+Auto-merging arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+Auto-merging arch/powerpc/sysdev/fsl_soc.h
+Auto-merging drivers/staging/xgifb/XGI_main_26.c
+Auto-merging drivers/video/atmel_lcdfb.c
+Auto-merging drivers/video/backlight/adp8860_bl.c
+Auto-merging drivers/video/controlfb.c
+Auto-merging drivers/video/fb_defio.c
+Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
+Auto-merging drivers/video/platinumfb.c
+Auto-merging drivers/video/via/viafbdev.c
+Merge made by recursive.
+ arch/powerpc/platforms/512x/mpc512x_shared.c |   22 +-
+ arch/powerpc/platforms/85xx/p1022_ds.c       |   47 +--
+ arch/powerpc/platforms/86xx/mpc8610_hpcd.c   |   55 ++--
+ arch/powerpc/sysdev/fsl_soc.h                |   25 +-
+ drivers/staging/xgifb/XGI_main_26.c          |   22 +-
+ drivers/video/68328fb.c                      |    4 +-
+ drivers/video/Kconfig                        |   16 +-
+ drivers/video/Makefile                       |    1 +
+ drivers/video/acornfb.c                      |    5 +-
+ drivers/video/arkfb.c                        |    9 +-
+ drivers/video/atmel_lcdfb.c                  |   15 +-
+ drivers/video/aty/radeon_base.c              |   10 +-
+ drivers/video/au1200fb.c                     |  297 ++++++--------
+ drivers/video/backlight/adp8860_bl.c         |    1 -
+ drivers/video/backlight/adp8870_bl.c         |    1 -
+ drivers/video/controlfb.c                    |    2 +-
+ drivers/video/da8xx-fb.c                     |  155 +++++++-
+ drivers/video/fb-puv3.c                      |    4 +-
+ drivers/video/fb_defio.c                     |    3 +-
+ drivers/video/fsl-diu-fb.c                   |   74 +++-
+ drivers/video/g364fb.c                       |    5 +-
+ drivers/video/grvga.c                        |  579 ++++++++++++++++++++++++++
+ drivers/video/gxt4500.c                      |    4 +-
+ drivers/video/hgafb.c                        |    4 +-
+ drivers/video/imsttfb.c                      |    2 +-
+ drivers/video/intelfb/intelfbhw.c            |    6 +-
+ drivers/video/mb862xx/mb862xxfbdrv.c         |    2 +-
+ drivers/video/mx3fb.c                        |    6 +-
+ drivers/video/neofb.c                        |    4 +-
+ drivers/video/platinumfb.c                   |    2 +-
+ drivers/video/pm2fb.c                        |    6 +-
+ drivers/video/pm3fb.c                        |    6 +-
+ drivers/video/pxa3xx-gcu.c                   |    2 -
+ drivers/video/s3c-fb.c                       |    2 +-
+ drivers/video/s3fb.c                         |    9 +-
+ drivers/video/savage/savagefb_driver.c       |   16 +-
+ drivers/video/sis/sis_main.c                 |   30 +-
+ drivers/video/skeletonfb.c                   |    2 +-
+ drivers/video/sm501fb.c                      |    6 +-
+ drivers/video/tridentfb.c                    |    4 +-
+ drivers/video/valkyriefb.c                   |    2 +-
+ drivers/video/vfb.c                          |    4 +-
+ drivers/video/vga16fb.c                      |    2 +-
+ drivers/video/via/via_modesetting.h          |    5 +
+ drivers/video/via/viafbdev.c                 |   16 +-
+ drivers/video/vt8500lcdfb.c                  |    4 +-
+ drivers/video/vt8623fb.c                     |    9 +-
+ drivers/video/xilinxfb.c                     |    1 -
+ 48 files changed, 1110 insertions(+), 398 deletions(-)
+ create mode 100644 drivers/video/grvga.c
+Merging viafb/viafb-next
+$ git merge viafb/viafb-next
+Auto-merging drivers/video/via/viafbdev.c
+Merge made by recursive.
+ drivers/video/via/dvi.c             |   34 +--
+ drivers/video/via/dvi.h             |    3 +-
+ drivers/video/via/global.c          |    2 +
+ drivers/video/via/global.h          |    2 +
+ drivers/video/via/hw.c              |  544 ++++++-----------------------------
+ drivers/video/via/hw.h              |  285 +------------------
+ drivers/video/via/lcd.c             |   53 ++--
+ drivers/video/via/lcd.h             |    7 +-
+ drivers/video/via/share.h           |   23 +--
+ drivers/video/via/via-core.c        |    2 +-
+ drivers/video/via/via_modesetting.c |  104 +++++++
+ drivers/video/via/via_modesetting.h |   18 ++
+ drivers/video/via/viafbdev.c        |   40 +--
+ drivers/video/via/viamode.c         |   60 +++-
+ drivers/video/via/viamode.h         |    4 +-
+ 15 files changed, 323 insertions(+), 858 deletions(-)
+Merging omap_dss2/for-next
+$ git merge omap_dss2/for-next
+Already up-to-date.
+Merging voltage/for-next
+$ git merge voltage/for-next
+Merge made by recursive.
+ drivers/regulator/88pm8607.c           |    2 +-
+ drivers/regulator/aat2870-regulator.c  |    1 +
+ drivers/regulator/max8649.c            |    2 +-
+ drivers/regulator/max8952.c            |    3 ---
+ drivers/regulator/tps65023-regulator.c |   11 +++++++++++
+ drivers/regulator/tps6507x-regulator.c |    8 +-------
+ drivers/regulator/tps65912-regulator.c |    2 --
+ include/linux/regulator/consumer.h     |    2 +-
+ 8 files changed, 16 insertions(+), 15 deletions(-)
+Merging security/next
+$ git merge security/next
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging fs/gfs2/inode.c
+Auto-merging fs/xfs/xfs_iops.c
+Removing security/integrity/ima/ima_iint.c
+Merge made by recursive.
+ Documentation/ABI/testing/evm       |   23 ++
+ Documentation/kernel-parameters.txt |    6 +
+ fs/attr.c                           |    5 +-
+ fs/btrfs/xattr.c                    |   50 +++---
+ fs/cifs/xattr.c                     |   40 ++--
+ fs/ext2/xattr_security.c            |   34 ++--
+ fs/ext3/xattr_security.c            |   36 ++--
+ fs/ext4/xattr_security.c            |   36 ++--
+ fs/gfs2/inode.c                     |   38 ++--
+ fs/jffs2/security.c                 |   35 ++--
+ fs/jfs/xattr.c                      |   57 +++---
+ fs/ocfs2/xattr.c                    |   38 +++--
+ fs/reiserfs/xattr_security.c        |    4 +-
+ fs/xattr.c                          |   63 ++++++-
+ fs/xfs/xfs_iops.c                   |   39 ++--
+ include/linux/evm.h                 |   92 +++++++++
+ include/linux/ima.h                 |   13 --
+ include/linux/integrity.h           |   38 ++++
+ include/linux/security.h            |   28 ++-
+ include/linux/xattr.h               |   14 ++-
+ mm/shmem.c                          |    4 +-
+ security/Kconfig                    |    2 +-
+ security/Makefile                   |    4 +-
+ security/commoncap.c                |   16 +-
+ security/integrity/Kconfig          |    7 +
+ security/integrity/Makefile         |   12 +
+ security/integrity/evm/Kconfig      |   14 ++
+ security/integrity/evm/Makefile     |    6 +
+ security/integrity/evm/evm.h        |   38 ++++
+ security/integrity/evm/evm_crypto.c |  216 ++++++++++++++++++++
+ security/integrity/evm/evm_main.c   |  384 +++++++++++++++++++++++++++++++++++
+ security/integrity/evm/evm_secfs.c  |  108 ++++++++++
+ security/integrity/iint.c           |  171 ++++++++++++++++
+ security/integrity/ima/Kconfig      |    1 +
+ security/integrity/ima/Makefile     |    2 +-
+ security/integrity/ima/ima.h        |   29 +--
+ security/integrity/ima/ima_api.c    |    7 +-
+ security/integrity/ima/ima_iint.c   |  169 ---------------
+ security/integrity/ima/ima_main.c   |   12 +-
+ security/integrity/integrity.h      |   47 +++++
+ security/security.c                 |   71 ++++++-
+ security/tomoyo/gc.c                |    2 +-
+ 42 files changed, 1576 insertions(+), 435 deletions(-)
+ create mode 100644 Documentation/ABI/testing/evm
+ create mode 100644 include/linux/evm.h
+ create mode 100644 include/linux/integrity.h
+ create mode 100644 security/integrity/Kconfig
+ create mode 100644 security/integrity/Makefile
+ create mode 100644 security/integrity/evm/Kconfig
+ create mode 100644 security/integrity/evm/Makefile
+ create mode 100644 security/integrity/evm/evm.h
+ create mode 100644 security/integrity/evm/evm_crypto.c
+ create mode 100644 security/integrity/evm/evm_main.c
+ create mode 100644 security/integrity/evm/evm_secfs.c
+ create mode 100644 security/integrity/iint.c
+ delete mode 100644 security/integrity/ima/ima_iint.c
+ create mode 100644 security/integrity/integrity.h
+Merging selinux/master
+$ git merge selinux/master
+Already up-to-date.
+Merging lblnet/master
+$ git merge lblnet/master
+Already up-to-date.
+Merging agp/agp-next
+$ git merge agp/agp-next
+Merge made by recursive.
+Merging watchdog/master
+$ git merge watchdog/master
+Merge made by recursive.
+ drivers/watchdog/hpwdt.c        |    9 +++++----
+ drivers/watchdog/watchdog_dev.c |   14 +++++++-------
+ 2 files changed, 12 insertions(+), 11 deletions(-)
+Merging bdev/master
+$ git merge bdev/master
+Already up-to-date.
+Merging dwmw2-iommu/master
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging cputime/cputime
+$ git merge cputime/cputime
+Already up-to-date.
+Merging osd/linux-next
+$ git merge osd/linux-next
+Merge made by recursive.
+ fs/exofs/exofs.h       |    3 --
+ fs/exofs/super.c       |   57 ++++++++++++++++++-----------------------------
+ include/scsi/osd_ore.h |    2 +
+ 3 files changed, 24 insertions(+), 38 deletions(-)
+Merging jc_docs/docs-next
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging nommu/master
+$ git merge nommu/master
+Already up-to-date.
+Merging trivial/for-next
+$ git merge trivial/for-next
+Auto-merging fs/eventpoll.c
+Auto-merging lib/idr.c
+Merge made by recursive.
+ Documentation/ABI/removed/o2cb                     |    2 +-
+ Documentation/ABI/testing/sysfs-bus-bcma           |    8 ++++----
+ .../testing/sysfs-class-backlight-driver-adp8870   |   16 ++++++++--------
+ drivers/usb/serial/mos7720.c                       |    1 -
+ drivers/usb/serial/mos7840.c                       |    1 -
+ fs/eventpoll.c                                     |    2 +-
+ lib/idr.c                                          |    2 +-
+ 7 files changed, 15 insertions(+), 17 deletions(-)
+Merging audit/for-next
+$ git merge audit/for-next
+Already up-to-date.
+Merging pm/linux-next
+$ git merge pm/linux-next
+Auto-merging arch/arm/mach-shmobile/setup-sh7372.c
+Merge made by recursive.
+ Documentation/power/basic-pm-debugging.txt   |   24 +++
+ Documentation/power/runtime_pm.txt           |    1 +
+ arch/arm/mach-shmobile/include/mach/sh7372.h |    3 +
+ arch/arm/mach-shmobile/pm-sh7372.c           |   48 +----
+ arch/arm/mach-shmobile/setup-sh7372.c        |    3 +
+ drivers/base/power/domain.c                  |  276 ++++++++++++++++----------
+ drivers/base/power/main.c                    |   31 +++-
+ drivers/base/power/runtime.c                 |   15 ++-
+ include/linux/pm_domain.h                    |   25 ++-
+ include/linux/suspend.h                      |   52 +++++
+ kernel/power/Kconfig                         |    4 +
+ kernel/power/main.c                          |  102 ++++++++++
+ kernel/power/suspend.c                       |   17 ++-
+ 13 files changed, 433 insertions(+), 168 deletions(-)
+Merging apm/for-next
+$ git merge apm/for-next
+Already up-to-date.
+Merging fsnotify/for-next
+$ git merge fsnotify/for-next
+Auto-merging fs/cachefiles/namei.c
+Auto-merging fs/nfsd/vfs.c
+Auto-merging fs/notify/fanotify/fanotify_user.c
+Auto-merging fs/notify/group.c
+Auto-merging fs/notify/mark.c
+Auto-merging include/linux/fsnotify_backend.h
+Merge made by recursive.
+ fs/cachefiles/namei.c              |    1 -
+ fs/cachefiles/xattr.c              |    1 -
+ fs/nfsd/vfs.c                      |    3 -
+ fs/notify/dnotify/dnotify.c        |   15 +++---
+ fs/notify/fanotify/fanotify.c      |   24 +++++----
+ fs/notify/fanotify/fanotify_user.c |  101 +++++++++++++++++++++++++-----------
+ fs/notify/group.c                  |    1 +
+ fs/notify/mark.c                   |   36 +++++--------
+ include/linux/fanotify.h           |    5 ++-
+ include/linux/fsnotify_backend.h   |   14 ++++-
+ 10 files changed, 121 insertions(+), 80 deletions(-)
+Merging irda/for-next
+$ git merge irda/for-next
+Already up-to-date.
+Merging i7core_edac/linux_next
+$ git merge i7core_edac/linux_next
+Auto-merging drivers/edac/i7core_edac.c
+Merge made by recursive.
+ drivers/edac/i7core_edac.c |   23 ++++++++++++++++++++---
+ 1 files changed, 20 insertions(+), 3 deletions(-)
+Merging i7300_edac/linux_next
+$ git merge i7300_edac/linux_next
+Resolved 'arch/x86/kernel/cpu/mcheck/mce.c' using previous resolution.
+Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
+Removing drivers/edac/edac_mce.c
+Auto-merging drivers/edac/i7core_edac.c
+Auto-merging include/linux/edac.h
+Removing include/linux/edac_mce.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master d4fefa7] Merge remote-tracking branch 'i7300_edac/linux_next'
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/kernel/cpu/mcheck/mce.c |   18 +--
+ drivers/edac/Kconfig             |    8 +-
+ drivers/edac/Makefile            |    1 -
+ drivers/edac/edac_core.h         |  350 +----------------------------------
+ drivers/edac/edac_mce.c          |   61 ------
+ drivers/edac/i7core_edac.c       |  387 ++++++++++++++++++++++++++++++++++----
+ include/linux/edac.h             |  350 ++++++++++++++++++++++++++++++++++
+ include/linux/edac_mce.h         |   31 ---
+ 8 files changed, 710 insertions(+), 496 deletions(-)
+ delete mode 100644 drivers/edac/edac_mce.c
+ delete mode 100644 include/linux/edac_mce.h
+Merging devicetree/devicetree/next
+$ git merge devicetree/devicetree/next
+Resolved 'drivers/of/base.c' using previous resolution.
+Auto-merging drivers/of/base.c
+CONFLICT (content): Merge conflict in drivers/of/base.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 7032952] Merge remote-tracking branch 'devicetree/devicetree/next'
+$ git diff -M --stat --summary HEAD^..
+Merging spi/spi/next
+$ git merge spi/spi/next
+Already up-to-date.
+Merging gpio/gpio/next
+$ git merge gpio/gpio/next
+Already up-to-date.
+Merging tip/auto-latest
+$ git merge tip/auto-latest
+Recorded preimage for 'arch/x86/mm/fault.c'
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging arch/x86/mm/fault.c
+CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/x86/mm/fault.c'.
+[master fe69a8f] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kernel-parameters.txt   |   18 ++++
+ Documentation/x86/entry_64.txt        |    3 -
+ arch/x86/Kconfig                      |    9 ++
+ arch/x86/include/asm/archrandom.h     |   75 +++++++++++++++++
+ arch/x86/include/asm/cmpxchg_32.h     |   21 +++++
+ arch/x86/include/asm/cmpxchg_64.h     |   26 ++++++
+ arch/x86/include/asm/elf.h            |   31 +++++++
+ arch/x86/include/asm/pgtable_types.h  |    1 -
+ arch/x86/include/asm/spinlock.h       |  140 +++++++++++---------------------
+ arch/x86/include/asm/spinlock_types.h |   22 +++++-
+ arch/x86/include/asm/x86_init.h       |   12 ---
+ arch/x86/kernel/apic/x2apic_uv_x.c    |    1 -
+ arch/x86/kernel/cpu/Makefile          |    1 +
+ arch/x86/kernel/cpu/amd.c             |   47 +++++++----
+ arch/x86/kernel/cpu/common.c          |    5 +
+ arch/x86/kernel/cpu/cpu.h             |    1 +
+ arch/x86/kernel/cpu/rdrand.c          |   73 ++++++++++++++++
+ arch/x86/kernel/sys_x86_64.c          |   77 +++++++++++++++++-
+ arch/x86/kernel/x86_init.c            |    4 -
+ arch/x86/mm/init.c                    |  147 ++++++++++++++++++++++++---------
+ arch/x86/mm/mmap.c                    |   20 +----
+ arch/x86/platform/olpc/olpc.c         |    4 +-
+ arch/x86/vdso/vma.c                   |    9 ++
+ arch/x86/xen/mmu.c                    |   15 ----
+ drivers/char/random.c                 |   23 +++++-
+ drivers/rtc/interface.c               |    4 +-
+ include/linux/irq.h                   |   11 ++-
+ include/linux/irqdesc.h               |    1 +
+ include/linux/random.h                |   13 +++
+ include/linux/rtc.h                   |    3 +
+ kernel/irq/generic-chip.c             |    4 +-
+ kernel/irq/irqdesc.c                  |   36 ++++++---
+ kernel/irq/manage.c                   |   18 +++-
+ kernel/lockdep.c                      |    8 ++-
+ 34 files changed, 652 insertions(+), 231 deletions(-)
+ create mode 100644 arch/x86/include/asm/archrandom.h
+ create mode 100644 arch/x86/kernel/cpu/rdrand.c
+Merging rcu/rcu/next
+$ git merge rcu/rcu/next
+Auto-merging Documentation/RCU/NMI-RCU.txt
+Auto-merging include/linux/rcupdate.h
+Auto-merging include/linux/sched.h
+Auto-merging init/Kconfig
+Auto-merging kernel/lockdep.c
+Auto-merging kernel/pid.c
+Auto-merging kernel/rcupdate.c
+Auto-merging kernel/rcutorture.c
+Auto-merging kernel/rcutree_trace.c
+Auto-merging kernel/sched.c
+Merge made by recursive.
+ Documentation/RCU/NMI-RCU.txt       |    2 +-
+ Documentation/RCU/lockdep-splat.txt |  110 +++++++++
+ Documentation/RCU/lockdep.txt       |   34 ++-
+ Documentation/RCU/torture.txt       |  137 ++++++++---
+ Documentation/RCU/trace.txt         |   38 ++--
+ include/linux/lockdep.h             |    2 +-
+ include/linux/rcupdate.h            |  300 +++++++++++-------------
+ include/linux/rcutiny.h             |   20 ++-
+ include/linux/rcutree.h             |    2 +
+ include/linux/sched.h               |    4 -
+ include/linux/types.h               |   10 +
+ include/trace/events/rcu.h          |  459 +++++++++++++++++++++++++++++++++++
+ init/Kconfig                        |    6 +-
+ kernel/lockdep.c                    |   84 ++++---
+ kernel/pid.c                        |    4 +-
+ kernel/rcu.h                        |   85 +++++++
+ kernel/rcupdate.c                   |   26 ++-
+ kernel/rcutiny.c                    |  117 ++-------
+ kernel/rcutiny_plugin.h             |  135 +++++++----
+ kernel/rcutorture.c                 |   64 ++---
+ kernel/rcutree.c                    |  206 ++++++++++------
+ kernel/rcutree.h                    |   14 +-
+ kernel/rcutree_plugin.h             |   97 +++++---
+ kernel/rcutree_trace.c              |   13 +-
+ kernel/sched.c                      |   13 +-
+ kernel/time/tick-sched.c            |    6 -
+ 26 files changed, 1394 insertions(+), 594 deletions(-)
+ create mode 100644 Documentation/RCU/lockdep-splat.txt
+ create mode 100644 include/trace/events/rcu.h
+ create mode 100644 kernel/rcu.h
+Merging kvm/linux-next
+$ git merge kvm/linux-next
+Merge made by recursive.
+ arch/x86/kvm/Kconfig |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+Merging oprofile/for-next
+$ git merge oprofile/for-next
+Already up-to-date.
+Merging ptrace/ptrace
+$ git merge ptrace/ptrace
+Already up-to-date.
+Merging xen/upstream/xen
+$ git merge xen/upstream/xen
+Resolved 'arch/x86/xen/Makefile' using previous resolution.
+Auto-merging arch/x86/xen/Makefile
+CONFLICT (content): Merge conflict in arch/x86/xen/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 842ebe3] Merge remote-tracking branch 'xen/upstream/xen'
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/xen/Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+Merging xen-two/linux-next
+$ git merge xen-two/linux-next
+Auto-merging arch/x86/xen/mmu.c
+Merge made by recursive.
+ .../ABI/testing/sysfs-bus-pci-devices-cciss        |    7 ++
+ Documentation/blockdev/cciss.txt                   |   10 +++
+ arch/x86/xen/Kconfig                               |    8 --
+ arch/x86/xen/mmu.c                                 |   38 -----------
+ drivers/block/cciss.c                              |   69 ++++++++++++++++---
+ drivers/block/cciss.h                              |    1 +
+ drivers/block/xen-blkback/blkback.c                |    8 +-
+ drivers/block/xen-blkback/common.h                 |    2 +-
+ drivers/block/xen-blkback/xenbus.c                 |   14 +++-
+ drivers/block/xen-blkfront.c                       |    9 ++-
+ drivers/pci/xen-pcifront.c                         |    4 +-
+ drivers/xen/balloon.c                              |   15 ++--
+ drivers/xen/events.c                               |    9 +--
+ drivers/xen/gntdev.c                               |    3 +-
+ drivers/xen/grant-table.c                          |    2 +-
+ drivers/xen/pci.c                                  |    4 +-
+ drivers/xen/swiotlb-xen.c                          |   42 ++++++++----
+ drivers/xen/xen-balloon.c                          |   17 ++---
+ drivers/xen/xen-pciback/conf_space_header.c        |    2 +-
+ drivers/xen/xenbus/xenbus_probe.c                  |    7 +-
+ drivers/xen/xenbus/xenbus_probe.h                  |    3 +-
+ 21 files changed, 156 insertions(+), 118 deletions(-)
+Merging xen-pvhvm/linux-next
+$ git merge xen-pvhvm/linux-next
+Already up-to-date.
+Merging edac-amd/for-next
+$ git merge edac-amd/for-next
+Merge made by recursive.
+ drivers/edac/mce_amd.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+Merging percpu/for-next
+$ git merge percpu/for-next
+Merge made by recursive.
+ mm/percpu-vm.c |    5 ++---
+ mm/percpu.c    |   17 +++++++++--------
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+Merging workqueues/for-next
+$ git merge workqueues/for-next
+Already up-to-date.
+Merging sfi/sfi-test
+$ git merge sfi/sfi-test
+Already up-to-date.
+Merging asm-generic/next
+$ git merge asm-generic/next
+Already up-to-date.
+Merging drivers-x86/linux-next
+$ git merge drivers-x86/linux-next
+Already up-to-date.
+Merging hwpoison/hwpoison
+$ git merge hwpoison/hwpoison
+Already up-to-date.
+Merging sysctl/master
+$ git merge sysctl/master
+Auto-merging fs/proc/proc_sysctl.c
+Merge made by recursive.
+ fs/proc/proc_sysctl.c |   14 ++------------
+ 1 files changed, 2 insertions(+), 12 deletions(-)
+Merging namespace/master
+$ git merge namespace/master
+Auto-merging fs/proc/inode.c
+Merge made by recursive.
+ fs/proc/inode.c      |    6 +-
+ fs/proc/namespaces.c |  160 +++++++++++++++++++++++++++++++++++++++++++-------
+ 2 files changed, 142 insertions(+), 24 deletions(-)
+Merging regmap/for-next
+$ git merge regmap/for-next
+Auto-merging drivers/base/regmap/regmap-spi.c
+Merge made by recursive.
+ drivers/base/regmap/Makefile         |    1 +
+ drivers/base/regmap/internal.h       |   66 +++++++++++
+ drivers/base/regmap/regmap-debugfs.c |  209 ++++++++++++++++++++++++++++++++++
+ drivers/base/regmap/regmap-i2c.c     |    1 -
+ drivers/base/regmap/regmap-spi.c     |    1 -
+ drivers/base/regmap/regmap.c         |  139 +++++++++++++++++-----
+ include/linux/regmap.h               |   27 ++++-
+ include/trace/events/regmap.h        |  112 ++++++++++++++++++
+ 8 files changed, 518 insertions(+), 38 deletions(-)
+ create mode 100644 drivers/base/regmap/internal.h
+ create mode 100644 drivers/base/regmap/regmap-debugfs.c
+ create mode 100644 include/trace/events/regmap.h
+Merging driver-core/driver-core-next
+$ git merge driver-core/driver-core-next
+Already up-to-date.
+Merging tty/tty-next
+$ git merge tty/tty-next
+Already up-to-date.
+Merging usb/usb-next
+$ git merge usb/usb-next
+Already up-to-date.
+Merging staging/staging-next
+$ git merge staging/staging-next
+Already up-to-date.
+Merging bkl-config/config
+$ git merge bkl-config/config
+Already up-to-date.
+Merging tmem/linux-next
+$ git merge tmem/linux-next
+Auto-merging include/linux/swap.h
+Auto-merging mm/Kconfig
+Auto-merging mm/swapfile.c
+Merge made by recursive.
+ .../ABI/testing/sysfs-kernel-mm-frontswap          |   16 +
+ Documentation/vm/frontswap.txt                     |  210 ++++++++++++
+ include/linux/frontswap.h                          |   92 ++++++
+ include/linux/swap.h                               |    2 +
+ include/linux/swapfile.h                           |   13 +
+ mm/Kconfig                                         |   17 +
+ mm/Makefile                                        |    1 +
+ mm/frontswap.c                                     |  335 ++++++++++++++++++++
+ mm/page_io.c                                       |   12 +
+ mm/swapfile.c                                      |   65 +++-
+ 10 files changed, 751 insertions(+), 12 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-frontswap
+ create mode 100644 Documentation/vm/frontswap.txt
+ create mode 100644 include/linux/frontswap.h
+ create mode 100644 include/linux/swapfile.h
+ create mode 100644 mm/frontswap.c
+Merging writeback/next
+$ git merge writeback/next
+Already up-to-date.
+Merging arm-dt/devicetree/arm-next
+$ git merge arm-dt/devicetree/arm-next
+Already up-to-date.
+Merging scsi-post-merge/merge-base:master
+Merging moduleh/module.h-split
+$ git merge moduleh/module.h-split
+Recorded preimage for 'include/linux/dmaengine.h'
+Auto-merging arch/arm/common/scoop.c
+Auto-merging arch/arm/kernel/setup.c
+Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
+Auto-merging arch/arm/mach-ixp2000/core.c
+Auto-merging arch/arm/mach-ixp4xx/common-pci.c
+Auto-merging arch/arm/mach-msm/io.c
+Auto-merging arch/arm/mach-omap1/board-ams-delta.c
+Auto-merging arch/arm/mach-omap1/board-sx1.c
+Auto-merging arch/arm/mach-omap1/board-voiceblue.c
+Auto-merging arch/arm/mach-orion5x/dns323-setup.c
+Auto-merging arch/mips/bcm47xx/gpio.c
+Auto-merging arch/mips/bcm47xx/setup.c
+Auto-merging arch/mips/kernel/traps.c
+Auto-merging arch/x86/kernel/cpu/amd.c
+Auto-merging drivers/base/power/main.c
+Auto-merging drivers/base/power/runtime.c
+Auto-merging drivers/bcma/core.c
+Auto-merging drivers/bcma/driver_chipcommon.c
+Auto-merging drivers/bcma/driver_pci.c
+Auto-merging drivers/bcma/main.c
+Auto-merging drivers/char/virtio_console.c
+Auto-merging drivers/clocksource/sh_cmt.c
+Auto-merging drivers/firmware/google/gsmi.c
+Auto-merging drivers/hid/hid-axff.c
+Auto-merging drivers/hid/hid-debug.c
+Auto-merging drivers/hid/hid-sjoy.c
+Auto-merging drivers/hid/usbhid/hid-quirks.c
+Auto-merging drivers/input/input-polldev.c
+Auto-merging drivers/md/dm-raid.c
+Auto-merging drivers/md/md.c
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/mmc/core/host.c
+Auto-merging drivers/mmc/host/sdhci-tegra.c
+Auto-merging drivers/mtd/ar7part.c
+Auto-merging drivers/mtd/cmdlinepart.c
+Auto-merging drivers/mtd/mtdsuper.c
+Auto-merging drivers/mtd/nand/cafe_nand.c
+Auto-merging drivers/mtd/nand/cmx270_nand.c
+Auto-merging drivers/mtd/nand/diskonchip.c
+Auto-merging drivers/mtd/nand/nand_bbt.c
+Auto-merging drivers/mtd/nand/omap2.c
+Auto-merging drivers/mtd/onenand/onenand_bbt.c
+Auto-merging drivers/mtd/redboot.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/alloc.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/catas.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/cmd.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/cq.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/eq.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/fw.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/intf.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/mr.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/pd.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/port.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/qp.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/srq.c
+Auto-merging drivers/pci/hotplug/pcihp_slot.c
+Auto-merging drivers/pci/setup-res.c
+Auto-merging drivers/regulator/88pm8607.c
+Auto-merging drivers/rtc/interface.c
+Auto-merging drivers/s390/cio/qdio_debug.c
+Auto-merging drivers/video/atmel_lcdfb.c
+Auto-merging drivers/video/carminefb.c
+Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
+Auto-merging drivers/video/msm/mdp.c
+Auto-merging drivers/xen/balloon.c
+Auto-merging drivers/xen/swiotlb-xen.c
+Auto-merging drivers/xen/xen-selfballoon.c
+Auto-merging drivers/xen/xenbus/xenbus_probe.c
+Auto-merging fs/exofs/super.c
+Auto-merging fs/logfs/super.c
+Auto-merging include/linux/bcma/bcma.h
+Auto-merging include/linux/blkdev.h
+Auto-merging include/linux/dmaengine.h
+CONFLICT (content): Merge conflict in include/linux/dmaengine.h
+Auto-merging include/linux/hid.h
+Auto-merging include/linux/mtd/mtd.h
+Auto-merging include/net/lib80211.h
+Auto-merging kernel/lockdep.c
+Auto-merging kernel/pid.c
+Auto-merging kernel/power/main.c
+Auto-merging kernel/power/suspend.c
+Auto-merging kernel/rcupdate.c
+Auto-merging kernel/rcutiny.c
+Auto-merging kernel/rcutorture.c
+Auto-merging kernel/rcutree.c
+Auto-merging kernel/rcutree_trace.c
+Auto-merging kernel/sched.c
+Auto-merging kernel/trace/blktrace.c
+Auto-merging mm/swapfile.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'include/linux/dmaengine.h'.
+[master b160c5f] Merge remote-tracking branch 'moduleh/module.h-split'
+$ git diff -M --stat --summary HEAD^..
+ arch/alpha/kernel/core_irongate.c                  |    1 +
+ arch/alpha/kernel/pci-sysfs.c                      |    1 +
+ arch/alpha/kernel/pci_iommu.c                      |    1 +
+ arch/alpha/kernel/setup.c                          |    1 +
+ arch/arm/common/it8152.c                           |    1 +
+ arch/arm/common/scoop.c                            |    1 +
+ arch/arm/kernel/armksyms.c                         |    2 +-
+ arch/arm/kernel/bios32.c                           |    2 +-
+ arch/arm/kernel/devtree.c                          |    2 +-
+ arch/arm/kernel/elf.c                              |    2 +-
+ arch/arm/kernel/io.c                               |    2 +-
+ arch/arm/kernel/irq.c                              |    1 -
+ arch/arm/kernel/leds.c                             |    3 +-
+ arch/arm/kernel/perf_event.c                       |    2 +-
+ arch/arm/kernel/pj4-cp0.c                          |    1 -
+ arch/arm/kernel/process.c                          |    2 +-
+ arch/arm/kernel/ptrace.c                           |    1 +
+ arch/arm/kernel/return_address.c                   |    2 +-
+ arch/arm/kernel/setup.c                            |    2 +-
+ arch/arm/kernel/stacktrace.c                       |    2 +-
+ arch/arm/kernel/sys_arm.c                          |    2 +-
+ arch/arm/kernel/time.c                             |    2 +-
+ arch/arm/kernel/unwind.c                           |    2 +-
+ arch/arm/kernel/xscale-cp0.c                       |    1 -
+ arch/arm/mach-at91/cpuidle.c                       |    1 +
+ arch/arm/mach-bcmring/dma.c                        |    1 +
+ arch/arm/mach-bcmring/mm.c                         |    1 +
+ arch/arm/mach-davinci/board-dm644x-evm.c           |    1 +
+ arch/arm/mach-davinci/board-dm646x-evm.c           |    1 +
+ arch/arm/mach-davinci/cdce949.c                    |    1 +
+ arch/arm/mach-davinci/cpufreq.c                    |    1 +
+ arch/arm/mach-davinci/cpuidle.c                    |    1 +
+ arch/arm/mach-ep93xx/core.c                        |    1 +
+ arch/arm/mach-exynos4/dev-sysmmu.c                 |    1 +
+ arch/arm/mach-footbridge/dc21285.c                 |    1 +
+ arch/arm/mach-imx/mach-mx31lilly.c                 |    1 +
+ arch/arm/mach-imx/mach-mx31lite.c                  |    1 +
+ arch/arm/mach-imx/mach-mx31moboard.c               |    1 +
+ arch/arm/mach-iop13xx/pci.c                        |    1 +
+ arch/arm/mach-ixp2000/core.c                       |    1 +
+ arch/arm/mach-ixp4xx/common-pci.c                  |    1 +
+ arch/arm/mach-ixp4xx/common.c                      |    1 +
+ arch/arm/mach-kirkwood/cpuidle.c                   |    1 +
+ arch/arm/mach-msm/io.c                             |    1 +
+ arch/arm/mach-netx/xc.c                            |    1 +
+ arch/arm/mach-omap1/board-ams-delta.c              |    1 +
+ arch/arm/mach-omap1/board-sx1.c                    |    1 +
+ arch/arm/mach-omap1/board-voiceblue.c              |    1 +
+ arch/arm/mach-omap1/mailbox.c                      |    1 +
+ arch/arm/mach-omap2/board-omap3evm.c               |    1 +
+ arch/arm/mach-omap2/clockdomain.c                  |    1 +
+ arch/arm/mach-omap2/display.c                      |    1 +
+ arch/arm/mach-omap2/gpmc-onenand.c                 |    1 +
+ arch/arm/mach-omap2/pm.c                           |    1 +
+ arch/arm/mach-omap2/prcm.c                         |    1 +
+ arch/arm/mach-omap2/usb-tusb6010.c                 |    2 +
+ arch/arm/mach-omap2/voltage.c                      |    1 +
+ arch/arm/mach-orion5x/dns323-setup.c               |    2 +-
+ arch/arm/mach-orion5x/pci.c                        |    1 +
+ arch/arm/mach-pxa/corgi.c                          |    1 +
+ arch/arm/mach-pxa/poodle.c                         |    1 +
+ arch/arm/mach-pxa/spitz.c                          |    1 +
+ arch/arm/mach-s3c2410/mach-h1940.c                 |    1 +
+ arch/arm/mach-s3c64xx/dev-audio.c                  |    1 +
+ arch/arm/mach-sa1100/collie.c                      |    1 +
+ arch/arm/mach-sa1100/jornada720.c                  |    1 +
+ arch/arm/mach-shmobile/clock.c                     |    1 +
+ arch/arm/mach-tegra/pcie.c                         |    1 +
+ arch/arm/mm/fault-armv.c                           |    1 -
+ arch/arm/mm/init.c                                 |    1 +
+ arch/arm/plat-iop/gpio.c                           |    1 +
+ arch/arm/plat-iop/time.c                           |    1 +
+ arch/arm/plat-omap/clock.c                         |    1 +
+ arch/arm/plat-omap/mailbox.c                       |    1 +
+ arch/arm/plat-s3c24xx/devs.c                       |    1 +
+ arch/arm/plat-s5p/dev-ehci.c                       |    1 +
+ arch/arm/plat-s5p/dev-onenand.c                    |    2 +
+ arch/arm/plat-samsung/dev-adc.c                    |    2 +
+ arch/arm/plat-samsung/dev-asocdma.c                |    1 +
+ arch/arm/plat-samsung/dev-backlight.c              |    1 +
+ arch/arm/plat-samsung/dev-ide.c                    |    2 +
+ arch/arm/plat-samsung/dev-nand.c                   |    1 +
+ arch/arm/plat-samsung/dev-pwm.c                    |    1 +
+ arch/arm/plat-samsung/dev-rtc.c                    |    1 +
+ arch/arm/plat-samsung/dev-ts.c                     |    2 +
+ arch/arm/plat-samsung/dev-usb.c                    |    1 +
+ arch/arm/plat-samsung/dev-wdt.c                    |    3 +
+ arch/arm/plat-samsung/platformdata.c               |    1 +
+ arch/arm/vfp/vfpmodule.c                           |    1 -
+ arch/avr32/mach-at32ap/clock.c                     |    1 +
+ arch/avr32/mach-at32ap/cpufreq.c                   |    1 +
+ arch/avr32/mach-at32ap/intc.c                      |    1 +
+ arch/avr32/mach-at32ap/pio.c                       |    1 +
+ arch/avr32/mm/dma-coherent.c                       |    1 +
+ arch/blackfin/kernel/dma-mapping.c                 |    1 +
+ arch/blackfin/kernel/perf_event.c                  |    1 +
+ arch/blackfin/kernel/sys_bfin.c                    |    1 +
+ arch/blackfin/mach-bf518/boards/ezbrd.c            |    1 +
+ arch/blackfin/mach-bf527/boards/ad7160eval.c       |    1 +
+ arch/blackfin/mach-bf527/boards/ezkit.c            |    1 +
+ arch/blackfin/mach-bf527/boards/tll6527m.c         |    1 +
+ arch/blackfin/mach-bf537/boards/dnp5370.c          |    1 +
+ arch/blackfin/mach-common/cpufreq.c                |    1 +
+ arch/blackfin/mm/init.c                            |    1 +
+ arch/ia64/hp/common/hwsw_iommu.c                   |    1 +
+ arch/ia64/kernel/dma-mapping.c                     |    1 +
+ arch/ia64/kernel/topology.c                        |    1 +
+ arch/ia64/sn/kernel/io_init.c                      |    1 +
+ arch/ia64/sn/pci/pcibr/pcibr_dma.c                 |    1 +
+ arch/ia64/sn/pci/pcibr/pcibr_provider.c            |    1 +
+ arch/ia64/sn/pci/tioca_provider.c                  |    1 +
+ arch/m68k/atari/time.c                             |    1 +
+ arch/m68k/kernel/dma_mm.c                          |    1 +
+ arch/m68k/kernel/dma_no.c                          |    1 +
+ arch/mips/bcm47xx/gpio.c                           |    1 +
+ arch/mips/bcm47xx/setup.c                          |    1 +
+ arch/mips/cavium-octeon/csrc-octeon.c              |    1 +
+ arch/mips/cavium-octeon/dma-octeon.c               |    1 +
+ arch/mips/cavium-octeon/flash_setup.c              |    1 +
+ arch/mips/kernel/8250-platform.c                   |    1 -
+ arch/mips/kernel/cpu-probe.c                       |    3 +-
+ arch/mips/kernel/i8253.c                           |    2 +-
+ arch/mips/kernel/init_task.c                       |    2 +-
+ arch/mips/kernel/irq-msc01.c                       |    1 -
+ arch/mips/kernel/irq.c                             |    1 -
+ arch/mips/kernel/mips-mt.c                         |    2 +-
+ arch/mips/kernel/mips_ksyms.c                      |    2 +-
+ arch/mips/kernel/module.c                          |    1 -
+ arch/mips/kernel/process.c                         |    2 +-
+ arch/mips/kernel/prom.c                            |    2 +-
+ arch/mips/kernel/reset.c                           |    2 +-
+ arch/mips/kernel/rtlx.c                            |    1 -
+ arch/mips/kernel/setup.c                           |    2 +-
+ arch/mips/kernel/spinlock_test.c                   |    2 +-
+ arch/mips/kernel/stacktrace.c                      |    2 +-
+ arch/mips/kernel/time.c                            |    2 +-
+ arch/mips/kernel/traps.c                           |    1 -
+ arch/mips/kernel/unaligned.c                       |    1 -
+ arch/mips/kernel/vpe.c                             |    1 -
+ arch/mips/loongson/common/platform.c               |    1 +
+ arch/mips/pci/pci-ip27.c                           |    1 +
+ arch/mips/pci/pci.c                                |    1 +
+ arch/mips/powertv/pci/fixup-powertv.c              |    1 +
+ arch/mips/powertv/powertv-usb.c                    |    1 +
+ arch/mips/rb532/gpio.c                             |    1 +
+ arch/mips/rb532/setup.c                            |    1 +
+ arch/mips/txx9/generic/spi_eeprom.c                |    1 +
+ arch/mips/txx9/rbtx4939/setup.c                    |    1 +
+ arch/mips/vr41xx/common/giu.c                      |    1 +
+ arch/mips/vr41xx/common/rtc.c                      |    1 +
+ arch/parisc/kernel/drivers.c                       |    1 +
+ arch/parisc/kernel/pci-dma.c                       |    1 +
+ arch/parisc/kernel/setup.c                         |    1 +
+ arch/parisc/lib/iomap.c                            |    1 +
+ arch/powerpc/include/asm/lv1call.h                 |    1 +
+ arch/powerpc/include/asm/machdep.h                 |    1 +
+ arch/powerpc/include/asm/spu.h                     |    1 +
+ arch/powerpc/kernel/btext.c                        |    2 +-
+ arch/powerpc/kernel/clock.c                        |    2 +-
+ arch/powerpc/kernel/cputable.c                     |    2 +-
+ arch/powerpc/kernel/crash.c                        |    1 +
+ arch/powerpc/kernel/dma-iommu.c                    |    1 +
+ arch/powerpc/kernel/dma.c                          |    1 +
+ arch/powerpc/kernel/firmware.c                     |    3 +-
+ arch/powerpc/kernel/hw_breakpoint.c                |    1 -
+ arch/powerpc/kernel/ibmebus.c                      |    2 +
+ arch/powerpc/kernel/init_task.c                    |    2 +-
+ arch/powerpc/kernel/io-workarounds.c               |    1 +
+ arch/powerpc/kernel/io.c                           |    2 +-
+ arch/powerpc/kernel/iomap.c                        |    1 +
+ arch/powerpc/kernel/irq.c                          |    2 +-
+ arch/powerpc/kernel/isa-bridge.c                   |    1 +
+ arch/powerpc/kernel/kvm.c                          |    1 +
+ arch/powerpc/kernel/module.c                       |    1 -
+ arch/powerpc/kernel/of_platform.c                  |    2 +-
+ arch/powerpc/kernel/paca.c                         |    2 +-
+ arch/powerpc/kernel/pci-common.c                   |    1 +
+ arch/powerpc/kernel/pci_32.c                       |    1 +
+ arch/powerpc/kernel/pci_64.c                       |    1 +
+ arch/powerpc/kernel/pci_dn.c                       |    1 +
+ arch/powerpc/kernel/pci_of_scan.c                  |    1 +
+ arch/powerpc/kernel/pmc.c                          |    2 +-
+ arch/powerpc/kernel/ppc_ksyms.c                    |    2 +-
+ arch/powerpc/kernel/process.c                      |    2 +-
+ arch/powerpc/kernel/prom.c                         |    2 +-
+ arch/powerpc/kernel/prom_parse.c                   |    1 -
+ arch/powerpc/kernel/ptrace.c                       |    1 -
+ arch/powerpc/kernel/rtas.c                         |    2 +-
+ arch/powerpc/kernel/setup-common.c                 |    2 +-
+ arch/powerpc/kernel/setup_64.c                     |    2 +-
+ arch/powerpc/kernel/signal_64.c                    |    1 -
+ arch/powerpc/kernel/smp.c                          |    2 +-
+ arch/powerpc/kernel/stacktrace.c                   |    2 +-
+ arch/powerpc/kernel/swsusp_64.c                    |    1 +
+ arch/powerpc/kernel/sysfs.c                        |    2 +-
+ arch/powerpc/kernel/time.c                         |    2 +-
+ arch/powerpc/kernel/vdso.c                         |    1 -
+ arch/powerpc/kernel/vio.c                          |    3 +-
+ arch/powerpc/kvm/44x.c                             |    1 +
+ arch/powerpc/kvm/book3s.c                          |    1 +
+ arch/powerpc/kvm/book3s_exports.c                  |    2 +-
+ arch/powerpc/kvm/book3s_hv.c                       |    1 +
+ arch/powerpc/kvm/book3s_hv_builtin.c               |    1 +
+ arch/powerpc/kvm/book3s_pr.c                       |    1 +
+ arch/powerpc/kvm/powerpc.c                         |    1 -
+ arch/powerpc/lib/checksum_wrappers_64.c            |    2 +-
+ arch/powerpc/lib/devres.c                          |    2 +-
+ arch/powerpc/lib/locks.c                           |    2 +-
+ arch/powerpc/lib/rheap.c                           |    2 +-
+ arch/powerpc/mm/dma-noncoherent.c                  |    1 +
+ arch/powerpc/mm/hash_utils_64.c                    |    1 +
+ arch/powerpc/mm/mem.c                              |    2 +-
+ arch/powerpc/mm/mmu_context_hash32.c               |    1 +
+ arch/powerpc/mm/mmu_context_hash64.c               |    2 +-
+ arch/powerpc/mm/numa.c                             |    2 +-
+ arch/powerpc/mm/pgtable_64.c                       |    1 +
+ arch/powerpc/mm/slice.c                            |    2 +-
+ arch/powerpc/mm/tlb_hash32.c                       |    1 +
+ arch/powerpc/mm/tlb_nohash.c                       |    1 +
+ arch/powerpc/platforms/44x/warp.c                  |    1 +
+ arch/powerpc/platforms/512x/clock.c                |    1 +
+ arch/powerpc/platforms/52xx/mpc52xx_common.c       |    1 +
+ arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c      |    1 +
+ arch/powerpc/platforms/83xx/suspend.c              |    1 +
+ arch/powerpc/platforms/85xx/mpc85xx_cds.c          |    1 -
+ arch/powerpc/platforms/85xx/mpc85xx_mds.c          |    1 -
+ arch/powerpc/platforms/85xx/sbc8548.c              |    1 -
+ arch/powerpc/platforms/86xx/gef_gpio.c             |    1 +
+ arch/powerpc/platforms/8xx/tqm8xx_setup.c          |    1 -
+ arch/powerpc/platforms/cell/axon_msi.c             |    1 +
+ arch/powerpc/platforms/cell/beat.c                 |    2 +-
+ arch/powerpc/platforms/cell/beat_spu_priv1.c       |    2 -
+ arch/powerpc/platforms/cell/beat_wrapper.h         |    1 +
+ arch/powerpc/platforms/cell/cbe_cpufreq.c          |    1 +
+ arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c      |    1 +
+ arch/powerpc/platforms/cell/cbe_powerbutton.c      |    1 +
+ arch/powerpc/platforms/cell/cbe_regs.c             |    2 +-
+ arch/powerpc/platforms/cell/celleb_setup.c         |    1 +
+ arch/powerpc/platforms/cell/cpufreq_spudemand.c    |    1 +
+ arch/powerpc/platforms/cell/interrupt.c            |    2 +-
+ arch/powerpc/platforms/cell/pmu.c                  |    1 +
+ arch/powerpc/platforms/cell/qpace_setup.c          |    1 +
+ arch/powerpc/platforms/cell/setup.c                |    1 +
+ arch/powerpc/platforms/cell/smp.c                  |    1 -
+ arch/powerpc/platforms/cell/spu_callbacks.c        |    2 +-
+ arch/powerpc/platforms/cell/spu_fault.c            |    2 +-
+ arch/powerpc/platforms/cell/spu_manage.c           |    2 +-
+ arch/powerpc/platforms/cell/spu_notify.c           |    3 +-
+ arch/powerpc/platforms/cell/spu_priv1_mmio.c       |    1 -
+ arch/powerpc/platforms/cell/spufs/backing_ops.c    |    1 -
+ arch/powerpc/platforms/cell/spufs/context.c        |    2 +-
+ arch/powerpc/platforms/cell/spufs/coredump.c       |    1 -
+ arch/powerpc/platforms/cell/spufs/fault.c          |    1 -
+ arch/powerpc/platforms/cell/spufs/file.c           |    2 +-
+ arch/powerpc/platforms/cell/spufs/hw_ops.c         |    1 -
+ arch/powerpc/platforms/cell/spufs/sched.c          |    1 -
+ arch/powerpc/platforms/cell/spufs/switch.c         |    2 +-
+ arch/powerpc/platforms/cell/spufs/syscalls.c       |    2 +-
+ arch/powerpc/platforms/embedded6xx/holly.c         |    1 +
+ arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c  |    1 +
+ arch/powerpc/platforms/iseries/hvlpconfig.c        |    2 +-
+ arch/powerpc/platforms/iseries/iommu.c             |    2 +-
+ arch/powerpc/platforms/iseries/ksyms.c             |    2 +-
+ arch/powerpc/platforms/iseries/lpardata.c          |    1 -
+ arch/powerpc/platforms/iseries/lpevents.c          |    2 +-
+ arch/powerpc/platforms/iseries/mf.c                |    1 +
+ arch/powerpc/platforms/iseries/pci.c               |    1 -
+ arch/powerpc/platforms/iseries/setup.c             |    1 +
+ arch/powerpc/platforms/iseries/smp.c               |    1 -
+ arch/powerpc/platforms/iseries/vio.c               |    2 +-
+ arch/powerpc/platforms/iseries/viopath.c           |    2 +-
+ arch/powerpc/platforms/maple/setup.c               |    1 +
+ arch/powerpc/platforms/pasemi/cpufreq.c            |    1 +
+ arch/powerpc/platforms/pasemi/dma_lib.c            |    3 +-
+ arch/powerpc/platforms/pasemi/setup.c              |    1 +
+ arch/powerpc/platforms/powermac/backlight.c        |    1 +
+ arch/powerpc/platforms/powermac/feature.c          |    1 +
+ arch/powerpc/platforms/powermac/low_i2c.c          |    2 +-
+ arch/powerpc/platforms/powermac/nvram.c            |    2 +-
+ arch/powerpc/platforms/powermac/pic.c              |    1 -
+ arch/powerpc/platforms/powermac/setup.c            |    1 +
+ arch/powerpc/platforms/ps3/exports.c               |    2 -
+ arch/powerpc/platforms/ps3/interrupt.c             |    2 +-
+ arch/powerpc/platforms/ps3/mm.c                    |    2 +-
+ arch/powerpc/platforms/ps3/os-area.c               |    1 +
+ arch/powerpc/platforms/ps3/setup.c                 |    1 +
+ arch/powerpc/platforms/ps3/spu.c                   |    1 +
+ arch/powerpc/platforms/ps3/system-bus.c            |    2 +-
+ arch/powerpc/platforms/pseries/eeh.c               |    2 +
+ arch/powerpc/platforms/pseries/eeh_event.c         |    1 +
+ arch/powerpc/platforms/pseries/eeh_sysfs.c         |    1 +
+ arch/powerpc/platforms/pseries/hotplug-cpu.c       |    1 +
+ arch/powerpc/platforms/pseries/hvconsole.c         |    3 +-
+ arch/powerpc/platforms/pseries/io_event_irq.c      |    2 +-
+ arch/powerpc/platforms/pseries/iommu.c             |    1 +
+ arch/powerpc/platforms/pseries/lpar.c              |    1 +
+ arch/powerpc/platforms/pseries/mobility.c          |    1 +
+ arch/powerpc/platforms/pseries/pci_dlpar.c         |    1 +
+ arch/powerpc/platforms/pseries/plpar_wrappers.h    |    3 +
+ arch/powerpc/platforms/pseries/setup.c             |    2 +-
+ arch/powerpc/platforms/pseries/smp.c               |    1 -
+ arch/powerpc/platforms/pseries/suspend.c           |    1 +
+ arch/powerpc/sysdev/bestcomm/sram.c                |    2 +-
+ arch/powerpc/sysdev/cpm_common.c                   |    1 +
+ arch/powerpc/sysdev/dcr.c                          |    1 +
+ arch/powerpc/sysdev/fsl_gtm.c                      |    1 +
+ arch/powerpc/sysdev/fsl_lbc.c                      |    3 +-
+ arch/powerpc/sysdev/fsl_pmc.c                      |    1 +
+ arch/powerpc/sysdev/fsl_rio.c                      |    2 +-
+ arch/powerpc/sysdev/fsl_soc.c                      |    2 +-
+ arch/powerpc/sysdev/mpc5xxx_clocks.c               |    1 +
+ arch/powerpc/sysdev/mpc8xx_pic.c                   |    1 -
+ arch/powerpc/sysdev/mv64x60_pci.c                  |    1 +
+ arch/powerpc/sysdev/pmi.c                          |    1 +
+ arch/powerpc/sysdev/ppc4xx_msi.c                   |    1 +
+ arch/powerpc/sysdev/qe_lib/gpio.c                  |    1 +
+ arch/powerpc/sysdev/qe_lib/ucc.c                   |    2 +-
+ arch/powerpc/sysdev/qe_lib/ucc_fast.c              |    2 +-
+ arch/powerpc/sysdev/qe_lib/ucc_slow.c              |    2 +-
+ arch/powerpc/sysdev/qe_lib/usb.c                   |    1 +
+ arch/powerpc/sysdev/rtc_cmos_setup.c               |    1 +
+ arch/powerpc/sysdev/scom.c                         |    1 +
+ arch/powerpc/sysdev/simple_gpio.c                  |    1 -
+ arch/powerpc/sysdev/tsi108_dev.c                   |    2 +-
+ arch/powerpc/xmon/xmon.c                           |    2 +-
+ arch/s390/crypto/sha_common.c                      |    1 +
+ arch/s390/mm/init.c                                |    1 +
+ arch/sh/drivers/dma/dma-sysfs.c                    |    1 +
+ arch/sh/drivers/pci/pci.c                          |    1 +
+ arch/sh/kernel/cpu/shmobile/cpuidle.c              |    1 +
+ arch/sh/kernel/perf_event.c                        |    1 +
+ arch/sh/kernel/topology.c                          |    1 +
+ arch/sh/mm/init.c                                  |    1 +
+ arch/sparc/include/asm/termios.h                   |    1 -
+ arch/sparc/kernel/auxio_32.c                       |    1 +
+ arch/sparc/kernel/btext.c                          |    1 -
+ arch/sparc/kernel/central.c                        |    1 +
+ arch/sparc/kernel/cpu.c                            |    2 +-
+ arch/sparc/kernel/cpumap.c                         |    2 +-
+ arch/sparc/kernel/dma.c                            |    1 -
+ arch/sparc/kernel/ebus.c                           |    2 +-
+ arch/sparc/kernel/hvapi.c                          |    2 +-
+ arch/sparc/kernel/idprom.c                         |    2 +-
+ arch/sparc/kernel/iommu.c                          |    2 +-
+ arch/sparc/kernel/irq_32.c                         |    1 +
+ arch/sparc/kernel/irq_64.c                         |    1 -
+ arch/sparc/kernel/ldc.c                            |    2 +-
+ arch/sparc/kernel/leon_kernel.c                    |    1 -
+ arch/sparc/kernel/leon_pci_grpci2.c                |    1 -
+ arch/sparc/kernel/nmi.c                            |    2 +-
+ arch/sparc/kernel/of_device_32.c                   |    1 -
+ arch/sparc/kernel/of_device_64.c                   |    3 +-
+ arch/sparc/kernel/of_device_common.c               |    2 +-
+ arch/sparc/kernel/pci.c                            |    2 +-
+ arch/sparc/kernel/pci_fire.c                       |    1 +
+ arch/sparc/kernel/pci_psycho.c                     |    1 +
+ arch/sparc/kernel/pci_sabre.c                      |    1 +
+ arch/sparc/kernel/pci_schizo.c                     |    1 +
+ arch/sparc/kernel/pci_sun4v.c                      |    1 +
+ arch/sparc/kernel/pcic.c                           |    1 +
+ arch/sparc/kernel/pcr.c                            |    3 +-
+ arch/sparc/kernel/pmc.c                            |    1 +
+ arch/sparc/kernel/power.c                          |    2 +-
+ arch/sparc/kernel/process_64.c                     |    2 +-
+ arch/sparc/kernel/prom_32.c                        |    1 -
+ arch/sparc/kernel/prom_64.c                        |    1 -
+ arch/sparc/kernel/prom_common.c                    |    2 +-
+ arch/sparc/kernel/reboot.c                         |    2 +-
+ arch/sparc/kernel/sbus.c                           |    1 +
+ arch/sparc/kernel/setup_32.c                       |    1 +
+ arch/sparc/kernel/setup_64.c                       |    1 +
+ arch/sparc/kernel/smp_64.c                         |    2 +-
+ arch/sparc/kernel/sparc_ksyms_64.c                 |    2 +-
+ arch/sparc/kernel/stacktrace.c                     |    2 +-
+ arch/sparc/kernel/sys_sparc32.c                    |    1 -
+ arch/sparc/kernel/sys_sparc_64.c                   |    2 +-
+ arch/sparc/kernel/time_64.c                        |    2 +-
+ arch/sparc/kernel/traps_32.c                       |    1 +
+ arch/sparc/kernel/unaligned_32.c                   |    1 -
+ arch/sparc/kernel/vio.c                            |    1 +
+ arch/sparc/kernel/viohs.c                          |    2 +-
+ arch/sparc/mm/fault_32.c                           |    1 -
+ arch/sparc/mm/generic_32.c                         |    1 +
+ arch/sparc/mm/generic_64.c                         |    1 +
+ arch/sparc/mm/highmem.c                            |    1 +
+ arch/sparc/mm/hugetlbpage.c                        |    1 -
+ arch/x86/crypto/aes_glue.c                         |    1 +
+ arch/x86/crypto/aesni-intel_glue.c                 |    1 +
+ arch/x86/kernel/cpu/amd.c                          |    1 +
+ arch/x86/kernel/cpu/mcheck/therm_throt.c           |    1 +
+ arch/x86/kernel/devicetree.c                       |    1 +
+ arch/x86/kernel/e820.c                             |    1 +
+ arch/x86/kernel/hpet.c                             |    1 +
+ arch/x86/kernel/irq.c                              |    1 +
+ arch/x86/kernel/pci-dma.c                          |    1 +
+ arch/x86/kernel/probe_roms.c                       |    4 +-
+ arch/x86/kernel/rtc.c                              |    1 +
+ arch/x86/kernel/smp.c                              |    1 +
+ arch/x86/kernel/time.c                             |    1 +
+ arch/x86/kernel/topology.c                         |    1 +
+ arch/x86/kernel/vsyscall_64.c                      |    1 +
+ arch/x86/pci/i386.c                                |    1 +
+ arch/x86/pci/legacy.c                              |    1 +
+ arch/x86/platform/efi/efi.c                        |    1 +
+ arch/x86/platform/efi/efi_32.c                     |    1 +
+ arch/x86/platform/mrst/vrtc.c                      |    1 +
+ arch/x86/platform/olpc/olpc-xo1-pm.c               |    1 +
+ arch/x86/platform/uv/bios_uv.c                     |    1 +
+ arch/x86/power/cpu.c                               |    1 +
+ arch/x86/video/fbdev.c                             |    1 +
+ block/blk-integrity.c                              |    1 +
+ block/ioctl.c                                      |    1 +
+ crypto/async_tx/async_memcpy.c                     |    1 +
+ crypto/async_tx/async_pq.c                         |    1 +
+ crypto/async_tx/async_raid6_recov.c                |    1 +
+ crypto/async_tx/async_tx.c                         |    1 +
+ crypto/async_tx/async_xor.c                        |    1 +
+ crypto/async_tx/raid6test.c                        |    1 +
+ crypto/crypto_wq.c                                 |    1 +
+ crypto/md4.c                                       |    1 +
+ crypto/proc.c                                      |    1 +
+ crypto/vmac.c                                      |    1 +
+ crypto/xcbc.c                                      |    1 +
+ drivers/acpi/acpica/hwsleep.c                      |    1 +
+ drivers/acpi/ec_sys.c                              |    1 +
+ drivers/acpi/sbshc.c                               |    1 +
+ drivers/acpi/sysfs.c                               |    2 +-
+ drivers/ata/libata-eh.c                            |    1 +
+ drivers/ata/libata-pmp.c                           |    1 +
+ drivers/ata/libata-scsi.c                          |    1 +
+ drivers/ata/libata-sff.c                           |    1 +
+ drivers/base/base.h                                |    1 +
+ drivers/base/dma-coherent.c                        |    1 +
+ drivers/base/dma-mapping.c                         |    1 +
+ drivers/base/hypervisor.c                          |    1 +
+ drivers/base/power/generic_ops.c                   |    1 +
+ drivers/base/power/main.c                          |    1 +
+ drivers/base/power/runtime.c                       |    1 +
+ drivers/base/power/sysfs.c                         |    1 +
+ drivers/base/power/trace.c                         |    1 +
+ drivers/base/power/wakeup.c                        |    1 +
+ drivers/base/transport_class.c                     |    1 +
+ drivers/bcma/core.c                                |    1 +
+ drivers/bcma/driver_chipcommon.c                   |    1 +
+ drivers/bcma/driver_pci.c                          |    1 +
+ drivers/bcma/host_pci.c                            |    1 +
+ drivers/bcma/main.c                                |    1 +
+ drivers/block/aoe/aoechr.c                         |    1 +
+ drivers/block/ps3disk.c                            |    1 +
+ drivers/block/ps3vram.c                            |    1 +
+ drivers/block/virtio_blk.c                         |    1 +
+ drivers/char/hw_random/virtio-rng.c                |    1 +
+ drivers/char/ramoops.c                             |    1 +
+ drivers/char/ttyprintk.c                           |    1 +
+ drivers/char/virtio_console.c                      |    1 +
+ drivers/clocksource/sh_cmt.c                       |    1 +
+ drivers/clocksource/sh_mtu2.c                      |    1 +
+ drivers/clocksource/sh_tmu.c                       |    1 +
+ drivers/cpufreq/cpufreq_stats.c                    |    1 +
+ drivers/cpufreq/s3c64xx-cpufreq.c                  |    1 +
+ drivers/crypto/mv_cesa.c                           |    1 +
+ drivers/dca/dca-core.c                             |    1 +
+ drivers/dca/dca-sysfs.c                            |    1 +
+ drivers/dma/intel_mid_dma.c                        |    1 +
+ drivers/dma/ipu/ipu_idmac.c                        |    1 +
+ drivers/dma/ste_dma40.c                            |    1 +
+ drivers/edac/mce_amd_inj.c                         |    1 +
+ drivers/firewire/core-iso.c                        |    1 +
+ drivers/firmware/google/gsmi.c                     |    1 +
+ drivers/firmware/sigma.c                           |    1 +
+ drivers/gpio/gpio-74x164.c                         |    1 +
+ drivers/gpio/gpio-ep93xx.c                         |    1 +
+ drivers/gpio/gpio-mc33880.c                        |    1 +
+ drivers/gpio/gpio-mcp23s08.c                       |    1 +
+ drivers/gpio/gpio-ml-ioh.c                         |    1 +
+ drivers/gpio/gpio-mpc5200.c                        |    1 +
+ drivers/gpio/gpio-mxc.c                            |    1 +
+ drivers/gpio/gpio-mxs.c                            |    1 +
+ drivers/gpio/gpio-pcf857x.c                        |    1 +
+ drivers/gpio/gpio-pch.c                            |    1 +
+ drivers/gpio/gpio-xilinx.c                         |    1 +
+ drivers/gpu/drm/ttm/ttm_tt.c                       |    1 +
+ drivers/hid/hid-axff.c                             |    1 +
+ drivers/hid/hid-debug.c                            |    1 +
+ drivers/hid/hid-dr.c                               |    1 +
+ drivers/hid/hid-emsff.c                            |    1 +
+ drivers/hid/hid-gaff.c                             |    1 +
+ drivers/hid/hid-holtekff.c                         |    1 +
+ drivers/hid/hid-picolcd.c                          |    1 +
+ drivers/hid/hid-pl.c                               |    1 +
+ drivers/hid/hid-roccat-common.c                    |    1 +
+ drivers/hid/hid-roccat.c                           |    1 +
+ drivers/hid/hid-sjoy.c                             |    1 +
+ drivers/hid/hid-tmff.c                             |    1 +
+ drivers/hid/hid-zpff.c                             |    1 +
+ drivers/hid/usbhid/hid-quirks.c                    |    1 +
+ drivers/hwmon/ultra45_env.c                        |    1 +
+ drivers/i2c/busses/i2c-pxa-pci.c                   |    1 +
+ drivers/i2c/busses/i2c-sh7760.c                    |    1 +
+ drivers/i2c/busses/i2c-tegra.c                     |    1 +
+ drivers/i2c/i2c-boardinfo.c                        |    1 +
+ drivers/ide/buddha.c                               |    1 +
+ drivers/ide/cmd640.c                               |    1 +
+ drivers/ide/ide-acpi.c                             |    1 +
+ drivers/ide/ide-atapi.c                            |    1 +
+ drivers/ide/ide-disk_proc.c                        |    1 +
+ drivers/ide/ide-dma-sff.c                          |    1 +
+ drivers/ide/ide-dma.c                              |    1 +
+ drivers/ide/ide-eh.c                               |    1 +
+ drivers/ide/ide-floppy_proc.c                      |    1 +
+ drivers/ide/ide-io-std.c                           |    1 +
+ drivers/ide/ide-ioctls.c                           |    1 +
+ drivers/ide/ide-legacy.c                           |    1 +
+ drivers/ide/ide-lib.c                              |    1 +
+ drivers/ide/ide-pnp.c                              |    1 +
+ drivers/ide/ide-taskfile.c                         |    1 +
+ drivers/ide/ide-xfer-mode.c                        |    1 +
+ drivers/ide/macide.c                               |    1 +
+ drivers/ide/pmac.c                                 |    1 +
+ drivers/ide/q40ide.c                               |    1 +
+ drivers/ide/setup-pci.c                            |    1 +
+ drivers/ide/tc86c001.c                             |    1 +
+ drivers/idle/intel_idle.c                          |    1 +
+ drivers/infiniband/core/cm.c                       |    1 +
+ drivers/infiniband/core/fmr_pool.c                 |    1 +
+ drivers/infiniband/core/mad.c                      |    1 +
+ drivers/infiniband/core/multicast.c                |    1 +
+ drivers/infiniband/core/packer.c                   |    1 +
+ drivers/infiniband/core/sysfs.c                    |    1 +
+ drivers/infiniband/core/ud_header.c                |    1 +
+ drivers/infiniband/core/umem.c                     |    1 +
+ drivers/infiniband/core/uverbs_marshall.c          |    1 +
+ drivers/infiniband/core/verbs.c                    |    1 +
+ drivers/infiniband/hw/ipath/ipath_diag.c           |    1 +
+ drivers/infiniband/hw/ipath/ipath_file_ops.c       |    1 +
+ drivers/infiniband/hw/ipath/ipath_sysfs.c          |    1 +
+ drivers/infiniband/hw/ipath/ipath_verbs.c          |    1 +
+ drivers/infiniband/hw/mthca/mthca_catas.c          |    1 +
+ drivers/infiniband/hw/mthca/mthca_cmd.c            |    1 +
+ drivers/infiniband/hw/mthca/mthca_provider.c       |    2 +
+ drivers/infiniband/hw/qib/qib_diag.c               |    1 +
+ drivers/infiniband/hw/qib/qib_file_ops.c           |    1 +
+ drivers/infiniband/hw/qib/qib_iba7220.c            |    1 +
+ drivers/infiniband/hw/qib/qib_iba7322.c            |    1 +
+ drivers/infiniband/hw/qib/qib_pcie.c               |    1 +
+ drivers/infiniband/hw/qib/qib_sd7220.c             |    1 +
+ drivers/infiniband/hw/qib/qib_verbs.c              |    1 +
+ drivers/input/input-compat.c                       |    1 +
+ drivers/input/input-mt.c                           |    1 +
+ drivers/input/input-polldev.c                      |    1 +
+ drivers/input/joystick/as5011.c                    |    1 +
+ drivers/input/keyboard/nomadik-ske-keypad.c        |    1 +
+ drivers/input/keyboard/tnetv107x-keypad.c          |    1 +
+ drivers/input/misc/ad714x.c                        |    1 +
+ drivers/input/misc/adxl34x.c                       |    1 +
+ drivers/input/misc/ati_remote2.c                   |    1 +
+ drivers/input/misc/cma3000_d0x.c                   |    1 +
+ drivers/input/misc/dm355evm_keys.c                 |    1 +
+ drivers/input/sparse-keymap.c                      |    1 +
+ drivers/input/touchscreen/ad7877.c                 |    1 +
+ drivers/input/touchscreen/ad7879-spi.c             |    1 +
+ drivers/input/touchscreen/ad7879.c                 |    1 +
+ drivers/input/touchscreen/ads7846.c                |    1 +
+ drivers/input/touchscreen/bu21013_ts.c             |    1 +
+ drivers/isdn/capi/kcapi_proc.c                     |    1 +
+ drivers/leds/dell-led.c                            |    1 +
+ drivers/leds/leds-88pm860x.c                       |    1 +
+ drivers/leds/leds-asic3.c                          |    1 +
+ drivers/leds/leds-atmel-pwm.c                      |    1 +
+ drivers/leds/leds-cobalt-raq.c                     |    1 +
+ drivers/leds/leds-fsg.c                            |    1 +
+ drivers/leds/leds-gpio.c                           |    1 +
+ drivers/leds/leds-lm3530.c                         |    1 +
+ drivers/leds/leds-locomo.c                         |    1 +
+ drivers/leds/leds-lt3593.c                         |    1 +
+ drivers/leds/leds-net48xx.c                        |    1 +
+ drivers/leds/leds-net5501.c                        |    1 +
+ drivers/leds/leds-ns2.c                            |    1 +
+ drivers/leds/leds-s3c24xx.c                        |    1 +
+ drivers/leds/leds-wm831x-status.c                  |    1 +
+ drivers/leds/leds-wm8350.c                         |    1 +
+ drivers/leds/leds-wrap.c                           |    1 +
+ drivers/lguest/lguest_device.c                     |    1 +
+ drivers/md/dm-exception-store.c                    |    1 +
+ drivers/md/dm-log-userspace-base.c                 |    1 +
+ drivers/md/dm-path-selector.c                      |    1 +
+ drivers/md/dm-raid.c                               |    1 +
+ drivers/md/dm-round-robin.c                        |    1 +
+ drivers/md/dm-service-time.c                       |    1 +
+ drivers/md/dm-snap-persistent.c                    |    1 +
+ drivers/md/dm-snap-transient.c                     |    1 +
+ drivers/md/dm-uevent.c                             |    1 +
+ drivers/md/faulty.c                                |    1 +
+ drivers/md/linear.c                                |    1 +
+ drivers/md/md.c                                    |    1 +
+ drivers/md/multipath.c                             |    1 +
+ drivers/md/raid0.c                                 |    1 +
+ drivers/md/raid1.c                                 |    1 +
+ drivers/md/raid10.c                                |    1 +
+ drivers/md/raid5.c                                 |    1 +
+ drivers/media/common/saa7146_core.c                |    1 +
+ drivers/media/common/saa7146_fops.c                |    1 +
+ drivers/media/common/saa7146_hlp.c                 |    1 +
+ drivers/media/common/saa7146_video.c               |    1 +
+ drivers/media/common/tuners/tuner-types.c          |    1 +
+ drivers/media/dvb/frontends/dibx000_common.c       |    1 +
+ drivers/media/dvb/siano/sms-cards.c                |    1 +
+ drivers/media/dvb/siano/smsendian.c                |    1 +
+ drivers/media/dvb/siano/smssdio.c                  |    1 +
+ drivers/media/dvb/siano/smsusb.c                   |    1 +
+ drivers/media/media-device.c                       |    1 +
+ drivers/media/radio/radio-timb.c                   |    1 +
+ drivers/media/radio/radio-wl1273.c                 |    1 +
+ drivers/media/radio/si4713-i2c.c                   |    1 +
+ drivers/media/radio/wl128x/fmdrv_v4l2.c            |    2 +
+ drivers/media/rc/ir-jvc-decoder.c                  |    1 +
+ drivers/media/rc/ir-lirc-codec.c                   |    1 +
+ drivers/media/rc/ir-nec-decoder.c                  |    1 +
+ drivers/media/rc/ir-raw.c                          |    2 +
+ drivers/media/rc/ir-rc5-decoder.c                  |    1 +
+ drivers/media/rc/ir-rc5-sz-decoder.c               |    1 +
+ drivers/media/rc/ir-rc6-decoder.c                  |    1 +
+ drivers/media/rc/ir-sony-decoder.c                 |    1 +
+ drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c    |    1 +
+ drivers/media/rc/keymaps/rc-alink-dtu-m.c          |    1 +
+ drivers/media/rc/keymaps/rc-anysee.c               |    1 +
+ drivers/media/rc/keymaps/rc-apac-viewcomp.c        |    1 +
+ drivers/media/rc/keymaps/rc-asus-pc39.c            |    1 +
+ drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c |    1 +
+ drivers/media/rc/keymaps/rc-avermedia-a16d.c       |    1 +
+ drivers/media/rc/keymaps/rc-avermedia-cardbus.c    |    1 +
+ drivers/media/rc/keymaps/rc-avermedia-dvbt.c       |    1 +
+ drivers/media/rc/keymaps/rc-avermedia-m135a.c      |    1 +
+ .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c    |    1 +
+ drivers/media/rc/keymaps/rc-avermedia-rm-ks.c      |    1 +
+ drivers/media/rc/keymaps/rc-avermedia.c            |    1 +
+ drivers/media/rc/keymaps/rc-avertv-303.c           |    1 +
+ drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c   |    1 +
+ drivers/media/rc/keymaps/rc-behold-columbus.c      |    1 +
+ drivers/media/rc/keymaps/rc-behold.c               |    1 +
+ drivers/media/rc/keymaps/rc-budget-ci-old.c        |    1 +
+ drivers/media/rc/keymaps/rc-cinergy-1400.c         |    1 +
+ drivers/media/rc/keymaps/rc-cinergy.c              |    1 +
+ drivers/media/rc/keymaps/rc-dib0700-nec.c          |    1 +
+ drivers/media/rc/keymaps/rc-dib0700-rc5.c          |    1 +
+ drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c  |    1 +
+ drivers/media/rc/keymaps/rc-digittrade.c           |    1 +
+ drivers/media/rc/keymaps/rc-dm1105-nec.c           |    1 +
+ drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c      |    1 +
+ drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c   |    1 +
+ drivers/media/rc/keymaps/rc-em-terratec.c          |    1 +
+ drivers/media/rc/keymaps/rc-encore-enltv-fm53.c    |    1 +
+ drivers/media/rc/keymaps/rc-encore-enltv.c         |    1 +
+ drivers/media/rc/keymaps/rc-encore-enltv2.c        |    1 +
+ drivers/media/rc/keymaps/rc-evga-indtube.c         |    1 +
+ drivers/media/rc/keymaps/rc-eztv.c                 |    1 +
+ drivers/media/rc/keymaps/rc-flydvb.c               |    1 +
+ drivers/media/rc/keymaps/rc-flyvideo.c             |    1 +
+ drivers/media/rc/keymaps/rc-fusionhdtv-mce.c       |    1 +
+ drivers/media/rc/keymaps/rc-gadmei-rm008z.c        |    1 +
+ drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c   |    1 +
+ drivers/media/rc/keymaps/rc-gotview7135.c          |    1 +
+ drivers/media/rc/keymaps/rc-hauppauge.c            |    1 +
+ drivers/media/rc/keymaps/rc-imon-mce.c             |    1 +
+ drivers/media/rc/keymaps/rc-imon-pad.c             |    1 +
+ drivers/media/rc/keymaps/rc-iodata-bctv7e.c        |    1 +
+ drivers/media/rc/keymaps/rc-kaiomy.c               |    1 +
+ drivers/media/rc/keymaps/rc-kworld-315u.c          |    1 +
+ .../media/rc/keymaps/rc-kworld-plus-tv-analog.c    |    1 +
+ drivers/media/rc/keymaps/rc-leadtek-y04g0051.c     |    1 +
+ drivers/media/rc/keymaps/rc-lirc.c                 |    1 +
+ drivers/media/rc/keymaps/rc-lme2510.c              |    1 +
+ drivers/media/rc/keymaps/rc-manli.c                |    1 +
+ drivers/media/rc/keymaps/rc-msi-digivox-ii.c       |    1 +
+ drivers/media/rc/keymaps/rc-msi-digivox-iii.c      |    1 +
+ drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c  |    1 +
+ drivers/media/rc/keymaps/rc-msi-tvanywhere.c       |    1 +
+ drivers/media/rc/keymaps/rc-nebula.c               |    1 +
+ .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c  |    1 +
+ drivers/media/rc/keymaps/rc-norwood.c              |    1 +
+ drivers/media/rc/keymaps/rc-npgtech.c              |    1 +
+ drivers/media/rc/keymaps/rc-pctv-sedna.c           |    1 +
+ drivers/media/rc/keymaps/rc-pinnacle-color.c       |    1 +
+ drivers/media/rc/keymaps/rc-pinnacle-grey.c        |    1 +
+ drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c     |    1 +
+ drivers/media/rc/keymaps/rc-pixelview-002t.c       |    1 +
+ drivers/media/rc/keymaps/rc-pixelview-mk12.c       |    1 +
+ drivers/media/rc/keymaps/rc-pixelview-new.c        |    1 +
+ drivers/media/rc/keymaps/rc-pixelview.c            |    1 +
+ .../media/rc/keymaps/rc-powercolor-real-angel.c    |    1 +
+ drivers/media/rc/keymaps/rc-proteus-2309.c         |    1 +
+ drivers/media/rc/keymaps/rc-purpletv.c             |    1 +
+ drivers/media/rc/keymaps/rc-pv951.c                |    1 +
+ drivers/media/rc/keymaps/rc-rc6-mce.c              |    1 +
+ .../media/rc/keymaps/rc-real-audio-220-32-keys.c   |    1 +
+ drivers/media/rc/keymaps/rc-streamzap.c            |    1 +
+ drivers/media/rc/keymaps/rc-tbs-nec.c              |    1 +
+ drivers/media/rc/keymaps/rc-technisat-usb2.c       |    1 +
+ drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c  |    1 +
+ drivers/media/rc/keymaps/rc-terratec-slim-2.c      |    1 +
+ drivers/media/rc/keymaps/rc-terratec-slim.c        |    1 +
+ drivers/media/rc/keymaps/rc-tevii-nec.c            |    1 +
+ drivers/media/rc/keymaps/rc-tivo.c                 |    1 +
+ drivers/media/rc/keymaps/rc-total-media-in-hand.c  |    1 +
+ drivers/media/rc/keymaps/rc-trekstor.c             |    1 +
+ drivers/media/rc/keymaps/rc-tt-1500.c              |    1 +
+ drivers/media/rc/keymaps/rc-twinhan1027.c          |    1 +
+ drivers/media/rc/keymaps/rc-videomate-m1f.c        |    1 +
+ drivers/media/rc/keymaps/rc-videomate-s350.c       |    1 +
+ drivers/media/rc/keymaps/rc-videomate-tv-pvr.c     |    1 +
+ drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c |    1 +
+ drivers/media/rc/keymaps/rc-winfast.c              |    1 +
+ drivers/media/rc/rc-main.c                         |    1 +
+ drivers/media/video/adp1653.c                      |    1 +
+ drivers/media/video/ak881x.c                       |    1 +
+ drivers/media/video/cpia2/cpia2_usb.c              |    1 +
+ drivers/media/video/cx25840/cx25840-ir.c           |    1 +
+ drivers/media/video/davinci/dm355_ccdc.c           |    1 +
+ drivers/media/video/davinci/dm644x_ccdc.c          |    1 +
+ drivers/media/video/hdpvr/hdpvr-i2c.c              |    1 +
+ drivers/media/video/hexium_gemini.c                |    1 +
+ drivers/media/video/hexium_orion.c                 |    1 +
+ drivers/media/video/imx074.c                       |    1 +
+ drivers/media/video/m5mols/m5mols_core.c           |    1 +
+ drivers/media/video/mt9m001.c                      |    1 +
+ drivers/media/video/mt9m111.c                      |    1 +
+ drivers/media/video/mt9t031.c                      |    1 +
+ drivers/media/video/mt9v011.c                      |    1 +
+ drivers/media/video/mt9v022.c                      |    1 +
+ drivers/media/video/mt9v032.c                      |    1 +
+ drivers/media/video/mxb.c                          |    1 +
+ drivers/media/video/noon010pc30.c                  |    1 +
+ drivers/media/video/omap24xxcam.c                  |    1 +
+ drivers/media/video/ov6650.c                       |    1 +
+ drivers/media/video/pvrusb2/pvrusb2-devattr.c      |    1 +
+ drivers/media/video/pvrusb2/pvrusb2-hdw.c          |    1 +
+ drivers/media/video/pvrusb2/pvrusb2-i2c-core.c     |    1 +
+ drivers/media/video/pvrusb2/pvrusb2-v4l2.c         |    1 +
+ drivers/media/video/rj54n1cb0c.c                   |    1 +
+ drivers/media/video/sh_mobile_csi2.c               |    1 +
+ drivers/media/video/sh_vou.c                       |    1 +
+ drivers/media/video/sr030pc30.c                    |    1 +
+ drivers/media/video/tcm825x.c                      |    1 +
+ drivers/media/video/timblogiw.c                    |    1 +
+ drivers/media/video/tvp514x.c                      |    1 +
+ drivers/media/video/tvp5150.c                      |    1 +
+ drivers/media/video/tvp7002.c                      |    1 +
+ drivers/media/video/usbvision/usbvision-cards.c    |    1 +
+ drivers/media/video/v4l2-ctrls.c                   |    1 +
+ drivers/media/video/v4l2-device.c                  |    1 +
+ drivers/media/video/v4l2-event.c                   |    1 +
+ drivers/media/video/v4l2-fh.c                      |    1 +
+ drivers/media/video/v4l2-int-device.c              |    1 +
+ drivers/media/video/v4l2-subdev.c                  |    1 +
+ drivers/memstick/core/memstick.c                   |    1 +
+ drivers/memstick/core/mspro_block.c                |    1 +
+ drivers/memstick/host/jmb38x_ms.c                  |    1 +
+ drivers/memstick/host/tifm_ms.c                    |    1 +
+ drivers/message/i2o/pci.c                          |    1 +
+ drivers/mfd/ab3100-core.c                          |    1 +
+ drivers/mfd/ab3550-core.c                          |    1 +
+ drivers/mfd/ab8500-debugfs.c                       |    1 +
+ drivers/mfd/ab8500-sysctrl.c                       |    1 +
+ drivers/mfd/abx500-core.c                          |    1 +
+ drivers/mfd/asic3.c                                |    1 +
+ drivers/mfd/dm355evm_msp.c                         |    1 +
+ drivers/mfd/max8997.c                              |    1 +
+ drivers/mfd/mfd-core.c                             |    1 +
+ drivers/mfd/pcf50633-irq.c                         |    1 +
+ drivers/mfd/tmio_core.c                            |    1 +
+ drivers/mfd/twl-core.c                             |    1 +
+ drivers/mfd/twl6030-irq.c                          |    1 +
+ drivers/mfd/wl1273-core.c                          |    1 +
+ drivers/mfd/wm8400-core.c                          |    1 +
+ drivers/misc/ab8500-pwm.c                          |    1 +
+ drivers/misc/atmel-ssc.c                           |    1 +
+ drivers/misc/atmel_tclib.c                         |    1 +
+ drivers/misc/bh1780gli.c                           |    1 +
+ drivers/misc/kgdbts.c                              |    1 +
+ drivers/misc/ti-st/st_kim.c                        |    1 +
+ drivers/misc/tifm_7xx1.c                           |    1 +
+ drivers/misc/tifm_core.c                           |    1 +
+ drivers/mmc/card/mmc_test.c                        |    1 +
+ drivers/mmc/core/bus.c                             |    2 +
+ drivers/mmc/core/debugfs.c                         |    1 +
+ drivers/mmc/core/host.c                            |    1 +
+ drivers/mmc/core/mmc.c                             |    1 +
+ drivers/mmc/core/mmc_ops.c                         |    1 +
+ drivers/mmc/core/quirks.c                          |    1 +
+ drivers/mmc/core/sd.c                              |    1 +
+ drivers/mmc/core/sd_ops.c                          |    1 +
+ drivers/mmc/core/sdio_bus.c                        |    1 +
+ drivers/mmc/core/sdio_io.c                         |    1 +
+ drivers/mmc/core/sdio_irq.c                        |    1 +
+ drivers/mmc/host/mmc_spi.c                         |    1 +
+ drivers/mmc/host/mxs-mmc.c                         |    1 +
+ drivers/mmc/host/sdhci-of-esdhc.c                  |    1 +
+ drivers/mmc/host/sdhci-of-hlwd.c                   |    1 +
+ drivers/mmc/host/sdhci-pci.c                       |    1 +
+ drivers/mmc/host/sdhci-pltfm.c                     |    1 +
+ drivers/mmc/host/sdhci-pxav2.c                     |    1 +
+ drivers/mmc/host/sdhci-pxav3.c                     |    1 +
+ drivers/mmc/host/sdhci-spear.c                     |    1 +
+ drivers/mmc/host/sdhci-tegra.c                     |    1 +
+ drivers/mmc/host/sdhci.c                           |    1 +
+ drivers/mmc/host/sdricoh_cs.c                      |    1 +
+ drivers/mmc/host/sh_mmcif.c                        |    1 +
+ drivers/mmc/host/sh_mobile_sdhi.c                  |    1 +
+ drivers/mmc/host/tifm_sd.c                         |    1 +
+ drivers/mmc/host/via-sdmmc.c                       |    1 +
+ drivers/mtd/ar7part.c                              |    1 +
+ drivers/mtd/cmdlinepart.c                          |    1 +
+ drivers/mtd/lpddr/lpddr_cmds.c                     |    1 +
+ drivers/mtd/mtdblock_ro.c                          |    1 +
+ drivers/mtd/mtdsuper.c                             |    1 +
+ drivers/mtd/nand/cafe_nand.c                       |    1 +
+ drivers/mtd/nand/cmx270_nand.c                     |    1 +
+ drivers/mtd/nand/diskonchip.c                      |    1 +
+ drivers/mtd/nand/nand_bbt.c                        |    1 +
+ drivers/mtd/nand/omap2.c                           |    1 +
+ drivers/mtd/nand/sm_common.c                       |    1 +
+ drivers/mtd/onenand/onenand_bbt.c                  |    1 +
+ drivers/mtd/redboot.c                              |    1 +
+ drivers/mtd/rfd_ftl.c                              |    1 +
+ drivers/mtd/ubi/vmt.c                              |    1 +
+ drivers/net/ethernet/mellanox/mlx4/alloc.c         |    1 +
+ drivers/net/ethernet/mellanox/mlx4/catas.c         |    1 +
+ drivers/net/ethernet/mellanox/mlx4/cmd.c           |    1 +
+ drivers/net/ethernet/mellanox/mlx4/cq.c            |    1 +
+ drivers/net/ethernet/mellanox/mlx4/eq.c            |    1 +
+ drivers/net/ethernet/mellanox/mlx4/fw.c            |    1 +
+ drivers/net/ethernet/mellanox/mlx4/intf.c          |    1 +
+ drivers/net/ethernet/mellanox/mlx4/mr.c            |    1 +
+ drivers/net/ethernet/mellanox/mlx4/pd.c            |    1 +
+ drivers/net/ethernet/mellanox/mlx4/port.c          |    1 +
+ drivers/net/ethernet/mellanox/mlx4/qp.c            |    1 +
+ drivers/net/ethernet/mellanox/mlx4/srq.c           |    1 +
+ drivers/net/phy/realtek.c                          |    1 +
+ drivers/net/wireless/b43/pcmcia.c                  |    1 +
+ drivers/of/of_pci.c                                |    1 +
+ drivers/of/of_pci_irq.c                            |    1 +
+ drivers/of/of_spi.c                                |    1 +
+ drivers/parisc/ccio-dma.c                          |    1 +
+ drivers/parisc/sba_iommu.c                         |    1 +
+ drivers/pci/hotplug-pci.c                          |    1 +
+ drivers/pci/hotplug/pciehp_acpi.c                  |    1 +
+ drivers/pci/hotplug/pcihp_slot.c                   |    1 +
+ drivers/pci/hotplug/rpadlpar_core.c                |    1 +
+ drivers/pci/htirq.c                                |    1 +
+ drivers/pci/iov.c                                  |    1 +
+ drivers/pci/irq.c                                  |    1 +
+ drivers/pci/msi.c                                  |    1 +
+ drivers/pci/pci-sysfs.c                            |    1 +
+ drivers/pci/quirks.c                               |    1 +
+ drivers/pci/rom.c                                  |    1 +
+ drivers/pci/setup-res.c                            |    1 +
+ drivers/pci/slot.c                                 |    1 +
+ drivers/pci/vpd.c                                  |    1 +
+ drivers/pcmcia/db1xxx_ss.c                         |    1 +
+ drivers/pcmcia/pxa2xx_cm_x255.c                    |    1 +
+ drivers/pcmcia/pxa2xx_cm_x270.c                    |    1 +
+ drivers/platform/x86/intel_scu_ipc.c               |    1 +
+ drivers/platform/x86/msi-wmi.c                     |    1 +
+ drivers/platform/x86/wmi.c                         |    1 +
+ drivers/power/max17042_battery.c                   |    1 +
+ drivers/power/max8903_charger.c                    |    1 +
+ drivers/power/power_supply_sysfs.c                 |    1 +
+ drivers/ps3/ps3stor_lib.c                          |    1 +
+ drivers/ps3/sys-manager-core.c                     |    1 +
+ drivers/rapidio/switches/idt_gen2.c                |    1 +
+ drivers/regulator/88pm8607.c                       |    1 +
+ drivers/regulator/ab8500.c                         |    1 +
+ drivers/regulator/bq24022.c                        |    1 +
+ drivers/regulator/da903x.c                         |    1 +
+ drivers/regulator/db8500-prcmu.c                   |    1 +
+ drivers/regulator/dummy.c                          |    1 +
+ drivers/regulator/fixed.c                          |    1 +
+ drivers/regulator/lp3971.c                         |    1 +
+ drivers/regulator/lp3972.c                         |    1 +
+ drivers/regulator/max8925-regulator.c              |    1 +
+ drivers/regulator/max8997.c                        |    1 +
+ drivers/regulator/mc13783-regulator.c              |    1 +
+ drivers/regulator/mc13892-regulator.c              |    1 +
+ drivers/regulator/mc13xxx-regulator-core.c         |    1 +
+ drivers/regulator/tps6586x-regulator.c             |    1 +
+ drivers/regulator/userspace-consumer.c             |    1 +
+ drivers/regulator/virtual.c                        |    1 +
+ drivers/regulator/wm8400-regulator.c               |    1 +
+ drivers/rtc/interface.c                            |    1 +
+ drivers/rtc/rtc-dm355evm.c                         |    1 +
+ drivers/rtc/rtc-ds1305.c                           |    1 +
+ drivers/rtc/rtc-ds1511.c                           |    1 +
+ drivers/rtc/rtc-ds1553.c                           |    1 +
+ drivers/rtc/rtc-ds1672.c                           |    1 +
+ drivers/rtc/rtc-ds1742.c                           |    1 +
+ drivers/rtc/rtc-em3027.c                           |    1 +
+ drivers/rtc/rtc-isl12022.c                         |    1 +
+ drivers/rtc/rtc-mv.c                               |    1 +
+ drivers/rtc/rtc-pcf2123.c                          |    1 +
+ drivers/rtc/rtc-pcf8563.c                          |    1 +
+ drivers/rtc/rtc-rs5c348.c                          |    1 +
+ drivers/rtc/rtc-rs5c372.c                          |    1 +
+ drivers/rtc/rtc-stk17ta8.c                         |    1 +
+ drivers/rtc/rtc-tx4939.c                           |    1 +
+ drivers/rtc/rtc-x1205.c                            |    1 +
+ drivers/s390/char/fs3270.c                         |    1 +
+ drivers/s390/char/sclp_cpi_sys.c                   |    1 +
+ drivers/s390/char/vmur.c                           |    1 +
+ drivers/s390/cio/chp.c                             |    2 +
+ drivers/s390/cio/qdio_debug.c                      |    2 +
+ drivers/s390/kvm/kvm_virtio.c                      |    1 +
+ drivers/s390/scsi/zfcp_ccw.c                       |    1 +
+ drivers/s390/scsi/zfcp_dbf.c                       |    1 +
+ drivers/s390/scsi/zfcp_scsi.c                      |    1 +
+ drivers/scsi/a2091.c                               |    1 +
+ drivers/scsi/a3000.c                               |    1 +
+ drivers/scsi/aacraid/aachba.c                      |    1 +
+ drivers/scsi/bfa/bfad_debugfs.c                    |    1 +
+ drivers/scsi/bfa/bfad_im.c                         |    2 +
+ drivers/scsi/device_handler/scsi_dh.c              |    1 +
+ drivers/scsi/device_handler/scsi_dh_alua.c         |    1 +
+ drivers/scsi/device_handler/scsi_dh_emc.c          |    1 +
+ drivers/scsi/device_handler/scsi_dh_hp_sw.c        |    1 +
+ drivers/scsi/device_handler/scsi_dh_rdac.c         |    1 +
+ drivers/scsi/gvp11.c                               |    1 +
+ drivers/scsi/libfc/fc_disc.c                       |    1 +
+ drivers/scsi/libfc/fc_elsct.c                      |    1 +
+ drivers/scsi/libfc/fc_exch.c                       |    1 +
+ drivers/scsi/libfc/fc_libfc.c                      |    1 +
+ drivers/scsi/libfc/fc_lport.c                      |    1 +
+ drivers/scsi/libfc/fc_npiv.c                       |    1 +
+ drivers/scsi/libfc/fc_rport.c                      |    1 +
+ drivers/scsi/libsas/sas_scsi_host.c                |    1 +
+ drivers/scsi/libsas/sas_task.c                     |    1 +
+ drivers/scsi/libsrp.c                              |    1 +
+ drivers/scsi/lpfc/lpfc_attr.c                      |    1 +
+ drivers/scsi/lpfc/lpfc_debugfs.c                   |    1 +
+ drivers/scsi/lpfc/lpfc_init.c                      |    1 +
+ drivers/scsi/lpfc/lpfc_scsi.c                      |    1 +
+ drivers/scsi/mac53c94.c                            |    1 +
+ drivers/scsi/megaraid/megaraid_mbox.c              |    1 +
+ drivers/scsi/osd/osd_initiator.c                   |    1 +
+ drivers/scsi/ps3rom.c                              |    1 +
+ drivers/scsi/scsi_lib.c                            |    1 +
+ drivers/scsi/scsi_lib_dma.c                        |    1 +
+ drivers/scsi/scsi_pm.c                             |    1 +
+ drivers/scsi/sr_ioctl.c                            |    1 +
+ drivers/sfi/sfi_core.h                             |    3 +
+ drivers/sh/intc/core.c                             |    1 +
+ drivers/sh/intc/virq.c                             |    1 +
+ drivers/sh/maple/maple.c                           |    1 +
+ drivers/spi/spi-altera.c                           |    1 +
+ drivers/spi/spi-au1550.c                           |    1 +
+ drivers/spi/spi-bitbang.c                          |    1 +
+ drivers/spi/spi-butterfly.c                        |    1 +
+ drivers/spi/spi-dw-mmio.c                          |    1 +
+ drivers/spi/spi-dw-pci.c                           |    1 +
+ drivers/spi/spi-dw.c                               |    1 +
+ drivers/spi/spi-gpio.c                             |    1 +
+ drivers/spi/spi-oc-tiny.c                          |    1 +
+ drivers/spi/spi-omap-uwire.c                       |    1 +
+ drivers/spi/spi-orion.c                            |    1 +
+ drivers/spi/spi-pxa2xx-pci.c                       |    1 +
+ drivers/spi/spi-s3c24xx.c                          |    1 +
+ drivers/spi/spi-sh-msiof.c                         |    1 +
+ drivers/spi/spi-sh-sci.c                           |    1 +
+ drivers/spi/spi-ti-ssp.c                           |    1 +
+ drivers/spi/spi-tle62x0.c                          |    1 +
+ drivers/spi/spi-txx9.c                             |    1 +
+ drivers/spi/spi.c                                  |    1 +
+ drivers/ssb/b43_pci_bridge.c                       |    1 +
+ drivers/ssb/driver_chipcommon.c                    |    1 +
+ drivers/ssb/driver_chipcommon_pmu.c                |    1 +
+ drivers/ssb/driver_gige.c                          |    1 +
+ drivers/ssb/driver_pcicore.c                       |    1 +
+ drivers/ssb/embedded.c                             |    1 +
+ drivers/ssb/main.c                                 |    1 +
+ drivers/ssb/pcihost_wrapper.c                      |    1 +
+ drivers/staging/altera-stapl/altera.c              |    1 +
+ drivers/staging/brcm80211/brcmutil/wifi.c          |    1 +
+ drivers/staging/dt3155v4l/dt3155v4l.c              |    1 +
+ drivers/staging/iio/accel/adis16201_core.c         |    1 +
+ drivers/staging/iio/accel/adis16203_core.c         |    1 +
+ drivers/staging/iio/accel/adis16204_core.c         |    1 +
+ drivers/staging/iio/accel/adis16209_core.c         |    1 +
+ drivers/staging/iio/accel/adis16220_core.c         |    1 +
+ drivers/staging/iio/accel/adis16240_core.c         |    1 +
+ drivers/staging/iio/accel/kxsd9.c                  |    1 +
+ drivers/staging/iio/accel/lis3l02dq_core.c         |    1 +
+ drivers/staging/iio/accel/sca3000_core.c           |    1 +
+ drivers/staging/iio/adc/ad7150.c                   |    1 +
+ drivers/staging/iio/adc/ad7152.c                   |    1 +
+ drivers/staging/iio/adc/ad7291.c                   |    1 +
+ drivers/staging/iio/adc/ad7298_core.c              |    1 +
+ drivers/staging/iio/adc/ad7314.c                   |    1 +
+ drivers/staging/iio/adc/ad7476_core.c              |    1 +
+ drivers/staging/iio/adc/ad7606_core.c              |    1 +
+ drivers/staging/iio/adc/ad7745.c                   |    1 +
+ drivers/staging/iio/adc/ad7780.c                   |    1 +
+ drivers/staging/iio/adc/ad7816.c                   |    1 +
+ drivers/staging/iio/adc/ad7887_core.c              |    1 +
+ drivers/staging/iio/adc/ad799x_core.c              |    1 +
+ drivers/staging/iio/adc/adt7310.c                  |    1 +
+ drivers/staging/iio/adc/adt7410.c                  |    1 +
+ drivers/staging/iio/adc/adt75.c                    |    1 +
+ drivers/staging/iio/adc/max1363_core.c             |    1 +
+ drivers/staging/iio/addac/adt7316-i2c.c            |    1 +
+ drivers/staging/iio/addac/adt7316.c                |    1 +
+ drivers/staging/iio/dac/ad5446.c                   |    1 +
+ drivers/staging/iio/dac/ad5504.c                   |    1 +
+ drivers/staging/iio/dac/ad5624r_spi.c              |    1 +
+ drivers/staging/iio/dac/ad5686.c                   |    1 +
+ drivers/staging/iio/dac/ad5791.c                   |    1 +
+ drivers/staging/iio/dds/ad5930.c                   |    1 +
+ drivers/staging/iio/dds/ad9832.c                   |    1 +
+ drivers/staging/iio/dds/ad9834.c                   |    1 +
+ drivers/staging/iio/dds/ad9850.c                   |    1 +
+ drivers/staging/iio/dds/ad9852.c                   |    1 +
+ drivers/staging/iio/dds/ad9910.c                   |    1 +
+ drivers/staging/iio/dds/ad9951.c                   |    1 +
+ drivers/staging/iio/gyro/adis16060_core.c          |    1 +
+ drivers/staging/iio/gyro/adis16080_core.c          |    1 +
+ drivers/staging/iio/gyro/adis16130_core.c          |    1 +
+ drivers/staging/iio/gyro/adis16260_core.c          |    1 +
+ drivers/staging/iio/gyro/adxrs450_core.c           |    1 +
+ drivers/staging/iio/imu/adis16400_core.c           |    1 +
+ drivers/staging/iio/industrialio-ring.c            |    1 +
+ drivers/staging/iio/light/tsl2583.c                |    1 +
+ drivers/staging/iio/meter/ade7753.c                |    1 +
+ drivers/staging/iio/meter/ade7754.c                |    1 +
+ drivers/staging/iio/meter/ade7758_core.c           |    1 +
+ drivers/staging/iio/meter/ade7759.c                |    1 +
+ drivers/staging/iio/meter/ade7854-i2c.c            |    1 +
+ drivers/staging/iio/meter/ade7854-spi.c            |    1 +
+ drivers/staging/iio/meter/ade7854.c                |    1 +
+ drivers/staging/iio/resolver/ad2s120x.c            |    1 +
+ drivers/staging/iio/resolver/ad2s1210.c            |    1 +
+ drivers/staging/iio/resolver/ad2s90.c              |    1 +
+ drivers/staging/iio/trigger.h                      |    1 +
+ .../staging/intel_sst/intel_sst_drv_interface.c    |    1 +
+ drivers/staging/line6/audio.c                      |    1 +
+ drivers/staging/olpc_dcon/olpc_dcon.c              |    1 +
+ drivers/staging/sm7xx/smtcfb.c                     |    2 +
+ drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c      |    1 +
+ drivers/staging/usbip/stub_dev.c                   |    1 +
+ drivers/staging/usbip/stub_main.c                  |    1 +
+ drivers/staging/usbip/usbip_event.c                |    1 +
+ drivers/tty/hvc/hvc_iseries.c                      |    1 +
+ drivers/tty/hvc/hvc_vio.c                          |    1 +
+ drivers/tty/serial/jsm/jsm_driver.c                |    2 +-
+ drivers/tty/serial/kgdboc.c                        |    1 +
+ drivers/tty/serial/max3100.c                       |    1 +
+ drivers/tty/serial/max3107-aava.c                  |    1 +
+ drivers/tty/serial/max3107.c                       |    1 +
+ drivers/tty/serial/nwpserial.c                     |    1 +
+ drivers/tty/serial/timbuart.c                      |    1 +
+ drivers/tty/serial/xilinx_uartps.c                 |    1 +
+ drivers/tty/vt/vc_screen.c                         |    1 +
+ drivers/uio/uio_pdrv.c                             |    1 +
+ drivers/uio/uio_pdrv_genirq.c                      |    1 +
+ drivers/usb/c67x00/c67x00-drv.c                    |    1 +
+ drivers/usb/core/driver.c                          |    1 +
+ drivers/usb/core/notify.c                          |    1 +
+ drivers/usb/gadget/cdc2.c                          |    1 +
+ drivers/usb/gadget/composite.c                     |    1 +
+ drivers/usb/gadget/dbgp.c                          |    1 +
+ drivers/usb/gadget/f_fs.c                          |    1 +
+ drivers/usb/gadget/f_obex.c                        |    1 +
+ drivers/usb/gadget/f_sourcesink.c                  |    1 +
+ drivers/usb/gadget/file_storage.c                  |    1 +
+ drivers/usb/gadget/fusb300_udc.c                   |    1 +
+ drivers/usb/gadget/gmidi.c                         |    1 +
+ drivers/usb/gadget/u_serial.c                      |    1 +
+ drivers/usb/host/fsl-mph-dr-of.c                   |    1 +
+ drivers/usb/host/isp1760-if.c                      |    1 +
+ drivers/usb/host/pci-quirks.c                      |    1 +
+ drivers/usb/host/whci/debug.c                      |    1 +
+ drivers/usb/host/whci/hcd.c                        |    1 +
+ drivers/usb/host/xhci-hub.c                        |    1 +
+ drivers/usb/host/xhci-pci.c                        |    1 +
+ drivers/usb/mon/mon_bin.c                          |    1 +
+ drivers/usb/mon/mon_stat.c                         |    1 +
+ drivers/usb/mon/mon_text.c                         |    1 +
+ drivers/usb/otg/gpio_vbus.c                        |    1 +
+ drivers/usb/otg/otg.c                              |    1 +
+ drivers/usb/otg/ulpi.c                             |    1 +
+ drivers/usb/serial/aircable.c                      |    1 +
+ drivers/usb/serial/qcserial.c                      |    1 +
+ drivers/usb/storage/option_ms.c                    |    1 +
+ drivers/usb/storage/protocol.c                     |    1 +
+ drivers/usb/storage/sierra_ms.c                    |    1 +
+ drivers/usb/storage/transport.c                    |    1 +
+ drivers/usb/storage/uas.c                          |    1 +
+ drivers/usb/wusbcore/devconnect.c                  |    1 +
+ drivers/usb/wusbcore/mmc.c                         |    1 +
+ drivers/usb/wusbcore/rh.c                          |    1 +
+ drivers/usb/wusbcore/security.c                    |    1 +
+ drivers/usb/wusbcore/wa-hc.c                       |    1 +
+ drivers/usb/wusbcore/wa-rpipe.c                    |    1 +
+ drivers/usb/wusbcore/wa-xfer.c                     |    1 +
+ drivers/uwb/est.c                                  |    1 +
+ drivers/uwb/i1480/dfu/dfu.c                        |    1 +
+ drivers/uwb/ie.c                                   |    1 +
+ drivers/uwb/lc-dev.c                               |    2 +
+ drivers/uwb/neh.c                                  |    1 +
+ drivers/uwb/pal.c                                  |    1 +
+ drivers/uwb/radio.c                                |    1 +
+ drivers/uwb/reset.c                                |    1 +
+ drivers/uwb/rsv.c                                  |    1 +
+ drivers/uwb/scan.c                                 |    1 +
+ drivers/uwb/umc-bus.c                              |    1 +
+ drivers/uwb/umc-dev.c                              |    1 +
+ drivers/uwb/umc-drv.c                              |    1 +
+ drivers/uwb/whci.c                                 |    1 +
+ drivers/video/atmel_lcdfb.c                        |    1 +
+ drivers/video/backlight/88pm860x_bl.c              |    1 +
+ drivers/video/backlight/adp5520_bl.c               |    1 +
+ drivers/video/backlight/ams369fg06.c               |    1 +
+ drivers/video/backlight/da903x_bl.c                |    1 +
+ drivers/video/backlight/l4f00242t03.c              |    1 +
+ drivers/video/backlight/ld9040.c                   |    1 +
+ drivers/video/backlight/lms283gf05.c               |    1 +
+ drivers/video/backlight/max8925_bl.c               |    1 +
+ drivers/video/backlight/s6e63m0.c                  |    1 +
+ drivers/video/backlight/wm831x_bl.c                |    1 +
+ drivers/video/carminefb.c                          |    1 +
+ drivers/video/cobalt_lcdfb.c                       |    1 +
+ drivers/video/fb_ddc.c                             |    3 +-
+ drivers/video/fb_notify.c                          |    1 +
+ drivers/video/mb862xx/mb862xx-i2c.c                |    1 +
+ drivers/video/mb862xx/mb862xxfbdrv.c               |    1 +
+ drivers/video/msm/mdp.c                            |    1 +
+ drivers/video/omap/lcd_mipid.c                     |    1 +
+ drivers/video/omap/omapfb_main.c                   |    1 +
+ drivers/video/omap2/dss/dispc.c                    |    1 +
+ drivers/video/omap2/dss/dpi.c                      |    1 +
+ drivers/video/omap2/dss/dsi.c                      |    1 +
+ drivers/video/omap2/dss/dss.c                      |    1 +
+ drivers/video/omap2/dss/rfbi.c                     |    1 +
+ drivers/video/omap2/dss/sdi.c                      |    1 +
+ drivers/video/omap2/omapfb/omapfb-ioctl.c          |    1 +
+ drivers/video/savage/savagefb_accel.c              |    1 +
+ drivers/video/sh_mipi_dsi.c                        |    1 +
+ drivers/video/sh_mobile_lcdcfb.c                   |    1 +
+ drivers/video/via/via-gpio.c                       |    1 +
+ drivers/video/w100fb.c                             |    1 +
+ drivers/virtio/virtio.c                            |    1 +
+ drivers/virtio/virtio_balloon.c                    |    1 +
+ drivers/virtio/virtio_ring.c                       |    1 +
+ drivers/w1/w1_family.c                             |    1 +
+ drivers/xen/balloon.c                              |    1 +
+ drivers/xen/manage.c                               |    1 +
+ drivers/xen/swiotlb-xen.c                          |    1 +
+ drivers/xen/xen-pciback/conf_space.c               |    1 +
+ drivers/xen/xen-selfballoon.c                      |    2 +
+ drivers/xen/xenbus/xenbus_client.c                 |    1 +
+ drivers/xen/xenbus/xenbus_probe.c                  |    1 +
+ drivers/xen/xenbus/xenbus_probe_backend.c          |    1 +
+ drivers/xen/xenbus/xenbus_probe_frontend.c         |    1 +
+ drivers/zorro/proc.c                               |    1 +
+ fs/bio-integrity.c                                 |    1 +
+ fs/exofs/super.c                                   |    1 +
+ fs/gfs2/ops_fstype.c                               |    1 +
+ fs/ioprio.c                                        |    1 +
+ fs/jfs/jfs_logmgr.c                                |    1 +
+ fs/logfs/super.c                                   |    1 +
+ fs/nfsd/nfssvc.c                                   |    1 +
+ fs/proc/vmcore.c                                   |    1 +
+ include/acpi/platform/aclinux.h                    |    2 +-
+ include/drm/drmP.h                                 |    3 +-
+ include/linux/bcma/bcma.h                          |    7 +-
+ include/linux/blkdev.h                             |    2 +-
+ include/linux/cpuidle.h                            |    3 +-
+ include/linux/crypto.h                             |    6 --
+ include/linux/device.h                             |   15 ++-
+ include/linux/device_cgroup.h                      |    1 -
+ include/linux/dmaengine.h                          |    2 +
+ include/linux/export.h                             |   89 ++++++++++++++++++++
+ include/linux/firmware.h                           |    2 +-
+ include/linux/ftrace.h                             |    2 +-
+ include/linux/gameport.h                           |   17 ++--
+ include/linux/hid.h                                |    9 +-
+ include/linux/i2c.h                                |   10 +-
+ include/linux/ipmi.h                               |    3 +-
+ include/linux/ipmi_smi.h                           |    1 -
+ include/linux/mdio-bitbang.h                       |    3 +-
+ include/linux/module.h                             |   68 +---------------
+ include/linux/mtd/mtd.h                            |    3 +-
+ include/linux/of_platform.h                        |    1 -
+ include/linux/pci_hotplug.h                        |   10 +--
+ include/linux/pm_runtime.h                         |    1 +
+ include/linux/regulator/driver.h                   |    1 +
+ include/linux/serio.h                              |   20 +++--
+ include/linux/ssb/ssb.h                            |    7 +-
+ include/linux/stop_machine.h                       |    1 +
+ include/linux/sunrpc/svc_xprt.h                    |    3 +-
+ include/linux/sysdev.h                             |    1 -
+ include/linux/textsearch.h                         |    3 +-
+ include/linux/uio_driver.h                         |   12 ++--
+ include/linux/usb.h                                |    9 +-
+ include/linux/uwb.h                                |    1 +
+ include/linux/uwb/umc.h                            |    7 +-
+ include/linux/vermagic.h                           |    1 -
+ include/linux/vlynq.h                              |    3 +-
+ include/media/saa7146.h                            |    3 +-
+ include/media/v4l2-int-device.h                    |    3 +-
+ include/net/inet_timewait_sock.h                   |    1 -
+ include/net/lib80211.h                             |    3 +-
+ include/net/sch_generic.h                          |    1 -
+ include/net/sock.h                                 |    2 +-
+ include/sound/core.h                               |    2 +-
+ include/trace/define_trace.h                       |    2 +-
+ include/trace/events/module.h                      |    2 +-
+ include/xen/xenbus.h                               |    1 +
+ kernel/async.c                                     |    2 +-
+ kernel/audit.c                                     |    2 +-
+ kernel/auditsc.c                                   |    2 +-
+ kernel/capability.c                                |    2 +-
+ kernel/cgroup_freezer.c                            |    2 +-
+ kernel/compat.c                                    |    1 +
+ kernel/cpu.c                                       |    2 +-
+ kernel/cpuset.c                                    |    2 +-
+ kernel/crash_dump.c                                |    2 +-
+ kernel/cred.c                                      |    2 +-
+ kernel/debug/kdb/kdb_debugger.c                    |    1 +
+ kernel/dma.c                                       |    2 +-
+ kernel/events/core.c                               |    1 +
+ kernel/exit.c                                      |    3 +-
+ kernel/fork.c                                      |    3 +-
+ kernel/freezer.c                                   |    2 +-
+ kernel/futex.c                                     |    2 +-
+ kernel/groups.c                                    |    2 +-
+ kernel/hrtimer.c                                   |    2 +-
+ kernel/hung_task.c                                 |    2 +-
+ kernel/irq_work.c                                  |    4 +-
+ kernel/kfifo.c                                     |    2 +-
+ kernel/kprobes.c                                   |    2 +-
+ kernel/ksysfs.c                                    |    3 +-
+ kernel/kthread.c                                   |    2 +-
+ kernel/latencytop.c                                |    2 +-
+ kernel/lockdep.c                                   |    2 +-
+ kernel/lockdep_proc.c                              |    2 +-
+ kernel/module.c                                    |    2 +-
+ kernel/mutex-debug.c                               |    2 +-
+ kernel/mutex.c                                     |    2 +-
+ kernel/notifier.c                                  |    2 +-
+ kernel/nsproxy.c                                   |    2 +-
+ kernel/padata.c                                    |    2 +-
+ kernel/params.c                                    |    4 +-
+ kernel/pid.c                                       |    2 +-
+ kernel/posix-timers.c                              |    2 +-
+ kernel/power/hibernate.c                           |    1 +
+ kernel/power/main.c                                |    1 +
+ kernel/power/suspend.c                             |    2 +
+ kernel/printk.c                                    |    2 +-
+ kernel/profile.c                                   |    2 +-
+ kernel/ptrace.c                                    |    2 +-
+ kernel/range.c                                     |    2 +-
+ kernel/rcupdate.c                                  |    2 +-
+ kernel/rcutiny.c                                   |    4 +-
+ kernel/rcutorture.c                                |    3 +-
+ kernel/rcutree.c                                   |    2 +-
+ kernel/rcutree_trace.c                             |    3 +-
+ kernel/relay.c                                     |    2 +-
+ kernel/resource.c                                  |    2 +-
+ kernel/rtmutex-debug.c                             |    2 +-
+ kernel/rtmutex-tester.c                            |    2 +-
+ kernel/rtmutex.c                                   |    2 +-
+ kernel/rwsem.c                                     |    2 +-
+ kernel/sched.c                                     |    2 +-
+ kernel/sched_clock.c                               |    2 +-
+ kernel/semaphore.c                                 |    2 +-
+ kernel/signal.c                                    |    2 +-
+ kernel/smp.c                                       |    2 +-
+ kernel/softirq.c                                   |    2 +-
+ kernel/spinlock.c                                  |    2 +-
+ kernel/srcu.c                                      |    2 +-
+ kernel/stacktrace.c                                |    2 +-
+ kernel/stop_machine.c                              |    2 +-
+ kernel/sys.c                                       |    3 +-
+ kernel/sysctl.c                                    |    2 +-
+ kernel/time.c                                      |    2 +-
+ kernel/time/posix-clock.c                          |    1 +
+ kernel/timer.c                                     |    2 +-
+ kernel/trace/blktrace.c                            |    1 +
+ kernel/trace/ftrace.c                              |    1 +
+ kernel/trace/trace_syscalls.c                      |    1 +
+ kernel/up.c                                        |    2 +-
+ kernel/user-return-notifier.c                      |    2 +-
+ kernel/user.c                                      |    2 +-
+ kernel/user_namespace.c                            |    2 +-
+ kernel/utsname.c                                   |    2 +-
+ kernel/utsname_sysctl.c                            |    2 +-
+ kernel/wait.c                                      |    2 +-
+ kernel/watchdog.c                                  |    3 +-
+ kernel/workqueue.c                                 |    2 +-
+ lib/dma-debug.c                                    |    1 +
+ lib/raid6/algos.c                                  |    1 +
+ lib/raid6/mktables.c                               |    1 +
+ lib/raid6/recov.c                                  |    1 +
+ mm/fremap.c                                        |    1 -
+ mm/memcontrol.c                                    |    1 +
+ mm/memory-failure.c                                |    1 +
+ mm/mmzone.c                                        |    1 -
+ mm/quicklist.c                                     |    1 -
+ mm/sparse-vmemmap.c                                |    1 -
+ mm/swap_state.c                                    |    1 -
+ mm/swapfile.c                                      |    1 -
+ net/caif/cfpkt_skbuff.c                            |    1 +
+ net/netfilter/ipset/pfxlen.c                       |    1 +
+ net/rfkill/input.c                                 |    1 +
+ security/selinux/netlink.c                         |    1 +
+ sound/core/control.c                               |    1 +
+ sound/core/device.c                                |    1 +
+ sound/core/hwdep.c                                 |    1 +
+ sound/core/info.c                                  |    1 +
+ sound/core/info_oss.c                              |    1 +
+ sound/core/init.c                                  |    1 +
+ sound/core/isadma.c                                |    1 +
+ sound/core/jack.c                                  |    1 +
+ sound/core/memory.c                                |    1 +
+ sound/core/misc.c                                  |    1 +
+ sound/core/oss/mixer_oss.c                         |    1 +
+ sound/core/rawmidi.c                               |    1 +
+ sound/core/seq/oss/seq_oss.c                       |    2 +-
+ sound/core/seq/oss/seq_oss_init.c                  |    2 +-
+ sound/core/seq/oss/seq_oss_synth.c                 |    1 +
+ sound/core/seq/seq.c                               |    2 +-
+ sound/core/seq/seq_clientmgr.c                     |    1 +
+ sound/core/seq/seq_device.c                        |    1 +
+ sound/core/seq/seq_dummy.c                         |    2 +-
+ sound/core/seq/seq_info.c                          |    1 +
+ sound/core/seq/seq_lock.c                          |    1 +
+ sound/core/seq/seq_memory.c                        |    1 +
+ sound/core/seq/seq_midi.c                          |    2 +-
+ sound/core/seq/seq_midi_emul.c                     |    1 +
+ sound/core/seq/seq_midi_event.c                    |    1 +
+ sound/core/seq/seq_ports.c                         |    1 +
+ sound/core/seq/seq_system.c                        |    1 +
+ sound/core/seq/seq_virmidi.c                       |    1 +
+ sound/core/sound.c                                 |    2 +-
+ sound/core/sound_oss.c                             |    1 +
+ sound/core/timer.c                                 |    2 +-
+ sound/core/vmaster.c                               |    1 +
+ sound/drivers/mpu401/mpu401.c                      |    2 +-
+ sound/drivers/mpu401/mpu401_uart.c                 |    1 +
+ sound/drivers/mtpav.c                              |    1 +
+ sound/drivers/mts64.c                              |    1 +
+ sound/drivers/opl3/opl3_lib.c                      |    1 +
+ sound/drivers/opl3/opl3_oss.c                      |    1 +
+ sound/drivers/opl3/opl3_seq.c                      |    1 +
+ sound/drivers/opl3/opl3_synth.c                    |    1 +
+ sound/drivers/opl4/opl4_lib.c                      |    1 +
+ sound/drivers/opl4/opl4_proc.c                     |    1 +
+ sound/drivers/opl4/opl4_seq.c                      |    1 +
+ sound/drivers/portman2x4.c                         |    1 +
+ sound/drivers/serial-u16550.c                      |    2 +-
+ sound/drivers/virmidi.c                            |    2 +-
+ sound/firewire/iso-resources.c                     |    1 +
+ sound/firewire/packets-buffer.c                    |    1 +
+ sound/i2c/i2c.c                                    |    1 +
+ sound/i2c/other/ak4xxx-adda.c                      |    1 +
+ sound/i2c/other/pt2258.c                           |    1 +
+ sound/i2c/other/tea575x-tuner.c                    |    1 +
+ sound/i2c/tea6330t.c                               |    1 +
+ sound/isa/sb/emu8000.c                             |    1 +
+ sound/isa/sb/emu8000_callback.c                    |    1 +
+ sound/isa/sb/emu8000_patch.c                       |    1 +
+ sound/isa/sb/emu8000_synth.c                       |    1 +
+ sound/isa/wavefront/wavefront_fx.c                 |    1 +
+ sound/isa/wavefront/wavefront_synth.c              |    1 +
+ sound/pci/als4000.c                                |    2 +-
+ sound/pci/asihpi/hpioctl.c                         |    1 +
+ sound/pci/ctxfi/xfi.c                              |    1 +
+ sound/pci/oxygen/oxygen_io.c                       |    1 +
+ sound/soc/blackfin/bf5xx-sport.c                   |    1 +
+ sound/soc/tegra/tegra_asoc_utils.c                 |    1 +
+ sound/synth/emux/emux.c                            |    1 +
+ sound/synth/emux/emux_oss.c                        |    1 +
+ sound/synth/emux/emux_seq.c                        |    2 +-
+ sound/synth/emux/emux_synth.c                      |    1 +
+ sound/synth/emux/soundfont.c                       |    1 +
+ sound/synth/util_mem.c                             |    1 +
+ sound/usb/6fire/firmware.c                         |    1 +
+ sound/usb/midi.c                                   |    1 +
+ virt/kvm/iommu.c                                   |    2 +
+ 1386 files changed, 1518 insertions(+), 426 deletions(-)
+ create mode 100644 include/linux/export.h
+$ git am -3 ../patches/0001-dm-use-export.h-instead-of-module.h-where-possible.patch
+Applying: dm: use export.h instead of module.h where possible
+$ git reset HEAD^
+Unstaged changes after reset:
+M      drivers/md/persistent-data/dm-btree-remove.c
+M      drivers/md/persistent-data/dm-btree.c
+M      drivers/md/persistent-data/dm-space-map-disk.c
+M      drivers/md/persistent-data/dm-transaction-manager.c
+$ git add .
+$ git commit -v -a --amend
+[master d20243c] Merge remote-tracking branch 'moduleh/module.h-split'
+$ git am -3 ../patches/0001-block-bsg-lib.c-needs-export.h-not-module.h.patch
+Applying: block: bsg-lib.c needs export.h not module.h
+$ git reset HEAD^
+Unstaged changes after reset:
+M      block/bsg-lib.c
+$ git add .
+$ git commit -v -a --amend
+[master 0986bf9] Merge remote-tracking branch 'moduleh/module.h-split'
+$ git am -3 ../patches/power__max8998_charger.c_needs_module.h.patch
+Applying: power: max8998_charger.c needs module.h
+$ git reset HEAD^
+Unstaged changes after reset:
+M      drivers/power/max8998_charger.c
+$ git add .
+$ git commit -v -a --amend
+[master daa087f] Merge remote-tracking branch 'moduleh/module.h-split'
+$ git am -3 ../patches/0001-power_supply-max8997_charger.c-need-to-include-modul.patch
+Applying: power_supply: max8997_charger.c need to include module.h
+$ git reset HEAD^
+Unstaged changes after reset:
+M      drivers/power/max8997_charger.c
+$ git add .
+$ git commit -v -a --amend
+[master 3d59edd] Merge remote-tracking branch 'moduleh/module.h-split'
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm
+From ../next
+ * [new branch]      quilt/akpm -> akpm
+$ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base
+From ../next
+ * [new branch]      quilt/akpm-base -> akpm-base
+$ git checkout akpm
+Switched to branch 'akpm'
+$ git rebase --onto master akpm-base
+First, rewinding head to replay your work on top of it...
+Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
+Applying: This patch makes two changes:
+Applying: On thread exit shm_exit_ns() is called, it uses shm_ids(ns).rw_mutex.  It
+Applying: Because of x86-implement-strict-user-copy-checks-for-x86_64.patch
+Applying: When no floppy is found the module code can be released while a timer
+Applying: The parameter's origin type is long.  On an i386 architecture, it can
+Applying: Add support for Aspire 1410 BIOS v1.3314.  Fixes the following error:
+Applying: This makes the iris driver use the platform API, so it is properly exposed
+Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
+Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
+Applying: Cc: Ed Wildgoose <git@wildgooses.com>
+Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
+Applying: The x86 timer interrupt handler is the only handler not traced in the
+Applying: The current interrupt traces from irq_handler_entry and irq_handler_exit
+Applying: Don't allow everybody to use a modem.
+Applying: The address limit is already set in flush_old_exec() so this
+Applying: A call to va_copy() should always be followed by a call to va_end() in the
+Applying: Don't dereference em if it's NULL or an error pointer.
+Applying: Some messing with error codes to return 0 on out id's and match
+Applying: fb_set_suspend() must be called with the console semaphore held, which
+Applying: hwmon was using an idr with a NULL pointer, so convert to an
+Applying: A straightforward looking use of idr for a device id.
+Applying: The address limit is already set in flush_old_exec() so this
+Applying: The address limit is already set in flush_old_exec() so this
+Applying: Add new check (assert_init) to make sure objects are initialized and
+Applying: del_timer_sync() calls debug_object_assert_init() to assert that a timer
+Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
+Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
+Applying: The address limit is already set in flush_old_exec() so those calls to
+Applying: When do pci remove/rescan on system that have more iommus, got
+Applying: The current implementation of dmi_name_in_vendors() is an invitation to
+Applying: For headers that get exported to userland and make use of u32 style
+Applying: Fix sparse warnings of right shift bigger than source value size:
+Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
+Applying: Some mangling of errors was necessary to maintain current interface.
+Applying: This does involve additional use of the spin lock in idr.c.  Is this an
+Applying: Instead of open coding this function use kstrtoul_from_user() directly.
+Applying: brd_make_request() always returns 0, which doesn't make much sense.
+Applying: The address limit is already set in flush_old_exec() so this assignment of
+Applying: The basic idea behind cross memory attach is to allow MPI programs doing
+Applying: - Add x86_64 specific wire up
+Applying: acct_isolated of compaction uses page_lru_base_type which returns only
+Applying: Change ISOLATE_XXX macro with bitwise isolate_mode_t type.  Normally,
+Applying: In async mode, compaction doesn't migrate dirty or writeback pages.  So,
+Applying: In __zone_reclaim case, we don't want to shrink mapped page.  Nonetheless,
+Applying: unmap_and_move() is one a big messy function.  Clean it up.
+Applying: radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was
+Applying: per-task block plug can reduce block queue lock contention and increase
+Applying: The tracing ring-buffer used this function briefly, but not anymore.
+Applying: After selecting a task to kill, the oom killer iterates all processes and
+Applying: Remove PageSwapBacked (!page_is_file_cache) cases from
+Applying: Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Applying: The current implementation of the /dev/hpet driver couples opening the
+Applying: smp_call_function() only lets all other CPUs execute a specific function,
+Applying: auto_demotion_disable is called only for online CPUs.  For hotplugged
+Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:
+Applying: Strict user copy checks are only really supported on x86_32 even though
+Applying: The help text for this config is duplicated across the x86, parisc, and
+Applying: s/lib-/obj-/ for usercopy.o
+Applying: After an "unexpected" reboot, I found this Oops in my logs:
+Applying: In the move of the lis3 driver, the hp_accel.c file got dropped from the
+Applying: Add axis correction for HP EliteBook 2730p.
+Applying: Add axis correction for HP EliteBook 8540w.
+Applying: Add axis correction for HP ProBook 6555b.
+Applying: Adapt the help text for CONFIG_HP_ACCEL to the move of
+Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
+Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
+Applying: Change exported functions to use the device given as parameter
+Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
+Applying: Add V2 of the LED driver for a single timer channel for the TPU hardware
+Applying: Add support for slice by 8 to existing crc32 algorithm.  Also modify
+Applying: don't include asm/msr.h
+Applying: This is the one use of an ida that doesn't retry on receiving -EAGAIN.
+Applying: One can get this information from minix/inode.c, but adding the
+Applying: Signed-off-by: Igor Mammedov <imammedo@redhat.com>
+Applying: Force this on for -next/mm testing purposes.
+Applying: Add a proc_dointvec_bool() sysctl handler for cases where the input value
+Applying: Use the new proc_do_intvec_bool() handler for various boolean inputs.
+Applying: Add a proc_dointvec_unsigned() sysctl handler for positive value cases.
+Applying: Cc: Alexey Dobriyan <adobriyan@gmail.com>
+Applying: Use the new proc_do_intvec_unsigned() handler for various unsigned inputs.
+Applying: A default echo function has been provided so it is no longer an error when
+Applying: This client driver allows you to use a GPIO pin as a source for PPS
+Applying: remove unneeded cast of void*
+Applying: Straightforward.  As an aside, the ida_init calls are not needed as far as
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm
+From ../rebase-tmp
+ + 1d17b24...1589540 akpm       -> akpm  (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm
+$ git merge --no-ff akpm
+Removing arch/sparc/lib/usercopy.c
+Removing drivers/leds/leds-alix2.c
+Merge made by recursive.
+ Documentation/DocBook/debugobjects.tmpl            |   50 ++
+ .../trace/postprocess/trace-vmscan-postprocess.pl  |    8 +-
+ MAINTAINERS                                        |    1 +
+ arch/arm/include/asm/processor.h                   |    1 -
+ arch/arm/mach-ux500/mbox-db5500.c                  |    2 +-
+ arch/ia64/include/asm/processor.h                  |    1 -
+ arch/parisc/Kconfig                                |    1 +
+ arch/parisc/Kconfig.debug                          |   14 -
+ arch/parisc/include/asm/processor.h                |    2 -
+ arch/parisc/kernel/process.c                       |    1 -
+ arch/powerpc/include/asm/systbl.h                  |    2 +
+ arch/powerpc/include/asm/unistd.h                  |    4 +-
+ arch/s390/Kconfig                                  |    1 +
+ arch/s390/Kconfig.debug                            |   14 -
+ arch/s390/lib/Makefile                             |    1 -
+ arch/sparc/kernel/process_32.c                     |    3 +-
+ arch/sparc/kernel/process_64.c                     |    3 -
+ arch/sparc/lib/Makefile                            |    1 -
+ arch/sparc/lib/usercopy.c                          |    8 -
+ arch/tile/Kconfig                                  |    8 +-
+ arch/tile/include/asm/uaccess.h                    |    7 +-
+ arch/tile/lib/uaccess.c                            |    8 -
+ arch/unicore32/include/asm/processor.h             |    1 -
+ arch/x86/Kconfig                                   |   15 +
+ arch/x86/Kconfig.debug                             |   14 -
+ arch/x86/ia32/ia32entry.S                          |    2 +
+ arch/x86/include/asm/irq_vectors.h                 |   50 ++
+ arch/x86/include/asm/uaccess_64.h                  |   12 +-
+ arch/x86/include/asm/unistd_32.h                   |    4 +-
+ arch/x86/include/asm/unistd_64.h                   |    4 +
+ arch/x86/kernel/apic/apic.c                        |    7 +
+ arch/x86/kernel/cpu/mcheck/therm_throt.c           |    3 +
+ arch/x86/kernel/cpu/mcheck/threshold.c             |    3 +
+ arch/x86/kernel/e820.c                             |   59 +--
+ arch/x86/kernel/irq.c                              |    6 +-
+ arch/x86/kernel/irq_work.c                         |    3 +
+ arch/x86/kernel/smp.c                              |    7 +
+ arch/x86/kernel/syscall_table_32.S                 |    2 +
+ arch/x86/kernel/time.c                             |   15 +-
+ arch/x86/kernel/traps.c                            |    3 +
+ arch/x86/lib/usercopy_32.c                         |    6 -
+ arch/x86/mm/mmap.c                                 |    4 +-
+ arch/x86/mm/tlb.c                                  |    3 +
+ arch/x86/platform/Makefile                         |    1 +
+ arch/x86/platform/geode/Makefile                   |    1 +
+ arch/x86/platform/geode/alix.c                     |  142 ++++++
+ arch/x86/platform/iris/iris.c                      |   67 +++-
+ drivers/block/brd.c                                |    2 +-
+ drivers/block/floppy.c                             |    8 +-
+ drivers/char/hpet.c                                |   56 ++-
+ drivers/firmware/dmi_scan.c                        |    6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c      |   34 +-
+ drivers/hwmon/hwmon.c                              |   32 +-
+ drivers/hwmon/ibmaem.c                             |   47 +--
+ drivers/idle/intel_idle.c                          |   59 ++-
+ drivers/iommu/dmar.c                               |    7 +-
+ drivers/iommu/intel-iommu.c                        |  177 +++++++-
+ drivers/leds/Kconfig                               |   20 +-
+ drivers/leds/Makefile                              |    2 +-
+ drivers/leds/leds-alix2.c                          |  239 ----------
+ drivers/leds/leds-renesas-tpu.c                    |  343 ++++++++++++++
+ drivers/misc/lis3lv02d/lis3lv02d.c                 |  389 +++++++++-------
+ drivers/misc/lis3lv02d/lis3lv02d.h                 |    9 +-
+ drivers/misc/lis3lv02d/lis3lv02d_i2c.c             |   11 +-
+ drivers/misc/lis3lv02d/lis3lv02d_spi.c             |    2 +-
+ drivers/platform/x86/Kconfig                       |    2 +-
+ drivers/platform/x86/acerhdf.c                     |    1 +
+ drivers/platform/x86/hp_accel.c                    |   10 +-
+ drivers/pps/clients/Kconfig                        |    9 +
+ drivers/pps/clients/Makefile                       |    1 +
+ drivers/pps/clients/pps-gpio.c                     |  227 +++++++++
+ drivers/pps/clients/pps-ktimer.c                   |   12 -
+ drivers/pps/clients/pps_parport.c                  |    9 -
+ drivers/pps/kapi.c                                 |   20 +-
+ drivers/rtc/class.c                                |   32 +-
+ drivers/scsi/aacraid/commctrl.c                    |    1 +
+ drivers/scsi/megaraid.c                            |    8 +-
+ drivers/scsi/osd/osd_uld.c                         |   22 +-
+ drivers/scsi/sd.c                                  |   32 +-
+ drivers/scsi/sg.c                                  |   25 +-
+ drivers/video/fbmem.c                              |   24 +-
+ drivers/w1/slaves/w1_ds2760.c                      |   48 +--
+ drivers/w1/slaves/w1_ds2780.c                      |   48 +--
+ fs/aio.c                                           |    4 +-
+ fs/btrfs/inode.c                                   |    3 +-
+ fs/compat.c                                        |    7 +-
+ fs/ext4/ext4.h                                     |    7 +-
+ fs/ext4/ialloc.c                                   |    4 +-
+ fs/ocfs2/ocfs2.h                                   |   47 ++
+ fs/ocfs2/quota_local.c                             |   10 +-
+ fs/read_write.c                                    |    8 +-
+ include/linux/compat.h                             |    3 +-
+ include/linux/debugobjects.h                       |    6 +
+ include/linux/dmar.h                               |    5 +
+ include/linux/fs.h                                 |    7 +-
+ include/linux/hpet.h                               |    1 +
+ include/linux/jiffies.h                            |    2 +-
+ include/linux/leds-renesas-tpu.h                   |   14 +
+ include/linux/magic.h                              |   10 +-
+ include/linux/memcontrol.h                         |    3 +-
+ include/linux/mmzone.h                             |   12 +
+ include/linux/pps-gpio.h                           |   32 ++
+ include/linux/swap.h                               |    7 +-
+ include/linux/syscalls.h                           |   13 +
+ include/linux/sysctl.h                             |    4 +
+ include/linux/writeback.h                          |    2 -
+ include/scsi/scsi_netlink.h                        |    2 +-
+ include/trace/events/irq_vectors.h                 |   56 +++
+ include/trace/events/vmscan.h                      |    8 +-
+ init/do_mounts.c                                   |   46 ++-
+ ipc/msgutil.c                                      |    6 +
+ ipc/shm.c                                          |   13 +-
+ ipc/util.c                                         |   30 +-
+ ipc/util.h                                         |    1 +
+ kernel/audit.c                                     |    5 +-
+ kernel/kprobes.c                                   |    2 +-
+ kernel/sys_ni.c                                    |    4 +
+ kernel/sysctl.c                                    |  103 +++--
+ kernel/time.c                                      |    2 +-
+ kernel/timer.c                                     |   54 ++-
+ lib/Kconfig.debug                                  |   18 +
+ lib/Makefile                                       |    1 +
+ lib/crc32.c                                        |  370 +++++++++++-----
+ lib/crc32defs.h                                    |   16 +-
+ lib/debugobjects.c                                 |   33 ++
+ lib/gen_crc32table.c                               |   59 ++-
+ lib/radix-tree.c                                   |   10 +-
+ {arch/s390/lib => lib}/usercopy.c                  |    0
+ mm/Makefile                                        |    3 +-
+ mm/compaction.c                                    |   24 +-
+ mm/memcontrol.c                                    |    5 +-
+ mm/mempolicy.c                                     |    4 +-
+ mm/migrate.c                                       |   75 ++--
+ mm/mincore.c                                       |    6 +
+ mm/oom_kill.c                                      |    5 +-
+ mm/page-writeback.c                                |  122 +++---
+ mm/process_vm_access.c                             |  487 ++++++++++++++++++++
+ mm/vmscan.c                                        |   63 ++-
+ security/keys/compat.c                             |    2 +-
+ security/keys/keyctl.c                             |    2 +-
+ security/selinux/selinuxfs.c                       |   14 +-
+ 141 files changed, 3100 insertions(+), 1311 deletions(-)
+ delete mode 100644 arch/sparc/lib/usercopy.c
+ create mode 100644 arch/x86/platform/geode/Makefile
+ create mode 100644 arch/x86/platform/geode/alix.c
+ delete mode 100644 drivers/leds/leds-alix2.c
+ create mode 100644 drivers/leds/leds-renesas-tpu.c
+ create mode 100644 drivers/pps/clients/pps-gpio.c
+ create mode 100644 include/linux/leds-renesas-tpu.h
+ create mode 100644 include/linux/pps-gpio.h
+ create mode 100644 include/trace/events/irq_vectors.h
+ rename {arch/s390/lib => lib}/usercopy.c (100%)
+ create mode 100644 mm/process_vm_access.c
+$ git am -3 ../patches/0001-do_mounts-remove-__init_data-from-root_wait.patch
+Applying: do_mounts: remove __init_data from root_wait
+$ git reset HEAD^
+Unstaged changes after reset:
+M      init/do_mounts.c
+$ git add .
+$ git commit -v -a --amend
+[master 5d5aa79] Merge branch 'akpm'
+$ git revert f0b182b003e2
+[master d56e62a] Revert "ASoC: Implement WM8994 thermal warning and shutdown interrupt support"
+ 1 files changed, 0 insertions(+), 26 deletions(-)
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644 (file)
index 0000000..ee413f3
--- /dev/null
@@ -0,0 +1,36 @@
+Importing i2c based on 3.1-rc2
+       quilt series is empty
+$ git update-ref refs/heads/quilt/i2c 93ee7a9340d64f20295aacc3fb6a22b759323280
+Importing jdelvare-hwmon based on 3.1-rc2
+       quilt series is empty
+$ git update-ref refs/heads/quilt/jdelvare-hwmon 93ee7a9340d64f20295aacc3fb6a22b759323280
+Importing kernel-doc based on 3.0
+Unchanged quilt series kernel-doc
+Importing rr based on v3.1-rc1-304-g91d85ea
+$ git clone -s -l -n -q . ../quilt-tmp
+$ cd ../quilt-tmp
+$ git reset --hard 91d85ea6786107aa2837bef3e957165ad7c8b823
+HEAD is now at 91d85ea Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
+$ git am ../quilt/rr/virtio-include-in-documentation.patch
+Applying: virtio: Add text copy of spec to Documentation/virtual.
+/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:20: new blank line at EOF.
++
+warning: 1 line adds whitespace errors.
+$ git am ../quilt/rr/lguest-relocatable-fix-launcher.patch
+Applying: lguest: allow booting guest with CONFIG_RELOCATABLE=y
+$ git am ../quilt/rr/lguest-weaken-paravirt-restriction.patch
+Applying: lguest: Allow running under paravirt-enabled KVM.
+$ git am ../quilt/rr/lguest-remove-kvm-cpuid-signature.patch
+Applying: lguest: don't allow KVM-detection cpuid.
+$ git am ../quilt/rr/virtio:console_use_config_val_for_retrieving_config.patch
+Applying: virtio-console: Use virtio_config_val() for retrieving config
+$ git am ../quilt/rr/virtio:config_add_config_val_len.patch
+Applying: virtio_config: Add virtio_config_val_len()
+$ git am ../quilt/rr/virtio:net_use_config_val_for_retrieving_config.patch
+Applying: virtio-net: Use virtio_config_val() for retrieving config
+$ cd ../next
+$ git fetch -f ../quilt-tmp master:quilt/rr
+From ../quilt-tmp
+ + b6ce750...69010e5 master     -> quilt/rr  (forced update)
+Importing device-mapper based on v3.1-rc1
+Unchanged quilt series device-mapper
diff --git a/localversion-next b/localversion-next
new file mode 100644 (file)
index 0000000..0c6df7a
--- /dev/null
@@ -0,0 +1 @@
+-next-20110817