Add linux-next specific files for 20090917
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000..99d99e2
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,141 @@
+Name SHA1
+---- ----
+origin ab86e5765d41a5eb4239a1c04d613db87bea5ed8
+fixes 4afc3f39fb9d312ea59342359bdd71f3b67ae4af
+arm-current dca230f00d737353e2dffae489c916b41971921f
+m68k-current 9848484fad9ddeb18f18f02f9ecdcd330ac9a216
+powerpc-merge 8775965c9009cb52f5357a9ba758fc75a1e14139
+sparc-current 0a375d75902c522ea36c6dc409296622f93db4a7
+scsi-rc-fixes 388ce4beb7135722c584b0af18f215e3ec657adf
+net-current 4e36a95e591e9c58dd10bb4103c00993917c27fd
+sound-current 1110afbe728838ac7ce973c37af9e11385dbaef9
+pci-current ab86e5765d41a5eb4239a1c04d613db87bea5ed8
+wireless-current 11ebd1bf07fafde8d16562966c96b05b0d4ced9e
+kbuild-current 04e448d9a386640a79a4aa71251aa1cdd314f662
+driver-core.current 0cb583fd2862f19ea88b02eb307d11c09e51e2f8
+tty.current 5cea4a4e15a918f19d32fd3dc9a5056f333847c3
+usb.current 9db7ee94e1cd76290efab73c43bd80d00ecfbaf9
+cpufreq-current 7fc1b26613587ab4369615445b5485040c60fef1
+input-current fc8e1ead9314cf0e0f1922e661428b93d3a50d88
+md-current 80ffb3cceaefa405f2ecd46d66500ed8d53efe74
+audit-current 3a6a6c16be78472a52f6dd7d88913373b42ad0f7
+crypto-current 81bd5f6c966cf2f137c2759dfc78abdffcff055e
+ide-curent 0cb583fd2862f19ea88b02eb307d11c09e51e2f8
+dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442
+arm 5413eb4cb79ec7d53e40a3f7816c7089433a36c6
+davinci 85609c1ccda64af7d7c277469183f20e4f3b69c3
+pxa 52a7a1cec88acdaf3f8b36a6b1fe904f6eca7ee5
+thumb-2 4fb3c2e2ab3549308a1b1663296d165e45d72ba5
+avr32 2c731afd139a76d790862d33857654fea6ac2a1f
+blackfin 60762a78ad4578db806b08c7a031642a2c6db892
+cris 62f589c5e391dc2081db42e801382304c652e43a
+ia64 6ae86350857bf3e862f8dcd10039ccb45e056f85
+m68k b25ef35f34a9837e1133b3ef5fab8058155cc69f
+m68knommu 6a281f89327cf4f9d12bab631de66b3baab5c9d5
+microblaze 2e7e1f3d34fd80e677b36b7150b883c2579c7d69
+mips df4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb
+parisc 1e0d061b462e48f9b1609a29aed9a5abcf65833e
+powerpc d331d8305cba713605854aab63a000fb892353a7
+4xx c5b20d3926dfc9616265b8ff5967cb7a476f9344
+galak 1dcd8ffc81e80a170625883f63f6a5db3cd0428d
+s390 59e36927ee08f3bf06d8d14597e57389bf1b41dc
+sh 480c646c32f368dfa2a076f7a120a7795e786e62
+sparc 0cb583fd2862f19ea88b02eb307d11c09e51e2f8
+xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9
+cifs 48541bd3dd4739b4d574b44ea47660c88d833677
+configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5
+ecryptfs 55deb64a779567cc0ef4fcb8cd2be8923350af33
+ext3 a22b086bba68b62195af7bd403ca562efc44774d
+ext4 dd474650d4b1ca3efb882ec7a8f14392d974a6a2
+fatfs 955234755ce4a2c33cfc558912aa8f2148cc1fc6
+fuse 79a9d99434b104c562f30f21b75317667f444793
+gfs2 86d006365610fe6cda243d89b67d5047dca44656
+jfs 4a19fb11a90fdbbcb3bc02effa036230d035ca28
+nfs ab86e5765d41a5eb4239a1c04d613db87bea5ed8
+nfsd b09333c4644d173d95b8f3fd4f1dc4375d91be2a
+nilfs2 b4fe76d550d3d74a9fb51c7d6384b28266981586
+ocfs2 7b1c7dec9ef1ac8742721a2d7bbb8ff3304cb816
+squashfs e5d287539dba264a1d9d7607a25b8c8c61c9d658
+udf cbc8cc33529b0e0e55ae0ff077b8cb0b71d54c7a
+v9fs 74fca6a42863ffacaf7ba6f1936a9f228950f657
+ubifs 873a64c762f0c52cdf95dcee59bd416bbf9688e6
+xfs 9ef96da6ec5e1b4cf7eb8e30852cd88ec7d5fdc0
+vfs aa7dfb8954ccf49e026ba13d12991a4eb7defb96
+pci ab86e5765d41a5eb4239a1c04d613db87bea5ed8
+hid 18240904960a39e582ced8ba8ececb10b8c22dd3
+i2c cfc6c3ff1dc8f4434e61365056b0813a6739570f
+jdelvare-hwmon 006609c96cd9b18966b0f366cf46757dec39e184
+kernel-doc d5fbe7da7a303f2c8c3c9acf17dc1ec346eaa850
+v4l-dvb fdc14b893269d90494fc077ce5f996fc2cb6cc23
+quota dee865656f2d8b866f8ac22c60d6363b914e9f12
+kbuild 1d2b9755debc2122bb8840cd2a9dacdc8ee604f2
+kconfig 48586218b6515b9bd70694e3cd8c901a6a6ee69c
+ide 0cb583fd2862f19ea88b02eb307d11c09e51e2f8
+libata c984123c7a888731b7e971e1c878b6f2b716b292
+infiniband 16e366791c052242eeb356127ecb4e6048787838
+acpi 90cebe356cda0f68094bb772edc7c36dc230a7a0
+ieee1394 625f0850a8e27b6a8d6fdb95056f35bc22d92b55
+ubi de75c771b4cc4da963164a538a8448128301bc35
+kvm cba2be0ef98862a68fa25ed03b370829634e6b0e
+dlm 1329e3f2c898cfabb6ed236d3fb8c1725197af53
+scsi 338f43ee21f0a3a8fec25526aec21e60b7d30129
+async_tx 084dac53adcfb910792a66bc0bae720cdde971de
+net 4142e0d1def2c0176c27fd2e810243045a62eb6d
+wireless bbac31f4c0339f6c51afbd0edfb4959df9b53fa9
+mtd 2c78c44362bc9b7c715a3c2119b89a407c1cb739
+crypto 81bd5f6c966cf2f137c2759dfc78abdffcff055e
+sound 26aaa4241a831b1df3db336d3e70ca859906d44c
+cpufreq f0adb134d8dc9993a9998dc50845ec4f6ff4fadc
+rr 1bd0e3809cd71567bb19059bb4818a9324771a40
+mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c
+input 9de48cc300fb10f7d9faa978670becf5e352462a
+lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f
+block b96fb4408a710eae29400f692b4a7483cdecc3f7
+device-mapper b96fb4408a710eae29400f692b4a7483cdecc3f7
+embedded 4744b43431e8613f920c5cba88346756f53c5165
+firmware 6e03a201bbe8137487f340d26aa662110e324b20
+pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2
+battery 3961f7c3cf247eee5df7fabadc7a40f2deeb98f3
+leds f16a5dba01ed942f427f56b0d1128251721275a5
+backlight 3b96ea9ef837c010f2187e0618d823fbdd8eeb54
+kgdb 98517d8f092cceea77ab93f15437c182b5615d9e
+slab f4d7562891d5f767f4a0fcf10b0f12eb96dbdfd8
+uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298
+md 80ffb3cceaefa405f2ecd46d66500ed8d53efe74
+mfd 2919cb9811911a3a14b64cde4c29e9a874ddda5d
+hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91
+drm 8dfaa8a7779ad2667d539aca6ae11cd87f562db6
+voltage 8428ccb2426fee73196a4e1484daa6da1e937bb1
+security-testing 86d710146fb9975f04c505ec78caa43d227c1018
+lblnet 86d710146fb9975f04c505ec78caa43d227c1018
+agp 121264827656f5f06328b17983c796af17dc5949
+uwb 0396c215f301e92677d1e9a064b405e31501dc1d
+watchdog 376f38198f6d611fad991b098e22e9582fc002fd
+bdev feaf3848a813a106f163013af6fcf6c4bfec92d9
+dwmw2-iommu 074835f0143b83845af5044af2739c52c9f53808
+cputime 27bf8712477db47c891e6198000c985631cd18de
+osd fb48922b3cf64d1b20d13468e4c4bb2988093e18
+jc_docs 6c19efb46aacf2c5043ad210b888ee58ffb848c0
+nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32
+trivial 9636885bd4f5f66adc26eebcdfa6bf5d25635e15
+audit def57543418a5f47debae28a0a9dea2effc11692
+omap 1f685b36dbf27db55072fb738aac57aaf37d2c71
+aoe c3643395dc3b8d47932e2bbc2992532ae88ee522
+suspend 0cb583fd2862f19ea88b02eb307d11c09e51e2f8
+bluetooth 7e7430908c3ccaf71f0851050c8ccaf9ecfb3b56
+fsnotify cf71f3cf1697ab9ad9064635e23fecd57af2c327
+irda 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554
+hwlat a2c8b6b9bc412196e4a0bfa1c6b33840f7f0a039
+drbd 03162bd2aab65d91d034abfd6bd0ee0358bd1454
+kmemleak 18240904960a39e582ced8ba8ececb10b8c22dd3
+tip 41c38ffadbde7d0e9fab049d0a03c76b1de41ae7
+oprofile 8b5050255f993dda5e7b5908ab71d1cafc731bd1
+percpu c2a7e818019f20a5cf7fb26a6eb59e212e6c0cd8
+sfi 5f0db7a2fb78895a197f64e548333b3bbd433996
+asm-generic 428bc597508e482cdea17b11b7b08eabd6b924a6
+hwpoison 465fdd97cbe16ef8727221857e96ef62dd352017
+driver-core 9db7ee94e1cd76290efab73c43bd80d00ecfbaf9
+tty a991e940234ee0929570f4e73ccb54431e1c2e4c
+usb fe7f73dc04056d218310cdc395ef9e300a6cb208
+staging fe7f73dc04056d218310cdc395ef9e300a6cb208
+scsi-post-merge 15addcb9e65e9b7a9df5978ee7f105ce2afee257
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000..eacb7d3
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,143 @@
+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
+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
+sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.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-2.6.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-2.6.git#master
+kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master
+driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/
+tty.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-tty.current/
+usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb.current/
+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-2.6.git#master
+dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master
+arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel
+davinci git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git#for-next
+pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next
+thumb-2 git git://linux-arm.org/linux-2.6.git#thumb-2
+avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch
+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
+parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#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
+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#master
+sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master
+xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master
+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#next
+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
+jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next
+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
+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
+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/
+jdelvare-hwmon quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
+kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/
+v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master
+quota git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6.git#for_next
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master
+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-2.6.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
+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
+kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#linux-next
+dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next
+scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master
+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-2.6.git#master
+wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master
+mtd git git://git.infradead.org/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
+cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next
+rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/
+mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next
+input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.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
+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
+voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next
+security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next
+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
+uwb git git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream
+watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-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
+omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next
+aoe quilt http://support.coraid.com/support/linux/for-next/patches/
+suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next
+bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6.git#master
+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
+hwlat git git://git.kernel.org/pub/scm/linux/kernel/git/jcm/linux-2.6-hwlat.git#for-linus
+drbd git git://git.drbd.org/linux-2.6-drbd.git#drbd
+kmemleak git git://linux-arm.org/linux-2.6.git#kmemleak
+tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest
+oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next
+percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.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
+hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison
+driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-driver-core/
+tty quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-tty/
+usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-06-usb/
+staging quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-07-staging/
+scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master
diff --git a/Next/merge.log b/Next/merge.log
new file mode 100644
index 0000000..45db16a
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,6766 @@
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 0cb583f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6
+Merging origin/master
+$ git merge origin/master
+Updating 0cb583f..ab86e57
+Fast forward
+ Documentation/ABI/testing/sysfs-bus-pci | 10 +
+ Documentation/DocBook/uio-howto.tmpl | 163 +
+ Documentation/PCI/pci-error-recovery.txt | 119 +-
+ Documentation/trace/events.txt | 24 +-
+ Documentation/vgaarbiter.txt | 194 +
+ MAINTAINERS | 7 +
+ arch/alpha/include/asm/pci.h | 1 -
+ arch/arm/include/asm/pci.h | 2 -
+ arch/frv/mb93090-mb00/pci-frv.c | 10 +-
+ arch/h8300/include/asm/pci.h | 1 -
+ arch/ia64/include/asm/pci.h | 14 +-
+ arch/mips/include/asm/pci.h | 2 -
+ arch/mn10300/include/asm/pci.h | 13 +-
+ arch/parisc/include/asm/pci.h | 1 -
+ arch/powerpc/include/asm/pci.h | 1 -
+ arch/powerpc/kernel/pci_of_scan.c | 1 +
+ arch/powerpc/platforms/pseries/eeh.c | 10 +-
+ arch/sh/include/asm/pci.h | 1 -
+ arch/sparc/include/asm/pci_32.h | 1 -
+ arch/sparc/include/asm/pci_64.h | 1 -
+ arch/um/include/asm/pci.h | 1 -
+ arch/x86/include/asm/pci.h | 1 -
+ arch/x86/kernel/pci-dma.c | 4 +-
+ arch/x86/kernel/quirks.c | 2 +-
+ arch/x86/pci/amd_bus.c | 64 +-
+ arch/x86/pci/common.c | 69 +
+ block/genhd.c | 2 +-
+ drivers/acpi/pci_root.c | 17 +-
+ drivers/acpi/power.c | 58 +-
+ drivers/acpi/scan.c | 1 +
+ drivers/acpi/sleep.c | 12 +-
+ drivers/acpi/wakeup.c | 4 +-
+ drivers/base/Kconfig | 25 +
+ drivers/base/Makefile | 2 +
+ drivers/base/base.h | 13 +-
+ drivers/base/bus.c | 23 +-
+ drivers/base/class.c | 87 +
+ drivers/base/core.c | 29 +-
+ drivers/base/dd.c | 31 +-
+ drivers/base/devtmpfs.c | 367 +
+ {kernel => drivers/base}/dma-coherent.c | 0
+ drivers/base/driver.c | 4 +-
+ drivers/base/init.c | 1 +
+ drivers/base/platform.c | 8 +-
+ drivers/block/cciss.c | 2 +-
+ drivers/block/pktcdvd.c | 2 +-
+ drivers/bluetooth/dtl1_cs.c | 2 +-
+ drivers/char/mem.c | 82 +-
+ drivers/firewire/core-device.c | 2 +-
+ drivers/firmware/dmi-id.c | 2 +-
+ drivers/gpu/Makefile | 2 +-
+ drivers/gpu/vga/Kconfig | 10 +
+ drivers/gpu/vga/Makefile | 1 +
+ drivers/gpu/vga/vgaarb.c | 1205 +++
+ drivers/infiniband/hw/ehca/ehca_main.c | 2 +-
+ drivers/infiniband/hw/ipath/ipath_kernel.h | 2 +-
+ drivers/infiniband/hw/ipath/ipath_sysfs.c | 2 +-
+ drivers/input/input.c | 2 +-
+ drivers/misc/enclosure.c | 4 +-
+ drivers/misc/hpilo.c | 290 +-
+ drivers/misc/hpilo.h | 8 +-
+ drivers/mmc/core/mmc.c | 2 +-
+ drivers/mmc/core/sd.c | 2 +-
+ drivers/mtd/mtdcore.c | 2 +-
+ drivers/net/wireless/iwmc3200wifi/Kconfig | 6 +-
+ drivers/pci/Makefile | 3 +
+ drivers/pci/hotplug/Makefile | 2 +-
+ drivers/pci/hotplug/acpi_pcihp.c | 117 +-
+ drivers/pci/hotplug/acpiphp.h | 3 -
+ drivers/pci/hotplug/acpiphp_glue.c | 187 +-
+ drivers/pci/hotplug/pci_hotplug_core.c | 3 +-
+ drivers/pci/hotplug/pciehp.h | 9 -
+ drivers/pci/hotplug/pciehp_acpi.c | 7 +-
+ drivers/pci/hotplug/pciehp_ctrl.c | 5 -
+ drivers/pci/hotplug/pciehp_hpc.c | 10 +-
+ drivers/pci/hotplug/pciehp_pci.c | 137 +-
+ drivers/pci/hotplug/pcihp_slot.c | 187 +
+ drivers/pci/hotplug/shpchp.h | 9 -
+ drivers/pci/hotplug/shpchp_pci.c | 62 +-
+ drivers/pci/legacy.c | 34 +
+ drivers/pci/msi.c | 283 +-
+ drivers/pci/pci-acpi.c | 29 +-
+ drivers/pci/pci-driver.c | 132 +-
+ drivers/pci/pci-stub.c | 45 +-
+ drivers/pci/pci-sysfs.c | 37 +
+ drivers/pci/pci.c | 106 +-
+ drivers/pci/pci.h | 2 +-
+ drivers/pci/pcie/aer/aer_inject.c | 25 +-
+ drivers/pci/pcie/aer/aerdrv.c | 22 +-
+ drivers/pci/pcie/aer/aerdrv.h | 34 +-
+ drivers/pci/pcie/aer/aerdrv_core.c | 107 +-
+ drivers/pci/pcie/aer/aerdrv_errprint.c | 190 +-
+ drivers/pci/pcie/aspm.c | 495 +-
+ drivers/pci/pcie/portdrv_core.c | 6 -
+ drivers/pci/pcie/portdrv_pci.c | 1 +
+ drivers/pci/probe.c | 33 +-
+ drivers/pci/quirks.c | 36 +-
+ drivers/pci/search.c | 31 -
+ drivers/pci/setup-bus.c | 22 +-
+ drivers/pci/setup-res.c | 1 +
+ drivers/pcmcia/au1000_pb1x00.c | 1 -
+ drivers/pcmcia/au1000_xxs1500.c | 1 -
+ drivers/pcmcia/ds.c | 3 +-
+ drivers/pcmcia/o2micro.h | 4 +
+ drivers/pcmcia/pcmcia_ioctl.c | 2 +-
+ drivers/pcmcia/pcmcia_resource.c | 6 +-
+ drivers/pcmcia/yenta_socket.c | 16 +-
+ drivers/s390/cio/css.c | 2 +-
+ drivers/s390/cio/device.c | 2 +-
+ drivers/s390/net/netiucv.c | 2 +-
+ drivers/scsi/scsi_priv.h | 2 +-
+ drivers/scsi/scsi_sysfs.c | 4 +-
+ drivers/staging/Kconfig | 36 +-
+ drivers/staging/Makefile | 20 +-
+ drivers/staging/agnx/pci.c | 2 +-
+ drivers/staging/altpciechdma/altpciechdma.c | 2 +-
+ drivers/staging/android/binder.c | 713 +-
+ drivers/staging/android/lowmemorykiller.c | 41 +-
+ drivers/staging/android/lowmemorykiller.txt | 16 -
+ drivers/staging/asus_oled/asus_oled.c | 404 +-
+ drivers/staging/at76_usb/Kconfig | 8 -
+ drivers/staging/at76_usb/Makefile | 1 -
+ drivers/staging/at76_usb/TODO | 7 -
+ drivers/staging/at76_usb/at76_usb.c | 5579 -----------
+ drivers/staging/at76_usb/at76_usb.h | 706 --
+ drivers/staging/b3dfg/b3dfg.c | 41 +-
+ drivers/staging/comedi/comedi.h | 1002 +-
+ drivers/staging/comedi/comedi_compat32.c | 115 +-
+ drivers/staging/comedi/comedi_compat32.h | 4 +-
+ drivers/staging/comedi/comedi_fops.c | 278 +-
+ drivers/staging/comedi/comedi_ksyms.c | 3 -
+ drivers/staging/comedi/comedidev.h | 85 +-
+ drivers/staging/comedi/comedilib.h | 77 +-
+ drivers/staging/comedi/drivers.c | 184 +-
+ drivers/staging/comedi/drivers/8253.h | 69 +-
+ drivers/staging/comedi/drivers/8255.c | 54 +-
+ drivers/staging/comedi/drivers/8255.h | 16 +-
+ drivers/staging/comedi/drivers/acl7225b.c | 22 +-
+ .../comedi/drivers/addi-data/addi_amcc_s5933.h | 3 +
+ .../comedi/drivers/addi-data/amcc_s5933_58.h | 3 +
+ .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +-
+ drivers/staging/comedi/drivers/adl_pci6208.c | 93 +-
+ drivers/staging/comedi/drivers/adl_pci7296.c | 39 +-
+ drivers/staging/comedi/drivers/adl_pci7432.c | 57 +-
+ drivers/staging/comedi/drivers/adl_pci8164.c | 126 +-
+ drivers/staging/comedi/drivers/adl_pci9111.c | 361 +-
+ drivers/staging/comedi/drivers/adl_pci9118.c | 532 +-
+ drivers/staging/comedi/drivers/adq12b.c | 371 +-
+ drivers/staging/comedi/drivers/adv_pci1710.c | 417 +-
+ drivers/staging/comedi/drivers/adv_pci1723.c | 73 +-
+ drivers/staging/comedi/drivers/adv_pci_dio.c | 306 +-
+ drivers/staging/comedi/drivers/aio_aio12_8.c | 36 +-
+ drivers/staging/comedi/drivers/aio_iiro_16.c | 30 +-
+ drivers/staging/comedi/drivers/amplc_dio200.c | 314 +-
+ drivers/staging/comedi/drivers/amplc_pc236.c | 118 +-
+ drivers/staging/comedi/drivers/amplc_pc263.c | 101 +-
+ drivers/staging/comedi/drivers/amplc_pci224.c | 260 +-
+ drivers/staging/comedi/drivers/amplc_pci230.c | 497 +-
+ drivers/staging/comedi/drivers/c6xdigio.c | 42 +-
+ drivers/staging/comedi/drivers/cb_das16_cs.c | 168 +-
+ drivers/staging/comedi/drivers/cb_pcidas.c | 671 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c | 1788 ++--
+ drivers/staging/comedi/drivers/cb_pcidda.c | 218 +-
+ drivers/staging/comedi/drivers/cb_pcidio.c | 74 +-
+ drivers/staging/comedi/drivers/cb_pcimdas.c | 89 +-
+ drivers/staging/comedi/drivers/cb_pcimdda.c | 61 +-
+ drivers/staging/comedi/drivers/comedi_bond.c | 56 +-
+ drivers/staging/comedi/drivers/comedi_fc.c | 14 +-
+ drivers/staging/comedi/drivers/comedi_fc.h | 4 +-
+ drivers/staging/comedi/drivers/comedi_parport.c | 29 +-
+ drivers/staging/comedi/drivers/comedi_test.c | 143 +-
+ drivers/staging/comedi/drivers/contec_pci_dio.c | 48 +-
+ drivers/staging/comedi/drivers/daqboard2000.c | 119 +-
+ drivers/staging/comedi/drivers/das08.c | 622 +-
+ drivers/staging/comedi/drivers/das08.h | 3 +-
+ drivers/staging/comedi/drivers/das08_cs.c | 25 +-
+ drivers/staging/comedi/drivers/das16.c | 828 +-
+ drivers/staging/comedi/drivers/das16m1.c | 132 +-
+ drivers/staging/comedi/drivers/das1800.c | 658 +-
+ drivers/staging/comedi/drivers/das6402.c | 23 +-
+ drivers/staging/comedi/drivers/das800.c | 224 +-
+ drivers/staging/comedi/drivers/dmm32at.c | 144 +-
+ drivers/staging/comedi/drivers/dt2801.c | 242 +-
+ drivers/staging/comedi/drivers/dt2811.c | 178 +-
+ drivers/staging/comedi/drivers/dt2814.c | 16 +-
+ drivers/staging/comedi/drivers/dt2815.c | 38 +-
+ drivers/staging/comedi/drivers/dt2817.c | 19 +-
+ drivers/staging/comedi/drivers/dt282x.c | 264 +-
+ drivers/staging/comedi/drivers/dt3000.c | 145 +-
+ drivers/staging/comedi/drivers/dt9812.c | 85 +-
+ drivers/staging/comedi/drivers/fl512.c | 37 +-
+ drivers/staging/comedi/drivers/gsc_hpdi.c | 236 +-
+ drivers/staging/comedi/drivers/icp_multi.c | 198 +-
+ drivers/staging/comedi/drivers/icp_multi.h | 74 +-
+ drivers/staging/comedi/drivers/ii_pci20kc.c | 127 +-
+ drivers/staging/comedi/drivers/jr3_pci.c | 298 +-
+ drivers/staging/comedi/drivers/jr3_pci.h | 40 +-
+ drivers/staging/comedi/drivers/ke_counter.c | 67 +-
+ drivers/staging/comedi/drivers/me4000.c | 881 +-
+ drivers/staging/comedi/drivers/me_daq.c | 218 +-
+ drivers/staging/comedi/drivers/mite.c | 138 +-
+ drivers/staging/comedi/drivers/mite.h | 144 +-
+ drivers/staging/comedi/drivers/mpc624.c | 48 +-
+ drivers/staging/comedi/drivers/mpc8260cpm.c | 26 +-
+ drivers/staging/comedi/drivers/multiq3.c | 45 +-
+ drivers/staging/comedi/drivers/ni_6527.c | 109 +-
+ drivers/staging/comedi/drivers/ni_65xx.c | 402 +-
+ drivers/staging/comedi/drivers/ni_660x.c | 293 +-
+ drivers/staging/comedi/drivers/ni_670x.c | 101 +-
+ drivers/staging/comedi/drivers/ni_at_a2150.c | 93 +-
+ drivers/staging/comedi/drivers/ni_at_ao.c | 69 +-
+ drivers/staging/comedi/drivers/ni_atmio.c | 318 +-
+ drivers/staging/comedi/drivers/ni_atmio16d.c | 128 +-
+ drivers/staging/comedi/drivers/ni_daq_700.c | 80 +-
+ drivers/staging/comedi/drivers/ni_daq_dio24.c | 43 +-
+ drivers/staging/comedi/drivers/ni_labpc.c | 452 +-
+ drivers/staging/comedi/drivers/ni_labpc.h | 5 +-
+ drivers/staging/comedi/drivers/ni_labpc_cs.c | 70 +-
+ drivers/staging/comedi/drivers/ni_mio_common.c | 1662 ++--
+ drivers/staging/comedi/drivers/ni_mio_cs.c | 36 +-
+ drivers/staging/comedi/drivers/ni_pcidio.c | 343 +-
+ drivers/staging/comedi/drivers/ni_pcimio.c | 2065 ++--
+ drivers/staging/comedi/drivers/ni_stc.h | 64 +-
+ drivers/staging/comedi/drivers/ni_tio.c | 475 +-
+ drivers/staging/comedi/drivers/ni_tio.h | 47 +-
+ drivers/staging/comedi/drivers/ni_tio_internal.h | 58 +-
+ drivers/staging/comedi/drivers/ni_tiocmd.c | 105 +-
+ drivers/staging/comedi/drivers/pcl711.c | 107 +-
+ drivers/staging/comedi/drivers/pcl724.c | 33 +-
+ drivers/staging/comedi/drivers/pcl725.c | 7 +-
+ drivers/staging/comedi/drivers/pcl726.c | 59 +-
+ drivers/staging/comedi/drivers/pcl730.c | 16 +-
+ drivers/staging/comedi/drivers/pcl812.c | 480 +-
+ drivers/staging/comedi/drivers/pcl816.c | 220 +-
+ drivers/staging/comedi/drivers/pcl818.c | 338 +-
+ drivers/staging/comedi/drivers/pcm3724.c | 28 +-
+ drivers/staging/comedi/drivers/pcm3730.c | 16 +-
+ drivers/staging/comedi/drivers/pcmad.c | 19 +-
+ drivers/staging/comedi/drivers/pcmda12.c | 25 +-
+ drivers/staging/comedi/drivers/pcmmio.c | 287 +-
+ drivers/staging/comedi/drivers/pcmuio.c | 228 +-
+ drivers/staging/comedi/drivers/plx9080.h | 8 +-
+ drivers/staging/comedi/drivers/poc.c | 104 +-
+ drivers/staging/comedi/drivers/quatech_daqp_cs.c | 115 +-
+ drivers/staging/comedi/drivers/rtd520.c | 487 +-
+ drivers/staging/comedi/drivers/rti800.c | 83 +-
+ drivers/staging/comedi/drivers/rti802.c | 21 +-
+ drivers/staging/comedi/drivers/s526.c | 203 +-
+ drivers/staging/comedi/drivers/s626.c | 1019 ++-
+ drivers/staging/comedi/drivers/s626.h | 16 +-
+ drivers/staging/comedi/drivers/serial2002.c | 201 +-
+ drivers/staging/comedi/drivers/skel.c | 82 +-
+ drivers/staging/comedi/drivers/ssv_dnp.c | 40 +-
+ drivers/staging/comedi/drivers/unioxx5.c | 106 +-
+ drivers/staging/comedi/drivers/usbdux.c | 268 +-
+ drivers/staging/comedi/drivers/usbduxfast.c | 459 +-
+ drivers/staging/comedi/drivers/vmk80xx.c | 135 +-
+ drivers/staging/comedi/kcomedilib/data.c | 12 +-
+ drivers/staging/comedi/kcomedilib/dio.c | 8 +-
+ drivers/staging/comedi/kcomedilib/get.c | 55 +-
+ .../staging/comedi/kcomedilib/kcomedilib_main.c | 35 +-
+ drivers/staging/comedi/kcomedilib/ksyms.c | 4 -
+ drivers/staging/comedi/proc.c | 23 +-
+ drivers/staging/comedi/range.c | 21 +-
+ drivers/staging/cowloop/Kconfig | 16 +
+ drivers/staging/cowloop/Makefile | 1 +
+ drivers/staging/cowloop/TODO | 11 +
+ drivers/staging/cowloop/cowloop.c | 2842 ++++++
+ drivers/staging/cowloop/cowloop.h | 66 +
+ drivers/staging/cpc-usb/TODO | 1 +
+ drivers/staging/cpc-usb/cpc-usb_drv.c | 1 -
+ drivers/staging/cpc-usb/cpc.h | 519 +-
+ drivers/staging/cpc-usb/cpc_int.h | 8 +-
+ drivers/staging/cpc-usb/cpcusb.h | 2 +-
+ drivers/staging/dream/Kconfig | 12 +
+ drivers/staging/dream/Makefile | 4 +
+ drivers/staging/dream/camera/Kconfig | 46 +
+ drivers/staging/dream/camera/Makefile | 7 +
+ drivers/staging/dream/camera/msm_camera.c | 2181 +++++
+ drivers/staging/dream/camera/msm_io7x.c | 291 +
+ drivers/staging/dream/camera/msm_io8x.c | 320 +
+ drivers/staging/dream/camera/msm_v4l2.c | 797 ++
+ drivers/staging/dream/camera/msm_vfe7x.c | 701 ++
+ drivers/staging/dream/camera/msm_vfe7x.h | 255 +
+ drivers/staging/dream/camera/msm_vfe8x.c | 756 ++
+ drivers/staging/dream/camera/msm_vfe8x.h | 895 ++
+ drivers/staging/dream/camera/msm_vfe8x_proc.c | 4003 ++++++++
+ drivers/staging/dream/camera/msm_vfe8x_proc.h | 1549 +++
+ drivers/staging/dream/camera/mt9d112.c | 761 ++
+ drivers/staging/dream/camera/mt9d112.h | 36 +
+ drivers/staging/dream/camera/mt9d112_reg.c | 307 +
+ drivers/staging/dream/camera/mt9p012.h | 51 +
+ drivers/staging/dream/camera/mt9p012_fox.c | 1305 +++
+ drivers/staging/dream/camera/mt9p012_reg.c | 573 ++
+ drivers/staging/dream/camera/mt9t013.c | 1496 +++
+ drivers/staging/dream/camera/mt9t013.h | 48 +
+ drivers/staging/dream/camera/mt9t013_reg.c | 266 +
+ drivers/staging/dream/camera/s5k3e2fx.c | 1310 +++
+ drivers/staging/dream/camera/s5k3e2fx.h | 9 +
+ drivers/staging/dream/gpio_axis.c | 180 +
+ drivers/staging/dream/gpio_event.c | 224 +
+ drivers/staging/dream/gpio_input.c | 343 +
+ drivers/staging/dream/gpio_matrix.c | 406 +
+ drivers/staging/dream/gpio_output.c | 84 +
+ drivers/staging/dream/qdsp5/Makefile | 17 +
+ drivers/staging/dream/qdsp5/adsp.c | 1163 +++
+ drivers/staging/dream/qdsp5/adsp.h | 369 +
+ drivers/staging/dream/qdsp5/adsp_6210.c | 283 +
+ drivers/staging/dream/qdsp5/adsp_6220.c | 284 +
+ drivers/staging/dream/qdsp5/adsp_6225.c | 328 +
+ drivers/staging/dream/qdsp5/adsp_driver.c | 641 ++
+ drivers/staging/dream/qdsp5/adsp_info.c | 121 +
+ .../staging/dream/qdsp5/adsp_jpeg_patch_event.c | 31 +
+ drivers/staging/dream/qdsp5/adsp_jpeg_verify_cmd.c | 182 +
+ drivers/staging/dream/qdsp5/adsp_lpm_verify_cmd.c | 65 +
+ drivers/staging/dream/qdsp5/adsp_vfe_patch_event.c | 54 +
+ drivers/staging/dream/qdsp5/adsp_vfe_verify_cmd.c | 239 +
+ .../staging/dream/qdsp5/adsp_video_verify_cmd.c | 163 +
+ .../staging/dream/qdsp5/adsp_videoenc_verify_cmd.c | 235 +
+ drivers/staging/dream/qdsp5/audio_aac.c | 1052 ++
+ drivers/staging/dream/qdsp5/audio_amrnb.c | 873 ++
+ drivers/staging/dream/qdsp5/audio_evrc.c | 845 ++
+ drivers/staging/dream/qdsp5/audio_in.c | 967 ++
+ drivers/staging/dream/qdsp5/audio_mp3.c | 971 ++
+ drivers/staging/dream/qdsp5/audio_out.c | 851 ++
+ drivers/staging/dream/qdsp5/audio_qcelp.c | 856 ++
+ drivers/staging/dream/qdsp5/audmgr.c | 313 +
+ drivers/staging/dream/qdsp5/audmgr.h | 215 +
+ drivers/staging/dream/qdsp5/audmgr_new.h | 213 +
+ drivers/staging/dream/qdsp5/audpp.c | 429 +
+ drivers/staging/dream/qdsp5/evlog.h | 133 +
+ drivers/staging/dream/qdsp5/snd.c | 279 +
+ drivers/staging/dream/smd/Kconfig | 26 +
+ drivers/staging/dream/smd/Makefile | 6 +
+ .../staging/dream/smd/rpc_server_dog_keepalive.c | 68 +
+ drivers/staging/dream/smd/rpc_server_time_remote.c | 77 +
+ drivers/staging/dream/smd/smd.c | 1330 +++
+ drivers/staging/dream/smd/smd_private.h | 171 +
+ drivers/staging/dream/smd/smd_qmi.c | 860 ++
+ drivers/staging/dream/smd/smd_rpcrouter.c | 1274 +++
+ drivers/staging/dream/smd/smd_rpcrouter.h | 195 +
+ drivers/staging/dream/smd/smd_rpcrouter_device.c | 376 +
+ drivers/staging/dream/smd/smd_rpcrouter_servers.c | 229 +
+ drivers/staging/dream/smd/smd_tty.c | 213 +
+ drivers/staging/dream/synaptics_i2c_rmi.c | 658 ++
+ drivers/staging/dream/synaptics_i2c_rmi.h | 53 +
+ drivers/staging/dst/export.c | 2 +-
+ drivers/staging/echo/TODO | 5 +-
+ drivers/staging/echo/bit_operations.h | 226 -
+ drivers/staging/echo/echo.c | 190 +-
+ drivers/staging/echo/echo.h | 15 +-
+ drivers/staging/echo/fir.h | 109 +-
+ drivers/staging/echo/mmx.h | 281 -
+ drivers/staging/echo/oslec.h | 70 +-
+ drivers/staging/epl/Benchmark.h | 425 -
+ drivers/staging/epl/Debug.h | 694 --
+ drivers/staging/epl/Edrv8139.c | 1246 ---
+ drivers/staging/epl/EdrvFec.h | 114 -
+ drivers/staging/epl/EdrvSim.h | 89 -
+ drivers/staging/epl/Epl.h | 272 -
+ drivers/staging/epl/EplAmi.h | 323 -
+ drivers/staging/epl/EplApiGeneric.c | 2054 ----
+ drivers/staging/epl/EplApiLinux.h | 141 -
+ drivers/staging/epl/EplApiLinuxKernel.c | 1173 ---
+ drivers/staging/epl/EplApiProcessImage.c | 328 -
+ drivers/staging/epl/EplCfg.h | 196 -
+ drivers/staging/epl/EplDef.h | 355 -
+ drivers/staging/epl/EplDll.h | 205 -
+ drivers/staging/epl/EplDllCal.h | 123 -
+ drivers/staging/epl/EplDllk.c | 4052 --------
+ drivers/staging/epl/EplDllkCal.c | 1260 ---
+ drivers/staging/epl/EplDlluCal.c | 529 --
+ drivers/staging/epl/EplErrDef.h | 294 -
+ drivers/staging/epl/EplErrorHandlerk.c | 810 --
+ drivers/staging/epl/EplEvent.h | 279 -
+ drivers/staging/epl/EplEventk.c | 853 --
+ drivers/staging/epl/EplEventu.c | 813 --
+ drivers/staging/epl/EplFrame.h | 344 -
+ drivers/staging/epl/EplIdentu.c | 486 -
+ drivers/staging/epl/EplInc.h | 370 -
+ drivers/staging/epl/EplInstDef.h | 363 -
+ drivers/staging/epl/EplLed.h | 92 -
+ drivers/staging/epl/EplNmt.h | 230 -
+ drivers/staging/epl/EplNmtCnu.c | 701 --
+ drivers/staging/epl/EplNmtMnu.c | 2828 ------
+ drivers/staging/epl/EplNmtk.c | 1840 ----
+ drivers/staging/epl/EplNmtkCal.c | 147 -
+ drivers/staging/epl/EplNmtu.c | 706 --
+ drivers/staging/epl/EplNmtuCal.c | 158 -
+ drivers/staging/epl/EplObd.c | 3192 -------
+ drivers/staging/epl/EplObd.h | 456 -
+ drivers/staging/epl/EplObdMacro.h | 354 -
+ drivers/staging/epl/EplObdkCal.c | 146 -
+ drivers/staging/epl/EplObdu.c | 506 -
+ drivers/staging/epl/EplObduCal.c | 543 --
+ drivers/staging/epl/EplPdo.h | 117 -
+ drivers/staging/epl/EplPdok.c | 669 --
+ drivers/staging/epl/EplPdokCal.c | 266 -
+ drivers/staging/epl/EplPdou.c | 565 --
+ drivers/staging/epl/EplSdo.h | 241 -
+ drivers/staging/epl/EplSdoAc.h | 111 -
+ drivers/staging/epl/EplSdoAsndu.c | 483 -
+ drivers/staging/epl/EplSdoAsySequ.c | 2522 -----
+ drivers/staging/epl/EplSdoComu.c | 3345 -------
+ drivers/staging/epl/EplSdoUdpu.c | 650 --
+ drivers/staging/epl/EplStatusu.c | 377 -
+ drivers/staging/epl/EplTarget.h | 140 -
+ drivers/staging/epl/EplTimer.h | 116 -
+ drivers/staging/epl/EplTimeruLinuxKernel.c | 446 -
+ drivers/staging/epl/EplVersion.h | 98 -
+ drivers/staging/epl/Kconfig | 6 -
+ drivers/staging/epl/Makefile | 41 -
+ drivers/staging/epl/SharedBuff.c | 1762 ----
+ drivers/staging/epl/SharedBuff.h | 187 -
+ drivers/staging/epl/ShbIpc-LinuxKernel.c | 944 --
+ drivers/staging/epl/ShbIpc.h | 99 -
+ drivers/staging/epl/ShbLinuxKernel.h | 68 -
+ drivers/staging/epl/SocketLinuxKernel.c | 197 -
+ drivers/staging/epl/SocketLinuxKernel.h | 105 -
+ drivers/staging/epl/TimerHighReskX86.c | 510 -
+ drivers/staging/epl/VirtualEthernetLinux.c | 348 -
+ drivers/staging/epl/amix86.c | 861 --
+ drivers/staging/epl/demo_main.c | 947 --
+ drivers/staging/epl/edrv.h | 167 -
+ drivers/staging/epl/global.h | 144 -
+ drivers/staging/epl/kernel/EplDllk.h | 153 -
+ drivers/staging/epl/kernel/EplDllkCal.h | 129 -
+ drivers/staging/epl/kernel/EplErrorHandlerk.h | 88 -
+ drivers/staging/epl/kernel/EplEventk.h | 96 -
+ drivers/staging/epl/kernel/EplNmtk.h | 90 -
+ drivers/staging/epl/kernel/EplObdk.h | 156 -
+ drivers/staging/epl/kernel/EplPdok.h | 98 -
+ drivers/staging/epl/kernel/EplPdokCal.h | 86 -
+ drivers/staging/epl/kernel/EplTimerHighResk.h | 96 -
+ drivers/staging/epl/kernel/EplTimerk.h | 108 -
+ drivers/staging/epl/kernel/VirtualEthernet.h | 84 -
+ drivers/staging/epl/proc_fs.c | 410 -
+ drivers/staging/epl/proc_fs.h | 89 -
+ drivers/staging/epl/user/EplCfgMau.h | 276 -
+ drivers/staging/epl/user/EplDllu.h | 96 -
+ drivers/staging/epl/user/EplDlluCal.h | 106 -
+ drivers/staging/epl/user/EplEventu.h | 96 -
+ drivers/staging/epl/user/EplIdentu.h | 94 -
+ drivers/staging/epl/user/EplLedu.h | 95 -
+ drivers/staging/epl/user/EplNmtCnu.h | 92 -
+ drivers/staging/epl/user/EplNmtMnu.h | 117 -
+ drivers/staging/epl/user/EplNmtu.h | 139 -
+ drivers/staging/epl/user/EplNmtuCal.h | 80 -
+ drivers/staging/epl/user/EplObdu.h | 169 -
+ drivers/staging/epl/user/EplObduCal.h | 126 -
+ drivers/staging/epl/user/EplPdou.h | 96 -
+ drivers/staging/epl/user/EplSdoAsndu.h | 96 -
+ drivers/staging/epl/user/EplSdoAsySequ.h | 100 -
+ drivers/staging/epl/user/EplSdoComu.h | 114 -
+ drivers/staging/epl/user/EplSdoUdpu.h | 97 -
+ drivers/staging/epl/user/EplStatusu.h | 90 -
+ drivers/staging/epl/user/EplTimeru.h | 95 -
+ drivers/staging/et131x/Makefile | 3 -
+ drivers/staging/et131x/et1310_address_map.h | 2304 ++---
+ drivers/staging/et131x/et1310_eeprom.c | 215 +-
+ drivers/staging/et131x/et1310_eeprom.h | 22 +-
+ drivers/staging/et131x/et1310_jagcore.c | 220 -
+ drivers/staging/et131x/et1310_jagcore.h | 36 +-
+ drivers/staging/et131x/et1310_mac.c | 358 +-
+ drivers/staging/et131x/et1310_mac.h | 8 +-
+ drivers/staging/et131x/et1310_phy.c | 770 +-
+ drivers/staging/et131x/et1310_phy.h | 941 +-
+ drivers/staging/et131x/et1310_pm.c | 96 +-
+ drivers/staging/et131x/et1310_pm.h | 46 +-
+ drivers/staging/et131x/et1310_rx.c | 572 +-
+ drivers/staging/et131x/et1310_rx.h | 198 +-
+ drivers/staging/et131x/et1310_tx.c | 1067 +--
+ drivers/staging/et131x/et1310_tx.h | 108 +-
+ drivers/staging/et131x/et131x_adapter.h | 141 +-
+ drivers/staging/et131x/et131x_config.c | 325 -
+ drivers/staging/et131x/et131x_debug.c | 217 -
+ drivers/staging/et131x/et131x_debug.h | 255 -
+ drivers/staging/et131x/et131x_defs.h | 28 +-
+ drivers/staging/et131x/et131x_initpci.c | 726 +-
+ drivers/staging/et131x/et131x_initpci.h | 6 +-
+ drivers/staging/et131x/et131x_isr.c | 240 +-
+ drivers/staging/et131x/et131x_isr.h | 6 +-
+ drivers/staging/et131x/et131x_netdev.c | 327 +-
+ drivers/staging/et131x/et131x_netdev.h | 6 +-
+ drivers/staging/et131x/et131x_version.h | 6 +-
+ drivers/staging/heci/Kconfig | 7 -
+ drivers/staging/heci/Makefile | 9 -
+ drivers/staging/heci/TODO | 6 -
+ drivers/staging/heci/heci.h | 175 -
+ drivers/staging/heci/heci_data_structures.h | 529 --
+ drivers/staging/heci/heci_init.c | 1083 ---
+ drivers/staging/heci/heci_interface.c | 498 -
+ drivers/staging/heci/heci_interface.h | 170 -
+ drivers/staging/heci/heci_main.c | 1576 ---
+ drivers/staging/heci/heci_version.h | 54 -
+ drivers/staging/heci/interrupt.c | 1555 ---
+ drivers/staging/heci/io_heci.c | 872 --
+ drivers/staging/hv/BlkVsc.c | 111 +
+ drivers/staging/hv/Channel.c | 1015 ++
+ drivers/staging/hv/Channel.h | 112 +
+ drivers/staging/hv/ChannelInterface.c | 152 +
+ drivers/staging/hv/ChannelInterface.h | 35 +
+ drivers/staging/hv/ChannelMgmt.c | 686 ++
+ drivers/staging/hv/ChannelMgmt.h | 319 +
+ drivers/staging/hv/Connection.c | 341 +
+ drivers/staging/hv/Hv.c | 568 ++
+ drivers/staging/hv/Hv.h | 144 +
+ drivers/staging/hv/Kconfig | 32 +
+ drivers/staging/hv/Makefile | 11 +
+ drivers/staging/hv/NetVsc.c | 1379 +++
+ drivers/staging/hv/NetVsc.h | 329 +
+ drivers/staging/hv/NetVscApi.h | 123 +
+ drivers/staging/hv/RingBuffer.c | 606 ++
+ drivers/staging/hv/RingBuffer.h | 101 +
+ drivers/staging/hv/RndisFilter.c | 1000 ++
+ drivers/staging/hv/RndisFilter.h | 55 +
+ drivers/staging/hv/StorVsc.c | 850 ++
+ drivers/staging/hv/StorVscApi.h | 113 +
+ drivers/staging/hv/TODO | 13 +
+ drivers/staging/hv/VersionInfo.h | 31 +
+ drivers/staging/hv/Vmbus.c | 311 +
+ drivers/staging/hv/VmbusApi.h | 175 +
+ drivers/staging/hv/VmbusChannelInterface.h | 89 +
+ drivers/staging/hv/VmbusPacketFormat.h | 160 +
+ drivers/staging/hv/VmbusPrivate.h | 134 +
+ drivers/staging/hv/blkvsc_drv.c | 1511 +++
+ drivers/staging/hv/hv_api.h | 905 ++
+ drivers/staging/hv/logging.h | 119 +
+ drivers/staging/hv/netvsc_drv.c | 618 ++
+ drivers/staging/hv/osd.c | 156 +
+ drivers/staging/hv/osd.h | 69 +
+ drivers/staging/hv/rndis.h | 652 ++
+ drivers/staging/hv/storvsc_drv.c | 1208 +++
+ drivers/staging/hv/vmbus.h | 77 +
+ drivers/staging/hv/vmbus_drv.c | 999 ++
+ drivers/staging/hv/vstorage.h | 192 +
+ drivers/staging/iio/Documentation/device.txt | 49 +
+ drivers/staging/iio/Documentation/iio_utils.h | 159 +
+ .../iio/Documentation/lis3l02dqbuffersimple.c | 171 +
+ drivers/staging/iio/Documentation/overview.txt | 62 +
+ drivers/staging/iio/Documentation/ring.txt | 61 +
+ drivers/staging/iio/Documentation/trigger.txt | 38 +
+ drivers/staging/iio/Documentation/userspace.txt | 60 +
+ drivers/staging/iio/Kconfig | 47 +
+ drivers/staging/iio/Makefile | 16 +
+ drivers/staging/iio/TODO | 69 +
+ drivers/staging/iio/accel/Kconfig | 27 +
+ drivers/staging/iio/accel/Makefile | 11 +
+ drivers/staging/iio/accel/accel.h | 167 +
+ drivers/staging/iio/accel/kxsd9.c | 395 +
+ drivers/staging/iio/accel/lis3l02dq.h | 232 +
+ drivers/staging/iio/accel/lis3l02dq_core.c | 926 ++
+ drivers/staging/iio/accel/lis3l02dq_ring.c | 600 ++
+ drivers/staging/iio/accel/sca3000.h | 298 +
+ drivers/staging/iio/accel/sca3000_core.c | 1509 +++
+ drivers/staging/iio/accel/sca3000_ring.c | 331 +
+ drivers/staging/iio/adc/Kconfig | 13 +
+ drivers/staging/iio/adc/Makefile | 8 +
+ drivers/staging/iio/adc/adc.h | 13 +
+ drivers/staging/iio/adc/max1363.h | 269 +
+ drivers/staging/iio/adc/max1363_core.c | 623 ++
+ drivers/staging/iio/adc/max1363_ring.c | 241 +
+ drivers/staging/iio/chrdev.h | 118 +
+ drivers/staging/iio/iio.h | 411 +
+ drivers/staging/iio/industrialio-core.c | 851 ++
+ drivers/staging/iio/industrialio-ring.c | 568 ++
+ drivers/staging/iio/industrialio-trigger.c | 399 +
+ drivers/staging/iio/light/Kconfig | 13 +
+ drivers/staging/iio/light/Makefile | 5 +
+ drivers/staging/iio/light/light.h | 12 +
+ drivers/staging/iio/light/tsl2561.c | 276 +
+ drivers/staging/iio/ring_generic.h | 283 +
+ drivers/staging/iio/ring_hw.h | 22 +
+ drivers/staging/iio/ring_sw.c | 433 +
+ drivers/staging/iio/ring_sw.h | 189 +
+ drivers/staging/iio/sysfs.h | 293 +
+ drivers/staging/iio/trigger.h | 151 +
+ drivers/staging/iio/trigger/Kconfig | 21 +
+ drivers/staging/iio/trigger/Makefile | 5 +
+ drivers/staging/iio/trigger/iio-trig-gpio.c | 202 +
+ .../staging/iio/trigger/iio-trig-periodic-rtc.c | 228 +
+ drivers/staging/iio/trigger_consumer.h | 45 +
+ drivers/staging/line6/capture.c | 4 +-
+ drivers/staging/line6/driver.c | 2 +-
+ drivers/staging/line6/pod.c | 8 +-
+ drivers/staging/me4000/Kconfig | 10 -
+ drivers/staging/me4000/Makefile | 1 -
+ drivers/staging/me4000/README | 13 -
+ drivers/staging/me4000/me4000.c | 6109 ------------
+ drivers/staging/me4000/me4000.h | 966 --
+ drivers/staging/me4000/me4000_firmware.h |10033 --------------------
+ drivers/staging/me4000/me4610_firmware.h | 5409 -----------
+ drivers/staging/meilhaus/Kconfig | 128 -
+ drivers/staging/meilhaus/Makefile | 43 -
+ drivers/staging/meilhaus/TODO | 10 -
+ drivers/staging/meilhaus/me0600_device.c | 213 -
+ drivers/staging/meilhaus/me0600_device.h | 97 -
+ drivers/staging/meilhaus/me0600_dio.c | 415 -
+ drivers/staging/meilhaus/me0600_dio.h | 68 -
+ drivers/staging/meilhaus/me0600_dio_reg.h | 41 -
+ drivers/staging/meilhaus/me0600_ext_irq.c | 469 -
+ drivers/staging/meilhaus/me0600_ext_irq.h | 58 -
+ drivers/staging/meilhaus/me0600_ext_irq_reg.h | 18 -
+ drivers/staging/meilhaus/me0600_optoi.c | 243 -
+ drivers/staging/meilhaus/me0600_optoi.h | 58 -
+ drivers/staging/meilhaus/me0600_optoi_reg.h | 35 -
+ drivers/staging/meilhaus/me0600_relay.c | 359 -
+ drivers/staging/meilhaus/me0600_relay.h | 63 -
+ drivers/staging/meilhaus/me0600_relay_reg.h | 36 -
+ drivers/staging/meilhaus/me0600_ttli.c | 238 -
+ drivers/staging/meilhaus/me0600_ttli.h | 58 -
+ drivers/staging/meilhaus/me0600_ttli_reg.h | 35 -
+ drivers/staging/meilhaus/me0900_device.c | 178 -
+ drivers/staging/meilhaus/me0900_device.h | 92 -
+ drivers/staging/meilhaus/me0900_di.c | 245 -
+ drivers/staging/meilhaus/me0900_di.h | 65 -
+ drivers/staging/meilhaus/me0900_do.c | 314 -
+ drivers/staging/meilhaus/me0900_do.h | 68 -
+ drivers/staging/meilhaus/me0900_reg.h | 40 -
+ drivers/staging/meilhaus/me1000_device.c | 206 -
+ drivers/staging/meilhaus/me1000_device.h | 59 -
+ drivers/staging/meilhaus/me1000_dio.c | 438 -
+ drivers/staging/meilhaus/me1000_dio.h | 71 -
+ drivers/staging/meilhaus/me1000_dio_reg.h | 50 -
+ drivers/staging/meilhaus/me1400_device.c | 253 -
+ drivers/staging/meilhaus/me1400_device.h | 108 -
+ drivers/staging/meilhaus/me1400_ext_irq.c | 507 -
+ drivers/staging/meilhaus/me1400_ext_irq.h | 62 -
+ drivers/staging/meilhaus/me1400_ext_irq_reg.h | 56 -
+ drivers/staging/meilhaus/me1600_ao.c | 1017 --
+ drivers/staging/meilhaus/me1600_ao.h | 128 -
+ drivers/staging/meilhaus/me1600_ao_reg.h | 66 -
+ drivers/staging/meilhaus/me1600_device.c | 259 -
+ drivers/staging/meilhaus/me1600_device.h | 101 -
+ drivers/staging/meilhaus/me4600_ai.c | 3405 -------
+ drivers/staging/meilhaus/me4600_ai.h | 175 -
+ drivers/staging/meilhaus/me4600_ai_reg.h | 107 -
+ drivers/staging/meilhaus/me4600_ao.c | 5974 ------------
+ drivers/staging/meilhaus/me4600_ao.h | 259 -
+ drivers/staging/meilhaus/me4600_ao_reg.h | 113 -
+ drivers/staging/meilhaus/me4600_device.c | 371 -
+ drivers/staging/meilhaus/me4600_device.h | 151 -
+ drivers/staging/meilhaus/me4600_di.c | 256 -
+ drivers/staging/meilhaus/me4600_di.h | 64 -
+ drivers/staging/meilhaus/me4600_dio.c | 510 -
+ drivers/staging/meilhaus/me4600_dio.h | 69 -
+ drivers/staging/meilhaus/me4600_dio_reg.h | 63 -
+ drivers/staging/meilhaus/me4600_do.c | 433 -
+ drivers/staging/meilhaus/me4600_do.h | 65 -
+ drivers/staging/meilhaus/me4600_ext_irq.c | 457 -
+ drivers/staging/meilhaus/me4600_ext_irq.h | 78 -
+ drivers/staging/meilhaus/me4600_ext_irq_reg.h | 41 -
+ drivers/staging/meilhaus/me4600_reg.h | 46 -
+ drivers/staging/meilhaus/me6000_ao.c | 3709 --------
+ drivers/staging/meilhaus/me6000_ao.h | 195 -
+ drivers/staging/meilhaus/me6000_ao_reg.h | 177 -
+ drivers/staging/meilhaus/me6000_device.c | 209 -
+ drivers/staging/meilhaus/me6000_device.h | 149 -
+ drivers/staging/meilhaus/me6000_dio.c | 415 -
+ drivers/staging/meilhaus/me6000_dio.h | 68 -
+ drivers/staging/meilhaus/me6000_dio_reg.h | 43 -
+ drivers/staging/meilhaus/me6000_reg.h | 35 -
+ drivers/staging/meilhaus/me8100_device.c | 185 -
+ drivers/staging/meilhaus/me8100_device.h | 97 -
+ drivers/staging/meilhaus/me8100_di.c | 684 --
+ drivers/staging/meilhaus/me8100_di.h | 89 -
+ drivers/staging/meilhaus/me8100_di_reg.h | 47 -
+ drivers/staging/meilhaus/me8100_do.c | 391 -
+ drivers/staging/meilhaus/me8100_do.h | 70 -
+ drivers/staging/meilhaus/me8100_do_reg.h | 36 -
+ drivers/staging/meilhaus/me8100_reg.h | 41 -
+ drivers/staging/meilhaus/me8200_device.c | 192 -
+ drivers/staging/meilhaus/me8200_device.h | 97 -
+ drivers/staging/meilhaus/me8200_di.c | 832 --
+ drivers/staging/meilhaus/me8200_di.h | 92 -
+ drivers/staging/meilhaus/me8200_di_reg.h | 75 -
+ drivers/staging/meilhaus/me8200_dio.c | 418 -
+ drivers/staging/meilhaus/me8200_dio.h | 68 -
+ drivers/staging/meilhaus/me8200_dio_reg.h | 43 -
+ drivers/staging/meilhaus/me8200_do.c | 591 --
+ drivers/staging/meilhaus/me8200_do.h | 75 -
+ drivers/staging/meilhaus/me8200_do_reg.h | 40 -
+ drivers/staging/meilhaus/me8200_reg.h | 46 -
+ drivers/staging/meilhaus/me8254.c | 1176 ---
+ drivers/staging/meilhaus/me8254.h | 80 -
+ drivers/staging/meilhaus/me8254_reg.h | 172 -
+ drivers/staging/meilhaus/me8255.c | 462 -
+ drivers/staging/meilhaus/me8255.h | 59 -
+ drivers/staging/meilhaus/me8255_reg.h | 50 -
+ drivers/staging/meilhaus/mecirc_buf.h | 131 -
+ drivers/staging/meilhaus/mecommon.h | 26 -
+ drivers/staging/meilhaus/medebug.h | 125 -
+ drivers/staging/meilhaus/medefines.h | 449 -
+ drivers/staging/meilhaus/medevice.c | 1740 ----
+ drivers/staging/meilhaus/medevice.h | 304 -
+ drivers/staging/meilhaus/medlist.c | 127 -
+ drivers/staging/meilhaus/medlist.h | 91 -
+ drivers/staging/meilhaus/medlock.c | 195 -
+ drivers/staging/meilhaus/medlock.h | 76 -
+ drivers/staging/meilhaus/medriver.h | 350 -
+ drivers/staging/meilhaus/medummy.c | 1264 ---
+ drivers/staging/meilhaus/medummy.h | 40 -
+ drivers/staging/meilhaus/meerror.h | 100 -
+ drivers/staging/meilhaus/mefirmware.c | 137 -
+ drivers/staging/meilhaus/mefirmware.h | 57 -
+ drivers/staging/meilhaus/meids.h | 31 -
+ drivers/staging/meilhaus/meinternal.h | 363 -
+ drivers/staging/meilhaus/meioctl.h | 515 -
+ drivers/staging/meilhaus/memain.c | 2084 ----
+ drivers/staging/meilhaus/memain.h | 266 -
+ drivers/staging/meilhaus/meplx_reg.h | 53 -
+ drivers/staging/meilhaus/meslist.c | 173 -
+ drivers/staging/meilhaus/meslist.h | 108 -
+ drivers/staging/meilhaus/meslock.c | 136 -
+ drivers/staging/meilhaus/meslock.h | 73 -
+ drivers/staging/meilhaus/mesubdevice.c | 317 -
+ drivers/staging/meilhaus/mesubdevice.h | 197 -
+ drivers/staging/meilhaus/metempl_device.c | 135 -
+ drivers/staging/meilhaus/metempl_device.h | 92 -
+ drivers/staging/meilhaus/metempl_sub.c | 149 -
+ drivers/staging/meilhaus/metempl_sub.h | 64 -
+ drivers/staging/meilhaus/metempl_sub_reg.h | 35 -
+ drivers/staging/meilhaus/metypes.h | 95 -
+ drivers/staging/otus/80211core/cagg.c | 6 +-
+ drivers/staging/otus/80211core/cmm.c | 4 +-
+ drivers/staging/otus/80211core/performance.c | 6 +-
+ drivers/staging/otus/hal/hpmain.c | 2 +-
+ drivers/staging/otus/ioctl.c | 25 +-
+ drivers/staging/otus/usbdrv.c | 14 -
+ drivers/staging/otus/usbdrv.h | 4 -
+ drivers/staging/otus/wrap_buf.c | 3 -
+ drivers/staging/otus/wrap_dbg.c | 3 -
+ drivers/staging/otus/wrap_ev.c | 7 -
+ drivers/staging/otus/wrap_mem.c | 3 -
+ drivers/staging/otus/wrap_mis.c | 3 -
+ drivers/staging/otus/wrap_pkt.c | 4 -
+ drivers/staging/otus/wrap_sec.c | 3 -
+ drivers/staging/otus/wrap_usb.c | 3 -
+ drivers/staging/otus/wwrap.c | 8 -
+ drivers/staging/otus/zdcompat.h | 10 -
+ drivers/staging/panel/panel.c | 50 +-
+ drivers/staging/pata_rdc/Kconfig | 6 -
+ drivers/staging/pata_rdc/Makefile | 2 -
+ drivers/staging/pata_rdc/pata_rdc.c | 955 --
+ drivers/staging/pata_rdc/pata_rdc.h | 144 -
+ drivers/staging/pohmelfs/config.c | 101 +-
+ drivers/staging/pohmelfs/crypto.c | 4 +-
+ drivers/staging/pohmelfs/dir.c | 27 +-
+ drivers/staging/pohmelfs/inode.c | 9 +-
+ drivers/staging/pohmelfs/net.c | 20 +-
+ drivers/staging/pohmelfs/netfs.h | 5 +
+ drivers/staging/pohmelfs/trans.c | 3 +-
+ drivers/staging/quatech_usb2/Kconfig | 15 +
+ drivers/staging/quatech_usb2/Makefile | 1 +
+ drivers/staging/quatech_usb2/TODO | 8 +
+ drivers/staging/quatech_usb2/quatech_usb2.c | 2025 ++++
+ drivers/staging/rar/Kconfig | 17 +
+ drivers/staging/rar/Makefile | 2 +
+ drivers/staging/rar/rar_driver.c | 444 +
+ drivers/staging/rar/rar_driver.h | 99 +
+ drivers/staging/rspiusb/Kconfig | 6 -
+ drivers/staging/rspiusb/Makefile | 1 -
+ drivers/staging/rspiusb/TODO | 22 -
+ drivers/staging/rspiusb/rspiusb.c | 923 --
+ drivers/staging/rspiusb/rspiusb.h | 33 -
+ drivers/staging/rt2860/2860_main_dev.c | 7 +
+ drivers/staging/rt2860/ap.h | 453 -
+ drivers/staging/rt2860/chlist.h | 5 -
+ drivers/staging/rt2860/common/action.c | 11 +-
+ drivers/staging/rt2860/common/ba_action.c | 19 +-
+ drivers/staging/rt2860/common/cmm_data.c | 298 +-
+ drivers/staging/rt2860/common/cmm_info.c | 25 +-
+ drivers/staging/rt2860/common/cmm_sanity.c | 184 -
+ drivers/staging/rt2860/common/cmm_wpa.c | 806 +--
+ drivers/staging/rt2860/common/eeprom.c | 55 +-
+ drivers/staging/rt2860/common/mlme.c | 590 +--
+ drivers/staging/rt2860/common/rtmp_init.c | 386 +-
+ drivers/staging/rt2860/common/spectrum.c | 5 -
+ drivers/staging/rt2860/dfs.h | 12 -
+ drivers/staging/rt2860/oid.h | 170 +-
+ drivers/staging/rt2860/rt2860.h | 2 +
+ drivers/staging/rt2860/rt28xx.h | 22 +-
+ drivers/staging/rt2860/rt_config.h | 4 -
+ drivers/staging/rt2860/rt_linux.c | 19 +-
+ drivers/staging/rt2860/rt_linux.h | 118 +-
+ drivers/staging/rt2860/rt_main_dev.c | 59 +-
+ drivers/staging/rt2860/rt_profile.c | 44 +-
+ drivers/staging/rt2860/rtmp.h | 719 +--
+ drivers/staging/rt2860/rtmp_ckipmic.h | 35 -
+ drivers/staging/rt2860/rtmp_def.h | 14 -
+ drivers/staging/rt2860/sta/assoc.c | 26 -
+ drivers/staging/rt2860/sta/connect.c | 15 +-
+ drivers/staging/rt2860/sta/rtmp_data.c | 15 +-
+ drivers/staging/rt2860/sta/sync.c | 2 -
+ drivers/staging/rt2860/sta/wpa.c | 9 -
+ drivers/staging/rt2860/sta_ioctl.c | 3174 +------
+ drivers/staging/rt2860/wpa.h | 3 -
+ drivers/staging/rt2870/2870_main_dev.c | 196 +-
+ drivers/staging/rt2870/Kconfig | 5 +-
+ drivers/staging/rt2870/Makefile | 2 +-
+ drivers/staging/rt2870/common/2870_rtmp_init.c | 63 +-
+ drivers/staging/rt2870/common/cmm_data_2870.c | 30 -
+ drivers/staging/rt2870/common/firmware.h | 558 --
+ drivers/staging/rt2870/common/rtusb_bulk.c | 3 +-
+ drivers/staging/rt2870/common/rtusb_io.c | 81 +-
+ drivers/staging/rt2870/link_list.h | 1 -
+ drivers/staging/rt2870/rt2870.h | 215 +-
+ drivers/staging/rt3070/2870_main_dev.c | 1 -
+ drivers/staging/rt3070/Kconfig | 6 -
+ drivers/staging/rt3070/Makefile | 43 -
+ drivers/staging/rt3070/action.h | 1 -
+ drivers/staging/rt3070/aironet.h | 1 -
+ drivers/staging/rt3070/ap.h | 1 -
+ drivers/staging/rt3070/chlist.h | 1 -
+ drivers/staging/rt3070/common/2870_rtmp_init.c | 1 -
+ drivers/staging/rt3070/common/action.c | 1 -
+ drivers/staging/rt3070/common/ba_action.c | 1 -
+ drivers/staging/rt3070/common/cmm_data.c | 1 -
+ drivers/staging/rt3070/common/cmm_data_2870.c | 1 -
+ drivers/staging/rt3070/common/cmm_info.c | 1 -
+ drivers/staging/rt3070/common/cmm_sanity.c | 1 -
+ drivers/staging/rt3070/common/cmm_sync.c | 1 -
+ drivers/staging/rt3070/common/cmm_wpa.c | 1 -
+ drivers/staging/rt3070/common/dfs.c | 1 -
+ drivers/staging/rt3070/common/eeprom.c | 1 -
+ drivers/staging/rt3070/common/md5.c | 1 -
+ drivers/staging/rt3070/common/mlme.c | 1 -
+ drivers/staging/rt3070/common/rtmp_init.c | 1 -
+ drivers/staging/rt3070/common/rtmp_tkip.c | 1 -
+ drivers/staging/rt3070/common/rtmp_wep.c | 1 -
+ drivers/staging/rt3070/common/rtusb_bulk.c | 1 -
+ drivers/staging/rt3070/common/rtusb_data.c | 1 -
+ drivers/staging/rt3070/common/rtusb_io.c | 1 -
+ drivers/staging/rt3070/common/spectrum.c | 1 -
+ drivers/staging/rt3070/dfs.h | 1 -
+ drivers/staging/rt3070/link_list.h | 1 -
+ drivers/staging/rt3070/md5.h | 1 -
+ drivers/staging/rt3070/mlme.h | 1 -
+ drivers/staging/rt3070/oid.h | 1 -
+ drivers/staging/rt3070/rt2870.h | 1 -
+ drivers/staging/rt3070/rt28xx.h | 1 -
+ drivers/staging/rt3070/rt_config.h | 1 -
+ drivers/staging/rt3070/rt_linux.c | 1 -
+ drivers/staging/rt3070/rt_linux.h | 1 -
+ drivers/staging/rt3070/rt_main_dev.c | 1 -
+ drivers/staging/rt3070/rt_profile.c | 1 -
+ drivers/staging/rt3070/rtmp.h | 1 -
+ drivers/staging/rt3070/rtmp_ckipmic.h | 1 -
+ drivers/staging/rt3070/rtmp_def.h | 1 -
+ drivers/staging/rt3070/rtmp_type.h | 1 -
+ drivers/staging/rt3070/spectrum.h | 1 -
+ drivers/staging/rt3070/spectrum_def.h | 1 -
+ drivers/staging/rt3070/sta/aironet.c | 1 -
+ drivers/staging/rt3070/sta/assoc.c | 1 -
+ drivers/staging/rt3070/sta/auth.c | 1 -
+ drivers/staging/rt3070/sta/auth_rsp.c | 1 -
+ drivers/staging/rt3070/sta/connect.c | 2 -
+ drivers/staging/rt3070/sta/rtmp_data.c | 1 -
+ drivers/staging/rt3070/sta/sanity.c | 1 -
+ drivers/staging/rt3070/sta/sync.c | 1 -
+ drivers/staging/rt3070/sta/wpa.c | 1 -
+ drivers/staging/rt3070/sta_ioctl.c | 1 -
+ drivers/staging/rt3070/wpa.h | 1 -
+ drivers/staging/rt3090/Kconfig | 5 +
+ drivers/staging/rt3090/Makefile | 80 +
+ drivers/staging/{rt2860/md4.h => rt3090/action.h} | 50 +-
+ drivers/staging/rt3090/ap.h | 512 +
+ drivers/staging/rt3090/ap_apcli.h | 276 +
+ .../{rt2870/md4.h => rt3090/ap_autoChSel.h} | 63 +-
+ .../{rt2870/md4.h => rt3090/ap_autoChSel_cmm.h} | 50 +-
+ drivers/staging/rt3090/ap_cfg.h | 118 +
+ drivers/staging/{rt2860/md4.h => rt3090/ap_ids.h} | 66 +-
+ drivers/staging/{rt2860/md4.h => rt3090/ap_mbss.h} | 56 +-
+ drivers/staging/rt3090/ap_uapsd.h | 636 ++
+ drivers/staging/rt3090/ap_wds.h | 212 +
+ drivers/staging/rt3090/chips/rt3090.c | 123 +
+ drivers/staging/rt3090/chips/rt30xx.c | 525 +
+ drivers/staging/rt3090/chips/rt3370.c | 121 +
+ drivers/staging/rt3090/chips/rt3390.c | 122 +
+ drivers/staging/rt3090/chips/rt33xx.c | 536 ++
+ drivers/staging/rt3090/chlist.h | 130 +
+ drivers/staging/rt3090/common/action.c | 1057 +++
+ drivers/staging/rt3090/common/ba_action.c | 1779 ++++
+ drivers/staging/rt3090/common/cmm_aes.c | 1560 +++
+ drivers/staging/rt3090/common/cmm_asic.c | 2753 ++++++
+ drivers/staging/rt3090/common/cmm_cfg.c | 295 +
+ drivers/staging/rt3090/common/cmm_data.c | 2763 ++++++
+ drivers/staging/rt3090/common/cmm_data_pci.c | 1576 +++
+ drivers/staging/rt3090/common/cmm_info.c | 3717 ++++++++
+ drivers/staging/rt3090/common/cmm_mac_pci.c | 1757 ++++
+ drivers/staging/rt3090/common/cmm_profile.c | 2321 +++++
+ drivers/staging/rt3090/common/cmm_sanity.c | 1718 ++++
+ drivers/staging/rt3090/common/cmm_sync.c | 734 ++
+ drivers/staging/rt3090/common/cmm_tkip.c | 966 ++
+ drivers/staging/rt3090/common/cmm_wep.c | 500 +
+ drivers/staging/rt3090/common/cmm_wpa.c | 3149 ++++++
+ drivers/staging/rt3090/common/crypt_aes.c | 1007 ++
+ drivers/staging/rt3090/common/crypt_biginteger.c | 1119 +++
+ drivers/staging/rt3090/common/crypt_dh.c | 234 +
+ drivers/staging/rt3090/common/crypt_hmac.c | 279 +
+ drivers/staging/rt3090/common/crypt_md5.c | 353 +
+ drivers/staging/rt3090/common/crypt_sha2.c | 536 ++
+ drivers/staging/rt3090/common/dfs.c | 481 +
+ drivers/staging/rt3090/common/ee_efuse.c | 1548 +++
+ drivers/staging/rt3090/common/ee_prom.c | 308 +
+ drivers/staging/rt3090/common/eeprom.c | 98 +
+ drivers/staging/rt3090/common/igmp_snoop.c | 1365 +++
+ drivers/staging/rt3090/common/mlme.c | 6550 +++++++++++++
+ drivers/staging/rt3090/common/mlme_ex.c | 215 +
+ drivers/staging/rt3090/common/netif_block.c | 147 +
+ drivers/staging/rt3090/common/rt_channel.c | 1287 +++
+ drivers/staging/rt3090/common/rt_rf.c | 201 +
+ drivers/staging/rt3090/common/rtmp_init.c | 3882 ++++++++
+ drivers/staging/rt3090/common/rtmp_mcu.c | 560 ++
+ drivers/staging/rt3090/common/rtmp_timer.c | 327 +
+ drivers/staging/rt3090/common/spectrum.c | 2221 +++++
+ drivers/staging/rt3090/config.mk | 187 +
+ .../staging/{rt2860/md4.h => rt3090/crypt_hmac.h} | 65 +-
+ .../staging/{rt2860/md4.h => rt3090/crypt_md5.h} | 62 +-
+ drivers/staging/rt3090/crypt_sha2.h | 107 +
+ drivers/staging/rt3090/dfs.h | 137 +
+ drivers/staging/rt3090/eeprom.h | 82 +
+ drivers/staging/rt3090/firmware.h | 517 +
+ drivers/staging/rt3090/igmp_snoop.h | 152 +
+ drivers/staging/rt3090/ipv6.h | 215 +
+ drivers/staging/{rt2860 => rt3090}/link_list.h | 1 -
+ drivers/staging/rt3090/mac_pci.h | 454 +
+ drivers/staging/rt3090/mlme.h | 1360 +++
+ drivers/staging/{rt2870/md4.h => rt3090/mlme_ex.h} | 67 +-
+ .../staging/{rt2860/md4.h => rt3090/mlme_ex_def.h} | 37 +-
+ .../staging/{rt2860/md4.h => rt3090/netif_block.h} | 38 +-
+ drivers/staging/rt3090/oid.h | 1144 +++
+ drivers/staging/rt3090/pci_main_dev.c | 1195 +++
+ drivers/staging/{rt2870/md4.h => rt3090/rt3090.h} | 59 +-
+ drivers/staging/{rt2860/md4.h => rt3090/rt30xx.h} | 30 +-
+ drivers/staging/{rt2870/md4.h => rt3090/rt3370.h} | 46 +-
+ drivers/staging/{rt2870/md4.h => rt3090/rt3390.h} | 59 +-
+ drivers/staging/{rt2870/md4.h => rt3090/rt33xx.h} | 30 +-
+ drivers/staging/rt3090/rt_ate.c | 6089 ++++++++++++
+ drivers/staging/rt3090/rt_ate.h | 314 +
+ drivers/staging/rt3090/rt_config.h | 126 +
+ drivers/staging/rt3090/rt_linux.c | 1623 ++++
+ drivers/staging/rt3090/rt_linux.h | 1034 ++
+ drivers/staging/rt3090/rt_main_dev.c | 897 ++
+ drivers/staging/rt3090/rt_pci_rbus.c | 989 ++
+ drivers/staging/rt3090/rt_profile.c | 101 +
+ drivers/staging/rt3090/rtmp.h | 6873 ++++++++++++++
+ drivers/staging/rt3090/rtmp_chip.h | 355 +
+ drivers/staging/rt3090/rtmp_def.h | 1650 ++++
+ drivers/staging/rt3090/rtmp_dot11.h | 146 +
+ .../staging/{rt2860/md4.h => rt3090/rtmp_iface.h} | 63 +-
+ drivers/staging/rt3090/rtmp_mac.h | 2304 +++++
+ .../staging/{rt2860/md4.h => rt3090/rtmp_mcu.h} | 39 +-
+ drivers/staging/rt3090/rtmp_os.h | 93 +
+ drivers/staging/rt3090/rtmp_pci.h | 110 +
+ drivers/staging/rt3090/rtmp_phy.h | 631 ++
+ drivers/staging/rt3090/rtmp_timer.h | 162 +
+ drivers/staging/rt3090/rtmp_type.h | 147 +
+ drivers/staging/rt3090/spectrum.h | 234 +
+ drivers/staging/rt3090/spectrum_def.h | 257 +
+ drivers/staging/rt3090/sta/assoc.c | 1673 ++++
+ drivers/staging/rt3090/sta/auth.c | 491 +
+ drivers/staging/rt3090/sta/auth_rsp.c | 151 +
+ drivers/staging/rt3090/sta/connect.c | 2759 ++++++
+ drivers/staging/rt3090/sta/dls.c | 2207 +++++
+ drivers/staging/rt3090/sta/rtmp_ckipmic.c | 579 ++
+ drivers/staging/rt3090/sta/rtmp_data.c | 2661 ++++++
+ drivers/staging/rt3090/sta/sanity.c | 382 +
+ drivers/staging/rt3090/sta/sync.c | 1840 ++++
+ drivers/staging/rt3090/sta/wpa.c | 396 +
+ drivers/staging/rt3090/sta_ioctl.c | 7557 +++++++++++++++
+ .../staging/{rt2860/md4.h => rt3090/vr_ikans.h} | 53 +-
+ drivers/staging/rt3090/wpa.h | 447 +
+ drivers/staging/rtl8187se/Makefile | 16 -
+ drivers/staging/rtl8187se/TODO | 15 +
+ drivers/staging/rtl8187se/dot11d.h | 101 -
+ drivers/staging/rtl8187se/ieee80211.h | 1755 ----
+ drivers/staging/rtl8187se/ieee80211/dot11d.c | 22 -
+ drivers/staging/rtl8187se/ieee80211/dot11d.h | 2 -
+ drivers/staging/rtl8187se/ieee80211/ieee80211.h | 665 +-
+ .../staging/rtl8187se/ieee80211/ieee80211_crypt.c | 17 -
+ .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 88 +-
+ .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 324 +-
+ .../rtl8187se/ieee80211/ieee80211_crypt_wep.c | 125 +-
+ .../staging/rtl8187se/ieee80211/ieee80211_module.c | 88 -
+ drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 512 +-
+ .../rtl8187se/ieee80211/ieee80211_softmac.c | 1033 +--
+ .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 30 -
+ drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 270 +-
+ drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 129 +-
+ drivers/staging/rtl8187se/ieee80211/internal.h | 115 -
+ drivers/staging/rtl8187se/ieee80211/rtl_crypto.h | 399 -
+ drivers/staging/rtl8187se/r8180.h | 24 +-
+ drivers/staging/rtl8187se/r8180_93cx6.h | 2 -
+ drivers/staging/rtl8187se/r8180_core.c | 2954 +------
+ drivers/staging/rtl8187se/r8180_dm.c | 58 -
+ drivers/staging/rtl8187se/r8180_dm.h | 18 -
+ drivers/staging/rtl8187se/r8180_gct.c | 296 -
+ drivers/staging/rtl8187se/r8180_hw.h | 393 +-
+ drivers/staging/rtl8187se/r8180_max2820.c | 240 -
+ drivers/staging/rtl8187se/r8180_max2820.h | 21 -
+ drivers/staging/rtl8187se/r8180_pm.c | 92 -
+ drivers/staging/rtl8187se/r8180_rtl8225.c | 933 --
+ drivers/staging/rtl8187se/r8180_rtl8225.h | 12 +-
+ drivers/staging/rtl8187se/r8180_rtl8225z2.c | 1552 +--
+ drivers/staging/rtl8187se/r8180_rtl8255.c | 1838 ----
+ drivers/staging/rtl8187se/r8180_rtl8255.h | 19 -
+ drivers/staging/rtl8187se/r8180_sa2400.c | 233 -
+ drivers/staging/rtl8187se/r8180_sa2400.h | 26 -
+ drivers/staging/rtl8187se/r8180_wx.c | 63 +-
+ drivers/staging/rtl8187se/r8180_wx.h | 2 +-
+ drivers/staging/rtl8187se/r8185b_init.c | 665 +--
+ drivers/staging/rtl8192e/Kconfig | 6 +
+ drivers/staging/rtl8192e/Makefile | 34 +
+ drivers/staging/{rtl8192su => rtl8192e}/dot11d.h | 0
+ .../staging/{rtl8192su => rtl8192e}/ieee80211.h | 228 +-
+ drivers/staging/rtl8192e/ieee80211/dot11d.c | 239 +
+ .../{rtl8192su => rtl8192e/ieee80211}/dot11d.h | 0
+ .../{rtl8192su => rtl8192e/ieee80211}/ieee80211.h | 115 +-
+ .../staging/rtl8192e/ieee80211/ieee80211_crypt.c | 273 +
+ .../ieee80211}/ieee80211_crypt.h | 7 +
+ .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 534 ++
+ .../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 1031 ++
+ .../rtl8192e/ieee80211/ieee80211_crypt_wep.c | 393 +
+ .../staging/rtl8192e/ieee80211/ieee80211_module.c | 432 +
+ drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 2802 ++++++
+ .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 3548 +++++++
+ .../rtl8192e/ieee80211/ieee80211_softmac_wx.c | 682 ++
+ drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 933 ++
+ drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 1032 ++
+ drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h | 69 +
+ .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c | 779 ++
+ drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h | 481 +
+ .../staging/rtl8192e/ieee80211/rtl819x_HTProc.c | 1719 ++++
+ drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h | 748 ++
+ drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h | 56 +
+ .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 659 ++
+ .../{rtl8192su => rtl8192e}/ieee80211/rtl_crypto.h | 0
+ .../{rtl8187se => rtl8192e}/ieee80211_crypt.h | 0
+ drivers/staging/rtl8192e/r8180_93cx6.c | 146 +
+ drivers/staging/rtl8192e/r8180_93cx6.h | 40 +
+ drivers/staging/rtl8192e/r8190_rtl8256.c | 1161 +++
+ .../{rtl8192su => rtl8192e}/r8190_rtl8256.h | 9 +-
+ drivers/staging/rtl8192e/r8192E.h | 1516 +++
+ drivers/staging/rtl8192e/r8192E_core.c | 6462 +++++++++++++
+ drivers/staging/rtl8192e/r8192E_dm.c | 3880 ++++++++
+ drivers/staging/rtl8192e/r8192E_dm.h | 312 +
+ .../r8192U_hw.h => rtl8192e/r8192E_hw.h} | 437 +-
+ drivers/staging/rtl8192e/r8192E_wx.c | 1344 +++
+ .../r8180_gct.h => rtl8192e/r8192E_wx.h} | 23 +-
+ drivers/staging/rtl8192e/r8192_pm.c | 172 +
+ .../{rtl8187se/r8180_pm.h => rtl8192e/r8192_pm.h} | 18 +-
+ drivers/staging/rtl8192e/r819xE_cmdpkt.c | 804 ++
+ drivers/staging/rtl8192e/r819xE_cmdpkt.h | 207 +
+ drivers/staging/rtl8192e/r819xE_firmware.c | 352 +
+ .../r819xU_phy.c => rtl8192e/r819xE_phy.c} | 2404 ++++-
+ .../r819xU_phy.h => rtl8192e/r819xE_phy.h} | 61 +-
+ .../r819xU_phyreg.h => rtl8192e/r819xE_phyreg.h} | 7 +
+ drivers/staging/rtl8192su/Makefile | 39 +-
+ drivers/staging/rtl8192su/TODO | 18 +
+ drivers/staging/rtl8192su/ieee80211/EndianFree.h | 199 -
+ drivers/staging/rtl8192su/ieee80211/Makefile | 3 +-
+ drivers/staging/rtl8192su/ieee80211/aes.c | 469 -
+ drivers/staging/rtl8192su/ieee80211/api.c | 246 -
+ drivers/staging/rtl8192su/ieee80211/arc4.c | 103 -
+ drivers/staging/rtl8192su/ieee80211/autoload.c | 40 -
+ drivers/staging/rtl8192su/ieee80211/cipher.c | 299 -
+ drivers/staging/rtl8192su/ieee80211/compress.c | 64 -
+ .../staging/rtl8192su/ieee80211/crypto_compat.h | 90 -
+ drivers/staging/rtl8192su/ieee80211/digest.c | 108 -
+ drivers/staging/rtl8192su/ieee80211/dot11d.c | 25 +-
+ drivers/staging/rtl8192su/ieee80211/dot11d.h | 4 -
+ drivers/staging/rtl8192su/ieee80211/ieee80211.h | 1350 +---
+ .../staging/rtl8192su/ieee80211/ieee80211_crypt.c | 31 +-
+ .../staging/rtl8192su/ieee80211/ieee80211_crypt.h | 7 -
+ .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 66 +-
+ .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 292 +-
+ .../rtl8192su/ieee80211/ieee80211_crypt_wep.c | 126 +-
+ .../staging/rtl8192su/ieee80211/ieee80211_module.c | 77 +-
+ .../staging/rtl8192su/ieee80211/ieee80211_r8192s.h | 436 +
+ drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 253 +-
+ .../rtl8192su/ieee80211/ieee80211_softmac.c | 360 +-
+ .../rtl8192su/ieee80211/ieee80211_softmac_wx.c | 86 -
+ drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 26 +-
+ drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 272 +-
+ drivers/staging/rtl8192su/ieee80211/internal.h | 115 -
+ drivers/staging/rtl8192su/ieee80211/kmap_types.h | 20 -
+ drivers/staging/rtl8192su/ieee80211/michael_mic.c | 194 -
+ drivers/staging/rtl8192su/ieee80211/proc.c | 116 -
+ .../staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 49 +-
+ drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h | 9 -
+ .../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 279 +-
+ drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h | 168 +-
+ .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 34 +-
+ drivers/staging/rtl8192su/ieee80211/scatterwalk.c | 126 -
+ drivers/staging/rtl8192su/ieee80211/scatterwalk.h | 51 -
+ drivers/staging/rtl8192su/r8180_93cx6.h | 5 -
+ drivers/staging/rtl8192su/r8190_rtl8256.c | 312 -
+ drivers/staging/rtl8192su/r8192S_Efuse.c | 113 -
+ drivers/staging/rtl8192su/r8192S_FwImgDTM.h | 3797 --------
+ drivers/staging/rtl8192su/r8192S_firmware.c | 483 -
+ drivers/staging/rtl8192su/r8192S_firmware.h | 5 -
+ drivers/staging/rtl8192su/r8192S_hw.h | 184 -
+ drivers/staging/rtl8192su/r8192S_phy.c | 947 +--
+ drivers/staging/rtl8192su/r8192S_phy.h | 5 +-
+ drivers/staging/rtl8192su/r8192S_rtl6052.c | 104 -
+ drivers/staging/rtl8192su/r8192S_rtl6052.h | 47 -
+ drivers/staging/rtl8192su/r8192U.h | 528 +-
+ drivers/staging/rtl8192su/r8192U_core.c | 4898 +----------
+ drivers/staging/rtl8192su/r8192U_dm.c | 550 +--
+ drivers/staging/rtl8192su/r8192U_dm.h | 55 -
+ drivers/staging/rtl8192su/r8192U_pm.c | 11 +-
+ drivers/staging/rtl8192su/r8192U_pm.h | 2 -
+ drivers/staging/rtl8192su/r8192U_wx.c | 132 +-
+ drivers/staging/rtl8192su/r8192U_wx.h | 1 -
+ drivers/staging/rtl8192su/r819xU_HTType.h | 9 -
+ drivers/staging/rtl8192su/r819xU_cmdpkt.c | 113 +-
+ drivers/staging/rtl8192su/r819xU_cmdpkt.h | 20 -
+ drivers/staging/rtl8192su/r819xU_firmware.c | 707 --
+ drivers/staging/rtl8192su/r819xU_firmware.h | 106 -
+ drivers/staging/rtl8192su/r819xU_firmware_img.c | 3447 -------
+ drivers/staging/rtl8192su/r819xU_firmware_img.h | 35 -
+ drivers/staging/sep/Kconfig | 10 +
+ drivers/staging/sep/Makefile | 2 +
+ drivers/staging/sep/TODO | 8 +
+ drivers/staging/sep/sep_dev.h | 110 +
+ drivers/staging/sep/sep_driver.c | 2707 ++++++
+ drivers/staging/sep/sep_driver_api.h | 425 +
+ drivers/staging/sep/sep_driver_config.h | 225 +
+ drivers/staging/sep/sep_driver_hw_defs.h | 232 +
+ drivers/staging/serqt_usb2/serqt_usb2.c | 2 +-
+ drivers/staging/slicoss/slicoss.c | 2 +-
+ drivers/staging/sxg/Kconfig | 11 -
+ drivers/staging/sxg/Makefile | 3 -
+ drivers/staging/sxg/README | 12 -
+ drivers/staging/sxg/sxg.c | 4543 ---------
+ drivers/staging/sxg/sxg.h | 787 --
+ drivers/staging/sxg/sxg_ethtool.c | 328 -
+ drivers/staging/sxg/sxg_os.h | 149 -
+ drivers/staging/sxg/sxgdbg.h | 184 -
+ drivers/staging/sxg/sxghif.h | 1014 --
+ drivers/staging/sxg/sxghw.h | 1020 --
+ drivers/staging/sxg/sxgphycode-1.2.h | 130 -
+ drivers/staging/udlfb/udlfb.h | 2 +-
+ drivers/staging/usbip/Kconfig | 2 +-
+ drivers/staging/usbip/stub_dev.c | 16 +-
+ drivers/staging/usbip/stub_main.c | 8 +-
+ drivers/staging/usbip/stub_rx.c | 49 +-
+ drivers/staging/usbip/stub_tx.c | 26 +-
+ drivers/staging/usbip/usbip_common.c | 226 +-
+ drivers/staging/usbip/usbip_common.h | 96 +-
+ drivers/staging/usbip/usbip_event.c | 37 +-
+ drivers/staging/usbip/vhci_hcd.c | 156 +-
+ drivers/staging/usbip/vhci_rx.c | 41 +-
+ drivers/staging/usbip/vhci_sysfs.c | 22 +-
+ drivers/staging/usbip/vhci_tx.c | 22 +-
+ drivers/staging/vme/Kconfig | 17 +
+ drivers/staging/vme/Makefile | 7 +
+ drivers/staging/vme/TODO | 98 +
+ drivers/staging/vme/bridges/Kconfig | 13 +
+ drivers/staging/vme/bridges/Makefile | 2 +
+ drivers/staging/vme/bridges/vme_ca91cx42.c | 1933 ++++
+ drivers/staging/vme/bridges/vme_ca91cx42.h | 505 +
+ drivers/staging/vme/bridges/vme_tsi148.c | 2925 ++++++
+ drivers/staging/vme/bridges/vme_tsi148.h | 1387 +++
+ drivers/staging/vme/devices/Kconfig | 8 +
+ drivers/staging/vme/devices/Makefile | 5 +
+ drivers/staging/vme/devices/vme_user.c | 826 ++
+ drivers/staging/vme/devices/vme_user.h | 52 +
+ drivers/staging/vme/vme.c | 1497 +++
+ drivers/staging/vme/vme.h | 161 +
+ drivers/staging/vme/vme_api.txt | 372 +
+ drivers/staging/vme/vme_bridge.h | 261 +
+ drivers/staging/vt6655/80211hdr.h | 10 +-
+ drivers/staging/vt6655/80211mgr.c | 38 +-
+ drivers/staging/vt6655/80211mgr.h | 13 +-
+ drivers/staging/vt6655/IEEE11h.c | 47 +-
+ drivers/staging/vt6655/IEEE11h.h | 16 -
+ drivers/staging/vt6655/Kconfig | 2 +-
+ drivers/staging/vt6655/Makefile | 6 +-
+ drivers/staging/vt6655/Makefile.arm | 181 -
+ drivers/staging/vt6655/Makefile.x86 | 209 -
+ drivers/staging/vt6655/TODO | 21 +
+ drivers/staging/vt6655/aes_ccmp.c | 30 +-
+ drivers/staging/vt6655/aes_ccmp.h | 2 -
+ drivers/staging/vt6655/baseband.c | 61 +-
+ drivers/staging/vt6655/baseband.h | 35 +-
+ drivers/staging/vt6655/bssdb.c | 158 +-
+ drivers/staging/vt6655/bssdb.h | 23 +-
+ drivers/staging/vt6655/card.c | 80 +-
+ drivers/staging/vt6655/card.h | 17 -
+ drivers/staging/vt6655/country.h | 17 +-
+ drivers/staging/vt6655/datarate.c | 26 +-
+ drivers/staging/vt6655/desc.h | 103 +-
+ drivers/staging/vt6655/device.h | 177 +-
+ drivers/staging/vt6655/device_cfg.h | 46 +-
+ drivers/staging/vt6655/device_main.c | 643 +-
+ drivers/staging/vt6655/dpc.c | 304 +-
+ drivers/staging/vt6655/dpc.h | 24 +-
+ drivers/staging/vt6655/hostap.c | 135 +-
+ drivers/staging/vt6655/hostap.h | 24 -
+ drivers/staging/vt6655/iocmd.h | 23 +-
+ drivers/staging/vt6655/ioctl.c | 101 +-
+ drivers/staging/vt6655/ioctl.h | 17 -
+ drivers/staging/vt6655/iowpa.h | 4 +-
+ drivers/staging/vt6655/iwctl.c | 314 +-
+ drivers/staging/vt6655/iwctl.h | 105 +-
+ drivers/staging/vt6655/kcompat.h | 49 +-
+ drivers/staging/vt6655/key.c | 153 +-
+ drivers/staging/vt6655/key.h | 24 +-
+ drivers/staging/vt6655/mac.c | 145 +-
+ drivers/staging/vt6655/mac.h | 19 +-
+ drivers/staging/vt6655/mib.c | 153 +-
+ drivers/staging/vt6655/mib.h | 35 +-
+ drivers/staging/vt6655/michael.c | 7 -
+ drivers/staging/vt6655/michael.h | 4 -
+ drivers/staging/vt6655/power.c | 45 +-
+ drivers/staging/vt6655/power.h | 3 +-
+ drivers/staging/vt6655/rc4.c | 7 +-
+ drivers/staging/vt6655/rc4.h | 6 +-
+ drivers/staging/vt6655/rf.c | 16 +-
+ drivers/staging/vt6655/rf.h | 16 +-
+ drivers/staging/vt6655/rxtx.c | 556 +-
+ drivers/staging/vt6655/rxtx.h | 10 +-
+ drivers/staging/vt6655/srom.c | 31 +-
+ drivers/staging/vt6655/srom.h | 24 +-
+ drivers/staging/vt6655/tcrc.c | 9 -
+ drivers/staging/vt6655/tcrc.h | 18 -
+ drivers/staging/vt6655/tether.c | 16 +-
+ drivers/staging/vt6655/tether.h | 26 +-
+ drivers/staging/vt6655/tkip.c | 12 -
+ drivers/staging/vt6655/tkip.h | 16 -
+ drivers/staging/vt6655/tmacro.h | 90 -
+ drivers/staging/vt6655/tpci.h | 117 -
+ drivers/staging/vt6655/ttype.h | 261 +-
+ drivers/staging/vt6655/upc.h | 5 -
+ drivers/staging/vt6655/vntwifi.c | 33 +-
+ drivers/staging/vt6655/vntwifi.h | 19 +-
+ drivers/staging/vt6655/wcmd.c | 137 +-
+ drivers/staging/vt6655/wcmd.h | 22 +-
+ drivers/staging/vt6655/wctl.c | 17 +-
+ drivers/staging/vt6655/wctl.h | 19 -
+ drivers/staging/vt6655/wmgr.c | 360 +-
+ drivers/staging/vt6655/wmgr.h | 33 +-
+ drivers/staging/vt6655/wpa.c | 71 +-
+ drivers/staging/vt6655/wpa.h | 14 -
+ drivers/staging/vt6655/wpa2.c | 55 +-
+ drivers/staging/vt6655/wpa2.h | 24 +-
+ drivers/staging/vt6655/wpactl.c | 102 +-
+ drivers/staging/vt6655/wpactl.h | 17 -
+ drivers/staging/vt6655/wroute.c | 28 +-
+ drivers/staging/vt6655/wroute.h | 18 -
+ drivers/staging/vt6656/80211hdr.h | 353 +
+ drivers/staging/vt6656/80211mgr.c | 1026 ++
+ drivers/staging/vt6656/80211mgr.h | 861 ++
+ drivers/staging/vt6656/Kconfig | 6 +
+ drivers/staging/vt6656/Makefile | 39 +
+ drivers/staging/vt6656/TODO | 20 +
+ drivers/staging/vt6656/aes_ccmp.c | 402 +
+ .../staging/{vt6655/tbit.h => vt6656/aes_ccmp.h} | 48 +-
+ drivers/staging/vt6656/baseband.c | 2105 ++++
+ drivers/staging/vt6656/baseband.h | 146 +
+ drivers/staging/vt6656/bssdb.c | 1721 ++++
+ drivers/staging/vt6656/bssdb.h | 359 +
+ drivers/staging/vt6656/card.c | 1113 +++
+ drivers/staging/vt6656/card.h | 95 +
+ drivers/staging/vt6656/channel.c | 525 +
+ .../staging/{vt6655/umem.h => vt6656/channel.h} | 58 +-
+ drivers/staging/vt6656/control.c | 109 +
+ .../staging/{vt6655/tbit.h => vt6656/control.h} | 69 +-
+ drivers/staging/vt6656/country.h | 163 +
+ drivers/staging/vt6656/datarate.c | 499 +
+ drivers/staging/vt6656/datarate.h | 110 +
+ drivers/staging/vt6656/desc.h | 443 +
+ drivers/staging/vt6656/device.h | 939 ++
+ drivers/staging/vt6656/device_cfg.h | 107 +
+ drivers/staging/vt6656/dpc.c | 1616 ++++
+ drivers/staging/{vt6655/umem.h => vt6656/dpc.h} | 65 +-
+ drivers/staging/vt6656/firmware.c | 876 ++
+ .../staging/{vt6655/umem.h => vt6656/firmware.h} | 55 +-
+ drivers/staging/vt6656/hostap.c | 868 ++
+ drivers/staging/{vt6655/umem.h => vt6656/hostap.h} | 63 +-
+ drivers/staging/vt6656/int.c | 193 +
+ drivers/staging/{vt6655/umem.h => vt6656/int.h} | 74 +-
+ drivers/staging/vt6656/iocmd.h | 475 +
+ drivers/staging/vt6656/ioctl.c | 701 ++
+ drivers/staging/{vt6655/umem.h => vt6656/ioctl.h} | 52 +-
+ drivers/staging/vt6656/iowpa.h | 158 +
+ drivers/staging/vt6656/iwctl.c | 2190 +++++
+ drivers/staging/vt6656/iwctl.h | 229 +
+ drivers/staging/vt6656/kcompat.h | 39 +
+ drivers/staging/vt6656/key.c | 869 ++
+ drivers/staging/vt6656/key.h | 177 +
+ drivers/staging/vt6656/mac.c | 482 +
+ drivers/staging/vt6656/mac.h | 442 +
+ drivers/staging/vt6656/main_usb.c | 2196 +++++
+ drivers/staging/vt6656/mib.c | 573 ++
+ drivers/staging/vt6656/mib.h | 423 +
+ drivers/staging/vt6656/michael.c | 181 +
+ .../staging/{vt6655/tbit.h => vt6656/michael.h} | 60 +-
+ drivers/staging/vt6656/power.c | 424 +
+ drivers/staging/{vt6655/tbit.h => vt6656/power.h} | 90 +-
+ drivers/staging/vt6656/rc4.c | 87 +
+ drivers/staging/vt6656/rc4.h | 47 +
+ drivers/staging/vt6656/rf.c | 1151 +++
+ drivers/staging/vt6656/rf.h | 100 +
+ drivers/staging/vt6656/rndis.h | 162 +
+ drivers/staging/vt6656/rxtx.c | 3239 +++++++
+ drivers/staging/vt6656/rxtx.h | 694 ++
+ drivers/staging/vt6656/srom.h | 127 +
+ drivers/staging/vt6656/tcrc.c | 198 +
+ drivers/staging/{vt6655/tbit.h => vt6656/tcrc.h} | 45 +-
+ drivers/staging/vt6656/tether.c | 109 +
+ drivers/staging/vt6656/tether.h | 236 +
+ drivers/staging/vt6656/tkip.c | 272 +
+ drivers/staging/{vt6655/tbit.h => vt6656/tkip.h} | 50 +-
+ drivers/staging/vt6656/tmacro.h | 62 +
+ drivers/staging/vt6656/ttype.h | 162 +
+ drivers/staging/vt6656/upc.h | 166 +
+ drivers/staging/vt6656/usbpipe.c | 841 ++
+ .../staging/{vt6655/tbit.h => vt6656/usbpipe.h} | 99 +-
+ drivers/staging/vt6656/vntconfiguration.dat | 6 +
+ drivers/staging/vt6656/wcmd.c | 1354 +++
+ drivers/staging/vt6656/wcmd.h | 150 +
+ drivers/staging/vt6656/wctl.c | 254 +
+ drivers/staging/vt6656/wctl.h | 108 +
+ drivers/staging/vt6656/wmgr.c | 4949 ++++++++++
+ drivers/staging/vt6656/wmgr.h | 502 +
+ drivers/staging/vt6656/wpa.c | 316 +
+ drivers/staging/{vt6655/tbit.h => vt6656/wpa.h} | 84 +-
+ drivers/staging/vt6656/wpa2.c | 363 +
+ drivers/staging/{vt6655/umem.h => vt6656/wpa2.h} | 69 +-
+ drivers/staging/vt6656/wpactl.c | 1008 ++
+ drivers/staging/{vt6655/tbit.h => vt6656/wpactl.h} | 56 +-
+ drivers/staging/winbond/core.h | 4 +-
+ drivers/staging/winbond/localpara.h | 1 -
+ drivers/staging/winbond/mds.c | 22 +-
+ drivers/staging/winbond/mds_f.h | 6 +-
+ drivers/staging/winbond/mds_s.h | 17 +-
+ drivers/staging/winbond/mlmetxrx.c | 2 +-
+ drivers/staging/winbond/mlmetxrx_f.h | 32 +-
+ drivers/staging/winbond/mto.c | 26 +-
+ drivers/staging/winbond/mto.h | 116 +-
+ drivers/staging/winbond/wb35rx.c | 4 +-
+ drivers/staging/winbond/wb35tx.c | 4 +-
+ drivers/staging/winbond/wbhal_f.h | 2 +-
+ drivers/staging/winbond/wbhal_s.h | 4 +-
+ drivers/staging/winbond/wbusb.c | 5 -
+ drivers/staging/wlan-ng/hfa384x_usb.c | 205 +-
+ drivers/staging/wlan-ng/p80211conv.c | 12 +-
+ drivers/staging/wlan-ng/p80211hdr.h | 15 -
+ drivers/staging/wlan-ng/p80211meta.h | 6 -
+ drivers/staging/wlan-ng/p80211mgmt.h | 6 -
+ drivers/staging/wlan-ng/p80211msg.h | 6 -
+ drivers/staging/wlan-ng/p80211netdev.c | 62 +-
+ drivers/staging/wlan-ng/p80211netdev.h | 3 -
+ drivers/staging/wlan-ng/p80211req.c | 12 +-
+ drivers/staging/wlan-ng/p80211types.h | 4 -
+ drivers/staging/wlan-ng/p80211wep.c | 27 +-
+ drivers/staging/wlan-ng/p80211wext.c | 77 +-
+ drivers/staging/wlan-ng/prism2fw.c | 509 +-
+ drivers/staging/wlan-ng/prism2mgmt.c | 23 +-
+ drivers/staging/wlan-ng/prism2mib.c | 144 +-
+ drivers/staging/wlan-ng/prism2sta.c | 153 +-
+ drivers/staging/wlan-ng/prism2usb.c | 10 +-
+ drivers/uio/Kconfig | 15 +-
+ drivers/uio/Makefile | 1 +
+ drivers/uio/uio_pci_generic.c | 207 +
+ drivers/usb/core/endpoint.c | 2 +-
+ drivers/usb/core/sysfs.c | 4 +-
+ drivers/usb/core/usb.h | 4 +-
+ drivers/usb/host/uhci-hcd.c | 2 +-
+ drivers/uwb/lc-dev.c | 2 +-
+ drivers/video/Kconfig | 2 +
+ fs/afs/write.c | 1 -
+ fs/block_dev.c | 1 -
+ fs/btrfs/disk-io.c | 1 +
+ fs/btrfs/ordered-data.c | 1 -
+ fs/fs-writeback.c | 345 +-
+ fs/fuse/inode.c | 2 +
+ fs/inode.c | 4 +-
+ fs/jbd2/commit.c | 1 -
+ fs/nfs/super.c | 2 +
+ fs/nfs/write.c | 1 -
+ fs/nilfs2/the_nilfs.c | 4 +-
+ fs/partitions/check.c | 2 +-
+ fs/super.c | 6 +
+ fs/sync.c | 9 +-
+ fs/ubifs/budget.c | 20 +-
+ fs/ubifs/super.c | 1 +
+ include/acpi/acpi_bus.h | 18 +-
+ include/asm-generic/pci.h | 13 +-
+ include/linux/attribute_container.h | 2 +-
+ include/linux/backing-dev.h | 3 +-
+ include/linux/device.h | 45 +-
+ include/linux/fs.h | 2 +-
+ include/linux/netdevice.h | 2 +-
+ include/linux/pci.h | 14 +
+ include/linux/pci_hotplug.h | 16 +-
+ include/linux/pci_ids.h | 3 +
+ include/linux/pci_regs.h | 1 +
+ include/linux/shmem_fs.h | 3 +
+ include/linux/transport_class.h | 2 +-
+ include/linux/vgaarb.h | 200 +
+ include/linux/writeback.h | 5 +-
+ include/pcmcia/ss.h | 4 +-
+ include/trace/events/ext4.h | 6 +-
+ init/do_mounts.c | 2 +-
+ init/main.c | 2 +
+ kernel/Makefile | 1 -
+ kernel/sysctl.c | 4 +
+ mm/backing-dev.c | 90 +-
+ mm/page-writeback.c | 22 +-
+ mm/shmem.c | 9 +-
+ mm/slub.c | 2 +
+ net/bluetooth/hci_sysfs.c | 4 +-
+ net/core/net-sysfs.c | 2 +-
+ samples/trace_events/trace-events-sample.h | 2 +-
+ 1418 files changed, 292504 insertions(+), 211283 deletions(-)
+ create mode 100644 Documentation/vgaarbiter.txt
+ create mode 100644 drivers/base/devtmpfs.c
+ rename {kernel => drivers/base}/dma-coherent.c (100%)
+ create mode 100644 drivers/gpu/vga/Kconfig
+ create mode 100644 drivers/gpu/vga/Makefile
+ create mode 100644 drivers/gpu/vga/vgaarb.c
+ create mode 100644 drivers/pci/hotplug/pcihp_slot.c
+ create mode 100644 drivers/pci/legacy.c
+ delete mode 100644 drivers/staging/android/lowmemorykiller.txt
+ delete mode 100644 drivers/staging/at76_usb/Kconfig
+ delete mode 100644 drivers/staging/at76_usb/Makefile
+ delete mode 100644 drivers/staging/at76_usb/TODO
+ delete mode 100644 drivers/staging/at76_usb/at76_usb.c
+ delete mode 100644 drivers/staging/at76_usb/at76_usb.h
+ create mode 100644 drivers/staging/cowloop/Kconfig
+ create mode 100644 drivers/staging/cowloop/Makefile
+ create mode 100644 drivers/staging/cowloop/TODO
+ create mode 100644 drivers/staging/cowloop/cowloop.c
+ create mode 100644 drivers/staging/cowloop/cowloop.h
+ create mode 100644 drivers/staging/dream/Kconfig
+ create mode 100644 drivers/staging/dream/Makefile
+ create mode 100644 drivers/staging/dream/camera/Kconfig
+ create mode 100644 drivers/staging/dream/camera/Makefile
+ create mode 100644 drivers/staging/dream/camera/msm_camera.c
+ create mode 100644 drivers/staging/dream/camera/msm_io7x.c
+ create mode 100644 drivers/staging/dream/camera/msm_io8x.c
+ create mode 100644 drivers/staging/dream/camera/msm_v4l2.c
+ create mode 100644 drivers/staging/dream/camera/msm_vfe7x.c
+ create mode 100644 drivers/staging/dream/camera/msm_vfe7x.h
+ create mode 100644 drivers/staging/dream/camera/msm_vfe8x.c
+ create mode 100644 drivers/staging/dream/camera/msm_vfe8x.h
+ create mode 100644 drivers/staging/dream/camera/msm_vfe8x_proc.c
+ create mode 100644 drivers/staging/dream/camera/msm_vfe8x_proc.h
+ create mode 100644 drivers/staging/dream/camera/mt9d112.c
+ create mode 100644 drivers/staging/dream/camera/mt9d112.h
+ create mode 100644 drivers/staging/dream/camera/mt9d112_reg.c
+ create mode 100644 drivers/staging/dream/camera/mt9p012.h
+ create mode 100644 drivers/staging/dream/camera/mt9p012_fox.c
+ create mode 100644 drivers/staging/dream/camera/mt9p012_reg.c
+ create mode 100644 drivers/staging/dream/camera/mt9t013.c
+ create mode 100644 drivers/staging/dream/camera/mt9t013.h
+ create mode 100644 drivers/staging/dream/camera/mt9t013_reg.c
+ create mode 100644 drivers/staging/dream/camera/s5k3e2fx.c
+ create mode 100644 drivers/staging/dream/camera/s5k3e2fx.h
+ create mode 100644 drivers/staging/dream/gpio_axis.c
+ create mode 100644 drivers/staging/dream/gpio_event.c
+ create mode 100644 drivers/staging/dream/gpio_input.c
+ create mode 100644 drivers/staging/dream/gpio_matrix.c
+ create mode 100644 drivers/staging/dream/gpio_output.c
+ create mode 100644 drivers/staging/dream/qdsp5/Makefile
+ create mode 100644 drivers/staging/dream/qdsp5/adsp.c
+ create mode 100644 drivers/staging/dream/qdsp5/adsp.h
+ create mode 100644 drivers/staging/dream/qdsp5/adsp_6210.c
+ create mode 100644 drivers/staging/dream/qdsp5/adsp_6220.c
+ create mode 100644 drivers/staging/dream/qdsp5/adsp_6225.c
+ create mode 100644 drivers/staging/dream/qdsp5/adsp_driver.c
+ create mode 100644 drivers/staging/dream/qdsp5/adsp_info.c
+ create mode 100644 drivers/staging/dream/qdsp5/adsp_jpeg_patch_event.c
+ create mode 100644 drivers/staging/dream/qdsp5/adsp_jpeg_verify_cmd.c
+ create mode 100644 drivers/staging/dream/qdsp5/adsp_lpm_verify_cmd.c
+ create mode 100644 drivers/staging/dream/qdsp5/adsp_vfe_patch_event.c
+ create mode 100644 drivers/staging/dream/qdsp5/adsp_vfe_verify_cmd.c
+ create mode 100644 drivers/staging/dream/qdsp5/adsp_video_verify_cmd.c
+ create mode 100644 drivers/staging/dream/qdsp5/adsp_videoenc_verify_cmd.c
+ create mode 100644 drivers/staging/dream/qdsp5/audio_aac.c
+ create mode 100644 drivers/staging/dream/qdsp5/audio_amrnb.c
+ create mode 100644 drivers/staging/dream/qdsp5/audio_evrc.c
+ create mode 100644 drivers/staging/dream/qdsp5/audio_in.c
+ create mode 100644 drivers/staging/dream/qdsp5/audio_mp3.c
+ create mode 100644 drivers/staging/dream/qdsp5/audio_out.c
+ create mode 100644 drivers/staging/dream/qdsp5/audio_qcelp.c
+ create mode 100644 drivers/staging/dream/qdsp5/audmgr.c
+ create mode 100644 drivers/staging/dream/qdsp5/audmgr.h
+ create mode 100644 drivers/staging/dream/qdsp5/audmgr_new.h
+ create mode 100644 drivers/staging/dream/qdsp5/audpp.c
+ create mode 100644 drivers/staging/dream/qdsp5/evlog.h
+ create mode 100644 drivers/staging/dream/qdsp5/snd.c
+ create mode 100644 drivers/staging/dream/smd/Kconfig
+ create mode 100644 drivers/staging/dream/smd/Makefile
+ create mode 100644 drivers/staging/dream/smd/rpc_server_dog_keepalive.c
+ create mode 100644 drivers/staging/dream/smd/rpc_server_time_remote.c
+ create mode 100644 drivers/staging/dream/smd/smd.c
+ create mode 100644 drivers/staging/dream/smd/smd_private.h
+ create mode 100644 drivers/staging/dream/smd/smd_qmi.c
+ create mode 100644 drivers/staging/dream/smd/smd_rpcrouter.c
+ create mode 100644 drivers/staging/dream/smd/smd_rpcrouter.h
+ create mode 100644 drivers/staging/dream/smd/smd_rpcrouter_device.c
+ create mode 100644 drivers/staging/dream/smd/smd_rpcrouter_servers.c
+ create mode 100644 drivers/staging/dream/smd/smd_tty.c
+ create mode 100644 drivers/staging/dream/synaptics_i2c_rmi.c
+ create mode 100644 drivers/staging/dream/synaptics_i2c_rmi.h
+ delete mode 100644 drivers/staging/echo/bit_operations.h
+ delete mode 100644 drivers/staging/echo/mmx.h
+ delete mode 100644 drivers/staging/epl/Benchmark.h
+ delete mode 100644 drivers/staging/epl/Debug.h
+ delete mode 100644 drivers/staging/epl/Edrv8139.c
+ delete mode 100644 drivers/staging/epl/EdrvFec.h
+ delete mode 100644 drivers/staging/epl/EdrvSim.h
+ delete mode 100644 drivers/staging/epl/Epl.h
+ delete mode 100644 drivers/staging/epl/EplAmi.h
+ delete mode 100644 drivers/staging/epl/EplApiGeneric.c
+ delete mode 100644 drivers/staging/epl/EplApiLinux.h
+ delete mode 100644 drivers/staging/epl/EplApiLinuxKernel.c
+ delete mode 100644 drivers/staging/epl/EplApiProcessImage.c
+ delete mode 100644 drivers/staging/epl/EplCfg.h
+ delete mode 100644 drivers/staging/epl/EplDef.h
+ delete mode 100644 drivers/staging/epl/EplDll.h
+ delete mode 100644 drivers/staging/epl/EplDllCal.h
+ delete mode 100644 drivers/staging/epl/EplDllk.c
+ delete mode 100644 drivers/staging/epl/EplDllkCal.c
+ delete mode 100644 drivers/staging/epl/EplDlluCal.c
+ delete mode 100644 drivers/staging/epl/EplErrDef.h
+ delete mode 100644 drivers/staging/epl/EplErrorHandlerk.c
+ delete mode 100644 drivers/staging/epl/EplEvent.h
+ delete mode 100644 drivers/staging/epl/EplEventk.c
+ delete mode 100644 drivers/staging/epl/EplEventu.c
+ delete mode 100644 drivers/staging/epl/EplFrame.h
+ delete mode 100644 drivers/staging/epl/EplIdentu.c
+ delete mode 100644 drivers/staging/epl/EplInc.h
+ delete mode 100644 drivers/staging/epl/EplInstDef.h
+ delete mode 100644 drivers/staging/epl/EplLed.h
+ delete mode 100644 drivers/staging/epl/EplNmt.h
+ delete mode 100644 drivers/staging/epl/EplNmtCnu.c
+ delete mode 100644 drivers/staging/epl/EplNmtMnu.c
+ delete mode 100644 drivers/staging/epl/EplNmtk.c
+ delete mode 100644 drivers/staging/epl/EplNmtkCal.c
+ delete mode 100644 drivers/staging/epl/EplNmtu.c
+ delete mode 100644 drivers/staging/epl/EplNmtuCal.c
+ delete mode 100644 drivers/staging/epl/EplObd.c
+ delete mode 100644 drivers/staging/epl/EplObd.h
+ delete mode 100644 drivers/staging/epl/EplObdMacro.h
+ delete mode 100644 drivers/staging/epl/EplObdkCal.c
+ delete mode 100644 drivers/staging/epl/EplObdu.c
+ delete mode 100644 drivers/staging/epl/EplObduCal.c
+ delete mode 100644 drivers/staging/epl/EplPdo.h
+ delete mode 100644 drivers/staging/epl/EplPdok.c
+ delete mode 100644 drivers/staging/epl/EplPdokCal.c
+ delete mode 100644 drivers/staging/epl/EplPdou.c
+ delete mode 100644 drivers/staging/epl/EplSdo.h
+ delete mode 100644 drivers/staging/epl/EplSdoAc.h
+ delete mode 100644 drivers/staging/epl/EplSdoAsndu.c
+ delete mode 100644 drivers/staging/epl/EplSdoAsySequ.c
+ delete mode 100644 drivers/staging/epl/EplSdoComu.c
+ delete mode 100644 drivers/staging/epl/EplSdoUdpu.c
+ delete mode 100644 drivers/staging/epl/EplStatusu.c
+ delete mode 100644 drivers/staging/epl/EplTarget.h
+ delete mode 100644 drivers/staging/epl/EplTimer.h
+ delete mode 100644 drivers/staging/epl/EplTimeruLinuxKernel.c
+ delete mode 100644 drivers/staging/epl/EplVersion.h
+ delete mode 100644 drivers/staging/epl/Kconfig
+ delete mode 100644 drivers/staging/epl/Makefile
+ delete mode 100644 drivers/staging/epl/SharedBuff.c
+ delete mode 100644 drivers/staging/epl/SharedBuff.h
+ delete mode 100644 drivers/staging/epl/ShbIpc-LinuxKernel.c
+ delete mode 100644 drivers/staging/epl/ShbIpc.h
+ delete mode 100644 drivers/staging/epl/ShbLinuxKernel.h
+ delete mode 100644 drivers/staging/epl/SocketLinuxKernel.c
+ delete mode 100644 drivers/staging/epl/SocketLinuxKernel.h
+ delete mode 100644 drivers/staging/epl/TimerHighReskX86.c
+ delete mode 100644 drivers/staging/epl/VirtualEthernetLinux.c
+ delete mode 100644 drivers/staging/epl/amix86.c
+ delete mode 100644 drivers/staging/epl/demo_main.c
+ delete mode 100644 drivers/staging/epl/edrv.h
+ delete mode 100644 drivers/staging/epl/global.h
+ delete mode 100644 drivers/staging/epl/kernel/EplDllk.h
+ delete mode 100644 drivers/staging/epl/kernel/EplDllkCal.h
+ delete mode 100644 drivers/staging/epl/kernel/EplErrorHandlerk.h
+ delete mode 100644 drivers/staging/epl/kernel/EplEventk.h
+ delete mode 100644 drivers/staging/epl/kernel/EplNmtk.h
+ delete mode 100644 drivers/staging/epl/kernel/EplObdk.h
+ delete mode 100644 drivers/staging/epl/kernel/EplPdok.h
+ delete mode 100644 drivers/staging/epl/kernel/EplPdokCal.h
+ delete mode 100644 drivers/staging/epl/kernel/EplTimerHighResk.h
+ delete mode 100644 drivers/staging/epl/kernel/EplTimerk.h
+ delete mode 100644 drivers/staging/epl/kernel/VirtualEthernet.h
+ delete mode 100644 drivers/staging/epl/proc_fs.c
+ delete mode 100644 drivers/staging/epl/proc_fs.h
+ delete mode 100644 drivers/staging/epl/user/EplCfgMau.h
+ delete mode 100644 drivers/staging/epl/user/EplDllu.h
+ delete mode 100644 drivers/staging/epl/user/EplDlluCal.h
+ delete mode 100644 drivers/staging/epl/user/EplEventu.h
+ delete mode 100644 drivers/staging/epl/user/EplIdentu.h
+ delete mode 100644 drivers/staging/epl/user/EplLedu.h
+ delete mode 100644 drivers/staging/epl/user/EplNmtCnu.h
+ delete mode 100644 drivers/staging/epl/user/EplNmtMnu.h
+ delete mode 100644 drivers/staging/epl/user/EplNmtu.h
+ delete mode 100644 drivers/staging/epl/user/EplNmtuCal.h
+ delete mode 100644 drivers/staging/epl/user/EplObdu.h
+ delete mode 100644 drivers/staging/epl/user/EplObduCal.h
+ delete mode 100644 drivers/staging/epl/user/EplPdou.h
+ delete mode 100644 drivers/staging/epl/user/EplSdoAsndu.h
+ delete mode 100644 drivers/staging/epl/user/EplSdoAsySequ.h
+ delete mode 100644 drivers/staging/epl/user/EplSdoComu.h
+ delete mode 100644 drivers/staging/epl/user/EplSdoUdpu.h
+ delete mode 100644 drivers/staging/epl/user/EplStatusu.h
+ delete mode 100644 drivers/staging/epl/user/EplTimeru.h
+ delete mode 100644 drivers/staging/et131x/et1310_jagcore.c
+ delete mode 100644 drivers/staging/et131x/et131x_config.c
+ delete mode 100644 drivers/staging/et131x/et131x_debug.c
+ delete mode 100644 drivers/staging/et131x/et131x_debug.h
+ delete mode 100644 drivers/staging/heci/Kconfig
+ delete mode 100644 drivers/staging/heci/Makefile
+ delete mode 100644 drivers/staging/heci/TODO
+ delete mode 100644 drivers/staging/heci/heci.h
+ delete mode 100644 drivers/staging/heci/heci_data_structures.h
+ delete mode 100644 drivers/staging/heci/heci_init.c
+ delete mode 100644 drivers/staging/heci/heci_interface.c
+ delete mode 100644 drivers/staging/heci/heci_interface.h
+ delete mode 100644 drivers/staging/heci/heci_main.c
+ delete mode 100644 drivers/staging/heci/heci_version.h
+ delete mode 100644 drivers/staging/heci/interrupt.c
+ delete mode 100644 drivers/staging/heci/io_heci.c
+ create mode 100644 drivers/staging/hv/BlkVsc.c
+ create mode 100644 drivers/staging/hv/Channel.c
+ create mode 100644 drivers/staging/hv/Channel.h
+ create mode 100644 drivers/staging/hv/ChannelInterface.c
+ create mode 100644 drivers/staging/hv/ChannelInterface.h
+ create mode 100644 drivers/staging/hv/ChannelMgmt.c
+ create mode 100644 drivers/staging/hv/ChannelMgmt.h
+ create mode 100644 drivers/staging/hv/Connection.c
+ create mode 100644 drivers/staging/hv/Hv.c
+ create mode 100644 drivers/staging/hv/Hv.h
+ create mode 100644 drivers/staging/hv/Kconfig
+ create mode 100644 drivers/staging/hv/Makefile
+ create mode 100644 drivers/staging/hv/NetVsc.c
+ create mode 100644 drivers/staging/hv/NetVsc.h
+ create mode 100644 drivers/staging/hv/NetVscApi.h
+ create mode 100644 drivers/staging/hv/RingBuffer.c
+ create mode 100644 drivers/staging/hv/RingBuffer.h
+ create mode 100644 drivers/staging/hv/RndisFilter.c
+ create mode 100644 drivers/staging/hv/RndisFilter.h
+ create mode 100644 drivers/staging/hv/StorVsc.c
+ create mode 100644 drivers/staging/hv/StorVscApi.h
+ create mode 100644 drivers/staging/hv/TODO
+ create mode 100644 drivers/staging/hv/VersionInfo.h
+ create mode 100644 drivers/staging/hv/Vmbus.c
+ create mode 100644 drivers/staging/hv/VmbusApi.h
+ create mode 100644 drivers/staging/hv/VmbusChannelInterface.h
+ create mode 100644 drivers/staging/hv/VmbusPacketFormat.h
+ create mode 100644 drivers/staging/hv/VmbusPrivate.h
+ create mode 100644 drivers/staging/hv/blkvsc_drv.c
+ create mode 100644 drivers/staging/hv/hv_api.h
+ create mode 100644 drivers/staging/hv/logging.h
+ create mode 100644 drivers/staging/hv/netvsc_drv.c
+ create mode 100644 drivers/staging/hv/osd.c
+ create mode 100644 drivers/staging/hv/osd.h
+ create mode 100644 drivers/staging/hv/rndis.h
+ create mode 100644 drivers/staging/hv/storvsc_drv.c
+ create mode 100644 drivers/staging/hv/vmbus.h
+ create mode 100644 drivers/staging/hv/vmbus_drv.c
+ create mode 100644 drivers/staging/hv/vstorage.h
+ create mode 100644 drivers/staging/iio/Documentation/device.txt
+ create mode 100644 drivers/staging/iio/Documentation/iio_utils.h
+ create mode 100644 drivers/staging/iio/Documentation/lis3l02dqbuffersimple.c
+ create mode 100644 drivers/staging/iio/Documentation/overview.txt
+ create mode 100644 drivers/staging/iio/Documentation/ring.txt
+ create mode 100644 drivers/staging/iio/Documentation/trigger.txt
+ create mode 100644 drivers/staging/iio/Documentation/userspace.txt
+ create mode 100644 drivers/staging/iio/Kconfig
+ create mode 100644 drivers/staging/iio/Makefile
+ create mode 100644 drivers/staging/iio/TODO
+ create mode 100644 drivers/staging/iio/accel/Kconfig
+ create mode 100644 drivers/staging/iio/accel/Makefile
+ create mode 100644 drivers/staging/iio/accel/accel.h
+ create mode 100644 drivers/staging/iio/accel/kxsd9.c
+ create mode 100644 drivers/staging/iio/accel/lis3l02dq.h
+ create mode 100644 drivers/staging/iio/accel/lis3l02dq_core.c
+ create mode 100644 drivers/staging/iio/accel/lis3l02dq_ring.c
+ create mode 100644 drivers/staging/iio/accel/sca3000.h
+ create mode 100644 drivers/staging/iio/accel/sca3000_core.c
+ create mode 100644 drivers/staging/iio/accel/sca3000_ring.c
+ create mode 100644 drivers/staging/iio/adc/Kconfig
+ create mode 100644 drivers/staging/iio/adc/Makefile
+ create mode 100644 drivers/staging/iio/adc/adc.h
+ create mode 100644 drivers/staging/iio/adc/max1363.h
+ create mode 100644 drivers/staging/iio/adc/max1363_core.c
+ create mode 100644 drivers/staging/iio/adc/max1363_ring.c
+ create mode 100644 drivers/staging/iio/chrdev.h
+ create mode 100644 drivers/staging/iio/iio.h
+ create mode 100644 drivers/staging/iio/industrialio-core.c
+ create mode 100644 drivers/staging/iio/industrialio-ring.c
+ create mode 100644 drivers/staging/iio/industrialio-trigger.c
+ create mode 100644 drivers/staging/iio/light/Kconfig
+ create mode 100644 drivers/staging/iio/light/Makefile
+ create mode 100644 drivers/staging/iio/light/light.h
+ create mode 100644 drivers/staging/iio/light/tsl2561.c
+ create mode 100644 drivers/staging/iio/ring_generic.h
+ create mode 100644 drivers/staging/iio/ring_hw.h
+ create mode 100644 drivers/staging/iio/ring_sw.c
+ create mode 100644 drivers/staging/iio/ring_sw.h
+ create mode 100644 drivers/staging/iio/sysfs.h
+ create mode 100644 drivers/staging/iio/trigger.h
+ create mode 100644 drivers/staging/iio/trigger/Kconfig
+ create mode 100644 drivers/staging/iio/trigger/Makefile
+ create mode 100644 drivers/staging/iio/trigger/iio-trig-gpio.c
+ create mode 100644 drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
+ create mode 100644 drivers/staging/iio/trigger_consumer.h
+ delete mode 100644 drivers/staging/me4000/Kconfig
+ delete mode 100644 drivers/staging/me4000/Makefile
+ delete mode 100644 drivers/staging/me4000/README
+ delete mode 100644 drivers/staging/me4000/me4000.c
+ delete mode 100644 drivers/staging/me4000/me4000.h
+ delete mode 100644 drivers/staging/me4000/me4000_firmware.h
+ delete mode 100644 drivers/staging/me4000/me4610_firmware.h
+ delete mode 100644 drivers/staging/meilhaus/Kconfig
+ delete mode 100644 drivers/staging/meilhaus/Makefile
+ delete mode 100644 drivers/staging/meilhaus/TODO
+ delete mode 100644 drivers/staging/meilhaus/me0600_device.c
+ delete mode 100644 drivers/staging/meilhaus/me0600_device.h
+ delete mode 100644 drivers/staging/meilhaus/me0600_dio.c
+ delete mode 100644 drivers/staging/meilhaus/me0600_dio.h
+ delete mode 100644 drivers/staging/meilhaus/me0600_dio_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me0600_ext_irq.c
+ delete mode 100644 drivers/staging/meilhaus/me0600_ext_irq.h
+ delete mode 100644 drivers/staging/meilhaus/me0600_ext_irq_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me0600_optoi.c
+ delete mode 100644 drivers/staging/meilhaus/me0600_optoi.h
+ delete mode 100644 drivers/staging/meilhaus/me0600_optoi_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me0600_relay.c
+ delete mode 100644 drivers/staging/meilhaus/me0600_relay.h
+ delete mode 100644 drivers/staging/meilhaus/me0600_relay_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me0600_ttli.c
+ delete mode 100644 drivers/staging/meilhaus/me0600_ttli.h
+ delete mode 100644 drivers/staging/meilhaus/me0600_ttli_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me0900_device.c
+ delete mode 100644 drivers/staging/meilhaus/me0900_device.h
+ delete mode 100644 drivers/staging/meilhaus/me0900_di.c
+ delete mode 100644 drivers/staging/meilhaus/me0900_di.h
+ delete mode 100644 drivers/staging/meilhaus/me0900_do.c
+ delete mode 100644 drivers/staging/meilhaus/me0900_do.h
+ delete mode 100644 drivers/staging/meilhaus/me0900_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me1000_device.c
+ delete mode 100644 drivers/staging/meilhaus/me1000_device.h
+ delete mode 100644 drivers/staging/meilhaus/me1000_dio.c
+ delete mode 100644 drivers/staging/meilhaus/me1000_dio.h
+ delete mode 100644 drivers/staging/meilhaus/me1000_dio_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me1400_device.c
+ delete mode 100644 drivers/staging/meilhaus/me1400_device.h
+ delete mode 100644 drivers/staging/meilhaus/me1400_ext_irq.c
+ delete mode 100644 drivers/staging/meilhaus/me1400_ext_irq.h
+ delete mode 100644 drivers/staging/meilhaus/me1400_ext_irq_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me1600_ao.c
+ delete mode 100644 drivers/staging/meilhaus/me1600_ao.h
+ delete mode 100644 drivers/staging/meilhaus/me1600_ao_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me1600_device.c
+ delete mode 100644 drivers/staging/meilhaus/me1600_device.h
+ delete mode 100644 drivers/staging/meilhaus/me4600_ai.c
+ delete mode 100644 drivers/staging/meilhaus/me4600_ai.h
+ delete mode 100644 drivers/staging/meilhaus/me4600_ai_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me4600_ao.c
+ delete mode 100644 drivers/staging/meilhaus/me4600_ao.h
+ delete mode 100644 drivers/staging/meilhaus/me4600_ao_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me4600_device.c
+ delete mode 100644 drivers/staging/meilhaus/me4600_device.h
+ delete mode 100644 drivers/staging/meilhaus/me4600_di.c
+ delete mode 100644 drivers/staging/meilhaus/me4600_di.h
+ delete mode 100644 drivers/staging/meilhaus/me4600_dio.c
+ delete mode 100644 drivers/staging/meilhaus/me4600_dio.h
+ delete mode 100644 drivers/staging/meilhaus/me4600_dio_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me4600_do.c
+ delete mode 100644 drivers/staging/meilhaus/me4600_do.h
+ delete mode 100644 drivers/staging/meilhaus/me4600_ext_irq.c
+ delete mode 100644 drivers/staging/meilhaus/me4600_ext_irq.h
+ delete mode 100644 drivers/staging/meilhaus/me4600_ext_irq_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me4600_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me6000_ao.c
+ delete mode 100644 drivers/staging/meilhaus/me6000_ao.h
+ delete mode 100644 drivers/staging/meilhaus/me6000_ao_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me6000_device.c
+ delete mode 100644 drivers/staging/meilhaus/me6000_device.h
+ delete mode 100644 drivers/staging/meilhaus/me6000_dio.c
+ delete mode 100644 drivers/staging/meilhaus/me6000_dio.h
+ delete mode 100644 drivers/staging/meilhaus/me6000_dio_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me6000_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me8100_device.c
+ delete mode 100644 drivers/staging/meilhaus/me8100_device.h
+ delete mode 100644 drivers/staging/meilhaus/me8100_di.c
+ delete mode 100644 drivers/staging/meilhaus/me8100_di.h
+ delete mode 100644 drivers/staging/meilhaus/me8100_di_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me8100_do.c
+ delete mode 100644 drivers/staging/meilhaus/me8100_do.h
+ delete mode 100644 drivers/staging/meilhaus/me8100_do_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me8100_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me8200_device.c
+ delete mode 100644 drivers/staging/meilhaus/me8200_device.h
+ delete mode 100644 drivers/staging/meilhaus/me8200_di.c
+ delete mode 100644 drivers/staging/meilhaus/me8200_di.h
+ delete mode 100644 drivers/staging/meilhaus/me8200_di_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me8200_dio.c
+ delete mode 100644 drivers/staging/meilhaus/me8200_dio.h
+ delete mode 100644 drivers/staging/meilhaus/me8200_dio_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me8200_do.c
+ delete mode 100644 drivers/staging/meilhaus/me8200_do.h
+ delete mode 100644 drivers/staging/meilhaus/me8200_do_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me8200_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me8254.c
+ delete mode 100644 drivers/staging/meilhaus/me8254.h
+ delete mode 100644 drivers/staging/meilhaus/me8254_reg.h
+ delete mode 100644 drivers/staging/meilhaus/me8255.c
+ delete mode 100644 drivers/staging/meilhaus/me8255.h
+ delete mode 100644 drivers/staging/meilhaus/me8255_reg.h
+ delete mode 100644 drivers/staging/meilhaus/mecirc_buf.h
+ delete mode 100644 drivers/staging/meilhaus/mecommon.h
+ delete mode 100644 drivers/staging/meilhaus/medebug.h
+ delete mode 100644 drivers/staging/meilhaus/medefines.h
+ delete mode 100644 drivers/staging/meilhaus/medevice.c
+ delete mode 100644 drivers/staging/meilhaus/medevice.h
+ delete mode 100644 drivers/staging/meilhaus/medlist.c
+ delete mode 100644 drivers/staging/meilhaus/medlist.h
+ delete mode 100644 drivers/staging/meilhaus/medlock.c
+ delete mode 100644 drivers/staging/meilhaus/medlock.h
+ delete mode 100644 drivers/staging/meilhaus/medriver.h
+ delete mode 100644 drivers/staging/meilhaus/medummy.c
+ delete mode 100644 drivers/staging/meilhaus/medummy.h
+ delete mode 100644 drivers/staging/meilhaus/meerror.h
+ delete mode 100644 drivers/staging/meilhaus/mefirmware.c
+ delete mode 100644 drivers/staging/meilhaus/mefirmware.h
+ delete mode 100644 drivers/staging/meilhaus/meids.h
+ delete mode 100644 drivers/staging/meilhaus/meinternal.h
+ delete mode 100644 drivers/staging/meilhaus/meioctl.h
+ delete mode 100644 drivers/staging/meilhaus/memain.c
+ delete mode 100644 drivers/staging/meilhaus/memain.h
+ delete mode 100644 drivers/staging/meilhaus/meplx_reg.h
+ delete mode 100644 drivers/staging/meilhaus/meslist.c
+ delete mode 100644 drivers/staging/meilhaus/meslist.h
+ delete mode 100644 drivers/staging/meilhaus/meslock.c
+ delete mode 100644 drivers/staging/meilhaus/meslock.h
+ delete mode 100644 drivers/staging/meilhaus/mesubdevice.c
+ delete mode 100644 drivers/staging/meilhaus/mesubdevice.h
+ delete mode 100644 drivers/staging/meilhaus/metempl_device.c
+ delete mode 100644 drivers/staging/meilhaus/metempl_device.h
+ delete mode 100644 drivers/staging/meilhaus/metempl_sub.c
+ delete mode 100644 drivers/staging/meilhaus/metempl_sub.h
+ delete mode 100644 drivers/staging/meilhaus/metempl_sub_reg.h
+ delete mode 100644 drivers/staging/meilhaus/metypes.h
+ delete mode 100644 drivers/staging/pata_rdc/Kconfig
+ delete mode 100644 drivers/staging/pata_rdc/Makefile
+ delete mode 100644 drivers/staging/pata_rdc/pata_rdc.c
+ delete mode 100644 drivers/staging/pata_rdc/pata_rdc.h
+ create mode 100644 drivers/staging/quatech_usb2/Kconfig
+ create mode 100644 drivers/staging/quatech_usb2/Makefile
+ create mode 100644 drivers/staging/quatech_usb2/TODO
+ create mode 100644 drivers/staging/quatech_usb2/quatech_usb2.c
+ create mode 100644 drivers/staging/rar/Kconfig
+ create mode 100644 drivers/staging/rar/Makefile
+ create mode 100644 drivers/staging/rar/rar_driver.c
+ create mode 100644 drivers/staging/rar/rar_driver.h
+ delete mode 100644 drivers/staging/rspiusb/Kconfig
+ delete mode 100644 drivers/staging/rspiusb/Makefile
+ delete mode 100644 drivers/staging/rspiusb/TODO
+ delete mode 100644 drivers/staging/rspiusb/rspiusb.c
+ delete mode 100644 drivers/staging/rspiusb/rspiusb.h
+ delete mode 100644 drivers/staging/rt2870/common/firmware.h
+ delete mode 100644 drivers/staging/rt2870/link_list.h
+ delete mode 100644 drivers/staging/rt3070/2870_main_dev.c
+ delete mode 100644 drivers/staging/rt3070/Kconfig
+ delete mode 100644 drivers/staging/rt3070/Makefile
+ delete mode 100644 drivers/staging/rt3070/action.h
+ delete mode 100644 drivers/staging/rt3070/aironet.h
+ delete mode 100644 drivers/staging/rt3070/ap.h
+ delete mode 100644 drivers/staging/rt3070/chlist.h
+ delete mode 100644 drivers/staging/rt3070/common/2870_rtmp_init.c
+ delete mode 100644 drivers/staging/rt3070/common/action.c
+ delete mode 100644 drivers/staging/rt3070/common/ba_action.c
+ delete mode 100644 drivers/staging/rt3070/common/cmm_data.c
+ delete mode 100644 drivers/staging/rt3070/common/cmm_data_2870.c
+ delete mode 100644 drivers/staging/rt3070/common/cmm_info.c
+ delete mode 100644 drivers/staging/rt3070/common/cmm_sanity.c
+ delete mode 100644 drivers/staging/rt3070/common/cmm_sync.c
+ delete mode 100644 drivers/staging/rt3070/common/cmm_wpa.c
+ delete mode 100644 drivers/staging/rt3070/common/dfs.c
+ delete mode 100644 drivers/staging/rt3070/common/eeprom.c
+ delete mode 100644 drivers/staging/rt3070/common/md5.c
+ delete mode 100644 drivers/staging/rt3070/common/mlme.c
+ delete mode 100644 drivers/staging/rt3070/common/rtmp_init.c
+ delete mode 100644 drivers/staging/rt3070/common/rtmp_tkip.c
+ delete mode 100644 drivers/staging/rt3070/common/rtmp_wep.c
+ delete mode 100644 drivers/staging/rt3070/common/rtusb_bulk.c
+ delete mode 100644 drivers/staging/rt3070/common/rtusb_data.c
+ delete mode 100644 drivers/staging/rt3070/common/rtusb_io.c
+ delete mode 100644 drivers/staging/rt3070/common/spectrum.c
+ delete mode 100644 drivers/staging/rt3070/dfs.h
+ delete mode 100644 drivers/staging/rt3070/link_list.h
+ delete mode 100644 drivers/staging/rt3070/md5.h
+ delete mode 100644 drivers/staging/rt3070/mlme.h
+ delete mode 100644 drivers/staging/rt3070/oid.h
+ delete mode 100644 drivers/staging/rt3070/rt2870.h
+ delete mode 100644 drivers/staging/rt3070/rt28xx.h
+ delete mode 100644 drivers/staging/rt3070/rt_config.h
+ delete mode 100644 drivers/staging/rt3070/rt_linux.c
+ delete mode 100644 drivers/staging/rt3070/rt_linux.h
+ delete mode 100644 drivers/staging/rt3070/rt_main_dev.c
+ delete mode 100644 drivers/staging/rt3070/rt_profile.c
+ delete mode 100644 drivers/staging/rt3070/rtmp.h
+ delete mode 100644 drivers/staging/rt3070/rtmp_ckipmic.h
+ delete mode 100644 drivers/staging/rt3070/rtmp_def.h
+ delete mode 100644 drivers/staging/rt3070/rtmp_type.h
+ delete mode 100644 drivers/staging/rt3070/spectrum.h
+ delete mode 100644 drivers/staging/rt3070/spectrum_def.h
+ delete mode 100644 drivers/staging/rt3070/sta/aironet.c
+ delete mode 100644 drivers/staging/rt3070/sta/assoc.c
+ delete mode 100644 drivers/staging/rt3070/sta/auth.c
+ delete mode 100644 drivers/staging/rt3070/sta/auth_rsp.c
+ delete mode 100644 drivers/staging/rt3070/sta/connect.c
+ delete mode 100644 drivers/staging/rt3070/sta/rtmp_data.c
+ delete mode 100644 drivers/staging/rt3070/sta/sanity.c
+ delete mode 100644 drivers/staging/rt3070/sta/sync.c
+ delete mode 100644 drivers/staging/rt3070/sta/wpa.c
+ delete mode 100644 drivers/staging/rt3070/sta_ioctl.c
+ delete mode 100644 drivers/staging/rt3070/wpa.h
+ create mode 100644 drivers/staging/rt3090/Kconfig
+ create mode 100644 drivers/staging/rt3090/Makefile
+ copy drivers/staging/{rt2860/md4.h => rt3090/action.h} (66%)
+ create mode 100644 drivers/staging/rt3090/ap.h
+ create mode 100644 drivers/staging/rt3090/ap_apcli.h
+ copy drivers/staging/{rt2870/md4.h => rt3090/ap_autoChSel.h} (57%)
+ copy drivers/staging/{rt2870/md4.h => rt3090/ap_autoChSel_cmm.h} (62%)
+ create mode 100644 drivers/staging/rt3090/ap_cfg.h
+ copy drivers/staging/{rt2860/md4.h => rt3090/ap_ids.h} (56%)
+ copy drivers/staging/{rt2860/md4.h => rt3090/ap_mbss.h} (62%)
+ create mode 100644 drivers/staging/rt3090/ap_uapsd.h
+ create mode 100644 drivers/staging/rt3090/ap_wds.h
+ create mode 100644 drivers/staging/rt3090/chips/rt3090.c
+ create mode 100644 drivers/staging/rt3090/chips/rt30xx.c
+ create mode 100644 drivers/staging/rt3090/chips/rt3370.c
+ create mode 100644 drivers/staging/rt3090/chips/rt3390.c
+ create mode 100644 drivers/staging/rt3090/chips/rt33xx.c
+ create mode 100644 drivers/staging/rt3090/chlist.h
+ create mode 100644 drivers/staging/rt3090/common/action.c
+ create mode 100644 drivers/staging/rt3090/common/ba_action.c
+ create mode 100644 drivers/staging/rt3090/common/cmm_aes.c
+ create mode 100644 drivers/staging/rt3090/common/cmm_asic.c
+ create mode 100644 drivers/staging/rt3090/common/cmm_cfg.c
+ create mode 100644 drivers/staging/rt3090/common/cmm_data.c
+ create mode 100644 drivers/staging/rt3090/common/cmm_data_pci.c
+ create mode 100644 drivers/staging/rt3090/common/cmm_info.c
+ create mode 100644 drivers/staging/rt3090/common/cmm_mac_pci.c
+ create mode 100644 drivers/staging/rt3090/common/cmm_profile.c
+ create mode 100644 drivers/staging/rt3090/common/cmm_sanity.c
+ create mode 100644 drivers/staging/rt3090/common/cmm_sync.c
+ create mode 100644 drivers/staging/rt3090/common/cmm_tkip.c
+ create mode 100644 drivers/staging/rt3090/common/cmm_wep.c
+ create mode 100644 drivers/staging/rt3090/common/cmm_wpa.c
+ create mode 100644 drivers/staging/rt3090/common/crypt_aes.c
+ create mode 100644 drivers/staging/rt3090/common/crypt_biginteger.c
+ create mode 100644 drivers/staging/rt3090/common/crypt_dh.c
+ create mode 100644 drivers/staging/rt3090/common/crypt_hmac.c
+ create mode 100644 drivers/staging/rt3090/common/crypt_md5.c
+ create mode 100644 drivers/staging/rt3090/common/crypt_sha2.c
+ create mode 100644 drivers/staging/rt3090/common/dfs.c
+ create mode 100644 drivers/staging/rt3090/common/ee_efuse.c
+ create mode 100644 drivers/staging/rt3090/common/ee_prom.c
+ create mode 100644 drivers/staging/rt3090/common/eeprom.c
+ create mode 100644 drivers/staging/rt3090/common/igmp_snoop.c
+ create mode 100644 drivers/staging/rt3090/common/mlme.c
+ create mode 100644 drivers/staging/rt3090/common/mlme_ex.c
+ create mode 100644 drivers/staging/rt3090/common/netif_block.c
+ create mode 100644 drivers/staging/rt3090/common/rt_channel.c
+ create mode 100644 drivers/staging/rt3090/common/rt_rf.c
+ create mode 100644 drivers/staging/rt3090/common/rtmp_init.c
+ create mode 100644 drivers/staging/rt3090/common/rtmp_mcu.c
+ create mode 100644 drivers/staging/rt3090/common/rtmp_timer.c
+ create mode 100644 drivers/staging/rt3090/common/spectrum.c
+ create mode 100644 drivers/staging/rt3090/config.mk
+ copy drivers/staging/{rt2860/md4.h => rt3090/crypt_hmac.h} (54%)
+ copy drivers/staging/{rt2860/md4.h => rt3090/crypt_md5.h} (54%)
+ create mode 100644 drivers/staging/rt3090/crypt_sha2.h
+ create mode 100644 drivers/staging/rt3090/dfs.h
+ create mode 100644 drivers/staging/rt3090/eeprom.h
+ create mode 100644 drivers/staging/rt3090/firmware.h
+ create mode 100644 drivers/staging/rt3090/igmp_snoop.h
+ create mode 100644 drivers/staging/rt3090/ipv6.h
+ rename drivers/staging/{rt2860 => rt3090}/link_list.h (99%)
+ create mode 100644 drivers/staging/rt3090/mac_pci.h
+ create mode 100644 drivers/staging/rt3090/mlme.h
+ copy drivers/staging/{rt2870/md4.h => rt3090/mlme_ex.h} (56%)
+ copy drivers/staging/{rt2860/md4.h => rt3090/mlme_ex_def.h} (67%)
+ copy drivers/staging/{rt2860/md4.h => rt3090/netif_block.h} (72%)
+ create mode 100644 drivers/staging/rt3090/oid.h
+ create mode 100644 drivers/staging/rt3090/pci_main_dev.c
+ copy drivers/staging/{rt2870/md4.h => rt3090/rt3090.h} (55%)
+ copy drivers/staging/{rt2860/md4.h => rt3090/rt30xx.h} (79%)
+ copy drivers/staging/{rt2870/md4.h => rt3090/rt3370.h} (65%)
+ copy drivers/staging/{rt2870/md4.h => rt3090/rt3390.h} (55%)
+ rename drivers/staging/{rt2870/md4.h => rt3090/rt33xx.h} (79%)
+ create mode 100644 drivers/staging/rt3090/rt_ate.c
+ create mode 100644 drivers/staging/rt3090/rt_ate.h
+ create mode 100644 drivers/staging/rt3090/rt_config.h
+ create mode 100644 drivers/staging/rt3090/rt_linux.c
+ create mode 100644 drivers/staging/rt3090/rt_linux.h
+ create mode 100644 drivers/staging/rt3090/rt_main_dev.c
+ create mode 100644 drivers/staging/rt3090/rt_pci_rbus.c
+ create mode 100644 drivers/staging/rt3090/rt_profile.c
+ create mode 100644 drivers/staging/rt3090/rtmp.h
+ create mode 100644 drivers/staging/rt3090/rtmp_chip.h
+ create mode 100644 drivers/staging/rt3090/rtmp_def.h
+ create mode 100644 drivers/staging/rt3090/rtmp_dot11.h
+ copy drivers/staging/{rt2860/md4.h => rt3090/rtmp_iface.h} (56%)
+ create mode 100644 drivers/staging/rt3090/rtmp_mac.h
+ copy drivers/staging/{rt2860/md4.h => rt3090/rtmp_mcu.h} (73%)
+ create mode 100644 drivers/staging/rt3090/rtmp_os.h
+ create mode 100644 drivers/staging/rt3090/rtmp_pci.h
+ create mode 100644 drivers/staging/rt3090/rtmp_phy.h
+ create mode 100644 drivers/staging/rt3090/rtmp_timer.h
+ create mode 100644 drivers/staging/rt3090/rtmp_type.h
+ create mode 100644 drivers/staging/rt3090/spectrum.h
+ create mode 100644 drivers/staging/rt3090/spectrum_def.h
+ create mode 100644 drivers/staging/rt3090/sta/assoc.c
+ create mode 100644 drivers/staging/rt3090/sta/auth.c
+ create mode 100644 drivers/staging/rt3090/sta/auth_rsp.c
+ create mode 100644 drivers/staging/rt3090/sta/connect.c
+ create mode 100644 drivers/staging/rt3090/sta/dls.c
+ create mode 100644 drivers/staging/rt3090/sta/rtmp_ckipmic.c
+ create mode 100644 drivers/staging/rt3090/sta/rtmp_data.c
+ create mode 100644 drivers/staging/rt3090/sta/sanity.c
+ create mode 100644 drivers/staging/rt3090/sta/sync.c
+ create mode 100644 drivers/staging/rt3090/sta/wpa.c
+ create mode 100644 drivers/staging/rt3090/sta_ioctl.c
+ rename drivers/staging/{rt2860/md4.h => rt3090/vr_ikans.h} (59%)
+ create mode 100644 drivers/staging/rt3090/wpa.h
+ create mode 100644 drivers/staging/rtl8187se/TODO
+ delete mode 100644 drivers/staging/rtl8187se/dot11d.h
+ delete mode 100644 drivers/staging/rtl8187se/ieee80211.h
+ delete mode 100644 drivers/staging/rtl8187se/ieee80211/internal.h
+ delete mode 100644 drivers/staging/rtl8187se/ieee80211/rtl_crypto.h
+ delete mode 100644 drivers/staging/rtl8187se/r8180_gct.c
+ delete mode 100644 drivers/staging/rtl8187se/r8180_max2820.c
+ delete mode 100644 drivers/staging/rtl8187se/r8180_max2820.h
+ delete mode 100644 drivers/staging/rtl8187se/r8180_pm.c
+ delete mode 100644 drivers/staging/rtl8187se/r8180_rtl8225.c
+ delete mode 100644 drivers/staging/rtl8187se/r8180_rtl8255.c
+ delete mode 100644 drivers/staging/rtl8187se/r8180_rtl8255.h
+ delete mode 100644 drivers/staging/rtl8187se/r8180_sa2400.c
+ delete mode 100644 drivers/staging/rtl8187se/r8180_sa2400.h
+ create mode 100644 drivers/staging/rtl8192e/Kconfig
+ create mode 100644 drivers/staging/rtl8192e/Makefile
+ copy drivers/staging/{rtl8192su => rtl8192e}/dot11d.h (100%)
+ copy drivers/staging/{rtl8192su => rtl8192e}/ieee80211.h (92%)
+ create mode 100644 drivers/staging/rtl8192e/ieee80211/dot11d.c
+ rename drivers/staging/{rtl8192su => rtl8192e/ieee80211}/dot11d.h (100%)
+ rename drivers/staging/{rtl8192su => rtl8192e/ieee80211}/ieee80211.h (95%)
+ create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_crypt.c
+ rename drivers/staging/{rtl8192su => rtl8192e/ieee80211}/ieee80211_crypt.h (92%)
+ create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_ccmp.c
+ create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_tkip.c
+ create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_wep.c
+ create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
+ create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
+ create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
+ create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_softmac_wx.c
+ create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c
+ create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
+ create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h
+ create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c
+ create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h
+ create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c
+ create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h
+ create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h
+ create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c
+ rename drivers/staging/{rtl8192su => rtl8192e}/ieee80211/rtl_crypto.h (100%)
+ rename drivers/staging/{rtl8187se => rtl8192e}/ieee80211_crypt.h (100%)
+ create mode 100644 drivers/staging/rtl8192e/r8180_93cx6.c
+ create mode 100644 drivers/staging/rtl8192e/r8180_93cx6.h
+ create mode 100644 drivers/staging/rtl8192e/r8190_rtl8256.c
+ rename drivers/staging/{rtl8192su => rtl8192e}/r8190_rtl8256.h (65%)
+ create mode 100644 drivers/staging/rtl8192e/r8192E.h
+ create mode 100644 drivers/staging/rtl8192e/r8192E_core.c
+ create mode 100644 drivers/staging/rtl8192e/r8192E_dm.c
+ create mode 100644 drivers/staging/rtl8192e/r8192E_dm.h
+ rename drivers/staging/{rtl8192su/r8192U_hw.h => rtl8192e/r8192E_hw.h} (72%)
+ create mode 100644 drivers/staging/rtl8192e/r8192E_wx.c
+ rename drivers/staging/{rtl8187se/r8180_gct.h => rtl8192e/r8192E_wx.h} (52%)
+ create mode 100644 drivers/staging/rtl8192e/r8192_pm.c
+ rename drivers/staging/{rtl8187se/r8180_pm.h => rtl8192e/r8192_pm.h} (52%)
+ create mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.c
+ create mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.h
+ create mode 100644 drivers/staging/rtl8192e/r819xE_firmware.c
+ rename drivers/staging/{rtl8192su/r819xU_phy.c => rtl8192e/r819xE_phy.c} (50%)
+ rename drivers/staging/{rtl8192su/r819xU_phy.h => rtl8192e/r819xE_phy.h} (61%)
+ rename drivers/staging/{rtl8192su/r819xU_phyreg.h => rtl8192e/r819xE_phyreg.h} (99%)
+ create mode 100644 drivers/staging/rtl8192su/TODO
+ delete mode 100644 drivers/staging/rtl8192su/ieee80211/EndianFree.h
+ delete mode 100644 drivers/staging/rtl8192su/ieee80211/aes.c
+ delete mode 100644 drivers/staging/rtl8192su/ieee80211/api.c
+ delete mode 100644 drivers/staging/rtl8192su/ieee80211/arc4.c
+ delete mode 100644 drivers/staging/rtl8192su/ieee80211/autoload.c
+ delete mode 100644 drivers/staging/rtl8192su/ieee80211/cipher.c
+ delete mode 100644 drivers/staging/rtl8192su/ieee80211/compress.c
+ delete mode 100644 drivers/staging/rtl8192su/ieee80211/crypto_compat.h
+ delete mode 100644 drivers/staging/rtl8192su/ieee80211/digest.c
+ create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_r8192s.h
+ delete mode 100644 drivers/staging/rtl8192su/ieee80211/internal.h
+ delete mode 100644 drivers/staging/rtl8192su/ieee80211/kmap_types.h
+ delete mode 100644 drivers/staging/rtl8192su/ieee80211/michael_mic.c
+ delete mode 100644 drivers/staging/rtl8192su/ieee80211/proc.c
+ delete mode 100644 drivers/staging/rtl8192su/ieee80211/scatterwalk.c
+ delete mode 100644 drivers/staging/rtl8192su/ieee80211/scatterwalk.h
+ delete mode 100644 drivers/staging/rtl8192su/r8190_rtl8256.c
+ delete mode 100644 drivers/staging/rtl8192su/r8192S_FwImgDTM.h
+ delete mode 100644 drivers/staging/rtl8192su/r819xU_firmware.c
+ delete mode 100644 drivers/staging/rtl8192su/r819xU_firmware.h
+ delete mode 100644 drivers/staging/rtl8192su/r819xU_firmware_img.c
+ delete mode 100644 drivers/staging/rtl8192su/r819xU_firmware_img.h
+ create mode 100644 drivers/staging/sep/Kconfig
+ create mode 100644 drivers/staging/sep/Makefile
+ create mode 100644 drivers/staging/sep/TODO
+ create mode 100644 drivers/staging/sep/sep_dev.h
+ create mode 100644 drivers/staging/sep/sep_driver.c
+ create mode 100644 drivers/staging/sep/sep_driver_api.h
+ create mode 100644 drivers/staging/sep/sep_driver_config.h
+ create mode 100644 drivers/staging/sep/sep_driver_hw_defs.h
+ delete mode 100644 drivers/staging/sxg/Kconfig
+ delete mode 100644 drivers/staging/sxg/Makefile
+ delete mode 100644 drivers/staging/sxg/README
+ delete mode 100644 drivers/staging/sxg/sxg.c
+ delete mode 100644 drivers/staging/sxg/sxg.h
+ delete mode 100644 drivers/staging/sxg/sxg_ethtool.c
+ delete mode 100644 drivers/staging/sxg/sxg_os.h
+ delete mode 100644 drivers/staging/sxg/sxgdbg.h
+ delete mode 100644 drivers/staging/sxg/sxghif.h
+ delete mode 100644 drivers/staging/sxg/sxghw.h
+ delete mode 100644 drivers/staging/sxg/sxgphycode-1.2.h
+ create mode 100644 drivers/staging/vme/Kconfig
+ create mode 100644 drivers/staging/vme/Makefile
+ create mode 100644 drivers/staging/vme/TODO
+ create mode 100644 drivers/staging/vme/bridges/Kconfig
+ create mode 100644 drivers/staging/vme/bridges/Makefile
+ create mode 100644 drivers/staging/vme/bridges/vme_ca91cx42.c
+ create mode 100644 drivers/staging/vme/bridges/vme_ca91cx42.h
+ create mode 100644 drivers/staging/vme/bridges/vme_tsi148.c
+ create mode 100644 drivers/staging/vme/bridges/vme_tsi148.h
+ create mode 100644 drivers/staging/vme/devices/Kconfig
+ create mode 100644 drivers/staging/vme/devices/Makefile
+ create mode 100644 drivers/staging/vme/devices/vme_user.c
+ create mode 100644 drivers/staging/vme/devices/vme_user.h
+ create mode 100644 drivers/staging/vme/vme.c
+ create mode 100644 drivers/staging/vme/vme.h
+ create mode 100644 drivers/staging/vme/vme_api.txt
+ create mode 100644 drivers/staging/vme/vme_bridge.h
+ delete mode 100644 drivers/staging/vt6655/Makefile.arm
+ delete mode 100644 drivers/staging/vt6655/Makefile.x86
+ create mode 100644 drivers/staging/vt6655/TODO
+ delete mode 100644 drivers/staging/vt6655/tpci.h
+ create mode 100644 drivers/staging/vt6656/80211hdr.h
+ create mode 100644 drivers/staging/vt6656/80211mgr.c
+ create mode 100644 drivers/staging/vt6656/80211mgr.h
+ create mode 100644 drivers/staging/vt6656/Kconfig
+ create mode 100644 drivers/staging/vt6656/Makefile
+ create mode 100644 drivers/staging/vt6656/TODO
+ create mode 100644 drivers/staging/vt6656/aes_ccmp.c
+ copy drivers/staging/{vt6655/tbit.h => vt6656/aes_ccmp.h} (58%)
+ create mode 100644 drivers/staging/vt6656/baseband.c
+ create mode 100644 drivers/staging/vt6656/baseband.h
+ create mode 100644 drivers/staging/vt6656/bssdb.c
+ create mode 100644 drivers/staging/vt6656/bssdb.h
+ create mode 100644 drivers/staging/vt6656/card.c
+ create mode 100644 drivers/staging/vt6656/card.h
+ create mode 100644 drivers/staging/vt6656/channel.c
+ copy drivers/staging/{vt6655/umem.h => vt6656/channel.h} (56%)
+ create mode 100644 drivers/staging/vt6656/control.c
+ copy drivers/staging/{vt6655/tbit.h => vt6656/control.h} (53%)
+ create mode 100644 drivers/staging/vt6656/country.h
+ create mode 100644 drivers/staging/vt6656/datarate.c
+ create mode 100644 drivers/staging/vt6656/datarate.h
+ create mode 100644 drivers/staging/vt6656/desc.h
+ create mode 100644 drivers/staging/vt6656/device.h
+ create mode 100644 drivers/staging/vt6656/device_cfg.h
+ create mode 100644 drivers/staging/vt6656/dpc.c
+ copy drivers/staging/{vt6655/umem.h => vt6656/dpc.h} (56%)
+ create mode 100644 drivers/staging/vt6656/firmware.c
+ copy drivers/staging/{vt6655/umem.h => vt6656/firmware.h} (56%)
+ create mode 100644 drivers/staging/vt6656/hostap.c
+ copy drivers/staging/{vt6655/umem.h => vt6656/hostap.h} (55%)
+ create mode 100644 drivers/staging/vt6656/int.c
+ copy drivers/staging/{vt6655/umem.h => vt6656/int.h} (56%)
+ create mode 100644 drivers/staging/vt6656/iocmd.h
+ create mode 100644 drivers/staging/vt6656/ioctl.c
+ copy drivers/staging/{vt6655/umem.h => vt6656/ioctl.h} (55%)
+ create mode 100644 drivers/staging/vt6656/iowpa.h
+ create mode 100644 drivers/staging/vt6656/iwctl.c
+ create mode 100644 drivers/staging/vt6656/iwctl.h
+ create mode 100644 drivers/staging/vt6656/kcompat.h
+ create mode 100644 drivers/staging/vt6656/key.c
+ create mode 100644 drivers/staging/vt6656/key.h
+ create mode 100644 drivers/staging/vt6656/mac.c
+ create mode 100644 drivers/staging/vt6656/mac.h
+ create mode 100644 drivers/staging/vt6656/main_usb.c
+ create mode 100644 drivers/staging/vt6656/mib.c
+ create mode 100644 drivers/staging/vt6656/mib.h
+ create mode 100644 drivers/staging/vt6656/michael.c
+ copy drivers/staging/{vt6655/tbit.h => vt6656/michael.h} (51%)
+ create mode 100644 drivers/staging/vt6656/power.c
+ copy drivers/staging/{vt6655/tbit.h => vt6656/power.h} (56%)
+ create mode 100644 drivers/staging/vt6656/rc4.c
+ create mode 100644 drivers/staging/vt6656/rc4.h
+ create mode 100644 drivers/staging/vt6656/rf.c
+ create mode 100644 drivers/staging/vt6656/rf.h
+ create mode 100644 drivers/staging/vt6656/rndis.h
+ create mode 100644 drivers/staging/vt6656/rxtx.c
+ create mode 100644 drivers/staging/vt6656/rxtx.h
+ create mode 100644 drivers/staging/vt6656/srom.h
+ create mode 100644 drivers/staging/vt6656/tcrc.c
+ copy drivers/staging/{vt6655/tbit.h => vt6656/tcrc.h} (59%)
+ create mode 100644 drivers/staging/vt6656/tether.c
+ create mode 100644 drivers/staging/vt6656/tether.h
+ create mode 100644 drivers/staging/vt6656/tkip.c
+ copy drivers/staging/{vt6655/tbit.h => vt6656/tkip.h} (62%)
+ create mode 100644 drivers/staging/vt6656/tmacro.h
+ create mode 100644 drivers/staging/vt6656/ttype.h
+ create mode 100644 drivers/staging/vt6656/upc.h
+ create mode 100644 drivers/staging/vt6656/usbpipe.c
+ copy drivers/staging/{vt6655/tbit.h => vt6656/usbpipe.h} (52%)
+ create mode 100644 drivers/staging/vt6656/vntconfiguration.dat
+ create mode 100644 drivers/staging/vt6656/wcmd.c
+ create mode 100644 drivers/staging/vt6656/wcmd.h
+ create mode 100644 drivers/staging/vt6656/wctl.c
+ create mode 100644 drivers/staging/vt6656/wctl.h
+ create mode 100644 drivers/staging/vt6656/wmgr.c
+ create mode 100644 drivers/staging/vt6656/wmgr.h
+ create mode 100644 drivers/staging/vt6656/wpa.c
+ copy drivers/staging/{vt6655/tbit.h => vt6656/wpa.h} (57%)
+ create mode 100644 drivers/staging/vt6656/wpa2.c
+ rename drivers/staging/{vt6655/umem.h => vt6656/wpa2.h} (56%)
+ create mode 100644 drivers/staging/vt6656/wpactl.c
+ rename drivers/staging/{vt6655/tbit.h => vt6656/wpactl.h} (54%)
+ create mode 100644 drivers/uio/uio_pci_generic.c
+ create mode 100644 include/linux/vgaarb.h
+Merging fixes/fixes
+$ git merge fixes/fixes
+Updating ab86e57..4afc3f3
+Fast forward
+ arch/x86/include/asm/processor.h | 2 ++
+ arch/x86/kernel/cpu/amd.c | 10 ++++++++++
+ drivers/edac/edac_mce_amd.c | 2 +-
+ 3 files changed, 13 insertions(+), 1 deletions(-)
+Merging arm-current/master
+$ git merge arm-current/master
+Merge made by recursive.
+ arch/arm/common/vic.c | 1 +
+ arch/arm/include/asm/cache.h | 2 +-
+ arch/arm/lib/copy_page.S | 16 ++++++++--------
+ arch/arm/mm/Kconfig | 5 +++++
+ 4 files changed, 15 insertions(+), 9 deletions(-)
+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 uptodate!
+Merge made by recursive.
+Merging sparc-current/master
+$ git merge sparc-current/master
+Removing drivers/video/console/.gitignore
+Removing drivers/video/console/prom.uni
+Removing drivers/video/console/promcon.c
+Merge made by recursive.
+ Documentation/dontdiff | 1 -
+ arch/sparc/configs/sparc32_defconfig | 44 ++-
+ arch/sparc/configs/sparc64_defconfig | 51 ++--
+ arch/sparc/kernel/setup_32.c | 2 -
+ arch/sparc/kernel/setup_64.c | 2 -
+ drivers/char/vt.c | 3 -
+ drivers/video/console/.gitignore | 2 -
+ drivers/video/console/Kconfig | 9 +-
+ drivers/video/console/Makefile | 12 -
+ drivers/video/console/prom.uni | 11 -
+ drivers/video/console/promcon.c | 598 ----------------------------------
+ scripts/Makefile | 1 -
+ 12 files changed, 56 insertions(+), 680 deletions(-)
+ delete mode 100644 drivers/video/console/.gitignore
+ delete mode 100644 drivers/video/console/prom.uni
+ delete mode 100644 drivers/video/console/promcon.c
+Merging scsi-rc-fixes/master
+$ git merge scsi-rc-fixes/master
+Already up-to-date.
+Merging net-current/master
+$ git merge net-current/master
+Auto-merging drivers/net/smc91x.h
+Auto-merging include/linux/netdevice.h
+Merge made by recursive.
+ drivers/net/bonding/bond_main.c | 9 +-
+ drivers/net/can/vcan.c | 2 +-
+ drivers/net/igb/e1000_82575.c | 198 ++++----
+ drivers/net/igb/e1000_82575.h | 2 +-
+ drivers/net/igb/e1000_defines.h | 2 +-
+ drivers/net/igb/e1000_phy.c | 5 +-
+ drivers/net/igb/igb_main.c | 2 +-
+ drivers/net/ixgbe/ixgbe_82598.c | 6 +-
+ drivers/net/ixgbe/ixgbe_82599.c | 3 +
+ drivers/net/ixgbe/ixgbe_main.c | 4 +
+ drivers/net/ixgbe/ixgbe_type.h | 2 +
+ drivers/net/mlx4/catas.c | 11 +-
+ drivers/net/pcmcia/pcnet_cs.c | 10 +-
+ drivers/net/pppol2tp.c | 4 +-
+ drivers/net/sky2.c | 24 +-
+ drivers/net/smc91x.h | 28 --
+ drivers/net/usb/cdc-phonet.c | 1 -
+ drivers/serial/serial_cs.c | 14 +-
+ firmware/Makefile | 3 +-
+ firmware/WHENCE | 12 +
+ firmware/cis/MT5634ZLX.cis.ihex | 11 +
+ firmware/cis/PCMLM28.cis.ihex | 18 +
+ firmware/cis/RS-COM-2P.cis.ihex | 10 +
+ include/keys/rxrpc-type.h | 107 ++++
+ include/linux/igmp.h | 2 +
+ include/linux/net.h | 5 +
+ include/linux/netdevice.h | 3 +-
+ include/linux/netlink.h | 4 +
+ include/linux/notifier.h | 2 +
+ include/linux/rxrpc.h | 7 +
+ include/net/addrconf.h | 2 +
+ include/net/protocol.h | 13 +-
+ include/net/sch_generic.h | 2 +-
+ include/net/tcp.h | 7 +
+ net/appletalk/ddp.c | 2 +-
+ net/can/af_can.c | 4 +-
+ net/core/dev.c | 4 +-
+ net/dccp/ccids/Kconfig | 6 +-
+ net/dccp/ccids/ccid2.c | 2 -
+ net/dccp/ccids/ccid2.h | 8 +-
+ net/dccp/ccids/ccid3.c | 5 +-
+ net/dccp/ccids/ccid3.h | 50 +-
+ net/dccp/ccids/lib/loss_interval.c | 7 +-
+ net/dccp/ccids/lib/loss_interval.h | 2 -
+ net/dccp/ccids/lib/packet_history.c | 4 +-
+ net/dccp/ccids/lib/packet_history.h | 1 -
+ net/dccp/ccids/lib/tfrc.h | 4 +-
+ net/dccp/ccids/lib/tfrc_equation.c | 26 +-
+ net/dccp/ipv4.c | 2 +-
+ net/dccp/ipv6.c | 4 +-
+ net/ipv4/af_inet.c | 18 +-
+ net/ipv4/ah4.c | 2 +-
+ net/ipv4/devinet.c | 6 +
+ net/ipv4/esp4.c | 2 +-
+ net/ipv4/icmp.c | 2 +-
+ net/ipv4/igmp.c | 22 +
+ net/ipv4/ip_gre.c | 2 +-
+ net/ipv4/ip_input.c | 2 +-
+ net/ipv4/ipcomp.c | 2 +-
+ net/ipv4/ipmr.c | 6 +-
+ net/ipv4/protocol.c | 6 +-
+ net/ipv4/tcp.c | 2 +-
+ net/ipv4/tcp_input.c | 2 +-
+ net/ipv4/tcp_ipv4.c | 4 +-
+ net/ipv4/tcp_minisocks.c | 4 +-
+ net/ipv4/tunnel4.c | 4 +-
+ net/ipv4/udplite.c | 2 +-
+ net/ipv6/addrconf.c | 19 +
+ net/ipv6/af_inet6.c | 10 +-
+ net/ipv6/ah6.c | 2 +-
+ net/ipv6/esp6.c | 2 +-
+ net/ipv6/exthdrs.c | 6 +-
+ net/ipv6/icmp.c | 4 +-
+ net/ipv6/ip6_input.c | 2 +-
+ net/ipv6/ip6mr.c | 6 +-
+ net/ipv6/ipcomp6.c | 2 +-
+ net/ipv6/mcast.c | 19 +
+ net/ipv6/protocol.c | 6 +-
+ net/ipv6/reassembly.c | 2 +-
+ net/ipv6/tcp_ipv6.c | 7 +-
+ net/ipv6/tunnel6.c | 4 +-
+ net/ipv6/udp.c | 2 +-
+ net/ipv6/udplite.c | 2 +-
+ net/iucv/af_iucv.c | 4 +-
+ net/netlink/af_netlink.c | 51 ++-
+ net/netlink/genetlink.c | 5 +-
+ net/phonet/pn_dev.c | 9 +-
+ net/rds/af_rds.c | 2 +-
+ net/rose/af_rose.c | 4 +-
+ net/rxrpc/ar-ack.c | 6 +-
+ net/rxrpc/ar-internal.h | 32 +-
+ net/rxrpc/ar-key.c | 914 +++++++++++++++++++++++++++++++++--
+ net/rxrpc/ar-security.c | 8 +-
+ net/rxrpc/rxkad.c | 47 +-
+ net/sched/sch_api.c | 29 +-
+ net/sched/sch_mq.c | 13 +-
+ net/sctp/ipv6.c | 2 +-
+ net/sctp/protocol.c | 2 +-
+ net/socket.c | 1 +
+ 99 files changed, 1526 insertions(+), 452 deletions(-)
+ create mode 100644 firmware/cis/MT5634ZLX.cis.ihex
+ create mode 100644 firmware/cis/PCMLM28.cis.ihex
+ create mode 100644 firmware/cis/RS-COM-2P.cis.ihex
+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
+Already up-to-date.
+Merging wireless-current/master
+$ git merge wireless-current/master
+Already up-to-date.
+Merging kbuild-current/master
+$ git merge kbuild-current/master
+Already up-to-date.
+Merging quilt/driver-core.current
+$ git merge quilt/driver-core.current
+Already up-to-date.
+Merging quilt/tty.current
+$ git merge quilt/tty.current
+Recorded preimage for 'drivers/serial/serial_cs.c'
+Auto-merging drivers/serial/serial_cs.c
+CONFLICT (content): Merge conflict in drivers/serial/serial_cs.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/serial/serial_cs.c'.
+[master c5e0322] Merge branch 'quilt/tty.current'
+$ git diff -M --stat --summary HEAD^..
+ drivers/isdn/gigaset/interface.c | 19 +++++++------------
+ drivers/serial/bfin_5xx.c | 4 ++++
+ drivers/serial/serial_cs.c | 1 +
+ 3 files changed, 12 insertions(+), 12 deletions(-)
+Merging quilt/usb.current
+$ git merge quilt/usb.current
+Merge made by recursive.
+ drivers/usb/class/cdc-acm.c | 2 +
+ drivers/usb/class/cdc-wdm.c | 30 +++-
+ drivers/usb/core/config.c | 2 +-
+ drivers/usb/host/sl811-hcd.c | 8 +-
+ drivers/usb/host/xhci-dbg.c | 5 +-
+ drivers/usb/host/xhci-hcd.c | 370 ++++++++++++++++++++++++++++++++--------
+ drivers/usb/host/xhci-mem.c | 64 +++++++-
+ drivers/usb/host/xhci-pci.c | 13 ++
+ drivers/usb/host/xhci-ring.c | 232 ++++++++++++++++++++++---
+ drivers/usb/host/xhci.h | 41 ++++-
+ drivers/usb/serial/ftdi_sio.c | 7 +
+ drivers/usb/serial/ftdi_sio.h | 10 +
+ drivers/usb/serial/option.c | 4 +
+ drivers/usb/serial/pl2303.c | 1 +
+ drivers/usb/serial/pl2303.h | 4 +
+ drivers/usb/storage/onetouch.c | 2 +-
+ 16 files changed, 679 insertions(+), 116 deletions(-)
+Merging cpufreq-current/fixes
+$ git merge cpufreq-current/fixes
+Merge made by recursive.
+ arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 15 ++++++++-------
+ 1 files changed, 8 insertions(+), 7 deletions(-)
+Merging input-current/for-linus
+$ git merge input-current/for-linus
+Auto-merging drivers/input/input.c
+Merge made by recursive.
+ drivers/input/input.c | 64 ++++++-
+ drivers/input/keyboard/Kconfig | 9 +
+ drivers/input/keyboard/Makefile | 1 +
+ drivers/input/keyboard/atkbd.c | 25 --
+ drivers/input/keyboard/opencores-kbd.c | 180 +++++++++++++++
+ drivers/input/misc/dm355evm_keys.c | 26 +--
+ drivers/input/mouse/sentelic.c | 18 +-
+ drivers/input/mouse/synaptics_i2c.c | 51 +++--
+ drivers/input/serio/i8042.c | 40 ++++
+ drivers/input/serio/libps2.c | 28 ++-
+ drivers/input/touchscreen/Kconfig | 18 ++-
+ drivers/input/touchscreen/Makefile | 1 +
+ drivers/input/touchscreen/ad7879.c | 6 +-
+ drivers/input/touchscreen/mcs5000_ts.c | 374 ++++++++++++++++++++++++++++++++
+ drivers/leds/leds-clevo-mail.c | 8 +
+ drivers/platform/x86/acer-wmi.c | 2 +
+ include/linux/i2c/mcs5000_ts.h | 11 +
+ include/linux/i8042.h | 30 +++
+ include/linux/input.h | 2 +-
+ include/linux/libps2.h | 2 +
+ 20 files changed, 816 insertions(+), 80 deletions(-)
+ create mode 100644 drivers/input/keyboard/opencores-kbd.c
+ create mode 100644 drivers/input/touchscreen/mcs5000_ts.c
+ create mode 100644 include/linux/i2c/mcs5000_ts.h
+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.
+$ git reset --hard HEAD^
+HEAD is now at 5c55956 Merge commit 'cpufreq-current/fixes'
+Merging refs/next/20090916/input-current
+$ git merge refs/next/20090916/input-current
+Already up-to-date.
+Merging arm/devel
+$ git merge arm/devel
+Auto-merging arch/arm/kernel/vmlinux.lds.S
+Merge made by recursive.
+ Documentation/arm/tcm.txt | 145 ++++++++++++
+ arch/arm/Kconfig | 5 +
+ arch/arm/include/asm/cputype.h | 5 +
+ arch/arm/include/asm/tcm.h | 31 +++
+ arch/arm/kernel/Makefile | 1 +
+ arch/arm/kernel/setup.c | 2 +
+ arch/arm/kernel/tcm.c | 246 ++++++++++++++++++++
+ arch/arm/kernel/tcm.h | 17 ++
+ arch/arm/kernel/vmlinux.lds.S | 57 +++++
+ arch/arm/mach-at91/at91sam9g45_devices.c | 49 ++++
+ arch/arm/mach-at91/at91sam9rl_devices.c | 47 ++++
+ arch/arm/mach-integrator/integrator_cp.c | 4 +-
+ arch/arm/mach-realview/core.c | 6 +-
+ arch/arm/mach-realview/core.h | 4 +-
+ arch/arm/mach-u300/include/mach/memory.h | 8 +
+ arch/arm/mach-u300/mmc.c | 6 +-
+ arch/arm/mach-versatile/core.c | 2 +-
+ arch/arm/mach-versatile/versatile_pb.c | 4 +-
+ arch/arm/mm/init.c | 8 +
+ drivers/mmc/host/mmci.c | 59 ++++--
+ drivers/mmc/host/mmci.h | 2 +-
+ .../asm/mach/mmc.h => include/linux/amba/mmci.h | 9 +-
+ 22 files changed, 681 insertions(+), 36 deletions(-)
+ create mode 100644 Documentation/arm/tcm.txt
+ create mode 100644 arch/arm/include/asm/tcm.h
+ create mode 100644 arch/arm/kernel/tcm.c
+ create mode 100644 arch/arm/kernel/tcm.h
+ rename arch/arm/include/asm/mach/mmc.h => include/linux/amba/mmci.h (63%)
+Merging davinci/for-next
+$ git merge davinci/for-next
+Auto-merging MAINTAINERS
+Auto-merging sound/soc/davinci/davinci-pcm.c
+Merge made by recursive.
+ MAINTAINERS | 6 +
+ arch/arm/configs/da830_omapl137_defconfig | 1254 ++++++++++++++++++++++
+ arch/arm/configs/da850_omapl138_defconfig | 1229 +++++++++++++++++++++
+ arch/arm/configs/davinci_all_defconfig | 173 ++--
+ arch/arm/mach-davinci/Kconfig | 49 +-
+ arch/arm/mach-davinci/Makefile | 14 +-
+ arch/arm/mach-davinci/Makefile.boot | 10 +
+ arch/arm/mach-davinci/board-da830-evm.c | 157 +++
+ arch/arm/mach-davinci/board-da850-evm.c | 415 +++++++
+ arch/arm/mach-davinci/board-dm355-evm.c | 83 ++-
+ arch/arm/mach-davinci/board-dm365-evm.c | 492 +++++++++
+ arch/arm/mach-davinci/board-dm644x-evm.c | 81 ++-
+ arch/arm/mach-davinci/board-dm646x-evm.c | 410 +++++++
+ arch/arm/mach-davinci/clock.c | 5 +-
+ arch/arm/mach-davinci/da830.c | 1205 +++++++++++++++++++++
+ arch/arm/mach-davinci/da850.c | 820 ++++++++++++++
+ arch/arm/mach-davinci/devices-da8xx.c | 450 ++++++++
+ arch/arm/mach-davinci/devices.c | 60 +-
+ arch/arm/mach-davinci/dm355.c | 174 +++-
+ arch/arm/mach-davinci/dm365.c | 926 ++++++++++++++++
+ arch/arm/mach-davinci/dm644x.c | 141 +++-
+ arch/arm/mach-davinci/dm646x.c | 321 ++++++-
+ arch/arm/mach-davinci/dma.c | 955 ++++++++++++-----
+ arch/arm/mach-davinci/gpio.c | 105 ++-
+ arch/arm/mach-davinci/include/mach/asp.h | 56 +-
+ arch/arm/mach-davinci/include/mach/common.h | 2 +-
+ arch/arm/mach-davinci/include/mach/cputype.h | 24 +
+ arch/arm/mach-davinci/include/mach/da8xx.h | 121 +++
+ arch/arm/mach-davinci/include/mach/debug-macro.S | 8 +
+ arch/arm/mach-davinci/include/mach/dm355.h | 7 +
+ arch/arm/mach-davinci/include/mach/dm365.h | 29 +
+ arch/arm/mach-davinci/include/mach/dm644x.h | 4 +
+ arch/arm/mach-davinci/include/mach/dm646x.h | 65 ++
+ arch/arm/mach-davinci/include/mach/edma.h | 67 ++-
+ arch/arm/mach-davinci/include/mach/gpio.h | 13 +-
+ arch/arm/mach-davinci/include/mach/hardware.h | 17 +
+ arch/arm/mach-davinci/include/mach/io.h | 23 +-
+ arch/arm/mach-davinci/include/mach/irqs.h | 205 ++++-
+ arch/arm/mach-davinci/include/mach/memory.h | 9 +-
+ arch/arm/mach-davinci/include/mach/mux.h | 731 +++++++++++++
+ arch/arm/mach-davinci/include/mach/psc.h | 62 ++
+ arch/arm/mach-davinci/include/mach/serial.h | 6 +-
+ arch/arm/mach-davinci/include/mach/system.h | 4 +-
+ arch/arm/mach-davinci/include/mach/uncompress.h | 7 +-
+ arch/arm/mach-davinci/include/mach/vmalloc.h | 2 +-
+ arch/arm/mach-davinci/mux.c | 14 +
+ arch/arm/mach-davinci/sram.c | 2 +-
+ arch/arm/mach-davinci/time.c | 16 +-
+ arch/arm/mach-davinci/usb.c | 13 +
+ sound/soc/davinci/davinci-pcm.c | 6 +-
+ 50 files changed, 10535 insertions(+), 513 deletions(-)
+ create mode 100644 arch/arm/configs/da830_omapl137_defconfig
+ create mode 100644 arch/arm/configs/da850_omapl138_defconfig
+ create mode 100644 arch/arm/mach-davinci/board-da830-evm.c
+ create mode 100644 arch/arm/mach-davinci/board-da850-evm.c
+ create mode 100644 arch/arm/mach-davinci/board-dm365-evm.c
+ create mode 100644 arch/arm/mach-davinci/da830.c
+ create mode 100644 arch/arm/mach-davinci/da850.c
+ create mode 100644 arch/arm/mach-davinci/devices-da8xx.c
+ create mode 100644 arch/arm/mach-davinci/dm365.c
+ create mode 100644 arch/arm/mach-davinci/include/mach/da8xx.h
+ create mode 100644 arch/arm/mach-davinci/include/mach/dm365.h
+Merging pxa/for-next
+$ git merge pxa/for-next
+Auto-merging MAINTAINERS
+Removing arch/arm/configs/littleton_defconfig
+Removing arch/arm/configs/zylonite_defconfig
+Auto-merging arch/arm/include/asm/cputype.h
+Auto-merging drivers/net/irda/pxaficp_ir.c
+Auto-merging drivers/rtc/rtc-sa1100.c
+Auto-merging sound/arm/pxa2xx-ac97.c
+Merge made by recursive.
+ MAINTAINERS | 8 +-
+ arch/arm/configs/littleton_defconfig | 783 ---------------
+ arch/arm/configs/pxa3xx_defconfig | 1332 ++++++++++++++++++++++++++
+ arch/arm/configs/xcep_defconfig | 1129 ++++++++++++++++++++++
+ arch/arm/configs/zylonite_defconfig | 736 --------------
+ arch/arm/include/asm/cputype.h | 5 +-
+ arch/arm/mach-pxa/Kconfig | 36 +
+ arch/arm/mach-pxa/Makefile | 4 +
+ arch/arm/mach-pxa/balloon3.c | 361 +++++++
+ arch/arm/mach-pxa/clock.h | 1 -
+ arch/arm/mach-pxa/cm-x270.c | 146 ++-
+ arch/arm/mach-pxa/cm-x300.c | 71 +--
+ arch/arm/mach-pxa/colibri-pxa300.c | 1 +
+ arch/arm/mach-pxa/colibri-pxa320.c | 33 +
+ arch/arm/mach-pxa/colibri-pxa3xx.c | 52 +-
+ arch/arm/mach-pxa/corgi.c | 233 +++--
+ arch/arm/mach-pxa/csb726.c | 54 +-
+ arch/arm/mach-pxa/devices.c | 27 +
+ arch/arm/mach-pxa/devices.h | 2 +
+ arch/arm/mach-pxa/e740.c | 1 -
+ arch/arm/mach-pxa/e750.c | 1 -
+ arch/arm/mach-pxa/em-x270.c | 45 +-
+ arch/arm/mach-pxa/eseries.c | 39 +-
+ arch/arm/mach-pxa/gumstix.c | 5 +-
+ arch/arm/mach-pxa/hx4700.c | 65 +-
+ arch/arm/mach-pxa/idp.c | 5 +-
+ arch/arm/mach-pxa/imote2.c | 3 +
+ arch/arm/mach-pxa/include/mach/balloon3.h | 134 +++
+ arch/arm/mach-pxa/include/mach/colibri.h | 6 +
+ arch/arm/mach-pxa/include/mach/entry-macro.S | 25 +-
+ arch/arm/mach-pxa/include/mach/hardware.h | 17 +
+ arch/arm/mach-pxa/include/mach/irda.h | 2 +
+ arch/arm/mach-pxa/include/mach/irqs.h | 42 +-
+ arch/arm/mach-pxa/include/mach/mfp.h | 301 +------
+ arch/arm/mach-pxa/include/mach/mmc.h | 5 +
+ arch/arm/mach-pxa/include/mach/palmtc.h | 86 ++
+ arch/arm/mach-pxa/include/mach/palmtx.h | 5 +
+ arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 4 +-
+ arch/arm/mach-pxa/include/mach/pxafb.h | 3 +-
+ arch/arm/mach-pxa/include/mach/regs-intc.h | 11 +
+ arch/arm/mach-pxa/include/mach/uncompress.h | 2 +-
+ arch/arm/mach-pxa/irq.c | 8 +-
+ arch/arm/mach-pxa/littleton.c | 43 +-
+ arch/arm/mach-pxa/lubbock.c | 18 +-
+ arch/arm/mach-pxa/magician.c | 59 +-
+ arch/arm/mach-pxa/mainstone.c | 16 +-
+ arch/arm/mach-pxa/mioa701.c | 84 +--
+ arch/arm/mach-pxa/palmld.c | 143 +--
+ arch/arm/mach-pxa/palmt5.c | 111 +--
+ arch/arm/mach-pxa/palmtc.c | 436 +++++++++
+ arch/arm/mach-pxa/palmte2.c | 110 +--
+ arch/arm/mach-pxa/palmtx.c | 225 +++--
+ arch/arm/mach-pxa/palmz72.c | 116 +---
+ arch/arm/mach-pxa/pcm990-baseboard.c | 67 +-
+ arch/arm/mach-pxa/poodle.c | 80 +--
+ arch/arm/mach-pxa/pxa2xx.c | 1 +
+ arch/arm/mach-pxa/pxa300.c | 2 +
+ arch/arm/mach-pxa/pxa320.c | 2 +
+ arch/arm/mach-pxa/pxa930.c | 19 +-
+ arch/arm/mach-pxa/spitz.c | 237 +++--
+ arch/arm/mach-pxa/tosa.c | 91 +--
+ arch/arm/mach-pxa/treo680.c | 159 +---
+ arch/arm/mach-pxa/trizeps4.c | 4 +
+ arch/arm/mach-pxa/xcep.c | 187 ++++
+ arch/arm/mach-pxa/zylonite.c | 3 +
+ arch/arm/plat-pxa/dma.c | 281 +++++-
+ arch/arm/plat-pxa/include/plat/mfp.h | 73 ++-
+ arch/arm/plat-pxa/mfp.c | 3 +
+ drivers/i2c/busses/Kconfig | 4 +-
+ drivers/mmc/host/pxamci.c | 104 ++-
+ drivers/net/irda/pxaficp_ir.c | 47 +-
+ drivers/pcmcia/Makefile | 1 +
+ drivers/pcmcia/pxa2xx_base.c | 18 +-
+ drivers/pcmcia/pxa2xx_palmtc.c | 230 +++++
+ drivers/rtc/rtc-pxa.c | 27 +-
+ drivers/rtc/rtc-sa1100.c | 23 +-
+ drivers/serial/pxa.c | 20 +-
+ drivers/spi/pxa2xx_spi.c | 30 +-
+ drivers/usb/host/ohci-pxa27x.c | 30 +-
+ drivers/video/backlight/da903x_bl.c | 20 +-
+ drivers/video/pxafb.c | 32 +-
+ include/linux/fb.h | 1 +
+ sound/arm/pxa2xx-ac97.c | 20 +-
+ 83 files changed, 5606 insertions(+), 3400 deletions(-)
+ delete mode 100644 arch/arm/configs/littleton_defconfig
+ create mode 100644 arch/arm/configs/pxa3xx_defconfig
+ create mode 100644 arch/arm/configs/xcep_defconfig
+ delete mode 100644 arch/arm/configs/zylonite_defconfig
+ create mode 100644 arch/arm/mach-pxa/balloon3.c
+ create mode 100644 arch/arm/mach-pxa/include/mach/balloon3.h
+ create mode 100644 arch/arm/mach-pxa/include/mach/palmtc.h
+ create mode 100644 arch/arm/mach-pxa/palmtc.c
+ create mode 100644 arch/arm/mach-pxa/xcep.c
+ create mode 100644 drivers/pcmcia/pxa2xx_palmtc.c
+Merging thumb-2/thumb-2
+$ git merge thumb-2/thumb-2
+Merge made by recursive.
+ arch/arm/include/asm/unified.h | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+Merging avr32/avr32-arch
+$ git merge avr32/avr32-arch
+Merge made by recursive.
+ arch/avr32/boards/atngw100/mrmt.c | 1 +
+ arch/avr32/boards/atngw100/setup.c | 5 ----
+ arch/avr32/mach-at32ap/at32ap700x.c | 35 ++++++++++++++------------
+ arch/avr32/mach-at32ap/include/mach/board.h | 1 +
+ arch/avr32/mach-at32ap/include/mach/cpu.h | 2 +
+ 5 files changed, 23 insertions(+), 21 deletions(-)
+Merging blackfin/for-linus
+$ git merge blackfin/for-linus
+Recorded preimage for 'arch/blackfin/mm/sram-alloc.c'
+Auto-merging arch/blackfin/kernel/vmlinux.lds.S
+Removing arch/blackfin/mach-common/lock.S
+Auto-merging arch/blackfin/mm/sram-alloc.c
+CONFLICT (content): Merge conflict in arch/blackfin/mm/sram-alloc.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/blackfin/mm/sram-alloc.c'.
+[master 344eb42] Merge commit 'blackfin/for-linus'
+$ git diff -M --stat --summary HEAD^..
+ arch/blackfin/Kconfig | 25 +-
+ arch/blackfin/Kconfig.debug | 6 +
+ arch/blackfin/configs/BF518F-EZBRD_defconfig | 4 +-
+ arch/blackfin/configs/BF526-EZBRD_defconfig | 4 +-
+ arch/blackfin/configs/BF527-EZKIT_defconfig | 4 +-
+ arch/blackfin/configs/BF548-EZKIT_defconfig | 2 +-
+ arch/blackfin/include/asm/bfin-global.h | 6 -
+ arch/blackfin/include/asm/bfin5xx_spi.h | 1 +
+ arch/blackfin/include/asm/cplb.h | 46 ++++-
+ arch/blackfin/include/asm/early_printk.h | 24 ++
+ arch/blackfin/include/asm/entry.h | 30 ++-
+ arch/blackfin/include/asm/ipipe.h | 7 -
+ arch/blackfin/include/asm/irq_handler.h | 1 +
+ arch/blackfin/include/asm/mmu_context.h | 6 +-
+ arch/blackfin/include/asm/pda.h | 7 +
+ arch/blackfin/kernel/Makefile | 1 +
+ arch/blackfin/kernel/asm-offsets.c | 7 +
+ arch/blackfin/kernel/bfin_dma_5xx.c | 14 +-
+ arch/blackfin/kernel/bfin_gpio.c | 1 -
+ arch/blackfin/kernel/cplb-mpu/cacheinit.c | 6 +-
+ arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 63 +----
+ arch/blackfin/kernel/cplb-nompu/cacheinit.c | 6 +-
+ arch/blackfin/kernel/cplb-nompu/cplbinit.c | 11 +-
+ arch/blackfin/kernel/cplb-nompu/cplbmgr.c | 35 +---
+ arch/blackfin/kernel/early_printk.c | 74 +++++-
+ arch/blackfin/kernel/entry.S | 24 ++-
+ arch/blackfin/kernel/ftrace.c | 2 +-
+ arch/blackfin/kernel/ipipe.c | 83 +++----
+ arch/blackfin/kernel/kgdb_test.c | 2 +-
+ arch/blackfin/kernel/module.c | 266 +++++++++-----------
+ arch/blackfin/kernel/process.c | 10 +-
+ arch/blackfin/kernel/ptrace.c | 155 +++++++-----
+ arch/blackfin/kernel/setup.c | 120 +++------
+ arch/blackfin/kernel/shadow_console.c | 113 +++++++++
+ arch/blackfin/kernel/time-ts.c | 4 +-
+ arch/blackfin/kernel/traps.c | 88 ++++---
+ arch/blackfin/kernel/vmlinux.lds.S | 4 +-
+ arch/blackfin/lib/ins.S | 4 +-
+ arch/blackfin/mach-bf518/boards/ezbrd.c | 29 +--
+ arch/blackfin/mach-bf518/include/mach/anomaly.h | 1 +
+ arch/blackfin/mach-bf518/include/mach/blackfin.h | 10 -
+ arch/blackfin/mach-bf527/boards/cm_bf527.c | 164 ++++++-------
+ arch/blackfin/mach-bf527/boards/ezbrd.c | 29 +--
+ arch/blackfin/mach-bf527/boards/ezkit.c | 58 +----
+ arch/blackfin/mach-bf527/include/mach/anomaly.h | 13 +-
+ arch/blackfin/mach-bf527/include/mach/blackfin.h | 10 -
+ arch/blackfin/mach-bf533/boards/H8606.c | 39 +--
+ arch/blackfin/mach-bf533/boards/blackstamp.c | 11 +
+ arch/blackfin/mach-bf533/boards/cm_bf533.c | 127 +++++++++-
+ arch/blackfin/mach-bf533/boards/ezkit.c | 13 +-
+ arch/blackfin/mach-bf533/boards/stamp.c | 83 ++++---
+ arch/blackfin/mach-bf533/dma.c | 8 +-
+ arch/blackfin/mach-bf533/include/mach/blackfin.h | 7 -
+ arch/blackfin/mach-bf537/boards/Kconfig | 12 +-
+ arch/blackfin/mach-bf537/boards/Makefile | 3 +-
+ .../mach-bf537/boards/{cm_bf537.c => cm_bf537e.c} | 157 +++++++++---
+ .../mach-bf537/boards/{cm_bf537.c => cm_bf537u.c} | 47 ++--
+ arch/blackfin/mach-bf537/boards/pnav10.c | 29 +--
+ arch/blackfin/mach-bf537/boards/stamp.c | 249 +++++++++++++++----
+ arch/blackfin/mach-bf537/boards/tcm_bf537.c | 43 ++--
+ arch/blackfin/mach-bf537/dma.c | 8 +-
+ arch/blackfin/mach-bf537/include/mach/anomaly.h | 2 +-
+ arch/blackfin/mach-bf537/include/mach/blackfin.h | 90 -------
+ arch/blackfin/mach-bf538/boards/ezkit.c | 65 +++++
+ arch/blackfin/mach-bf538/include/mach/anomaly.h | 2 +-
+ arch/blackfin/mach-bf538/include/mach/blackfin.h | 10 -
+ arch/blackfin/mach-bf538/include/mach/cdefBF538.h | 1 +
+ arch/blackfin/mach-bf548/boards/cm_bf548.c | 19 ++-
+ arch/blackfin/mach-bf548/boards/ezkit.c | 12 +-
+ arch/blackfin/mach-bf548/dma.c | 8 +-
+ arch/blackfin/mach-bf548/include/mach/anomaly.h | 21 ++-
+ arch/blackfin/mach-bf548/include/mach/blackfin.h | 89 -------
+ arch/blackfin/mach-bf561/boards/cm_bf561.c | 141 +++++++++--
+ arch/blackfin/mach-bf561/boards/ezkit.c | 13 +-
+ arch/blackfin/mach-bf561/include/mach/anomaly.h | 2 +
+ arch/blackfin/mach-bf561/secondary.S | 28 +--
+ arch/blackfin/mach-common/Makefile | 1 -
+ arch/blackfin/mach-common/entry.S | 191 ++++++++-------
+ arch/blackfin/mach-common/head.S | 19 ++-
+ arch/blackfin/mach-common/interrupt.S | 78 +++---
+ arch/blackfin/mach-common/ints-priority.c | 19 +-
+ arch/blackfin/mach-common/lock.S | 223 ----------------
+ arch/blackfin/mach-common/pm.c | 64 +----
+ arch/blackfin/mm/init.c | 3 +
+ arch/blackfin/mm/isram-driver.c | 222 ++++++++++++++++-
+ arch/blackfin/mm/sram-alloc.c | 30 ++-
+ 86 files changed, 2113 insertions(+), 1656 deletions(-)
+ create mode 100644 arch/blackfin/kernel/shadow_console.c
+ copy arch/blackfin/mach-bf537/boards/{cm_bf537.c => cm_bf537e.c} (85%)
+ rename arch/blackfin/mach-bf537/boards/{cm_bf537.c => cm_bf537u.c} (94%)
+ delete mode 100644 arch/blackfin/mach-common/lock.S
+Merging cris/for-next
+$ git merge cris/for-next
+Auto-merging drivers/net/cris/eth_v10.c
+Merge made by recursive.
+ arch/cris/arch-v10/kernel/time.c | 1 -
+ arch/cris/arch-v32/kernel/smp.c | 2 --
+ arch/cris/arch-v32/kernel/time.c | 1 -
+ arch/cris/arch-v32/mach-a3/io.c | 2 +-
+ arch/cris/arch-v32/mach-fs/io.c | 2 +-
+ arch/cris/include/arch-v10/arch/mmu.h | 9 +++++----
+ arch/cris/include/arch-v32/arch/mmu.h | 10 ++++++----
+ arch/cris/include/asm/hardirq.h | 12 ++----------
+ arch/cris/include/asm/pgtable.h | 2 ++
+ arch/cris/kernel/irq.c | 5 -----
+ drivers/net/cris/eth_v10.c | 20 +++++++++++++++++---
+ drivers/serial/crisv10.c | 1 +
+ 12 files changed, 35 insertions(+), 32 deletions(-)
+Merging ia64/test
+$ git merge ia64/test
+Recorded preimage for 'arch/ia64/kernel/vmlinux.lds.S'
+Auto-merging arch/ia64/kernel/head.S
+Auto-merging arch/ia64/kernel/vmlinux.lds.S
+CONFLICT (content): Merge conflict in arch/ia64/kernel/vmlinux.lds.S
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/ia64/kernel/vmlinux.lds.S'.
+[master 3f40a5c] Merge commit 'ia64/test'
+$ git diff -M --stat --summary HEAD^..
+ arch/ia64/include/asm/mca.h | 2 +
+ arch/ia64/kernel/crash.c | 83 ++++++++++++++++++--------
+ arch/ia64/kernel/head.S | 6 +-
+ arch/ia64/kernel/machine_kexec.c | 15 +++++
+ arch/ia64/kernel/mca.c | 15 ++++-
+ arch/ia64/kernel/mca_asm.S | 47 +++++++++++++++
+ arch/ia64/kernel/relocate_kernel.S | 2 +-
+ arch/ia64/kernel/vmlinux.lds.S | 113 +++++-------------------------------
+ arch/ia64/sn/pci/pcibr/pcibr_ate.c | 2 +
+ drivers/char/mbcs.c | 5 +-
+ drivers/misc/sgi-xp/xpc_sn2.c | 40 +++++++------
+ drivers/serial/ioc4_serial.c | 2 +-
+ 12 files changed, 179 insertions(+), 153 deletions(-)
+Merging m68k/for-next
+$ git merge m68k/for-next
+Merge made by recursive.
+ drivers/rtc/Kconfig | 19 +++
+ drivers/rtc/Makefile | 2 +
+ drivers/rtc/rtc-msm6242.c | 268 +++++++++++++++++++++++++++++++++++++++++++++
+ drivers/rtc/rtc-rp5c01.c | 222 +++++++++++++++++++++++++++++++++++++
+ 4 files changed, 511 insertions(+), 0 deletions(-)
+ create mode 100644 drivers/rtc/rtc-msm6242.c
+ create mode 100644 drivers/rtc/rtc-rp5c01.c
+Merging m68knommu/for-next
+$ git merge m68knommu/for-next
+Removing arch/m68k/include/asm/checksum_mm.h
+Removing arch/m68k/include/asm/checksum_no.h
+Removing arch/m68k/include/asm/dma_mm.h
+Removing arch/m68k/include/asm/dma_no.h
+Removing arch/m68k/include/asm/elia.h
+Removing arch/m68k/include/asm/irq_mm.h
+Removing arch/m68k/include/asm/irq_no.h
+Removing arch/m68k/include/asm/processor_mm.h
+Removing arch/m68k/include/asm/processor_no.h
+Auto-merging drivers/net/fec.c
+Merge made by recursive.
+ arch/m68k/include/asm/checksum.h | 173 +++++++-
+ arch/m68k/include/asm/checksum_mm.h | 148 -------
+ arch/m68k/include/asm/checksum_no.h | 132 ------
+ arch/m68k/include/asm/dma.h | 492 +++++++++++++++++++++-
+ arch/m68k/include/asm/dma_mm.h | 16 -
+ arch/m68k/include/asm/dma_no.h | 494 ---------------------
+ arch/m68k/include/asm/elia.h | 41 --
+ arch/m68k/include/asm/gpio.h | 238 ++++++++++
+ arch/m68k/include/asm/hardirq_no.h | 10 +-
+ arch/m68k/include/asm/io_no.h | 2 +-
+ arch/m68k/include/asm/irq.h | 135 ++++++-
+ arch/m68k/include/asm/irq_mm.h | 126 ------
+ arch/m68k/include/asm/irq_no.h | 26 --
+ arch/m68k/include/asm/m5206sim.h | 33 +-
+ arch/m68k/include/asm/m520xsim.h | 77 +++-
+ arch/m68k/include/asm/m523xsim.h | 77 ++++
+ arch/m68k/include/asm/m5249sim.h | 54 ++-
+ arch/m68k/include/asm/m5272sim.h | 62 +++-
+ arch/m68k/include/asm/m527xsim.h | 169 +++++++
+ arch/m68k/include/asm/m528xsim.h | 151 +++++++
+ arch/m68k/include/asm/m5307sim.h | 32 +-
+ arch/m68k/include/asm/m532xsim.h | 198 ++++-----
+ arch/m68k/include/asm/m5407sim.h | 28 +-
+ arch/m68k/include/asm/mcfgpio.h | 40 ++
+ arch/m68k/include/asm/mcfintc.h | 89 ++++
+ arch/m68k/include/asm/mcfne.h | 83 ----
+ arch/m68k/include/asm/mcfsim.h | 95 +----
+ arch/m68k/include/asm/mcfsmc.h | 6 +-
+ arch/m68k/include/asm/nettel.h | 4 +-
+ arch/m68k/include/asm/page_no.h | 4 +-
+ arch/m68k/include/asm/pinmux.h | 30 ++
+ arch/m68k/include/asm/processor.h | 173 +++++++-
+ arch/m68k/include/asm/processor_mm.h | 130 ------
+ arch/m68k/include/asm/processor_no.h | 143 ------
+ arch/m68k/include/asm/ptrace.h | 12 +
+ arch/m68k/include/asm/timex.h | 17 +-
+ arch/m68knommu/Kconfig | 6 +
+ arch/m68knommu/kernel/irq.c | 26 --
+ arch/m68knommu/kernel/ptrace.c | 18 +-
+ arch/m68knommu/kernel/time.c | 2 +-
+ arch/m68knommu/lib/checksum.c | 11 +-
+ arch/m68knommu/platform/5206/Makefile | 2 +-
+ arch/m68knommu/platform/5206/config.c | 56 +--
+ arch/m68knommu/platform/5206/gpio.c | 49 ++
+ arch/m68knommu/platform/5206e/Makefile | 2 +-
+ arch/m68knommu/platform/5206e/config.c | 58 +--
+ arch/m68knommu/platform/5206e/gpio.c | 49 ++
+ arch/m68knommu/platform/520x/Makefile | 2 +-
+ arch/m68knommu/platform/520x/config.c | 30 --
+ arch/m68knommu/platform/520x/gpio.c | 211 +++++++++
+ arch/m68knommu/platform/523x/Makefile | 2 +-
+ arch/m68knommu/platform/523x/config.c | 66 +---
+ arch/m68knommu/platform/523x/gpio.c | 283 ++++++++++++
+ arch/m68knommu/platform/5249/Makefile | 2 +-
+ arch/m68knommu/platform/5249/config.c | 49 +--
+ arch/m68knommu/platform/5249/gpio.c | 65 +++
+ arch/m68knommu/platform/5249/intc2.c | 59 +++
+ arch/m68knommu/platform/5272/Makefile | 2 +-
+ arch/m68knommu/platform/5272/config.c | 78 +---
+ arch/m68knommu/platform/5272/gpio.c | 81 ++++
+ arch/m68knommu/platform/5272/intc.c | 138 ++++++
+ arch/m68knommu/platform/527x/Makefile | 2 +-
+ arch/m68knommu/platform/527x/config.c | 49 --
+ arch/m68knommu/platform/527x/gpio.c | 607 ++++++++++++++++++++++++++
+ arch/m68knommu/platform/528x/Makefile | 2 +-
+ arch/m68knommu/platform/528x/config.c | 51 +--
+ arch/m68knommu/platform/528x/gpio.c | 438 +++++++++++++++++++
+ arch/m68knommu/platform/5307/Makefile | 2 +-
+ arch/m68knommu/platform/5307/config.c | 65 +--
+ arch/m68knommu/platform/5307/gpio.c | 49 ++
+ arch/m68knommu/platform/532x/Makefile | 2 +-
+ arch/m68knommu/platform/532x/config.c | 53 +---
+ arch/m68knommu/platform/532x/gpio.c | 337 ++++++++++++++
+ arch/m68knommu/platform/5407/Makefile | 2 +-
+ arch/m68knommu/platform/5407/config.c | 68 +--
+ arch/m68knommu/platform/5407/gpio.c | 49 ++
+ arch/m68knommu/platform/68328/ints.c | 72 ++--
+ arch/m68knommu/platform/68360/ints.c | 44 ++-
+ arch/m68knommu/platform/coldfire/Makefile | 21 +-
+ arch/m68knommu/platform/coldfire/gpio.c | 127 ++++++
+ arch/m68knommu/platform/coldfire/intc-2.c | 93 ++++
+ arch/m68knommu/platform/coldfire/intc-simr.c | 78 ++++
+ arch/m68knommu/platform/coldfire/intc.c | 153 +++++++
+ arch/m68knommu/platform/coldfire/pinmux.c | 28 ++
+ arch/m68knommu/platform/coldfire/pit.c | 8 -
+ arch/m68knommu/platform/coldfire/timers.c | 18 +-
+ arch/m68knommu/platform/coldfire/vectors.c | 20 +-
+ drivers/net/fec.c | 18 +-
+ 88 files changed, 5231 insertions(+), 2312 deletions(-)
+ delete mode 100644 arch/m68k/include/asm/checksum_mm.h
+ delete mode 100644 arch/m68k/include/asm/checksum_no.h
+ delete mode 100644 arch/m68k/include/asm/dma_mm.h
+ delete mode 100644 arch/m68k/include/asm/dma_no.h
+ delete mode 100644 arch/m68k/include/asm/elia.h
+ create mode 100644 arch/m68k/include/asm/gpio.h
+ delete mode 100644 arch/m68k/include/asm/irq_mm.h
+ delete mode 100644 arch/m68k/include/asm/irq_no.h
+ create mode 100644 arch/m68k/include/asm/mcfgpio.h
+ create mode 100644 arch/m68k/include/asm/mcfintc.h
+ create mode 100644 arch/m68k/include/asm/pinmux.h
+ delete mode 100644 arch/m68k/include/asm/processor_mm.h
+ delete mode 100644 arch/m68k/include/asm/processor_no.h
+ create mode 100644 arch/m68knommu/platform/5206/gpio.c
+ create mode 100644 arch/m68knommu/platform/5206e/gpio.c
+ create mode 100644 arch/m68knommu/platform/520x/gpio.c
+ create mode 100644 arch/m68knommu/platform/523x/gpio.c
+ create mode 100644 arch/m68knommu/platform/5249/gpio.c
+ create mode 100644 arch/m68knommu/platform/5249/intc2.c
+ create mode 100644 arch/m68knommu/platform/5272/gpio.c
+ create mode 100644 arch/m68knommu/platform/5272/intc.c
+ create mode 100644 arch/m68knommu/platform/527x/gpio.c
+ create mode 100644 arch/m68knommu/platform/528x/gpio.c
+ create mode 100644 arch/m68knommu/platform/5307/gpio.c
+ create mode 100644 arch/m68knommu/platform/532x/gpio.c
+ create mode 100644 arch/m68knommu/platform/5407/gpio.c
+ create mode 100644 arch/m68knommu/platform/coldfire/gpio.c
+ create mode 100644 arch/m68knommu/platform/coldfire/intc-2.c
+ create mode 100644 arch/m68knommu/platform/coldfire/intc-simr.c
+ create mode 100644 arch/m68knommu/platform/coldfire/intc.c
+ create mode 100644 arch/m68knommu/platform/coldfire/pinmux.c
+Merging microblaze/next
+$ git merge microblaze/next
+Merge made by recursive.
+ Documentation/gcov.txt | 2 +-
+ arch/microblaze/Kconfig | 1 +
+ arch/microblaze/include/asm/io.h | 3 +
+ arch/microblaze/include/asm/setup.h | 2 +-
+ arch/microblaze/include/asm/syscall.h | 99 +++++++++++++++++++++++++++++++++
+ arch/microblaze/kernel/entry.S | 66 ++++++++++++++++++---
+ arch/microblaze/kernel/head.S | 14 ++++-
+ arch/microblaze/kernel/ptrace.c | 62 ++++++++++++++++++++
+ arch/microblaze/kernel/setup.c | 12 ++++-
+ arch/microblaze/kernel/vmlinux.lds.S | 39 +++----------
+ drivers/mtd/Kconfig | 2 +-
+ drivers/mtd/maps/Kconfig | 2 +-
+ drivers/usb/Kconfig | 1 -
+ kernel/gcov/Kconfig | 2 +-
+ 14 files changed, 257 insertions(+), 50 deletions(-)
+ create mode 100644 arch/microblaze/include/asm/syscall.h
+Merging mips/mips-for-linux-next
+$ git merge mips/mips-for-linux-next
+Already up-to-date.
+Merging parisc/next
+$ git merge parisc/next
+Resolved 'arch/parisc/include/asm/thread_info.h' using previous resolution.
+Resolved 'arch/parisc/kernel/entry.S' using previous resolution.
+Resolved 'arch/parisc/kernel/signal.c' using previous resolution.
+Auto-merging MAINTAINERS
+Auto-merging arch/parisc/include/asm/thread_info.h
+CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h
+Auto-merging arch/parisc/kernel/entry.S
+CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S
+Auto-merging arch/parisc/kernel/module.c
+Auto-merging arch/parisc/kernel/signal.c
+CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master cbd4cb0] Merge commit 'parisc/next'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 1 +
+ arch/parisc/Kconfig | 1 +
+ arch/parisc/include/asm/elf.h | 1 +
+ arch/parisc/include/asm/hardirq.h | 20 +--
+ arch/parisc/include/asm/ptrace.h | 38 +++-
+ arch/parisc/include/asm/syscall.h | 40 +++
+ arch/parisc/include/asm/thread_info.h | 10 +-
+ arch/parisc/kernel/asm-offsets.c | 4 +-
+ arch/parisc/kernel/entry.S | 29 +-
+ arch/parisc/kernel/irq.c | 5 -
+ arch/parisc/kernel/module.c | 2 +-
+ arch/parisc/kernel/ptrace.c | 457 +++++++++++++++++++++++++++++++--
+ arch/parisc/kernel/signal.c | 4 +
+ arch/parisc/kernel/syscall.S | 22 +-
+ 14 files changed, 560 insertions(+), 74 deletions(-)
+ create mode 100644 arch/parisc/include/asm/syscall.h
+Merging powerpc/next
+$ git merge powerpc/next
+Already up-to-date.
+Merging 4xx/next
+$ git merge 4xx/next
+Already up-to-date.
+Merging galak/next
+$ git merge galak/next
+Already up-to-date.
+Merging s390/features
+$ git merge s390/features
+Already up-to-date.
+Merging sh/master
+$ git merge sh/master
+Removing arch/sh/boot/compressed/misc_32.c
+Removing arch/sh/boot/compressed/misc_64.c
+Removing arch/sh/boot/compressed/piggy.S
+Removing arch/sh/include/cpu-common/cpu/cacheflush.h
+Removing arch/sh/include/cpu-sh2a/cpu/cacheflush.h
+Removing arch/sh/include/cpu-sh3/cpu/cacheflush.h
+Removing arch/sh/include/cpu-sh4/cpu/cacheflush.h
+Removing arch/sh/include/cpu-sh5/cpu/cacheflush.h
+Removing arch/sh/include/mach-common/mach/migor.h
+Removing arch/sh/kernel/Makefile_32
+Removing arch/sh/kernel/Makefile_64
+Removing arch/sh/lib64/clear_page.S
+Removing arch/sh/mm/Makefile_32
+Removing arch/sh/mm/Makefile_64
+Removing arch/sh/mm/pg-nommu.c
+Removing arch/sh/mm/pg-sh4.c
+Removing arch/sh/mm/pg-sh7705.c
+Removing arch/sh/mm/tlb-nommu.c
+Auto-merging drivers/video/Kconfig
+Merge made by recursive.
+ Documentation/kernel-parameters.txt | 2 +-
+ arch/sh/Kconfig | 44 +-
+ arch/sh/Kconfig.debug | 23 +-
+ arch/sh/Makefile | 26 +-
+ arch/sh/boards/Kconfig | 22 +-
+ arch/sh/boards/board-ap325rxa.c | 10 +-
+ arch/sh/boards/board-sh7785lcr.c | 18 +
+ arch/sh/boards/mach-ecovec24/Makefile | 9 +
+ arch/sh/boards/mach-ecovec24/setup.c | 660 +++++++
+ arch/sh/boards/mach-highlander/setup.c | 7 +
+ arch/sh/boards/mach-kfr2r09/Makefile | 2 +
+ arch/sh/boards/mach-kfr2r09/lcd_wqvga.c | 332 ++++
+ arch/sh/boards/mach-kfr2r09/setup.c | 386 ++++
+ arch/sh/boards/mach-migor/setup.c | 11 +-
+ arch/sh/boards/mach-se/7722/setup.c | 4 +
+ arch/sh/boards/mach-se/7724/setup.c | 110 +-
+ arch/sh/boards/mach-x3proto/setup.c | 7 +
+ arch/sh/boot/.gitignore | 5 +-
+ arch/sh/boot/Makefile | 48 +-
+ arch/sh/boot/compressed/.gitignore | 1 +
+ arch/sh/boot/compressed/Makefile | 21 +-
+ arch/sh/boot/compressed/head_32.S | 2 +-
+ arch/sh/boot/compressed/misc.c | 149 ++
+ arch/sh/boot/compressed/misc_32.c | 206 --
+ arch/sh/boot/compressed/misc_64.c | 210 --
+ arch/sh/boot/compressed/piggy.S | 8 -
+ arch/sh/boot/compressed/vmlinux.scr | 10 +
+ arch/sh/boot/romimage/Makefile | 19 +
+ arch/sh/boot/romimage/head.S | 10 +
+ arch/sh/boot/romimage/vmlinux.scr | 6 +
+ arch/sh/configs/ecovec24-romimage_defconfig | 1032 ++++++++++
+ arch/sh/configs/ecovec24_defconfig | 1558 +++++++++++++++
+ arch/sh/configs/kfr2r09-romimage_defconfig | 774 ++++++++
+ arch/sh/configs/kfr2r09_defconfig | 1059 ++++++++++
+ arch/sh/configs/snapgear_defconfig | 77 +-
+ arch/sh/drivers/dma/Kconfig | 6 +-
+ arch/sh/drivers/heartbeat.c | 10 +
+ arch/sh/drivers/pci/pci.c | 4 +
+ arch/sh/include/asm/Kbuild | 2 +-
+ arch/sh/include/asm/bug.h | 31 +
+ arch/sh/include/asm/bugs.h | 24 +-
+ arch/sh/include/asm/cachectl.h | 19 +
+ arch/sh/include/asm/cacheflush.h | 114 +-
+ arch/sh/include/asm/device.h | 16 +-
+ arch/sh/include/asm/dma-sh.h | 1 +
+ arch/sh/include/asm/dwarf.h | 398 ++++
+ arch/sh/include/asm/entry-macros.S | 86 +-
+ arch/sh/include/asm/ftrace.h | 8 +-
+ arch/sh/include/asm/hardirq.h | 13 +-
+ arch/sh/include/asm/heartbeat.h | 1 +
+ arch/sh/include/asm/hwblk.h | 72 +
+ arch/sh/include/asm/io.h | 16 +-
+ arch/sh/include/asm/kdebug.h | 1 +
+ arch/sh/include/asm/kgdb.h | 3 -
+ arch/sh/include/asm/lmb.h | 6 +
+ arch/sh/include/asm/mmu_context.h | 2 +-
+ arch/sh/include/asm/page.h | 24 +-
+ arch/sh/include/asm/pgtable.h | 34 +-
+ arch/sh/include/asm/pgtable_32.h | 30 +-
+ arch/sh/include/asm/pgtable_64.h | 5 +
+ arch/sh/include/asm/processor.h | 15 +-
+ arch/sh/include/asm/romimage-macros.h | 73 +
+ arch/sh/include/asm/sections.h | 1 +
+ arch/sh/include/asm/sh_keysc.h | 1 +
+ arch/sh/include/asm/stacktrace.h | 25 +
+ arch/sh/include/asm/suspend.h | 9 +
+ arch/sh/include/asm/syscall_32.h | 1 +
+ arch/sh/include/asm/system.h | 19 +-
+ arch/sh/include/asm/system_32.h | 43 +-
+ arch/sh/include/asm/system_64.h | 10 +
+ arch/sh/include/asm/thread_info.h | 11 +-
+ arch/sh/include/asm/types.h | 2 +
+ arch/sh/include/asm/unistd_32.h | 2 +-
+ arch/sh/include/asm/unistd_64.h | 2 +-
+ arch/sh/include/asm/unwinder.h | 31 +
+ arch/sh/include/asm/vmlinux.lds.h | 17 +
+ arch/sh/include/asm/watchdog.h | 19 +-
+ arch/sh/include/cpu-common/cpu/cacheflush.h | 44 -
+ arch/sh/include/cpu-sh2a/cpu/cacheflush.h | 34 -
+ arch/sh/include/cpu-sh3/cpu/cacheflush.h | 46 -
+ arch/sh/include/cpu-sh4/cpu/cacheflush.h | 43 -
+ arch/sh/include/cpu-sh4/cpu/dma-sh4a.h | 3 +-
+ arch/sh/include/cpu-sh4/cpu/freq.h | 4 +
+ arch/sh/include/cpu-sh4/cpu/sh7722.h | 14 +
+ arch/sh/include/cpu-sh4/cpu/sh7723.h | 17 +
+ arch/sh/include/cpu-sh4/cpu/sh7724.h | 17 +
+ arch/sh/include/cpu-sh4/cpu/sh7757.h | 243 +++
+ arch/sh/include/cpu-sh5/cpu/cacheflush.h | 33 -
+ arch/sh/include/mach-common/mach/migor.h | 64 -
+ arch/sh/include/mach-common/mach/romimage.h | 1 +
+ arch/sh/include/mach-common/mach/sh7785lcr.h | 2 +
+ .../mach-ecovec24/mach/partner-jet-setup.txt | 82 +
+ arch/sh/include/mach-ecovec24/mach/romimage.h | 20 +
+ arch/sh/include/mach-kfr2r09/mach/kfr2r09.h | 21 +
+ .../mach-kfr2r09/mach/partner-jet-setup.txt | 143 ++
+ arch/sh/include/mach-kfr2r09/mach/romimage.h | 20 +
+ arch/sh/include/mach-migor/mach/migor.h | 14 +
+ arch/sh/kernel/Makefile | 44 +-
+ arch/sh/kernel/Makefile_32 | 37 -
+ arch/sh/kernel/Makefile_64 | 19 -
+ arch/sh/kernel/asm-offsets.c | 1 +
+ arch/sh/kernel/cpu/Makefile | 2 +-
+ arch/sh/kernel/cpu/hwblk.c | 155 ++
+ arch/sh/kernel/cpu/init.c | 36 +-
+ arch/sh/kernel/cpu/irq/ipr.c | 1 +
+ arch/sh/kernel/cpu/sh2/entry.S | 3 +-
+ arch/sh/kernel/cpu/sh2/probe.c | 1 +
+ arch/sh/kernel/cpu/sh2a/entry.S | 3 +-
+ arch/sh/kernel/cpu/sh2a/probe.c | 2 +
+ arch/sh/kernel/cpu/sh3/clock-sh7709.c | 11 -
+ arch/sh/kernel/cpu/sh3/entry.S | 102 +-
+ arch/sh/kernel/cpu/sh3/ex.S | 4 +-
+ arch/sh/kernel/cpu/sh3/probe.c | 2 +
+ arch/sh/kernel/cpu/sh4/probe.c | 21 +-
+ arch/sh/kernel/cpu/sh4a/Makefile | 9 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 63 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 113 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 124 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 130 ++
+ arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c | 106 +
+ arch/sh/kernel/cpu/sh4a/hwblk-sh7723.c | 117 ++
+ arch/sh/kernel/cpu/sh4a/hwblk-sh7724.c | 121 ++
+ arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c | 2019 ++++++++++++++++++++
+ arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 2 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 39 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 42 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 43 +
+ arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 513 +++++
+ arch/sh/kernel/cpu/sh4a/setup-shx3.c | 55 +-
+ arch/sh/kernel/cpu/sh4a/smp-shx3.c | 2 +
+ arch/sh/kernel/cpu/sh5/probe.c | 2 +
+ arch/sh/kernel/cpu/shmobile/Makefile | 2 +
+ arch/sh/kernel/cpu/shmobile/cpuidle.c | 113 ++
+ arch/sh/kernel/cpu/shmobile/pm.c | 42 +-
+ arch/sh/kernel/cpu/shmobile/pm_runtime.c | 303 +++
+ arch/sh/kernel/cpu/shmobile/sleep.S | 155 +-
+ arch/sh/kernel/cpufreq.c | 10 +-
+ arch/sh/kernel/dumpstack.c | 123 ++
+ arch/sh/kernel/dwarf.c | 972 ++++++++++
+ arch/sh/kernel/early_printk.c | 5 +-
+ arch/sh/kernel/entry-common.S | 103 +-
+ arch/sh/kernel/ftrace.c | 188 ++
+ arch/sh/kernel/io.c | 97 +-
+ arch/sh/kernel/io_generic.c | 50 +-
+ arch/sh/kernel/io_trapped.c | 10 +-
+ arch/sh/kernel/irq.c | 19 +-
+ arch/sh/kernel/kgdb.c | 4 -
+ arch/sh/kernel/localtimer.c | 9 +-
+ arch/sh/kernel/nmi_debug.c | 77 +
+ arch/sh/kernel/process_32.c | 25 +-
+ arch/sh/kernel/process_64.c | 24 +-
+ arch/sh/kernel/ptrace_32.c | 9 +
+ arch/sh/kernel/ptrace_64.c | 9 +
+ arch/sh/kernel/setup.c | 80 +-
+ arch/sh/kernel/sh_ksyms_32.c | 10 +-
+ arch/sh/kernel/sh_ksyms_64.c | 9 -
+ arch/sh/kernel/signal_32.c | 12 +-
+ arch/sh/kernel/signal_64.c | 38 +-
+ arch/sh/kernel/stacktrace.c | 98 +-
+ arch/sh/kernel/sys_sh.c | 43 +
+ arch/sh/kernel/syscalls_32.S | 2 +-
+ arch/sh/kernel/syscalls_64.S | 2 +-
+ arch/sh/kernel/time.c | 31 +-
+ arch/sh/kernel/traps.c | 45 +-
+ arch/sh/kernel/traps_32.c | 218 ++-
+ arch/sh/kernel/unwinder.c | 164 ++
+ arch/sh/kernel/vmlinux.lds.S | 94 +-
+ arch/sh/lib/Makefile | 4 +-
+ arch/sh/lib/{clear_page.S => __clear_user.S} | 48 +-
+ arch/sh/lib/copy_page.S | 11 +-
+ arch/sh/lib/delay.c | 5 +-
+ arch/sh/lib/mcount.S | 228 +++-
+ arch/sh/lib64/Makefile | 2 +-
+ arch/sh/lib64/clear_page.S | 54 -
+ arch/sh/mm/Kconfig | 7 +-
+ arch/sh/mm/Makefile | 68 +-
+ arch/sh/mm/Makefile_32 | 43 -
+ arch/sh/mm/Makefile_64 | 46 -
+ arch/sh/mm/cache-sh2.c | 13 +-
+ arch/sh/mm/cache-sh2a.c | 23 +-
+ arch/sh/mm/cache-sh3.c | 25 +-
+ arch/sh/mm/cache-sh4.c | 362 ++--
+ arch/sh/mm/cache-sh5.c | 307 +---
+ arch/sh/mm/cache-sh7705.c | 72 +-
+ arch/sh/mm/cache.c | 316 +++
+ arch/sh/mm/fault_32.c | 196 ++-
+ arch/sh/mm/fault_64.c | 11 +-
+ arch/sh/mm/flush-sh4.c | 108 ++
+ arch/sh/mm/init.c | 50 +-
+ arch/sh/mm/ioremap_32.c | 8 -
+ arch/sh/mm/ioremap_64.c | 6 +-
+ arch/sh/mm/kmap.c | 65 +
+ arch/sh/mm/mmap.c | 2 +-
+ arch/sh/mm/nommu.c | 96 +
+ arch/sh/mm/numa.c | 36 +-
+ arch/sh/mm/pg-nommu.c | 38 -
+ arch/sh/mm/pg-sh4.c | 146 --
+ arch/sh/mm/pg-sh7705.c | 138 --
+ arch/sh/mm/tlb-nommu.c | 62 -
+ arch/sh/mm/tlb-pteaex.c | 28 +-
+ arch/sh/mm/tlb-sh3.c | 27 +-
+ arch/sh/mm/tlb-sh4.c | 37 +-
+ arch/sh/mm/tlb-sh5.c | 21 +-
+ arch/sh/mm/tlbflush_64.c | 22 +-
+ arch/sh/oprofile/backtrace.c | 84 +-
+ arch/sh/tools/mach-types | 3 +
+ drivers/i2c/busses/i2c-sh_mobile.c | 39 +-
+ drivers/input/keyboard/sh_keysc.c | 3 +
+ drivers/media/video/sh_mobile_ceu_camera.c | 41 +-
+ drivers/rtc/rtc-ds1302.c | 69 +-
+ drivers/rtc/rtc-sh.c | 97 +-
+ drivers/serial/sh-sci.c | 8 +-
+ drivers/serial/sh-sci.h | 17 +
+ drivers/sh/intc.c | 71 +-
+ drivers/uio/uio_pdrv_genirq.c | 54 +
+ drivers/usb/gadget/Kconfig | 28 +-
+ drivers/usb/gadget/Makefile | 1 +
+ drivers/usb/gadget/gadget_chips.h | 8 +
+ drivers/usb/gadget/m66592-udc.c | 286 ++--
+ drivers/usb/gadget/m66592-udc.h | 90 +-
+ drivers/usb/gadget/r8a66597-udc.c | 1689 ++++++++++++++++
+ drivers/usb/gadget/r8a66597-udc.h | 256 +++
+ drivers/usb/host/Kconfig | 7 -
+ drivers/usb/host/r8a66597-hcd.c | 210 ++-
+ drivers/usb/host/r8a66597.h | 442 +----
+ drivers/video/Kconfig | 2 +-
+ drivers/video/sh_mobile_lcdcfb.c | 292 +++-
+ include/linux/sh_intc.h | 1 -
+ include/linux/usb/m66592.h | 44 +
+ include/linux/usb/r8a66597.h | 375 ++++-
+ 230 files changed, 18983 insertions(+), 4044 deletions(-)
+ create mode 100644 arch/sh/boards/mach-ecovec24/Makefile
+ create mode 100644 arch/sh/boards/mach-ecovec24/setup.c
+ create mode 100644 arch/sh/boards/mach-kfr2r09/Makefile
+ create mode 100644 arch/sh/boards/mach-kfr2r09/lcd_wqvga.c
+ create mode 100644 arch/sh/boards/mach-kfr2r09/setup.c
+ create mode 100644 arch/sh/boot/compressed/.gitignore
+ create mode 100644 arch/sh/boot/compressed/misc.c
+ delete mode 100644 arch/sh/boot/compressed/misc_32.c
+ delete mode 100644 arch/sh/boot/compressed/misc_64.c
+ delete mode 100644 arch/sh/boot/compressed/piggy.S
+ create mode 100644 arch/sh/boot/compressed/vmlinux.scr
+ create mode 100644 arch/sh/boot/romimage/Makefile
+ create mode 100644 arch/sh/boot/romimage/head.S
+ create mode 100644 arch/sh/boot/romimage/vmlinux.scr
+ create mode 100644 arch/sh/configs/ecovec24-romimage_defconfig
+ create mode 100644 arch/sh/configs/ecovec24_defconfig
+ create mode 100644 arch/sh/configs/kfr2r09-romimage_defconfig
+ create mode 100644 arch/sh/configs/kfr2r09_defconfig
+ create mode 100644 arch/sh/include/asm/cachectl.h
+ create mode 100644 arch/sh/include/asm/dwarf.h
+ create mode 100644 arch/sh/include/asm/hwblk.h
+ create mode 100644 arch/sh/include/asm/lmb.h
+ create mode 100644 arch/sh/include/asm/romimage-macros.h
+ create mode 100644 arch/sh/include/asm/stacktrace.h
+ create mode 100644 arch/sh/include/asm/unwinder.h
+ create mode 100644 arch/sh/include/asm/vmlinux.lds.h
+ delete mode 100644 arch/sh/include/cpu-common/cpu/cacheflush.h
+ delete mode 100644 arch/sh/include/cpu-sh2a/cpu/cacheflush.h
+ delete mode 100644 arch/sh/include/cpu-sh3/cpu/cacheflush.h
+ delete mode 100644 arch/sh/include/cpu-sh4/cpu/cacheflush.h
+ create mode 100644 arch/sh/include/cpu-sh4/cpu/sh7757.h
+ delete mode 100644 arch/sh/include/cpu-sh5/cpu/cacheflush.h
+ delete mode 100644 arch/sh/include/mach-common/mach/migor.h
+ create mode 100644 arch/sh/include/mach-common/mach/romimage.h
+ create mode 100644 arch/sh/include/mach-ecovec24/mach/partner-jet-setup.txt
+ create mode 100644 arch/sh/include/mach-ecovec24/mach/romimage.h
+ create mode 100644 arch/sh/include/mach-kfr2r09/mach/kfr2r09.h
+ create mode 100644 arch/sh/include/mach-kfr2r09/mach/partner-jet-setup.txt
+ create mode 100644 arch/sh/include/mach-kfr2r09/mach/romimage.h
+ create mode 100644 arch/sh/include/mach-migor/mach/migor.h
+ delete mode 100644 arch/sh/kernel/Makefile_32
+ delete mode 100644 arch/sh/kernel/Makefile_64
+ create mode 100644 arch/sh/kernel/cpu/hwblk.c
+ create mode 100644 arch/sh/kernel/cpu/sh4a/clock-sh7757.c
+ create mode 100644 arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c
+ create mode 100644 arch/sh/kernel/cpu/sh4a/hwblk-sh7723.c
+ create mode 100644 arch/sh/kernel/cpu/sh4a/hwblk-sh7724.c
+ create mode 100644 arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c
+ create mode 100644 arch/sh/kernel/cpu/sh4a/setup-sh7757.c
+ create mode 100644 arch/sh/kernel/cpu/shmobile/cpuidle.c
+ create mode 100644 arch/sh/kernel/cpu/shmobile/pm_runtime.c
+ create mode 100644 arch/sh/kernel/dumpstack.c
+ create mode 100644 arch/sh/kernel/dwarf.c
+ create mode 100644 arch/sh/kernel/nmi_debug.c
+ create mode 100644 arch/sh/kernel/unwinder.c
+ rename arch/sh/lib/{clear_page.S => __clear_user.S} (75%)
+ delete mode 100644 arch/sh/lib64/clear_page.S
+ delete mode 100644 arch/sh/mm/Makefile_32
+ delete mode 100644 arch/sh/mm/Makefile_64
+ create mode 100644 arch/sh/mm/cache.c
+ create mode 100644 arch/sh/mm/flush-sh4.c
+ create mode 100644 arch/sh/mm/kmap.c
+ create mode 100644 arch/sh/mm/nommu.c
+ delete mode 100644 arch/sh/mm/pg-nommu.c
+ delete mode 100644 arch/sh/mm/pg-sh4.c
+ delete mode 100644 arch/sh/mm/pg-sh7705.c
+ delete mode 100644 arch/sh/mm/tlb-nommu.c
+ create mode 100644 drivers/usb/gadget/r8a66597-udc.c
+ create mode 100644 drivers/usb/gadget/r8a66597-udc.h
+ create mode 100644 include/linux/usb/m66592.h
+Merging sparc/master
+$ git merge sparc/master
+Already up-to-date.
+Merging xtensa/master
+$ git merge xtensa/master
+Auto-merging arch/xtensa/Kconfig
+Merge made by recursive.
+Merging cifs/master
+$ git merge cifs/master
+Merge made by recursive.
+ fs/cifs/cifsglob.h | 9 +++++----
+ fs/cifs/cifsproto.h | 2 +-
+ fs/cifs/dir.c | 11 +++++------
+ fs/cifs/file.c | 16 ++++++++++------
+ fs/cifs/misc.c | 7 +++----
+ 5 files changed, 24 insertions(+), 21 deletions(-)
+Merging configfs/linux-next
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next
+$ git merge ecryptfs/next
+Merge made by recursive.
+ fs/ecryptfs/Kconfig | 4 +++-
+ fs/ecryptfs/crypto.c | 15 ++++++++-------
+ fs/ecryptfs/keystore.c | 11 ++++-------
+ fs/ecryptfs/super.c | 2 --
+ 4 files changed, 15 insertions(+), 17 deletions(-)
+Merging ext3/for_next
+$ git merge ext3/for_next
+Auto-merging MAINTAINERS
+Auto-merging drivers/staging/pohmelfs/inode.c
+Auto-merging fs/block_dev.c
+Auto-merging fs/ext3/file.c
+Auto-merging fs/ext4/file.c
+Auto-merging fs/fs-writeback.c
+Auto-merging fs/splice.c
+Auto-merging fs/sync.c
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/writeback.h
+Merge made by recursive.
+ MAINTAINERS | 3 +--
+ fs/ext3/inode.c | 28 ++++++++++++++++++++++++----
+ fs/jbd/checkpoint.c | 6 +++---
+ fs/jbd/commit.c | 2 +-
+ fs/jbd/journal.c | 30 +++++++++++++++---------------
+ fs/jbd/recovery.c | 18 +++++++++---------
+ fs/jbd/revoke.c | 16 ++++++++--------
+ fs/jbd/transaction.c | 9 +++++----
+ include/linux/jbd.h | 26 +++++++++++++-------------
+ 9 files changed, 79 insertions(+), 59 deletions(-)
+Merging ext4/next
+$ git merge ext4/next
+Recorded preimage for 'include/trace/events/ext4.h'
+Auto-merging fs/ext4/namei.c
+Auto-merging fs/jbd2/commit.c
+Auto-merging include/trace/events/ext4.h
+CONFLICT (content): Merge conflict in include/trace/events/ext4.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'include/trace/events/ext4.h'.
+[master 2601584] Merge commit 'ext4/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/ext4.txt | 8 +-
+ fs/ext4/Kconfig | 11 +-
+ fs/ext4/balloc.c | 2 +-
+ fs/ext4/ext4.h | 84 ++++++--
+ fs/ext4/ext4_extents.h | 3 +-
+ fs/ext4/ext4_jbd2.c | 9 +-
+ fs/ext4/extents.c | 112 ++++++----
+ fs/ext4/fsync.c | 13 +-
+ fs/ext4/ialloc.c | 2 +-
+ fs/ext4/inode.c | 128 +++++++----
+ fs/ext4/ioctl.c | 7 +-
+ fs/ext4/mballoc.c | 420 ++++++++++++++++++------------------
+ fs/ext4/mballoc.h | 22 ++-
+ fs/ext4/migrate.c | 2 +-
+ fs/ext4/move_extent.c | 47 +++--
+ fs/ext4/namei.c | 22 ++-
+ fs/ext4/resize.c | 7 +-
+ fs/ext4/super.c | 152 ++++++++------
+ fs/jbd2/commit.c | 11 +-
+ fs/jbd2/journal.c | 6 +
+ fs/jbd2/transaction.c | 7 +-
+ include/linux/jbd2.h | 2 +-
+ include/trace/events/ext4.h | 109 +++++++---
+ include/trace/events/jbd2.h | 2 +-
+ 24 files changed, 704 insertions(+), 484 deletions(-)
+Merging fatfs/master
+$ git merge fatfs/master
+Merge made by recursive.
+ Documentation/filesystems/vfat.txt | 2 +-
+ fs/fat/inode.c | 4 ++--
+ fs/fat/namei_vfat.c | 15 ++++-----------
+ fs/nls/nls_base.c | 8 ++++----
+ 4 files changed, 11 insertions(+), 18 deletions(-)
+Merging fuse/for-next
+$ git merge fuse/for-next
+Auto-merging fs/fuse/dev.c
+Auto-merging fs/fuse/inode.c
+Merge made by recursive.
+ fs/fuse/control.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ fs/fuse/dev.c | 10 ++--
+ fs/fuse/fuse_i.h | 18 ++++---
+ fs/fuse/inode.c | 80 +++++++++++++++++++++++++++++
+ include/linux/fuse.h | 29 ++++++++++-
+ 5 files changed, 258 insertions(+), 17 deletions(-)
+Merging gfs2/master
+$ git merge gfs2/master
+Already up-to-date.
+Merging jfs/next
+$ git merge jfs/next
+Already up-to-date.
+Merging nfs/linux-next
+$ git merge nfs/linux-next
+Already up-to-date.
+Merging nfsd/nfsd-next
+$ git merge nfsd/nfsd-next
+Auto-merging fs/nfsd/nfssvc.c
+Auto-merging include/linux/nfs4.h
+Auto-merging net/sunrpc/clnt.c
+Merge made by recursive.
+ fs/lockd/clntlock.c | 2 +-
+ fs/lockd/host.c | 4 +-
+ fs/lockd/mon.c | 2 +-
+ fs/lockd/svcsubs.c | 2 +-
+ fs/nfsd/export.c | 2 +
+ fs/nfsd/nfs3xdr.c | 75 ++--
+ fs/nfsd/nfs4acl.c | 4 +-
+ fs/nfsd/nfs4callback.c | 263 ++++++++++--
+ fs/nfsd/nfs4proc.c | 89 ++--
+ fs/nfsd/nfs4state.c | 681 ++++++++++++++----------------
+ fs/nfsd/nfs4xdr.c | 42 +-
+ fs/nfsd/nfsctl.c | 8 +-
+ fs/nfsd/nfsfh.c | 158 ++++----
+ fs/nfsd/nfssvc.c | 54 ++-
+ include/linux/lockd/lockd.h | 43 --
+ include/linux/nfs4.h | 2 +-
+ include/linux/nfsd/nfsd.h | 7 +-
+ include/linux/nfsd/state.h | 77 +++-
+ include/linux/nfsd/xdr4.h | 19 +-
+ include/linux/sunrpc/auth.h | 4 +-
+ include/linux/sunrpc/clnt.h | 114 +++++
+ include/linux/sunrpc/svc.h | 2 -
+ include/linux/sunrpc/svc_xprt.h | 1 +
+ include/linux/sunrpc/svcsock.h | 1 +
+ include/linux/sunrpc/xprt.h | 19 +
+ include/linux/sunrpc/xprtrdma.h | 5 -
+ include/linux/sunrpc/xprtsock.h | 11 -
+ net/sunrpc/auth.c | 20 +-
+ net/sunrpc/auth_generic.c | 4 +-
+ net/sunrpc/auth_gss/svcauth_gss.c | 6 +-
+ net/sunrpc/cache.c | 87 +++--
+ net/sunrpc/clnt.c | 1 +
+ net/sunrpc/sched.c | 7 +-
+ net/sunrpc/sunrpc.h | 14 +
+ net/sunrpc/svc_xprt.c | 25 +-
+ net/sunrpc/svcauth_unix.c | 1 +
+ net/sunrpc/svcsock.c | 335 +++++++++++----
+ net/sunrpc/xprt.c | 15 +-
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 +-
+ net/sunrpc/xprtsock.c | 242 +++++++++++-
+ 40 files changed, 1567 insertions(+), 885 deletions(-)
+Merging nilfs2/for-next
+$ git merge nilfs2/for-next
+Auto-merging fs/nilfs2/the_nilfs.c
+Merge made by recursive.
+Merging ocfs2/linux-next
+$ git merge ocfs2/linux-next
+Auto-merging arch/x86/ia32/ia32entry.S
+Auto-merging arch/x86/include/asm/unistd_32.h
+Auto-merging arch/x86/include/asm/unistd_64.h
+Auto-merging fs/namei.c
+Auto-merging fs/ocfs2/file.c
+Auto-merging fs/ocfs2/ioctl.c
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/security.h
+Auto-merging include/linux/syscalls.h
+Auto-merging security/capability.c
+Auto-merging security/security.c
+Merge made by recursive.
+ Documentation/filesystems/reflink.txt | 174 ++
+ Documentation/filesystems/vfs.txt | 4 +
+ arch/x86/ia32/ia32entry.S | 1 +
+ arch/x86/include/asm/unistd_32.h | 1 +
+ arch/x86/include/asm/unistd_64.h | 2 +
+ arch/x86/kernel/syscall_table_32.S | 1 +
+ fs/namei.c | 137 ++
+ fs/ocfs2/Makefile | 1 +
+ fs/ocfs2/alloc.c | 1342 ++++++-----
+ fs/ocfs2/alloc.h | 101 +-
+ fs/ocfs2/aops.c | 37 +-
+ fs/ocfs2/aops.h | 2 +
+ fs/ocfs2/buffer_head_io.c | 47 +-
+ fs/ocfs2/buffer_head_io.h | 8 +-
+ fs/ocfs2/cluster/masklog.c | 1 +
+ fs/ocfs2/cluster/masklog.h | 1 +
+ fs/ocfs2/dir.c | 107 +-
+ fs/ocfs2/dlm/dlmthread.c | 6 +-
+ fs/ocfs2/dlmglue.c | 105 +-
+ fs/ocfs2/dlmglue.h | 6 +
+ fs/ocfs2/extent_map.c | 33 +-
+ fs/ocfs2/extent_map.h | 8 +-
+ fs/ocfs2/file.c | 151 ++-
+ fs/ocfs2/file.h | 2 +
+ fs/ocfs2/inode.c | 86 +-
+ fs/ocfs2/inode.h | 20 +-
+ fs/ocfs2/ioctl.c | 14 +
+ fs/ocfs2/journal.c | 82 +-
+ fs/ocfs2/journal.h | 94 +-
+ fs/ocfs2/localalloc.c | 12 +-
+ fs/ocfs2/namei.c | 343 +++-
+ fs/ocfs2/namei.h | 6 +
+ fs/ocfs2/ocfs2.h | 52 +-
+ fs/ocfs2/ocfs2_fs.h | 107 +-
+ fs/ocfs2/ocfs2_lockid.h | 5 +
+ fs/ocfs2/quota_global.c | 5 +-
+ fs/ocfs2/quota_local.c | 26 +-
+ fs/ocfs2/refcounttree.c | 4249 +++++++++++++++++++++++++++++++++
+ fs/ocfs2/refcounttree.h | 108 +
+ fs/ocfs2/resize.c | 16 +-
+ fs/ocfs2/slot_map.c | 10 +-
+ fs/ocfs2/suballoc.c | 35 +-
+ fs/ocfs2/super.c | 13 +-
+ fs/ocfs2/uptodate.c | 265 ++-
+ fs/ocfs2/uptodate.h | 51 +-
+ fs/ocfs2/xattr.c | 2056 +++++++++++++++--
+ fs/ocfs2/xattr.h | 15 +-
+ include/linux/fcntl.h | 8 +
+ include/linux/fs.h | 2 +
+ include/linux/security.h | 23 +
+ include/linux/syscalls.h | 3 +
+ security/capability.c | 7 +
+ security/security.c | 8 +
+ 53 files changed, 8823 insertions(+), 1176 deletions(-)
+ create mode 100644 Documentation/filesystems/reflink.txt
+ create mode 100644 fs/ocfs2/refcounttree.c
+ create mode 100644 fs/ocfs2/refcounttree.h
+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
+Already up-to-date.
+Merging ubifs/linux-next
+$ git merge ubifs/linux-next
+Resolved 'fs/ubifs/super.c' using previous resolution.
+Auto-merging fs/ubifs/super.c
+CONFLICT (content): Merge conflict in fs/ubifs/super.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9ebdd77] Merge commit 'ubifs/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/ubifs/commit.c | 2 +-
+ fs/ubifs/debug.c | 2 +-
+ fs/ubifs/debug.h | 3 ++
+ fs/ubifs/file.c | 62 +++++++++++++++++++--------------------
+ fs/ubifs/gc.c | 2 +-
+ fs/ubifs/key.h | 35 ++++------------------
+ fs/ubifs/log.c | 2 +-
+ fs/ubifs/lprops.c | 2 +-
+ fs/ubifs/master.c | 20 +++++++++----
+ fs/ubifs/orphan.c | 7 ++--
+ fs/ubifs/recovery.c | 4 +-
+ fs/ubifs/replay.c | 6 ++--
+ fs/ubifs/scan.c | 32 ++++++++++++++------
+ fs/ubifs/super.c | 33 ++++++---------------
+ fs/ubifs/tnc.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++--
+ fs/ubifs/tnc_commit.c | 2 +-
+ fs/ubifs/ubifs.h | 2 +-
+ fs/ubifs/xattr.c | 4 +-
+ 18 files changed, 176 insertions(+), 120 deletions(-)
+Merging xfs/master
+$ git merge xfs/master
+Resolved 'fs/xfs/linux-2.6/xfs_lrw.c' using previous resolution.
+Auto-merging MAINTAINERS
+Auto-merging fs/xfs/linux-2.6/xfs_iops.c
+Auto-merging fs/xfs/linux-2.6/xfs_lrw.c
+CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_lrw.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master faf518b] Merge commit 'xfs/master'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 2 +-
+ fs/xfs/linux-2.6/xfs_aops.c | 1 -
+ fs/xfs/linux-2.6/xfs_file.c | 19 +-
+ fs/xfs/linux-2.6/xfs_iops.c | 1 -
+ fs/xfs/linux-2.6/xfs_lrw.c | 8 +-
+ fs/xfs/linux-2.6/xfs_stats.c | 51 ++--
+ fs/xfs/linux-2.6/xfs_super.c | 24 +-
+ fs/xfs/linux-2.6/xfs_sync.c | 15 -
+ fs/xfs/linux-2.6/xfs_sync.h | 1 -
+ fs/xfs/quota/xfs_qm_stats.c | 78 ++---
+ fs/xfs/xfs_ag.h | 9 +
+ fs/xfs/xfs_bmap.c | 2 +-
+ fs/xfs/xfs_bmap.h | 11 -
+ fs/xfs/xfs_bmap_btree.c | 20 +-
+ fs/xfs/xfs_bmap_btree.h | 1 -
+ fs/xfs/xfs_btree.c | 42 +---
+ fs/xfs/xfs_btree.h | 15 -
+ fs/xfs/xfs_ialloc.c | 805 +++++++++++++++++++++---------------------
+ fs/xfs/xfs_ialloc.h | 18 +-
+ fs/xfs/xfs_iget.c | 27 --
+ fs/xfs/xfs_inode.c | 8 +-
+ fs/xfs/xfs_inode.h | 8 -
+ fs/xfs/xfs_inode_item.c | 10 -
+ fs/xfs/xfs_inode_item.h | 2 -
+ fs/xfs/xfs_inum.h | 1 -
+ fs/xfs/xfs_itable.c | 98 +++---
+ fs/xfs/xfs_itable.h | 5 -
+ fs/xfs/xfs_log_priv.h | 2 -
+ fs/xfs/xfs_log_recover.c | 2 +-
+ fs/xfs/xfs_mount.c | 2 +-
+ fs/xfs/xfs_mount.h | 3 -
+ fs/xfs/xfs_mru_cache.c | 29 --
+ fs/xfs/xfs_mru_cache.h | 1 -
+ fs/xfs/xfs_rw.c | 84 -----
+ fs/xfs/xfs_rw.h | 7 -
+ fs/xfs/xfs_trans.h | 2 +-
+ fs/xfs/xfs_trans_buf.c | 4 +-
+ fs/xfs/xfs_trans_inode.c | 86 +-----
+ fs/xfs/xfs_vnodeops.c | 17 +-
+ 39 files changed, 593 insertions(+), 928 deletions(-)
+Merging vfs/for-next
+$ git merge vfs/for-next
+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
+Already up-to-date.
+Merging quilt/i2c
+$ git merge quilt/i2c
+Resolved 'drivers/base/class.c' using previous resolution.
+Removing Documentation/i2c/chips/pca9539
+Removing Documentation/i2c/chips/pcf8574
+Removing Documentation/i2c/chips/pcf8575
+Auto-merging MAINTAINERS
+Auto-merging drivers/base/class.c
+CONFLICT (content): Merge conflict in drivers/base/class.c
+Auto-merging drivers/base/core.c
+Auto-merging drivers/i2c/busses/Kconfig
+Removing drivers/i2c/chips/pca9539.c
+Removing drivers/i2c/chips/pcf8574.c
+Removing drivers/i2c/chips/pcf8575.c
+Auto-merging include/linux/device.h
+Auto-merging include/linux/netdevice.h
+Auto-merging include/linux/pci_ids.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4f2cc67] Merge branch 'quilt/i2c'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/i2c/busses/i2c-piix4 | 2 +
+ Documentation/i2c/chips/pca9539 | 58 -----
+ Documentation/i2c/chips/pcf8574 | 65 ------
+ Documentation/i2c/chips/pcf8575 | 69 ------
+ MAINTAINERS | 16 ++
+ drivers/base/class.c | 4 +-
+ drivers/gpio/pcf857x.c | 1 +
+ drivers/i2c/Kconfig | 8 +
+ drivers/i2c/busses/Kconfig | 14 +-
+ drivers/i2c/busses/Makefile | 3 +
+ drivers/i2c/busses/i2c-piix4.c | 9 +-
+ drivers/i2c/busses/i2c-pnx.c | 7 +-
+ drivers/i2c/busses/i2c-scmi.c | 440 ++++++++++++++++++++++++++++++++++++
+ drivers/i2c/busses/i2c-taos-evm.c | 45 ++--
+ drivers/i2c/busses/scx200_acb.c | 6 +-
+ drivers/i2c/chips/Kconfig | 48 ----
+ drivers/i2c/chips/Makefile | 3 -
+ drivers/i2c/chips/pca9539.c | 152 -------------
+ drivers/i2c/chips/pcf8574.c | 215 ------------------
+ drivers/i2c/chips/pcf8575.c | 198 ----------------
+ drivers/i2c/chips/tsl2550.c | 42 +---
+ drivers/i2c/i2c-core.c | 165 ++++++++++----
+ include/linux/i2c-id.h | 11 -
+ include/linux/i2c.h | 2 -
+ include/linux/pci_ids.h | 1 +
+ 25 files changed, 648 insertions(+), 936 deletions(-)
+ delete mode 100644 Documentation/i2c/chips/pca9539
+ delete mode 100644 Documentation/i2c/chips/pcf8574
+ delete mode 100644 Documentation/i2c/chips/pcf8575
+ create mode 100644 drivers/i2c/busses/i2c-scmi.c
+ delete mode 100644 drivers/i2c/chips/pca9539.c
+ delete mode 100644 drivers/i2c/chips/pcf8574.c
+ delete mode 100644 drivers/i2c/chips/pcf8575.c
+Merging quilt/jdelvare-hwmon
+$ git merge quilt/jdelvare-hwmon
+Auto-merging MAINTAINERS
+Merge made by recursive.
+ Documentation/hwmon/pcf8591 | 28 ++--
+ Documentation/hwmon/tmp421 | 36 +++++
+ MAINTAINERS | 6 +
+ drivers/hwmon/Kconfig | 110 ++++++++------
+ drivers/hwmon/Makefile | 7 +-
+ drivers/hwmon/abituguru.c | 2 +-
+ drivers/hwmon/abituguru3.c | 79 +++++-----
+ drivers/hwmon/applesmc.c | 2 +-
+ drivers/hwmon/dme1737.c | 2 +-
+ drivers/hwmon/f71805f.c | 2 +-
+ drivers/hwmon/hdaps.c | 3 +-
+ drivers/hwmon/hwmon-vid.c | 10 +-
+ drivers/hwmon/it87.c | 2 +-
+ drivers/hwmon/lm78.c | 2 +-
+ drivers/hwmon/lm85.c | 32 ++++
+ drivers/hwmon/pc87360.c | 2 +-
+ drivers/hwmon/pc87427.c | 8 +-
+ drivers/hwmon/sis5595.c | 2 +-
+ drivers/hwmon/smsc47b397.c | 2 +-
+ drivers/hwmon/smsc47m1.c | 2 +-
+ drivers/hwmon/tmp421.c | 347 +++++++++++++++++++++++++++++++++++++++++++
+ drivers/hwmon/via686a.c | 2 +-
+ drivers/hwmon/vt1211.c | 8 +-
+ drivers/hwmon/vt8231.c | 2 +-
+ drivers/hwmon/w83627ehf.c | 2 +-
+ drivers/hwmon/w83627hf.c | 2 +-
+ drivers/hwmon/w83781d.c | 2 +-
+ 27 files changed, 579 insertions(+), 125 deletions(-)
+ create mode 100644 Documentation/hwmon/tmp421
+ create mode 100644 drivers/hwmon/tmp421.c
+Merging quilt/kernel-doc
+$ git merge quilt/kernel-doc
+Merge made by recursive.
+ Documentation/kernel-doc-nano-HOWTO.txt | 4 +++-
+ Documentation/kref.txt | 1 -
+ mm/mmap.c | 2 +-
+ scripts/kernel-doc | 21 ++++++++++++++++-----
+ 4 files changed, 20 insertions(+), 8 deletions(-)
+Merging v4l-dvb/master
+$ git merge v4l-dvb/master
+Resolved 'drivers/media/video/sh_mobile_ceu_camera.c' using previous resolution.
+Auto-merging arch/sh/boards/board-ap325rxa.c
+Auto-merging drivers/media/video/sh_mobile_ceu_camera.c
+CONFLICT (content): Merge conflict in drivers/media/video/sh_mobile_ceu_camera.c
+Auto-merging drivers/staging/Kconfig
+Auto-merging drivers/staging/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 79cf98c] Merge commit 'v4l-dvb/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/Makefile | 2 +-
+ Documentation/DocBook/dvb/audio.xml | 1473 ++++++++++++
+ Documentation/DocBook/dvb/ca.xml | 221 ++
+ Documentation/DocBook/dvb/demux.xml | 973 ++++++++
+ Documentation/DocBook/dvb/dvbapi.xml | 79 +
+ Documentation/DocBook/dvb/dvbstb.pdf | Bin 0 -> 1881 bytes
+ Documentation/DocBook/dvb/dvbstb.png | Bin 0 -> 22655 bytes
+ Documentation/DocBook/dvb/examples.xml | 365 +++
+ Documentation/DocBook/dvb/frontend.xml | 1765 ++++++++++++++
+ Documentation/DocBook/dvb/intro.xml | 191 ++
+ Documentation/DocBook/dvb/kdapi.xml | 2309 ++++++++++++++++++
+ Documentation/DocBook/dvb/net.xml | 12 +
+ Documentation/DocBook/dvb/video.xml | 1971 ++++++++++++++++
+ Documentation/DocBook/media-entities.tmpl | 363 +++
+ Documentation/DocBook/media-indices.tmpl | 85 +
+ Documentation/DocBook/media.tmpl | 112 +
+ Documentation/DocBook/v4l/biblio.xml | 188 ++
+ Documentation/DocBook/v4l/capture.c.xml | 659 ++++++
+ Documentation/DocBook/v4l/common.xml | 1169 ++++++++++
+ Documentation/DocBook/v4l/compat.xml | 2457 ++++++++++++++++++++
+ Documentation/DocBook/v4l/controls.xml | 2049 ++++++++++++++++
+ Documentation/DocBook/v4l/crop.gif | Bin 0 -> 5967 bytes
+ Documentation/DocBook/v4l/crop.pdf | Bin 0 -> 5846 bytes
+ Documentation/DocBook/v4l/dev-capture.xml | 115 +
+ Documentation/DocBook/v4l/dev-codec.xml | 26 +
+ Documentation/DocBook/v4l/dev-effect.xml | 25 +
+ Documentation/DocBook/v4l/dev-osd.xml | 164 ++
+ Documentation/DocBook/v4l/dev-output.xml | 111 +
+ Documentation/DocBook/v4l/dev-overlay.xml | 379 +++
+ Documentation/DocBook/v4l/dev-radio.xml | 57 +
+ Documentation/DocBook/v4l/dev-raw-vbi.xml | 347 +++
+ Documentation/DocBook/v4l/dev-rds.xml | 168 ++
+ Documentation/DocBook/v4l/dev-sliced-vbi.xml | 708 ++++++
+ Documentation/DocBook/v4l/dev-teletext.xml | 40 +
+ Documentation/DocBook/v4l/driver.xml | 208 ++
+ Documentation/DocBook/v4l/fdl-appendix.xml | 671 ++++++
+ Documentation/DocBook/v4l/fieldseq_bt.gif | Bin 0 -> 25430 bytes
+ Documentation/DocBook/v4l/fieldseq_bt.pdf | Bin 0 -> 9185 bytes
+ Documentation/DocBook/v4l/fieldseq_tb.gif | Bin 0 -> 25323 bytes
+ Documentation/DocBook/v4l/fieldseq_tb.pdf | Bin 0 -> 9173 bytes
+ Documentation/DocBook/v4l/func-close.xml | 70 +
+ Documentation/DocBook/v4l/func-ioctl.xml | 146 ++
+ Documentation/DocBook/v4l/func-mmap.xml | 185 ++
+ Documentation/DocBook/v4l/func-munmap.xml | 83 +
+ Documentation/DocBook/v4l/func-open.xml | 121 +
+ Documentation/DocBook/v4l/func-poll.xml | 127 +
+ Documentation/DocBook/v4l/func-read.xml | 189 ++
+ Documentation/DocBook/v4l/func-select.xml | 138 ++
+ Documentation/DocBook/v4l/func-write.xml | 136 ++
+ Documentation/DocBook/v4l/io.xml | 1073 +++++++++
+ Documentation/DocBook/v4l/keytable.c.xml | 172 ++
+ Documentation/DocBook/v4l/libv4l.xml | 167 ++
+ Documentation/DocBook/v4l/pixfmt-grey.xml | 70 +
+ Documentation/DocBook/v4l/pixfmt-nv12.xml | 151 ++
+ Documentation/DocBook/v4l/pixfmt-nv16.xml | 174 ++
+ Documentation/DocBook/v4l/pixfmt-packed-rgb.xml | 862 +++++++
+ Documentation/DocBook/v4l/pixfmt-packed-yuv.xml | 244 ++
+ Documentation/DocBook/v4l/pixfmt-sbggr16.xml | 91 +
+ Documentation/DocBook/v4l/pixfmt-sbggr8.xml | 75 +
+ Documentation/DocBook/v4l/pixfmt-sgbrg8.xml | 75 +
+ Documentation/DocBook/v4l/pixfmt-sgrbg8.xml | 75 +
+ Documentation/DocBook/v4l/pixfmt-uyvy.xml | 128 +
+ Documentation/DocBook/v4l/pixfmt-vyuy.xml | 128 +
+ Documentation/DocBook/v4l/pixfmt-y16.xml | 89 +
+ Documentation/DocBook/v4l/pixfmt-y41p.xml | 157 ++
+ Documentation/DocBook/v4l/pixfmt-yuv410.xml | 141 ++
+ Documentation/DocBook/v4l/pixfmt-yuv411p.xml | 155 ++
+ Documentation/DocBook/v4l/pixfmt-yuv420.xml | 157 ++
+ Documentation/DocBook/v4l/pixfmt-yuv422p.xml | 161 ++
+ Documentation/DocBook/v4l/pixfmt-yuyv.xml | 128 +
+ Documentation/DocBook/v4l/pixfmt-yvyu.xml | 128 +
+ Documentation/DocBook/v4l/pixfmt.xml | 796 +++++++
+ Documentation/DocBook/v4l/remote_controllers.xml | 170 ++
+ Documentation/DocBook/v4l/v4l2.xml | 481 ++++
+ Documentation/DocBook/v4l/v4l2grab.c.xml | 164 ++
+ Documentation/DocBook/v4l/vbi_525.gif | Bin 0 -> 4741 bytes
+ Documentation/DocBook/v4l/vbi_525.pdf | Bin 0 -> 3395 bytes
+ Documentation/DocBook/v4l/vbi_625.gif | Bin 0 -> 5095 bytes
+ Documentation/DocBook/v4l/vbi_625.pdf | Bin 0 -> 3683 bytes
+ Documentation/DocBook/v4l/vbi_hsync.gif | Bin 0 -> 2400 bytes
+ Documentation/DocBook/v4l/vbi_hsync.pdf | Bin 0 -> 7405 bytes
+ Documentation/DocBook/v4l/videodev2.h.xml | 1639 +++++++++++++
+ Documentation/DocBook/v4l/vidioc-cropcap.xml | 174 ++
+ .../DocBook/v4l/vidioc-dbg-g-chip-ident.xml | 275 +++
+ .../DocBook/v4l/vidioc-dbg-g-register.xml | 275 +++
+ Documentation/DocBook/v4l/vidioc-encoder-cmd.xml | 204 ++
+ Documentation/DocBook/v4l/vidioc-enum-fmt.xml | 164 ++
+ .../DocBook/v4l/vidioc-enum-frameintervals.xml | 270 +++
+ .../DocBook/v4l/vidioc-enum-framesizes.xml | 282 +++
+ Documentation/DocBook/v4l/vidioc-enumaudio.xml | 86 +
+ Documentation/DocBook/v4l/vidioc-enumaudioout.xml | 89 +
+ Documentation/DocBook/v4l/vidioc-enuminput.xml | 287 +++
+ Documentation/DocBook/v4l/vidioc-enumoutput.xml | 172 ++
+ Documentation/DocBook/v4l/vidioc-enumstd.xml | 391 ++++
+ Documentation/DocBook/v4l/vidioc-g-audio.xml | 188 ++
+ Documentation/DocBook/v4l/vidioc-g-audioout.xml | 154 ++
+ Documentation/DocBook/v4l/vidioc-g-crop.xml | 143 ++
+ Documentation/DocBook/v4l/vidioc-g-ctrl.xml | 130 +
+ Documentation/DocBook/v4l/vidioc-g-enc-index.xml | 213 ++
+ Documentation/DocBook/v4l/vidioc-g-ext-ctrls.xml | 307 +++
+ Documentation/DocBook/v4l/vidioc-g-fbuf.xml | 456 ++++
+ Documentation/DocBook/v4l/vidioc-g-fmt.xml | 201 ++
+ Documentation/DocBook/v4l/vidioc-g-frequency.xml | 145 ++
+ Documentation/DocBook/v4l/vidioc-g-input.xml | 100 +
+ Documentation/DocBook/v4l/vidioc-g-jpegcomp.xml | 180 ++
+ Documentation/DocBook/v4l/vidioc-g-modulator.xml | 246 ++
+ Documentation/DocBook/v4l/vidioc-g-output.xml | 100 +
+ Documentation/DocBook/v4l/vidioc-g-parm.xml | 332 +++
+ Documentation/DocBook/v4l/vidioc-g-priority.xml | 144 ++
+ .../DocBook/v4l/vidioc-g-sliced-vbi-cap.xml | 264 +++
+ Documentation/DocBook/v4l/vidioc-g-std.xml | 99 +
+ Documentation/DocBook/v4l/vidioc-g-tuner.xml | 535 +++++
+ Documentation/DocBook/v4l/vidioc-log-status.xml | 58 +
+ Documentation/DocBook/v4l/vidioc-overlay.xml | 83 +
+ Documentation/DocBook/v4l/vidioc-qbuf.xml | 168 ++
+ Documentation/DocBook/v4l/vidioc-querybuf.xml | 103 +
+ Documentation/DocBook/v4l/vidioc-querycap.xml | 284 +++
+ Documentation/DocBook/v4l/vidioc-queryctrl.xml | 428 ++++
+ Documentation/DocBook/v4l/vidioc-querystd.xml | 83 +
+ Documentation/DocBook/v4l/vidioc-reqbufs.xml | 160 ++
+ .../DocBook/v4l/vidioc-s-hw-freq-seek.xml | 129 +
+ Documentation/DocBook/v4l/vidioc-streamon.xml | 106 +
+ Documentation/dvb/get_dvb_firmware | 37 +-
+ Documentation/video4linux/soc-camera.txt | 40 +
+ Documentation/video4linux/v4l2-framework.txt | 61 +-
+ arch/sh/boards/board-ap325rxa.c | 58 +-
+ drivers/media/common/tuners/tda18271-common.c | 3 +-
+ drivers/media/common/tuners/tda18271-fe.c | 83 +-
+ drivers/media/common/tuners/tda18271-maps.c | 3 +-
+ drivers/media/common/tuners/tda18271-priv.h | 1 +
+ drivers/media/common/tuners/tda18271.h | 14 +
+ drivers/media/common/tuners/tuner-xc2028.c | 20 +-
+ drivers/media/common/tuners/tuner-xc2028.h | 2 +
+ drivers/media/dvb/dvb-usb/af9015.c | 50 +-
+ drivers/media/dvb/dvb-usb/dib0700_devices.c | 122 +-
+ drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 5 +
+ drivers/media/dvb/frontends/dib7000p.c | 33 +-
+ drivers/media/video/Kconfig | 82 +
+ drivers/media/video/Makefile | 4 +
+ drivers/media/video/adv7343.c | 1 -
+ drivers/media/video/au0828/au0828-cards.c | 4 +-
+ drivers/media/video/bt8xx/bttv-cards.c | 44 +-
+ drivers/media/video/cafe_ccic.c | 2 +-
+ drivers/media/video/cx18/cx18-driver.c | 2 +-
+ drivers/media/video/cx18/cx18-i2c.c | 16 +-
+ drivers/media/video/cx18/cx18-streams.c | 4 +-
+ drivers/media/video/cx231xx/cx231xx-cards.c | 4 +-
+ drivers/media/video/cx23885/cx23885-cards.c | 2 +-
+ drivers/media/video/cx23885/cx23885-dvb.c | 4 +
+ drivers/media/video/cx23885/cx23885-video.c | 6 +-
+ drivers/media/video/cx88/cx88-cards.c | 14 +-
+ drivers/media/video/cx88/cx88-video.c | 6 +-
+ drivers/media/video/davinci/Makefile | 17 +
+ drivers/media/video/davinci/ccdc_hw_device.h | 110 +
+ drivers/media/video/davinci/dm355_ccdc.c | 978 ++++++++
+ drivers/media/video/davinci/dm355_ccdc_regs.h | 310 +++
+ drivers/media/video/davinci/dm644x_ccdc.c | 878 +++++++
+ drivers/media/video/davinci/dm644x_ccdc_regs.h | 145 ++
+ drivers/media/video/davinci/vpfe_capture.c | 2124 +++++++++++++++++
+ drivers/media/video/davinci/vpif.c | 296 +++
+ drivers/media/video/davinci/vpif.h | 642 +++++
+ drivers/media/video/davinci/vpif_capture.c | 2168 +++++++++++++++++
+ drivers/media/video/davinci/vpif_capture.h | 165 ++
+ drivers/media/video/davinci/vpif_display.c | 1656 +++++++++++++
+ drivers/media/video/davinci/vpif_display.h | 175 ++
+ drivers/media/video/davinci/vpss.c | 301 +++
+ drivers/media/video/em28xx/Makefile | 2 +-
+ drivers/media/video/em28xx/em28xx-cards.c | 35 +-
+ drivers/media/video/em28xx/em28xx-core.c | 51 +-
+ drivers/media/video/em28xx/em28xx-reg.h | 16 +
+ drivers/media/video/em28xx/em28xx-vbi.c | 142 ++
+ drivers/media/video/em28xx/em28xx-video.c | 589 ++++-
+ drivers/media/video/em28xx/em28xx.h | 25 +-
+ drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 13 +
+ drivers/media/video/ivtv/ivtv-driver.c | 2 +-
+ drivers/media/video/ivtv/ivtv-i2c.c | 18 +-
+ drivers/media/video/ivtv/ivtv-streams.c | 4 +-
+ drivers/media/video/mt9m001.c | 435 ++--
+ drivers/media/video/mt9m111.c | 524 +++--
+ drivers/media/video/mt9t031.c | 491 +++--
+ drivers/media/video/mt9v022.c | 434 ++--
+ drivers/media/video/mx1_camera.c | 78 +-
+ drivers/media/video/mx3_camera.c | 207 +-
+ drivers/media/video/mxb.c | 14 +-
+ drivers/media/video/ov772x.c | 381 ++--
+ drivers/media/video/pvrusb2/pvrusb2-devattr.c | 2 +
+ drivers/media/video/pvrusb2/pvrusb2-hdw.c | 10 +-
+ drivers/media/video/pxa_camera.c | 358 ++--
+ drivers/media/video/saa7134/saa7134-cards.c | 12 +-
+ drivers/media/video/saa7134/saa7134-core.c | 6 +-
+ drivers/media/video/saa7134/saa7134-dvb.c | 1 +
+ drivers/media/video/sh_mobile_ceu_camera.c | 1058 ++++++++-
+ drivers/media/video/soc_camera.c | 725 ++++---
+ drivers/media/video/soc_camera_platform.c | 163 +-
+ drivers/media/video/tvp514x.c | 1030 ++++-----
+ drivers/media/video/tvp514x_regs.h | 10 -
+ drivers/media/video/tw9910.c | 361 ++--
+ drivers/media/video/usbvision/usbvision-i2c.c | 12 +-
+ drivers/media/video/v4l2-common.c | 133 --
+ drivers/media/video/v4l2-dev.c | 154 +-
+ drivers/media/video/vino.c | 8 +-
+ drivers/media/video/w9968cf.c | 4 +-
+ drivers/media/video/zoran/zoran_card.c | 8 +-
+ drivers/staging/Kconfig | 2 +
+ drivers/staging/Makefile | 1 +
+ drivers/staging/cx25821/Kconfig | 34 +
+ drivers/staging/cx25821/Makefile | 14 +
+ drivers/staging/cx25821/README | 6 +
+ drivers/staging/cx25821/cx25821-alsa.c | 789 +++++++
+ drivers/staging/cx25821/cx25821-audio-upstream.c | 804 +++++++
+ drivers/staging/cx25821/cx25821-audio-upstream.h | 57 +
+ drivers/staging/cx25821/cx25821-audio.h | 57 +
+ drivers/staging/cx25821/cx25821-audups11.c | 434 ++++
+ drivers/staging/cx25821/cx25821-biffuncs.h | 45 +
+ drivers/staging/cx25821/cx25821-cards.c | 70 +
+ drivers/staging/cx25821/cx25821-core.c | 1551 ++++++++++++
+ drivers/staging/cx25821/cx25821-gpio.c | 98 +
+ drivers/staging/cx25821/cx25821-gpio.h | 2 +
+ drivers/staging/cx25821/cx25821-i2c.c | 419 ++++
+ drivers/staging/cx25821/cx25821-medusa-defines.h | 51 +
+ drivers/staging/cx25821/cx25821-medusa-reg.h | 455 ++++
+ drivers/staging/cx25821/cx25821-medusa-video.c | 869 +++++++
+ drivers/staging/cx25821/cx25821-medusa-video.h | 49 +
+ drivers/staging/cx25821/cx25821-reg.h | 1592 +++++++++++++
+ drivers/staging/cx25821/cx25821-sram.h | 261 +++
+ .../staging/cx25821/cx25821-video-upstream-ch2.c | 835 +++++++
+ .../staging/cx25821/cx25821-video-upstream-ch2.h | 101 +
+ drivers/staging/cx25821/cx25821-video-upstream.c | 894 +++++++
+ drivers/staging/cx25821/cx25821-video-upstream.h | 109 +
+ drivers/staging/cx25821/cx25821-video.c | 1299 +++++++++++
+ drivers/staging/cx25821/cx25821-video.h | 194 ++
+ drivers/staging/cx25821/cx25821-video0.c | 451 ++++
+ drivers/staging/cx25821/cx25821-video1.c | 451 ++++
+ drivers/staging/cx25821/cx25821-video2.c | 452 ++++
+ drivers/staging/cx25821/cx25821-video3.c | 451 ++++
+ drivers/staging/cx25821/cx25821-video4.c | 450 ++++
+ drivers/staging/cx25821/cx25821-video5.c | 450 ++++
+ drivers/staging/cx25821/cx25821-video6.c | 450 ++++
+ drivers/staging/cx25821/cx25821-video7.c | 449 ++++
+ drivers/staging/cx25821/cx25821-videoioctl.c | 496 ++++
+ drivers/staging/cx25821/cx25821-vidups10.c | 435 ++++
+ drivers/staging/cx25821/cx25821-vidups9.c | 433 ++++
+ drivers/staging/cx25821/cx25821.h | 602 +++++
+ drivers/staging/go7007/go7007-driver.c | 12 +-
+ drivers/staging/go7007/go7007-fw.c | 3 +-
+ drivers/staging/go7007/go7007-i2c.c | 12 +-
+ drivers/staging/go7007/go7007-priv.h | 6 +-
+ drivers/staging/go7007/go7007-usb.c | 10 +-
+ drivers/staging/go7007/go7007-v4l2.c | 66 +-
+ drivers/staging/go7007/go7007.txt | 176 +-
+ drivers/staging/go7007/s2250-board.c | 20 +-
+ drivers/staging/go7007/s2250-loader.c | 8 +-
+ drivers/staging/go7007/snd-go7007.c | 2 +-
+ drivers/staging/go7007/wis-tw9903.c | 3 +-
+ drivers/staging/tm6000/Kconfig | 32 +
+ drivers/staging/tm6000/Makefile | 15 +
+ drivers/staging/tm6000/README | 11 +
+ drivers/staging/tm6000/hack.c | 252 ++
+ drivers/staging/tm6000/hack.h | 45 +
+ drivers/staging/tm6000/tm6000-alsa.c | 413 ++++
+ drivers/staging/tm6000/tm6000-cards.c | 630 +++++
+ drivers/staging/tm6000/tm6000-core.c | 511 ++++
+ drivers/staging/tm6000/tm6000-dvb.c | 322 +++
+ drivers/staging/tm6000/tm6000-i2c.c | 262 +++
+ drivers/staging/tm6000/tm6000-regs.h | 86 +
+ drivers/staging/tm6000/tm6000-stds.c | 873 +++++++
+ drivers/staging/tm6000/tm6000-usb-isoc.h | 53 +
+ drivers/staging/tm6000/tm6000-video.c | 1573 +++++++++++++
+ drivers/staging/tm6000/tm6000.h | 279 +++
+ include/linux/videodev2.h | 4 +-
+ include/media/davinci/ccdc_types.h | 43 +
+ include/media/davinci/dm355_ccdc.h | 321 +++
+ include/media/davinci/dm644x_ccdc.h | 184 ++
+ include/media/davinci/vpfe_capture.h | 198 ++
+ include/media/davinci/vpfe_types.h | 51 +
+ include/media/davinci/vpss.h | 69 +
+ include/media/soc_camera.h | 113 +-
+ include/media/soc_camera_platform.h | 9 +-
+ include/media/tvp514x.h | 4 -
+ include/media/v4l2-common.h | 24 +-
+ include/media/v4l2-dev.h | 6 +-
+ 281 files changed, 75061 insertions(+), 3226 deletions(-)
+ create mode 100644 Documentation/DocBook/dvb/audio.xml
+ create mode 100644 Documentation/DocBook/dvb/ca.xml
+ create mode 100644 Documentation/DocBook/dvb/demux.xml
+ create mode 100644 Documentation/DocBook/dvb/dvbapi.xml
+ create mode 100644 Documentation/DocBook/dvb/dvbstb.pdf
+ create mode 100644 Documentation/DocBook/dvb/dvbstb.png
+ create mode 100644 Documentation/DocBook/dvb/examples.xml
+ create mode 100644 Documentation/DocBook/dvb/frontend.xml
+ create mode 100644 Documentation/DocBook/dvb/intro.xml
+ create mode 100644 Documentation/DocBook/dvb/kdapi.xml
+ create mode 100644 Documentation/DocBook/dvb/net.xml
+ create mode 100644 Documentation/DocBook/dvb/video.xml
+ create mode 100644 Documentation/DocBook/media-entities.tmpl
+ create mode 100644 Documentation/DocBook/media-indices.tmpl
+ create mode 100644 Documentation/DocBook/media.tmpl
+ create mode 100644 Documentation/DocBook/v4l/biblio.xml
+ create mode 100644 Documentation/DocBook/v4l/capture.c.xml
+ create mode 100644 Documentation/DocBook/v4l/common.xml
+ create mode 100644 Documentation/DocBook/v4l/compat.xml
+ create mode 100644 Documentation/DocBook/v4l/controls.xml
+ create mode 100644 Documentation/DocBook/v4l/crop.gif
+ create mode 100644 Documentation/DocBook/v4l/crop.pdf
+ create mode 100644 Documentation/DocBook/v4l/dev-capture.xml
+ create mode 100644 Documentation/DocBook/v4l/dev-codec.xml
+ create mode 100644 Documentation/DocBook/v4l/dev-effect.xml
+ create mode 100644 Documentation/DocBook/v4l/dev-osd.xml
+ create mode 100644 Documentation/DocBook/v4l/dev-output.xml
+ create mode 100644 Documentation/DocBook/v4l/dev-overlay.xml
+ create mode 100644 Documentation/DocBook/v4l/dev-radio.xml
+ create mode 100644 Documentation/DocBook/v4l/dev-raw-vbi.xml
+ create mode 100644 Documentation/DocBook/v4l/dev-rds.xml
+ create mode 100644 Documentation/DocBook/v4l/dev-sliced-vbi.xml
+ create mode 100644 Documentation/DocBook/v4l/dev-teletext.xml
+ create mode 100644 Documentation/DocBook/v4l/driver.xml
+ create mode 100644 Documentation/DocBook/v4l/fdl-appendix.xml
+ create mode 100644 Documentation/DocBook/v4l/fieldseq_bt.gif
+ create mode 100644 Documentation/DocBook/v4l/fieldseq_bt.pdf
+ create mode 100644 Documentation/DocBook/v4l/fieldseq_tb.gif
+ create mode 100644 Documentation/DocBook/v4l/fieldseq_tb.pdf
+ create mode 100644 Documentation/DocBook/v4l/func-close.xml
+ create mode 100644 Documentation/DocBook/v4l/func-ioctl.xml
+ create mode 100644 Documentation/DocBook/v4l/func-mmap.xml
+ create mode 100644 Documentation/DocBook/v4l/func-munmap.xml
+ create mode 100644 Documentation/DocBook/v4l/func-open.xml
+ create mode 100644 Documentation/DocBook/v4l/func-poll.xml
+ create mode 100644 Documentation/DocBook/v4l/func-read.xml
+ create mode 100644 Documentation/DocBook/v4l/func-select.xml
+ create mode 100644 Documentation/DocBook/v4l/func-write.xml
+ create mode 100644 Documentation/DocBook/v4l/io.xml
+ create mode 100644 Documentation/DocBook/v4l/keytable.c.xml
+ create mode 100644 Documentation/DocBook/v4l/libv4l.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-grey.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-nv12.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-nv16.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-packed-rgb.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-packed-yuv.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-sbggr16.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-sbggr8.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-sgbrg8.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-sgrbg8.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-uyvy.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-vyuy.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-y16.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-y41p.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-yuv410.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-yuv411p.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-yuv420.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-yuv422p.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-yuyv.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt-yvyu.xml
+ create mode 100644 Documentation/DocBook/v4l/pixfmt.xml
+ create mode 100644 Documentation/DocBook/v4l/remote_controllers.xml
+ create mode 100644 Documentation/DocBook/v4l/v4l2.xml
+ create mode 100644 Documentation/DocBook/v4l/v4l2grab.c.xml
+ create mode 100644 Documentation/DocBook/v4l/vbi_525.gif
+ create mode 100644 Documentation/DocBook/v4l/vbi_525.pdf
+ create mode 100644 Documentation/DocBook/v4l/vbi_625.gif
+ create mode 100644 Documentation/DocBook/v4l/vbi_625.pdf
+ create mode 100644 Documentation/DocBook/v4l/vbi_hsync.gif
+ create mode 100644 Documentation/DocBook/v4l/vbi_hsync.pdf
+ create mode 100644 Documentation/DocBook/v4l/videodev2.h.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-cropcap.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-dbg-g-chip-ident.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-dbg-g-register.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-encoder-cmd.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-enum-fmt.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-enum-frameintervals.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-enum-framesizes.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-enumaudio.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-enumaudioout.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-enuminput.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-enumoutput.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-enumstd.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-g-audio.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-g-audioout.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-g-crop.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-g-ctrl.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-g-enc-index.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-g-ext-ctrls.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-g-fbuf.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-g-fmt.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-g-frequency.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-g-input.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-g-jpegcomp.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-g-modulator.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-g-output.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-g-parm.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-g-priority.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-g-sliced-vbi-cap.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-g-std.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-g-tuner.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-log-status.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-overlay.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-qbuf.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-querybuf.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-querycap.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-queryctrl.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-querystd.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-reqbufs.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-s-hw-freq-seek.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-streamon.xml
+ create mode 100644 drivers/media/video/davinci/Makefile
+ create mode 100644 drivers/media/video/davinci/ccdc_hw_device.h
+ create mode 100644 drivers/media/video/davinci/dm355_ccdc.c
+ create mode 100644 drivers/media/video/davinci/dm355_ccdc_regs.h
+ create mode 100644 drivers/media/video/davinci/dm644x_ccdc.c
+ create mode 100644 drivers/media/video/davinci/dm644x_ccdc_regs.h
+ create mode 100644 drivers/media/video/davinci/vpfe_capture.c
+ create mode 100644 drivers/media/video/davinci/vpif.c
+ create mode 100644 drivers/media/video/davinci/vpif.h
+ create mode 100644 drivers/media/video/davinci/vpif_capture.c
+ create mode 100644 drivers/media/video/davinci/vpif_capture.h
+ create mode 100644 drivers/media/video/davinci/vpif_display.c
+ create mode 100644 drivers/media/video/davinci/vpif_display.h
+ create mode 100644 drivers/media/video/davinci/vpss.c
+ create mode 100644 drivers/media/video/em28xx/em28xx-vbi.c
+ create mode 100644 drivers/staging/cx25821/Kconfig
+ create mode 100644 drivers/staging/cx25821/Makefile
+ create mode 100644 drivers/staging/cx25821/README
+ create mode 100644 drivers/staging/cx25821/cx25821-alsa.c
+ create mode 100644 drivers/staging/cx25821/cx25821-audio-upstream.c
+ create mode 100644 drivers/staging/cx25821/cx25821-audio-upstream.h
+ create mode 100644 drivers/staging/cx25821/cx25821-audio.h
+ create mode 100644 drivers/staging/cx25821/cx25821-audups11.c
+ create mode 100644 drivers/staging/cx25821/cx25821-biffuncs.h
+ create mode 100644 drivers/staging/cx25821/cx25821-cards.c
+ create mode 100644 drivers/staging/cx25821/cx25821-core.c
+ create mode 100644 drivers/staging/cx25821/cx25821-gpio.c
+ create mode 100644 drivers/staging/cx25821/cx25821-gpio.h
+ create mode 100644 drivers/staging/cx25821/cx25821-i2c.c
+ create mode 100644 drivers/staging/cx25821/cx25821-medusa-defines.h
+ create mode 100644 drivers/staging/cx25821/cx25821-medusa-reg.h
+ create mode 100644 drivers/staging/cx25821/cx25821-medusa-video.c
+ create mode 100644 drivers/staging/cx25821/cx25821-medusa-video.h
+ create mode 100644 drivers/staging/cx25821/cx25821-reg.h
+ create mode 100644 drivers/staging/cx25821/cx25821-sram.h
+ create mode 100644 drivers/staging/cx25821/cx25821-video-upstream-ch2.c
+ create mode 100644 drivers/staging/cx25821/cx25821-video-upstream-ch2.h
+ create mode 100644 drivers/staging/cx25821/cx25821-video-upstream.c
+ create mode 100644 drivers/staging/cx25821/cx25821-video-upstream.h
+ create mode 100644 drivers/staging/cx25821/cx25821-video.c
+ create mode 100644 drivers/staging/cx25821/cx25821-video.h
+ create mode 100644 drivers/staging/cx25821/cx25821-video0.c
+ create mode 100644 drivers/staging/cx25821/cx25821-video1.c
+ create mode 100644 drivers/staging/cx25821/cx25821-video2.c
+ create mode 100644 drivers/staging/cx25821/cx25821-video3.c
+ create mode 100644 drivers/staging/cx25821/cx25821-video4.c
+ create mode 100644 drivers/staging/cx25821/cx25821-video5.c
+ create mode 100644 drivers/staging/cx25821/cx25821-video6.c
+ create mode 100644 drivers/staging/cx25821/cx25821-video7.c
+ create mode 100644 drivers/staging/cx25821/cx25821-videoioctl.c
+ create mode 100644 drivers/staging/cx25821/cx25821-vidups10.c
+ create mode 100644 drivers/staging/cx25821/cx25821-vidups9.c
+ create mode 100644 drivers/staging/cx25821/cx25821.h
+ create mode 100644 drivers/staging/tm6000/Kconfig
+ create mode 100644 drivers/staging/tm6000/Makefile
+ create mode 100644 drivers/staging/tm6000/README
+ create mode 100644 drivers/staging/tm6000/hack.c
+ create mode 100644 drivers/staging/tm6000/hack.h
+ create mode 100644 drivers/staging/tm6000/tm6000-alsa.c
+ create mode 100644 drivers/staging/tm6000/tm6000-cards.c
+ create mode 100644 drivers/staging/tm6000/tm6000-core.c
+ create mode 100644 drivers/staging/tm6000/tm6000-dvb.c
+ create mode 100644 drivers/staging/tm6000/tm6000-i2c.c
+ create mode 100644 drivers/staging/tm6000/tm6000-regs.h
+ create mode 100644 drivers/staging/tm6000/tm6000-stds.c
+ create mode 100644 drivers/staging/tm6000/tm6000-usb-isoc.h
+ create mode 100644 drivers/staging/tm6000/tm6000-video.c
+ create mode 100644 drivers/staging/tm6000/tm6000.h
+ create mode 100644 include/media/davinci/ccdc_types.h
+ create mode 100644 include/media/davinci/dm355_ccdc.h
+ create mode 100644 include/media/davinci/dm644x_ccdc.h
+ create mode 100644 include/media/davinci/vpfe_capture.h
+ create mode 100644 include/media/davinci/vpfe_types.h
+ create mode 100644 include/media/davinci/vpss.h
+Merging quota/for_next
+$ git merge quota/for_next
+Already up-to-date.
+Merging kbuild/master
+$ git merge kbuild/master
+Resolved 'scripts/extract-ikconfig' using previous resolution.
+Auto-merging Documentation/dontdiff
+Removing scripts/binoffset.c
+Auto-merging scripts/extract-ikconfig
+CONFLICT (content): Merge conflict in scripts/extract-ikconfig
+Auto-merging scripts/kconfig/mconf.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4eb0c37] Merge commit 'kbuild/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/dontdiff | 1 -
+ scripts/.gitignore | 1 -
+ scripts/binoffset.c | 163 -------------------------------------------
+ scripts/extract-ikconfig | 127 ++++++++++++----------------------
+ scripts/kconfig/conf.c | 22 +++---
+ scripts/kconfig/expr.c | 2 +
+ scripts/kconfig/gconf.c | 21 +-----
+ scripts/kconfig/lkc_proto.h | 2 +
+ scripts/kconfig/mconf.c | 78 +--------------------
+ scripts/kconfig/menu.c | 79 +++++++++++++++++++++
+ scripts/kconfig/qconf.cc | 10 +--
+ usr/Makefile | 2 +-
+ 12 files changed, 150 insertions(+), 358 deletions(-)
+ delete mode 100644 scripts/binoffset.c
+Merging kconfig/for-next
+$ git merge kconfig/for-next
+Already up-to-date.
+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
+Auto-merging include/linux/Kbuild
+Merge made by recursive.
+ Documentation/Makefile | 3 +-
+ Documentation/ummunotify/Makefile | 7 +
+ Documentation/ummunotify/ummunotify.txt | 150 ++++++++
+ Documentation/ummunotify/umn-test.c | 200 +++++++++++
+ drivers/char/Kconfig | 12 +
+ drivers/char/Makefile | 1 +
+ drivers/char/ummunotify.c | 566 +++++++++++++++++++++++++++++++
+ include/linux/Kbuild | 1 +
+ include/linux/ummunotify.h | 121 +++++++
+ 9 files changed, 1060 insertions(+), 1 deletions(-)
+ create mode 100644 Documentation/ummunotify/Makefile
+ create mode 100644 Documentation/ummunotify/ummunotify.txt
+ create mode 100644 Documentation/ummunotify/umn-test.c
+ create mode 100644 drivers/char/ummunotify.c
+ create mode 100644 include/linux/ummunotify.h
+Merging acpi/test
+$ git merge acpi/test
+Resolved 'drivers/acpi/power.c' using previous resolution.
+Resolved 'drivers/pci/dmar.c' using previous resolution.
+Auto-merging MAINTAINERS
+Auto-merging arch/x86/kernel/reboot.c
+Auto-merging drivers/acpi/acpica/hwsleep.c
+Auto-merging drivers/acpi/blacklist.c
+Auto-merging drivers/acpi/pci_root.c
+Auto-merging drivers/acpi/power.c
+CONFLICT (content): Merge conflict in drivers/acpi/power.c
+Auto-merging drivers/acpi/scan.c
+Auto-merging drivers/acpi/sleep.c
+Auto-merging drivers/char/agp/hp-agp.c
+Auto-merging drivers/pci/dmar.c
+CONFLICT (content): Merge conflict in drivers/pci/dmar.c
+Auto-merging include/acpi/acpi_bus.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c7096c6] Merge commit 'acpi/test'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/stable/sysfs-class-backlight | 36 +
+ Documentation/ABI/testing/sysfs-class-lcd | 23 +
+ Documentation/ABI/testing/sysfs-class-led | 28 +
+ .../ABI/testing/sysfs-platform-asus-laptop | 52 ++
+ .../ABI/testing/sysfs-platform-eeepc-laptop | 50 ++
+ Documentation/laptops/asus-laptop.txt | 258 ++++++
+ Documentation/leds-class.txt | 9 +-
+ MAINTAINERS | 8 +
+ arch/ia64/hp/common/sba_iommu.c | 7 +-
+ arch/x86/include/asm/acpi.h | 1 -
+ arch/x86/kernel/reboot.c | 2 +-
+ arch/x86/pci/mmconfig-shared.c | 2 +
+ drivers/acpi/Kconfig | 17 +-
+ drivers/acpi/Makefile | 2 +
+ drivers/acpi/ac.c | 2 +
+ drivers/acpi/acpi_memhotplug.c | 51 +-
+ drivers/acpi/acpi_pad.c | 514 ++++++++++++
+ drivers/acpi/acpica/Makefile | 4 +-
+ drivers/acpi/acpica/acconfig.h | 10 +-
+ drivers/acpi/acpica/acdebug.h | 4 -
+ drivers/acpi/acpica/acglobal.h | 37 +-
+ drivers/acpi/acpica/achware.h | 8 +
+ drivers/acpi/acpica/acinterp.h | 4 +-
+ drivers/acpi/acpica/aclocal.h | 16 +
+ drivers/acpi/acpica/acmacros.h | 2 +
+ drivers/acpi/acpica/acnamesp.h | 25 +
+ drivers/acpi/acpica/acobject.h | 1 +
+ drivers/acpi/acpica/acparser.h | 2 +
+ drivers/acpi/acpica/acpredef.h | 584 ++++++++-----
+ drivers/acpi/acpica/acutils.h | 30 +-
+ drivers/acpi/acpica/amlcode.h | 1 +
+ drivers/acpi/acpica/dsfield.c | 18 +-
+ drivers/acpi/acpica/dsmethod.c | 15 +-
+ drivers/acpi/acpica/dsmthdat.c | 8 +-
+ drivers/acpi/acpica/dsobject.c | 23 +-
+ drivers/acpi/acpica/dswload.c | 41 +-
+ drivers/acpi/acpica/evevent.c | 13 +-
+ drivers/acpi/acpica/evgpe.c | 8 +-
+ drivers/acpi/acpica/evgpeblk.c | 4 +-
+ drivers/acpi/acpica/evrgnini.c | 45 +-
+ drivers/acpi/acpica/exconfig.c | 7 +
+ drivers/acpi/acpica/exdump.c | 6 +-
+ drivers/acpi/acpica/exfield.c | 82 ++-
+ drivers/acpi/acpica/exfldio.c | 7 +-
+ drivers/acpi/acpica/exutils.c | 53 +-
+ drivers/acpi/acpica/hwgpe.c | 34 +-
+ drivers/acpi/acpica/hwregs.c | 206 +++++-
+ drivers/acpi/acpica/hwsleep.c | 24 +-
+ drivers/acpi/acpica/hwtimer.c | 2 +-
+ drivers/acpi/acpica/hwxface.c | 195 +++--
+ drivers/acpi/acpica/nsalloc.c | 88 ++-
+ drivers/acpi/acpica/nsdumpdv.c | 7 +-
+ drivers/acpi/acpica/nseval.c | 137 +++
+ drivers/acpi/acpica/nsinit.c | 15 +
+ drivers/acpi/acpica/nsload.c | 3 +-
+ drivers/acpi/acpica/nspredef.c | 718 +++++++++--------
+ drivers/acpi/acpica/nsrepair.c | 203 +++++
+ drivers/acpi/acpica/nsutils.c | 5 +-
+ drivers/acpi/acpica/nsxfeval.c | 23 +-
+ drivers/acpi/acpica/nsxfname.c | 237 ++++--
+ drivers/acpi/acpica/psloop.c | 119 +++-
+ drivers/acpi/acpica/psxface.c | 4 +
+ drivers/acpi/acpica/tbutils.c | 82 ++-
+ drivers/acpi/acpica/utdelete.c | 6 +
+ drivers/acpi/acpica/uteval.c | 378 +--------
+ drivers/acpi/acpica/utglobal.c | 12 +-
+ drivers/acpi/acpica/utids.c | 382 +++++++++
+ drivers/acpi/acpica/utinit.c | 22 +-
+ drivers/acpi/acpica/utmisc.c | 85 ++-
+ drivers/acpi/acpica/utxface.c | 26 +-
+ drivers/acpi/battery.c | 22 +
+ drivers/acpi/blacklist.c | 2 +
+ drivers/acpi/bus.c | 3 +-
+ drivers/acpi/button.c | 2 +
+ drivers/acpi/cm_sbs.c | 2 +
+ drivers/acpi/container.c | 13 +-
+ drivers/acpi/dock.c | 10 +-
+ drivers/acpi/ec.c | 269 +++----
+ drivers/acpi/event.c | 2 +
+ drivers/acpi/fan.c | 2 +
+ drivers/acpi/glue.c | 10 +-
+ drivers/acpi/internal.h | 22 +-
+ drivers/acpi/numa.c | 2 +
+ drivers/acpi/osl.c | 94 ++-
+ drivers/acpi/pci_irq.c | 2 +
+ drivers/acpi/pci_link.c | 2 +
+ drivers/acpi/pci_root.c | 2 +
+ drivers/acpi/pci_slot.c | 5 +-
+ drivers/acpi/power.c | 2 +
+ drivers/acpi/processor_core.c | 246 +++---
+ drivers/acpi/processor_idle.c | 12 +-
+ drivers/acpi/processor_perflib.c | 2 +
+ drivers/acpi/processor_thermal.c | 5 +-
+ drivers/acpi/processor_throttling.c | 5 +-
+ drivers/acpi/sbs.c | 2 +
+ drivers/acpi/sbshc.c | 2 +
+ drivers/acpi/scan.c | 180 +++--
+ drivers/acpi/sleep.c | 22 +-
+ drivers/acpi/system.c | 2 +
+ drivers/acpi/tables.c | 6 +
+ drivers/acpi/thermal.c | 2 +
+ drivers/acpi/utils.c | 2 +
+ drivers/acpi/video.c | 112 ++-
+ drivers/acpi/video_detect.c | 2 +
+ drivers/char/agp/hp-agp.c | 9 +-
+ drivers/ide/ide-acpi.c | 5 +-
+ drivers/pci/dmar.c | 4 +-
+ drivers/pci/hotplug/acpiphp_ibm.c | 12 +-
+ drivers/platform/x86/Kconfig | 1 +
+ drivers/platform/x86/acerhdf.c | 97 ++-
+ drivers/platform/x86/asus-laptop.c | 227 ++++--
+ drivers/platform/x86/eeepc-laptop.c | 340 +++++---
+ drivers/platform/x86/fujitsu-laptop.c | 109 ++--
+ drivers/platform/x86/sony-laptop.c | 7 +-
+ drivers/platform/x86/wmi.c | 1 -
+ drivers/pnp/pnpacpi/core.c | 6 +-
+ include/acpi/acpi_bus.h | 16 +-
+ include/acpi/acpiosxf.h | 3 +
+ include/acpi/acpixf.h | 10 +-
+ include/acpi/actbl.h | 78 ++-
+ include/acpi/actbl1.h | 872 +++++---------------
+ include/acpi/actbl2.h | 868 +++++++++++++++++++
+ include/acpi/actypes.h | 92 +-
+ include/acpi/platform/aclinux.h | 4 +-
+ include/linux/acpi.h | 15 +-
+ 125 files changed, 6079 insertions(+), 2900 deletions(-)
+ create mode 100644 Documentation/ABI/stable/sysfs-class-backlight
+ create mode 100644 Documentation/ABI/testing/sysfs-class-lcd
+ create mode 100644 Documentation/ABI/testing/sysfs-class-led
+ create mode 100644 Documentation/ABI/testing/sysfs-platform-asus-laptop
+ create mode 100644 Documentation/ABI/testing/sysfs-platform-eeepc-laptop
+ create mode 100644 Documentation/laptops/asus-laptop.txt
+ create mode 100644 drivers/acpi/acpi_pad.c
+ create mode 100644 drivers/acpi/acpica/nsrepair.c
+ create mode 100644 drivers/acpi/acpica/utids.c
+ create mode 100644 include/acpi/actbl2.h
+Merging ieee1394/for-next
+$ git merge ieee1394/for-next
+Merge made by recursive.
+ drivers/firewire/core-card.c | 13 +++++--------
+ drivers/firewire/core-transaction.c | 2 +-
+ drivers/firewire/core.h | 14 ++++++++++++++
+ drivers/firewire/ohci.c | 4 ++--
+ drivers/firewire/sbp2.c | 16 ++++++++--------
+ drivers/ieee1394/raw1394.c | 4 +++-
+ drivers/ieee1394/sbp2.c | 3 +--
+ include/linux/firewire.h | 14 --------------
+ 8 files changed, 34 insertions(+), 36 deletions(-)
+Merging ubi/linux-next
+$ git merge ubi/linux-next
+Merge made by recursive.
+ drivers/mtd/ubi/debug.c | 32 +++++++++++++++++++++++++++++
+ drivers/mtd/ubi/debug.h | 2 +
+ drivers/mtd/ubi/io.c | 51 +++++++++++++++++++++++++++++++---------------
+ drivers/mtd/ubi/scan.c | 22 +++++++++++++++++--
+ drivers/mtd/ubi/scan.h | 2 +
+ drivers/mtd/ubi/ubi.h | 3 +-
+ 6 files changed, 91 insertions(+), 21 deletions(-)
+Merging kvm/linux-next
+$ git merge kvm/linux-next
+Auto-merging arch/x86/kvm/x86.c
+Merge made by recursive.
+ arch/ia64/include/asm/kvm.h | 1 +
+ arch/ia64/include/asm/kvm_host.h | 1 -
+ arch/ia64/kvm/Makefile | 2 +-
+ arch/ia64/kvm/kvm-ia64.c | 11 +-
+ arch/powerpc/kvm/powerpc.c | 2 +-
+ arch/s390/kvm/kvm-s390.c | 2 +-
+ arch/x86/include/asm/kvm.h | 1 +
+ arch/x86/include/asm/kvm_host.h | 12 +-
+ arch/x86/kvm/Makefile | 3 +-
+ arch/x86/kvm/emulate.c | 154 +++++++-
+ arch/x86/kvm/i8254.c | 2 -
+ arch/x86/kvm/i8259.c | 44 ++-
+ arch/x86/kvm/irq.h | 1 +
+ arch/x86/kvm/lapic.c | 7 +-
+ arch/x86/kvm/mmu.c | 2 +-
+ arch/x86/kvm/svm.c | 105 +++---
+ arch/x86/kvm/vmx.c | 153 ++++----
+ arch/x86/kvm/x86.c | 64 ++--
+ include/linux/kvm_host.h | 50 +++-
+ virt/kvm/assigned-dev.c | 818 ++++++++++++++++++++++++++++++++++++++
+ virt/kvm/eventfd.c | 2 -
+ virt/kvm/ioapic.c | 80 +++-
+ virt/kvm/ioapic.h | 5 +
+ virt/kvm/irq_comm.c | 214 ++++++----
+ virt/kvm/kvm_main.c | 804 +-------------------------------------
+ 25 files changed, 1395 insertions(+), 1145 deletions(-)
+ create mode 100644 virt/kvm/assigned-dev.c
+Merging dlm/next
+$ git merge dlm/next
+Merge made by recursive.
+ fs/dlm/lowcomms.c | 26 ++++++++++++++++----------
+ 1 files changed, 16 insertions(+), 10 deletions(-)
+Merging scsi/master
+$ git merge scsi/master
+Merge made by recursive.
+ Documentation/scsi/hptiop.txt | 21 ++++++++++-
+ drivers/scsi/bnx2i/bnx2i.h | 2 +
+ drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +-
+ drivers/scsi/device_handler/scsi_dh_rdac.c | 2 -
+ drivers/scsi/hptiop.c | 37 ++++++++++++-----
+ drivers/scsi/hptiop.h | 3 +-
+ drivers/scsi/mvsas/mv_defs.h | 4 ++
+ drivers/scsi/mvsas/mv_init.c | 4 ++
+ drivers/scsi/pmcraid.c | 58 +++++++++++++++-------------
+ 9 files changed, 90 insertions(+), 43 deletions(-)
+Merging async_tx/next
+$ git merge async_tx/next
+Auto-merging arch/sh/drivers/dma/Kconfig
+Auto-merging arch/sh/include/asm/dma-sh.h
+Auto-merging drivers/dma/at_hdmac.c
+Auto-merging drivers/dma/dw_dmac.c
+Removing drivers/dma/ioat.c
+Removing drivers/dma/ioat_dma.c
+Removing drivers/dma/ioatdma.h
+Removing drivers/dma/ioatdma_hw.h
+Auto-merging drivers/dma/txx9dmac.c
+Auto-merging drivers/md/raid5.c
+Auto-merging include/linux/pci_ids.h
+Merge made by recursive.
+ Documentation/crypto/async-tx-api.txt | 75 +-
+ arch/arm/include/asm/hardware/iop3xx-adma.h | 81 +-
+ arch/arm/include/asm/hardware/iop_adma.h | 3 +
+ arch/arm/mach-iop13xx/include/mach/adma.h | 119 ++-
+ arch/arm/mach-iop13xx/setup.c | 17 +-
+ arch/arm/plat-iop/adma.c | 4 +-
+ arch/powerpc/include/asm/fsldma.h | 136 ++
+ arch/sh/drivers/dma/Kconfig | 12 +-
+ arch/sh/drivers/dma/Makefile | 3 +-
+ arch/sh/include/asm/dma-sh.h | 13 +
+ crypto/async_tx/Kconfig | 9 +
+ crypto/async_tx/Makefile | 3 +
+ crypto/async_tx/async_memcpy.c | 44 +-
+ crypto/async_tx/async_memset.c | 43 +-
+ crypto/async_tx/async_pq.c | 395 +++++
+ crypto/async_tx/async_raid6_recov.c | 455 +++++
+ crypto/async_tx/async_tx.c | 87 +-
+ crypto/async_tx/async_xor.c | 207 ++--
+ crypto/async_tx/raid6test.c | 241 +++
+ drivers/dca/dca-core.c | 124 ++-
+ drivers/dma/Kconfig | 14 +-
+ drivers/dma/Makefile | 4 +-
+ drivers/dma/at_hdmac.c | 60 +-
+ drivers/dma/at_hdmac_regs.h | 1 +
+ drivers/dma/dmaengine.c | 94 +-
+ drivers/dma/dmatest.c | 40 +
+ drivers/dma/dw_dmac.c | 50 +-
+ drivers/dma/dw_dmac_regs.h | 1 +
+ drivers/dma/fsldma.c | 288 +++-
+ drivers/dma/fsldma.h | 4 +-
+ drivers/dma/ioat.c | 202 ---
+ drivers/dma/ioat/Makefile | 2 +
+ drivers/dma/{ioat_dca.c => ioat/dca.c} | 13 +-
+ drivers/dma/ioat/dma.c | 1238 ++++++++++++++
+ drivers/dma/ioat/dma.h | 337 ++++
+ drivers/dma/ioat/dma_v2.c | 869 ++++++++++
+ drivers/dma/ioat/dma_v2.h | 190 +++
+ drivers/dma/ioat/dma_v3.c | 1220 ++++++++++++++
+ drivers/dma/ioat/hw.h | 215 +++
+ drivers/dma/ioat/pci.c | 210 +++
+ .../dma/{ioatdma_registers.h => ioat/registers.h} | 54 +-
+ drivers/dma/ioat_dma.c | 1741 --------------------
+ drivers/dma/ioatdma.h | 165 --
+ drivers/dma/ioatdma_hw.h | 70 -
+ drivers/dma/iop-adma.c | 491 +++++-
+ drivers/dma/iovlock.c | 10 +
+ drivers/dma/mv_xor.c | 7 +-
+ drivers/dma/mv_xor.h | 4 +-
+ drivers/dma/shdma.c | 786 +++++++++
+ drivers/dma/shdma.h | 64 +
+ drivers/dma/txx9dmac.c | 24 +-
+ drivers/dma/txx9dmac.h | 1 +
+ drivers/idle/i7300_idle.c | 20 +-
+ drivers/md/Kconfig | 26 +
+ drivers/md/raid5.c | 1470 ++++++++++-------
+ drivers/md/raid5.h | 28 +-
+ drivers/mmc/host/atmel-mci.c | 9 +-
+ include/linux/async_tx.h | 129 ++-
+ include/linux/dca.h | 11 +-
+ include/linux/dmaengine.h | 179 ++-
+ include/linux/pci_ids.h | 10 +
+ 61 files changed, 9114 insertions(+), 3308 deletions(-)
+ create mode 100644 arch/powerpc/include/asm/fsldma.h
+ create mode 100644 crypto/async_tx/async_pq.c
+ create mode 100644 crypto/async_tx/async_raid6_recov.c
+ create mode 100644 crypto/async_tx/raid6test.c
+ delete mode 100644 drivers/dma/ioat.c
+ create mode 100644 drivers/dma/ioat/Makefile
+ rename drivers/dma/{ioat_dca.c => ioat/dca.c} (98%)
+ create mode 100644 drivers/dma/ioat/dma.c
+ create mode 100644 drivers/dma/ioat/dma.h
+ create mode 100644 drivers/dma/ioat/dma_v2.c
+ create mode 100644 drivers/dma/ioat/dma_v2.h
+ create mode 100644 drivers/dma/ioat/dma_v3.c
+ create mode 100644 drivers/dma/ioat/hw.h
+ create mode 100644 drivers/dma/ioat/pci.c
+ rename drivers/dma/{ioatdma_registers.h => ioat/registers.h} (84%)
+ delete mode 100644 drivers/dma/ioat_dma.c
+ delete mode 100644 drivers/dma/ioatdma.h
+ delete mode 100644 drivers/dma/ioatdma_hw.h
+ create mode 100644 drivers/dma/shdma.c
+ create mode 100644 drivers/dma/shdma.h
+Merging net/master
+$ git merge net/master
+Already up-to-date.
+Merging wireless/master
+$ git merge wireless/master
+Merge made by recursive.
+ drivers/net/wireless/Kconfig | 1 +
+ drivers/net/wireless/ath/ath9k/ani.c | 6 ++++--
+ drivers/net/wireless/b43/main.c | 8 +++-----
+ drivers/net/wireless/hostap/hostap_main.c | 3 ++-
+ drivers/net/wireless/iwlwifi/iwl-4965.c | 1 +
+ drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 10 +++++++++-
+ drivers/net/wireless/iwlwifi/iwl-core.c | 9 ++++++---
+ drivers/net/wireless/iwlwifi/iwl-core.h | 1 +
+ drivers/net/wireless/iwlwifi/iwl-power.c | 5 +++--
+ drivers/net/wireless/iwlwifi/iwl-rx.c | 24 +++++++++++++++++-------
+ drivers/net/wireless/iwlwifi/iwl3945-base.c | 24 ++++++++++++++++--------
+ drivers/net/wireless/p54/p54usb.c | 1 +
+ drivers/ssb/pci.c | 1 +
+ drivers/ssb/sdio.c | 6 +++---
+ net/mac80211/rc80211_minstrel.c | 2 +-
+ net/wireless/scan.c | 7 ++++++-
+ net/wireless/sme.c | 21 +++++++++++++--------
+ 17 files changed, 88 insertions(+), 42 deletions(-)
+Merging mtd/master
+$ git merge mtd/master
+Resolved 'drivers/mtd/mtdcore.c' using previous resolution.
+Auto-merging drivers/mtd/mtdblock.c
+Auto-merging drivers/mtd/mtdcore.c
+CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 6b01165] Merge commit 'mtd/master'
+$ git diff -M --stat --summary HEAD^..
+ drivers/mtd/afs.c | 2 +-
+ drivers/mtd/devices/m25p80.c | 3 +
+ drivers/mtd/devices/mtd_dataflash.c | 4 +-
+ drivers/mtd/devices/slram.c | 2 +-
+ drivers/mtd/maps/physmap_of.c | 20 ++++----
+ drivers/mtd/maps/plat-ram.c | 2 +-
+ drivers/mtd/maps/pmcmsp-flash.c | 76 +++++++++++++++++++++++-------
+ drivers/mtd/mtdblock.c | 2 +-
+ drivers/mtd/mtdcore.c | 4 +-
+ drivers/mtd/nand/nand_base.c | 88 ++++++++++++++++++-----------------
+ drivers/mtd/onenand/Kconfig | 2 +-
+ drivers/mtd/onenand/onenand_base.c | 20 ++++----
+ drivers/mtd/tests/mtd_oobtest.c | 2 +-
+ drivers/mtd/tests/mtd_pagetest.c | 12 ++--
+ include/linux/mtd/onenand_regs.h | 3 +
+ 15 files changed, 147 insertions(+), 95 deletions(-)
+Merging crypto/master
+$ git merge crypto/master
+Already up-to-date.
+Merging sound/for-next
+$ git merge sound/for-next
+Merge made by recursive.
+ sound/pci/hda/patch_realtek.c | 3 +-
+ sound/pci/hda/patch_sigmatel.c | 65 +++++++++++++++++++++-------------------
+ 2 files changed, 36 insertions(+), 32 deletions(-)
+Merging cpufreq/next
+$ git merge cpufreq/next
+Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+Auto-merging drivers/cpufreq/cpufreq_ondemand.c
+Merge made by recursive.
+ Documentation/cpu-freq/user-guide.txt | 9 +-
+ arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 21 ++
+ arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 29 +---
+ drivers/cpufreq/cpufreq.c | 305 +++++++++++++++++-----------
+ drivers/cpufreq/cpufreq_ondemand.c | 139 ++++++++++---
+ include/linux/cpufreq.h | 10 +
+ 6 files changed, 342 insertions(+), 171 deletions(-)
+Merging quilt/rr
+$ git merge quilt/rr
+Recorded preimage for 'drivers/hid/hid-core.c'
+Recorded preimage for 'drivers/media/video/em28xx/em28xx.h'
+Recorded preimage for 'drivers/media/video/saa7134/saa7134-core.c'
+Recorded preimage for 'drivers/media/video/saa7134/saa7134.h'
+Recorded preimage for 'drivers/net/virtio_net.c'
+Recorded preimage for 'drivers/virtio/virtio_ring.c'
+Recorded preimage for 'include/linux/kmod.h'
+Recorded preimage for 'include/linux/moduleparam.h'
+Recorded preimage for 'init/main.c'
+Recorded preimage for 'kernel/extable.c'
+Recorded preimage for 'kernel/kmod.c'
+Recorded preimage for 'kernel/kthread.c'
+Recorded preimage for 'kernel/module.c'
+Recorded preimage for 'kernel/params.c'
+Recorded preimage for 'kernel/sched_cpupri.c'
+Resolved 'kernel/cpu.c' using previous resolution.
+Auto-merging arch/arm/boot/compressed/misc.c
+Auto-merging arch/blackfin/lib/strncmp.c
+Auto-merging arch/mips/alchemy/common/time.c
+Auto-merging arch/s390/include/asm/string.h
+Auto-merging arch/sparc/include/asm/topology_64.h
+CONFLICT (delete/modify): arch/x86/include/asm/es7000/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/es7000/apic.h left in tree.
+CONFLICT (delete/modify): arch/x86/include/asm/numaq/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/numaq/apic.h left in tree.
+Auto-merging drivers/hid/hid-core.c
+CONFLICT (content): Merge conflict in drivers/hid/hid-core.c
+Auto-merging drivers/media/video/bt8xx/bttv-driver.c
+Auto-merging drivers/media/video/bt8xx/bttvp.h
+Auto-merging drivers/media/video/cx88/cx88-mpeg.c
+Auto-merging drivers/media/video/cx88/cx88.h
+Auto-merging drivers/media/video/em28xx/em28xx-cards.c
+Auto-merging drivers/media/video/em28xx/em28xx.h
+CONFLICT (content): Merge conflict in drivers/media/video/em28xx/em28xx.h
+Auto-merging drivers/media/video/saa7134/saa7134-core.c
+CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134-core.c
+Auto-merging drivers/media/video/saa7134/saa7134.h
+CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134.h
+Auto-merging drivers/mtd/nand/nand_base.c
+Auto-merging drivers/net/virtio_net.c
+CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
+Auto-merging drivers/video/aty/aty128fb.c
+Auto-merging drivers/video/cyber2000fb.c
+Auto-merging drivers/video/uvesafb.c
+Auto-merging drivers/virtio/virtio_ring.c
+CONFLICT (content): Merge conflict in drivers/virtio/virtio_ring.c
+Auto-merging include/linux/cpu.h
+Auto-merging include/linux/cpumask.h
+Auto-merging include/linux/kmod.h
+CONFLICT (content): Merge conflict in include/linux/kmod.h
+Auto-merging include/linux/module.h
+Auto-merging include/linux/moduleparam.h
+CONFLICT (content): Merge conflict in include/linux/moduleparam.h
+Auto-merging include/linux/string.h
+Auto-merging init/main.c
+CONFLICT (content): Merge conflict in init/main.c
+Auto-merging kernel/cpu.c
+CONFLICT (content): Merge conflict in kernel/cpu.c
+Auto-merging kernel/extable.c
+CONFLICT (content): Merge conflict in kernel/extable.c
+Auto-merging kernel/kallsyms.c
+Auto-merging kernel/kmod.c
+CONFLICT (content): Merge conflict in kernel/kmod.c
+Auto-merging kernel/kthread.c
+CONFLICT (content): Merge conflict in kernel/kthread.c
+Auto-merging kernel/module.c
+CONFLICT (content): Merge conflict in kernel/module.c
+Auto-merging kernel/params.c
+CONFLICT (content): Merge conflict in kernel/params.c
+Auto-merging kernel/sched_cpupri.c
+CONFLICT (content): Merge conflict in kernel/sched_cpupri.c
+Auto-merging kernel/sched_rt.c
+CONFLICT (delete/modify): mm/pdflush.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of mm/pdflush.c left in tree.
+Auto-merging scripts/mod/modpost.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git reset --hard HEAD^
+HEAD is now at ccdca83 Merge commit 'sound/for-next'
+Merging refs/next/20090908/rr
+$ git merge refs/next/20090908/rr
+Resolved 'drivers/net/virtio_net.c' using previous resolution.
+Auto-merging arch/arm/include/asm/mmu_context.h
+Auto-merging arch/arm/mm/flush.c
+Auto-merging arch/ia64/kernel/smp.c
+Auto-merging arch/powerpc/include/asm/smp.h
+Auto-merging arch/powerpc/kernel/smp.c
+Auto-merging arch/powerpc/platforms/powermac/smp.c
+Auto-merging arch/s390/include/asm/smp.h
+Auto-merging arch/s390/kernel/smp.c
+Auto-merging arch/x86/kernel/apic/io_apic.c
+Auto-merging arch/x86/kernel/setup.c
+Auto-merging arch/x86/kernel/smpboot.c
+Auto-merging drivers/acpi/osl.c
+Auto-merging drivers/acpi/processor_perflib.c
+Auto-merging drivers/acpi/processor_throttling.c
+Auto-merging drivers/net/sfc/efx.c
+Auto-merging drivers/net/virtio_net.c
+CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
+Auto-merging include/linux/interrupt.h
+Auto-merging include/linux/pci.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/topology.h
+Auto-merging init/main.c
+Auto-merging kernel/module.c
+Auto-merging kernel/smp.c
+Auto-merging kernel/trace/trace.c
+Auto-merging mm/quicklist.c
+Auto-merging net/9p/trans_virtio.c
+Auto-merging virt/kvm/kvm_main.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4a92b1a] Merge commit 'refs/next/20090908/rr'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/lguest/lguest.c | 26 +-
+ arch/alpha/include/asm/smp.h | 2 +-
+ arch/alpha/include/asm/topology.h | 18 -
+ arch/alpha/kernel/smp.c | 14 +-
+ arch/arm/include/asm/cacheflush.h | 8 +-
+ arch/arm/include/asm/mmu_context.h | 7 +-
+ arch/arm/include/asm/smp.h | 1 -
+ arch/arm/include/asm/tlbflush.h | 4 +-
+ arch/arm/kernel/smp.c | 10 +-
+ arch/arm/mm/context.c | 2 +-
+ arch/arm/mm/flush.c | 10 +-
+ arch/ia64/include/asm/smp.h | 1 -
+ arch/ia64/include/asm/topology.h | 3 -
+ arch/ia64/kernel/smp.c | 2 +-
+ arch/m32r/include/asm/mmu_context.h | 4 +-
+ arch/m32r/include/asm/smp.h | 2 +-
+ arch/m32r/kernel/smp.c | 30 +-
+ arch/m32r/kernel/smpboot.c | 2 +-
+ arch/mips/alchemy/common/time.c | 2 +-
+ arch/mips/include/asm/mach-ip27/topology.h | 2 -
+ arch/mips/include/asm/mmu_context.h | 10 +-
+ arch/mips/include/asm/smp-ops.h | 2 +-
+ arch/mips/include/asm/smp.h | 2 +-
+ arch/mips/kernel/smp-cmp.c | 6 +-
+ arch/mips/kernel/smp-mt.c | 6 +-
+ arch/mips/kernel/smp-up.c | 3 +-
+ arch/mips/kernel/smp.c | 8 +-
+ arch/mips/kernel/smtc.c | 6 +-
+ arch/mips/mipssim/sim_smtc.c | 5 +-
+ arch/mips/mm/c-octeon.c | 2 +-
+ arch/mips/mti-malta/malta-smtc.c | 4 +-
+ arch/mips/pmc-sierra/yosemite/smp.c | 4 +-
+ arch/mips/sgi-ip27/ip27-memory.c | 2 +-
+ arch/mips/sgi-ip27/ip27-smp.c | 4 +-
+ arch/mips/sibyte/bcm1480/smp.c | 5 +-
+ arch/mips/sibyte/sb1250/smp.c | 5 +-
+ arch/mn10300/include/asm/mmu_context.h | 12 +-
+ arch/parisc/include/asm/smp.h | 1 -
+ arch/powerpc/include/asm/smp.h | 2 +-
+ arch/powerpc/include/asm/topology.h | 12 -
+ arch/powerpc/kernel/setup-common.c | 6 +-
+ arch/powerpc/kernel/smp.c | 12 +-
+ arch/powerpc/platforms/powermac/smp.c | 6 +-
+ arch/powerpc/platforms/pseries/hotplug-cpu.c | 6 +-
+ arch/s390/include/asm/smp.h | 2 +-
+ arch/s390/include/asm/topology.h | 1 -
+ arch/s390/kernel/smp.c | 4 +-
+ arch/sh/include/asm/smp.h | 1 -
+ arch/sh/include/asm/topology.h | 1 -
+ arch/sparc/include/asm/smp_64.h | 1 -
+ arch/sparc/include/asm/topology_64.h | 16 -
+ arch/um/include/asm/mmu_context.h | 4 +-
+ arch/um/kernel/smp.c | 2 +-
+ arch/x86/include/asm/mmu_context.h | 6 +-
+ arch/x86/include/asm/smp.h | 1 -
+ arch/x86/kernel/apic/io_apic.c | 7 +-
+ arch/x86/kernel/ldt.c | 4 +-
+ arch/x86/kernel/process.c | 6 +-
+ arch/x86/kernel/setup.c | 1 -
+ arch/x86/kernel/smpboot.c | 9 +-
+ arch/x86/lguest/boot.c | 10 +-
+ arch/x86/mm/tlb.c | 15 +-
+ arch/x86/xen/mmu.c | 4 +-
+ drivers/acpi/osl.c | 2 +-
+ drivers/acpi/processor_perflib.c | 3 +-
+ drivers/acpi/processor_throttling.c | 3 +-
+ drivers/block/virtio_blk.c | 3 +-
+ drivers/char/hw_random/virtio-rng.c | 3 +-
+ drivers/char/virtio_console.c | 5 +-
+ drivers/lguest/core.c | 5 +-
+ drivers/lguest/page_tables.c | 45 +-
+ drivers/net/sfc/efx.c | 3 +-
+ drivers/net/virtio_net.c | 236 ++++------
+ drivers/oprofile/buffer_sync.c | 3 +-
+ drivers/virtio/virtio_balloon.c | 3 +-
+ drivers/virtio/virtio_pci.c | 125 +++--
+ drivers/virtio/virtio_ring.c | 6 +-
+ include/asm-generic/topology.h | 17 -
+ include/linux/cpumask.h | 709 +++++++++-----------------
+ include/linux/interrupt.h | 2 -
+ include/linux/pci.h | 4 +-
+ include/linux/sched.h | 3 +
+ include/linux/smp.h | 11 -
+ include/linux/topology.h | 6 -
+ include/linux/virtio.h | 2 +-
+ include/linux/virtio_9p.h | 2 -
+ include/linux/virtio_balloon.h | 3 -
+ include/linux/virtio_blk.h | 3 -
+ include/linux/virtio_console.h | 3 -
+ include/linux/virtio_ids.h | 17 +
+ include/linux/virtio_net.h | 3 -
+ include/linux/virtio_rng.h | 3 -
+ init/main.c | 5 -
+ kernel/smp.c | 7 -
+ kernel/trace/trace.c | 7 +-
+ mm/quicklist.c | 3 +-
+ net/9p/trans_virtio.c | 5 +-
+ virt/kvm/kvm_main.c | 3 +-
+ 98 files changed, 648 insertions(+), 991 deletions(-)
+ create mode 100644 include/linux/virtio_ids.h
+Merging mmc/next
+$ git merge mmc/next
+Already up-to-date.
+Merging input/next
+$ git merge input/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
+Recorded preimage for 'fs/fs-writeback.c'
+Recorded preimage for 'mm/page-writeback.c'
+Auto-merging fs/fs-writeback.c
+CONFLICT (content): Merge conflict in fs/fs-writeback.c
+Auto-merging fs/fuse/inode.c
+Auto-merging fs/sync.c
+Auto-merging fs/ubifs/super.c
+Auto-merging include/linux/backing-dev.h
+Auto-merging include/linux/fs.h
+Auto-merging mm/backing-dev.c
+Auto-merging mm/page-writeback.c
+CONFLICT (content): Merge conflict in mm/page-writeback.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'fs/fs-writeback.c'.
+Recorded resolution for 'mm/page-writeback.c'.
+[master 2cbb11b] Merge commit 'block/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging quilt/device-mapper
+$ git merge quilt/device-mapper
+Already up-to-date.
+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
+Resolved 'drivers/power/wm97xx_battery.c' using previous resolution.
+Auto-merging drivers/input/touchscreen/wm97xx-core.c
+Auto-merging drivers/power/wm97xx_battery.c
+CONFLICT (content): Merge conflict in drivers/power/wm97xx_battery.c
+Auto-merging include/linux/wm97xx.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 3248172] Merge commit 'battery/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/power/power_supply_class.txt | 7 +
+ drivers/input/touchscreen/wm97xx-core.c | 3 +
+ drivers/power/Kconfig | 7 +
+ drivers/power/Makefile | 1 +
+ drivers/power/ds2760_battery.c | 147 +++++-
+ drivers/power/olpc_battery.c | 50 ++
+ drivers/power/power_supply_core.c | 44 ++-
+ drivers/power/power_supply_sysfs.c | 12 +
+ drivers/power/wm831x_power.c | 779 ++++++++++++++++++++++++++++
+ drivers/power/wm8350_power.c | 22 +
+ drivers/power/wm97xx_battery.c | 79 +++-
+ include/linux/mfd/wm831x/pmu.h | 189 +++++++
+ include/linux/power_supply.h | 21 +
+ include/linux/wm97xx.h | 18 +
+ include/linux/wm97xx_batt.h | 18 +-
+ 15 files changed, 1331 insertions(+), 66 deletions(-)
+ create mode 100644 drivers/power/wm831x_power.c
+ create mode 100644 include/linux/mfd/wm831x/pmu.h
+Merging leds/for-mm
+$ git merge leds/for-mm
+Merge made by recursive.
+ drivers/leds/Kconfig | 13 +-
+ drivers/leds/Makefile | 1 +
+ drivers/leds/leds-clevo-mail.c | 2 +-
+ drivers/leds/leds-cobalt-qube.c | 2 +-
+ drivers/leds/leds-cobalt-raq.c | 4 +-
+ drivers/leds/leds-gpio.c | 2 +-
+ drivers/leds/leds-pca9532.c | 12 +-
+ drivers/leds/leds-wm831x-status.c | 341 +++++++++++++++++++++++++++++++++++++
+ drivers/leds/ledtrig-gpio.c | 28 ++--
+ drivers/macintosh/via-pmu-led.c | 2 +-
+ include/linux/mfd/wm831x/status.h | 34 ++++
+ 11 files changed, 412 insertions(+), 29 deletions(-)
+ create mode 100644 drivers/leds/leds-wm831x-status.c
+ create mode 100644 include/linux/mfd/wm831x/status.h
+Merging backlight/for-mm
+$ git merge backlight/for-mm
+Auto-merging drivers/video/backlight/Kconfig
+Merge made by recursive.
+ drivers/video/backlight/Kconfig | 22 +++
+ drivers/video/backlight/Makefile | 4 +-
+ drivers/video/backlight/adx_bl.c | 178 ++++++++++++++++++++++
+ drivers/video/backlight/hp680_bl.c | 2 +-
+ drivers/video/backlight/lms283gf05.c | 242 ++++++++++++++++++++++++++++++
+ drivers/video/backlight/mbp_nvidia_bl.c | 36 +++++
+ drivers/video/backlight/wm831x_bl.c | 250 +++++++++++++++++++++++++++++++
+ include/linux/spi/lms283gf05.h | 28 ++++
+ 8 files changed, 760 insertions(+), 2 deletions(-)
+ create mode 100644 drivers/video/backlight/adx_bl.c
+ create mode 100644 drivers/video/backlight/lms283gf05.c
+ create mode 100644 drivers/video/backlight/wm831x_bl.c
+ create mode 100644 include/linux/spi/lms283gf05.h
+Merging kgdb/kgdb-next
+$ git merge kgdb/kgdb-next
+Auto-merging include/linux/sched.h
+Merge made by recursive.
+ arch/x86/kernel/kgdb.c | 12 ++++++++----
+ include/linux/sched.h | 4 ++++
+ kernel/kgdb.c | 31 +++++++++++++++++++++++--------
+ kernel/softlockup.c | 16 ++++++++++++++++
+ 4 files changed, 51 insertions(+), 12 deletions(-)
+Merging slab/for-next
+$ git merge slab/for-next
+Merge made by recursive.
+ Documentation/vm/slqbinfo.c | 1047 ++++++++++++
+ include/linux/rcu_types.h | 18 +
+ include/linux/rcupdate.h | 11 +-
+ include/linux/slab.h | 10 +-
+ include/linux/slqb_def.h | 301 ++++
+ init/Kconfig | 8 +-
+ lib/Kconfig.debug | 20 +
+ mm/Makefile | 1 +
+ mm/slqb.c | 3775 +++++++++++++++++++++++++++++++++++++++++++
+ 9 files changed, 5178 insertions(+), 13 deletions(-)
+ create mode 100644 Documentation/vm/slqbinfo.c
+ create mode 100644 include/linux/rcu_types.h
+ create mode 100644 include/linux/slqb_def.h
+ create mode 100644 mm/slqb.c
+Merging uclinux/for-next
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next
+$ git merge md/for-next
+Already up-to-date.
+Merging mfd/for-next
+$ git merge mfd/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/hwmon/Kconfig
+Auto-merging drivers/hwmon/Makefile
+Auto-merging drivers/rtc/Kconfig
+Auto-merging drivers/rtc/Makefile
+Merge made by recursive.
+ Documentation/hwmon/wm831x | 37 +
+ Documentation/hwmon/wm8350 | 26 +
+ MAINTAINERS | 18 +
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 122 ++-
+ drivers/gpio/Kconfig | 7 +
+ drivers/gpio/Makefile | 1 +
+ drivers/gpio/wm831x-gpio.c | 252 +++++
+ drivers/hwmon/Kconfig | 21 +
+ drivers/hwmon/Makefile | 2 +
+ drivers/hwmon/wm831x-hwmon.c | 226 ++++
+ drivers/hwmon/wm8350-hwmon.c | 151 +++
+ drivers/input/misc/Kconfig | 20 +
+ drivers/input/misc/Makefile | 3 +
+ drivers/input/misc/pcap_keys.c | 144 +++
+ drivers/input/misc/wm831x-on.c | 163 +++
+ drivers/input/touchscreen/Kconfig | 9 +
+ drivers/input/touchscreen/Makefile | 1 +
+ drivers/input/touchscreen/pcap_ts.c | 271 +++++
+ drivers/mfd/Kconfig | 42 +
+ drivers/mfd/Makefile | 6 +
+ drivers/mfd/ab3100-core.c | 62 +-
+ drivers/mfd/ab3100-otp.c | 268 +++++
+ drivers/mfd/dm355evm_msp.c | 12 +-
+ drivers/mfd/ezx-pcap.c | 105 ++-
+ drivers/mfd/mc13783-core.c | 427 +++++++
+ drivers/mfd/mfd-core.c | 2 +-
+ drivers/mfd/pcf50633-adc.c | 32 +-
+ drivers/mfd/pcf50633-core.c | 5 +-
+ drivers/mfd/twl4030-core.c | 23 +
+ drivers/mfd/twl4030-irq.c | 2 +-
+ drivers/mfd/twl4030-power.c | 472 ++++++++
+ drivers/mfd/wm831x-core.c | 1549 ++++++++++++++++++++++++++
+ drivers/mfd/wm831x-irq.c | 559 ++++++++++
+ drivers/mfd/wm831x-otp.c | 83 ++
+ drivers/mfd/wm8350-core.c | 3 +
+ drivers/regulator/Kconfig | 31 +
+ drivers/regulator/Makefile | 6 +
+ drivers/regulator/ab3100.c | 694 ++++++++++++
+ drivers/regulator/core.c | 24 +
+ drivers/regulator/mc13783.c | 410 +++++++
+ drivers/regulator/pcap-regulator.c | 318 ++++++
+ drivers/regulator/wm831x-dcdc.c | 862 ++++++++++++++
+ drivers/regulator/wm831x-isink.c | 260 +++++
+ drivers/regulator/wm831x-ldo.c | 852 ++++++++++++++
+ drivers/rtc/Kconfig | 19 +
+ drivers/rtc/Makefile | 2 +
+ drivers/rtc/rtc-ab3100.c | 281 +++++
+ drivers/rtc/rtc-wm831x.c | 523 +++++++++
+ include/linux/i2c/twl4030.h | 94 ++-
+ include/linux/mfd/ab3100.h | 37 +-
+ include/linux/mfd/core.h | 1 +
+ include/linux/mfd/ezx-pcap.h | 7 +-
+ include/linux/mfd/mc13783-private.h | 396 +++++++
+ include/linux/mfd/mc13783.h | 84 ++
+ include/linux/mfd/pcf50633/adc.h | 3 +-
+ include/linux/mfd/pcf50633/core.h | 1 +
+ include/linux/mfd/wm831x/auxadc.h | 216 ++++
+ include/linux/mfd/wm831x/core.h | 289 +++++
+ include/linux/mfd/wm831x/gpio.h | 55 +
+ include/linux/mfd/wm831x/irq.h | 764 +++++++++++++
+ include/linux/mfd/wm831x/otp.h | 162 +++
+ include/linux/mfd/wm831x/pdata.h | 113 ++
+ include/linux/mfd/wm831x/regulator.h | 1218 ++++++++++++++++++++
+ include/linux/mfd/wm8350/core.h | 6 +
+ include/linux/regulator/driver.h | 2 +
+ 65 files changed, 12756 insertions(+), 100 deletions(-)
+ create mode 100644 Documentation/hwmon/wm831x
+ create mode 100644 Documentation/hwmon/wm8350
+ create mode 100644 drivers/gpio/wm831x-gpio.c
+ create mode 100644 drivers/hwmon/wm831x-hwmon.c
+ create mode 100644 drivers/hwmon/wm8350-hwmon.c
+ create mode 100644 drivers/input/misc/pcap_keys.c
+ create mode 100644 drivers/input/misc/wm831x-on.c
+ create mode 100644 drivers/input/touchscreen/pcap_ts.c
+ create mode 100644 drivers/mfd/ab3100-otp.c
+ create mode 100644 drivers/mfd/mc13783-core.c
+ create mode 100644 drivers/mfd/twl4030-power.c
+ create mode 100644 drivers/mfd/wm831x-core.c
+ create mode 100644 drivers/mfd/wm831x-irq.c
+ create mode 100644 drivers/mfd/wm831x-otp.c
+ create mode 100644 drivers/regulator/ab3100.c
+ create mode 100644 drivers/regulator/mc13783.c
+ create mode 100644 drivers/regulator/pcap-regulator.c
+ create mode 100644 drivers/regulator/wm831x-dcdc.c
+ create mode 100644 drivers/regulator/wm831x-isink.c
+ create mode 100644 drivers/regulator/wm831x-ldo.c
+ create mode 100644 drivers/rtc/rtc-ab3100.c
+ create mode 100644 drivers/rtc/rtc-wm831x.c
+ create mode 100644 include/linux/mfd/mc13783-private.h
+ create mode 100644 include/linux/mfd/mc13783.h
+ create mode 100644 include/linux/mfd/wm831x/auxadc.h
+ create mode 100644 include/linux/mfd/wm831x/core.h
+ create mode 100644 include/linux/mfd/wm831x/gpio.h
+ create mode 100644 include/linux/mfd/wm831x/irq.h
+ create mode 100644 include/linux/mfd/wm831x/otp.h
+ create mode 100644 include/linux/mfd/wm831x/pdata.h
+ create mode 100644 include/linux/mfd/wm831x/regulator.h
+Merging hdlc/hdlc-next
+$ git merge hdlc/hdlc-next
+Already up-to-date.
+Merging drm/drm-next
+$ git merge drm/drm-next
+Resolved 'firmware/Makefile' using previous resolution.
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/intel_drv.h
+Auto-merging drivers/gpu/drm/i915/intel_tv.c
+Removing drivers/gpu/drm/mga/mga_ucode.h
+Removing drivers/gpu/drm/radeon/r300.h
+Removing drivers/gpu/drm/radeon/r600_microcode.h
+Removing drivers/gpu/drm/radeon/radeon_microcode.h
+Removing drivers/gpu/drm/radeon/rs780.c
+Auto-merging firmware/Makefile
+CONFLICT (content): Merge conflict in firmware/Makefile
+Auto-merging firmware/WHENCE
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 2910772] Merge commit 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/Kconfig | 18 +-
+ drivers/gpu/drm/Makefile | 8 +-
+ drivers/gpu/drm/drm_cache.c | 46 +-
+ drivers/gpu/drm/drm_crtc.c | 77 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 220 +-
+ drivers/gpu/drm/drm_drv.c | 4 +-
+ drivers/gpu/drm/drm_edid.c | 504 +-
+ drivers/gpu/drm/drm_encoder_slave.c | 116 +
+ drivers/gpu/drm/drm_fb_helper.c | 701 +
+ drivers/gpu/drm/drm_gem.c | 11 +-
+ drivers/gpu/drm/drm_mm.c | 21 +
+ drivers/gpu/drm/drm_modes.c | 435 +-
+ drivers/gpu/drm/drm_proc.c | 17 +-
+ drivers/gpu/drm/drm_sysfs.c | 28 +
+ drivers/gpu/drm/i915/Makefile | 2 +-
+ .../i915/{i915_gem_debugfs.c => i915_debugfs.c} | 91 +-
+ drivers/gpu/drm/i915/i915_dma.c | 100 +-
+ drivers/gpu/drm/i915/i915_drv.c | 9 +-
+ drivers/gpu/drm/i915/i915_drv.h | 62 +-
+ drivers/gpu/drm/i915/i915_gem.c | 14 +-
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 80 +-
+ drivers/gpu/drm/i915/i915_irq.c | 21 +
+ drivers/gpu/drm/i915/i915_reg.h | 143 +-
+ drivers/gpu/drm/i915/i915_suspend.c | 4 +-
+ drivers/gpu/drm/i915/intel_bios.c | 8 +-
+ drivers/gpu/drm/i915/intel_crt.c | 28 +
+ drivers/gpu/drm/i915/intel_display.c | 607 +-
+ drivers/gpu/drm/i915/intel_drv.h | 7 +-
+ drivers/gpu/drm/i915/intel_fb.c | 737 +-
+ drivers/gpu/drm/i915/intel_i2c.c | 8 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 22 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 331 +-
+ drivers/gpu/drm/i915/intel_tv.c | 30 +
+ drivers/gpu/drm/mga/mga_dma.c | 4 +-
+ drivers/gpu/drm/mga/mga_drv.h | 1 -
+ drivers/gpu/drm/mga/mga_ucode.h |11645 ----------
+ drivers/gpu/drm/mga/mga_warp.c | 180 +-
+ drivers/gpu/drm/r128/r128_cce.c | 116 +-
+ drivers/gpu/drm/r128/r128_drv.h | 8 +
+ drivers/gpu/drm/r128/r128_state.c | 36 +-
+ drivers/gpu/drm/radeon/Kconfig | 1 -
+ drivers/gpu/drm/radeon/Makefile | 43 +-
+ drivers/gpu/drm/radeon/atombios.h | 11 +
+ drivers/gpu/drm/radeon/atombios_crtc.c | 100 +-
+ .../gpu/drm/radeon/{radeon_share.h => avivod.h} | 41 +-
+ drivers/gpu/drm/radeon/mkregtable.c | 720 +
+ drivers/gpu/drm/radeon/r100.c | 1213 +-
+ drivers/gpu/drm/radeon/r100_track.h | 124 +
+ drivers/gpu/drm/radeon/r100d.h | 607 +
+ drivers/gpu/drm/radeon/r200.c | 456 +
+ drivers/gpu/drm/radeon/r300.c | 556 +-
+ drivers/gpu/drm/radeon/r300.h | 36 -
+ drivers/gpu/drm/radeon/r300d.h | 101 +
+ drivers/gpu/drm/radeon/r420.c | 288 +-
+ drivers/gpu/drm/radeon/r420d.h | 249 +
+ drivers/gpu/drm/radeon/r520.c | 6 -
+ drivers/gpu/drm/radeon/r600.c | 1734 ++-
+ drivers/gpu/drm/radeon/r600_blit.c | 850 +
+ drivers/gpu/drm/radeon/r600_blit_kms.c | 805 +
+ drivers/gpu/drm/radeon/r600_blit_shaders.c | 1072 +
+ drivers/gpu/drm/radeon/r600_blit_shaders.h | 14 +
+ drivers/gpu/drm/radeon/r600_cp.c | 541 +-
+ drivers/gpu/drm/radeon/r600_cs.c | 657 +
+ drivers/gpu/drm/radeon/r600_microcode.h |23297 --------------------
+ drivers/gpu/drm/radeon/r600d.h | 661 +
+ drivers/gpu/drm/radeon/radeon.h | 263 +-
+ drivers/gpu/drm/radeon/radeon_asic.h | 228 +-
+ drivers/gpu/drm/radeon/radeon_atombios.c | 156 +-
+ drivers/gpu/drm/radeon/radeon_clocks.c | 10 +-
+ drivers/gpu/drm/radeon/radeon_combios.c | 12 +-
+ drivers/gpu/drm/radeon/radeon_connectors.c | 307 +-
+ drivers/gpu/drm/radeon/radeon_cp.c | 128 +-
+ drivers/gpu/drm/radeon/radeon_cs.c | 3 +-
+ drivers/gpu/drm/radeon/radeon_device.c | 410 +-
+ drivers/gpu/drm/radeon/radeon_display.c | 20 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 23 +-
+ drivers/gpu/drm/radeon/radeon_drv.h | 148 +-
+ drivers/gpu/drm/radeon/radeon_encoders.c | 127 +-
+ drivers/gpu/drm/radeon/radeon_fb.c | 671 +-
+ drivers/gpu/drm/radeon/radeon_fence.c | 49 +-
+ drivers/gpu/drm/radeon/radeon_gart.c | 9 +-
+ drivers/gpu/drm/radeon/radeon_ioc32.c | 15 +
+ drivers/gpu/drm/radeon/radeon_irq_kms.c | 1 -
+ drivers/gpu/drm/radeon/radeon_kms.c | 22 +-
+ drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 44 +-
+ drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 339 +-
+ drivers/gpu/drm/radeon/radeon_legacy_tv.c | 904 +
+ drivers/gpu/drm/radeon/radeon_microcode.h | 1844 --
+ drivers/gpu/drm/radeon/radeon_mode.h | 54 +-
+ drivers/gpu/drm/radeon/radeon_object.c | 8 +
+ drivers/gpu/drm/radeon/radeon_object.h | 1 +
+ drivers/gpu/drm/radeon/radeon_reg.h | 79 +-
+ drivers/gpu/drm/radeon/radeon_ring.c | 143 +-
+ drivers/gpu/drm/radeon/radeon_state.c | 18 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 96 +-
+ drivers/gpu/drm/radeon/reg_srcs/r100 | 105 +
+ drivers/gpu/drm/radeon/reg_srcs/r200 | 184 +
+ drivers/gpu/drm/radeon/reg_srcs/r300 | 729 +
+ drivers/gpu/drm/radeon/reg_srcs/rn50 | 30 +
+ drivers/gpu/drm/radeon/reg_srcs/rs600 | 729 +
+ drivers/gpu/drm/radeon/reg_srcs/rv515 | 486 +
+ drivers/gpu/drm/radeon/rs400.c | 56 +-
+ drivers/gpu/drm/radeon/rs600.c | 101 +-
+ drivers/gpu/drm/radeon/rs690.c | 4 -
+ drivers/gpu/drm/radeon/rs780.c | 102 -
+ drivers/gpu/drm/radeon/rv515.c | 524 +-
+ drivers/gpu/drm/radeon/{rv515r.h => rv515d.h} | 56 +-
+ drivers/gpu/drm/radeon/rv770.c | 993 +-
+ drivers/gpu/drm/radeon/rv770d.h | 341 +
+ drivers/gpu/drm/ttm/ttm_bo.c | 295 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 4 +-
+ drivers/gpu/drm/ttm/ttm_global.c | 4 +-
+ drivers/gpu/drm/ttm/ttm_memory.c | 508 +-
+ drivers/gpu/drm/ttm/ttm_module.c | 58 +-
+ drivers/gpu/drm/ttm/ttm_tt.c | 104 +-
+ firmware/Makefile | 16 +
+ firmware/WHENCE | 121 +
+ firmware/matrox/g200_warp.H16 | 28 +
+ firmware/matrox/g400_warp.H16 | 44 +
+ firmware/r128/r128_cce.bin.ihex | 129 +
+ firmware/radeon/R100_cp.bin.ihex | 130 +
+ firmware/radeon/R200_cp.bin.ihex | 130 +
+ firmware/radeon/R300_cp.bin.ihex | 130 +
+ firmware/radeon/R420_cp.bin.ihex | 130 +
+ firmware/radeon/R520_cp.bin.ihex | 130 +
+ firmware/radeon/R600_me.bin.ihex | 1345 ++
+ firmware/radeon/R600_pfp.bin.ihex | 145 +
+ firmware/radeon/RS600_cp.bin.ihex | 130 +
+ firmware/radeon/RS690_cp.bin.ihex | 130 +
+ firmware/radeon/RS780_me.bin.ihex | 1345 ++
+ firmware/radeon/RS780_pfp.bin.ihex | 145 +
+ firmware/radeon/RV610_me.bin.ihex | 1345 ++
+ firmware/radeon/RV610_pfp.bin.ihex | 145 +
+ firmware/radeon/RV620_me.bin.ihex | 1345 ++
+ firmware/radeon/RV620_pfp.bin.ihex | 145 +
+ firmware/radeon/RV630_me.bin.ihex | 1345 ++
+ firmware/radeon/RV630_pfp.bin.ihex | 145 +
+ firmware/radeon/RV635_me.bin.ihex | 1345 ++
+ firmware/radeon/RV635_pfp.bin.ihex | 145 +
+ firmware/radeon/RV670_me.bin.ihex | 1345 ++
+ firmware/radeon/RV670_pfp.bin.ihex | 145 +
+ firmware/radeon/RV710_me.bin.ihex | 341 +
+ firmware/radeon/RV710_pfp.bin.ihex | 213 +
+ firmware/radeon/RV730_me.bin.ihex | 341 +
+ firmware/radeon/RV730_pfp.bin.ihex | 213 +
+ firmware/radeon/RV770_me.bin.ihex | 341 +
+ firmware/radeon/RV770_pfp.bin.ihex | 213 +
+ include/drm/drmP.h | 54 +-
+ include/drm/drm_cache.h | 38 +
+ include/drm/drm_crtc.h | 16 +
+ include/drm/drm_crtc_helper.h | 3 +
+ include/drm/drm_encoder_slave.h | 162 +
+ include/drm/drm_fb_helper.h | 82 +
+ include/drm/drm_mm.h | 7 +
+ include/drm/drm_mode.h | 11 +-
+ include/drm/drm_sysfs.h | 12 +
+ include/drm/ttm/ttm_bo_api.h | 13 +-
+ include/drm/ttm/ttm_bo_driver.h | 94 +-
+ include/drm/ttm/ttm_memory.h | 43 +-
+ include/drm/ttm/ttm_module.h | 2 +
+ 160 files changed, 34859 insertions(+), 41246 deletions(-)
+ create mode 100644 drivers/gpu/drm/drm_encoder_slave.c
+ create mode 100644 drivers/gpu/drm/drm_fb_helper.c
+ rename drivers/gpu/drm/i915/{i915_gem_debugfs.c => i915_debugfs.c} (79%)
+ delete mode 100644 drivers/gpu/drm/mga/mga_ucode.h
+ rename drivers/gpu/drm/radeon/{radeon_share.h => avivod.h} (50%)
+ create mode 100644 drivers/gpu/drm/radeon/mkregtable.c
+ create mode 100644 drivers/gpu/drm/radeon/r100_track.h
+ create mode 100644 drivers/gpu/drm/radeon/r100d.h
+ create mode 100644 drivers/gpu/drm/radeon/r200.c
+ delete mode 100644 drivers/gpu/drm/radeon/r300.h
+ create mode 100644 drivers/gpu/drm/radeon/r300d.h
+ create mode 100644 drivers/gpu/drm/radeon/r420d.h
+ create mode 100644 drivers/gpu/drm/radeon/r600_blit.c
+ create mode 100644 drivers/gpu/drm/radeon/r600_blit_kms.c
+ create mode 100644 drivers/gpu/drm/radeon/r600_blit_shaders.c
+ create mode 100644 drivers/gpu/drm/radeon/r600_blit_shaders.h
+ create mode 100644 drivers/gpu/drm/radeon/r600_cs.c
+ delete mode 100644 drivers/gpu/drm/radeon/r600_microcode.h
+ create mode 100644 drivers/gpu/drm/radeon/r600d.h
+ create mode 100644 drivers/gpu/drm/radeon/radeon_legacy_tv.c
+ delete mode 100644 drivers/gpu/drm/radeon/radeon_microcode.h
+ create mode 100644 drivers/gpu/drm/radeon/reg_srcs/r100
+ create mode 100644 drivers/gpu/drm/radeon/reg_srcs/r200
+ create mode 100644 drivers/gpu/drm/radeon/reg_srcs/r300
+ create mode 100644 drivers/gpu/drm/radeon/reg_srcs/rn50
+ create mode 100644 drivers/gpu/drm/radeon/reg_srcs/rs600
+ create mode 100644 drivers/gpu/drm/radeon/reg_srcs/rv515
+ delete mode 100644 drivers/gpu/drm/radeon/rs780.c
+ rename drivers/gpu/drm/radeon/{rv515r.h => rv515d.h} (78%)
+ create mode 100644 drivers/gpu/drm/radeon/rv770d.h
+ create mode 100644 firmware/matrox/g200_warp.H16
+ create mode 100644 firmware/matrox/g400_warp.H16
+ create mode 100644 firmware/r128/r128_cce.bin.ihex
+ create mode 100644 firmware/radeon/R100_cp.bin.ihex
+ create mode 100644 firmware/radeon/R200_cp.bin.ihex
+ create mode 100644 firmware/radeon/R300_cp.bin.ihex
+ create mode 100644 firmware/radeon/R420_cp.bin.ihex
+ create mode 100644 firmware/radeon/R520_cp.bin.ihex
+ create mode 100644 firmware/radeon/R600_me.bin.ihex
+ create mode 100644 firmware/radeon/R600_pfp.bin.ihex
+ create mode 100644 firmware/radeon/RS600_cp.bin.ihex
+ create mode 100644 firmware/radeon/RS690_cp.bin.ihex
+ create mode 100644 firmware/radeon/RS780_me.bin.ihex
+ create mode 100644 firmware/radeon/RS780_pfp.bin.ihex
+ create mode 100644 firmware/radeon/RV610_me.bin.ihex
+ create mode 100644 firmware/radeon/RV610_pfp.bin.ihex
+ create mode 100644 firmware/radeon/RV620_me.bin.ihex
+ create mode 100644 firmware/radeon/RV620_pfp.bin.ihex
+ create mode 100644 firmware/radeon/RV630_me.bin.ihex
+ create mode 100644 firmware/radeon/RV630_pfp.bin.ihex
+ create mode 100644 firmware/radeon/RV635_me.bin.ihex
+ create mode 100644 firmware/radeon/RV635_pfp.bin.ihex
+ create mode 100644 firmware/radeon/RV670_me.bin.ihex
+ create mode 100644 firmware/radeon/RV670_pfp.bin.ihex
+ create mode 100644 firmware/radeon/RV710_me.bin.ihex
+ create mode 100644 firmware/radeon/RV710_pfp.bin.ihex
+ create mode 100644 firmware/radeon/RV730_me.bin.ihex
+ create mode 100644 firmware/radeon/RV730_pfp.bin.ihex
+ create mode 100644 firmware/radeon/RV770_me.bin.ihex
+ create mode 100644 firmware/radeon/RV770_pfp.bin.ihex
+ create mode 100644 include/drm/drm_cache.h
+ create mode 100644 include/drm/drm_encoder_slave.h
+ create mode 100644 include/drm/drm_fb_helper.h
+ create mode 100644 include/drm/drm_sysfs.h
+Merging voltage/for-next
+$ git merge voltage/for-next
+Resolved 'drivers/regulator/Kconfig' using previous resolution.
+Auto-merging drivers/regulator/Kconfig
+CONFLICT (content): Merge conflict in drivers/regulator/Kconfig
+Auto-merging drivers/regulator/Makefile
+Auto-merging drivers/regulator/core.c
+Auto-merging include/linux/regulator/driver.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 1aa2357] Merge commit 'voltage/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/power/regulator/overview.txt | 4 +-
+ Documentation/power/regulator/regulator.txt | 5 +-
+ drivers/regulator/Kconfig | 18 +-
+ drivers/regulator/Makefile | 3 +
+ drivers/regulator/core.c | 285 ++++++++---
+ drivers/regulator/da903x.c | 75 +++-
+ drivers/regulator/fixed.c | 91 ++++-
+ drivers/regulator/pcf50633-regulator.c | 98 +++--
+ drivers/regulator/tps65023-regulator.c | 632 ++++++++++++++++++++++++
+ drivers/regulator/tps6507x-regulator.c | 714 +++++++++++++++++++++++++++
+ drivers/regulator/userspace-consumer.c | 45 +-
+ drivers/regulator/virtual.c | 56 ++-
+ drivers/regulator/wm8350-regulator.c | 2 +
+ include/linux/mfd/da903x.h | 4 +-
+ include/linux/regulator/consumer.h | 4 +
+ include/linux/regulator/driver.h | 2 +
+ include/linux/regulator/fixed.h | 24 +
+ include/linux/regulator/machine.h | 20 +-
+ 18 files changed, 1922 insertions(+), 160 deletions(-)
+ create mode 100644 drivers/regulator/tps65023-regulator.c
+ create mode 100644 drivers/regulator/tps6507x-regulator.c
+Merging security-testing/next
+$ git merge security-testing/next
+Already up-to-date.
+Merging lblnet/master
+$ git merge lblnet/master
+Already up-to-date.
+Merging agp/agp-next
+$ git merge agp/agp-next
+Already up-to-date.
+Merging uwb/for-upstream
+$ git merge uwb/for-upstream
+Merge made by recursive.
+ drivers/uwb/hwa-rc.c | 3 +--
+ drivers/uwb/lc-rc.c | 2 +-
+ drivers/uwb/reset.c | 21 +++++++++++----------
+ drivers/uwb/umc-bus.c | 2 +-
+ drivers/uwb/uwbd.c | 4 ++--
+ drivers/uwb/whc-rc.c | 3 +--
+ include/linux/uwb.h | 2 +-
+ 7 files changed, 18 insertions(+), 19 deletions(-)
+Merging watchdog/master
+$ git merge watchdog/master
+Merge made by recursive.
+ drivers/watchdog/Kconfig | 38 +++
+ drivers/watchdog/Makefile | 3 +
+ drivers/watchdog/ar7_wdt.c | 107 +++++-----
+ drivers/watchdog/booke_wdt.c | 57 +++++-
+ drivers/watchdog/coh901327_wdt.c | 2 +-
+ drivers/watchdog/davinci_wdt.c | 19 ++-
+ drivers/watchdog/iop_wdt.c | 2 +-
+ drivers/watchdog/nuc900_wdt.c | 353 ++++++++++++++++++++++++++++
+ drivers/watchdog/rm9k_wdt.c | 2 +-
+ drivers/watchdog/sbc_fitpc2_wdt.c | 267 +++++++++++++++++++++
+ drivers/watchdog/sc1200wdt.c | 2 +-
+ drivers/watchdog/wdt_pci.c | 21 +-
+ drivers/watchdog/wm831x_wdt.c | 441 +++++++++++++++++++++++++++++++++++
+ include/linux/mfd/wm831x/watchdog.h | 52 ++++
+ 14 files changed, 1293 insertions(+), 73 deletions(-)
+ create mode 100644 drivers/watchdog/nuc900_wdt.c
+ create mode 100644 drivers/watchdog/sbc_fitpc2_wdt.c
+ create mode 100644 drivers/watchdog/wm831x_wdt.c
+ create mode 100644 include/linux/mfd/wm831x/watchdog.h
+Merging bdev/master
+$ git merge bdev/master
+Already up-to-date.
+Merging dwmw2-iommu/master
+$ git merge dwmw2-iommu/master
+Auto-merging arch/x86/kernel/pci-dma.c
+Auto-merging arch/x86/kernel/pci-swiotlb.c
+Auto-merging drivers/pci/dmar.c
+Auto-merging drivers/pci/intel-iommu.c
+CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
+Auto-merging drivers/pci/intr_remapping.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/pci/intel-iommu.c'.
+[master 209f8d7] Merge commit 'dwmw2-iommu/master'
+$ git diff -M --stat --summary HEAD^..
+ arch/ia64/kernel/pci-swiotlb.c | 2 +-
+ arch/x86/kernel/pci-swiotlb.c | 5 +-
+ drivers/pci/dmar.c | 37 ++++-
+ drivers/pci/intel-iommu.c | 290 +++++++++++++++++++---------------------
+ drivers/pci/intr_remapping.c | 8 +
+ drivers/pci/iova.c | 16 +--
+ drivers/usb/host/pci-quirks.c | 2 +-
+ include/linux/intel-iommu.h | 2 +
+ include/linux/iova.h | 1 -
+ 9 files changed, 187 insertions(+), 176 deletions(-)
+Merging cputime/cputime
+$ git merge cputime/cputime
+Merge made by recursive.
+ fs/proc/uptime.c | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+Merging osd/linux-next
+$ git merge osd/linux-next
+Merge made by recursive.
+ Documentation/filesystems/00-INDEX | 2 +
+ Documentation/filesystems/exofs.txt | 23 ++++++++-------
+ drivers/scsi/osd/osd_initiator.c | 22 ++++++++++----
+ drivers/scsi/osd/osd_uld.c | 53 ++++++++++++++++++++++++++++++++++-
+ fs/exofs/inode.c | 13 ++++++--
+ fs/exofs/super.c | 17 +++++++----
+ include/scsi/osd_initiator.h | 53 ++++++++++++++++++++++++++++------
+ include/scsi/osd_sense.h | 3 ++
+ 8 files changed, 148 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 Documentation/sound/alsa/HD-Audio-Models.txt
+Auto-merging Documentation/sysctl/kernel.txt
+Auto-merging Documentation/trace/events.txt
+Auto-merging Documentation/trace/ftrace.txt
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/mach-at91/board-afeb-9260v1.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-sam9rlek.c
+Auto-merging arch/s390/hypfs/inode.c
+Auto-merging arch/s390/kvm/interrupt.c
+Auto-merging arch/sparc/kernel/irq_64.c
+Auto-merging arch/um/drivers/net_kern.c
+Auto-merging arch/x86/kernel/cpu/amd.c
+Auto-merging drivers/char/agp/uninorth-agp.c
+Auto-merging drivers/gpu/drm/i915/intel_dp.c
+Auto-merging drivers/gpu/drm/radeon/r300.c
+Auto-merging drivers/ide/ide-probe.c
+Auto-merging drivers/input/keyboard/atkbd.c
+Auto-merging drivers/lguest/page_tables.c
+Auto-merging drivers/media/video/cx88/cx88-dvb.c
+Auto-merging drivers/media/video/cx88/cx88-video.c
+Auto-merging drivers/message/fusion/mptbase.c
+Auto-merging drivers/mtd/devices/m25p80.c
+Auto-merging drivers/mtd/devices/slram.c
+Auto-merging drivers/mtd/ubi/ubi.h
+Auto-merging drivers/net/bnx2x_reg.h
+Auto-merging drivers/net/bonding/bond_3ad.c
+Auto-merging drivers/net/e1000/e1000_hw.c
+Auto-merging drivers/net/ibm_newemac/core.c
+Auto-merging drivers/net/igb/igb_main.c
+Auto-merging drivers/net/ll_temac_main.c
+Auto-merging drivers/net/macb.c
+Auto-merging drivers/net/ni52.c
+Auto-merging drivers/net/qlge/qlge_main.c
+Auto-merging drivers/net/rionet.c
+Auto-merging drivers/net/skge.c
+Auto-merging drivers/net/sky2.c
+Auto-merging drivers/net/vxge/vxge-config.h
+Auto-merging drivers/net/vxge/vxge-main.c
+Auto-merging drivers/net/wireless/ath/ath5k/reg.h
+Auto-merging drivers/net/wireless/atmel.c
+Auto-merging drivers/net/wireless/zd1211rw/zd_chip.c
+Auto-merging drivers/pcmcia/pcmcia_resource.c
+Auto-merging drivers/s390/block/dasd_eckd.c
+Auto-merging drivers/s390/net/netiucv.c
+Auto-merging drivers/s390/scsi/zfcp_scsi.c
+Auto-merging drivers/scsi/bnx2i/bnx2i_hwi.c
+Auto-merging drivers/scsi/lpfc/lpfc_ct.c
+Auto-merging drivers/staging/rt2860/rtmp.h
+Auto-merging drivers/usb/class/cdc-wdm.c
+Auto-merging drivers/usb/host/xhci.h
+Auto-merging drivers/video/imxfb.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/gfs2/rgrp.c
+Auto-merging fs/ocfs2/quota_global.c
+Auto-merging include/acpi/actypes.h
+Auto-merging include/linux/mISDNif.h
+Auto-merging include/linux/module.h
+Auto-merging include/linux/workqueue.h
+Auto-merging kernel/trace/Kconfig
+Auto-merging kernel/tracepoint.c
+Auto-merging net/sched/sch_hfsc.c
+Auto-merging net/wireless/wext-compat.c
+Auto-merging sound/soc/codecs/wm9081.c
+Auto-merging sound/soc/pxa/pxa-ssp.c
+Merge made by recursive.
+ Documentation/DocBook/mtdnand.tmpl | 2 +-
+ Documentation/DocBook/scsi.tmpl | 2 +-
+ Documentation/SubmittingPatches | 2 +-
+ Documentation/filesystems/nfsroot.txt | 2 +-
+ Documentation/hwmon/hpfall.c | 115 +++++++++++++++-------
+ Documentation/hwmon/pc87427 | 2 +-
+ Documentation/networking/regulatory.txt | 2 +-
+ Documentation/powerpc/dts-bindings/marvell.txt | 2 +-
+ Documentation/scsi/ChangeLog.megaraid | 2 +-
+ Documentation/scsi/scsi_fc_transport.txt | 2 +-
+ Documentation/sound/alsa/HD-Audio-Models.txt | 2 +-
+ Documentation/sysctl/kernel.txt | 30 +++---
+ Documentation/trace/events.txt | 2 +-
+ Documentation/trace/ftrace.txt | 2 +-
+ MAINTAINERS | 2 +-
+ arch/arm/Makefile | 2 +-
+ arch/arm/mach-at91/board-afeb-9260v1.c | 2 +-
+ arch/arm/mach-at91/board-cam60.c | 2 +-
+ arch/arm/mach-at91/board-neocore926.c | 2 +-
+ arch/arm/mach-at91/board-qil-a9260.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-sam9rlek.c | 2 +-
+ arch/arm/mach-at91/board-usb-a9260.c | 2 +-
+ arch/arm/mach-at91/board-usb-a9263.c | 2 +-
+ arch/blackfin/mach-bf538/include/mach/defBF539.h | 2 +-
+ arch/frv/lib/cache.S | 2 +-
+ arch/h8300/kernel/timer/tpu.c | 1 -
+ arch/ia64/ia32/sys_ia32.c | 2 +-
+ arch/mn10300/include/asm/cacheflush.h | 4 +-
+ arch/powerpc/kernel/udbg_16550.c | 2 +-
+ arch/powerpc/platforms/powermac/udbg_scc.c | 2 +-
+ arch/s390/hypfs/inode.c | 2 +-
+ arch/s390/kvm/interrupt.c | 2 +-
+ arch/sparc/kernel/irq_64.c | 2 +-
+ arch/um/drivers/net_kern.c | 2 +-
+ arch/um/include/shared/ptrace_user.h | 2 +-
+ arch/x86/kernel/cpu/amd.c | 2 +-
+ drivers/block/DAC960.c | 8 +-
+ drivers/block/swim3.c | 2 +-
+ drivers/char/agp/uninorth-agp.c | 2 +-
+ drivers/char/epca.c | 2 +-
+ drivers/char/ipmi/ipmi_poweroff.c | 4 +-
+ drivers/edac/edac_core.h | 2 +-
+ drivers/gpio/bt8xxgpio.c | 4 +-
+ drivers/gpu/drm/i915/intel_dp.c | 2 +-
+ drivers/gpu/drm/mga/mga_state.c | 4 +-
+ drivers/ide/ide-probe.c | 2 +-
+ drivers/ide/umc8672.c | 4 +-
+ drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 +-
+ drivers/input/keyboard/atkbd.c | 2 +-
+ drivers/isdn/capi/capiutil.c | 2 +-
+ drivers/isdn/i4l/isdn_common.c | 4 +-
+ drivers/lguest/page_tables.c | 2 +-
+ drivers/macintosh/rack-meter.c | 2 +-
+ drivers/md/md.h | 2 +-
+ drivers/media/dvb/siano/smscoreapi.c | 2 +-
+ drivers/media/dvb/siano/smscoreapi.h | 4 +-
+ drivers/media/radio/radio-mr800.c | 2 +-
+ drivers/media/video/cx88/cx88-blackbird.c | 4 +-
+ drivers/media/video/cx88/cx88-dvb.c | 4 +-
+ drivers/media/video/cx88/cx88-mpeg.c | 4 +-
+ drivers/media/video/cx88/cx88-video.c | 4 +-
+ drivers/media/video/gspca/m5602/m5602_core.c | 2 +-
+ drivers/message/fusion/mptbase.c | 4 +-
+ drivers/mmc/host/mxcmmc.c | 2 +-
+ drivers/mtd/devices/m25p80.c | 4 +-
+ drivers/mtd/devices/slram.c | 2 +-
+ drivers/mtd/ftl.c | 2 +-
+ drivers/mtd/maps/ixp2000.c | 2 +-
+ drivers/mtd/nand/cafe_nand.c | 4 +-
+ drivers/mtd/nand/cmx270_nand.c | 4 +-
+ drivers/mtd/ubi/eba.c | 2 +-
+ drivers/mtd/ubi/ubi.h | 2 +-
+ drivers/net/arcnet/arc-rawmode.c | 1 -
+ drivers/net/arcnet/capmode.c | 1 -
+ drivers/net/bnx2x_reg.h | 2 +-
+ drivers/net/bonding/bond_3ad.c | 2 +-
+ drivers/net/e1000/e1000_hw.c | 2 +-
+ drivers/net/gianfar_ethtool.c | 2 +-
+ drivers/net/ibm_newemac/core.c | 8 +-
+ drivers/net/igb/igb_main.c | 2 +-
+ drivers/net/ll_temac_main.c | 2 +-
+ drivers/net/macb.c | 2 +-
+ drivers/net/ni52.c | 4 +-
+ drivers/net/qlge/qlge_main.c | 4 +-
+ drivers/net/rionet.c | 2 +-
+ drivers/net/skfp/pcmplc.c | 2 +-
+ drivers/net/skfp/pmf.c | 8 +-
+ drivers/net/skge.c | 2 +-
+ drivers/net/sky2.c | 2 +-
+ drivers/net/vxge/vxge-config.h | 2 +-
+ drivers/net/vxge/vxge-main.c | 2 +-
+ drivers/net/wireless/ath/ath5k/reg.h | 2 +-
+ drivers/net/wireless/atmel.c | 2 +-
+ drivers/net/wireless/zd1211rw/zd_chip.c | 2 +-
+ drivers/rtc/rtc-omap.c | 2 +-
+ drivers/s390/block/dasd_eckd.c | 2 +-
+ drivers/s390/net/netiucv.c | 2 +-
+ drivers/s390/scsi/zfcp_scsi.c | 2 +-
+ drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +-
+ drivers/scsi/lpfc/lpfc_ct.c | 2 +-
+ drivers/scsi/megaraid/megaraid_sas.c | 2 +-
+ drivers/scsi/qla4xxx/ql4_os.c | 4 +-
+ drivers/spi/omap_uwire.c | 2 +-
+ drivers/spi/spi_s3c24xx.c | 2 +-
+ drivers/staging/rt2860/rtmp.h | 2 +-
+ drivers/usb/class/cdc-wdm.c | 2 -
+ drivers/usb/host/ehci-pci.c | 2 +-
+ drivers/usb/host/ehci.h | 2 +-
+ drivers/usb/host/ohci-q.c | 2 +-
+ drivers/usb/host/xhci.h | 2 +-
+ drivers/usb/serial/cypress_m8.h | 2 +-
+ drivers/usb/serial/io_edgeport.c | 2 +-
+ drivers/usb/serial/kl5kusb105.c | 2 +-
+ drivers/usb/serial/spcp8x5.c | 2 +-
+ drivers/usb/wusbcore/wa-hc.h | 2 +-
+ drivers/uwb/i1480/i1480u-wlp/netdev.c | 2 +-
+ drivers/video/cfbcopyarea.c | 2 +-
+ drivers/video/imxfb.c | 2 +-
+ drivers/video/omap/lcd_h3.c | 4 +-
+ drivers/video/omap/lcd_h4.c | 4 +-
+ drivers/video/omap/lcd_inn1510.c | 4 +-
+ drivers/video/omap/lcd_inn1610.c | 4 +-
+ drivers/video/omap/lcd_osk.c | 4 +-
+ drivers/video/omap/lcd_palmte.c | 4 +-
+ drivers/video/omap/lcd_palmtt.c | 4 +-
+ drivers/video/omap/lcd_palmz71.c | 4 +-
+ drivers/video/s3c2410fb.c | 2 +-
+ drivers/xen/balloon.c | 2 +-
+ fs/autofs/dirhash.c | 2 +-
+ fs/btrfs/tree-log.c | 2 +-
+ fs/cifs/cifs_dfs_ref.c | 2 +-
+ fs/ext4/inode.c | 2 +-
+ fs/gfs2/rgrp.c | 2 +-
+ fs/nfs/callback_xdr.c | 2 +-
+ fs/ntfs/layout.h | 2 +-
+ fs/ocfs2/quota_global.c | 2 +-
+ fs/xfs/xfs_fs.h | 2 +-
+ include/acpi/actypes.h | 2 +-
+ include/acpi/platform/acgcc.h | 2 +-
+ include/linux/capability.h | 2 +-
+ include/linux/mISDNif.h | 2 +-
+ include/linux/module.h | 5 +-
+ include/linux/namei.h | 2 +-
+ include/linux/usb.h | 2 +-
+ include/linux/workqueue.h | 2 +-
+ include/rdma/ib_cm.h | 2 +-
+ include/scsi/fc/fc_fc2.h | 3 +-
+ kernel/panic.c | 2 +-
+ kernel/trace/Kconfig | 2 +-
+ kernel/trace/trace_hw_branches.c | 2 +-
+ kernel/tracepoint.c | 2 +-
+ lib/zlib_deflate/deflate.c | 4 +-
+ mm/Kconfig.debug | 12 +-
+ net/rxrpc/ar-call.c | 2 +-
+ net/sched/sch_hfsc.c | 2 +-
+ net/wireless/wext-compat.c | 2 +-
+ scripts/basic/fixdep.c | 4 +-
+ scripts/mod/sumversion.c | 2 -
+ sound/oss/swarm_cs4297a.c | 3 -
+ sound/oss/sys_timer.c | 3 -
+ sound/soc/codecs/wm9081.c | 2 +-
+ sound/soc/pxa/pxa-ssp.c | 2 +-
+ sound/soc/s3c24xx/s3c24xx_uda134x.c | 2 +-
+ 167 files changed, 299 insertions(+), 263 deletions(-)
+Merging audit/for-next
+$ git merge audit/for-next
+Already up-to-date.
+Merging omap/for-next
+$ git merge omap/for-next
+Auto-merging arch/arm/mach-omap2/board-4430sdp.c
+Auto-merging arch/arm/mach-omap2/serial.c
+Auto-merging arch/arm/plat-omap/dma.c
+Auto-merging arch/arm/plat-omap/gpio.c
+Merge made by recursive.
+ Documentation/arm/OMAP/omap_pm | 129 ++
+ arch/arm/configs/n8x0_defconfig | 1104 ++++++++++++++++++
+ arch/arm/configs/omap3_beagle_defconfig | 41 +-
+ arch/arm/configs/omap_3430sdp_defconfig | 20 +-
+ arch/arm/configs/omap_zoom2_defconfig | 484 +++++++--
+ arch/arm/configs/rx51_defconfig | 1 +
+ arch/arm/mach-omap1/board-ams-delta.c | 43 +-
+ arch/arm/mach-omap1/board-fsample.c | 5 -
+ arch/arm/mach-omap1/board-generic.c | 5 -
+ arch/arm/mach-omap1/board-h2.c | 5 -
+ arch/arm/mach-omap1/board-h3.c | 5 -
+ arch/arm/mach-omap1/board-innovator.c | 5 -
+ arch/arm/mach-omap1/board-osk.c | 5 -
+ arch/arm/mach-omap1/board-palmte.c | 5 -
+ arch/arm/mach-omap1/board-palmtt.c | 5 -
+ arch/arm/mach-omap1/board-palmz71.c | 5 -
+ arch/arm/mach-omap1/board-perseus2.c | 5 -
+ arch/arm/mach-omap1/board-sx1.c | 5 -
+ arch/arm/mach-omap1/board-voiceblue.c | 5 -
+ arch/arm/mach-omap1/devices.c | 2 +-
+ arch/arm/mach-omap1/io.c | 6 +-
+ arch/arm/mach-omap1/pm.h | 4 +-
+ arch/arm/mach-omap1/serial.c | 17 +-
+ arch/arm/mach-omap1/sram.S | 12 +-
+ arch/arm/mach-omap1/time.c | 4 +-
+ arch/arm/mach-omap2/Kconfig | 9 +
+ arch/arm/mach-omap2/Makefile | 10 +-
+ arch/arm/mach-omap2/board-2430sdp.c | 18 +-
+ arch/arm/mach-omap2/board-3430sdp.c | 29 +-
+ arch/arm/mach-omap2/board-4430sdp.c | 5 +-
+ arch/arm/mach-omap2/board-apollon.c | 25 +-
+ arch/arm/mach-omap2/board-generic.c | 15 +-
+ arch/arm/mach-omap2/board-h4.c | 25 +-
+ arch/arm/mach-omap2/board-ldp.c | 25 +-
+ arch/arm/mach-omap2/board-n8x0.c | 150 +++
+ arch/arm/mach-omap2/board-omap3beagle.c | 36 +-
+ arch/arm/mach-omap2/board-omap3evm.c | 17 +-
+ arch/arm/mach-omap2/board-omap3pandora.c | 25 +-
+ arch/arm/mach-omap2/board-overo.c | 24 +-
+ arch/arm/mach-omap2/board-rx51.c | 9 +-
+ arch/arm/mach-omap2/board-zoom-debugboard.c | 11 +-
+ arch/arm/mach-omap2/board-zoom2.c | 218 ++++-
+ arch/arm/mach-omap2/clock.c | 2 +
+ arch/arm/mach-omap2/clock34xx.c | 17 +-
+ arch/arm/mach-omap2/clock34xx.h | 21 +-
+ arch/arm/mach-omap2/clockdomain.c | 10 +-
+ arch/arm/mach-omap2/cm.c | 70 ++
+ arch/arm/mach-omap2/cm.h | 10 +-
+ arch/arm/mach-omap2/cm4xxx.c | 68 ++
+ arch/arm/mach-omap2/devices.c | 41 +
+ arch/arm/mach-omap2/io.c | 23 +-
+ arch/arm/mach-omap2/iommu2.c | 19 +-
+ arch/arm/mach-omap2/mux.c | 55 +
+ arch/arm/mach-omap2/omap-smp.c | 2 +-
+ arch/arm/mach-omap2/omap_hwmod.c | 1554 +++++++++++++++++++++++++
+ arch/arm/mach-omap2/omap_hwmod_2420.h | 141 +++
+ arch/arm/mach-omap2/omap_hwmod_2430.h | 143 +++
+ arch/arm/mach-omap2/omap_hwmod_34xx.h | 168 +++
+ arch/arm/mach-omap2/pm-debug.c | 431 +++++++-
+ arch/arm/mach-omap2/pm.h | 11 +
+ arch/arm/mach-omap2/pm24xx.c | 4 +-
+ arch/arm/mach-omap2/pm34xx.c | 40 +-
+ arch/arm/mach-omap2/powerdomain.c | 114 ++-
+ arch/arm/mach-omap2/prm.h | 6 +-
+ arch/arm/mach-omap2/sdrc.h | 6 +-
+ arch/arm/mach-omap2/serial.c | 67 +-
+ arch/arm/mach-omap2/sram242x.S | 4 +-
+ arch/arm/mach-omap2/sram243x.S | 4 +-
+ arch/arm/mach-omap2/timer-gp.c | 2 +-
+ arch/arm/mach-omap2/usb-musb.c | 12 -
+ arch/arm/plat-omap/Kconfig | 17 +
+ arch/arm/plat-omap/Makefile | 6 +
+ arch/arm/plat-omap/clock.c | 2 +-
+ arch/arm/plat-omap/common.c | 88 --
+ arch/arm/plat-omap/dma.c | 8 +-
+ arch/arm/plat-omap/dmtimer.c | 5 +-
+ arch/arm/plat-omap/gpio.c | 115 ++-
+ arch/arm/plat-omap/include/mach/board.h | 2 -
+ arch/arm/plat-omap/include/mach/clockdomain.h | 3 +-
+ arch/arm/plat-omap/include/mach/control.h | 12 +-
+ arch/arm/plat-omap/include/mach/entry-macro.S | 8 +-
+ arch/arm/plat-omap/include/mach/gpio.h | 2 +-
+ arch/arm/plat-omap/include/mach/io.h | 97 +-
+ arch/arm/plat-omap/include/mach/iommu.h | 6 +-
+ arch/arm/plat-omap/include/mach/mtd-xip.h | 2 +-
+ arch/arm/plat-omap/include/mach/mux.h | 31 +
+ arch/arm/plat-omap/include/mach/omap-pm.h | 301 +++++
+ arch/arm/plat-omap/include/mach/omap44xx.h | 8 +-
+ arch/arm/plat-omap/include/mach/omap_device.h | 141 +++
+ arch/arm/plat-omap/include/mach/omap_hwmod.h | 447 +++++++
+ arch/arm/plat-omap/include/mach/powerdomain.h | 15 +-
+ arch/arm/plat-omap/include/mach/sdrc.h | 15 +-
+ arch/arm/plat-omap/include/mach/serial.h | 3 +
+ arch/arm/plat-omap/io.c | 62 +-
+ arch/arm/plat-omap/iommu-debug.c | 415 +++++++
+ arch/arm/plat-omap/iommu.c | 23 +-
+ arch/arm/plat-omap/iovmm.c | 2 +-
+ arch/arm/plat-omap/omap-pm-noop.c | 296 +++++
+ arch/arm/plat-omap/omap_device.c | 687 +++++++++++
+ arch/arm/plat-omap/sram.c | 18 +-
+ drivers/input/keyboard/omap-keypad.c | 22 +-
+ drivers/mtd/nand/ams-delta.c | 8 +-
+ drivers/video/omap/dispc.c | 6 +-
+ 103 files changed, 7777 insertions(+), 719 deletions(-)
+ create mode 100644 Documentation/arm/OMAP/omap_pm
+ create mode 100644 arch/arm/configs/n8x0_defconfig
+ create mode 100644 arch/arm/mach-omap2/board-n8x0.c
+ create mode 100644 arch/arm/mach-omap2/cm.c
+ create mode 100644 arch/arm/mach-omap2/cm4xxx.c
+ create mode 100644 arch/arm/mach-omap2/omap_hwmod.c
+ create mode 100644 arch/arm/mach-omap2/omap_hwmod_2420.h
+ create mode 100644 arch/arm/mach-omap2/omap_hwmod_2430.h
+ create mode 100644 arch/arm/mach-omap2/omap_hwmod_34xx.h
+ create mode 100644 arch/arm/plat-omap/include/mach/omap-pm.h
+ create mode 100644 arch/arm/plat-omap/include/mach/omap_device.h
+ create mode 100644 arch/arm/plat-omap/include/mach/omap_hwmod.h
+ create mode 100644 arch/arm/plat-omap/iommu-debug.c
+ create mode 100644 arch/arm/plat-omap/omap-pm-noop.c
+ create mode 100644 arch/arm/plat-omap/omap_device.c
+Merging quilt/aoe
+$ git merge quilt/aoe
+Merge made by recursive.
+ drivers/block/aoe/aoecmd.c | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+Merging suspend/linux-next
+$ git merge suspend/linux-next
+Already up-to-date.
+Merging bluetooth/master
+$ git merge bluetooth/master
+Already up-to-date.
+Merging fsnotify/for-next
+$ git merge fsnotify/for-next
+Auto-merging Documentation/feature-removal-schedule.txt
+Auto-merging init/Kconfig
+Auto-merging kernel/Makefile
+Merge made by recursive.
+ Documentation/feature-removal-schedule.txt | 7 +
+ fs/compat.c | 5 +-
+ fs/exec.c | 4 +-
+ fs/nfsd/vfs.c | 4 +-
+ fs/notify/dnotify/dnotify.c | 8 +-
+ fs/notify/fsnotify.c | 16 ++-
+ fs/notify/group.c | 50 +-----
+ fs/notify/inode_mark.c | 24 ++-
+ fs/notify/inotify/inotify_fsnotify.c | 59 ++++++-
+ fs/notify/inotify/inotify_user.c | 219 ++++++++++++++-------
+ fs/notify/notification.c | 161 +++++++++-------
+ fs/open.c | 2 +-
+ fs/read_write.c | 8 +-
+ include/linux/fsnotify.h | 44 +++--
+ include/linux/fsnotify_backend.h | 30 ++--
+ init/Kconfig | 10 +-
+ kernel/Makefile | 5 +-
+ kernel/audit.c | 1 -
+ kernel/audit.h | 26 ++-
+ kernel/audit_tree.c | 223 ++++++++++++---------
+ kernel/audit_watch.c | 296 ++++++++++++++++------------
+ kernel/auditfilter.c | 39 ++---
+ kernel/auditsc.c | 15 +-
+ 23 files changed, 730 insertions(+), 526 deletions(-)
+Merging irda/for-next
+$ git merge irda/for-next
+Auto-merging drivers/net/irda/irda-usb.c
+Merge made by recursive.
+ drivers/net/irda/irda-usb.c | 9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+Merging hwlat/for-linus
+$ git merge hwlat/for-linus
+Auto-merging MAINTAINERS
+Auto-merging drivers/misc/Kconfig
+Auto-merging drivers/misc/Makefile
+Merge made by recursive.
+ Documentation/hwlat_detector.txt | 64 ++
+ MAINTAINERS | 9 +
+ drivers/misc/Kconfig | 29 +
+ drivers/misc/Makefile | 1 +
+ drivers/misc/hwlat_detector.c | 1208 ++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 1311 insertions(+), 0 deletions(-)
+ create mode 100644 Documentation/hwlat_detector.txt
+ create mode 100644 drivers/misc/hwlat_detector.c
+Merging drbd/drbd
+$ git merge drbd/drbd
+Auto-merging MAINTAINERS
+Merge made by recursive.
+ .../blockdev/drbd/DRBD-8.3-data-packets.svg | 588 +++
+ Documentation/blockdev/drbd/DRBD-data-packets.svg | 459 ++
+ Documentation/blockdev/drbd/README.txt | 16 +
+ Documentation/blockdev/drbd/conn-states-8.dot | 18 +
+ Documentation/blockdev/drbd/disk-states-8.dot | 16 +
+ .../drbd/drbd-connection-state-overview.dot | 85 +
+ Documentation/blockdev/drbd/node-states-8.dot | 14 +
+ MAINTAINERS | 13 +
+ drivers/block/Kconfig | 2 +
+ drivers/block/Makefile | 1 +
+ drivers/block/drbd/Kconfig | 82 +
+ drivers/block/drbd/Makefile | 8 +
+ drivers/block/drbd/drbd_actlog.c | 1484 +++++++
+ drivers/block/drbd/drbd_bitmap.c | 1327 ++++++
+ drivers/block/drbd/drbd_int.h | 2258 ++++++++++
+ drivers/block/drbd/drbd_main.c | 3735 ++++++++++++++++
+ drivers/block/drbd/drbd_nl.c | 2365 +++++++++++
+ drivers/block/drbd/drbd_proc.c | 266 ++
+ drivers/block/drbd/drbd_receiver.c | 4456 ++++++++++++++++++++
+ drivers/block/drbd/drbd_req.c | 1132 +++++
+ drivers/block/drbd/drbd_req.h | 327 ++
+ drivers/block/drbd/drbd_strings.c | 113 +
+ drivers/block/drbd/drbd_tracing.c | 753 ++++
+ drivers/block/drbd/drbd_tracing.h | 87 +
+ drivers/block/drbd/drbd_vli.h | 351 ++
+ drivers/block/drbd/drbd_worker.c | 1529 +++++++
+ drivers/block/drbd/drbd_wrappers.h | 91 +
+ include/linux/drbd.h | 349 ++
+ include/linux/drbd_limits.h | 137 +
+ include/linux/drbd_nl.h | 137 +
+ include/linux/drbd_tag_magic.h | 83 +
+ include/linux/lru_cache.h | 294 ++
+ lib/Kconfig | 3 +
+ lib/Makefile | 2 +
+ lib/lru_cache.c | 560 +++
+ 35 files changed, 23141 insertions(+), 0 deletions(-)
+ create mode 100644 Documentation/blockdev/drbd/DRBD-8.3-data-packets.svg
+ create mode 100644 Documentation/blockdev/drbd/DRBD-data-packets.svg
+ create mode 100644 Documentation/blockdev/drbd/README.txt
+ create mode 100644 Documentation/blockdev/drbd/conn-states-8.dot
+ create mode 100644 Documentation/blockdev/drbd/disk-states-8.dot
+ create mode 100644 Documentation/blockdev/drbd/drbd-connection-state-overview.dot
+ create mode 100644 Documentation/blockdev/drbd/node-states-8.dot
+ create mode 100644 drivers/block/drbd/Kconfig
+ create mode 100644 drivers/block/drbd/Makefile
+ create mode 100644 drivers/block/drbd/drbd_actlog.c
+ create mode 100644 drivers/block/drbd/drbd_bitmap.c
+ create mode 100644 drivers/block/drbd/drbd_int.h
+ create mode 100644 drivers/block/drbd/drbd_main.c
+ create mode 100644 drivers/block/drbd/drbd_nl.c
+ create mode 100644 drivers/block/drbd/drbd_proc.c
+ create mode 100644 drivers/block/drbd/drbd_receiver.c
+ create mode 100644 drivers/block/drbd/drbd_req.c
+ create mode 100644 drivers/block/drbd/drbd_req.h
+ create mode 100644 drivers/block/drbd/drbd_strings.c
+ create mode 100644 drivers/block/drbd/drbd_tracing.c
+ create mode 100644 drivers/block/drbd/drbd_tracing.h
+ create mode 100644 drivers/block/drbd/drbd_vli.h
+ create mode 100644 drivers/block/drbd/drbd_worker.c
+ create mode 100644 drivers/block/drbd/drbd_wrappers.h
+ create mode 100644 include/linux/drbd.h
+ create mode 100644 include/linux/drbd_limits.h
+ create mode 100644 include/linux/drbd_nl.h
+ create mode 100644 include/linux/drbd_tag_magic.h
+ create mode 100644 include/linux/lru_cache.h
+ create mode 100644 lib/lru_cache.c
+Merging kmemleak/kmemleak
+$ git merge kmemleak/kmemleak
+Already up-to-date.
+Merging tip/auto-latest
+$ git merge tip/auto-latest
+Resolved 'arch/x86/kernel/setup.c' using previous resolution.
+Auto-merging Documentation/feature-removal-schedule.txt
+Auto-merging Documentation/trace/events.txt
+Auto-merging arch/arm/plat-omap/common.c
+Auto-merging arch/m68knommu/kernel/time.c
+Auto-merging arch/powerpc/kernel/time.c
+Auto-merging arch/s390/kernel/time.c
+Auto-merging arch/sh/kernel/time.c
+Auto-merging arch/x86/Kconfig
+Removing arch/x86/include/asm/do_timer.h
+Auto-merging arch/x86/include/asm/msr-index.h
+Auto-merging arch/x86/kernel/apic/io_apic.c
+Removing arch/x86/kernel/cpu/mcheck/k7.c
+Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
+Removing arch/x86/kernel/cpu/mcheck/non-fatal.c
+Removing arch/x86/kernel/cpu/mcheck/p4.c
+Removing arch/x86/kernel/cpu/mcheck/p6.c
+Auto-merging arch/x86/kernel/kvmclock.c
+Auto-merging arch/x86/kernel/setup.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
+Auto-merging arch/x86/kernel/smpboot.c
+Removing arch/x86/kernel/time_32.c
+Removing arch/x86/kernel/time_64.c
+Auto-merging arch/x86/lguest/boot.c
+Auto-merging arch/x86/xen/mmu.c
+Auto-merging drivers/pci/intr_remapping.c
+Auto-merging include/asm-generic/vmlinux.lds.h
+Auto-merging include/linux/sched.h
+Auto-merging init/main.c
+Auto-merging kernel/hrtimer.c
+Auto-merging kernel/sched.c
+Auto-merging kernel/trace/trace.c
+Removing kernel/trace/trace_event_types.h
+Auto-merging kernel/trace/trace_events.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b3d3b05] Merge commit 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/feature-removal-schedule.txt | 10 -
+ Documentation/trace/events.txt | 184 ++++++++++-
+ Documentation/x86/boot.txt | 1 +
+ arch/arm/plat-omap/common.c | 7 +-
+ arch/ia64/include/asm/cputime.h | 1 +
+ arch/m68knommu/kernel/time.c | 5 +-
+ arch/mips/dec/time.c | 5 +-
+ arch/mips/lasat/ds1603.c | 5 +-
+ arch/mips/lasat/sysctl.c | 8 +-
+ arch/mips/lemote/lm2e/setup.c | 5 +-
+ arch/mips/mti-malta/malta-time.c | 5 +-
+ arch/mips/pmc-sierra/yosemite/setup.c | 5 +-
+ arch/mips/sibyte/swarm/setup.c | 15 +-
+ arch/mips/sni/time.c | 5 +-
+ arch/powerpc/include/asm/cputime.h | 13 +
+ arch/powerpc/kernel/time.c | 23 +-
+ arch/s390/include/asm/cputime.h | 1 +
+ arch/s390/kernel/time.c | 38 +--
+ arch/sh/kernel/time.c | 6 +-
+ arch/x86/Kconfig | 80 ++---
+ arch/x86/include/asm/apic.h | 19 +-
+ arch/x86/include/asm/bootparam.h | 10 +
+ arch/x86/include/asm/do_timer.h | 16 -
+ arch/x86/include/asm/e820.h | 2 -
+ arch/x86/include/asm/elf.h | 2 +
+ arch/x86/include/asm/entry_arch.h | 2 +-
+ arch/x86/include/asm/hpet.h | 7 +-
+ arch/x86/include/asm/hypervisor.h | 2 +-
+ arch/x86/include/asm/io_apic.h | 5 +-
+ arch/x86/include/asm/irq.h | 3 +-
+ arch/x86/include/asm/mce.h | 20 +-
+ arch/x86/include/asm/mpspec.h | 47 ++-
+ arch/x86/include/asm/msr-index.h | 11 +
+ arch/x86/include/asm/nops.h | 2 +
+ arch/x86/include/asm/paravirt.h | 41 +--
+ arch/x86/include/asm/paravirt_types.h | 24 --
+ arch/x86/include/asm/pgtable.h | 10 -
+ arch/x86/include/asm/pgtable_types.h | 4 +-
+ arch/x86/include/asm/setup.h | 49 +--
+ arch/x86/include/asm/time.h | 3 -
+ arch/x86/include/asm/timer.h | 14 +-
+ arch/x86/include/asm/tsc.h | 3 +-
+ arch/x86/include/asm/vgtod.h | 1 +
+ arch/x86/include/asm/vmware.h | 2 +-
+ arch/x86/include/asm/x86_init.h | 129 +++++++
+ arch/x86/kernel/Makefile | 5 +-
+ arch/x86/kernel/acpi/boot.c | 1 +
+ arch/x86/kernel/apic/apic.c | 3 +-
+ arch/x86/kernel/apic/bigsmp_32.c | 2 +-
+ arch/x86/kernel/apic/io_apic.c | 101 ++++--
+ arch/x86/kernel/apic/nmi.c | 2 +-
+ arch/x86/kernel/apic/numaq_32.c | 57 ++--
+ arch/x86/kernel/apic/summit_32.c | 2 +-
+ arch/x86/kernel/cpu/hypervisor.c | 14 +-
+ arch/x86/kernel/cpu/mcheck/Makefile | 5 +-
+ arch/x86/kernel/cpu/mcheck/k7.c | 116 ------
+ arch/x86/kernel/cpu/mcheck/mce-internal.h | 14 +
+ arch/x86/kernel/cpu/mcheck/mce-severity.c | 2 -
+ arch/x86/kernel/cpu/mcheck/mce.c | 220 +++++-------
+ arch/x86/kernel/cpu/mcheck/mce_intel.c | 10 +-
+ arch/x86/kernel/cpu/mcheck/non-fatal.c | 94 -----
+ arch/x86/kernel/cpu/mcheck/p4.c | 163 ---------
+ arch/x86/kernel/cpu/mcheck/p6.c | 127 -------
+ arch/x86/kernel/cpu/mcheck/therm_throt.c | 13 +-
+ arch/x86/kernel/cpu/vmware.c | 21 +-
+ arch/x86/kernel/e820.c | 19 +-
+ arch/x86/kernel/entry_64.S | 6 +-
+ arch/x86/kernel/head32.c | 26 ++-
+ arch/x86/kernel/head64.c | 2 +-
+ arch/x86/kernel/head_32.S | 1 +
+ arch/x86/kernel/hpet.c | 60 ++--
+ arch/x86/kernel/i8253.c | 19 -
+ arch/x86/kernel/irq.c | 4 +-
+ arch/x86/kernel/irqinit.c | 38 +--
+ arch/x86/kernel/kvmclock.c | 7 +-
+ arch/x86/kernel/mpparse.c | 75 ++---
+ arch/x86/kernel/mrst.c | 24 ++
+ arch/x86/kernel/paravirt.c | 34 +--
+ arch/x86/kernel/rtc.c | 5 +-
+ arch/x86/kernel/setup.c | 114 +-----
+ arch/x86/kernel/signal.c | 2 +-
+ arch/x86/kernel/smpboot.c | 4 +-
+ arch/x86/kernel/time.c | 121 +++++++
+ arch/x86/kernel/time_32.c | 137 -------
+ arch/x86/kernel/time_64.c | 135 -------
+ arch/x86/kernel/traps.c | 5 +-
+ arch/x86/kernel/tsc.c | 78 ++++-
+ arch/x86/kernel/visws_quirks.c | 54 +--
+ arch/x86/kernel/vmi_32.c | 8 +-
+ arch/x86/kernel/vmiclock_32.c | 2 +-
+ arch/x86/kernel/vsyscall_64.c | 1 +
+ arch/x86/kernel/x86_init.c | 73 ++++
+ arch/x86/lguest/boot.c | 9 +-
+ arch/x86/mm/mmap.c | 17 +-
+ arch/x86/vdso/vclock_gettime.c | 39 ++-
+ arch/x86/xen/enlighten.c | 22 +-
+ arch/x86/xen/irq.c | 5 +-
+ arch/x86/xen/mmu.c | 16 +-
+ arch/x86/xen/mmu.h | 2 +-
+ arch/x86/xen/xen-ops.h | 2 -
+ arch/xtensa/kernel/time.c | 5 +-
+ drivers/pci/intr_remapping.c | 89 +++++-
+ drivers/pci/intr_remapping.h | 7 +
+ include/asm-generic/cputime.h | 1 +
+ include/asm-generic/vmlinux.lds.h | 5 +-
+ include/linux/clocksource.h | 121 +------
+ include/linux/dmar.h | 10 +
+ include/linux/ftrace_event.h | 6 +-
+ include/linux/hpet.h | 2 +
+ include/linux/hrtimer.h | 2 -
+ include/linux/kthread.h | 1 +
+ include/linux/poison.h | 16 +-
+ include/linux/sched.h | 16 +-
+ include/linux/time.h | 8 +-
+ include/linux/timer.h | 5 -
+ include/linux/timex.h | 5 +-
+ include/trace/events/block.h | 4 +-
+ include/trace/events/timer.h | 342 ++++++++++++++++++
+ init/main.c | 2 +
+ kernel/fork.c | 9 +-
+ kernel/hrtimer.c | 95 ++----
+ kernel/irq/manage.c | 2 +-
+ kernel/itimer.c | 169 +++++----
+ kernel/kthread.c | 5 +
+ kernel/posix-cpu-timers.c | 155 +++++----
+ kernel/posix-timers.c | 35 ++
+ kernel/rcutorture.c | 15 +-
+ kernel/rcutree.c | 41 +--
+ kernel/sched.c | 9 +-
+ kernel/time/clocksource.c | 492 ++++++++++++++------------
+ kernel/time/jiffies.c | 6 +-
+ kernel/time/ntp.c | 7 +-
+ kernel/time/timekeeping.c | 535 +++++++++++++++++++++-------
+ kernel/timer.c | 60 +++-
+ kernel/trace/ftrace.c | 150 ++------
+ kernel/trace/ring_buffer.c | 17 +-
+ kernel/trace/trace.c | 127 +++++++-
+ kernel/trace/trace.h | 276 ++++-----------
+ kernel/trace/trace_boot.c | 8 +-
+ kernel/trace/trace_entries.h | 392 ++++++++++++++++++++
+ kernel/trace/trace_event_profile.c | 5 +-
+ kernel/trace/trace_event_types.h | 178 ---------
+ kernel/trace/trace_events.c | 65 +---
+ kernel/trace/trace_events_filter.c | 41 +++
+ kernel/trace/trace_export.c | 241 +++++++------
+ kernel/trace/trace_functions_graph.c | 60 +++-
+ kernel/trace/trace_irqsoff.c | 16 +-
+ kernel/trace/trace_mmiotrace.c | 10 +-
+ kernel/trace/trace_output.c | 42 ++-
+ kernel/trace/trace_output.h | 2 +
+ kernel/trace/trace_sched_wakeup.c | 52 ++--
+ 151 files changed, 3779 insertions(+), 3173 deletions(-)
+ delete mode 100644 arch/x86/include/asm/do_timer.h
+ create mode 100644 arch/x86/include/asm/x86_init.h
+ delete mode 100644 arch/x86/kernel/cpu/mcheck/k7.c
+ delete mode 100644 arch/x86/kernel/cpu/mcheck/non-fatal.c
+ delete mode 100644 arch/x86/kernel/cpu/mcheck/p4.c
+ delete mode 100644 arch/x86/kernel/cpu/mcheck/p6.c
+ create mode 100644 arch/x86/kernel/mrst.c
+ create mode 100644 arch/x86/kernel/time.c
+ delete mode 100644 arch/x86/kernel/time_32.c
+ delete mode 100644 arch/x86/kernel/time_64.c
+ create mode 100644 arch/x86/kernel/x86_init.c
+ create mode 100644 include/trace/events/timer.h
+ create mode 100644 kernel/trace/trace_entries.h
+ delete mode 100644 kernel/trace/trace_event_types.h
+$ git am -3 ../patches/tip-fix-merge-for-cpumask-update.patch
+Applying: tip: fix merge for cupmask update
+$ git reset HEAD^
+arch/x86/kernel/time.c: locally modified
+$ git add .
+$ git commit -v -a --amend
+[master 7dac324] Merge commit 'tip/auto-latest'
+Merging oprofile/for-next
+$ git merge oprofile/for-next
+Auto-merging kernel/trace/ring_buffer.c
+Merge made by recursive.
+Merging percpu/for-next
+$ git merge percpu/for-next
+Already up-to-date.
+Merging sfi/sfi-test
+$ git merge sfi/sfi-test
+Resolved 'arch/x86/kernel/setup.c' using previous resolution.
+Resolved 'init/main.c' using previous resolution.
+Auto-merging MAINTAINERS
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/kernel/Makefile
+Auto-merging arch/x86/kernel/setup.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
+Auto-merging init/main.c
+CONFLICT (content): Merge conflict in init/main.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8ad68dd] Merge commit 'sfi/sfi-test'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 12 ++
+ arch/x86/Kconfig | 4 +-
+ arch/x86/kernel/Makefile | 1 +
+ arch/x86/kernel/setup.c | 3 +
+ arch/x86/kernel/sfi.c | 133 +++++++++++++
+ arch/x86/pci/mmconfig-shared.c | 6 +-
+ arch/x86/pci/mmconfig_32.c | 2 +-
+ drivers/Makefile | 1 +
+ drivers/sfi/Kconfig | 17 ++
+ drivers/sfi/Makefile | 3 +
+ drivers/sfi/sfi_acpi.c | 175 +++++++++++++++++
+ drivers/sfi/sfi_core.c | 412 ++++++++++++++++++++++++++++++++++++++++
+ drivers/sfi/sfi_core.h | 70 +++++++
+ include/linux/sfi.h | 206 ++++++++++++++++++++
+ include/linux/sfi_acpi.h | 93 +++++++++
+ init/main.c | 2 +
+ 16 files changed, 1136 insertions(+), 4 deletions(-)
+ create mode 100644 arch/x86/kernel/sfi.c
+ create mode 100644 drivers/sfi/Kconfig
+ create mode 100644 drivers/sfi/Makefile
+ create mode 100644 drivers/sfi/sfi_acpi.c
+ create mode 100644 drivers/sfi/sfi_core.c
+ create mode 100644 drivers/sfi/sfi_core.h
+ create mode 100644 include/linux/sfi.h
+ create mode 100644 include/linux/sfi_acpi.h
+Merging asm-generic/next
+$ git merge asm-generic/next
+Merge made by recursive.
+ lib/checksum.c | 14 ++++++++------
+ 1 files changed, 8 insertions(+), 6 deletions(-)
+Merging hwpoison/hwpoison
+$ git merge hwpoison/hwpoison
+Auto-merging Documentation/filesystems/vfs.txt
+Auto-merging fs/ext3/inode.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ocfs2/aops.c
+Auto-merging fs/xfs/linux-2.6/xfs_aops.c
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/sched.h
+Auto-merging kernel/sysctl.c
+Auto-merging mm/Makefile
+Auto-merging mm/page-writeback.c
+Auto-merging mm/shmem.c
+Merge made by recursive.
+ Documentation/filesystems/vfs.txt | 7 +
+ Documentation/sysctl/vm.txt | 41 ++-
+ arch/x86/mm/fault.c | 19 +-
+ fs/btrfs/inode.c | 1 +
+ fs/ext2/inode.c | 2 +
+ fs/ext3/inode.c | 3 +
+ fs/ext4/inode.c | 4 +
+ fs/gfs2/aops.c | 3 +
+ fs/nfs/file.c | 1 +
+ fs/ntfs/aops.c | 2 +
+ fs/ocfs2/aops.c | 1 +
+ fs/proc/meminfo.c | 9 +-
+ fs/xfs/linux-2.6/xfs_aops.c | 1 +
+ include/asm-generic/mman-common.h | 1 +
+ include/asm-generic/siginfo.h | 8 +-
+ include/linux/fs.h | 1 +
+ include/linux/mm.h | 15 +-
+ include/linux/page-flags.h | 17 +-
+ include/linux/prctl.h | 2 +
+ include/linux/rmap.h | 21 +-
+ include/linux/sched.h | 2 +
+ include/linux/swap.h | 34 ++-
+ include/linux/swapops.h | 38 ++
+ kernel/sys.c | 22 +
+ kernel/sysctl.c | 25 ++
+ mm/Kconfig | 14 +
+ mm/Makefile | 2 +
+ mm/filemap.c | 4 +
+ mm/hwpoison-inject.c | 41 ++
+ mm/madvise.c | 30 ++
+ mm/memory-failure.c | 832 +++++++++++++++++++++++++++++++++++++
+ mm/memory.c | 24 +-
+ mm/migrate.c | 2 +-
+ mm/page-writeback.c | 7 +
+ mm/page_alloc.c | 20 +-
+ mm/rmap.c | 60 ++-
+ mm/shmem.c | 5 +-
+ mm/swapfile.c | 4 +-
+ mm/truncate.c | 72 +++-
+ mm/vmscan.c | 2 +-
+ 40 files changed, 1331 insertions(+), 68 deletions(-)
+ create mode 100644 mm/hwpoison-inject.c
+ create mode 100644 mm/memory-failure.c
+Merging quilt/driver-core
+$ git merge quilt/driver-core
+Already up-to-date.
+Merging quilt/tty
+$ git merge quilt/tty
+Auto-merging arch/arm/mach-omap1/board-ams-delta.c
+Auto-merging drivers/char/vt.c
+Auto-merging drivers/serial/ioc4_serial.c
+Auto-merging drivers/serial/pxa.c
+Auto-merging drivers/serial/sh-sci.c
+Auto-merging drivers/usb/serial/io_edgeport.c
+Auto-merging drivers/usb/serial/kl5kusb105.c
+Auto-merging drivers/usb/serial/spcp8x5.c
+Merge made by recursive.
+ arch/mn10300/kernel/asm-offsets.c | 6 +-
+ drivers/char/cyclades.c | 2311 ++++++++-----------------------
+ drivers/char/esp.c | 7 +-
+ drivers/char/isicom.c | 57 +-
+ drivers/char/mxser.c | 62 +-
+ drivers/char/n_tty.c | 79 +-
+ drivers/char/riscom8.c | 164 ++--
+ drivers/char/tty_io.c | 22 +-
+ drivers/char/tty_ioctl.c | 4 +-
+ drivers/char/tty_ldisc.c | 82 +-
+ drivers/char/tty_port.c | 31 +-
+ drivers/char/vt.c | 14 +-
+ drivers/char/vt_ioctl.c | 482 ++++++-
+ drivers/net/slip.c | 96 +-
+ drivers/serial/21285.c | 8 +-
+ drivers/serial/8250.c | 28 +-
+ drivers/serial/8250.h | 1 +
+ drivers/serial/amba-pl010.c | 6 +-
+ drivers/serial/amba-pl011.c | 6 +-
+ drivers/serial/atmel_serial.c | 14 +-
+ drivers/serial/bfin_5xx.c | 20 +-
+ drivers/serial/bfin_sport_uart.c | 6 +-
+ drivers/serial/clps711x.c | 4 +-
+ drivers/serial/cpm_uart/cpm_uart_core.c | 2 +-
+ drivers/serial/dz.c | 6 +-
+ drivers/serial/icom.c | 20 +-
+ drivers/serial/imx.c | 16 +-
+ drivers/serial/ioc3_serial.c | 54 +-
+ drivers/serial/ioc4_serial.c | 68 +-
+ drivers/serial/ip22zilog.c | 14 +-
+ drivers/serial/jsm/jsm_neo.c | 2 +-
+ drivers/serial/jsm/jsm_tty.c | 20 +-
+ drivers/serial/m32r_sio.c | 6 +-
+ drivers/serial/max3100.c | 16 +-
+ drivers/serial/mcf.c | 4 +-
+ drivers/serial/mpc52xx_uart.c | 4 +-
+ drivers/serial/mpsc.c | 4 +-
+ drivers/serial/msm_serial.c | 6 +-
+ drivers/serial/mux.c | 4 +-
+ drivers/serial/netx-serial.c | 6 +-
+ drivers/serial/nwpserial.c | 4 +-
+ drivers/serial/pmac_zilog.c | 20 +-
+ drivers/serial/pnx8xxx_uart.c | 8 +-
+ drivers/serial/pxa.c | 6 +-
+ drivers/serial/sa1100.c | 8 +-
+ drivers/serial/samsung.c | 8 +-
+ drivers/serial/sb1250-duart.c | 6 +-
+ drivers/serial/sc26xx.c | 10 +-
+ drivers/serial/serial_core.c | 876 ++++++------
+ drivers/serial/serial_ks8695.c | 6 +-
+ drivers/serial/serial_lh7a40x.c | 6 +-
+ drivers/serial/serial_txx9.c | 4 +-
+ drivers/serial/sh-sci.c | 10 +-
+ drivers/serial/sn_console.c | 22 +-
+ drivers/serial/sunhv.c | 8 +-
+ drivers/serial/sunsab.c | 10 +-
+ drivers/serial/sunsu.c | 6 +-
+ drivers/serial/sunzilog.c | 14 +-
+ drivers/serial/timbuart.c | 10 +-
+ drivers/serial/uartlite.c | 19 +-
+ drivers/serial/ucc_uart.c | 4 +-
+ drivers/serial/vr41xx_siu.c | 6 +-
+ drivers/serial/zs.c | 6 +-
+ drivers/usb/class/cdc-acm.c | 5 +-
+ drivers/usb/serial/ark3116.c | 51 +-
+ drivers/usb/serial/belkin_sa.c | 4 +-
+ drivers/usb/serial/ch341.c | 5 +-
+ drivers/usb/serial/console.c | 4 +-
+ drivers/usb/serial/cp210x.c | 12 +-
+ drivers/usb/serial/cyberjack.c | 4 +-
+ drivers/usb/serial/cypress_m8.c | 18 +-
+ drivers/usb/serial/digi_acceleport.c | 6 +-
+ drivers/usb/serial/empeg.c | 18 +-
+ drivers/usb/serial/ftdi_sio.c | 6 +-
+ drivers/usb/serial/garmin_gps.c | 3 +-
+ drivers/usb/serial/generic.c | 3 +-
+ drivers/usb/serial/io_edgeport.c | 6 +-
+ drivers/usb/serial/io_ti.c | 3 +-
+ drivers/usb/serial/ipaq.c | 9 +-
+ drivers/usb/serial/ipw.c | 3 +-
+ drivers/usb/serial/ir-usb.c | 6 +-
+ drivers/usb/serial/iuu_phoenix.c | 34 +-
+ drivers/usb/serial/keyspan.c | 3 +-
+ drivers/usb/serial/keyspan.h | 3 +-
+ drivers/usb/serial/keyspan_pda.c | 2 +-
+ drivers/usb/serial/kl5kusb105.c | 10 +-
+ drivers/usb/serial/kobil_sct.c | 28 +-
+ drivers/usb/serial/mct_u232.c | 15 +-
+ drivers/usb/serial/mos7720.c | 123 ++-
+ drivers/usb/serial/mos7840.c | 118 +--
+ drivers/usb/serial/navman.c | 3 +-
+ drivers/usb/serial/omninet.c | 6 +-
+ drivers/usb/serial/opticon.c | 3 +-
+ drivers/usb/serial/option.c | 6 +-
+ drivers/usb/serial/oti6858.c | 27 +-
+ drivers/usb/serial/pl2303.c | 5 +-
+ drivers/usb/serial/sierra.c | 3 +-
+ drivers/usb/serial/spcp8x5.c | 26 +-
+ drivers/usb/serial/symbolserial.c | 3 +-
+ drivers/usb/serial/ti_usb_3410_5052.c | 6 +-
+ drivers/usb/serial/usb-serial.c | 385 +++---
+ drivers/usb/serial/usb_debug.c | 5 +-
+ drivers/usb/serial/visor.c | 6 +-
+ drivers/usb/serial/whiteheat.c | 11 +-
+ include/linux/cyclades.h | 11 +-
+ include/linux/hayesesp.h | 1 -
+ include/linux/kfifo.h | 4 +-
+ include/linux/serial.h | 2 +
+ include/linux/serial_8250.h | 1 +
+ include/linux/serial_core.h | 93 +-
+ include/linux/tty.h | 19 +-
+ include/linux/usb/serial.h | 10 +-
+ include/linux/vt.h | 32 +-
+ include/linux/vt_kern.h | 16 +-
+ kernel/kfifo.c | 2 +-
+ kernel/power/console.c | 63 +-
+ 116 files changed, 2541 insertions(+), 3549 deletions(-)
+Merging quilt/usb
+$ git merge quilt/usb
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Auto-merging drivers/usb/Kconfig
+Auto-merging drivers/usb/core/usb.h
+Auto-merging drivers/usb/gadget/Kconfig
+Auto-merging drivers/usb/host/Kconfig
+Auto-merging drivers/usb/host/ehci-pci.c
+Auto-merging drivers/usb/host/ehci.h
+Auto-merging drivers/usb/host/ohci-pxa27x.c
+Auto-merging drivers/usb/host/xhci.h
+Removing drivers/usb/mon/mon_dma.c
+Auto-merging include/linux/usb.h
+Merge made by recursive.
+ Documentation/kernel-parameters.txt | 2 +-
+ Documentation/usb/authorization.txt | 10 +-
+ Documentation/usb/usbmon.txt | 8 +-
+ Documentation/x86/earlyprintk.txt | 39 +-
+ MAINTAINERS | 4 +-
+ arch/x86/kernel/early_printk.c | 780 +---------
+ drivers/net/usb/cdc_eem.c | 17 +-
+ drivers/usb/Kconfig | 3 +
+ drivers/usb/Makefile | 2 +
+ drivers/usb/class/usbtmc.c | 84 +-
+ drivers/usb/core/devio.c | 247 +++-
+ drivers/usb/core/driver.c | 75 +-
+ drivers/usb/core/generic.c | 4 +-
+ drivers/usb/core/hcd.c | 113 +-
+ drivers/usb/core/hcd.h | 5 +
+ drivers/usb/core/hub.c | 126 ++-
+ drivers/usb/core/message.c | 32 +-
+ drivers/usb/core/usb.c | 13 +-
+ drivers/usb/core/usb.h | 7 +
+ drivers/usb/early/Makefile | 5 +
+ drivers/usb/early/ehci-dbgp.c | 996 ++++++++++++
+ drivers/usb/gadget/Kconfig | 31 +-
+ drivers/usb/gadget/amd5536udc.c | 56 +-
+ drivers/usb/gadget/at91_udc.c | 1 -
+ drivers/usb/gadget/audio.c | 24 +-
+ drivers/usb/gadget/composite.c | 2 +-
+ drivers/usb/gadget/dummy_hcd.c | 5 -
+ drivers/usb/gadget/ether.c | 31 +-
+ drivers/usb/gadget/f_audio.c | 97 +-
+ drivers/usb/gadget/f_eem.c | 562 +++++++
+ drivers/usb/gadget/f_rndis.c | 15 +-
+ drivers/usb/gadget/fsl_qe_udc.c | 4 +
+ drivers/usb/gadget/gmidi.c | 8 +-
+ drivers/usb/gadget/pxa25x_udc.c | 49 +-
+ drivers/usb/gadget/pxa25x_udc.h | 1 +
+ drivers/usb/gadget/rndis.c | 13 +-
+ drivers/usb/gadget/rndis.h | 3 +-
+ drivers/usb/gadget/s3c-hsotg.c | 6 +-
+ drivers/usb/gadget/s3c2410_udc.c | 3 +-
+ drivers/usb/gadget/u_audio.c | 10 +-
+ drivers/usb/gadget/u_ether.c | 85 +-
+ drivers/usb/gadget/u_ether.h | 12 +-
+ drivers/usb/gadget/u_serial.c | 1 -
+ drivers/usb/host/Kconfig | 18 +
+ drivers/usb/host/Makefile | 1 +
+ drivers/usb/host/ehci-atmel.c | 230 +++
+ drivers/usb/host/ehci-au1xxx.c | 29 +-
+ drivers/usb/host/ehci-dbg.c | 46 +-
+ drivers/usb/host/ehci-hcd.c | 89 +-
+ drivers/usb/host/ehci-hub.c | 84 +-
+ drivers/usb/host/ehci-mem.c | 26 +-
+ drivers/usb/host/ehci-pci.c | 42 +-
+ drivers/usb/host/ehci-q.c | 95 +-
+ drivers/usb/host/ehci-sched.c | 100 +-
+ drivers/usb/host/ehci-w90x900.c | 181 +++
+ drivers/usb/host/ehci.h | 14 +-
+ drivers/usb/host/isp1362-hcd.c | 2909 +++++++++++++++++++++++++++++++++++
+ drivers/usb/host/isp1362.h | 1079 +++++++++++++
+ drivers/usb/host/isp1760-hcd.c | 4 +
+ drivers/usb/host/isp1760-hcd.h | 2 +
+ drivers/usb/host/isp1760-if.c | 21 +-
+ drivers/usb/host/ohci-at91.c | 2 +-
+ drivers/usb/host/ohci-au1xxx.c | 27 +-
+ drivers/usb/host/ohci-ep93xx.c | 1 -
+ drivers/usb/host/ohci-hcd.c | 1 -
+ drivers/usb/host/ohci-pxa27x.c | 4 +
+ drivers/usb/host/oxu210hp-hcd.c | 1 -
+ drivers/usb/host/uhci-q.c | 1 -
+ drivers/usb/host/whci/asl.c | 12 +-
+ drivers/usb/host/whci/hcd.c | 8 +-
+ drivers/usb/host/whci/pzl.c | 12 +-
+ drivers/usb/host/whci/qset.c | 4 +-
+ drivers/usb/host/whci/whci-hc.h | 1 +
+ drivers/usb/host/xhci-hcd.c | 232 +++-
+ drivers/usb/host/xhci-mem.c | 88 +-
+ drivers/usb/host/xhci-pci.c | 3 +
+ drivers/usb/host/xhci-ring.c | 173 ++-
+ drivers/usb/host/xhci.h | 80 +-
+ drivers/usb/image/microtek.c | 37 -
+ drivers/usb/misc/idmouse.c | 21 +
+ drivers/usb/misc/ldusb.c | 6 +
+ drivers/usb/misc/legousbtower.c | 6 +
+ drivers/usb/misc/sisusbvga/sisusb.c | 53 +-
+ drivers/usb/misc/sisusbvga/sisusb.h | 2 -
+ drivers/usb/misc/usbsevseg.c | 69 +-
+ drivers/usb/mon/Kconfig | 4 +-
+ drivers/usb/mon/Makefile | 2 +-
+ drivers/usb/mon/mon_bin.c | 12 +-
+ drivers/usb/mon/mon_dma.c | 95 --
+ drivers/usb/mon/mon_main.c | 1 -
+ drivers/usb/mon/mon_text.c | 14 -
+ drivers/usb/mon/usb_mon.h | 14 -
+ drivers/usb/musb/musb_core.c | 8 +-
+ drivers/usb/otg/isp1301_omap.c | 23 +-
+ drivers/usb/serial/ark3116.c | 24 +-
+ drivers/usb/serial/ch341.c | 52 +
+ drivers/usb/serial/generic.c | 206 ++-
+ drivers/usb/serial/iuu_phoenix.c | 115 ++-
+ drivers/usb/serial/moto_modem.c | 2 +-
+ drivers/usb/serial/option.c | 134 ++-
+ drivers/usb/serial/pl2303.c | 70 +-
+ drivers/usb/serial/sierra.c | 157 ++-
+ drivers/usb/serial/usb-serial.c | 23 +-
+ drivers/usb/storage/datafab.c | 4 +-
+ drivers/usb/storage/initializers.c | 2 +-
+ drivers/usb/storage/jumpshot.c | 2 +-
+ drivers/usb/storage/unusual_devs.h | 22 +-
+ drivers/usb/usb-skeleton.c | 252 +++-
+ include/linux/usb.h | 25 +-
+ include/linux/usb/audio.h | 287 ++--
+ include/linux/usb/ch9.h | 8 +
+ include/linux/usb/ehci_def.h | 35 +
+ include/linux/usb/isp1362.h | 46 +
+ include/linux/usb/isp1760.h | 18 +
+ include/linux/usb/serial.h | 2 +
+ include/linux/usbdevice_fs.h | 3 +
+ 116 files changed, 8985 insertions(+), 2082 deletions(-)
+ create mode 100644 drivers/usb/early/Makefile
+ create mode 100644 drivers/usb/early/ehci-dbgp.c
+ create mode 100644 drivers/usb/gadget/f_eem.c
+ create mode 100644 drivers/usb/host/ehci-atmel.c
+ create mode 100644 drivers/usb/host/ehci-w90x900.c
+ create mode 100644 drivers/usb/host/isp1362-hcd.c
+ create mode 100644 drivers/usb/host/isp1362.h
+ delete mode 100644 drivers/usb/mon/mon_dma.c
+ create mode 100644 include/linux/usb/isp1362.h
+ create mode 100644 include/linux/usb/isp1760.h
+Merging quilt/staging
+$ git merge quilt/staging
+Already up-to-date.
+Merging scsi-post-merge/master
+$ git merge scsi-post-merge/master
+Recorded preimage for 'drivers/scsi/pmcraid.c'
+Recorded preimage for 'kernel/sysctl.c'
+Resolved 'drivers/scsi/Makefile' using previous resolution.
+Auto-merging MAINTAINERS
+Auto-merging drivers/ata/ahci.c
+Auto-merging drivers/message/fusion/mptbase.c
+Auto-merging drivers/message/fusion/mptbase.h
+Auto-merging drivers/scsi/Kconfig
+Auto-merging drivers/scsi/Makefile
+CONFLICT (content): Merge conflict in drivers/scsi/Makefile
+Auto-merging drivers/scsi/device_handler/scsi_dh_rdac.c
+Auto-merging drivers/scsi/pmcraid.c
+CONFLICT (add/add): Merge conflict in drivers/scsi/pmcraid.c
+Auto-merging drivers/scsi/qla2xxx/qla_def.h
+Auto-merging drivers/scsi/qla2xxx/qla_os.c
+Auto-merging include/linux/interrupt.h
+Auto-merging include/linux/libata.h
+Auto-merging kernel/sysctl.c
+CONFLICT (content): Merge conflict in kernel/sysctl.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/scsi/pmcraid.c'.
+Recorded resolution for 'kernel/sysctl.c'.
+[master e947e3a] Merge commit 'scsi-post-merge/master'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 8 +
+ drivers/ata/ahci.c | 54 +-
+ drivers/message/fusion/mptbase.c | 99 +-
+ drivers/message/fusion/mptbase.h | 3 +
+ drivers/scsi/Kconfig | 1 +
+ drivers/scsi/Makefile | 1 +
+ drivers/scsi/be2iscsi/Kconfig | 8 +
+ drivers/scsi/be2iscsi/Makefile | 8 +
+ drivers/scsi/be2iscsi/be.h | 183 ++
+ drivers/scsi/be2iscsi/be_cmds.c | 523 ++++++
+ drivers/scsi/be2iscsi/be_cmds.h | 877 ++++++++++
+ drivers/scsi/be2iscsi/be_iscsi.c | 646 ++++++++
+ drivers/scsi/be2iscsi/be_iscsi.h | 75 +
+ drivers/scsi/be2iscsi/be_main.c | 3393 ++++++++++++++++++++++++++++++++++++++
+ drivers/scsi/be2iscsi/be_main.h | 833 ++++++++++
+ drivers/scsi/be2iscsi/be_mgmt.c | 321 ++++
+ drivers/scsi/be2iscsi/be_mgmt.h | 249 +++
+ drivers/scsi/qla2xxx/qla_dbg.c | 78 +-
+ drivers/scsi/qla2xxx/qla_def.h | 5 +
+ drivers/scsi/qla2xxx/qla_gbl.h | 1 +
+ drivers/scsi/qla2xxx/qla_os.c | 36 +
+ include/linux/libata.h | 2 +
+ include/scsi/Kbuild | 1 +
+ include/scsi/fc/Kbuild | 4 +
+ 24 files changed, 7337 insertions(+), 72 deletions(-)
+ create mode 100644 drivers/scsi/be2iscsi/Kconfig
+ create mode 100644 drivers/scsi/be2iscsi/Makefile
+ create mode 100644 drivers/scsi/be2iscsi/be.h
+ create mode 100644 drivers/scsi/be2iscsi/be_cmds.c
+ create mode 100644 drivers/scsi/be2iscsi/be_cmds.h
+ create mode 100644 drivers/scsi/be2iscsi/be_iscsi.c
+ create mode 100644 drivers/scsi/be2iscsi/be_iscsi.h
+ create mode 100644 drivers/scsi/be2iscsi/be_main.c
+ create mode 100644 drivers/scsi/be2iscsi/be_main.h
+ create mode 100644 drivers/scsi/be2iscsi/be_mgmt.c
+ create mode 100644 drivers/scsi/be2iscsi/be_mgmt.h
+ create mode 100644 include/scsi/fc/Kbuild
+$ git am -3 ../patches/0001-nfsd-return-success-for-non-NFS4-nfs4_state_start.patch
+Applying: nfsd: return success for non NFS4 nfs4_state_start
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 0000000..401fd78
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,346 @@
+Importing driver-core.current based on 2.6.31-git5
+ quilt series is empty
+$ git update-ref refs/heads/quilt/driver-core.current 0cb583fd2862f19ea88b02eb307d11c09e51e2f8
+Importing tty.current based on quilt/driver-core.current
+$ git clone -s -l -n -q . ../quilt-tmp
+$ cd ../quilt-tmp
+$ git reset --hard 0cb583fd2862f19ea88b02eb307d11c09e51e2f8
+HEAD is now at 0cb583f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6
+$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/tty.current
+tty-gigaset-really-fix-chars_in_buffer.patch
+serial-bfin_5xx-fix-building-as-module-when-early-printk-is-enabled.patch
+tty-serial-pcmcia-add-id-for-advantech-card.patch
+$ cd ../next
+$ git fetch -f ../quilt-tmp master:quilt/tty.current
+From ../quilt-tmp
+ + 697417d...5cea4a4 master -> quilt/tty.current (forced update)
+Importing usb.current based on quilt/tty.current
+$ cd ../quilt-tmp
+$ git reset --hard 5cea4a4e15a918f19d32fd3dc9a5056f333847c3
+HEAD is now at 5cea4a4 tty: serial/pcmcia: add ID for Advantech card
+$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb.current
+usb-storage-fix-a-resume-path-gfp_noio-must-be-used.patch
+usb-serial-ftdi_sio-new-hardware-support-hameg-power-supply.patch
+usb-serial-pl2303-new-hardware-support-sanwa-multimeter.patch
+usb-option.c-add-support-for-zte-ac2726-evdo-modem.patch
+usb-option-telit-uc864g-support.patch
+usb-cdc-wdm-driver-doesn-t-support-non-blocking-reads.patch
+usb-fix-cdc-acm-regression-in-open.patch
+usb-add-pids-for-ftdi-based-opendcc-hardware.patch
+usb-sl811-hcd-fix-device-disconnect.patch
+usb-serial-ftdi-handle-gnice-jtag-adaptors.patch
+usb-xhci-work-around-for-chain-bit-in-link-trbs.patch
+usb-xhci-fix-slot-and-endpoint-context-debugging.patch
+usb-xhci-configure-endpoint-code-refactoring.patch
+usb-xhci-set-correct-max-packet-size-for-hs-fs-control-endpoints.patch
+usb-xhci-support-full-speed-devices.patch
+usb-xhci-handle-stalled-control-endpoints.patch
+usb-xhci-add-quirk-for-fresco-logic-xhci-hardware.patch
+usb-xhci-make-trb-completion-code-comparison-readable.patch
+usb-xhci-handle-babbling-endpoints-correctly.patch
+usb-xhci-don-t-touch-xhci_td-after-it-s-freed.patch
+usb-xhci-check-urb-s-actual-transfer-buffer-size.patch
+usb-xhci-check-urb_short_not_ok-before-setting-short-packet-status.patch
+usb-xhci-set-eremoteio-when-xhc-gives-bad-transfer-length.patch
+usb-xhci-support-interrupt-transfers.patch
+usb-fix-ss-endpoint-companion-descriptor-parsing.patch
+$ cd ../next
+$ git fetch -f ../quilt-tmp master:quilt/usb.current
+From ../quilt-tmp
+ + b80dedb...9db7ee9 master -> quilt/usb.current (forced update)
+Importing i2c based on 2.6.31-git5
+$ cd ../quilt-tmp
+$ git reset --hard 0cb583fd2862f19ea88b02eb307d11c09e51e2f8
+HEAD is now at 0cb583f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6
+$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c
+driver-model-constify-attribute-groups.patch
+Context reduced to (1/1) to apply fragment at 132
+driver-core-add-support-for-compatibility-classes.patch
+i2c-drop-i2c_driver-id.patch
+i2c-taos-evm-switch-echo-off.patch
+i2c-tsl2550-simpify-IO.patch
+i2c-core-01-client-as-device-type.patch
+i2c-core-02-adapters-as-bus-devices.patch
+i2c-core-03-i2c-adapter-compatibility-class-2.patch
+i2c-scx200_acb-provide-more-information-on-bus-errors.patch
+gpio-pcf857x-copy-i2c_device_id-from-old-pcf8574-driver.patch
+i2c-chips-remove-deprecated-pcf8575-driver.patch
+i2c-chips-remove-deprecated-pca9539-driver.patch
+i2c-chips-remove-deprecated-pcf8574-driver.patch
+i2c-piix4-add-amd-SB900-smbus-device-id.patch
+maintainers-add-maintainer-for-at24-and-pca9564-pca9665.patch
+i2c-pnx-correct-use-of-request_mem_region.patch
+i2c-add-driver-for-smbus-control-method-interface.patch
+$ cd ../next
+$ git fetch -f ../quilt-tmp master:quilt/i2c
+From ../quilt-tmp
+ + b62966f...cfc6c3f master -> quilt/i2c (forced update)
+Importing jdelvare-hwmon based on 2.6.31-git4
+Unchanged quilt series jdelvare-hwmon
+Importing kernel-doc based on 2.6.31-rc7
+Unchanged quilt series kernel-doc
+Importing rr based on v2.6.29-rc5-120-ge78ac4b
+$ cd ../quilt-tmp
+$ git reset --hard e78ac4b9deb8f36d8c828b6d91232960f109d951
+HEAD is now at e78ac4b Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
+$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr
+param:fix-charp-sysfs-write.patch
+cpumask:fix-cpu_online_map-etc-assignment.patch
+cpumask:remove-address-of-CPU_MASK_ALL.patch
+virtio:net_allow_setting_the_mac_address_of_the_nic.patch
+virtio:fix_bad_ring_start_us_and_end_use_macros.patch
+virtio:fix-ring-macros-harder.patch
+cpumask:sched_rt-no-alloc.patch
+misc:remove-start_kernel-prototypes.patch
+misc:cpuhotplug_remove_cpu_hotplug_init.patch
+kthread:dont-use-find_task_by_pid_ns.patch
+kthread:move-sched-realeted-initialization-from-kthreadd-context.patch
+module:cyber2000fb-stop-unload-for-CONFIG_ARCH_SHARK.patch
+ksplice:make_find_symbol_return_a_struct_kernel_symbol.patch
+module:module_address.patch
+module:remove-module_text_address.patch
+blackfin:allow-inline-str-ops-in-linux-string.h.patch
+arm:allow-inline-str-ops-in-linux-string.h.patch
+s390:allow-inline-str-ops-in-linux-string.h.patch
+misc:strstarts.patch
+module:use-strstarts.patch
+ksplice:add_functions_for_walking_kallsyms_symbols.patch
+module:export_symbols_needed_for_ksplice.patch
+module:clarify-try_to_force_load-message.patch
+module:dont-load-__versions-section.patch
+module:version-modversion_info.patch
+module:invbool-takes-a-bool.patch
+module:bool-param-can-be-bool.patch
+uvesafb:param-cleanup.patch
+module:create_a_request_nowait.patch
+module:create_a_request_nowait-fix.patch
+module:use_the_new_request_module_nowait_in_the_hid_driver.patch
+module:use_the_new_request_module_nowait_in_drivers_media.patch
+$ cd ../next
+$ git fetch -f ../quilt-tmp master:quilt/rr
+From ../quilt-tmp
+ + 25306e2...5518f08 master -> quilt/rr (forced update)
+Importing device-mapper based on block/for-next
+Unchanged quilt series device-mapper
+Importing aoe based on v2.6.31-rc9
+Unchanged quilt series aoe
+Importing driver-core based on quilt/usb.current
+ quilt series is empty
+$ git update-ref refs/heads/quilt/driver-core 9db7ee94e1cd76290efab73c43bd80d00ecfbaf9
+Importing tty based on quilt/driver-core
+$ cd ../quilt-tmp
+$ git reset --hard 9db7ee94e1cd76290efab73c43bd80d00ecfbaf9
+HEAD is now at 9db7ee9 USB: Fix SS endpoint companion descriptor parsing.
+$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/tty
+tty-ldisc-make-proc-tty-ldiscs-use-ldisc_ops-instead-of-ldiscs.patch
+tty-ldisc-get-rid-of-tty_ldisc_try_get-helper-function.patch
+tty-includecheck-fix-drivers-char-vt.c.patch
+tty-icom-bit-and-or-confusion.patch
+tty-cyclades-refcount
+tty-cyclades-use-port-block-helper
+tty-cyclades-precompute
+tty-cyclades-use-port-hangup
+tty-cyclades-use-port-close
+tty-cyclades-cleanup
+tty-cyclades-sleep-not-busy
+tty-cyclades-use-dtr-helpers
+tty-cyclades-merge-startup-common
+tty-cyclades-ioctl-cleanup
+tty-cyclades-modem-cleanup
+tty-cyclades-add-io-helpers
+tty-cyclades-remove-set-line-dups
+net-slip-ttyfix
+kfifo-const
+tty-usb-mos7720-modem
+tty-usb-mos7720-lsr
+tty-io-typo
+tty-usb-mos7840-modem
+serial-add-irqflags-support
+serial-8250-amstrad-e3
+serial-8250-minbaud
+tty-port-close-fn
+tty-riscom8-split-close
+tty-mxser-split-close
+tty-isicom-split-close
+tty-riscom8-close-kref
+tty-cyclades-port-close
+tty-kref-put-async
+tty-usb-cdc-fix-speed
+tty-usb-vhangup
+tty-usb-clean-dtr-rts
+tty-usb-shutdown
+vt-events
+vt-pm-extract
+vt-incfix
+vt-lockactive
+tty-usb-drop-filp-argp
+tty-isicom-split-open
+/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:47: trailing whitespace.
+
+warning: 1 line adds whitespace errors.
+serial-kill-info
+serial-fold-closing-port
+serial-port-portptr
+serial-move-counts
+serial-move-flags
+serial-kill-uif
+serial-move-mutex
+serial-msr-move
+serial-move-users
+serial-kill-USF_CLOSING
+serial-port-kref
+serial-console-set-resume
+tty-usb-serial-termiosbits
+n_tty-honor-opost-flag-for-echoes.patch
+n_tty-move-echoctl-check-and-clean-up-logic.patch
+tty-handle-vt-specific-compat-ioctls-in-vt-driver.patch
+tty-vt-use-printk_once.patch
+tty-power-fix-suspend-vt-regression.patch
+tty-fix-typos.patch
+tty-riscom8-fix-shutdown-declaration.patch
+tty-riscom8-fix-tty-refcnt.patch
+tty-usb-serial-mct_u232-fix-tty-refcnt.patch
+uartlite-support-shared-interrupt-lines.patch
+tty-char-mxser-add-support-for-cp112ul.patch
+tty-char-mxser-use-thre-for-aspp_oqueue-ioctl.patch
+usb-serial-change-referencing-of-port-and-serial-structures.patch
+usb-serial-put-subroutines-in-logical-order.patch
+usb-serial-change-logic-of-serial-lookups.patch
+usb-serial-acquire-references-when-a-new-tty-is-installed.patch
+usb-serial-fix-termios-initialization-logic.patch
+usb-serial-rename-subroutines.patch
+usb-serial-add-missing-tests-and-debug-lines.patch
+usb-serial-straighten-out-serial_open.patch
+$ cd ../next
+$ git fetch -f ../quilt-tmp master:quilt/tty
+From ../quilt-tmp
+ + 31af1bb...a991e94 master -> quilt/tty (forced update)
+Importing usb based on quilt/tty
+$ cd ../quilt-tmp
+$ git reset --hard a991e940234ee0929570f4e73ccb54431e1c2e4c
+HEAD is now at a991e94 usb-serial: straighten out serial_open
+$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb
+usb-ehci-dbg.c-no-need-for-checking-it-before-call-vfree.patch
+usb-sisusbvga-drop-usb_buffer_alloc.patch
+usb-usbmon-drop-kconfig-defaults.patch
+usb-usbmon-touch-up-the-documentation.patch
+usb-usbmon-end-ugly-tricks-with-dma-peeking.patch
+usb-let-usb_sg_init-to-set-transfer_buffer-more-often.patch
+usb-move-endpoint-sync-type-definitions-from-usb-audio.h-to-usb-ch9.h.patch
+usb-move-vendor-subclass-definition-from-usb-audio.h-to-usb-ch9.h.patch
+usb-audio-gadget-prefix-all-macro-definitions-with-uac_-in-linux-usb-audio.h.patch
+usb-audio-gadget-un-inline-generic_et_cmd.patch
+usb-add-nuvoton-ehci-driver-for-w90p910-platform.patch
+usb-whci-hcd-make-endpoint_reset-method-async.patch
+usb-add-api-for-userspace-drivers-to-claim-ports.patch
+usb-make-intf.pm_usage-an-atomic_t.patch
+usb-make-the-usbfs_snoop-log-more-pertinent.patch
+usb-gadget-pxa25x-basic-transceiver-support.patch
+usb-serial-full-autosuspend-support-for-the-option-driver.patch
+usb-usb-serial-remove-unused-variables.patch
+usb-usbtmc-can-do-io-to-device-after-disconnect.patch
+usb-suspend-resume-support-for-usbtmc.patch
+usb-legousbtower-make-poll-notice-disconnect.patch
+usb-ldusb-should-signal-an-error-in-poll-if-the-device-is-disconnected.patch
+usb-gadget-drop-null-test-on-list_entry-result.patch
+usb-gadget-s3c-hsotg-missing-parentheses.patch
+usb-full-power-management-support-for-the-idmouse-driver.patch
+usb-full-autosuspend-and-power-management-support-for-usbsevseg.patch
+usb-ehci-add-need_io_watchdog-flag-to-ehci_hcd.patch
+usb-ehci-split-ehci_qh-into-hw-and-sw-parts.patch
+usb-ehci-add-intel-moorestown-ehci-controller-hostpcx-extensions-and-support-phy-low-power-mode.patch
+usb-isp1760-allow-platform-devices-to-customize-devflags.patch
+usb-serial-spelling-correction-in-motorola-usb-phone-driver.patch
+usb-storage-drop-an-unneeded-a-null-test.patch
+usb-au1xxx-add-dev_pm_ops.patch
+usb-fix-wrong-order-of-events-in-usb-serial-suspension.patch
+usb-check-for-hub-driver-not-bound-to-root-hub-device.patch
+usb-don-t-lose-mode-switch-events-on-suspended-devices.patch
+usb-dummy-hcd-accept-mismatch-between-wlength-and-transfer-length.patch
+usb-nxp-isp1362-usb-host-driver.patch
+usb-usbtmc-sanity-checks-for-dev_dep_msg_in-urbs.patch
+usb-usbtmc-fix-printk-format-warnings.patch
+usb-uhci-rm-repeatedly-evaluation-for-urbp-qh.patch
+usb-at91-add-usb-ehci-driver-for-at91sam9g45-series.patch
+usb-at91-add-usb-gadget-driver-selection-for-at91sam9g45-series.patch
+usb-at91-modify-ohci-driver-to-allow-shared-interrupts.patch
+usb-audio-guard-kernel-only-code-with-__kernel__.patch
+usb-ehci-ohci-remove-unnecessary-includes-of-reboot.h.patch
+usb-ohci-pxa27x-allow-nocp-and-ocpm-to-be-cleared.patch
+usb-ark3116-add-irda-support-for-gembird-uir-22.patch
+usb-usb-storage-fails-to-attach-to-huawei-datacard-cdrom-device.patch
+usb-gadget-read-buffer-overflow.patch
+usb-gadget-audio-driver-seg-fault-fix.patch
+usb-isp1362-fix-pulldown-register-defines-and-conf-logic.patch
+usb-increase-usbdevfs-max-isoc-buffer-size.patch
+usb-work-around-bios-bugs-by-quiescing-usb-controllers-earlier.patch
+usb-musb-fix-put_device-call-sequence.patch
+usb-otg-twl4030-usb.c-mark-.init-as-subsys_initcall_sync.patch
+usb-ehci-ensure-all-watchdog-timer-events-are-deleted-when-suspending-usb.patch
+usb-isp1362-correct-use-of-and.patch
+usb-gadget-update-freescale-udc-entry-in-maintainers.patch
+usb-fix-cdc-eem-host-driver-sentinel-crc-validation.patch
+usb-otg-fix-twl4030-usb-build.patch
+usb-ohci-ep93xx.c-remove-unused-variable.patch
+usb-use-kfifo-to-buffer-usb-generic-serial-writes.patch
+usb-remove-unneeded-printks-from-microtek-driver.patch
+usb-gadget-add-eem-gadget-driver.patch
+usb-s3c2410-unregister-should-call-unbind-not-disconnect.patch
+usb-break-support-for-winchiphead-ch341-340-usb-serial-chip.patch
+usb-usbtmc-fix-short-reads-in-usbtmc_read.patch
+usb-usbtmc-inhibit-corruption.patch
+usb-usbtmc-correct-termination-condition-for-reads.patch
+usb-iuu_phoenix-don-t-reset-the-device-at-close.patch
+usb-iuu_phoenix-clean-up-parameter-s-descriptions.patch
+usb-iuu_phoenix-add-support-for-changing-vcc.patch
+usb-iuu_phoenix-increment-version-number.patch
+usb-iuu_phoenix-add-a-way-to-select-the-default-vcc.patch
+usb-serial-pl2303-fix-baud-rate-handling-in-case-of-unsupported-values.patch
+usb-serial-pl2303-add-space-mark-parity.patch
+usb-serial-pl2303-use-1.5-instead-of-2-stop-bits-with-5-data-bits.patch
+usb-fsl_qe_udc-add-fsl-mpc8323-qe-usb-compatible-entry.patch
+usb-ehci-rescan-the-queue-after-an-unlink.patch
+usb-ehci-change-deschedule-logic-for-interrupt-qhs.patch
+usb-make-usb_buffer_map_sg-consistent-with-doc.patch
+usb-double-put_tty_driver-in-gserial_setup.patch
+usb-clean-up-root-hub-string-descriptors.patch
+usb-gadget-double-free_irq-in-at91udc_probe.patch
+usb-omap-isp1301-compile-fix.patch
+usb-fix-paths-in-usbmon-documentation.patch
+usb-unusual_devs.h-drop-some-unneeded-floppy-entries.patch
+usb-ehci-dbgp-early_printk-split-ehci-debug-driver-from-early_printk.c.patch
+usb-dbgp-insert-cr-prior-to-nl-as-needed.patch
+usb-ehci-dbgp-execute-early-bios-hand-off.patch
+usb-dbgp-ehci-debug-controller-initialization-delays.patch
+early_printk-allow-more-than-one-early-console.patch
+usb-ehci-dbgp-stability-improvements-and-external-re-init.patch
+usb-ehci-dbgp-ehci-allow-early-or-late-use-of-the-dbgp-device.patch
+usb-ehci-dbgp-errata-for-ehci-debug-controller-initialization.patch
+usb-ehci-dbgp-errata-for-ehci-debug-host-controller-synchronization.patch
+usb-ehci-dbgp-documentation-documentation-updates-for-ehci-dbgp.patch
+usb-ehci-dbgp-ehci-allow-dbpg-to-work-with-suspend-resume.patch
+usb-support-for-autosuspend-in-sierra-while-online.patch
+usb-usbfs-add-usbdevfs_urb_bulk_continuation-flag.patch
+usb-fix-missing-error-check-in-probing.patch
+usb-fix-usbtmc-get_capabilities-success-handling.patch
+usb-gadget-ether-needs-to-select-crc32.patch
+usb-xhci-endpoint-representation-refactoring.patch
+usb-xhci-refactor-input-device-context-setup.patch
+usb-xhci-change-how-xhci-commands-are-handled.patch
+usb-xhci-fix-command-wait-list-handling.patch
+usb-xhci-set-route-string-for-all-devices.patch
+usb-xhci-set-multi-tt-field-for-ls-fs-devices-under-hubs.patch
+usb-xhci-support-usb-hubs.patch
+usb-add-hub-descriptor-update-hook-for-xhci.patch
+usb-skel_read-really-sucks-royally.patch
+usb-make-usb-skeleton-honor-o_nonblock-in-write-path.patch
+usb-o_nonblock-in-read-path-of-skeleton.patch
+usb-skeleton-fix-coding-style-issues.patch
+usb-fix-sysfs-paths-in-documentation.patch
+$ cd ../next
+$ git fetch -f ../quilt-tmp master:quilt/usb
+From ../quilt-tmp
+ + c44d091...fe7f73d master -> quilt/usb (forced update)
+Importing staging based on quilt/usb
+ quilt series is empty
+$ git update-ref refs/heads/quilt/staging fe7f73dc04056d218310cdc395ef9e300a6cb208
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 0000000..6e15222
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20090917
