diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-29 17:24:22 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-29 17:24:22 +1000 |
| commit | dc0bf979528a5d1fc20c0eb095d03cf013bd1730 (patch) | |
| tree | 4ca9bd307f6abefa81a1e4c6948a720a1fcdfaf8 | |
| parent | abbb1067eb825c92cb33447f20e987b6f04ccdbb (diff) | |
Add linux-next specific files for 20090729next-20090729
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 137 | ||||
| -rw-r--r-- | Next/Trees | 139 | ||||
| -rw-r--r-- | Next/merge.log | 5427 | ||||
| -rw-r--r-- | Next/quilt-import.log | 532 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 6236 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..2b623a7bdd6f --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,137 @@ +Name SHA1 +---- ---- +origin 7d3e91b8a1f5179d56a7412d4b499f2d5fc6b25d +fixes e83c2b0ff325f52dda1aff3572d0e1516216c54b +arm-current c640e1cb45cb9ff6b02f5f130a4f2a58ab9ebe55 +m68k-current adfe7c69891128f5e238a5e6823709b4bb85b340 +powerpc-merge 4733fd328f14280900435d9dbae1487d110a4d56 +sparc-current 8944146daa2c38dd85bc489d1b84fb9abc108837 +scsi-rc-fixes 5381837f125cc62ad703fbcdfcd7566fc81fd404 +net-current 6d7760a88c25057c2c2243e5dfe2d731064bd31d +sound-current 57e4a5c4f8cfb4b198830c5400f9fc9eb7b75091 +pci-current 4733fd328f14280900435d9dbae1487d110a4d56 +wireless-current 78f1a8b758d57c2d2c9f3db7199cd30803854c82 +kbuild-current 04e448d9a386640a79a4aa71251aa1cdd314f662 +driver-core.current 42065e425599e48897355397f0fadb2ab2d6ac48 +usb.current d3087a914dc0e23f637cbea1fded113768bb0b3d +cpufreq-current c2cc49a2f8a479dde96a599646d30b6cc9dbed78 +input-current 032e46cbf5fb1d768d7dec5631c224e22b4be46f +md-current e62e58a5ffdc98ac28d8dbd070c857620d541f99 +audit-current 3a6a6c16be78472a52f6dd7d88913373b42ad0f7 +crypto-current b6f34d44cb341ad32f08717d1a2c418e6053a031 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm 4dffdb72d9928f10c0b31a0c4b0502b5e92ee1ca +davinci 5a269ed0c04f1160bafeb82cb8610e3388d5934f +pxa ca1c4fecad010b35d1e0e4953a2419c8a42bcd53 +thumb-2 1f8bf3151049fc0c4cc4cfdb021cab168338a14d +avr32 92c548cd35d50df398f442b07021150094578460 +blackfin d6879c585b7f8c2f3eb2f7e7beac806af4e9755c +cris 425b6c8c0c495823a7ac8d70d8f4badfa92b3eb3 +ia64 682e7b49cc73dfa7f2847a19713d448062af1ac8 +m68k 9c6948da2e55f787b942946d830eb3018323b7b7 +m68knommu 2c9d18053800597a5575da46eabff06bd3a2d38d +microblaze 7ffde08214541c0f6f7e202d4165a9179b565af7 +mips 82e55f64130a74d2c2c4d83695151de4a58ff376 +parisc 7c5371c403abb29f01bc6cff6c5096abdf2dc524 +powerpc 8984d7d529d50d11ebd840d69ce61ab0bf4ffcab +4xx 336ff735425d2709c4bb3f2a55f7565e8170ce7a +galak 66c6b856d8738278a4a6e558d25c90e9950aa112 +s390 324049c462b622d28e9b391883632c4bdae0a6bf +sh a3beddd0aa267986de7b13b6d9cd0e1869fcf1fc +sparc b99c6ebe8f53dce1f56f0d483f6a7c23edb19d4c +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +cifs 7b91e2661addd8e2419cb45f6a322aa5dab9bcee +configfs 8af7d5ffe1b6468ed0de1c2bb5335ad40b755ba3 +ecryptfs e02b0b1ffd9956767132493cfce74ba26e1fc6f6 +ext3 f1015c447781729060c415f5133164c638561f25 +ext4 3ac831a0593f53c6080f8cafba7655757370081a +fatfs 2bfdd79eaa0043346e773ba5f6cfd811ea31b73d +fuse 37d217f029a56a6d385f99773fb27dfcb51f9a46 +gfs2 d38862a4636406f9bb9f6c41512b3dbe9436a1bd +jfs 4a19fb11a90fdbbcb3bc02effa036230d035ca28 +nfs 4733fd328f14280900435d9dbae1487d110a4d56 +nfsd 8b31d03efae98e2952b915f80bdfba0e5404755a +nilfs2 90a344c88eb3b9e8c7235250787aabf03d3ef6f4 +ocfs2 0584974a77796581eb3a64b6c5005edac4a95128 +squashfs e5d287539dba264a1d9d7607a25b8c8c61c9d658 +v9fs 99919f1770ed0f6449abc228f485f4f936c80b8f +ubifs 6847e154e3cd74fca6084124c097980a7634285a +xfs b56063453881a6d94cf5718c6769de6e35e67753 +reiserfs-bkl cfcb7d059be7c2441b2c3ac56e0015631396ead6 +vfs aa7dfb8954ccf49e026ba13d12991a4eb7defb96 +pci ddf30687adcf241bdb0f341df90de51a4cdab20d +hid fc5af8bf23596a9a5e74bce0b17b84ba821616ef +i2c 25468dcecee435ef7f09e215db8bb8517415c07d +jdelvare-hwmon 39db5be6690880197b918965bb6346cb99545700 +kernel-doc 52989765629e7d182b4f146050ebba0abf2cb0b7 +v4l-dvb 225a2a008b6a7455f23b3016ed9e274d2cff4afd +quota a790750fb89f3a3d47bc55ad7b5bd5f6ced37217 +kbuild 1d2b9755debc2122bb8840cd2a9dacdc8ee604f2 +ide 2fc2111c2729462b99b6e37f39a48917054776f5 +libata 10d4be2bbb6c017bcbda80fb342dbade51468bc6 +infiniband 17ca4928207d2d75db58fe1e323633b3cea21d3c +acpi 65fd51c9770dfd4a23297d7314b199f9ba91fedd +ieee1394 b69e33ae3402dce11fb0c85d33f2a97617dcc173 +ubi 694c42490fd9bb48f8245d7258039dc55c4f9d50 +kvm 0b972aaabb95808397c61483bd061f4e9ed10e11 +dlm 748285ccf7ea76d3d76d0d5f2945ad6fb91f5329 +scsi 8aceba2bc39718e534664e0df20e0e8b39cffc64 +async_tx 808347f6a31792079e345ec865e9cfcb6e8ae6b2 +udf 195c316ddb37d79614dade90064abe4d6a7ff496 +net 6cf5767c7107c606644503f3e95bc1855386a70f +wireless 0b647cc1549e21d244f7bb35a3b18f52e0947660 +mtd 5c5d4e8eafd0e54c2134c23296b1d7996c304fe1 +crypto ab300465676b0c0559af62d57ec9a902f5680b03 +sound 265cc0a5161224406d78db890e0e280ba0aac5c6 +cpufreq 150b06f7f223cfd0f808737a5243cceca8ea47fa +rr e2fea6e8d2937714daf801d2dd6b30e6a0401562 +mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c +input 9e3b25837a20f4d48fef57b0cb8bf750a8cfa8e2 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 90e56dba21f7a4481acbcd4cdc12644080398339 +device-mapper 90e56dba21f7a4481acbcd4cdc12644080398339 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery 4aed03ae58946c716c8e3f7060f8b500b8a8e30f +leds a1dd8c617217322614f0465ae347895c4b58e1ab +backlight 1d469c6c38c9deaa1836d2c1955330944719e4ef +kgdb 82dcc0d794467ad4749dae45831c8e411129acca +slab 17864179df90224b9b33c6787c0663a59c1ca609 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md e62e58a5ffdc98ac28d8dbd070c857620d541f99 +mfd a663677bf2f1b964f7bfa656d83a78387bd77f7a +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 5c61259e6c7290082108e93815f7f72f27da14f4 +voltage 8f843c807b6f6fba634663497d74bb814ea09366 +security-testing 967cc5371113f9806b39a2ebb2174af2883d96fe +lblnet 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b +agp b854b2ab959e8175d75e01cf8ed452ed2624d0c8 +uwb b81c087f6deb049023e41ce00717202a953f3939 +watchdog 9baf7d768b92d300a10ea1231baf7e8b56829ae8 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 86f4d0123b1fddb47d35b9a893f8c0b94bf89abe +cputime 27bf8712477db47c891e6198000c985631cd18de +osd bc47df0fa705887242c26c7b040e7cf0170ab1f1 +jc_docs 26593e663e6f2846411f5e030afbf8e6f144cf9e +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 7912a7d3f68eccecc7801f8994c540eb18808223 +audit def57543418a5f47debae28a0a9dea2effc11692 +omap 59a3759d0fe8d969888c741bb33f4946e4d3750d +aoe 1de9e8e70f5acc441550ca75433563d91b269bbe +suspend 0fd5d292e52842df153ce3cb75b37509fc098aa2 +bluetooth 8ca902d709d75ce6d7634036603fff432c9ed6d8 +edac-amd 4ad73bc713339d6c0be7abd9f49f46323ce614b6 +fsnotify 13eff6aec2a90d5204f2f66ef65f01f07e181a5c +irda e0057975e09a85ac92be81e975d0d0a911b1c4c6 +hwlat a2c8b6b9bc412196e4a0bfa1c6b33840f7f0a039 +drbd 2637c2bc0c6a4a1cffcd5bb2f57ff339ac9d6ca2 +kmemleak e5fdce447f685b22ada96b3f928df3b447d846b0 +tip da8f91e1099f3ab471b42944dfac0a39e12e45e1 +percpu a76761b621bcd8336065c4fe3a74f046858bc34c +sfi 7e0a0c1ff10f132e9158f22f931036d06da8e4a3 +asm-generic 428bc597508e482cdea17b11b7b08eabd6b924a6 +driver-core bed8558f3b7f8cc0d70b19cbab8599932cf0c5d6 +usb acd0cd068ebba584fa9ee955c22288b02d36903b +staging 49acb975a21d150c4beba4e581f3e1d004dd2867 +scsi-post-merge e349792a385ed47390d156155b1a1e19af1bf163 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..507e92e7e9b4 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,139 @@ +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/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-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 +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/cooloney/blackfin-2.6.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/fyu/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#master +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 +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 +reiserfs-bkl git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#reiserfs/kill-bkl-rc6 +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 +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-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#master +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 +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_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 +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +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 +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 +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/ +staging quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-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 000000000000..aacd5467c669 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5427 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at fc013a5 Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify +Merging origin/master +$ git merge origin/master +Updating fc013a5..7d3e91b +Fast forward + arch/mips/include/asm/pgalloc.h | 11 - + arch/sh/include/asm/pgalloc.h | 8 - + drivers/hwmon/asus_atk0110.c | 6 +- + drivers/hwmon/smsc47m1.c | 11 + + drivers/i2c/chips/tsl2550.c | 17 +- + drivers/isdn/mISDN/l1oip_core.c | 4 +- + drivers/usb/serial/usb-serial.c | 17 +- + fs/btrfs/async-thread.c | 4 +- + fs/btrfs/ctree.c | 121 +++-- + fs/btrfs/ctree.h | 29 +- + fs/btrfs/disk-io.c | 15 + + fs/btrfs/extent-tree.c | 516 +++++++++++++++----- + fs/btrfs/free-space-cache.c | 1003 ++++++++++++++++++++++++++++++--------- + fs/btrfs/free-space-cache.h | 8 + + fs/btrfs/inode.c | 2 +- + fs/btrfs/print-tree.c | 6 +- + fs/btrfs/relocation.c | 3 + + fs/btrfs/transaction.c | 40 +- + fs/btrfs/tree-log.c | 2 +- + fs/btrfs/volumes.c | 46 +- + fs/ecryptfs/keystore.c | 13 + + 21 files changed, 1397 insertions(+), 485 deletions(-) +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + arch/arm/boot/compressed/misc.c | 1 - + arch/arm/include/asm/atomic.h | 2 -- + arch/arm/mach-davinci/board-dm355-evm.c | 1 - + arch/arm/mach-davinci/board-dm355-leopard.c | 1 - + arch/arm/mach-davinci/board-dm644x-evm.c | 1 - + arch/arm/mach-davinci/board-dm646x-evm.c | 1 - + arch/arm/mach-davinci/board-sffsdr.c | 1 - + arch/arm/mach-ep93xx/include/mach/ts72xx.h | 3 --- + arch/arm/mach-ep93xx/ts72xx.c | 18 +++++++++++++----- + arch/arm/mach-omap1/mcbsp.c | 1 - + arch/arm/mach-omap2/mcbsp.c | 1 - + arch/arm/mach-pxa/treo680.c | 2 +- + arch/arm/plat-s3c64xx/pm.c | 2 -- + arch/arm/plat-stmp3xxx/pinmux.c | 1 - + 14 files changed, 14 insertions(+), 22 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 up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. + drivers/scsi/libsas/sas_port.c | 19 +++++++++++++++---- + 1 files changed, 15 insertions(+), 4 deletions(-) +Merging net-current/master +$ git merge net-current/master +Already up-to-date. +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 +Merge made by recursive. + drivers/net/wireless/airo.c | 13 ++++++------- + drivers/net/wireless/ath/ath9k/eeprom.c | 4 ++-- + drivers/net/wireless/iwlwifi/iwl-3945.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 6 ++++-- + drivers/net/wireless/iwlwifi/iwl-tx.c | 14 ++++++++------ + drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 ++-- + drivers/net/wireless/iwmc3200wifi/netdev.c | 6 ++---- + net/mac80211/mlme.c | 2 +- + 8 files changed, 26 insertions(+), 25 deletions(-) +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Merge made by recursive. + Documentation/filesystems/sysfs.txt | 3 ++- + drivers/base/firmware_class.c | 1 - + drivers/base/sys.c | 2 +- + fs/sysfs/dir.c | 2 ++ + lib/dynamic_debug.c | 2 +- + 5 files changed, 6 insertions(+), 4 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + drivers/usb/core/config.c | 48 +++--- + drivers/usb/host/ehci-orion.c | 2 +- + drivers/usb/host/ohci-omap.c | 1 + + drivers/usb/host/xhci-dbg.c | 199 ++++++++++++++--------- + drivers/usb/host/xhci-hcd.c | 290 +++++++++++++++++++++++----------- + drivers/usb/host/xhci-mem.c | 300 ++++++++++++++++++++++++++--------- + drivers/usb/host/xhci-pci.c | 1 + + drivers/usb/host/xhci-ring.c | 305 +++++++++++++++++++++++++---------- + drivers/usb/host/xhci.h | 148 +++++++++++++----- + drivers/usb/misc/Kconfig | 2 +- + drivers/usb/musb/musb_core.c | 3 +- + drivers/usb/musb/musb_gadget_ep0.c | 2 +- + drivers/usb/musb/musb_regs.h | 1 + + drivers/usb/serial/cp210x.c | 3 + + drivers/usb/serial/ftdi_sio.c | 1 + + drivers/usb/serial/ftdi_sio.h | 7 + + drivers/usb/serial/mos7840.c | 9 +- + drivers/usb/serial/option.c | 133 ++++++++++------ + drivers/usb/serial/pl2303.c | 1 + + drivers/usb/serial/pl2303.h | 4 + + drivers/usb/storage/transport.c | 2 +- + 21 files changed, 1017 insertions(+), 445 deletions(-) +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +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 dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-ep93xx/include/mach/ts72xx.h +Auto-merging arch/arm/mach-ep93xx/ts72xx.c +Auto-merging arch/arm/mach-realview/core.c +Auto-merging arch/arm/mach-versatile/core.c +Auto-merging drivers/net/Kconfig +Auto-merging drivers/video/Kconfig +Merge made by recursive. + MAINTAINERS | 8 +- + arch/arm/Kconfig | 19 + + arch/arm/Makefile | 1 + + arch/arm/common/vic.c | 99 ++- + arch/arm/configs/nhk8815_defconfig | 1316 ++++++++++++++++++++ + arch/arm/include/asm/ftrace.h | 34 + + arch/arm/include/asm/mach/mmc.h | 2 + + arch/arm/include/asm/pgtable.h | 20 +- + arch/arm/kernel/Makefile | 4 +- + arch/arm/kernel/crunch.c | 13 +- + arch/arm/kernel/return_address.c | 71 ++ + arch/arm/kernel/stacktrace.c | 4 +- + arch/arm/mach-at91/Kconfig | 49 +- + arch/arm/mach-at91/Makefile | 6 + + arch/arm/mach-at91/Makefile.boot | 4 + + arch/arm/mach-at91/at91sam9261.c | 22 +- + arch/arm/mach-at91/at91sam9g45.c | 360 ++++++ + arch/arm/mach-at91/at91sam9g45_devices.c | 1230 ++++++++++++++++++ + arch/arm/mach-at91/board-sam9261ek.c | 14 + + arch/arm/mach-at91/board-sam9g20ek.c | 1 + + arch/arm/mach-at91/board-sam9m10g45ek.c | 389 ++++++ + arch/arm/mach-at91/board-sam9rlek.c | 79 ++ + arch/arm/mach-at91/clock.c | 66 +- + arch/arm/mach-at91/generic.h | 2 + + arch/arm/mach-at91/gpio.c | 15 - + arch/arm/mach-at91/include/mach/at91sam9261.h | 3 + + arch/arm/mach-at91/include/mach/at91sam9g45.h | 138 ++ + .../mach-at91/include/mach/at91sam9g45_matrix.h | 153 +++ + arch/arm/mach-at91/include/mach/board.h | 8 +- + arch/arm/mach-at91/include/mach/cpu.h | 23 + + arch/arm/mach-at91/include/mach/hardware.h | 4 +- + arch/arm/mach-at91/include/mach/timex.h | 10 + + arch/arm/mach-at91/pm.c | 3 +- + arch/arm/mach-ep93xx/adssphere.c | 11 +- + arch/arm/mach-ep93xx/clock.c | 127 ++- + arch/arm/mach-ep93xx/core.c | 115 ++- + arch/arm/mach-ep93xx/edb93xx.c | 10 +- + arch/arm/mach-ep93xx/gesbc9312.c | 11 +- + arch/arm/mach-ep93xx/gpio.c | 65 +- + arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 102 +- + arch/arm/mach-ep93xx/include/mach/hardware.h | 17 +- + arch/arm/mach-ep93xx/include/mach/io.h | 17 +- + arch/arm/mach-ep93xx/include/mach/platform.h | 16 + + arch/arm/mach-ep93xx/include/mach/system.h | 12 +- + arch/arm/mach-ep93xx/include/mach/ts72xx.h | 1 - + arch/arm/mach-ep93xx/micro9.c | 11 +- + arch/arm/mach-ep93xx/ts72xx.c | 15 +- + arch/arm/mach-integrator/integrator_cp.c | 2 + + arch/arm/mach-nomadik/Kconfig | 21 + + arch/arm/mach-nomadik/Makefile | 19 + + arch/arm/mach-nomadik/Makefile.boot | 4 + + arch/arm/mach-nomadik/board-nhk8815.c | 111 ++ + arch/arm/mach-nomadik/clock.c | 45 + + arch/arm/mach-nomadik/clock.h | 14 + + arch/arm/mach-nomadik/cpu-8815.c | 139 ++ + arch/arm/mach-nomadik/gpio.c | 396 ++++++ + arch/arm/mach-nomadik/i2c-8815nhk.c | 65 + + arch/arm/mach-nomadik/include/mach/clkdev.h | 7 + + arch/arm/mach-nomadik/include/mach/debug-macro.S | 22 + + arch/arm/mach-nomadik/include/mach/entry-macro.S | 43 + + arch/arm/mach-nomadik/include/mach/gpio.h | 71 ++ + arch/arm/mach-nomadik/include/mach/hardware.h | 90 ++ + arch/arm/mach-nomadik/include/mach/io.h | 22 + + arch/arm/mach-nomadik/include/mach/irqs.h | 82 ++ + arch/arm/mach-nomadik/include/mach/memory.h | 28 + + arch/arm/mach-nomadik/include/mach/mtu.h | 45 + + arch/arm/mach-nomadik/include/mach/setup.h | 22 + + arch/arm/mach-nomadik/include/mach/system.h | 45 + + arch/arm/mach-nomadik/include/mach/timex.h | 6 + + arch/arm/mach-nomadik/include/mach/uncompress.h | 63 + + arch/arm/mach-nomadik/include/mach/vmalloc.h | 2 + + arch/arm/mach-nomadik/timer.c | 164 +++ + arch/arm/mach-realview/core.c | 7 + + arch/arm/mach-realview/include/mach/gpio.h | 6 + + arch/arm/mach-realview/realview_eb.c | 22 +- + arch/arm/mach-realview/realview_pb1176.c | 22 +- + arch/arm/mach-realview/realview_pb11mp.c | 22 +- + arch/arm/mach-realview/realview_pba8.c | 22 +- + arch/arm/mach-realview/realview_pbx.c | 22 +- + arch/arm/mach-u300/mmc.c | 2 + + arch/arm/mach-versatile/core.c | 17 +- + arch/arm/mach-versatile/include/mach/gpio.h | 6 + + arch/arm/mach-versatile/include/mach/irqs.h | 11 +- + arch/arm/mach-versatile/versatile_pb.c | 17 +- + arch/arm/mach-w90x900/clock.c | 18 + + arch/arm/mach-w90x900/clock.h | 8 + + arch/arm/mach-w90x900/irq.c | 154 +++- + arch/arm/mach-w90x900/mach-w90p910evb.c | 117 ++ + arch/arm/mach-w90x900/mfp-w90p910.c | 44 +- + arch/arm/mach-w90x900/w90p910.c | 8 +- + arch/arm/mm/Kconfig | 2 +- + arch/arm/mm/proc-macros.S | 6 - + arch/arm/tools/mach-types | 37 +- + drivers/mmc/host/mmci.c | 71 +- + drivers/mmc/host/mmci.h | 2 + + drivers/mtd/nand/ts7250.c | 5 +- + drivers/net/Kconfig | 2 +- + drivers/spi/amba-pl022.c | 2 - + drivers/video/Kconfig | 4 +- + drivers/video/atmel_lcdfb.c | 6 +- + drivers/video/backlight/Kconfig | 2 +- + sound/soc/atmel/sam9g20_wm8731.c | 36 - + 102 files changed, 6613 insertions(+), 315 deletions(-) + create mode 100644 arch/arm/configs/nhk8815_defconfig + create mode 100644 arch/arm/kernel/return_address.c + create mode 100644 arch/arm/mach-at91/at91sam9g45.c + create mode 100644 arch/arm/mach-at91/at91sam9g45_devices.c + create mode 100644 arch/arm/mach-at91/board-sam9m10g45ek.c + create mode 100644 arch/arm/mach-at91/include/mach/at91sam9g45.h + create mode 100644 arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h + create mode 100644 arch/arm/mach-nomadik/Kconfig + create mode 100644 arch/arm/mach-nomadik/Makefile + create mode 100644 arch/arm/mach-nomadik/Makefile.boot + create mode 100644 arch/arm/mach-nomadik/board-nhk8815.c + create mode 100644 arch/arm/mach-nomadik/clock.c + create mode 100644 arch/arm/mach-nomadik/clock.h + create mode 100644 arch/arm/mach-nomadik/cpu-8815.c + create mode 100644 arch/arm/mach-nomadik/gpio.c + create mode 100644 arch/arm/mach-nomadik/i2c-8815nhk.c + create mode 100644 arch/arm/mach-nomadik/include/mach/clkdev.h + create mode 100644 arch/arm/mach-nomadik/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-nomadik/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-nomadik/include/mach/gpio.h + create mode 100644 arch/arm/mach-nomadik/include/mach/hardware.h + create mode 100644 arch/arm/mach-nomadik/include/mach/io.h + create mode 100644 arch/arm/mach-nomadik/include/mach/irqs.h + create mode 100644 arch/arm/mach-nomadik/include/mach/memory.h + create mode 100644 arch/arm/mach-nomadik/include/mach/mtu.h + create mode 100644 arch/arm/mach-nomadik/include/mach/setup.h + create mode 100644 arch/arm/mach-nomadik/include/mach/system.h + create mode 100644 arch/arm/mach-nomadik/include/mach/timex.h + create mode 100644 arch/arm/mach-nomadik/include/mach/uncompress.h + create mode 100644 arch/arm/mach-nomadik/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-nomadik/timer.c + create mode 100644 arch/arm/mach-realview/include/mach/gpio.h + create mode 100644 arch/arm/mach-versatile/include/mach/gpio.h +Merging davinci/for-next +$ git merge davinci/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-davinci/board-dm355-evm.c +Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c +Auto-merging arch/arm/mach-davinci/board-dm646x-evm.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 | 127 +++ + arch/arm/mach-davinci/board-da850-evm.c | 120 ++ + arch/arm/mach-davinci/board-dm355-evm.c | 5 + + arch/arm/mach-davinci/board-dm365-evm.c | 492 +++++++++ + arch/arm/mach-davinci/board-dm644x-evm.c | 3 + + arch/arm/mach-davinci/board-dm646x-evm.c | 90 ++ + arch/arm/mach-davinci/clock.c | 5 +- + arch/arm/mach-davinci/da830.c | 1204 +++++++++++++++++++++ + arch/arm/mach-davinci/da850.c | 631 +++++++++++ + arch/arm/mach-davinci/devices-da8xx.c | 287 +++++ + arch/arm/mach-davinci/devices.c | 60 +- + arch/arm/mach-davinci/dm355.c | 85 ++- + arch/arm/mach-davinci/dm365.c | 909 ++++++++++++++++ + arch/arm/mach-davinci/dm644x.c | 85 ++- + arch/arm/mach-davinci/dm646x.c | 217 ++++- + arch/arm/mach-davinci/dma.c | 811 +++++++++----- + arch/arm/mach-davinci/gpio.c | 105 ++- + arch/arm/mach-davinci/include/mach/asp.h | 34 +- + 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 | 106 ++ + arch/arm/mach-davinci/include/mach/debug-macro.S | 8 + + arch/arm/mach-davinci/include/mach/dm355.h | 5 + + arch/arm/mach-davinci/include/mach/dm365.h | 29 + + arch/arm/mach-davinci/include/mach/dm644x.h | 2 + + arch/arm/mach-davinci/include/mach/dm646x.h | 6 + + arch/arm/mach-davinci/include/mach/edma.h | 57 +- + arch/arm/mach-davinci/include/mach/gpio.h | 8 +- + 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 | 202 ++++- + arch/arm/mach-davinci/include/mach/memory.h | 9 +- + arch/arm/mach-davinci/include/mach/mux.h | 593 ++++++++++ + 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, 8724 insertions(+), 504 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 +Removing arch/arm/configs/littleton_defconfig +Removing arch/arm/configs/zylonite_defconfig +Auto-merging drivers/video/pxafb.c +Merge made by recursive. + arch/arm/configs/littleton_defconfig | 783 --------------- + arch/arm/configs/pxa3xx_defconfig | 1332 ++++++++++++++++++++++++++ + arch/arm/configs/zylonite_defconfig | 736 -------------- + arch/arm/mach-pxa/Kconfig | 1 + + arch/arm/mach-pxa/cm-x270.c | 54 +- + 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 | 75 +-- + 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/em-x270.c | 43 +- + arch/arm/mach-pxa/gumstix.c | 5 +- + arch/arm/mach-pxa/idp.c | 5 +- + arch/arm/mach-pxa/imote2.c | 3 + + arch/arm/mach-pxa/include/mach/colibri.h | 6 + + arch/arm/mach-pxa/include/mach/irqs.h | 4 +- + arch/arm/mach-pxa/include/mach/mmc.h | 5 + + arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 4 +- + arch/arm/mach-pxa/littleton.c | 43 +- + arch/arm/mach-pxa/lubbock.c | 13 +- + arch/arm/mach-pxa/magician.c | 49 +- + arch/arm/mach-pxa/mainstone.c | 11 +- + arch/arm/mach-pxa/mioa701.c | 84 +-- + arch/arm/mach-pxa/palmld.c | 85 +-- + arch/arm/mach-pxa/palmt5.c | 85 +-- + arch/arm/mach-pxa/palmte2.c | 80 +-- + arch/arm/mach-pxa/palmtx.c | 85 +-- + arch/arm/mach-pxa/palmz72.c | 88 +-- + arch/arm/mach-pxa/pcm990-baseboard.c | 67 +- + arch/arm/mach-pxa/poodle.c | 53 +- + arch/arm/mach-pxa/pxa300.c | 2 + + arch/arm/mach-pxa/pxa320.c | 2 + + arch/arm/mach-pxa/spitz.c | 62 +-- + arch/arm/mach-pxa/tosa.c | 82 +-- + arch/arm/mach-pxa/trizeps4.c | 3 + + arch/arm/mach-pxa/zylonite.c | 3 + + arch/arm/mach-pxa/zylonite_pxa300.c | 2 + + arch/arm/mach-pxa/zylonite_pxa320.c | 2 + + drivers/mmc/host/pxamci.c | 81 ++- + drivers/video/pxafb.c | 8 +- + 43 files changed, 1781 insertions(+), 2505 deletions(-) + delete mode 100644 arch/arm/configs/littleton_defconfig + create mode 100644 arch/arm/configs/pxa3xx_defconfig + delete mode 100644 arch/arm/configs/zylonite_defconfig +Merging thumb-2/thumb-2 +$ git merge thumb-2/thumb-2 +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/Makefile +Merge made by recursive. + arch/arm/Kconfig | 15 +++ + arch/arm/Kconfig.debug | 1 + + arch/arm/Makefile | 11 ++- + arch/arm/boot/Makefile | 9 ++- + arch/arm/boot/compressed/head.S | 170 +++++++++++++++++++++-------------- + arch/arm/include/asm/assembler.h | 84 ++++++++++++++++++ + arch/arm/include/asm/elf.h | 3 + + arch/arm/include/asm/futex.h | 1 + + arch/arm/include/asm/memory.h | 6 ++ + arch/arm/include/asm/uaccess.h | 7 +- + arch/arm/include/asm/unified.h | 126 ++++++++++++++++++++++++++ + arch/arm/kernel/entry-armv.S | 169 +++++++++++++++++++++-------------- + arch/arm/kernel/entry-common.S | 28 ++---- + arch/arm/kernel/entry-header.S | 92 ++++++++++++++++++- + arch/arm/kernel/head-common.S | 15 ++- + arch/arm/kernel/head-nommu.S | 11 ++- + arch/arm/kernel/head.S | 28 ++++--- + arch/arm/kernel/module.c | 53 +++++++++++ + arch/arm/kernel/process.c | 2 +- + arch/arm/kernel/setup.c | 28 +++++-- + arch/arm/kernel/unwind.c | 4 + + arch/arm/lib/ashldi3.S | 4 +- + arch/arm/lib/ashrdi3.S | 4 +- + arch/arm/lib/backtrace.S | 8 ++- + arch/arm/lib/clear_user.S | 15 ++-- + arch/arm/lib/copy_from_user.S | 19 ++-- + arch/arm/lib/copy_template.S | 24 +++++- + arch/arm/lib/copy_to_user.S | 19 ++-- + arch/arm/lib/csumpartialcopyuser.S | 48 +++-------- + arch/arm/lib/div64.S | 4 +- + arch/arm/lib/findbit.S | 34 ++++++-- + arch/arm/lib/getuser.S | 5 + + arch/arm/lib/io-writesw-armv4.S | 5 +- + arch/arm/lib/lshrdi3.S | 4 +- + arch/arm/lib/memcpy.S | 7 +- + arch/arm/lib/memmove.S | 28 +++--- + arch/arm/lib/putuser.S | 15 +++ + arch/arm/lib/sha1.S | 2 + + arch/arm/lib/strncpy_from_user.S | 2 +- + arch/arm/lib/strnlen_user.S | 2 +- + arch/arm/mach-realview/platsmp.c | 18 ++--- + arch/arm/mm/alignment.c | 20 +++- + arch/arm/mm/cache-v7.S | 16 +++- + arch/arm/mm/proc-v7.S | 5 +- + arch/arm/vfp/entry.S | 2 + + arch/arm/vfp/vfphw.S | 48 +++++++---- + 46 files changed, 893 insertions(+), 328 deletions(-) + create mode 100644 arch/arm/include/asm/unified.h +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/boards/favr-32/setup.c | 4 ++++ + arch/avr32/lib/memcpy.S | 16 +++++++++++++--- + 2 files changed, 17 insertions(+), 3 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/include/arch-v10/arch/mmu.h | 9 +++++---- + arch/cris/include/arch-v32/arch/mmu.h | 10 ++++++---- + arch/cris/include/asm/pgtable.h | 2 ++ + 3 files changed, 13 insertions(+), 8 deletions(-) +Merging ia64/test +$ git merge ia64/test +Merge made by recursive. + arch/ia64/kernel/setup.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) +Merging m68k/for-next +$ git merge m68k/for-next +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/rtc/Makefile +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/hardirq_mm.h +Removing arch/m68k/include/asm/hardirq_no.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.h | 13 +- + arch/m68k/include/asm/hardirq_mm.h | 16 - + arch/m68k/include/asm/hardirq_no.h | 27 -- + 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/mcfsim.h | 93 +---- + arch/m68k/include/asm/mcfsmc.h | 6 +- + arch/m68k/include/asm/nettel.h | 4 +- + arch/m68k/include/asm/pinmux.h | 30 ++ + arch/m68k/include/asm/processor.h | 171 +++++++- + arch/m68k/include/asm/processor_mm.h | 130 ------ + arch/m68k/include/asm/processor_no.h | 143 ------ + arch/m68knommu/Kconfig | 6 + + arch/m68knommu/kernel/irq.c | 26 -- + 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 | 63 --- + 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 +- + 84 files changed, 5180 insertions(+), 2266 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/hardirq_mm.h + delete mode 100644 arch/m68k/include/asm/hardirq_no.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. + arch/microblaze/kernel/microblaze_ksyms.c | 7 +++++++ + arch/microblaze/mm/init.c | 1 + + 2 files changed, 8 insertions(+), 0 deletions(-) +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Resolved 'arch/mips/cavium-octeon/dma-octeon.c' using previous resolution. +Resolved 'arch/mips/cavium-octeon/executive/cvmx-helper-errata.c' using previous resolution. +Resolved 'arch/mips/mm/tlbex.c' using previous resolution. +Resolved 'arch/mips/sibyte/swarm/setup.c' using previous resolution. +Resolved 'drivers/char/hw_random/Kconfig' using previous resolution. +Resolved 'drivers/char/hw_random/Makefile' using previous resolution. +Resolved 'drivers/dma/txx9dmac.c' using previous resolution. +Auto-merging arch/mips/Kconfig +Auto-merging arch/mips/cavium-octeon/dma-octeon.c +CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c +Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-errata.c +CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c +Auto-merging arch/mips/cavium-octeon/octeon-irq.c +Auto-merging arch/mips/include/asm/cpu-features.h +Auto-merging arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h +Auto-merging arch/mips/mm/c-r4k.c +Auto-merging arch/mips/mm/tlbex.c +CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c +Auto-merging arch/mips/sibyte/Kconfig +Auto-merging arch/mips/sibyte/swarm/setup.c +CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c +Auto-merging drivers/char/hw_random/Kconfig +CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig +Auto-merging drivers/char/hw_random/Makefile +CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile +Auto-merging drivers/dma/txx9dmac.c +CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4bca1e8] Merge commit 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/mips/cavium-octeon/Makefile | 4 + + arch/mips/cavium-octeon/msi.c | 288 +++++++ + arch/mips/cavium-octeon/pci-common.c | 137 ++++ + arch/mips/cavium-octeon/pci-common.h | 39 + + arch/mips/cavium-octeon/pci.c | 568 ++++++++++++++ + arch/mips/cavium-octeon/pcie.c | 1370 ++++++++++++++++++++++++++++++++++ + 6 files changed, 2406 insertions(+), 0 deletions(-) + create mode 100644 arch/mips/cavium-octeon/msi.c + create mode 100644 arch/mips/cavium-octeon/pci-common.c + create mode 100644 arch/mips/cavium-octeon/pci-common.h + create mode 100644 arch/mips/cavium-octeon/pci.c + create mode 100644 arch/mips/cavium-octeon/pcie.c +Merging parisc/master +$ git merge parisc/master +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Merge made by recursive. + arch/powerpc/Kconfig | 22 +- + arch/powerpc/Makefile | 2 +- + arch/powerpc/boot/wrapper | 3 +- + arch/powerpc/include/asm/bitops.h | 194 ++---- + arch/powerpc/include/asm/cputhreads.h | 16 + + arch/powerpc/include/asm/exception-64e.h | 201 +++++ + .../include/asm/{exception.h => exception-64s.h} | 25 +- + arch/powerpc/include/asm/hw_irq.h | 5 + + arch/powerpc/include/asm/mmu-40x.h | 3 + + arch/powerpc/include/asm/mmu-44x.h | 6 + + arch/powerpc/include/asm/mmu-8xx.h | 3 + + arch/powerpc/include/asm/mmu-book3e.h | 196 ++++-- + arch/powerpc/include/asm/mmu-hash32.h | 6 + + arch/powerpc/include/asm/mmu-hash64.h | 20 - + arch/powerpc/include/asm/mmu.h | 37 + + arch/powerpc/include/asm/mmu_context.h | 15 +- + arch/powerpc/include/asm/paca.h | 23 +- + arch/powerpc/include/asm/page.h | 4 + + arch/powerpc/include/asm/page_64.h | 10 + + arch/powerpc/include/asm/pgalloc.h | 39 +- + arch/powerpc/include/asm/pgtable-ppc64-64k.h | 4 +- + arch/powerpc/include/asm/pgtable-ppc64.h | 64 ++- + arch/powerpc/include/asm/ppc-opcode.h | 6 + + arch/powerpc/include/asm/ppc_asm.h | 14 +- + arch/powerpc/include/asm/pte-book3e.h | 70 ++ + arch/powerpc/include/asm/pte-common.h | 3 + + arch/powerpc/include/asm/reg.h | 141 ++++- + arch/powerpc/include/asm/reg_booke.h | 42 +- + arch/powerpc/include/asm/smp.h | 10 + + arch/powerpc/include/asm/systbl.h | 4 +- + arch/powerpc/include/asm/tlb.h | 38 +- + arch/powerpc/include/asm/tlbflush.h | 11 +- + arch/powerpc/include/asm/vdso.h | 3 +- + arch/powerpc/kernel/Makefile | 10 +- + arch/powerpc/kernel/asm-offsets.c | 19 +- + arch/powerpc/kernel/cpu_setup_6xx.S | 2 +- + arch/powerpc/kernel/cputable.c | 27 +- + arch/powerpc/kernel/entry_32.S | 20 +- + arch/powerpc/kernel/entry_64.S | 102 ++- + arch/powerpc/kernel/exceptions-64e.S | 784 ++++++++++++++++++++ + arch/powerpc/kernel/exceptions-64s.S | 78 +- + arch/powerpc/kernel/fpu.S | 2 +- + arch/powerpc/kernel/head_32.S | 40 +- + arch/powerpc/kernel/head_40x.S | 124 ++-- + arch/powerpc/kernel/head_44x.S | 56 +- + arch/powerpc/kernel/head_64.S | 83 ++- + arch/powerpc/kernel/head_8xx.S | 13 +- + arch/powerpc/kernel/head_booke.h | 50 +- + arch/powerpc/kernel/head_fsl_booke.S | 60 +- + arch/powerpc/kernel/paca.c | 3 + + arch/powerpc/kernel/process.c | 2 + + arch/powerpc/kernel/prom_init.c | 4 - + arch/powerpc/kernel/setup_64.c | 34 +- + arch/powerpc/kernel/sys_ppc32.c | 12 + + arch/powerpc/kernel/vdso.c | 7 +- + arch/powerpc/kernel/vector.S | 2 +- + arch/powerpc/kvm/booke_interrupts.S | 18 +- + arch/powerpc/mm/Makefile | 1 + + arch/powerpc/mm/hash_low_32.S | 4 +- + arch/powerpc/mm/hugetlbpage.c | 8 +- + arch/powerpc/mm/init_32.c | 2 - + arch/powerpc/mm/init_64.c | 55 ++- + arch/powerpc/mm/mmu_context_nohash.c | 93 ++- + arch/powerpc/mm/mmu_decl.h | 37 +- + arch/powerpc/mm/pgtable.c | 12 + + arch/powerpc/mm/pgtable_64.c | 59 ++- + arch/powerpc/mm/slb.c | 30 +- + arch/powerpc/mm/tlb_hash32.c | 3 + + arch/powerpc/mm/tlb_hash64.c | 20 +- + arch/powerpc/mm/tlb_low_64e.S | 734 ++++++++++++++++++ + arch/powerpc/mm/tlb_nohash.c | 268 +++++++- + arch/powerpc/mm/tlb_nohash_low.S | 85 ++- + arch/powerpc/platforms/85xx/smp.c | 1 - + arch/powerpc/platforms/86xx/mpc86xx_smp.c | 1 - + arch/powerpc/platforms/Kconfig.cputype | 38 +- + arch/powerpc/platforms/amigaone/setup.c | 6 +- + arch/powerpc/platforms/cell/celleb_setup.c | 3 +- + arch/powerpc/platforms/cell/smp.c | 2 - + arch/powerpc/platforms/iseries/exception.S | 59 +- + arch/powerpc/platforms/iseries/exception.h | 6 +- + arch/powerpc/platforms/powermac/smp.c | 2 +- + arch/powerpc/platforms/pseries/smp.c | 2 - + arch/powerpc/sysdev/mpic.c | 13 +- + arch/powerpc/xmon/xmon.c | 2 +- + 84 files changed, 3571 insertions(+), 767 deletions(-) + create mode 100644 arch/powerpc/include/asm/exception-64e.h + rename arch/powerpc/include/asm/{exception.h => exception-64s.h} (94%) + create mode 100644 arch/powerpc/include/asm/pte-book3e.h + create mode 100644 arch/powerpc/kernel/exceptions-64e.S + create mode 100644 arch/powerpc/mm/tlb_low_64e.S +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 +Removing arch/s390/power/Makefile +Removing arch/s390/power/suspend.c +Removing arch/s390/power/swsusp.c +Removing arch/s390/power/swsusp_64.c +Merge made by recursive. + arch/s390/Kconfig | 1 - + arch/s390/Makefile | 3 +- + arch/s390/include/asm/atomic.h | 205 +++++++++---- + arch/s390/include/asm/checksum.h | 25 +-- + arch/s390/include/asm/chsc.h | 28 ++ + arch/s390/include/asm/cio.h | 223 +------------- + arch/s390/include/asm/ipl.h | 5 +- + .../cio/scsw.c => arch/s390/include/asm/scsw.h | 345 +++++++++++++------- + arch/s390/include/asm/setup.h | 2 +- + arch/s390/include/asm/timex.h | 16 +- + arch/s390/kernel/Makefile | 4 +- + arch/s390/kernel/early.c | 37 ++- + arch/s390/kernel/head.S | 2 +- + arch/s390/kernel/ipl.c | 166 +++++++++- + arch/s390/kernel/mcount.S | 147 +-------- + arch/s390/kernel/mcount64.S | 78 +++++ + arch/s390/kernel/suspend.c | 73 ++++ + arch/s390/{power => kernel}/swsusp_asm64.S | 2 +- + arch/s390/kernel/time.c | 9 +- + arch/s390/power/Makefile | 8 - + arch/s390/power/suspend.c | 40 --- + arch/s390/power/swsusp.c | 42 --- + arch/s390/power/swsusp_64.c | 17 - + drivers/char/hvc_iucv.c | 2 +- + drivers/s390/block/dasd.c | 26 +- + drivers/s390/block/dasd_3990_erp.c | 2 +- + drivers/s390/block/dasd_alias.c | 5 +- + drivers/s390/block/dasd_diag.c | 5 +- + drivers/s390/block/dasd_eckd.c | 47 ++-- + drivers/s390/block/dasd_eer.c | 4 +- + drivers/s390/block/dasd_erp.c | 4 +- + drivers/s390/block/dasd_fba.c | 9 +- + drivers/s390/block/dasd_int.h | 11 +- + drivers/s390/block/dasd_ioctl.c | 24 +- + drivers/s390/char/monreader.c | 2 +- + drivers/s390/char/tape_std.c | 2 +- + drivers/s390/char/vmlogrdr.c | 4 +- + drivers/s390/cio/Makefile | 2 +- + drivers/s390/cio/chp.c | 3 +- + drivers/s390/cio/chsc.h | 24 -- + drivers/s390/cio/css.c | 26 +- + drivers/s390/cio/device.c | 10 - + drivers/s390/cio/device_fsm.c | 13 +- + drivers/s390/cio/qdio.h | 4 +- + drivers/s390/cio/qdio_debug.c | 55 +--- + drivers/s390/cio/qdio_main.c | 4 +- + drivers/s390/crypto/ap_bus.c | 2 +- + drivers/s390/net/netiucv.c | 4 +- + drivers/s390/net/smsgiucv.c | 6 +- + drivers/s390/scsi/zfcp_aux.c | 12 +- + 50 files changed, 909 insertions(+), 881 deletions(-) + rename drivers/s390/cio/scsw.c => arch/s390/include/asm/scsw.h (70%) + create mode 100644 arch/s390/kernel/mcount64.S + create mode 100644 arch/s390/kernel/suspend.c + rename arch/s390/{power => kernel}/swsusp_asm64.S (99%) + delete mode 100644 arch/s390/power/Makefile + delete mode 100644 arch/s390/power/suspend.c + delete mode 100644 arch/s390/power/swsusp.c + delete mode 100644 arch/s390/power/swsusp_64.c +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 +Auto-merging drivers/video/Kconfig +Merge made by recursive. + arch/sh/Kconfig | 7 + + arch/sh/Kconfig.debug | 11 +- + arch/sh/Makefile | 20 +- + arch/sh/boards/Kconfig | 7 + + arch/sh/boards/mach-highlander/setup.c | 7 + + arch/sh/boards/mach-kfr2r09/Makefile | 1 + + arch/sh/boards/mach-kfr2r09/setup.c | 153 ++++++ + arch/sh/boards/mach-se/7724/setup.c | 1 + + arch/sh/boards/mach-x3proto/setup.c | 7 + + arch/sh/boot/.gitignore | 5 +- + arch/sh/boot/Makefile | 39 +- + arch/sh/boot/compressed/.gitignore | 1 + + arch/sh/boot/compressed/Makefile | 21 +- + 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/configs/kfr2r09_defconfig | 877 ++++++++++++++++++++++++++++++++ + arch/sh/include/asm/ftrace.h | 7 +- + arch/sh/include/asm/hwblk.h | 70 +++ + arch/sh/include/asm/lmb.h | 6 + + arch/sh/include/asm/pgtable_32.h | 14 +- + arch/sh/include/asm/suspend.h | 9 + + arch/sh/include/asm/syscall_32.h | 1 + + arch/sh/include/asm/thread_info.h | 11 +- + arch/sh/include/cpu-sh4/cpu/sh7722.h | 14 + + arch/sh/include/cpu-sh4/cpu/sh7723.h | 17 + + arch/sh/kernel/Makefile_32 | 2 + + arch/sh/kernel/asm-offsets.c | 1 + + arch/sh/kernel/cpu/Makefile | 2 +- + arch/sh/kernel/cpu/hwblk.c | 155 ++++++ + arch/sh/kernel/cpu/sh2/setup-sh7619.c | 2 +- + arch/sh/kernel/cpu/sh2a/setup-mxg.c | 2 +- + arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 2 +- + arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 2 +- + arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 2 +- + arch/sh/kernel/cpu/sh3/setup-sh7705.c | 2 +- + arch/sh/kernel/cpu/sh3/setup-sh770x.c | 2 +- + arch/sh/kernel/cpu/sh3/setup-sh7710.c | 2 +- + arch/sh/kernel/cpu/sh3/setup-sh7720.c | 2 +- + arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 2 +- + arch/sh/kernel/cpu/sh4/setup-sh7750.c | 2 +- + arch/sh/kernel/cpu/sh4/setup-sh7760.c | 2 +- + arch/sh/kernel/cpu/sh4a/Makefile | 4 +- + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 60 ++- + arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 110 +++-- + arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c | 106 ++++ + arch/sh/kernel/cpu/sh4a/hwblk-sh7723.c | 117 +++++ + arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 2 +- + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 4 +- + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 10 +- + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 4 +- + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 2 +- + arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 2 +- + arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 2 +- + arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 2 +- + arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 2 +- + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 2 +- + arch/sh/kernel/cpu/sh4a/setup-shx3.c | 2 +- + arch/sh/kernel/cpu/sh5/setup-sh5.c | 2 +- + arch/sh/kernel/cpu/shmobile/Makefile | 1 + + arch/sh/kernel/cpu/shmobile/cpuidle.c | 102 ++++ + arch/sh/kernel/cpu/shmobile/pm.c | 26 +- + arch/sh/kernel/entry-common.S | 18 +- + arch/sh/kernel/ftrace.c | 190 +++++++ + arch/sh/kernel/irq.c | 17 - + arch/sh/kernel/process_32.c | 5 +- + arch/sh/kernel/ptrace_32.c | 8 + + arch/sh/kernel/setup.c | 71 ++- + arch/sh/kernel/sh_ksyms_32.c | 4 +- + arch/sh/kernel/time.c | 2 + + arch/sh/kernel/vmlinux.lds.S | 86 +--- + arch/sh/lib/Makefile | 2 +- + arch/sh/lib/mcount.S | 228 ++++++++- + arch/sh/mm/fault_32.c | 164 ++++--- + arch/sh/mm/numa.c | 36 +- + arch/sh/tools/mach-types | 1 + + drivers/i2c/busses/i2c-sh_mobile.c | 2 +- + drivers/usb/gadget/Kconfig | 10 - + drivers/usb/gadget/m66592-udc.c | 284 ++++++----- + drivers/usb/gadget/m66592-udc.h | 90 ++-- + drivers/usb/host/Kconfig | 7 - + drivers/usb/host/r8a66597-hcd.c | 208 +++++---- + drivers/usb/host/r8a66597.h | 442 ++--------------- + drivers/video/Kconfig | 2 +- + drivers/video/sh_mobile_lcdcfb.c | 16 +- + include/linux/usb/m66592.h | 44 ++ + include/linux/usb/r8a66597.h | 375 ++++++++++++++- + 89 files changed, 3462 insertions(+), 1485 deletions(-) + create mode 100644 arch/sh/boards/mach-kfr2r09/Makefile + 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/configs/kfr2r09_defconfig + create mode 100644 arch/sh/include/asm/hwblk.h + create mode 100644 arch/sh/include/asm/lmb.h + create mode 100644 arch/sh/kernel/cpu/hwblk.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/shmobile/cpuidle.c + 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/cifs_dfs_ref.c | 12 +++++++++--- + fs/cifs/connect.c | 13 ++++++++++--- + 2 files changed, 19 insertions(+), 6 deletions(-) +Merging configfs/linux-next +$ git merge configfs/linux-next +Resolved 'fs/configfs/dir.c' using previous resolution. +Auto-merging fs/configfs/dir.c +CONFLICT (content): Merge conflict in fs/configfs/dir.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d1f06fad] Merge commit 'configfs/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging ecryptfs/next +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/keystore.c +Merge made by recursive. + fs/ecryptfs/crypto.c | 10 +++++----- + fs/ecryptfs/keystore.c | 11 ++++------- + fs/ecryptfs/super.c | 2 -- + 3 files changed, 9 insertions(+), 14 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Merge made by recursive. + fs/ext4/mballoc.c | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Auto-merging fs/fuse/dev.c +Merge made by recursive. + fs/fuse/dev.c | 10 +++++----- + fs/fuse/fuse_i.h | 12 ++++++------ + fs/fuse/inode.c | 14 ++++++++++++++ + include/linux/fuse.h | 29 +++++++++++++++++++++++++++-- + 4 files changed, 52 insertions(+), 13 deletions(-) +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/aops.c | 39 ++++++++++++++ + fs/gfs2/glock.c | 138 +++++++++++++++++++++++++++++++++----------------- + fs/gfs2/glock.h | 3 + + fs/gfs2/glops.c | 21 ++++++++ + fs/gfs2/incore.h | 2 + + fs/gfs2/ops_fstype.c | 13 ++++- + fs/gfs2/rgrp.c | 23 +++----- + fs/gfs2/super.c | 41 ++++++++++----- + fs/gfs2/super.h | 8 ++- + 9 files changed, 210 insertions(+), 78 deletions(-) +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/nfsctl.c +Auto-merging fs/nfsd/nfssvc.c +Merge made by recursive. + fs/nfsd/nfs4proc.c | 82 ++++++++------- + fs/nfsd/nfs4state.c | 164 +++++++++++++++++++----------- + fs/nfsd/nfs4xdr.c | 3 +- + fs/nfsd/nfsctl.c | 5 +- + fs/nfsd/nfssvc.c | 23 +++-- + include/linux/nfs4.h | 2 +- + include/linux/nfsd/nfsd.h | 3 + + include/linux/nfsd/state.h | 22 ++++- + include/linux/nfsd/xdr4.h | 12 -- + include/linux/sunrpc/svc.h | 2 - + net/sunrpc/svcsock.c | 84 ++++++++++----- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 +- + 12 files changed, 248 insertions(+), 158 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Merge made by recursive. + fs/nilfs2/segment.c | 7 +++- + fs/nilfs2/super.c | 86 +++++++++++++++++------------------------------- + fs/nilfs2/the_nilfs.h | 14 ++++++++ + 3 files changed, 51 insertions(+), 56 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/ocfs2/alloc.c | 47 ++++++++++++++++-- + fs/ocfs2/aops.c | 3 +- + fs/ocfs2/dcache.c | 35 +++++++++++--- + fs/ocfs2/dcache.h | 3 + + fs/ocfs2/dlm/dlmrecovery.c | 2 +- + fs/ocfs2/file.c | 5 ++- + fs/ocfs2/journal.c | 8 +++- + fs/ocfs2/journal.h | 14 ++++- + fs/ocfs2/ocfs2.h | 22 +++++++-- + fs/ocfs2/quota.h | 1 - + fs/ocfs2/quota_global.c | 31 ++++++++---- + fs/ocfs2/quota_local.c | 110 +++++++++++++++++++++++++++++++++++++------ + fs/ocfs2/super.c | 30 ++++++++++-- + fs/ocfs2/xattr.c | 3 +- + 14 files changed, 257 insertions(+), 57 deletions(-) +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Merge made by recursive. + fs/9p/vfs_inode.c | 126 +++++++++++++++++++++++++------------------------ + fs/9p/vfs_super.c | 20 ++++---- + net/9p/client.c | 14 +++--- + net/9p/trans_fd.c | 8 ++-- + net/9p/trans_rdma.c | 9 ++-- + net/9p/trans_virtio.c | 11 ++--- + 6 files changed, 94 insertions(+), 94 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Auto-merging fs/xfs/linux-2.6/xfs_super.c +Auto-merging fs/xfs/xfs_inode.h +Merge made by recursive. + fs/xfs/linux-2.6/xfs_super.c | 2 +- + fs/xfs/linux-2.6/xfs_sync.c | 15 --------------- + fs/xfs/linux-2.6/xfs_sync.h | 1 - + 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_inode.c | 8 ++++---- + fs/xfs/xfs_inode.h | 5 ----- + fs/xfs/xfs_inum.h | 1 - + fs/xfs/xfs_itable.c | 2 +- + 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.h | 6 ------ + fs/xfs/xfs_vnodeops.c | 2 +- + 22 files changed, 21 insertions(+), 156 deletions(-) +Merging reiserfs-bkl/reiserfs/kill-bkl-rc6 +$ git merge reiserfs-bkl/reiserfs/kill-bkl-rc6 +Resolved 'fs/reiserfs/journal.c' using previous resolution. +Resolved 'fs/reiserfs/super.c' using previous resolution. +Auto-merging fs/reiserfs/dir.c +Auto-merging fs/reiserfs/do_balan.c +Auto-merging fs/reiserfs/inode.c +Auto-merging fs/reiserfs/journal.c +CONFLICT (content): Merge conflict in fs/reiserfs/journal.c +Auto-merging fs/reiserfs/resize.c +Auto-merging fs/reiserfs/super.c +CONFLICT (content): Merge conflict in fs/reiserfs/super.c +Auto-merging fs/reiserfs/xattr.c +Auto-merging include/linux/reiserfs_fs.h +Auto-merging include/linux/reiserfs_fs_sb.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 10d8292] Merge commit 'reiserfs-bkl/reiserfs/kill-bkl-rc6' +$ git diff -M --stat --summary HEAD^.. + fs/reiserfs/Makefile | 2 +- + fs/reiserfs/bitmap.c | 4 ++ + fs/reiserfs/dir.c | 8 +++ + fs/reiserfs/do_balan.c | 17 ++---- + fs/reiserfs/fix_node.c | 19 ++++++-- + fs/reiserfs/inode.c | 73 ++++++++++++++++++--------- + fs/reiserfs/ioctl.c | 6 ++- + fs/reiserfs/journal.c | 109 ++++++++++++++++++++++++++++------------ + fs/reiserfs/lock.c | 89 ++++++++++++++++++++++++++++++++ + fs/reiserfs/namei.c | 13 ++++- + fs/reiserfs/prints.c | 4 -- + fs/reiserfs/resize.c | 2 + + fs/reiserfs/stree.c | 53 ++++++++++++++++--- + fs/reiserfs/super.c | 55 +++++++++++++++++--- + fs/reiserfs/xattr.c | 4 +- + include/linux/reiserfs_fs.h | 68 +++++++++++++++++++++++-- + include/linux/reiserfs_fs_sb.h | 20 +++++++ + 17 files changed, 441 insertions(+), 105 deletions(-) + create mode 100644 fs/reiserfs/lock.c +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Merge made by recursive. + Documentation/ABI/testing/sysfs-bus-pci | 10 ++++ + 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/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/pci/amd_bus.c | 64 +---------------------------- + arch/x86/pci/common.c | 69 +++++++++++++++++++++++++++++++ + drivers/acpi/pci_root.c | 17 +------- + drivers/pci/Makefile | 3 + + drivers/pci/hotplug/acpiphp_glue.c | 28 ++++++++----- + drivers/pci/hotplug/sgi_hotplug.c | 7 +-- + drivers/pci/legacy.c | 34 +++++++++++++++ + drivers/pci/pci-sysfs.c | 37 ++++++++++++++++ + drivers/pci/pci.c | 16 +++++++ + drivers/pci/pci.h | 1 + + drivers/pci/probe.c | 3 +- + drivers/pci/quirks.c | 3 + + drivers/pci/search.c | 31 -------------- + drivers/pci/setup-res.c | 1 + + drivers/pcmcia/yenta_socket.c | 16 ++++---- + include/acpi/acpi_bus.h | 16 +++++++ + include/asm-generic/pci.h | 13 +++++- + include/linux/pci.h | 1 + + 33 files changed, 263 insertions(+), 157 deletions(-) + create mode 100644 drivers/pci/legacy.c +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + drivers/hid/Kconfig | 29 +-- + drivers/hid/Makefile | 6 +- + drivers/hid/hid-a4tech.c | 4 +- + drivers/hid/hid-apple.c | 4 +- + drivers/hid/hid-belkin.c | 4 +- + drivers/hid/hid-cherry.c | 4 +- + drivers/hid/hid-chicony.c | 4 +- + drivers/hid/hid-core.c | 59 +++++-- + drivers/hid/hid-cypress.c | 4 +- + drivers/hid/hid-debug.c | 438 ++++++++++++++++++++++++++++++++++------- + drivers/hid/hid-ezkey.c | 4 +- + drivers/hid/hid-gyration.c | 4 +- + drivers/hid/hid-ids.h | 4 + + drivers/hid/hid-input.c | 13 +-- + drivers/hid/hid-kensington.c | 4 +- + drivers/hid/hid-kye.c | 4 +- + drivers/hid/hid-lg.c | 6 +- + drivers/hid/hid-lgff.c | 6 +- + drivers/hid/hid-microsoft.c | 4 +- + drivers/hid/hid-monterey.c | 4 +- + drivers/hid/hid-ntrig.c | 37 +++- + drivers/hid/hid-petalynx.c | 4 +- + drivers/hid/hid-pl.c | 4 +- + drivers/hid/hid-samsung.c | 43 ++++- + drivers/hid/hid-sjoy.c | 4 +- + drivers/hid/hid-sony.c | 4 +- + drivers/hid/hid-sunplus.c | 4 +- + drivers/hid/hid-tmff.c | 10 +- + drivers/hid/hid-topseed.c | 4 +- + drivers/hid/hid-twinhan.c | 147 ++++++++++++++ + drivers/hid/hid-wacom.c | 4 +- + drivers/hid/hid-zpff.c | 4 +- + drivers/hid/usbhid/hid-core.c | 9 +- + include/linux/hid-debug.h | 48 ++++-- + include/linux/hid.h | 22 +-- + 35 files changed, 739 insertions(+), 218 deletions(-) + create mode 100644 drivers/hid/hid-twinhan.c +Merging quilt/i2c +$ git merge quilt/i2c +Recorded preimage for 'drivers/i2c/chips/tsl2550.c' +Auto-merging drivers/i2c/chips/tsl2550.c +CONFLICT (content): Merge conflict in drivers/i2c/chips/tsl2550.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/i2c/chips/tsl2550.c'. +[master 39ae08d] Merge branch 'quilt/i2c' +$ git diff -M --stat --summary HEAD^.. + drivers/i2c/busses/i2c-taos-evm.c | 45 +++++++++++++++++++----------------- + drivers/i2c/chips/tsl2550.c | 42 ++++++++-------------------------- + include/linux/i2c-id.h | 11 --------- + include/linux/i2c.h | 2 - + 4 files changed, 34 insertions(+), 66 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/hwmon/tmp421 | 36 +++++ + drivers/hwmon/Kconfig | 10 ++ + drivers/hwmon/Makefile | 1 + + drivers/hwmon/hwmon-vid.c | 10 +- + drivers/hwmon/pc87427.c | 6 +- + drivers/hwmon/tmp421.c | 347 ++++++++++++++++++++++++++++++++++++++++++++ + drivers/hwmon/vt1211.c | 6 +- + 7 files changed, 409 insertions(+), 7 deletions(-) + create mode 100644 Documentation/hwmon/tmp421 + create mode 100644 drivers/hwmon/tmp421.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Resolved 'arch/arm/mach-davinci/board-dm646x-evm.c' using previous resolution. +Resolved 'arch/arm/mach-davinci/dm355.c' using previous resolution. +Resolved 'arch/arm/mach-davinci/dm644x.c' using previous resolution. +Resolved 'arch/arm/mach-davinci/dm646x.c' using previous resolution. +Resolved 'arch/arm/mach-davinci/include/mach/dm355.h' using previous resolution. +Resolved 'arch/arm/mach-davinci/include/mach/dm644x.h' using previous resolution. +Resolved 'drivers/media/dvb/b2c2/flexcop-fe-tuner.c' using previous resolution. +Auto-merging Documentation/video4linux/CARDLIST.em28xx +Auto-merging Documentation/video4linux/gspca.txt +Auto-merging arch/arm/mach-davinci/board-dm355-evm.c +Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c +Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c +CONFLICT (content): Merge conflict in arch/arm/mach-davinci/board-dm646x-evm.c +Auto-merging arch/arm/mach-davinci/dm355.c +CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm355.c +Auto-merging arch/arm/mach-davinci/dm644x.c +CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm644x.c +Auto-merging arch/arm/mach-davinci/dm646x.c +CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm646x.c +Auto-merging arch/arm/mach-davinci/include/mach/dm355.h +CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm355.h +Auto-merging arch/arm/mach-davinci/include/mach/dm644x.h +CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm644x.h +Auto-merging arch/arm/mach-davinci/include/mach/dm646x.h +Auto-merging arch/arm/mach-davinci/include/mach/mux.h +Auto-merging drivers/media/dvb/b2c2/flexcop-fe-tuner.c +CONFLICT (content): Merge conflict in drivers/media/dvb/b2c2/flexcop-fe-tuner.c +Auto-merging drivers/media/video/bt8xx/bttv-driver.c +Auto-merging drivers/media/video/cx23885/cx23885-417.c +Auto-merging drivers/media/video/em28xx/em28xx-cards.c +Auto-merging drivers/media/video/em28xx/em28xx-video.c +Auto-merging drivers/media/video/gspca/gspca.c +Auto-merging drivers/media/video/gspca/gspca.h +Auto-merging drivers/media/video/gspca/sonixj.c +Auto-merging drivers/media/video/gspca/sunplus.c +Auto-merging include/linux/videodev2.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6d80a82] Merge commit 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/video4linux/CARDLIST.cx23885 | 2 + + Documentation/video4linux/CARDLIST.em28xx | 2 +- + Documentation/video4linux/gspca.txt | 3 + + arch/arm/mach-davinci/board-dm355-evm.c | 76 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 72 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 122 ++ + arch/arm/mach-davinci/dm355.c | 83 + + arch/arm/mach-davinci/dm644x.c | 56 + + arch/arm/mach-davinci/dm646x.c | 62 + + arch/arm/mach-davinci/include/mach/dm355.h | 2 + + arch/arm/mach-davinci/include/mach/dm644x.h | 2 + + arch/arm/mach-davinci/include/mach/dm646x.h | 24 + + arch/arm/mach-davinci/include/mach/mux.h | 9 + + drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 218 +-- + drivers/media/dvb/dvb-core/dmxdev.c | 231 ++- + drivers/media/dvb/dvb-core/dmxdev.h | 9 +- + drivers/media/dvb/dvb-core/dvb_demux.c | 8 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 2 +- + drivers/media/dvb/frontends/cx24123.c | 2 +- + drivers/media/dvb/frontends/dib0070.c | 2 +- + drivers/media/dvb/frontends/dvb-pll.c | 75 + + drivers/media/dvb/frontends/dvb-pll.h | 4 + + drivers/media/dvb/frontends/lgs8gxx.c | 484 +++++-- + drivers/media/dvb/frontends/lgs8gxx.h | 11 +- + drivers/media/dvb/frontends/lgs8gxx_priv.h | 12 +- + drivers/media/dvb/frontends/mt312.c | 7 +- + drivers/media/dvb/frontends/stv0900_core.c | 8 +- + drivers/media/dvb/frontends/stv0900_sw.c | 2 +- + drivers/media/dvb/frontends/stv6110.c | 48 +- + drivers/media/dvb/frontends/stv6110.h | 2 +- + drivers/media/dvb/frontends/zl10036.c | 2 +- + drivers/media/dvb/ttpci/av7110_v4l.c | 2 +- + drivers/media/radio/radio-cadet.c | 6 +- + drivers/media/radio/radio-si470x.c | 390 +++--- + drivers/media/video/Kconfig | 71 + + drivers/media/video/Makefile | 4 + + drivers/media/video/adv7343.c | 1 - + drivers/media/video/bt8xx/bttv-driver.c | 14 +- + drivers/media/video/cx18/cx18-cards.c | 2 +- + drivers/media/video/cx18/cx18-driver.c | 41 +- + drivers/media/video/cx18/cx18-fileops.c | 2 +- + drivers/media/video/cx18/cx18-ioctl.c | 2 +- + drivers/media/video/cx231xx/cx231xx-video.c | 4 +- + drivers/media/video/cx23885/cimax2.c | 1 + + drivers/media/video/cx23885/cx23885-417.c | 57 +- + drivers/media/video/cx23885/cx23885-cards.c | 77 +- + drivers/media/video/cx23885/cx23885-core.c | 30 +- + drivers/media/video/cx23885/cx23885-dvb.c | 54 +- + drivers/media/video/cx23885/cx23885.h | 14 +- + drivers/media/video/davinci/Makefile | 15 + + 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 | 234 +++ + drivers/media/video/davinci/vpif.h | 632 +++++++ + drivers/media/video/davinci/vpif_display.c | 1679 +++++++++++++++++++ + drivers/media/video/davinci/vpif_display.h | 175 ++ + drivers/media/video/davinci/vpss.c | 301 ++++ + drivers/media/video/em28xx/em28xx-cards.c | 2 + + drivers/media/video/em28xx/em28xx-video.c | 125 +- + drivers/media/video/gspca/gspca.c | 57 +- + drivers/media/video/gspca/gspca.h | 5 +- + drivers/media/video/gspca/pac7311.c | 1 + + drivers/media/video/gspca/sonixj.c | 13 +- + drivers/media/video/gspca/spca508.c | 59 +- + drivers/media/video/gspca/sunplus.c | 10 +- + drivers/media/video/gspca/t613.c | 210 ++-- + drivers/media/video/gspca/vc032x.c | 46 +- + drivers/media/video/ivtv/ivtv-cards.c | 45 + + drivers/media/video/ivtv/ivtv-cards.h | 3 +- + drivers/media/video/ivtv/ivtv-driver.c | 3 +- + drivers/media/video/meye.c | 3 +- + drivers/media/video/pwc/pwc.h | 6 - + drivers/media/video/saa6588.c | 60 +- + drivers/media/video/saa7134/saa7134-core.c | 4 +- + drivers/media/video/saa7134/saa7134-video.c | 4 +- + drivers/media/video/saa7134/saa7134.h | 1 + + drivers/media/video/tvp514x.c | 1030 +++++------- + drivers/media/video/tvp514x_regs.h | 10 - + drivers/media/video/uvc/uvc_ctrl.c | 205 ++-- + drivers/media/video/uvc/uvc_driver.c | 139 +- + drivers/media/video/uvc/uvc_v4l2.c | 14 +- + drivers/media/video/uvc/uvc_video.c | 30 +- + drivers/media/video/uvc/uvcvideo.h | 160 +-- + drivers/media/video/v4l2-ioctl.c | 23 +- + drivers/media/video/zr364xx.c | 1166 +++++++++++--- + include/linux/dvb/dmx.h | 2 + + include/linux/usb/video.h | 164 ++ + include/linux/videodev2.h | 64 +- + 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/tvp514x.h | 4 - + include/media/v4l2-subdev.h | 3 + + 100 files changed, 12492 insertions(+), 2040 deletions(-) + 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_display.c + create mode 100644 drivers/media/video/davinci/vpif_display.h + create mode 100644 drivers/media/video/davinci/vpss.c + create mode 100644 include/linux/usb/video.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 +Merge made by recursive. + fs/quota/dquot.c | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) +Merging kbuild/master +$ git merge kbuild/master +Removing scripts/binoffset.c +Auto-merging scripts/kconfig/mconf.c +Merge made by recursive. + Documentation/dontdiff | 1 - + scripts/.gitignore | 1 - + scripts/binoffset.c | 163 ------------------------------------------- + scripts/extract-ikconfig | 113 ++++++++++++------------------ + 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(+), 344 deletions(-) + delete mode 100644 scripts/binoffset.c +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Auto-merging drivers/ata/libata-eh.c +Merge made by recursive. + drivers/ata/libata-eh.c | 6 ++++-- + drivers/ata/sata_sil.c | 13 +++++++++++++ + 2 files changed, 17 insertions(+), 2 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/core/mad.c | 6 +---- + drivers/infiniband/core/sa_query.c | 7 +---- + drivers/infiniband/core/uverbs_main.c | 4 +-- + drivers/infiniband/hw/ehca/ehca_main.c | 8 +++--- + drivers/infiniband/hw/mthca/mthca_config_reg.h | 2 - + drivers/infiniband/hw/mthca/mthca_reset.c | 1 - + drivers/infiniband/ulp/ipoib/ipoib.h | 1 - + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 1 - + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 1 - + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 7 +----- + drivers/net/mlx4/cq.c | 1 - + drivers/net/mlx4/eq.c | 1 - + drivers/net/mlx4/icm.c | 1 - + drivers/net/mlx4/main.c | 26 +++++++---------------- + drivers/net/mlx4/mcg.c | 1 - + drivers/net/mlx4/mr.c | 1 - + drivers/net/mlx4/pd.c | 1 - + drivers/net/mlx4/profile.c | 2 - + drivers/net/mlx4/qp.c | 2 - + drivers/net/mlx4/reset.c | 1 - + drivers/net/mlx4/srq.c | 2 - + 21 files changed, 17 insertions(+), 60 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merging MAINTAINERS +Auto-merging arch/x86/kernel/reboot.c +Auto-merging include/acpi/acpi_bus.h +Merge made by recursive. + MAINTAINERS | 8 + + arch/ia64/hp/common/sba_iommu.c | 7 +- + arch/x86/kernel/reboot.c | 2 +- + drivers/acpi/Kconfig | 17 ++- + drivers/acpi/Makefile | 2 + + drivers/acpi/acpi_memhotplug.c | 51 ++--- + drivers/acpi/acpi_pad.c | 509 +++++++++++++++++++++++++++++++++++ + drivers/acpi/acpica/Makefile | 2 +- + drivers/acpi/acpica/acconfig.h | 10 +- + drivers/acpi/acpica/acdebug.h | 4 - + drivers/acpi/acpica/acglobal.h | 36 ++-- + drivers/acpi/acpica/achware.h | 8 + + drivers/acpi/acpica/acinterp.h | 4 +- + drivers/acpi/acpica/aclocal.h | 13 + + drivers/acpi/acpica/acmacros.h | 2 + + drivers/acpi/acpica/acnamesp.h | 2 + + drivers/acpi/acpica/acutils.h | 30 ++- + drivers/acpi/acpica/amlcode.h | 1 + + 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/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 | 180 ++++++++----- + drivers/acpi/acpica/nsalloc.c | 88 +++++-- + drivers/acpi/acpica/nsdumpdv.c | 7 +- + drivers/acpi/acpica/nsload.c | 3 +- + drivers/acpi/acpica/nspredef.c | 396 +++++++++++++++------------ + drivers/acpi/acpica/nsutils.c | 5 +- + drivers/acpi/acpica/nsxfeval.c | 23 +- + drivers/acpi/acpica/nsxfname.c | 237 +++++++++++++---- + drivers/acpi/acpica/tbutils.c | 82 +++++- + drivers/acpi/acpica/uteval.c | 375 +++----------------------- + drivers/acpi/acpica/utglobal.c | 11 +- + drivers/acpi/acpica/utids.c | 382 ++++++++++++++++++++++++++ + drivers/acpi/acpica/utmisc.c | 85 ++++++- + drivers/acpi/bus.c | 2 +- + drivers/acpi/container.c | 11 +- + drivers/acpi/dock.c | 8 +- + drivers/acpi/ec.c | 118 +++----- + drivers/acpi/glue.c | 8 +- + drivers/acpi/processor_core.c | 244 ++++++++--------- + drivers/acpi/processor_idle.c | 10 +- + drivers/acpi/processor_thermal.c | 3 +- + drivers/acpi/processor_throttling.c | 3 +- + drivers/acpi/scan.c | 160 +++++++---- + drivers/acpi/sleep.c | 14 - + drivers/char/agp/hp-agp.c | 9 +- + drivers/ide/ide-acpi.c | 5 +- + drivers/pci/hotplug/acpiphp_ibm.c | 12 +- + drivers/platform/x86/sony-laptop.c | 7 +- + drivers/pnp/pnpacpi/core.c | 6 +- + include/acpi/acpi_bus.h | 14 +- + include/acpi/acpixf.h | 10 +- + include/acpi/actbl.h | 19 +- + include/acpi/actbl1.h | 8 +- + include/acpi/actypes.h | 92 ++++---- + 64 files changed, 2514 insertions(+), 1315 deletions(-) + create mode 100644 drivers/acpi/acpi_pad.c + create mode 100644 drivers/acpi/acpica/utids.c +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/ieee1394/raw1394.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/eba.c | 1 + + drivers/mtd/ubi/io.c | 8 ++++---- + drivers/mtd/ubi/scan.c | 35 +++++++++++++++++++++++++++++++---- + drivers/mtd/ubi/scan.h | 2 ++ + drivers/mtd/ubi/ubi.h | 3 ++- + 5 files changed, 40 insertions(+), 9 deletions(-) +Merging kvm/master +$ git merge kvm/master +Removing arch/x86/kvm/kvm_svm.h +Removing virt/kvm/kvm_trace.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 39 ++ + Documentation/kvm/api.txt | 683 ++++++++++++++++++++++++++++++ + arch/ia64/include/asm/kvm_host.h | 4 +- + arch/ia64/kvm/Kconfig | 11 +- + arch/ia64/kvm/kvm-ia64.c | 85 ++--- + arch/ia64/kvm/mmio.c | 6 +- + arch/ia64/kvm/vcpu.c | 10 +- + arch/ia64/kvm/vcpu.h | 13 +- + arch/powerpc/include/asm/kvm_host.h | 4 +- + arch/powerpc/kvm/44x.c | 4 +- + arch/powerpc/kvm/44x_tlb.c | 11 +- + arch/powerpc/kvm/Kconfig | 14 +- + arch/powerpc/kvm/Makefile | 4 +- + arch/powerpc/kvm/booke.c | 2 +- + arch/powerpc/kvm/e500.c | 7 +- + arch/powerpc/kvm/e500_emulate.c | 3 + + arch/powerpc/kvm/e500_tlb.c | 26 +- + arch/powerpc/kvm/e500_tlb.h | 6 +- + arch/powerpc/kvm/emulate.c | 7 +- + arch/powerpc/kvm/powerpc.c | 32 +- + arch/powerpc/kvm/trace.h | 104 +++++ + arch/s390/include/asm/kvm.h | 9 - + arch/s390/include/asm/kvm_host.h | 15 +- + arch/s390/kvm/Kconfig | 9 +- + arch/s390/kvm/gaccess.h | 23 +- + arch/s390/kvm/intercept.c | 18 +- + arch/s390/kvm/interrupt.c | 10 +- + arch/s390/kvm/kvm-s390.c | 78 ++-- + arch/s390/kvm/kvm-s390.h | 32 ++- + arch/s390/kvm/sigp.c | 60 ++- + arch/x86/include/asm/apicdef.h | 2 + + arch/x86/include/asm/kvm.h | 10 + + arch/x86/include/asm/kvm_host.h | 51 ++- + arch/x86/include/asm/msr-index.h | 1 + + arch/x86/include/asm/vmx.h | 8 + + arch/x86/kvm/Kconfig | 21 +- + arch/x86/kvm/Makefile | 35 +- + arch/x86/kvm/i8254.c | 161 +++++--- + arch/x86/kvm/i8254.h | 5 +- + arch/x86/kvm/i8259.c | 58 ++- + arch/x86/kvm/kvm_cache_regs.h | 9 + + arch/x86/kvm/kvm_svm.h | 51 --- + arch/x86/kvm/kvm_timer.h | 2 +- + arch/x86/kvm/lapic.c | 322 +++++++++++---- + arch/x86/kvm/lapic.h | 4 + + arch/x86/kvm/mmu.c | 381 ++++++++++++------ + arch/x86/kvm/mmu.h | 4 +- + arch/x86/kvm/mmutrace.h | 220 ++++++++++ + arch/x86/kvm/paging_tmpl.h | 54 ++- + arch/x86/kvm/svm.c | 271 ++++++++---- + arch/x86/kvm/timer.c | 16 +- + arch/x86/kvm/trace.h | 355 ++++++++++++++++ + arch/x86/kvm/vmx.c | 441 +++++++++++++++----- + arch/x86/kvm/x86.c | 784 +++++++++++++++++++++++++---------- + arch/x86/kvm/x86.h | 4 + + arch/x86/kvm/x86_emulate.c | 257 +++++++++++- + include/linux/kvm.h | 127 ++++-- + include/linux/kvm_host.h | 119 ++++-- + include/trace/events/kvm.h | 151 +++++++ + mm/hugetlb.c | 1 + + virt/kvm/Kconfig | 14 + + virt/kvm/coalesced_mmio.c | 74 ++-- + virt/kvm/coalesced_mmio.h | 1 + + virt/kvm/eventfd.c | 578 ++++++++++++++++++++++++++ + virt/kvm/ioapic.c | 84 +++-- + virt/kvm/iodev.h | 55 ++-- + virt/kvm/irq_comm.c | 51 ++- + virt/kvm/kvm_main.c | 292 +++++++++---- + virt/kvm/kvm_trace.c | 285 ------------- + 69 files changed, 5013 insertions(+), 1675 deletions(-) + create mode 100644 Documentation/kvm/api.txt + create mode 100644 arch/powerpc/kvm/trace.h + delete mode 100644 arch/x86/kvm/kvm_svm.h + create mode 100644 arch/x86/kvm/mmutrace.h + create mode 100644 arch/x86/kvm/trace.h + create mode 100644 include/trace/events/kvm.h + create mode 100644 virt/kvm/Kconfig + create mode 100644 virt/kvm/eventfd.c + delete mode 100644 virt/kvm/kvm_trace.c +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Merge made by recursive. + drivers/scsi/bnx2i/bnx2i_init.c | 93 +++++++++++++------------------- + drivers/scsi/constants.c | 95 ++++++++++++++++++++++++++------- + drivers/scsi/device_handler/scsi_dh.c | 23 ++++++--- + drivers/scsi/scsi_lib.c | 1 + + include/scsi/scsi_device.h | 2 + + 5 files changed, 133 insertions(+), 81 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Auto-merging drivers/dma/Kconfig +Auto-merging drivers/dma/Makefile +Merge made by recursive. + arch/arm/mach-at91/include/mach/at_hdmac.h | 102 +++ + crypto/async_tx/async_xor.c | 2 +- + drivers/dma/Kconfig | 12 +- + drivers/dma/Makefile | 1 + + drivers/dma/at_hdmac.c | 1213 ++++++++++++++++++++++++++++ + drivers/dma/at_hdmac_regs.h | 353 ++++++++ + drivers/dma/dmatest.c | 21 +- + drivers/dma/fsldma.c | 17 +- + drivers/dma/fsldma.h | 1 + + drivers/dma/mv_xor.c | 2 +- + 10 files changed, 1711 insertions(+), 13 deletions(-) + create mode 100644 arch/arm/mach-at91/include/mach/at_hdmac.h + create mode 100644 drivers/dma/at_hdmac.c + create mode 100644 drivers/dma/at_hdmac_regs.h +Merging udf/for_next +$ git merge udf/for_next +Merge made by recursive. + fs/udf/super.c | 12 ++++++++++++ + 1 files changed, 12 insertions(+), 0 deletions(-) +Merging net/master +$ git merge net/master +Resolved 'drivers/net/wireless/iwlwifi/iwl-3945.h' using previous resolution. +Resolved 'drivers/net/wireless/iwlwifi/iwl-tx.c' using previous resolution. +Resolved 'drivers/net/wireless/iwlwifi/iwl3945-base.c' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Removing drivers/isdn/hisax/isdnhdlc.h +Auto-merging drivers/misc/sgi-xp/xpnet.c +Auto-merging drivers/net/a2065.c +Auto-merging drivers/net/at1700.c +Auto-merging drivers/net/bmac.c +Auto-merging drivers/net/bnx2x_main.c +Auto-merging drivers/net/eepro.c +Auto-merging drivers/net/epic100.c +Auto-merging drivers/net/fealnx.c +Auto-merging drivers/net/fec.c +Auto-merging drivers/net/hamachi.c +Auto-merging drivers/net/hamradio/baycom_epp.c +Auto-merging drivers/net/ixgbe/ixgbe_main.c +Auto-merging drivers/net/natsemi.c +Auto-merging drivers/net/netxen/netxen_nic_init.c +Auto-merging drivers/net/pci-skeleton.c +Auto-merging drivers/net/pcmcia/nmclan_cs.c +Auto-merging drivers/net/pcnet32.c +Auto-merging drivers/net/starfire.c +Auto-merging drivers/net/sundance.c +Auto-merging drivers/net/tokenring/ibmtr.c +Auto-merging drivers/net/tulip/de2104x.c +Auto-merging drivers/net/tulip/tulip_core.c +Auto-merging drivers/net/tulip/winbond-840.c +Auto-merging drivers/net/wan/sbni.c +Auto-merging drivers/net/wireless/airo.c +Auto-merging drivers/net/wireless/ath/ath9k/eeprom.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.h +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-3945.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-dev.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-tx.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-tx.c +Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl3945-base.c +Auto-merging drivers/net/wireless/iwmc3200wifi/netdev.c +Removing drivers/net/wireless/p54/p54common.c +Removing drivers/net/wireless/p54/p54common.h +Auto-merging drivers/net/wireless/ray_cs.c +Removing drivers/net/wireless/rt2x00/rt2x00rfkill.c +Auto-merging drivers/net/wireless/wavelan_cs.c +Removing drivers/net/wireless/wl12xx/acx.c +Removing drivers/net/wireless/wl12xx/cmd.c +Removing drivers/net/wireless/wl12xx/wl12xx.h +Auto-merging drivers/net/yellowfin.c +Auto-merging drivers/s390/net/netiucv.c +Auto-merging drivers/staging/stlc45xx/stlc45xx.c +Removing include/net/ieee802154/nl802154.h +Auto-merging net/mac80211/mlme.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ccdaddd] Merge commit 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/connector/Makefile | 5 + + Documentation/connector/cn_test.c | 33 +- + Documentation/connector/connector.txt | 119 +- + Documentation/connector/ucon.c | 62 +- + Documentation/kernel-parameters.txt | 5 + + Documentation/networking/00-INDEX | 2 + + Documentation/networking/ieee802154.txt | 2 +- + MAINTAINERS | 11 +- + arch/ia64/hp/sim/simeth.c | 2 +- + arch/mips/kernel/scall64-n32.S | 2 +- + arch/mips/kernel/scall64-o32.S | 4 +- + arch/sparc/kernel/sys32.S | 2 +- + arch/um/drivers/net_kern.c | 2 +- + arch/xtensa/platforms/iss/network.c | 2 +- + drivers/atm/solos-pci.c | 2 +- + drivers/connector/cn_proc.c | 3 +- + drivers/connector/cn_queue.c | 7 +- + drivers/connector/connector.c | 6 +- + drivers/ieee802154/fakehard.c | 130 +- + drivers/isdn/Kconfig | 6 +- + drivers/isdn/act2000/capi.c | 3 +- + drivers/isdn/act2000/module.c | 31 +- + drivers/isdn/hardware/eicon/message.c | 4 +- + drivers/isdn/hardware/eicon/os_4bri.c | 3 +- + drivers/isdn/hardware/mISDN/Kconfig | 51 + + drivers/isdn/hardware/mISDN/Makefile | 8 + + drivers/isdn/hardware/mISDN/avmfritz.c | 1152 +++++++ + drivers/isdn/hardware/mISDN/hfcmulti.c | 23 +- + drivers/isdn/hardware/mISDN/hfcpci.c | 16 +- + drivers/isdn/hardware/mISDN/hfcsusb.c | 16 +- + drivers/isdn/hardware/mISDN/iohelper.h | 109 + + drivers/isdn/hardware/mISDN/ipac.h | 405 +++ + drivers/isdn/hardware/mISDN/isar.h | 269 ++ + drivers/isdn/hardware/mISDN/mISDNinfineon.c | 1178 +++++++ + drivers/isdn/hardware/mISDN/mISDNipac.c | 1655 ++++++++++ + drivers/isdn/hardware/mISDN/mISDNisar.c | 1726 ++++++++++ + drivers/isdn/hardware/mISDN/netjet.c | 1156 +++++++ + drivers/isdn/hardware/mISDN/netjet.h | 58 + + drivers/isdn/hardware/mISDN/speedfax.c | 526 +++ + drivers/isdn/hardware/mISDN/w6692.c | 1440 ++++++++ + drivers/isdn/hardware/mISDN/w6692.h | 190 ++ + drivers/isdn/hisax/Kconfig | 6 +- + drivers/isdn/hisax/Makefile | 4 - + drivers/isdn/hisax/amd7930_fn.c | 2 - + drivers/isdn/hisax/callc.c | 4 +- + drivers/isdn/hisax/hfc_pci.c | 2 - + drivers/isdn/hisax/hfc_sx.c | 2 - + drivers/isdn/hisax/icc.c | 2 - + drivers/isdn/hisax/isac.c | 2 - + drivers/isdn/hisax/isdnhdlc.h | 70 - + drivers/isdn/hisax/isdnl1.c | 12 +- + drivers/isdn/hisax/isdnl2.c | 4 +- + drivers/isdn/hisax/isdnl3.c | 4 +- + drivers/isdn/hisax/l3_1tr6.c | 20 +- + drivers/isdn/hisax/l3dss1.c | 26 +- + drivers/isdn/hisax/l3ni1.c | 26 +- + drivers/isdn/hisax/q931.c | 24 +- + drivers/isdn/hisax/st5481.h | 2 +- + drivers/isdn/hisax/st5481_b.c | 5 +- + drivers/isdn/hisax/st5481_d.c | 2 +- + drivers/isdn/hisax/st5481_usb.c | 11 +- + drivers/isdn/hisax/tei.c | 4 +- + drivers/isdn/hisax/w6692.c | 2 - + drivers/isdn/hysdn/hysdn_net.c | 2 +- + drivers/isdn/i4l/Kconfig | 11 + + drivers/isdn/i4l/Makefile | 1 + + drivers/isdn/i4l/isdn_net.c | 16 +- + drivers/isdn/i4l/isdn_ppp.c | 6 +- + drivers/isdn/{hisax => i4l}/isdnhdlc.c | 429 ++-- + drivers/isdn/mISDN/hwchannel.c | 15 +- + drivers/isdn/mISDN/layer2.c | 2 - + drivers/media/dvb/dvb-core/dvb_net.c | 2 +- + drivers/message/fusion/mptlan.c | 2 +- + drivers/misc/sgi-xp/xpnet.c | 4 +- + drivers/net/3c501.c | 2 +- + drivers/net/3c505.c | 2 +- + drivers/net/3c507.c | 2 +- + drivers/net/3c509.c | 2 +- + drivers/net/3c515.c | 4 +- + drivers/net/3c523.c | 2 +- + drivers/net/3c527.c | 4 +- + drivers/net/3c59x.c | 4 +- + drivers/net/7990.c | 2 +- + drivers/net/8139cp.c | 2 +- + drivers/net/8139too.c | 4 +- + drivers/net/82596.c | 4 +- + drivers/net/a2065.c | 4 +- + drivers/net/amd8111e.c | 2 +- + drivers/net/appletalk/cops.c | 2 +- + drivers/net/appletalk/ipddp.c | 4 +- + drivers/net/appletalk/ltpc.c | 2 +- + drivers/net/ariadne.c | 4 +- + drivers/net/arm/am79c961a.c | 2 +- + drivers/net/arm/at91_ether.c | 2 +- + drivers/net/arm/ether1.c | 2 +- + drivers/net/arm/ether3.c | 4 +- + drivers/net/at1700.c | 2 +- + drivers/net/atarilance.c | 4 +- + drivers/net/atp.c | 2 +- + drivers/net/au1000_eth.c | 2 +- + drivers/net/b44.c | 8 +- + drivers/net/benet/Kconfig | 1 - + drivers/net/benet/be.h | 11 +- + drivers/net/benet/be_ethtool.c | 9 +- + drivers/net/benet/be_main.c | 104 +- + drivers/net/bfin_mac.c | 2 +- + drivers/net/bmac.c | 2 +- + drivers/net/bnx2.c | 19 +- + drivers/net/bnx2x.h | 3 +- + drivers/net/bnx2x_hsi.h | 40 +- + drivers/net/bnx2x_link.c | 1100 ++++++- + drivers/net/bnx2x_link.h | 14 +- + drivers/net/bnx2x_main.c | 235 +- + drivers/net/bnx2x_reg.h | 28 +- + drivers/net/bonding/bond_3ad.c | 5 +- + drivers/net/bonding/bond_alb.c | 2 +- + drivers/net/bonding/bond_main.c | 8 +- + drivers/net/can/Kconfig | 7 +- + drivers/net/can/sja1000/ems_pci.c | 152 +- + drivers/net/can/sja1000/sja1000.c | 2 +- + drivers/net/cassini.c | 4 +- + drivers/net/cris/eth_v10.c | 2 +- + drivers/net/cs89x0.c | 4 +- + drivers/net/cxgb3/adapter.h | 10 + + drivers/net/cxgb3/ael1002.c | 1193 +------- + drivers/net/cxgb3/aq100x.c | 7 +- + drivers/net/cxgb3/common.h | 10 + + drivers/net/cxgb3/cxgb3_main.c | 99 +- + drivers/net/cxgb3/t3_hw.c | 2 + + drivers/net/cxgb3/xgmac.c | 11 +- + drivers/net/de600.c | 2 +- + drivers/net/de620.c | 2 +- + drivers/net/declance.c | 4 +- + drivers/net/defxx.c | 6 +- + drivers/net/depca.c | 2 +- + drivers/net/dm9000.c | 127 +- + drivers/net/dm9000.h | 18 + + drivers/net/dnet.c | 2 +- + drivers/net/dummy.c | 2 +- + drivers/net/e100.c | 2 +- + drivers/net/e1000/e1000.h | 7 +- + drivers/net/e1000/e1000_ethtool.c | 51 +- + drivers/net/e1000/e1000_hw.c | 2 +- + drivers/net/e1000/e1000_hw.h | 3 - + drivers/net/e1000/e1000_main.c | 483 +++- + drivers/net/eepro.c | 4 +- + drivers/net/eexpress.c | 4 +- + drivers/net/enc28j60.c | 2 +- + drivers/net/epic100.c | 4 +- + drivers/net/eql.c | 2 +- + drivers/net/eth16i.c | 4 +- + drivers/net/ethoc.c | 2 +- + drivers/net/ewrk3.c | 2 +- + drivers/net/fealnx.c | 2 +- + drivers/net/fec.c | 2 +- + drivers/net/fs_enet/mii-fec.c | 37 +- + drivers/net/gianfar.c | 1 - + drivers/net/hamachi.c | 2 +- + drivers/net/hamradio/6pack.c | 2 +- + drivers/net/hamradio/baycom_epp.c | 6 +- + drivers/net/hamradio/bpqether.c | 2 +- + drivers/net/hamradio/dmascc.c | 2 +- + drivers/net/hamradio/hdlcdrv.c | 4 +- + drivers/net/hamradio/mkiss.c | 2 +- + drivers/net/hamradio/scc.c | 6 +- + drivers/net/hamradio/yam.c | 2 +- + drivers/net/hp100.c | 6 +- + drivers/net/ibm_newemac/core.c | 2 +- + drivers/net/ibmveth.c | 2 +- + drivers/net/ifb.c | 2 +- + drivers/net/igb/e1000_82575.c | 193 +- + drivers/net/igb/e1000_82575.h | 6 +- + drivers/net/igb/e1000_defines.h | 8 + + drivers/net/igb/e1000_hw.h | 18 +- + drivers/net/igb/e1000_mac.c | 175 +- + drivers/net/igb/e1000_mac.h | 3 + + drivers/net/igb/e1000_phy.c | 4 +- + drivers/net/igb/e1000_regs.h | 1 + + drivers/net/igb/igb_ethtool.c | 65 +- + drivers/net/igb/igb_main.c | 121 +- + drivers/net/igbvf/netdev.c | 5 +- + drivers/net/ioc3-eth.c | 2 +- + drivers/net/irda/ali-ircc.c | 12 +- + drivers/net/irda/au1k_ir.c | 4 +- + drivers/net/irda/donauboe.c | 8 +- + drivers/net/irda/irda-usb.c | 2 +- + drivers/net/irda/nsc-ircc.c | 10 +- + drivers/net/irda/pxaficp_ir.c | 4 +- + drivers/net/irda/sa1100_ir.c | 4 +- + drivers/net/irda/sir_dev.c | 6 +- + drivers/net/irda/smsc-ircc2.c | 16 +- + drivers/net/irda/stir4200.c | 2 +- + drivers/net/irda/via-ircc.c | 12 +- + drivers/net/irda/vlsi_ir.c | 6 +- + drivers/net/irda/w83977af_ir.c | 4 +- + drivers/net/isa-skeleton.c | 2 +- + drivers/net/iseries_veth.c | 4 +- + drivers/net/ixgb/ixgb_main.c | 2 +- + drivers/net/ixgbe/ixgbe.h | 4 - + drivers/net/ixgbe/ixgbe_82598.c | 1 + + drivers/net/ixgbe/ixgbe_ethtool.c | 33 +- + drivers/net/ixgbe/ixgbe_main.c | 12 +- + drivers/net/ixgbe/ixgbe_type.h | 32 +- + drivers/net/ixp2000/ixpdev.c | 4 +- + drivers/net/jazzsonic.c | 4 +- + drivers/net/jme.c | 189 +- + drivers/net/jme.h | 21 +- + drivers/net/lance.c | 2 +- + drivers/net/lib82596.c | 4 +- + drivers/net/lib8390.c | 2 +- + drivers/net/ll_temac_main.c | 2 +- + drivers/net/loopback.c | 2 +- + drivers/net/lp486e.c | 4 +- + drivers/net/mac89x0.c | 2 +- + drivers/net/macb.c | 2 +- + drivers/net/mace.c | 2 +- + drivers/net/meth.c | 4 +- + drivers/net/mipsnet.c | 2 +- + drivers/net/mlx4/en_tx.c | 2 +- + drivers/net/myri10ge/myri10ge.c | 10 +- + drivers/net/myri_sbus.c | 2 +- + drivers/net/natsemi.c | 2 +- + drivers/net/netx-eth.c | 2 +- + drivers/net/netxen/netxen_nic.h | 177 +- + drivers/net/netxen/netxen_nic_ctx.c | 6 +- + drivers/net/netxen/netxen_nic_ethtool.c | 81 +- + drivers/net/netxen/netxen_nic_hdr.h | 2 +- + drivers/net/netxen/netxen_nic_hw.c | 28 +- + drivers/net/netxen/netxen_nic_init.c | 130 +- + drivers/net/netxen/netxen_nic_main.c | 581 +++-- + drivers/net/ni5010.c | 2 +- + drivers/net/ni52.c | 4 +- + drivers/net/ni65.c | 2 +- + drivers/net/pci-skeleton.c | 2 +- + drivers/net/pcmcia/3c574_cs.c | 2 +- + drivers/net/pcmcia/3c589_cs.c | 2 +- + drivers/net/pcmcia/axnet_cs.c | 2 +- + drivers/net/pcmcia/fmvj18x_cs.c | 4 +- + drivers/net/pcmcia/nmclan_cs.c | 2 +- + drivers/net/pcmcia/smc91c92_cs.c | 6 +- + drivers/net/pcmcia/xirc2ps_cs.c | 4 +- + drivers/net/pcnet32.c | 2 +- + drivers/net/phy/Kconfig | 6 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/bcm63xx.c | 132 + + drivers/net/plip.c | 2 +- + drivers/net/ppp_generic.c | 4 +- + drivers/net/r6040.c | 4 +- + drivers/net/rionet.c | 7 +- + drivers/net/rrunner.c | 2 +- + drivers/net/s2io.c | 10 +- + drivers/net/sb1000.c | 2 +- + drivers/net/sb1250-mac.c | 4 +- + drivers/net/seeq8005.c | 4 +- + drivers/net/sgiseeq.c | 6 +- + drivers/net/sh_eth.c | 2 +- + drivers/net/sis900.c | 2 +- + drivers/net/skfp/skfddi.c | 4 +- + drivers/net/sky2.c | 2 +- + drivers/net/slip.c | 6 +- + drivers/net/smc911x.c | 6 +- + drivers/net/smc9194.c | 8 +- + drivers/net/smc91x.c | 4 +- + drivers/net/sonic.c | 4 +- + drivers/net/starfire.c | 2 +- + drivers/net/sun3_82586.c | 4 +- + drivers/net/sun3lance.c | 4 +- + drivers/net/sunbmac.c | 2 +- + drivers/net/sundance.c | 2 +- + drivers/net/sunhme.c | 2 +- + drivers/net/sunlance.c | 2 +- + drivers/net/sunqe.c | 2 +- + drivers/net/tc35815.c | 2 +- + drivers/net/tlan.c | 6 +- + drivers/net/tokenring/3c359.c | 2 +- + drivers/net/tokenring/ibmtr.c | 2 +- + drivers/net/tokenring/lanstreamer.c | 2 +- + drivers/net/tokenring/olympic.c | 2 +- + drivers/net/tokenring/smctr.c | 2 +- + drivers/net/tokenring/tms380tr.c | 2 +- + drivers/net/tulip/de2104x.c | 2 +- + drivers/net/tulip/dmfe.c | 4 +- + drivers/net/tulip/tulip_core.c | 2 +- + drivers/net/tulip/uli526x.c | 4 +- + drivers/net/tulip/winbond-840.c | 2 +- + drivers/net/tulip/xircom_cb.c | 2 +- + drivers/net/tun.c | 18 +- + drivers/net/typhoon.c | 2 +- + drivers/net/ucc_geth.c | 42 +- + drivers/net/ucc_geth.h | 2 + + drivers/net/usb/catc.c | 2 +- + drivers/net/usb/hso.c | 2 +- + drivers/net/usb/kaweth.c | 4 +- + drivers/net/usb/pegasus.c | 2 +- + drivers/net/usb/rtl8150.c | 2 +- + drivers/net/usb/usbnet.c | 14 + + drivers/net/veth.c | 7 +- + drivers/net/via-rhine.c | 6 +- + drivers/net/via-velocity.c | 3431 ++++++++++---------- + drivers/net/via-velocity.h | 6 +- + drivers/net/virtio_net.c | 3 +- + drivers/net/vxge/vxge-config.c | 10 - + drivers/net/vxge/vxge-config.h | 10 +- + drivers/net/vxge/vxge-main.c | 100 +- + drivers/net/vxge/vxge-main.h | 4 +- + drivers/net/vxge/vxge-reg.h | 9 +- + drivers/net/vxge/vxge-traffic.h | 2 - + drivers/net/vxge/vxge-version.h | 2 +- + drivers/net/wan/cycx_x25.c | 2 +- + drivers/net/wan/dlci.c | 4 +- + drivers/net/wan/dscc4.c | 2 +- + drivers/net/wan/farsync.c | 27 +- + drivers/net/wan/hdlc_fr.c | 6 +- + drivers/net/wan/lmc/lmc_main.c | 2 +- + drivers/net/wan/sbni.c | 4 +- + drivers/net/wan/wanxl.c | 2 +- + drivers/net/wan/x25_asy.c | 10 +- + drivers/net/wimax/i2400m/sdio.c | 12 +- + drivers/net/wireless/Kconfig | 6 +- + drivers/net/wireless/adm8211.c | 20 +- + drivers/net/wireless/airo.c | 14 +- + drivers/net/wireless/arlan-main.c | 4 +- + drivers/net/wireless/at76c50x-usb.c | 3 +- + drivers/net/wireless/ath/ar9170/ar9170.h | 52 + + drivers/net/wireless/ath/ar9170/main.c | 615 ++++- + drivers/net/wireless/ath/ar9170/usb.c | 2 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 21 +- + drivers/net/wireless/ath/ath5k/attach.c | 3 + + drivers/net/wireless/ath/ath5k/base.c | 130 +- + drivers/net/wireless/ath/ath5k/base.h | 10 +- + drivers/net/wireless/ath/ath5k/debug.c | 8 +- + drivers/net/wireless/ath/ath5k/phy.c | 7 +- + drivers/net/wireless/ath/ath5k/qcu.c | 1 - + drivers/net/wireless/ath/ath5k/reg.h | 12 +- + drivers/net/wireless/ath/ath5k/reset.c | 1 - + drivers/net/wireless/ath/ath9k/ath9k.h | 50 +- + drivers/net/wireless/ath/ath9k/beacon.c | 15 +- + drivers/net/wireless/ath/ath9k/calib.c | 13 +- + drivers/net/wireless/ath/ath9k/calib.h | 4 +- + drivers/net/wireless/ath/ath9k/debug.c | 10 +- + drivers/net/wireless/ath/ath9k/eeprom.c | 22 +- + drivers/net/wireless/ath/ath9k/hw.c | 72 +- + drivers/net/wireless/ath/ath9k/hw.h | 18 +- + drivers/net/wireless/ath/ath9k/initvals.h | 47 +- + drivers/net/wireless/ath/ath9k/mac.c | 30 +- + drivers/net/wireless/ath/ath9k/main.c | 97 +- + drivers/net/wireless/ath/ath9k/rc.c | 609 ++--- + drivers/net/wireless/ath/ath9k/rc.h | 29 +- + drivers/net/wireless/ath/ath9k/recv.c | 92 +- + drivers/net/wireless/ath/ath9k/reg.h | 93 + + drivers/net/wireless/ath/ath9k/virtual.c | 17 + + drivers/net/wireless/ath/ath9k/xmit.c | 107 +- + drivers/net/wireless/ath/regd.c | 2 - + drivers/net/wireless/atmel.c | 6 +- + drivers/net/wireless/b43/main.c | 4 +- + drivers/net/wireless/b43/xmit.c | 3 +- + drivers/net/wireless/b43legacy/xmit.c | 3 +- + drivers/net/wireless/hostap/hostap_80211_tx.c | 42 +- + drivers/net/wireless/hostap/hostap_cs.c | 3 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 13 +- + drivers/net/wireless/ipw2x00/libipw_tx.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 7 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 24 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 58 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 3 - + drivers/net/wireless/iwlwifi/iwl-4965.c | 69 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 89 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 5 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 16 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 239 +- + drivers/net/wireless/iwlwifi/iwl-calib.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 487 ++-- + drivers/net/wireless/iwlwifi/iwl-core.h | 21 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 22 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 78 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 36 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-helpers.h | 21 + + drivers/net/wireless/iwlwifi/iwl-led.c | 34 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 5 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 13 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 31 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 19 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 22 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 177 +- + drivers/net/wireless/iwmc3200wifi/cfg80211.c | 373 +++- + drivers/net/wireless/iwmc3200wifi/commands.c | 148 +- + drivers/net/wireless/iwmc3200wifi/commands.h | 7 +- + drivers/net/wireless/iwmc3200wifi/eeprom.c | 4 - + drivers/net/wireless/iwmc3200wifi/fw.c | 21 +- + drivers/net/wireless/iwmc3200wifi/hal.c | 16 +- + drivers/net/wireless/iwmc3200wifi/iwm.h | 37 +- + drivers/net/wireless/iwmc3200wifi/lmac.h | 4 + + drivers/net/wireless/iwmc3200wifi/main.c | 45 +- + drivers/net/wireless/iwmc3200wifi/netdev.c | 27 +- + drivers/net/wireless/iwmc3200wifi/rx.c | 132 +- + drivers/net/wireless/iwmc3200wifi/sdio.c | 10 +- + drivers/net/wireless/iwmc3200wifi/sdio.h | 3 - + drivers/net/wireless/iwmc3200wifi/umac.h | 8 + + drivers/net/wireless/iwmc3200wifi/wext.c | 618 +---- + drivers/net/wireless/libertas/assoc.c | 16 +- + drivers/net/wireless/libertas/dev.h | 1 - + drivers/net/wireless/libertas/if_cs.c | 3 - + drivers/net/wireless/libertas/if_sdio.c | 5 +- + drivers/net/wireless/libertas/if_spi.c | 8 +- + drivers/net/wireless/libertas/if_usb.c | 3 +- + drivers/net/wireless/libertas/wext.c | 2 +- + drivers/net/wireless/libertas_tf/main.c | 3 +- + drivers/net/wireless/mac80211_hwsim.c | 91 +- + drivers/net/wireless/mwl8k.c | 9 +- + drivers/net/wireless/netwave_cs.c | 2 +- + drivers/net/wireless/orinoco/Kconfig | 1 + + drivers/net/wireless/orinoco/Makefile | 2 +- + drivers/net/wireless/orinoco/airport.c | 98 +- + drivers/net/wireless/orinoco/cfg.c | 162 + + drivers/net/wireless/orinoco/cfg.h | 15 + + drivers/net/wireless/orinoco/fw.c | 41 +- + drivers/net/wireless/orinoco/hermes.c | 2 +- + drivers/net/wireless/orinoco/hermes.h | 2 +- + drivers/net/wireless/orinoco/hermes_dld.c | 50 +- + drivers/net/wireless/orinoco/hw.c | 668 ++++- + drivers/net/wireless/orinoco/hw.h | 11 +- + drivers/net/wireless/orinoco/main.c | 1132 +++---- + drivers/net/wireless/orinoco/main.h | 3 +- + drivers/net/wireless/orinoco/orinoco.h | 49 +- + drivers/net/wireless/orinoco/orinoco_cs.c | 96 +- + drivers/net/wireless/orinoco/orinoco_nortel.c | 38 +- + drivers/net/wireless/orinoco/orinoco_pci.c | 38 +- + drivers/net/wireless/orinoco/orinoco_pci.h | 57 +- + drivers/net/wireless/orinoco/orinoco_plx.c | 38 +- + drivers/net/wireless/orinoco/orinoco_tmd.c | 38 +- + drivers/net/wireless/orinoco/scan.c | 291 +- + drivers/net/wireless/orinoco/scan.h | 21 +- + drivers/net/wireless/orinoco/spectrum_cs.c | 96 +- + drivers/net/wireless/orinoco/wext.c | 878 +----- + drivers/net/wireless/p54/Makefile | 3 + + drivers/net/wireless/p54/eeprom.c | 753 +++++ + drivers/net/wireless/p54/eeprom.h | 226 ++ + drivers/net/wireless/p54/fwio.c | 715 ++++ + drivers/net/wireless/p54/led.c | 163 + + drivers/net/wireless/p54/lmac.h | 558 ++++ + drivers/net/wireless/p54/main.c | 637 ++++ + drivers/net/wireless/p54/p54.h | 151 +- + drivers/net/wireless/p54/p54common.c | 2688 --------------- + drivers/net/wireless/p54/p54common.h | 644 ---- + drivers/net/wireless/p54/p54pci.c | 9 +- + drivers/net/wireless/p54/p54spi.c | 50 +- + drivers/net/wireless/p54/p54usb.c | 42 +- + drivers/net/wireless/p54/txrx.c | 860 +++++ + drivers/net/wireless/prism54/islpci_eth.c | 2 +- + drivers/net/wireless/prism54/islpci_hotplug.c | 4 +- + drivers/net/wireless/ray_cs.c | 6 +- + drivers/net/wireless/rndis_wlan.c | 298 +- + drivers/net/wireless/rt2x00/Kconfig | 8 - + drivers/net/wireless/rt2x00/Makefile | 1 - + drivers/net/wireless/rt2x00/rt2400pci.c | 8 +- + drivers/net/wireless/rt2x00/rt2400pci.h | 2 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 8 +- + drivers/net/wireless/rt2x00/rt2500pci.h | 2 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 8 +- + drivers/net/wireless/rt2x00/rt2500usb.h | 2 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 16 +- + drivers/net/wireless/rt2x00/rt2800usb.h | 2 +- + drivers/net/wireless/rt2x00/rt2x00.h | 20 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00crypto.c | 8 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 8 +- + drivers/net/wireless/rt2x00/rt2x00lib.h | 21 +- + drivers/net/wireless/rt2x00/rt2x00link.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 26 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 10 +- + drivers/net/wireless/rt2x00/rt2x00reg.h | 4 +- + drivers/net/wireless/rt2x00/rt2x00rfkill.c | 127 - + drivers/net/wireless/rt2x00/rt61pci.c | 10 +- + drivers/net/wireless/rt2x00/rt61pci.h | 2 +- + drivers/net/wireless/rt2x00/rt73usb.c | 8 +- + drivers/net/wireless/rt2x00/rt73usb.h | 4 +- + drivers/net/wireless/rtl818x/rtl8180_dev.c | 5 +- + drivers/net/wireless/rtl818x/rtl8187_dev.c | 3 +- + drivers/net/wireless/strip.c | 2 +- + drivers/net/wireless/wavelan.c | 2 +- + drivers/net/wireless/wavelan_cs.c | 4 +- + drivers/net/wireless/wl12xx/Kconfig | 17 +- + drivers/net/wireless/wl12xx/Makefile | 9 +- + drivers/net/wireless/wl12xx/acx.c | 689 ---- + drivers/net/wireless/wl12xx/cmd.c | 353 -- + drivers/net/wireless/wl12xx/reg.h | 1 - + drivers/net/wireless/wl12xx/wl1251.h | 479 +++- + drivers/net/wireless/wl12xx/wl1251_acx.c | 840 +++++ + .../net/wireless/wl12xx/{acx.h => wl1251_acx.h} | 199 +- + .../net/wireless/wl12xx/{boot.c => wl1251_boot.c} | 114 +- + .../net/wireless/wl12xx/{boot.h => wl1251_boot.h} | 12 +- + drivers/net/wireless/wl12xx/wl1251_cmd.c | 428 +++ + .../net/wireless/wl12xx/{cmd.h => wl1251_cmd.h} | 194 +- + .../wl12xx/{debugfs.c => wl1251_debugfs.c} | 60 +- + .../wl12xx/{debugfs.h => wl1251_debugfs.h} | 16 +- + .../wireless/wl12xx/{event.c => wl1251_event.c} | 54 +- + .../wireless/wl12xx/{event.h => wl1251_event.h} | 12 +- + .../net/wireless/wl12xx/{init.c => wl1251_init.c} | 78 +- + .../net/wireless/wl12xx/{init.h => wl1251_init.h} | 27 +- + .../net/wireless/wl12xx/{main.c => wl1251_main.c} | 659 ++-- + .../wl12xx/{debugfs.h => wl1251_netlink.h} | 15 +- + .../net/wireless/wl12xx/{wl1251.c => wl1251_ops.c} | 299 +- + drivers/net/wireless/wl12xx/wl1251_ops.h | 165 + + drivers/net/wireless/wl12xx/{ps.c => wl1251_ps.c} | 64 +- + drivers/net/wireless/wl12xx/{ps.h => wl1251_ps.h} | 18 +- + drivers/net/wireless/wl12xx/{rx.c => wl1251_rx.c} | 90 +- + drivers/net/wireless/wl12xx/{rx.h => wl1251_rx.h} | 24 +- + .../net/wireless/wl12xx/{spi.c => wl1251_spi.c} | 179 +- + .../net/wireless/wl12xx/{spi.h => wl1251_spi.h} | 62 +- + drivers/net/wireless/wl12xx/{tx.c => wl1251_tx.c} | 124 +- + drivers/net/wireless/wl12xx/{tx.h => wl1251_tx.h} | 21 +- + drivers/net/wireless/wl12xx/wl12xx.h | 409 --- + drivers/net/wireless/wl3501_cs.c | 3 +- + drivers/net/wireless/zd1201.c | 4 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 3 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 74 +- + drivers/net/xen-netfront.c | 4 +- + drivers/net/xtsonic.c | 2 +- + drivers/net/yellowfin.c | 4 +- + drivers/net/znet.c | 4 +- + drivers/s390/net/claw.c | 2 + + drivers/s390/net/ctcm_main.c | 10 +- + drivers/s390/net/lcs.c | 8 +- + drivers/s390/net/netiucv.c | 6 +- + drivers/s390/net/qeth_l2_main.c | 1 + + drivers/s390/net/qeth_l3_main.c | 1 + + drivers/staging/agnx/xmit.c | 3 +- + drivers/staging/at76_usb/at76_usb.c | 8 +- + drivers/staging/dst/dcore.c | 3 +- + drivers/staging/epl/VirtualEthernetLinux.c | 2 +- + drivers/staging/otus/usbdrv.c | 8 +- + drivers/staging/otus/wrap_pkt.c | 3 - + drivers/staging/rt2860/rt_main_dev.c | 6 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 4 +- + drivers/staging/rtl8187se/r8180_core.c | 4 +- + drivers/staging/slicoss/slicoss.c | 2 +- + drivers/staging/stlc45xx/stlc45xx.c | 3 +- + drivers/staging/winbond/wb35rx.c | 3 +- + drivers/staging/wlan-ng/p80211netdev.c | 2 +- + drivers/usb/gadget/f_phonet.c | 2 +- + drivers/usb/gadget/u_ether.c | 6 +- + drivers/video/uvesafb.c | 3 +- + drivers/w1/w1_netlink.c | 3 +- + firmware/Makefile | 5 +- + firmware/WHENCE | 17 + + firmware/cxgb3/ael2005_opt_edc.bin.ihex | 69 + + firmware/cxgb3/ael2005_twx_edc.bin.ihex | 93 + + firmware/cxgb3/ael2020_twx_edc.bin.ihex | 100 + + fs/dlm/netlink.c | 2 +- + include/linux/connector.h | 6 +- + include/linux/ethtool.h | 1 + + include/linux/ieee80211.h | 4 + + include/linux/if_ether.h | 4 +- + include/linux/if_tun.h | 1 + + include/linux/isdn/hdlc.h | 82 + + include/linux/mISDNhw.h | 1 + + include/linux/mISDNif.h | 16 +- + include/linux/mmc/sdio_ids.h | 6 + + include/linux/net_dropmon.h | 1 - + include/linux/netdevice.h | 4 - + include/linux/nl80211.h | 148 + + include/linux/rfkill.h | 14 + + include/linux/skbuff.h | 6 +- + include/linux/tipc.h | 2 + + include/linux/usb/usbnet.h | 3 + + include/linux/wireless.h | 8 + + include/net/{ieee802154 => }/af_ieee802154.h | 0 + include/net/cfg80211.h | 478 +++- + include/net/genetlink.h | 66 +- + include/net/{ieee802154/mac_def.h => ieee802154.h} | 4 +- + include/net/ieee802154/nl802154.h | 41 - + .../netdevice.h => ieee802154_netdev.h} | 0 + include/net/ipv6.h | 12 + + include/net/iw_handler.h | 2 +- + include/net/mac80211.h | 71 +- + include/net/net_namespace.h | 26 +- + include/net/netns/x_tables.h | 3 + + include/net/nl802154.h | 117 + + include/net/phonet/pn_dev.h | 2 + + include/net/scm.h | 2 - + include/net/udp.h | 3 + + kernel/taskstats.c | 10 +- + net/8021q/vlan.c | 13 + + net/Kconfig | 20 + + net/Makefile | 1 - + net/atm/br2684.c | 4 +- + net/atm/clip.c | 12 +- + net/atm/lec.c | 8 +- + net/atm/mpc.c | 2 +- + net/bluetooth/bnep/netdev.c | 6 +- + net/bridge/br_device.c | 2 +- + net/bridge/br_netfilter.c | 96 +- + net/compat.c | 17 +- + net/core/dev.c | 8 +- + net/core/ethtool.c | 16 +- + net/core/neighbour.c | 6 +- + net/core/net_namespace.c | 35 +- + net/core/netpoll.c | 6 +- + net/core/rtnetlink.c | 21 +- + net/core/skbuff.c | 3 - + net/decnet/dn_route.c | 2 +- + net/econet/af_econet.c | 4 +- + net/ieee802154/af_ieee802154.c | 4 +- + net/ieee802154/dgram.c | 6 +- + net/ieee802154/netlink.c | 6 +- + net/ieee802154/raw.c | 2 +- + net/ipv4/af_inet.c | 12 +- + net/ipv4/fib_trie.c | 50 +- + net/ipv4/ip_gre.c | 6 +- + net/ipv4/ipip.c | 6 +- + net/ipv4/ipmr.c | 2 +- + net/ipv4/tcp_output.c | 58 +- + net/ipv4/udp.c | 144 +- + net/ipv4/xfrm4_policy.c | 18 + + net/ipv6/af_inet6.c | 20 +- + net/ipv6/ip6_input.c | 6 +- + net/ipv6/ip6_output.c | 26 +- + net/ipv6/ip6_tunnel.c | 4 +- + net/ipv6/ip6mr.c | 2 +- + net/ipv6/mcast.c | 1 - + net/ipv6/sit.c | 6 +- + net/ipv6/udp.c | 141 +- + net/ipv6/xfrm6_policy.c | 18 + + net/irda/irlan/irlan_eth.c | 4 +- + net/irda/irnetlink.c | 2 +- + net/lapb/lapb_iface.c | 2 +- + net/mac80211/Kconfig | 28 +- + net/mac80211/Makefile | 3 + + net/mac80211/agg-tx.c | 3 - + net/mac80211/cfg.c | 216 +- + net/mac80211/debugfs.c | 2 +- + net/mac80211/debugfs_netdev.c | 46 - + net/mac80211/debugfs_sta.c | 98 +- + net/mac80211/driver-ops.h | 85 +- + net/mac80211/driver-trace.c | 6 + + net/mac80211/driver-trace.h | 648 ++++ + net/mac80211/event.c | 23 +- + net/mac80211/ibss.c | 15 +- + net/mac80211/ieee80211_i.h | 181 +- + net/mac80211/iface.c | 81 +- + net/mac80211/key.c | 28 +- + net/mac80211/main.c | 125 +- + net/mac80211/mesh.c | 11 +- + net/mac80211/mesh.h | 3 +- + net/mac80211/mesh_hwmp.c | 9 +- + net/mac80211/mesh_pathtbl.c | 26 +- + net/mac80211/mlme.c | 1905 ++++++------ + net/mac80211/rate.c | 31 +- + net/mac80211/rc80211_minstrel.c | 23 +- + net/mac80211/rc80211_pid_algo.c | 12 +- + net/mac80211/rx.c | 158 +- + net/mac80211/scan.c | 48 +- + net/mac80211/sta_info.h | 17 + + net/mac80211/tx.c | 335 +-- + net/mac80211/util.c | 68 +- + net/mac80211/wep.c | 52 +- + net/mac80211/wep.h | 7 +- + net/mac80211/wext.c | 450 +--- + net/mac80211/wme.c | 6 +- + net/mac80211/wme.h | 3 +- + net/mac80211/wpa.c | 3 +- + net/netfilter/ipvs/ip_vs_ctl.c | 2 +- + net/netlabel/netlabel_kapi.c | 6 +- + net/netlink/af_netlink.c | 72 +- + net/netlink/genetlink.c | 186 +- + net/netrom/nr_dev.c | 4 +- + net/packet/af_packet.c | 246 +- + net/phonet/datagram.c | 5 +- + net/phonet/pep-gprs.c | 4 +- + net/phonet/pep.c | 7 +- + net/phonet/pn_dev.c | 10 +- + net/phonet/socket.c | 96 + + net/rds/connection.c | 49 +- + net/rds/ib.c | 6 +- + net/rds/ib.h | 18 +- + net/rds/ib_cm.c | 62 +- + net/rds/ib_rdma.c | 12 +- + net/rds/ib_recv.c | 53 +- + net/rds/ib_sysctl.c | 12 +- + net/rds/iw.c | 15 +- + net/rds/iw.h | 1 - + net/rds/iw_rdma.c | 28 +- + net/rds/iw_send.c | 2 +- + net/rds/rdma_transport.c | 8 +- + net/rds/recv.c | 24 +- + net/rfkill/core.c | 10 +- + net/rose/rose_dev.c | 2 +- + net/sched/sch_teql.c | 6 +- + net/tipc/netlink.c | 2 +- + net/tipc/socket.c | 6 + + net/wireless/Kconfig | 43 +- + net/wireless/Makefile | 4 +- + net/wireless/core.c | 384 ++- + net/wireless/core.h | 206 ++- + net/wireless/debugfs.c | 14 +- + net/wireless/debugfs.h | 8 +- + net/wireless/ibss.c | 234 ++- + net/wireless/mlme.c | 589 ++++- + net/wireless/nl80211.c | 1522 +++++++-- + net/wireless/nl80211.h | 71 +- + net/wireless/reg.c | 73 +- + net/wireless/scan.c | 75 +- + net/wireless/sme.c | 836 +++++ + net/wireless/util.c | 66 +- + net/wireless/wext-compat.c | 678 ++++- + net/wireless/wext-sme.c | 394 +++ + net/wireless/wext.c | 256 +- + 710 files changed, 37677 insertions(+), 20261 deletions(-) + create mode 100644 drivers/isdn/hardware/mISDN/avmfritz.c + create mode 100644 drivers/isdn/hardware/mISDN/iohelper.h + create mode 100644 drivers/isdn/hardware/mISDN/ipac.h + create mode 100644 drivers/isdn/hardware/mISDN/isar.h + create mode 100644 drivers/isdn/hardware/mISDN/mISDNinfineon.c + create mode 100644 drivers/isdn/hardware/mISDN/mISDNipac.c + create mode 100644 drivers/isdn/hardware/mISDN/mISDNisar.c + create mode 100644 drivers/isdn/hardware/mISDN/netjet.c + create mode 100644 drivers/isdn/hardware/mISDN/netjet.h + create mode 100644 drivers/isdn/hardware/mISDN/speedfax.c + create mode 100644 drivers/isdn/hardware/mISDN/w6692.c + create mode 100644 drivers/isdn/hardware/mISDN/w6692.h + delete mode 100644 drivers/isdn/hisax/isdnhdlc.h + rename drivers/isdn/{hisax => i4l}/isdnhdlc.c (54%) + create mode 100644 drivers/net/phy/bcm63xx.c + create mode 100644 drivers/net/wireless/orinoco/cfg.c + create mode 100644 drivers/net/wireless/orinoco/cfg.h + create mode 100644 drivers/net/wireless/p54/eeprom.c + create mode 100644 drivers/net/wireless/p54/eeprom.h + create mode 100644 drivers/net/wireless/p54/fwio.c + create mode 100644 drivers/net/wireless/p54/led.c + create mode 100644 drivers/net/wireless/p54/lmac.h + create mode 100644 drivers/net/wireless/p54/main.c + delete mode 100644 drivers/net/wireless/p54/p54common.c + delete mode 100644 drivers/net/wireless/p54/p54common.h + create mode 100644 drivers/net/wireless/p54/txrx.c + delete mode 100644 drivers/net/wireless/rt2x00/rt2x00rfkill.c + delete mode 100644 drivers/net/wireless/wl12xx/acx.c + delete mode 100644 drivers/net/wireless/wl12xx/cmd.c + create mode 100644 drivers/net/wireless/wl12xx/wl1251_acx.c + rename drivers/net/wireless/wl12xx/{acx.h => wl1251_acx.h} (86%) + rename drivers/net/wireless/wl12xx/{boot.c => wl1251_boot.c} (67%) + rename drivers/net/wireless/wl12xx/{boot.h => wl1251_boot.h} (78%) + create mode 100644 drivers/net/wireless/wl12xx/wl1251_cmd.c + rename drivers/net/wireless/wl12xx/{cmd.h => wl1251_cmd.h} (60%) + rename drivers/net/wireless/wl12xx/{debugfs.c => wl1251_debugfs.c} (92%) + copy drivers/net/wireless/wl12xx/{debugfs.h => wl1251_debugfs.h} (74%) + rename drivers/net/wireless/wl12xx/{event.c => wl1251_event.c} (59%) + rename drivers/net/wireless/wl12xx/{event.h => wl1251_event.h} (94%) + rename drivers/net/wireless/wl12xx/{init.c => wl1251_init.c} (55%) + rename drivers/net/wireless/wl12xx/{init.h => wl1251_init.h} (55%) + rename drivers/net/wireless/wl12xx/{main.c => wl1251_main.c} (60%) + rename drivers/net/wireless/wl12xx/{debugfs.h => wl1251_netlink.h} (73%) + rename drivers/net/wireless/wl12xx/{wl1251.c => wl1251_ops.c} (65%) + create mode 100644 drivers/net/wireless/wl12xx/wl1251_ops.h + rename drivers/net/wireless/wl12xx/{ps.c => wl1251_ps.c} (55%) + rename drivers/net/wireless/wl12xx/{ps.h => wl1251_ps.h} (72%) + rename drivers/net/wireless/wl12xx/{rx.c => wl1251_rx.c} (68%) + rename drivers/net/wireless/wl12xx/{rx.h => wl1251_rx.h} (88%) + rename drivers/net/wireless/wl12xx/{spi.c => wl1251_spi.c} (63%) + rename drivers/net/wireless/wl12xx/{spi.h => wl1251_spi.h} (61%) + rename drivers/net/wireless/wl12xx/{tx.c => wl1251_tx.c} (79%) + rename drivers/net/wireless/wl12xx/{tx.h => wl1251_tx.h} (93%) + delete mode 100644 drivers/net/wireless/wl12xx/wl12xx.h + create mode 100644 firmware/cxgb3/ael2005_opt_edc.bin.ihex + create mode 100644 firmware/cxgb3/ael2005_twx_edc.bin.ihex + create mode 100644 firmware/cxgb3/ael2020_twx_edc.bin.ihex + create mode 100644 include/linux/isdn/hdlc.h + rename include/net/{ieee802154 => }/af_ieee802154.h (100%) + rename include/net/{ieee802154/mac_def.h => ieee802154.h} (98%) + delete mode 100644 include/net/ieee802154/nl802154.h + rename include/net/{ieee802154/netdevice.h => ieee802154_netdev.h} (100%) + create mode 100644 include/net/nl802154.h + create mode 100644 net/mac80211/driver-trace.c + create mode 100644 net/mac80211/driver-trace.h + create mode 100644 net/wireless/sme.c + create mode 100644 net/wireless/wext-sme.c +Merging wireless/master +$ git merge wireless/master +Auto-merging drivers/net/wireless/ath/ath9k/eeprom.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-tx.c +Auto-merging drivers/net/wireless/iwmc3200wifi/netdev.c +Removing drivers/net/wireless/iwmc3200wifi/wext.c +Auto-merging drivers/net/wireless/ray_cs.c +Auto-merging net/mac80211/mlme.c +Removing net/mac80211/wext.c +Merge made by recursive. + drivers/net/wireless/ath/ar9170/main.c | 2 + + drivers/net/wireless/ath/ath9k/Kconfig | 4 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 11 +- + drivers/net/wireless/ath/ath9k/calib.c | 22 +- + drivers/net/wireless/ath/ath9k/debug.c | 85 ++ + drivers/net/wireless/ath/ath9k/debug.h | 54 + + drivers/net/wireless/ath/ath9k/eeprom.c | 1203 +++++++++++++++++++++- + drivers/net/wireless/ath/ath9k/eeprom.h | 163 +++- + drivers/net/wireless/ath/ath9k/hw.c | 133 ++- + drivers/net/wireless/ath/ath9k/hw.h | 5 +- + drivers/net/wireless/ath/ath9k/initvals.h | 1516 +++++++++++++++++++++++++++ + drivers/net/wireless/ath/ath9k/main.c | 35 +- + drivers/net/wireless/ath/ath9k/pci.c | 2 + + drivers/net/wireless/ath/ath9k/phy.h | 1 + + drivers/net/wireless/ath/ath9k/xmit.c | 85 +- + drivers/net/wireless/ath/regd_common.h | 2 +- + drivers/net/wireless/iwlwifi/Kconfig | 3 + + drivers/net/wireless/iwlwifi/iwl-1000.c | 77 ++- + drivers/net/wireless/iwlwifi/iwl-3945-led.c | 11 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 9 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 45 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 59 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 85 ++- + drivers/net/wireless/iwlwifi/iwl-agn.c | 23 +- + drivers/net/wireless/iwlwifi/iwl-calib.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 7 + + drivers/net/wireless/iwlwifi/iwl-core.c | 35 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 2 + + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 84 ++ + drivers/net/wireless/iwlwifi/iwl-dev.h | 116 ++- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 63 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 526 ++++++++++ + drivers/net/wireless/iwlwifi/iwl-power.h | 93 ++ + drivers/net/wireless/iwlwifi/iwl-scan.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 48 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 100 ++- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 20 +- + drivers/net/wireless/iwmc3200wifi/Kconfig | 1 - + drivers/net/wireless/iwmc3200wifi/Makefile | 2 +- + drivers/net/wireless/iwmc3200wifi/iwm.h | 2 - + drivers/net/wireless/iwmc3200wifi/netdev.c | 1 - + drivers/net/wireless/iwmc3200wifi/wext.c | 187 ---- + drivers/net/wireless/p54/txrx.c | 2 +- + drivers/net/wireless/ray_cs.c | 3 - + drivers/net/wireless/rt2x00/rt2x00config.c | 12 +- + drivers/net/wireless/rt2x00/rt2x00lib.h | 2 +- + drivers/net/wireless/rt2x00/rt2x00link.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 2 +- + include/linux/ieee80211.h | 25 + + include/linux/nl80211.h | 9 + + include/net/cfg80211.h | 104 +- + include/net/mac80211.h | 4 + + net/core/dev.c | 1 + + net/mac80211/Kconfig | 1 - + net/mac80211/Makefile | 1 - + net/mac80211/cfg.c | 14 +- + net/mac80211/ibss.c | 2 +- + net/mac80211/ieee80211_i.h | 45 +- + net/mac80211/iface.c | 22 +- + net/mac80211/main.c | 3 +- + net/mac80211/mesh.c | 2 +- + net/mac80211/mlme.c | 35 +- + net/mac80211/rx.c | 21 +- + net/mac80211/scan.c | 304 ++++-- + net/mac80211/sta_info.h | 13 - + net/mac80211/tx.c | 109 +-- + net/mac80211/util.c | 13 + + net/mac80211/wext.c | 235 ----- + net/wireless/core.c | 78 ++- + net/wireless/core.h | 8 +- + net/wireless/ibss.c | 13 +- + net/wireless/mlme.c | 8 + + net/wireless/nl80211.c | 206 +++-- + net/wireless/scan.c | 25 +- + net/wireless/sme.c | 5 +- + net/wireless/wext-compat.c | 180 +++- + net/wireless/wext-compat.h | 50 + + net/wireless/wext-sme.c | 13 +- + 82 files changed, 5381 insertions(+), 1159 deletions(-) + delete mode 100644 drivers/net/wireless/iwmc3200wifi/wext.c + delete mode 100644 net/mac80211/wext.c + create mode 100644 net/wireless/wext-compat.h +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + arch/s390/crypto/des_s390.c | 11 +- + arch/s390/crypto/sha1_s390.c | 26 +++ + arch/s390/crypto/sha256_s390.c | 26 +++ + arch/s390/crypto/sha512_s390.c | 36 ++++ + arch/x86/crypto/aesni-intel_glue.c | 2 +- + crypto/Kconfig | 2 +- + crypto/Makefile | 3 +- + crypto/ablkcipher.c | 23 ++- + crypto/aes_generic.c | 9 +- + crypto/ahash.c | 336 ++++++++++++++++++++++++++++--- + crypto/algapi.c | 103 +++++++++- + crypto/algboss.c | 5 + + crypto/ansi_cprng.c | 34 +-- + crypto/api.c | 54 +++--- + crypto/authenc.c | 6 +- + crypto/cryptd.c | 286 ++++++++++++++++---------- + crypto/hmac.c | 302 +++++++++++++--------------- + crypto/internal.h | 28 +--- + crypto/pcompress.c | 6 +- + crypto/sha1_generic.c | 41 +++-- + crypto/sha256_generic.c | 100 +++++----- + crypto/sha512_generic.c | 48 ++--- + crypto/shash.c | 270 ++++++++++++++++++------- + crypto/tcrypt.c | 18 ++- + crypto/testmgr.c | 21 ++- + crypto/xcbc.c | 368 +++++++++++++--------------------- + drivers/char/hw_random/amd-rng.c | 4 +- + drivers/char/hw_random/geode-rng.c | 3 +- + drivers/char/random.c | 14 ++ + drivers/crypto/Kconfig | 2 +- + drivers/crypto/amcc/crypto4xx_alg.c | 3 +- + drivers/crypto/amcc/crypto4xx_core.c | 73 +++---- + drivers/crypto/amcc/crypto4xx_core.h | 25 ++- + drivers/crypto/padlock-sha.c | 329 +++++++++++++++--------------- + include/crypto/algapi.h | 37 +++- + include/crypto/hash.h | 147 +++++++++----- + include/crypto/internal/hash.h | 147 +++++++++++++- + include/crypto/sha.h | 20 ++ + include/linux/crypto.h | 43 +---- + include/linux/fips.h | 10 + + 40 files changed, 1892 insertions(+), 1129 deletions(-) + create mode 100644 include/linux/fips.h +Merging sound/for-next +$ git merge sound/for-next +Auto-merging sound/soc/atmel/sam9g20_wm8731.c +Auto-merging sound/soc/davinci/davinci-pcm.c +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 4 + + Documentation/sound/alsa/HD-Audio-Models.txt | 14 +- + Documentation/sound/alsa/HD-Audio.txt | 64 + + include/sound/ac97_codec.h | 6 + + include/sound/memalloc.h | 6 + + include/sound/pcm.h | 23 + + include/sound/soc-dai.h | 27 +- + include/sound/soc-dapm.h | 1 + + include/sound/soc.h | 35 +- + include/sound/tlv.h | 14 + + include/sound/uda1380.h | 22 + + include/sound/wm8993.h | 44 + + sound/core/Kconfig | 4 + + sound/core/Makefile | 2 +- + sound/core/info.c | 4 +- + sound/core/memalloc.c | 4 + + sound/core/pcm_memory.c | 2 + + sound/core/rawmidi.c | 2 +- + sound/core/seq/oss/seq_oss_midi.c | 14 +- + sound/core/seq/seq_midi.c | 7 +- + sound/core/vmaster.c | 8 +- + sound/isa/cmi8330.c | 86 +- + sound/pci/Kconfig | 4 +- + sound/pci/azt3328.c | 1116 ++++++----- + sound/pci/azt3328.h | 103 +- + sound/pci/ctxfi/ct20k2reg.h | 9 +- + sound/pci/ctxfi/ctamixer.c | 20 +- + sound/pci/ctxfi/ctatc.c | 77 +- + sound/pci/ctxfi/ctdaio.c | 30 +- + sound/pci/ctxfi/cthw20k1.c | 22 +- + sound/pci/ctxfi/cthw20k2.c | 73 +- + sound/pci/ctxfi/ctmixer.c | 8 +- + sound/pci/ctxfi/ctpcm.c | 6 +- + sound/pci/ctxfi/ctresource.c | 4 +- + sound/pci/ctxfi/ctsrc.c | 10 +- + sound/pci/ctxfi/ctvmem.c | 6 +- + sound/pci/hda/Kconfig | 14 + + sound/pci/hda/hda_beep.c | 4 + + sound/pci/hda/hda_codec.c | 65 +- + sound/pci/hda/hda_codec.h | 10 +- + sound/pci/hda/hda_generic.c | 18 +- + sound/pci/hda/hda_hwdep.c | 236 +++- + sound/pci/hda/hda_intel.c | 48 +- + sound/pci/hda/hda_local.h | 4 +- + sound/pci/hda/hda_proc.c | 3 +- + sound/pci/hda/patch_analog.c | 3 +- + sound/pci/hda/patch_ca0110.c | 3 +- + sound/pci/hda/patch_cmedia.c | 3 +- + sound/pci/hda/patch_conexant.c | 479 +++++ + sound/pci/hda/patch_intelhdmi.c | 2 + + sound/pci/hda/patch_realtek.c | 2348 +++++++++++------------ + sound/pci/hda/patch_sigmatel.c | 304 ++-- + sound/pci/hda/patch_via.c | 3 +- + sound/pci/ice1712/ice1712.h | 9 + + sound/pci/ice1712/ice1724.c | 112 +- + sound/pci/ice1712/prodigy_hifi.c | 46 +- + sound/soc/atmel/sam9g20_wm8731.c | 138 +-- + sound/soc/blackfin/bf5xx-ac97.c | 10 +- + sound/soc/blackfin/bf5xx-ad73311.c | 16 +- + sound/soc/blackfin/bf5xx-i2s.c | 8 +- + sound/soc/blackfin/bf5xx-ssm2602.c | 16 +- + sound/soc/codecs/Kconfig | 24 + + sound/soc/codecs/Makefile | 16 + + sound/soc/codecs/ad1938.c | 652 +++++++ + sound/soc/codecs/ad1938.h | 100 + + sound/soc/codecs/ak4535.c | 16 - + sound/soc/codecs/cx20442.c | 395 ++++ + sound/soc/codecs/cx20442.h | 19 + + sound/soc/codecs/max9877.c | 308 +++ + sound/soc/codecs/max9877.h | 37 + + sound/soc/codecs/spdif_transciever.c | 3 + + sound/soc/codecs/stac9766.c | 4 +- + sound/soc/codecs/twl4030.c | 105 +- + sound/soc/codecs/twl4030.h | 2 + + sound/soc/codecs/uda1380.c | 313 ++-- + sound/soc/codecs/uda1380.h | 8 - + sound/soc/codecs/wm8350.c | 40 +- + sound/soc/codecs/wm8400.c | 26 +- + sound/soc/codecs/wm8510.c | 1 + + sound/soc/codecs/wm8523.c | 755 ++++++++ + sound/soc/codecs/wm8523.h | 160 ++ + sound/soc/codecs/wm8580.c | 55 +- + sound/soc/codecs/wm8731.c | 74 +- + sound/soc/codecs/wm8753.c | 35 + + sound/soc/codecs/wm8900.c | 30 +- + sound/soc/codecs/wm8903.c | 27 +- + sound/soc/codecs/wm8940.c | 17 + + sound/soc/codecs/wm8960.c | 33 +- + sound/soc/codecs/wm8961.c | 1326 +++++++++++++ + sound/soc/codecs/wm8961.h | 866 +++++++++ + sound/soc/codecs/wm8988.c | 42 +- + sound/soc/codecs/wm8993.c | 2206 +++++++++++++++++++++ + sound/soc/codecs/wm8993.h | 2132 ++++++++++++++++++++ + sound/soc/codecs/wm9081.c | 25 + + sound/soc/davinci/Kconfig | 13 + + sound/soc/davinci/Makefile | 3 + + sound/soc/davinci/davinci-evm.c | 102 +- + sound/soc/davinci/davinci-i2s.c | 337 ++-- + sound/soc/davinci/davinci-mcasp.c | 874 +++++++++ + sound/soc/davinci/davinci-mcasp.h | 55 + + sound/soc/davinci/davinci-pcm.c | 1 + + sound/soc/davinci/davinci-pcm.h | 18 +- + sound/soc/fsl/mpc5200_psc_ac97.c | 3 +- + sound/soc/omap/Kconfig | 7 + + sound/soc/omap/Makefile | 2 + + sound/soc/omap/omap-pcm.c | 2 +- + sound/soc/omap/sdp3430.c | 11 +- + sound/soc/omap/zoom2.c | 314 +++ + sound/soc/pxa/magician.c | 54 +- + sound/soc/pxa/palm27x.c | 204 +-- + sound/soc/pxa/pxa-ssp.c | 50 +- + sound/soc/soc-core.c | 128 +- + sound/soc/soc-dapm.c | 355 +++- + sound/soc/soc-jack.c | 20 +- + sound/soc/txx9/txx9aclc.c | 10 +- + sound/usb/usbmidi.c | 290 ++- + sound/usb/usbmixer.c | 73 +- + 117 files changed, 15386 insertions(+), 3175 deletions(-) + create mode 100644 include/sound/uda1380.h + create mode 100644 include/sound/wm8993.h + create mode 100644 sound/soc/codecs/ad1938.c + create mode 100644 sound/soc/codecs/ad1938.h + create mode 100644 sound/soc/codecs/cx20442.c + create mode 100644 sound/soc/codecs/cx20442.h + create mode 100644 sound/soc/codecs/max9877.c + create mode 100644 sound/soc/codecs/max9877.h + create mode 100644 sound/soc/codecs/wm8523.c + create mode 100644 sound/soc/codecs/wm8523.h + create mode 100644 sound/soc/codecs/wm8961.c + create mode 100644 sound/soc/codecs/wm8961.h + create mode 100644 sound/soc/codecs/wm8993.c + create mode 100644 sound/soc/codecs/wm8993.h + create mode 100644 sound/soc/davinci/davinci-mcasp.c + create mode 100644 sound/soc/davinci/davinci-mcasp.h + create mode 100644 sound/soc/omap/zoom2.c +Merging cpufreq/next +$ git merge cpufreq/next +Merge made by recursive. + Documentation/cpu-freq/user-guide.txt | 9 +- + drivers/cpufreq/cpufreq.c | 265 +++++++++++++++++++-------------- + 2 files changed, 158 insertions(+), 116 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Auto-merging arch/powerpc/include/asm/smp.h +Auto-merging arch/powerpc/platforms/powermac/smp.c +Auto-merging arch/s390/kernel/smp.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging drivers/acpi/processor_throttling.c +Auto-merging include/linux/interrupt.h +Auto-merging include/linux/pci.h +Auto-merging include/linux/sched.h +Auto-merging virt/kvm/kvm_main.c +Merge made by recursive. + Documentation/lguest/lguest.c | 721 +++++++++++++++++--------- + 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/frv/include/asm/gdb-stub.h | 1 - + 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/gdb-stub.h | 1 - + 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/lguest.h | 3 +- + arch/x86/include/asm/lguest_hcall.h | 18 +- + arch/x86/include/asm/mmu_context.h | 6 +- + arch/x86/include/asm/smp.h | 1 - + arch/x86/kernel/acpi/cstate.c | 36 +- + 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 | 517 +++++++++++++------ + arch/x86/lguest/i386_head.S | 112 +++-- + arch/x86/mm/tlb.c | 15 +- + arch/x86/xen/mmu.c | 4 +- + drivers/acpi/processor_perflib.c | 3 +- + drivers/acpi/processor_throttling.c | 97 ++-- + drivers/firmware/dcdbas.c | 49 +-- + drivers/lguest/core.c | 119 +++-- + drivers/lguest/hypercalls.c | 145 ++++-- + drivers/lguest/interrupts_and_traps.c | 288 +++++++---- + drivers/lguest/lg.h | 32 +- + drivers/lguest/lguest_device.c | 160 ++++-- + drivers/lguest/lguest_user.c | 232 +++++++-- + drivers/lguest/page_tables.c | 526 +++++++++++++------- + drivers/lguest/segments.c | 106 +++-- + drivers/lguest/x86/core.c | 374 +++++++++----- + drivers/lguest/x86/switcher_32.S | 22 +- + drivers/net/sfc/efx.c | 3 +- + drivers/oprofile/buffer_sync.c | 3 +- + drivers/virtio/virtio_pci.c | 248 +++++---- + include/asm-generic/topology.h | 17 - + include/linux/cpumask.h | 709 +++++++++---------------- + include/linux/interrupt.h | 2 - + include/linux/lguest.h | 39 +- + include/linux/lguest_launcher.h | 18 +- + include/linux/pci.h | 4 +- + include/linux/sched.h | 3 + + include/linux/smp.h | 11 - + include/linux/topology.h | 6 - + include/linux/virtio_blk.h | 6 +- + include/linux/virtio_config.h | 3 +- + include/linux/virtio_net.h | 6 +- + include/linux/virtio_ring.h | 12 +- + init/main.c | 5 - + kernel/smp.c | 7 - + kernel/trace/trace.c | 7 +- + mm/quicklist.c | 3 +- + virt/kvm/kvm_main.c | 3 +- + 103 files changed, 2940 insertions(+), 2077 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging input/next +$ git merge input/next +Merge made by recursive. + arch/arm/mach-pxa/include/mach/pxa27x_keypad.h | 3 +- + arch/blackfin/include/asm/bfin_rotary.h | 39 ++++ + drivers/base/platform.c | 2 +- + drivers/base/power/main.c | 8 +- + drivers/input/keyboard/bf54x-keys.c | 26 +-- + drivers/input/keyboard/gpio_keys.c | 19 +- + drivers/input/keyboard/pxa27x_keypad.c | 62 +++--- + drivers/input/keyboard/sh_keysc.c | 22 ++- + drivers/input/misc/Kconfig | 10 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/bfin_rotary.c | 283 ++++++++++++++++++++++++ + drivers/input/misc/cobalt_btns.c | 2 +- + drivers/input/misc/dm355evm_keys.c | 42 ++-- + drivers/input/serio/at32psif.c | 2 +- + drivers/input/serio/i8042.c | 44 ++--- + drivers/input/serio/serio.c | 23 +- + drivers/input/touchscreen/Kconfig | 16 ++- + drivers/input/touchscreen/atmel_tsadcc.c | 8 +- + drivers/input/touchscreen/mainstone-wm97xx.c | 53 +++-- + drivers/input/touchscreen/tsc2007.c | 112 +++++----- + drivers/input/touchscreen/ucb1400_ts.c | 5 +- + drivers/input/touchscreen/usbtouchscreen.c | 81 +++++++ + drivers/input/touchscreen/w90p910_ts.c | 34 ++-- + drivers/input/touchscreen/wm97xx-core.c | 6 +- + drivers/pci/pci-driver.c | 16 +- + include/linux/device.h | 9 +- + include/linux/serio.h | 2 - + include/linux/wm97xx.h | 7 + + 28 files changed, 690 insertions(+), 247 deletions(-) + create mode 100644 arch/blackfin/include/asm/bfin_rotary.h + create mode 100644 drivers/input/misc/bfin_rotary.c +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/staging/dst/dcore.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/fuse/inode.c +Removing mm/pdflush.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-block | 37 +- + block/blk-core.c | 153 +++++-- + block/blk-integrity.c | 1 + + block/blk-merge.c | 49 ++- + block/blk-settings.c | 102 +++--- + block/blk.h | 1 + + block/cfq-iosched.c | 63 ++-- + block/elevator.c | 16 +- + block/genhd.c | 18 +- + drivers/block/aoe/aoeblk.c | 1 + + drivers/block/loop.c | 2 +- + drivers/block/mg_disk.c | 101 +++-- + drivers/block/osdblk.c | 2 +- + drivers/char/mem.c | 1 + + drivers/md/dm-raid1.c | 2 +- + drivers/md/dm-stripe.c | 2 +- + drivers/md/dm.c | 12 +- + drivers/md/linear.c | 2 +- + drivers/md/multipath.c | 4 +- + drivers/md/raid0.c | 2 +- + drivers/md/raid1.c | 14 +- + drivers/md/raid10.c | 6 +- + drivers/md/raid5.c | 2 +- + drivers/scsi/scsi_lib.c | 6 +- + drivers/staging/dst/dcore.c | 5 +- + fs/btrfs/disk-io.c | 1 + + fs/btrfs/volumes.c | 4 +- + fs/buffer.c | 2 +- + fs/char_dev.c | 1 + + fs/configfs/inode.c | 1 + + fs/fs-writeback.c | 775 ++++++++++++++++++++++++++------- + fs/fuse/inode.c | 1 + + fs/hugetlbfs/inode.c | 1 + + fs/nfs/client.c | 1 + + fs/ocfs2/dlm/dlmfs.c | 1 + + fs/ramfs/inode.c | 1 + + fs/super.c | 3 - + fs/sync.c | 2 +- + fs/sysfs/inode.c | 1 + + fs/ubifs/super.c | 1 + + include/linux/backing-dev.h | 71 +++- + include/linux/bio.h | 69 ++-- + include/linux/blkdev.h | 31 +- + include/linux/fs.h | 11 +- + include/linux/writeback.h | 15 +- + kernel/cgroup.c | 1 + + mm/Makefile | 2 +- + mm/backing-dev.c | 533 ++++++++++++++++++++++- + mm/page-writeback.c | 157 +------ + mm/pdflush.c | 269 ------------ + mm/swap_state.c | 1 + + mm/vmscan.c | 2 +- + 52 files changed, 1695 insertions(+), 867 deletions(-) + delete mode 100644 mm/pdflush.c +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 +Merge made by recursive. + Documentation/power/power_supply_class.txt | 7 + + drivers/power/Kconfig | 7 + + drivers/power/Makefile | 1 + + drivers/power/ds2782_battery.c | 330 ++++++++++++++++++++++++++++ + drivers/power/olpc_battery.c | 76 ++++++- + drivers/power/power_supply_sysfs.c | 12 + + drivers/power/wm8350_power.c | 22 ++ + include/linux/power_supply.h | 18 ++ + 8 files changed, 462 insertions(+), 11 deletions(-) + create mode 100644 drivers/power/ds2782_battery.c +Merging leds/for-mm +$ git merge leds/for-mm +Already up-to-date. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging include/linux/sched.h +Merge made by recursive. + arch/x86/kernel/kgdb.c | 9 +++++++-- + include/linux/kgdb.h | 48 ++++++++++++++++++++++++++++++++++++++++++------ + include/linux/sched.h | 4 ++++ + kernel/kgdb.c | 30 ++++++++++++++++++++---------- + kernel/softlockup.c | 16 ++++++++++++++++ + 5 files changed, 89 insertions(+), 18 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merging init/Kconfig +Auto-merging mm/Makefile +Auto-merging mm/slub.c +Merge made by recursive. + Documentation/vm/slqbinfo.c | 1047 ++++++++++++ + Documentation/vm/slub.txt | 10 + + include/linux/rcu_types.h | 18 + + include/linux/rcupdate.h | 11 +- + include/linux/slab.h | 10 +- + include/linux/slqb_def.h | 301 ++++ + init/Kconfig | 28 +- + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/slqb.c | 3765 +++++++++++++++++++++++++++++++++++++++++++ + mm/slub.c | 43 +- + 11 files changed, 5235 insertions(+), 19 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/mfd/ezx-pcap.c +Merge made by recursive. + MAINTAINERS | 18 ++ + drivers/mfd/ab3100-core.c | 8 +- + drivers/mfd/ezx-pcap.c | 103 ++++++++---- + drivers/mfd/twl4030-irq.c | 2 +- + drivers/regulator/Kconfig | 7 + + drivers/regulator/Makefile | 1 + + drivers/regulator/pcap-regulator.c | 318 ++++++++++++++++++++++++++++++++++++ + include/linux/mfd/ezx-pcap.h | 3 + + 8 files changed, 425 insertions(+), 35 deletions(-) + create mode 100644 drivers/regulator/pcap-regulator.c +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Merge made by recursive. + drivers/gpu/drm/drm_edid.c | 70 ++++++-- + drivers/gpu/drm/drm_modes.c | 416 +++++++++++++++++++++++++++++++++++++++++++ + include/drm/drm_crtc.h | 6 + + 3 files changed, 480 insertions(+), 12 deletions(-) +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + drivers/regulator/core.c | 214 +++++++++++++++++++++++++++----- + drivers/regulator/da903x.c | 75 ++++++++++-- + drivers/regulator/pcf50633-regulator.c | 2 +- + 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 | 4 + + include/linux/regulator/machine.h | 20 +++- + 9 files changed, 320 insertions(+), 61 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Auto-merging include/linux/sched.h +Merge made by recursive. + fs/locks.c | 2 +- + fs/proc/base.c | 23 +++---- + include/linux/lsm_audit.h | 10 ++- + include/linux/sched.h | 2 +- + include/linux/security.h | 14 ++-- + kernel/ptrace.c | 2 +- + lib/is_single_threaded.c | 61 ++++++++++------- + security/capability.c | 2 +- + security/commoncap.c | 4 +- + security/keys/proc.c | 4 + + security/keys/process_keys.c | 2 +- + security/security.c | 4 +- + security/selinux/avc.c | 8 ++- + security/selinux/hooks.c | 26 +++++--- + security/selinux/include/avc.h | 6 +- + security/selinux/ss/services.c | 142 +++++++++++++++++++++++++++++++++------ + security/smack/smack.h | 2 +- + security/smack/smack_access.c | 11 ++-- + security/smack/smack_lsm.c | 8 +- + security/tomoyo/common.c | 30 +++++++++ + security/tomoyo/common.h | 2 - + security/tomoyo/domain.c | 42 ++---------- + security/tomoyo/tomoyo.c | 10 +-- + security/tomoyo/tomoyo.h | 3 +- + 24 files changed, 271 insertions(+), 149 deletions(-) +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 +Already up-to-date. +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + drivers/watchdog/coh901327_wdt.c | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Auto-merging drivers/pci/intel-iommu.c +Merge made by recursive. + drivers/pci/intel-iommu.c | 44 ++++++++++++++++++++++++++------------------ + drivers/pci/iova.c | 16 ++++------------ + include/linux/iova.h | 1 - + 3 files changed, 30 insertions(+), 31 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 +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Merge made by recursive. + Documentation/filesystems/seq_file.txt | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +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 MAINTAINERS +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/mach-at91/board-sam9261ek.c +Auto-merging arch/arm/mach-at91/board-sam9g20ek.c +Auto-merging arch/arm/mach-at91/board-sam9rlek.c +Auto-merging arch/x86/kernel/cpu/amd.c +Auto-merging drivers/input/keyboard/atkbd.c +Auto-merging drivers/lguest/page_tables.c +Auto-merging drivers/mtd/ubi/eba.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/macb.c +Auto-merging drivers/net/rionet.c +Auto-merging drivers/net/wireless/ath/ath5k/reg.h +Auto-merging drivers/net/wireless/atmel.c +Auto-merging drivers/usb/host/xhci.h +Auto-merging fs/gfs2/rgrp.c +Auto-merging include/acpi/actypes.h +Auto-merging include/linux/mISDNif.h +Merge made by recursive. + Documentation/DocBook/mtdnand.tmpl | 2 +- + Documentation/DocBook/scsi.tmpl | 2 +- + Documentation/filesystems/nfsroot.txt | 2 +- + Documentation/gcov.txt | 2 +- + Documentation/hwmon/hpfall.c | 64 +++++++++++----------- + 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/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/um/include/shared/ptrace_user.h | 2 +- + arch/x86/kernel/cpu/amd.c | 2 +- + drivers/block/DAC960.c | 4 +- + drivers/char/agp/uninorth-agp.c | 2 +- + drivers/edac/edac_core.h | 2 +- + drivers/gpu/drm/mga/mga_state.c | 4 +- + drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 +- + drivers/input/keyboard/atkbd.c | 2 +- + drivers/isdn/i4l/isdn_common.c | 4 +- + drivers/lguest/page_tables.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/bnx2x_reg.h | 2 +- + drivers/net/bonding/bond_3ad.c | 2 +- + drivers/net/e1000/e1000_hw.c | 2 +- + drivers/net/macb.c | 2 +- + drivers/net/rionet.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/scsi/megaraid/megaraid_sas.c | 2 +- + drivers/scsi/mpt2sas/mpt2sas_base.h | 2 +- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 4 +- + drivers/scsi/qla4xxx/ql4_os.c | 4 +- + drivers/staging/rt2860/rtmp.h | 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/wusbcore/wa-hc.h | 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 +- + fs/ext4/inode.c | 2 +- + fs/gfs2/rgrp.c | 2 +- + fs/ntfs/layout.h | 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/namei.h | 2 +- + include/linux/usb.h | 2 +- + include/linux/workqueue.h | 2 +- + include/rdma/ib_cm.h | 2 +- + kernel/panic.c | 2 +- + kernel/tracepoint.c | 2 +- + lib/zlib_deflate/deflate.c | 4 +- + net/rxrpc/ar-call.c | 2 +- + net/sched/sch_hfsc.c | 2 +- + scripts/basic/fixdep.c | 3 +- + scripts/mod/sumversion.c | 2 - + sound/oss/swarm_cs4297a.c | 3 - + 111 files changed, 178 insertions(+), 183 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Already up-to-date. +Merging suspend/linux-next +$ git merge suspend/linux-next +Auto-merging drivers/base/platform.c +Auto-merging drivers/usb/musb/musb_core.c +Merge made by recursive. + arch/arm/include/asm/device.h | 3 + + arch/arm/plat-omap/debug-leds.c | 11 +- + arch/arm/plat-omap/gpio.c | 14 +- + arch/ia64/include/asm/device.h | 3 + + arch/microblaze/include/asm/device.h | 3 + + arch/powerpc/include/asm/device.h | 3 + + arch/sparc/include/asm/device.h | 3 + + arch/x86/include/asm/device.h | 3 + + drivers/base/platform.c | 36 --- + drivers/block/floppy.c | 9 +- + drivers/dma/dw_dmac.c | 15 +- + drivers/dma/txx9dmac.c | 15 +- + drivers/i2c/busses/i2c-pxa.c | 25 ++- + drivers/i2c/busses/i2c-s3c2410.c | 25 ++- + drivers/platform/x86/hp-wmi.c | 15 +- + drivers/usb/musb/musb_core.c | 18 +- + include/asm-generic/device.h | 3 + + include/linux/platform_device.h | 5 +- + kernel/irq/pm.c | 8 +- + kernel/power/hibernate.c | 21 ++- + kernel/power/power.h | 2 +- + kernel/power/snapshot.c | 412 ++++++++++++++++++++++++++-------- + 22 files changed, 455 insertions(+), 197 deletions(-) +Merging bluetooth/master +$ git merge bluetooth/master +Merge made by recursive. + Documentation/00-INDEX | 2 + + Documentation/btmrvl.txt | 119 +++++ + drivers/bluetooth/Kconfig | 25 + + drivers/bluetooth/Makefile | 6 + + drivers/bluetooth/btmrvl_debugfs.c | 432 ++++++++++++++++ + drivers/bluetooth/btmrvl_drv.h | 139 +++++ + drivers/bluetooth/btmrvl_main.c | 624 ++++++++++++++++++++++ + drivers/bluetooth/btmrvl_sdio.c | 1002 ++++++++++++++++++++++++++++++++++++ + drivers/bluetooth/btmrvl_sdio.h | 108 ++++ + drivers/bluetooth/btusb.c | 4 +- + include/net/bluetooth/l2cap.h | 8 +- + net/bluetooth/hidp/core.c | 1 + + net/bluetooth/l2cap.c | 72 +++- + net/bluetooth/sco.c | 49 ++- + 14 files changed, 2561 insertions(+), 30 deletions(-) + create mode 100644 Documentation/btmrvl.txt + create mode 100644 drivers/bluetooth/btmrvl_debugfs.c + create mode 100644 drivers/bluetooth/btmrvl_drv.h + create mode 100644 drivers/bluetooth/btmrvl_main.c + create mode 100644 drivers/bluetooth/btmrvl_sdio.c + create mode 100644 drivers/bluetooth/btmrvl_sdio.h +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Auto-merging drivers/edac/amd64_edac.c +Merge made by recursive. + drivers/edac/amd64_edac.c | 70 +++++++++++++++----------------------------- + 1 files changed, 24 insertions(+), 46 deletions(-) +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Resolved 'fs/notify/inotify/inotify_user.c' using previous resolution. +Auto-merging fs/notify/inotify/inotify_user.c +CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_user.c +Auto-merging include/linux/fsnotify_backend.h +Auto-merging init/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ddddbae] Merge commit 'fsnotify/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 7 + + fs/notify/dnotify/dnotify.c | 2 +- + fs/notify/inode_mark.c | 18 ++- + fs/notify/inotify/inotify_user.c | 2 +- + include/linux/fsnotify_backend.h | 10 +- + init/Kconfig | 10 +- + kernel/Makefile | 5 +- + kernel/audit.c | 1 - + kernel/audit.h | 26 ++- + kernel/audit_tree.c | 223 ++++++++++++---------- + kernel/audit_watch.c | 293 ++++++++++++++++------------ + kernel/auditfilter.c | 39 ++--- + kernel/auditsc.c | 9 +- + 13 files changed, 365 insertions(+), 280 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Already up-to-date. +Merging hwlat/for-linus +$ git merge hwlat/for-linus +Auto-merging MAINTAINERS +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 +Auto-merging drivers/block/Kconfig +Auto-merging drivers/block/Makefile +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 | 1485 +++++++ + drivers/block/drbd/drbd_bitmap.c | 1321 ++++++ + drivers/block/drbd/drbd_int.h | 2243 ++++++++++ + drivers/block/drbd/drbd_main.c | 3749 +++++++++++++++++ + drivers/block/drbd/drbd_nl.c | 2355 +++++++++++ + drivers/block/drbd/drbd_proc.c | 266 ++ + drivers/block/drbd/drbd_receiver.c | 4366 ++++++++++++++++++++ + drivers/block/drbd/drbd_req.c | 1130 +++++ + drivers/block/drbd/drbd_req.h | 299 ++ + drivers/block/drbd/drbd_strings.c | 113 + + drivers/block/drbd/drbd_tracing.c | 752 ++++ + drivers/block/drbd/drbd_tracing.h | 87 + + drivers/block/drbd/drbd_vli.h | 351 ++ + drivers/block/drbd/drbd_worker.c | 1527 +++++++ + 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, 23002 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 +$ git am -3 ../patches/0001-drbd-fixups-for-block-api-changes.patch +Applying: drbd: fixups for block api changes +$ git reset HEAD^ +drivers/block/drbd/drbd_actlog.c: locally modified +drivers/block/drbd/drbd_main.c: locally modified +drivers/block/drbd/drbd_req.c: locally modified +$ git add . +$ git commit -v -a --amend +[master a000cf9] Merge commit 'drbd/drbd' +$ git am -3 ../patches/0001-drbd-fix-for-removal-of-blk_queue_stack_limits.patch +Applying: drbd: fix for removal of blk_queue_stack_limits +$ git reset HEAD^ +drivers/block/drbd/drbd_nl.c: locally modified +$ git add . +$ git commit -v -a --amend +[master c561bcf] Merge commit 'drbd/drbd' +Merging tip/auto-latest +$ git merge tip/auto-latest +Resolved 'drivers/oprofile/oprofile_stats.c' using previous resolution. +Resolved 'include/linux/rcupdate.h' using previous resolution. +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/x86/oprofile/nmi_int.c +Auto-merging drivers/oprofile/oprofile_stats.c +CONFLICT (content): Merge conflict in drivers/oprofile/oprofile_stats.c +Removing include/linux/rcuclassic.h +Auto-merging include/linux/rcupdate.h +CONFLICT (content): Merge conflict in include/linux/rcupdate.h +Auto-merging include/linux/sched.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Auto-merging kernel/irq/manage.c +Removing kernel/rcuclassic.c +Auto-merging kernel/sched.c +Auto-merging kernel/trace/trace.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 290f9de] Merge commit 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/RTFP.txt | 77 +++ + Documentation/RCU/UP.txt | 34 +- + Documentation/RCU/checklist.txt | 20 +- + Documentation/RCU/rcubarrier.txt | 7 + + Documentation/RCU/torture.txt | 23 +- + Documentation/RCU/whatisRCU.txt | 14 +- + Documentation/feature-removal-schedule.txt | 9 - + Documentation/kernel-parameters.txt | 5 + + Documentation/trace/events.txt | 9 + + arch/x86/Kconfig | 5 + + arch/x86/boot/video-vesa.c | 7 +- + arch/x86/boot/video-vga.c | 10 - + arch/x86/boot/video.c | 5 - + arch/x86/boot/video.h | 20 +- + arch/x86/include/asm/i387.h | 1 + + arch/x86/include/asm/ioctls.h | 95 +---- + arch/x86/include/asm/ipcbuf.h | 29 +- + arch/x86/include/asm/mce.h | 2 +- + arch/x86/include/asm/mman.h | 14 +- + arch/x86/include/asm/module.h | 13 +- + arch/x86/include/asm/msgbuf.h | 40 +-- + arch/x86/include/asm/param.h | 23 +- + arch/x86/include/asm/paravirt.h | 711 +------------------------ + arch/x86/include/asm/paravirt_types.h | 720 +++++++++++++++++++++++++ + arch/x86/include/asm/pgtable.h | 16 +- + arch/x86/include/asm/scatterlist.h | 27 +- + arch/x86/include/asm/shmbuf.h | 52 +-- + arch/x86/include/asm/socket.h | 61 +-- + arch/x86/include/asm/sockios.h | 14 +- + arch/x86/include/asm/termbits.h | 199 +------- + arch/x86/include/asm/termios.h | 115 +---- + arch/x86/include/asm/types.h | 12 +- + arch/x86/include/asm/ucontext.h | 8 +- + arch/x86/kernel/cpu/mcheck/mce.c | 4 +- + arch/x86/kernel/cpu/mtrr/amd.c | 97 ++-- + arch/x86/kernel/cpu/mtrr/centaur.c | 168 ++----- + arch/x86/kernel/cpu/mtrr/cleanup.c | 350 ++++++------ + arch/x86/kernel/cpu/mtrr/cyrix.c | 94 ++-- + arch/x86/kernel/cpu/mtrr/generic.c | 304 ++++++----- + arch/x86/kernel/cpu/mtrr/if.c | 135 +++-- + arch/x86/kernel/cpu/mtrr/main.c | 455 +++++++++-------- + arch/x86/kernel/cpu/mtrr/mtrr.h | 19 +- + arch/x86/kernel/cpu/mtrr/state.c | 68 ++- + arch/x86/kernel/cpu/proc.c | 2 - + arch/x86/kernel/ds.c | 6 +- + arch/x86/kernel/process_32.c | 27 +- + arch/x86/kernel/process_64.c | 33 +- + arch/x86/kernel/traps.c | 33 +- + arch/x86/mm/fault.c | 51 +- + arch/x86/mm/highmem_32.c | 2 +- + arch/x86/oprofile/nmi_int.c | 101 ++-- + arch/x86/oprofile/op_model_amd.c | 267 ++++----- + arch/x86/oprofile/op_model_p4.c | 60 +-- + arch/x86/oprofile/op_model_ppro.c | 95 ++-- + arch/x86/oprofile/op_x86_model.h | 47 +- + drivers/oprofile/cpu_buffer.c | 16 +- + include/linux/irq.h | 7 - + include/linux/oprofile.h | 2 +- + include/linux/poison.h | 16 +- + include/linux/rcuclassic.h | 178 ------ + include/linux/rcupdate.h | 29 +- + include/linux/rcupreempt.h | 10 + + include/linux/rcutree.h | 12 +- + include/linux/sched.h | 6 + + init/Kconfig | 12 +- + kernel/Makefile | 1 - + kernel/irq/manage.c | 2 +- + kernel/kprobes.c | 30 +- + kernel/printk.c | 146 ++++-- + kernel/rcuclassic.c | 807 ---------------------------- + kernel/rcupdate.c | 25 + + kernel/rcutorture.c | 202 ++++---- + kernel/sched.c | 188 ++++++- + kernel/trace/kmemtrace.c | 120 +++- + kernel/trace/trace.c | 4 +- + kernel/trace/trace.h | 3 + + kernel/trace/trace_events.c | 37 ++- + 77 files changed, 2743 insertions(+), 3925 deletions(-) + create mode 100644 arch/x86/include/asm/paravirt_types.h + delete mode 100644 include/linux/rcuclassic.h + delete mode 100644 kernel/rcuclassic.c +Merging percpu/for-next +$ git merge percpu/for-next +Resolved 'arch/sh/kernel/vmlinux.lds.S' using previous resolution. +Resolved 'arch/x86/kernel/cpu/perf_counter.c' using previous resolution. +Resolved 'drivers/cpufreq/cpufreq_ondemand.c' using previous resolution. +Auto-merging Makefile +Auto-merging arch/ia64/kernel/smp.c +Auto-merging arch/mn10300/kernel/vmlinux.lds.S +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/sh/kernel/vmlinux.lds.S +CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging arch/x86/kernel/cpu/perf_counter.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_counter.c +Auto-merging arch/x86/kernel/vmlinux.lds.S +Auto-merging block/cfq-iosched.c +Auto-merging drivers/cpufreq/cpufreq_conservative.c +Auto-merging drivers/cpufreq/cpufreq_ondemand.c +CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_ondemand.c +Auto-merging drivers/xen/events.c +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging init/main.c +Auto-merging kernel/module.c +Auto-merging kernel/perf_counter.c +Auto-merging kernel/sched.c +Auto-merging kernel/trace/trace_events.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/Makefile +Auto-merging mm/page-writeback.c +Auto-merging mm/quicklist.c +Auto-merging mm/slub.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 27d0aa4] Merge commit 'percpu/for-next' +$ git diff -M --stat --summary HEAD^.. + Makefile | 2 +- + arch/alpha/include/asm/percpu.h | 100 +--- + arch/alpha/include/asm/tlbflush.h | 1 + + arch/alpha/kernel/vmlinux.lds.S | 9 +- + arch/arm/kernel/vmlinux.lds.S | 1 + + arch/avr32/kernel/vmlinux.lds.S | 9 +- + arch/blackfin/kernel/vmlinux.lds.S | 5 +- + arch/blackfin/mm/sram-alloc.c | 6 +- + arch/cris/include/asm/mmu_context.h | 3 +- + arch/cris/kernel/vmlinux.lds.S | 9 +- + arch/cris/mm/fault.c | 2 +- + arch/frv/kernel/vmlinux.lds.S | 2 + + arch/h8300/kernel/vmlinux.lds.S | 5 +- + arch/ia64/Kconfig | 3 + + arch/ia64/kernel/smp.c | 3 +- + arch/ia64/kernel/vmlinux.lds.S | 16 +- + arch/ia64/sn/kernel/setup.c | 2 +- + arch/m32r/kernel/vmlinux.lds.S | 10 +- + arch/m68k/kernel/vmlinux-std.lds | 10 +- + arch/m68k/kernel/vmlinux-sun3.lds | 9 +- + arch/m68knommu/kernel/vmlinux.lds.S | 7 +- + arch/microblaze/kernel/vmlinux.lds.S | 6 +- + arch/mips/kernel/vmlinux.lds.S | 21 +- + arch/mn10300/kernel/vmlinux.lds.S | 8 +- + arch/parisc/kernel/vmlinux.lds.S | 8 +- + arch/powerpc/Kconfig | 3 + + arch/powerpc/kernel/vmlinux.lds.S | 9 +- + arch/powerpc/mm/stab.c | 2 +- + arch/powerpc/platforms/ps3/smp.c | 2 +- + arch/s390/include/asm/percpu.h | 32 +- + arch/s390/kernel/vmlinux.lds.S | 9 +- + arch/sh/kernel/vmlinux.lds.S | 10 +- + arch/sparc/Kconfig | 3 - + arch/sparc/kernel/smp_64.c | 42 +- + arch/sparc/kernel/vmlinux.lds.S | 8 +- + arch/um/include/asm/common.lds.S | 5 - + arch/um/kernel/dyn.lds.S | 2 + + arch/um/kernel/uml.lds.S | 2 + + arch/x86/Kconfig | 3 - + arch/x86/include/asm/percpu.h | 9 - + arch/x86/kernel/cpu/cpu_debug.c | 4 +- + arch/x86/kernel/cpu/mcheck/mce.c | 8 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- + arch/x86/kernel/cpu/perf_counter.c | 14 +- + arch/x86/kernel/setup_percpu.c | 297 ++------ + arch/x86/kernel/vmlinux.lds.S | 11 +- + arch/x86/mm/pageattr.c | 1 + + arch/xtensa/kernel/vmlinux.lds.S | 13 +- + block/as-iosched.c | 10 +- + block/cfq-iosched.c | 10 +- + drivers/cpufreq/cpufreq_conservative.c | 12 +- + drivers/cpufreq/cpufreq_ondemand.c | 15 +- + drivers/xen/events.c | 13 +- + include/asm-generic/vmlinux.lds.h | 24 +- + include/linux/percpu-defs.h | 66 ++- + include/linux/percpu.h | 85 ++- + init/main.c | 24 - + kernel/module.c | 6 +- + kernel/perf_counter.c | 6 +- + kernel/sched.c | 4 +- + kernel/trace/trace_events.c | 6 +- + lib/Kconfig.debug | 15 + + mm/Makefile | 2 +- + mm/allocpercpu.c | 28 + + mm/kmemleak-test.c | 6 +- + mm/page-writeback.c | 5 +- + mm/percpu.c | 1316 +++++++++++++++++++++++++------- + mm/quicklist.c | 2 +- + mm/slub.c | 4 +- + net/ipv4/syncookies.c | 5 +- + net/ipv6/syncookies.c | 5 +- + net/rds/ib_stats.c | 2 +- + net/rds/iw_stats.c | 2 +- + net/rds/page.c | 2 +- + scripts/module-common.lds | 8 + + 75 files changed, 1504 insertions(+), 927 deletions(-) + create mode 100644 scripts/module-common.lds +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/include/asm/io_apic.h +Auto-merging arch/x86/kernel/apic/io_apic.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging init/main.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 5 + + MAINTAINERS | 12 + + arch/x86/Kconfig | 4 +- + arch/x86/include/asm/io_apic.h | 3 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/acpi/boot.c | 24 +-- + arch/x86/kernel/apic/io_apic.c | 27 ++- + arch/x86/kernel/setup.c | 3 + + arch/x86/kernel/sfi.c | 191 ++++++++++++++++ + arch/x86/pci/mmconfig-shared.c | 3 +- + drivers/Makefile | 1 + + drivers/acpi/tables.c | 3 + + drivers/sfi/Kconfig | 14 ++ + drivers/sfi/Makefile | 3 + + drivers/sfi/sfi_acpi.c | 151 +++++++++++++ + drivers/sfi/sfi_core.c | 406 +++++++++++++++++++++++++++++++++++ + drivers/sfi/sfi_core.h | 51 +++++ + include/linux/sfi.h | 187 ++++++++++++++++ + include/linux/sfi_acpi.h | 74 +++++++ + init/main.c | 2 + + 20 files changed, 1132 insertions(+), 33 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 quilt/driver-core +$ git merge quilt/driver-core +Resolved 'init/main.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging block/genhd.c +Auto-merging drivers/char/mem.c +Auto-merging drivers/infiniband/hw/ehca/ehca_main.c +Auto-merging drivers/s390/cio/css.c +Auto-merging drivers/s390/cio/device.c +Auto-merging drivers/s390/net/netiucv.c +Auto-merging include/linux/device.h +Auto-merging include/linux/netdevice.h +Auto-merging init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merging kernel/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9c881d4] Merge branch 'quilt/driver-core' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/uio-howto.tmpl | 163 ++++++++++++ + MAINTAINERS | 8 + + block/genhd.c | 2 +- + drivers/base/Kconfig | 25 ++ + drivers/base/Makefile | 2 + + drivers/base/base.h | 11 + + drivers/base/core.c | 27 ++- + 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/block/cciss.c | 2 +- + drivers/char/mem.c | 82 +++---- + drivers/firewire/core-device.c | 2 +- + drivers/firmware/dmi-id.c | 2 +- + 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/mmc/core/mmc.c | 2 +- + drivers/mmc/core/sd.c | 2 +- + drivers/mtd/mtdcore.c | 2 +- + 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/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/uwb/lc-dev.c | 2 +- + fs/partitions/check.c | 2 +- + include/linux/attribute_container.h | 2 +- + include/linux/device.h | 37 ++-- + include/linux/netdevice.h | 2 +- + include/linux/pci_regs.h | 1 + + include/linux/shmem_fs.h | 3 + + include/linux/transport_class.h | 2 +- + init/do_mounts.c | 2 +- + init/main.c | 2 + + kernel/Makefile | 1 - + mm/shmem.c | 9 +- + net/bluetooth/hci_sysfs.c | 4 +- + net/core/net-sysfs.c | 2 +- + 49 files changed, 949 insertions(+), 114 deletions(-) + create mode 100644 drivers/base/devtmpfs.c + rename {kernel => drivers/base}/dma-coherent.c (100%) + create mode 100644 drivers/uio/uio_pci_generic.c +Merging quilt/usb +$ git merge quilt/usb +Resolved 'drivers/usb/gadget/m66592-udc.c' using previous resolution. +Auto-merging arch/sh/kernel/cpu/sh4a/setup-sh7366.c +Auto-merging arch/sh/kernel/cpu/sh4a/setup-sh7722.c +Auto-merging arch/sh/kernel/cpu/sh4a/setup-sh7723.c +Auto-merging drivers/usb/gadget/Kconfig +Auto-merging drivers/usb/gadget/m66592-udc.c +CONFLICT (content): Merge conflict in drivers/usb/gadget/m66592-udc.c +Auto-merging drivers/usb/gadget/m66592-udc.h +Auto-merging drivers/usb/host/Kconfig +Auto-merging drivers/usb/host/ehci-pci.c +Auto-merging drivers/usb/host/ehci.h +Removing drivers/usb/mon/mon_dma.c +Auto-merging include/linux/usb.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 388d6e0] Merge branch 'quilt/usb' +$ git diff -M --stat --summary HEAD^.. + Documentation/usb/usbmon.txt | 2 +- + arch/arm/mach-omap2/board-omap3evm.c | 3 + + arch/arm/mach-omap2/usb-musb.c | 21 - + drivers/usb/Kconfig | 3 + + drivers/usb/Makefile | 1 + + drivers/usb/class/usbtmc.c | 56 +- + drivers/usb/core/devio.c | 166 ++- + drivers/usb/core/driver.c | 41 +- + drivers/usb/core/generic.c | 4 +- + drivers/usb/core/hub.c | 112 ++- + drivers/usb/core/message.c | 32 +- + drivers/usb/core/usb.h | 7 + + drivers/usb/gadget/Kconfig | 4 +- + drivers/usb/gadget/amd5536udc.c | 56 +- + drivers/usb/gadget/audio.c | 24 +- + drivers/usb/gadget/dummy_hcd.c | 5 - + drivers/usb/gadget/f_audio.c | 97 +- + drivers/usb/gadget/gmidi.c | 8 +- + drivers/usb/gadget/pxa25x_udc.c | 49 +- + drivers/usb/gadget/pxa25x_udc.h | 1 + + drivers/usb/gadget/s3c-hsotg.c | 6 +- + drivers/usb/host/Kconfig | 18 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-atmel.c | 230 +++ + drivers/usb/host/ehci-au1xxx.c | 28 +- + drivers/usb/host/ehci-dbg.c | 46 +- + drivers/usb/host/ehci-hcd.c | 36 +- + drivers/usb/host/ehci-hub.c | 62 +- + drivers/usb/host/ehci-mem.c | 26 +- + drivers/usb/host/ehci-pci.c | 3 + + drivers/usb/host/ehci-q.c | 50 +- + drivers/usb/host/ehci-sched.c | 66 +- + drivers/usb/host/ehci-w90x900.c | 181 +++ + drivers/usb/host/ehci.h | 13 +- + drivers/usb/host/isp1362-hcd.c | 2905 ++++++++++++++++++++++++++++++++++ + 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 | 26 +- + 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/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/Kconfig | 1 + + drivers/usb/serial/moto_modem.c | 2 +- + drivers/usb/serial/option.c | 134 ++- + drivers/usb/serial/usb-serial.c | 16 +- + drivers/usb/storage/datafab.c | 4 +- + drivers/usb/storage/jumpshot.c | 2 +- + include/linux/usb.h | 25 +- + include/linux/usb/audio.h | 283 ++-- + include/linux/usb/ch9.h | 8 + + include/linux/usb/ehci_def.h | 13 + + include/linux/usb/isp1362.h | 46 + + include/linux/usb/isp1760.h | 18 + + include/linux/usbdevice_fs.h | 2 + + 73 files changed, 5623 insertions(+), 765 deletions(-) + 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 +Removing drivers/staging/android/lowmemorykiller.txt +Auto-merging drivers/staging/at76_usb/at76_usb.c +Removing drivers/staging/epl/Benchmark.h +Removing drivers/staging/epl/Debug.h +Removing drivers/staging/epl/Edrv8139.c +Removing drivers/staging/epl/EdrvFec.h +Removing drivers/staging/epl/EdrvSim.h +Removing drivers/staging/epl/Epl.h +Removing drivers/staging/epl/EplAmi.h +Removing drivers/staging/epl/EplApiGeneric.c +Removing drivers/staging/epl/EplApiLinux.h +Removing drivers/staging/epl/EplApiLinuxKernel.c +Removing drivers/staging/epl/EplApiProcessImage.c +Removing drivers/staging/epl/EplCfg.h +Removing drivers/staging/epl/EplDef.h +Removing drivers/staging/epl/EplDll.h +Removing drivers/staging/epl/EplDllCal.h +Removing drivers/staging/epl/EplDllk.c +Removing drivers/staging/epl/EplDllkCal.c +Removing drivers/staging/epl/EplDlluCal.c +Removing drivers/staging/epl/EplErrDef.h +Removing drivers/staging/epl/EplErrorHandlerk.c +Removing drivers/staging/epl/EplEvent.h +Removing drivers/staging/epl/EplEventk.c +Removing drivers/staging/epl/EplEventu.c +Removing drivers/staging/epl/EplFrame.h +Removing drivers/staging/epl/EplIdentu.c +Removing drivers/staging/epl/EplInc.h +Removing drivers/staging/epl/EplInstDef.h +Removing drivers/staging/epl/EplLed.h +Removing drivers/staging/epl/EplNmt.h +Removing drivers/staging/epl/EplNmtCnu.c +Removing drivers/staging/epl/EplNmtMnu.c +Removing drivers/staging/epl/EplNmtk.c +Removing drivers/staging/epl/EplNmtkCal.c +Removing drivers/staging/epl/EplNmtu.c +Removing drivers/staging/epl/EplNmtuCal.c +Removing drivers/staging/epl/EplObd.c +Removing drivers/staging/epl/EplObd.h +Removing drivers/staging/epl/EplObdMacro.h +Removing drivers/staging/epl/EplObdkCal.c +Removing drivers/staging/epl/EplObdu.c +Removing drivers/staging/epl/EplObduCal.c +Removing drivers/staging/epl/EplPdo.h +Removing drivers/staging/epl/EplPdok.c +Removing drivers/staging/epl/EplPdokCal.c +Removing drivers/staging/epl/EplPdou.c +Removing drivers/staging/epl/EplSdo.h +Removing drivers/staging/epl/EplSdoAc.h +Removing drivers/staging/epl/EplSdoAsndu.c +Removing drivers/staging/epl/EplSdoAsySequ.c +Removing drivers/staging/epl/EplSdoComu.c +Removing drivers/staging/epl/EplSdoUdpu.c +Removing drivers/staging/epl/EplStatusu.c +Removing drivers/staging/epl/EplTarget.h +Removing drivers/staging/epl/EplTimer.h +Removing drivers/staging/epl/EplTimeruLinuxKernel.c +Removing drivers/staging/epl/EplVersion.h +Removing drivers/staging/epl/Kconfig +Removing drivers/staging/epl/Makefile +Removing drivers/staging/epl/SharedBuff.c +Removing drivers/staging/epl/SharedBuff.h +Removing drivers/staging/epl/ShbIpc-LinuxKernel.c +Removing drivers/staging/epl/ShbIpc.h +Removing drivers/staging/epl/ShbLinuxKernel.h +Removing drivers/staging/epl/SocketLinuxKernel.c +Removing drivers/staging/epl/SocketLinuxKernel.h +Removing drivers/staging/epl/TimerHighReskX86.c +CONFLICT (delete/modify): drivers/staging/epl/VirtualEthernetLinux.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/epl/VirtualEthernetLinux.c left in tree. +Removing drivers/staging/epl/amix86.c +Removing drivers/staging/epl/demo_main.c +Removing drivers/staging/epl/edrv.h +Removing drivers/staging/epl/global.h +Removing drivers/staging/epl/kernel/EplDllk.h +Removing drivers/staging/epl/kernel/EplDllkCal.h +Removing drivers/staging/epl/kernel/EplErrorHandlerk.h +Removing drivers/staging/epl/kernel/EplEventk.h +Removing drivers/staging/epl/kernel/EplNmtk.h +Removing drivers/staging/epl/kernel/EplObdk.h +Removing drivers/staging/epl/kernel/EplPdok.h +Removing drivers/staging/epl/kernel/EplPdokCal.h +Removing drivers/staging/epl/kernel/EplTimerHighResk.h +Removing drivers/staging/epl/kernel/EplTimerk.h +Removing drivers/staging/epl/kernel/VirtualEthernet.h +Removing drivers/staging/epl/proc_fs.c +Removing drivers/staging/epl/proc_fs.h +Removing drivers/staging/epl/user/EplCfgMau.h +Removing drivers/staging/epl/user/EplDllu.h +Removing drivers/staging/epl/user/EplDlluCal.h +Removing drivers/staging/epl/user/EplEventu.h +Removing drivers/staging/epl/user/EplIdentu.h +Removing drivers/staging/epl/user/EplLedu.h +Removing drivers/staging/epl/user/EplNmtCnu.h +Removing drivers/staging/epl/user/EplNmtMnu.h +Removing drivers/staging/epl/user/EplNmtu.h +Removing drivers/staging/epl/user/EplNmtuCal.h +Removing drivers/staging/epl/user/EplObdu.h +Removing drivers/staging/epl/user/EplObduCal.h +Removing drivers/staging/epl/user/EplPdou.h +Removing drivers/staging/epl/user/EplSdoAsndu.h +Removing drivers/staging/epl/user/EplSdoAsySequ.h +Removing drivers/staging/epl/user/EplSdoComu.h +Removing drivers/staging/epl/user/EplSdoUdpu.h +Removing drivers/staging/epl/user/EplStatusu.h +Removing drivers/staging/epl/user/EplTimeru.h +Auto-merging drivers/staging/otus/usbdrv.c +Auto-merging drivers/staging/otus/wrap_pkt.c +Auto-merging drivers/staging/rt2860/rt_main_dev.c +Removing drivers/staging/rtl8187se/dot11d.h +Removing drivers/staging/rtl8187se/ieee80211.h +Auto-merging drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c +Removing drivers/staging/rtl8187se/ieee80211/internal.h +Removing drivers/staging/rtl8187se/ieee80211/rtl_crypto.h +Removing drivers/staging/rtl8187se/ieee80211_crypt.h +Auto-merging drivers/staging/rtl8187se/r8180_core.c +Removing drivers/staging/rtl8187se/r8180_gct.c +Removing drivers/staging/rtl8187se/r8180_gct.h +Removing drivers/staging/rtl8187se/r8180_max2820.c +Removing drivers/staging/rtl8187se/r8180_max2820.h +Removing drivers/staging/rtl8187se/r8180_pm.c +Removing drivers/staging/rtl8187se/r8180_pm.h +Removing drivers/staging/rtl8187se/r8180_rtl8225.c +Removing drivers/staging/rtl8187se/r8180_rtl8255.c +Removing drivers/staging/rtl8187se/r8180_rtl8255.h +Removing drivers/staging/rtl8187se/r8180_sa2400.c +Removing drivers/staging/rtl8187se/r8180_sa2400.h +Removing drivers/staging/rtl8192su/dot11d.h +Removing drivers/staging/rtl8192su/ieee80211.h +Removing drivers/staging/rtl8192su/ieee80211/EndianFree.h +Removing drivers/staging/rtl8192su/ieee80211/aes.c +Removing drivers/staging/rtl8192su/ieee80211/api.c +Removing drivers/staging/rtl8192su/ieee80211/arc4.c +Removing drivers/staging/rtl8192su/ieee80211/autoload.c +Removing drivers/staging/rtl8192su/ieee80211/cipher.c +Removing drivers/staging/rtl8192su/ieee80211/compress.c +Removing drivers/staging/rtl8192su/ieee80211/crypto_compat.h +Removing drivers/staging/rtl8192su/ieee80211/digest.c +Removing drivers/staging/rtl8192su/ieee80211/internal.h +Removing drivers/staging/rtl8192su/ieee80211/kmap_types.h +Removing drivers/staging/rtl8192su/ieee80211/michael_mic.c +Removing drivers/staging/rtl8192su/ieee80211/proc.c +Removing drivers/staging/rtl8192su/ieee80211/rtl_crypto.h +Removing drivers/staging/rtl8192su/ieee80211/scatterwalk.c +Removing drivers/staging/rtl8192su/ieee80211/scatterwalk.h +Removing drivers/staging/rtl8192su/ieee80211_crypt.h +Removing drivers/staging/rtl8192su/r8190_rtl8256.c +Removing drivers/staging/rtl8192su/r8190_rtl8256.h +Removing drivers/staging/rtl8192su/r8192S_FwImgDTM.h +Removing drivers/staging/rtl8192su/r8192U_hw.h +Removing drivers/staging/rtl8192su/r819xU_firmware.c +Removing drivers/staging/rtl8192su/r819xU_firmware.h +Removing drivers/staging/rtl8192su/r819xU_firmware_img.c +Removing drivers/staging/rtl8192su/r819xU_firmware_img.h +Removing drivers/staging/rtl8192su/r819xU_phy.c +Removing drivers/staging/rtl8192su/r819xU_phy.h +Removing drivers/staging/rtl8192su/r819xU_phyreg.h +Auto-merging drivers/staging/slicoss/slicoss.c +Removing drivers/staging/uc2322/Kconfig +Removing drivers/staging/uc2322/Makefile +Removing drivers/staging/uc2322/TODO +Removing drivers/staging/uc2322/aten2011.c +Removing drivers/staging/vt6655/Makefile.arm +Removing drivers/staging/vt6655/Makefile.x86 +Auto-merging drivers/staging/wlan-ng/p80211netdev.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/epl/VirtualEthernetLinux.c +drivers/staging/epl/VirtualEthernetLinux.c: needs merge +rm 'drivers/staging/epl/VirtualEthernetLinux.c' +$ git commit -v -a +[master abbb106] Merge branch 'quilt/staging' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/Kconfig | 16 +- + drivers/staging/Makefile | 8 +- + drivers/staging/android/binder.c | 709 +- + drivers/staging/android/lowmemorykiller.c | 35 +- + drivers/staging/android/lowmemorykiller.txt | 16 - + drivers/staging/at76_usb/at76_usb.c | 131 +- + 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 +- + 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 | 1016 ++-- + 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/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/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 | 793 ++ + 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 | 3995 +++++++++++ + 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/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 | 635 ++ + drivers/staging/dream/synaptics_i2c_rmi.h | 53 + + drivers/staging/dst/export.c | 2 +- + 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/et1310_address_map.h | 2138 +++--- + drivers/staging/et131x/et1310_eeprom.c | 46 +- + drivers/staging/et131x/et1310_eeprom.h | 6 +- + drivers/staging/et131x/et1310_jagcore.c | 20 +- + drivers/staging/et131x/et1310_jagcore.h | 17 +- + drivers/staging/et131x/et1310_mac.c | 114 +- + drivers/staging/et131x/et1310_mac.h | 8 +- + drivers/staging/et131x/et1310_phy.c | 202 +- + drivers/staging/et131x/et1310_phy.h | 904 ++-- + drivers/staging/et131x/et1310_pm.c | 19 +- + drivers/staging/et131x/et1310_pm.h | 8 +- + drivers/staging/et131x/et1310_rx.c | 115 +- + drivers/staging/et131x/et1310_rx.h | 194 +- + drivers/staging/et131x/et1310_tx.c | 120 +- + drivers/staging/et131x/et1310_tx.h | 102 +- + drivers/staging/et131x/et131x_adapter.h | 72 +- + drivers/staging/et131x/et131x_config.c | 38 +- + drivers/staging/et131x/et131x_debug.c | 12 +- + drivers/staging/et131x/et131x_debug.h | 24 +- + drivers/staging/et131x/et131x_defs.h | 12 +- + drivers/staging/et131x/et131x_initpci.c | 74 +- + drivers/staging/et131x/et131x_initpci.h | 6 +- + drivers/staging/et131x/et131x_isr.c | 44 +- + drivers/staging/et131x/et131x_isr.h | 6 +- + drivers/staging/et131x/et131x_netdev.c | 123 +- + drivers/staging/et131x/et131x_netdev.h | 6 +- + drivers/staging/et131x/et131x_version.h | 6 +- + drivers/staging/hv/BlkVsc.c | 108 + + drivers/staging/hv/Channel.c | 1205 ++++ + drivers/staging/hv/Channel.h | 157 + + drivers/staging/hv/ChannelInterface.c | 222 + + drivers/staging/hv/ChannelInterface.h | 41 + + drivers/staging/hv/ChannelMgmt.c | 819 +++ + drivers/staging/hv/ChannelMgmt.h | 156 + + drivers/staging/hv/Connection.c | 438 ++ + drivers/staging/hv/Hv.c | 665 ++ + drivers/staging/hv/Hv.h | 184 + + drivers/staging/hv/Kconfig | 28 + + drivers/staging/hv/Makefile | 9 + + drivers/staging/hv/NetVsc.c | 1519 ++++ + drivers/staging/hv/NetVsc.h | 91 + + drivers/staging/hv/RingBuffer.c | 632 ++ + drivers/staging/hv/RingBuffer.h | 123 + + drivers/staging/hv/RndisFilter.c | 1160 +++ + drivers/staging/hv/RndisFilter.h | 61 + + drivers/staging/hv/Sources.c | 30 + + drivers/staging/hv/StorVsc.c | 988 +++ + drivers/staging/hv/TODO | 14 + + drivers/staging/hv/VersionInfo.h | 29 + + drivers/staging/hv/Vmbus.c | 522 ++ + drivers/staging/hv/VmbusPrivate.h | 173 + + drivers/staging/hv/blkvsc_drv.c | 1522 ++++ + drivers/staging/hv/include/ChannelMessages.h | 315 + + drivers/staging/hv/include/HvHalApi.h | 32 + + drivers/staging/hv/include/HvHcApi.h | 60 + + drivers/staging/hv/include/HvPtApi.h | 86 + + drivers/staging/hv/include/HvStatus.h | 718 ++ + drivers/staging/hv/include/HvSynicApi.h | 490 ++ + drivers/staging/hv/include/HvTypes.h | 31 + + drivers/staging/hv/include/HvVpApi.h | 51 + + drivers/staging/hv/include/List.h | 269 + + drivers/staging/hv/include/NetVscApi.h | 153 + + drivers/staging/hv/include/StorVscApi.h | 139 + + drivers/staging/hv/include/VmbusApi.h | 263 + + drivers/staging/hv/include/VmbusChannelInterface.h | 121 + + drivers/staging/hv/include/VmbusPacketFormat.h | 320 + + drivers/staging/hv/include/logging.h | 120 + + drivers/staging/hv/include/nvspprotocol.h | 306 + + drivers/staging/hv/include/osd.h | 166 + + drivers/staging/hv/include/rndis.h | 836 +++ + drivers/staging/hv/include/vmbus.h | 99 + + drivers/staging/hv/include/vstorage.h | 307 + + drivers/staging/hv/netvsc_drv.c | 705 ++ + drivers/staging/hv/osd.c | 324 + + drivers/staging/hv/storvsc_drv.c | 1202 ++++ + drivers/staging/hv/vmbus_drv.c | 1105 +++ + drivers/staging/line6/driver.c | 2 +- + drivers/staging/meilhaus/me0600_device.h | 2 +- + drivers/staging/meilhaus/me0900_device.h | 2 +- + drivers/staging/meilhaus/me1400_device.h | 2 +- + drivers/staging/meilhaus/me1600_device.h | 2 +- + drivers/staging/meilhaus/me4600_ai.c | 16 +- + drivers/staging/meilhaus/me4600_device.h | 2 +- + drivers/staging/meilhaus/me6000_device.h | 2 +- + drivers/staging/meilhaus/me8100_device.h | 2 +- + drivers/staging/meilhaus/me8200_device.h | 2 +- + drivers/staging/meilhaus/metempl_device.h | 2 +- + drivers/staging/otus/80211core/cagg.c | 6 +- + drivers/staging/otus/80211core/cmm.c | 4 +- + drivers/staging/otus/ioctl.c | 25 +- + drivers/staging/otus/usbdrv.c | 14 - + 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/quatech_usb2/Kconfig | 15 + + drivers/staging/quatech_usb2/Makefile | 1 + + drivers/staging/quatech_usb2/quatech_usb2.c | 611 ++ + drivers/staging/rt2860/rt_linux.h | 33 +- + drivers/staging/rt2860/rt_main_dev.c | 2 +- + drivers/staging/rt2860/sta_ioctl.c | 7 +- + drivers/staging/rt2870/2870_main_dev.c | 4 +- + drivers/staging/rt2870/rt2870.h | 5 + + 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 + + .../{rt2860/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/{rt2870/md4.h => rt3090/ap_ids.h} | 66 +- + drivers/staging/{rt2870/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/rt3090/link_list.h | 133 + + drivers/staging/rt3090/mac_pci.h | 454 ++ + drivers/staging/rt3090/mlme.h | 1360 ++++ + drivers/staging/{rt2870/md4.h => rt3090/mlme_ex.h} | 67 +- + .../staging/{rt2870/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 | 1194 +++ + drivers/staging/{rt2870/md4.h => rt3090/rt3090.h} | 59 +- + drivers/staging/{rt2860/md4.h => rt3090/rt30xx.h} | 30 +- + drivers/staging/{rt2860/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/ieee80211_crypt.h | 86 - + drivers/staging/rtl8187se/r8180.h | 24 +- + drivers/staging/rtl8187se/r8180_93cx6.h | 2 - + drivers/staging/rtl8187se/r8180_core.c | 2952 +------- + 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_gct.h | 25 - + 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_pm.h | 28 - + 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/rtl8192su/Makefile | 38 +- + drivers/staging/rtl8192su/TODO | 18 + + drivers/staging/rtl8192su/dot11d.h | 102 - + drivers/staging/rtl8192su/ieee80211.h | 2901 -------- + 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 | 75 +- + .../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 | 25 +- + drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 270 +- + 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 | 43 - + 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/rtl_crypto.h | 399 -- + drivers/staging/rtl8192su/ieee80211/scatterwalk.c | 126 - + drivers/staging/rtl8192su/ieee80211/scatterwalk.h | 51 - + drivers/staging/rtl8192su/ieee80211_crypt.h | 86 - + drivers/staging/rtl8192su/r8180_93cx6.h | 5 - + drivers/staging/rtl8192su/r8190_rtl8256.c | 312 - + drivers/staging/rtl8192su/r8190_rtl8256.h | 27 - + 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 | 4880 +------------- + drivers/staging/rtl8192su/r8192U_dm.c | 550 +-- + drivers/staging/rtl8192su/r8192U_dm.h | 55 - + drivers/staging/rtl8192su/r8192U_hw.h | 746 -- + 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/rtl8192su/r819xU_phy.c | 1826 ----- + drivers/staging/rtl8192su/r819xU_phy.h | 94 - + drivers/staging/rtl8192su/r819xU_phyreg.h | 871 --- + drivers/staging/serqt_usb2/serqt_usb2.c | 20 +- + drivers/staging/slicoss/slicoss.c | 2 +- + drivers/staging/sxg/sxg.c | 2 +- + drivers/staging/uc2322/Kconfig | 10 - + drivers/staging/uc2322/Makefile | 1 - + drivers/staging/uc2322/TODO | 7 - + drivers/staging/uc2322/aten2011.c | 2430 ------- + drivers/staging/udlfb/udlfb.c | 1 + + 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/vt6655/80211mgr.c | 2 +- + drivers/staging/vt6655/80211mgr.h | 2 +- + drivers/staging/vt6655/IEEE11h.c | 8 +- + drivers/staging/vt6655/Kconfig | 2 +- + drivers/staging/vt6655/Makefile | 2 +- + drivers/staging/vt6655/Makefile.arm | 181 - + drivers/staging/vt6655/Makefile.x86 | 209 - + drivers/staging/vt6655/bssdb.c | 2 +- + drivers/staging/vt6655/desc.h | 9 - + drivers/staging/vt6655/device.h | 98 - + drivers/staging/vt6655/device_main.c | 320 +- + drivers/staging/vt6655/dpc.c | 112 +- + drivers/staging/vt6655/hostap.c | 35 +- + drivers/staging/vt6655/hostap.h | 8 - + drivers/staging/vt6655/iwctl.c | 87 - + drivers/staging/vt6655/iwctl.h | 87 - + drivers/staging/vt6655/kcompat.h | 4 - + drivers/staging/vt6655/power.c | 2 +- + drivers/staging/vt6655/power.h | 2 +- + drivers/staging/vt6655/tmacro.h | 4 - + drivers/staging/vt6655/wctl.c | 4 - + drivers/staging/vt6655/wmgr.c | 6 +- + drivers/staging/vt6655/wmgr.h | 4 +- + drivers/staging/vt6655/wpa.c | 4 +- + drivers/staging/vt6656/80211hdr.h | 358 + + drivers/staging/vt6656/80211mgr.c | 1050 +++ + drivers/staging/vt6656/80211mgr.h | 867 +++ + drivers/staging/vt6656/Kconfig | 6 + + drivers/staging/vt6656/Makefile | 39 + + drivers/staging/vt6656/aes_ccmp.c | 410 ++ + drivers/staging/vt6656/aes_ccmp.h | 48 + + drivers/staging/vt6656/baseband.c | 2129 ++++++ + drivers/staging/vt6656/baseband.h | 163 + + drivers/staging/vt6656/bssdb.c | 1768 +++++ + drivers/staging/vt6656/bssdb.h | 370 + + drivers/staging/vt6656/card.c | 1147 +++ + drivers/staging/vt6656/card.h | 109 + + drivers/staging/vt6656/channel.c | 535 ++ + drivers/staging/vt6656/channel.h | 58 + + drivers/staging/vt6656/control.c | 116 + + drivers/staging/vt6656/control.h | 103 + + drivers/staging/vt6656/country.h | 163 + + drivers/staging/vt6656/datarate.c | 518 ++ + drivers/staging/vt6656/datarate.h | 110 + + drivers/staging/vt6656/desc.h | 453 ++ + drivers/staging/vt6656/device.h | 976 +++ + drivers/staging/vt6656/device_cfg.h | 142 + + drivers/staging/vt6656/dpc.c | 1658 +++++ + drivers/staging/vt6656/dpc.h | 94 + + drivers/staging/vt6656/firmware.c | 887 +++ + drivers/staging/vt6656/firmware.h | 66 + + drivers/staging/vt6656/hostap.c | 888 +++ + drivers/staging/vt6656/hostap.h | 86 + + drivers/staging/vt6656/int.c | 214 + + drivers/staging/vt6656/int.h | 101 + + drivers/staging/vt6656/iocmd.h | 478 ++ + drivers/staging/vt6656/ioctl.c | 724 ++ + drivers/staging/vt6656/ioctl.h | 74 + + drivers/staging/vt6656/iowpa.h | 159 + + drivers/staging/vt6656/iwctl.c | 2214 ++++++ + drivers/staging/vt6656/iwctl.h | 246 + + drivers/staging/vt6656/kcompat.h | 83 + + drivers/staging/vt6656/key.c | 886 +++ + drivers/staging/vt6656/key.h | 196 + + drivers/staging/vt6656/mac.c | 500 ++ + drivers/staging/vt6656/mac.h | 458 ++ + drivers/staging/vt6656/main_usb.c | 2257 ++++++ + drivers/staging/vt6656/mib.c | 592 ++ + drivers/staging/vt6656/mib.h | 445 ++ + drivers/staging/vt6656/michael.c | 188 + + drivers/staging/vt6656/michael.h | 62 + + drivers/staging/vt6656/power.c | 458 ++ + drivers/staging/vt6656/power.h | 84 + + drivers/staging/vt6656/rc4.c | 89 + + drivers/staging/vt6656/rc4.h | 51 + + drivers/staging/vt6656/rf.c | 1163 +++ + drivers/staging/vt6656/rf.h | 112 + + drivers/staging/vt6656/rndis.h | 162 + + drivers/staging/vt6656/rxtx.c | 3280 +++++++++ + drivers/staging/vt6656/rxtx.h | 716 ++ + drivers/staging/vt6656/srom.h | 144 + + drivers/staging/vt6656/tbit.h | 78 + + drivers/staging/vt6656/tcrc.c | 207 + + drivers/staging/vt6656/tcrc.h | 71 + + drivers/staging/vt6656/tether.c | 123 + + drivers/staging/vt6656/tether.h | 256 + + drivers/staging/vt6656/tkip.c | 284 + + drivers/staging/vt6656/tkip.h | 76 + + drivers/staging/vt6656/tmacro.h | 148 + + drivers/staging/vt6656/tpci.h | 119 + + drivers/staging/vt6656/ttype.h | 399 ++ + drivers/staging/vt6656/umem.h | 75 + + drivers/staging/vt6656/upc.h | 171 + + drivers/staging/vt6656/usbpipe.c | 857 +++ + drivers/staging/vt6656/usbpipe.h | 116 + + drivers/staging/vt6656/vntconfiguration.dat | 6 + + drivers/staging/vt6656/wcmd.c | 1397 ++++ + drivers/staging/vt6656/wcmd.h | 156 + + drivers/staging/vt6656/wctl.c | 263 + + drivers/staging/vt6656/wctl.h | 127 + + drivers/staging/vt6656/wmgr.c | 4993 +++++++++++++ + drivers/staging/vt6656/wmgr.h | 519 ++ + drivers/staging/vt6656/wpa.c | 339 + + drivers/staging/vt6656/wpa.h | 98 + + drivers/staging/vt6656/wpa2.c | 373 + + drivers/staging/vt6656/wpa2.h | 99 + + drivers/staging/vt6656/wpactl.c | 1030 +++ + drivers/staging/vt6656/wpactl.h | 90 + + 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 | 46 +- + 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 +- + 795 files changed, 224336 insertions(+), 114324 deletions(-) + delete mode 100644 drivers/staging/android/lowmemorykiller.txt + 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/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/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 + 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/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/Sources.c + create mode 100644 drivers/staging/hv/StorVsc.c + 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/VmbusPrivate.h + create mode 100644 drivers/staging/hv/blkvsc_drv.c + create mode 100644 drivers/staging/hv/include/ChannelMessages.h + create mode 100644 drivers/staging/hv/include/HvHalApi.h + create mode 100644 drivers/staging/hv/include/HvHcApi.h + create mode 100644 drivers/staging/hv/include/HvPtApi.h + create mode 100644 drivers/staging/hv/include/HvStatus.h + create mode 100644 drivers/staging/hv/include/HvSynicApi.h + create mode 100644 drivers/staging/hv/include/HvTypes.h + create mode 100644 drivers/staging/hv/include/HvVpApi.h + create mode 100644 drivers/staging/hv/include/List.h + create mode 100644 drivers/staging/hv/include/NetVscApi.h + create mode 100644 drivers/staging/hv/include/StorVscApi.h + create mode 100644 drivers/staging/hv/include/VmbusApi.h + create mode 100644 drivers/staging/hv/include/VmbusChannelInterface.h + create mode 100644 drivers/staging/hv/include/VmbusPacketFormat.h + create mode 100644 drivers/staging/hv/include/logging.h + create mode 100644 drivers/staging/hv/include/nvspprotocol.h + create mode 100644 drivers/staging/hv/include/osd.h + create mode 100644 drivers/staging/hv/include/rndis.h + create mode 100644 drivers/staging/hv/include/vmbus.h + create mode 100644 drivers/staging/hv/include/vstorage.h + create mode 100644 drivers/staging/hv/netvsc_drv.c + create mode 100644 drivers/staging/hv/osd.c + create mode 100644 drivers/staging/hv/storvsc_drv.c + create mode 100644 drivers/staging/hv/vmbus_drv.c + create mode 100644 drivers/staging/quatech_usb2/Kconfig + create mode 100644 drivers/staging/quatech_usb2/Makefile + create mode 100644 drivers/staging/quatech_usb2/quatech_usb2.c + 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/{rt2860/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/{rt2870/md4.h => rt3090/ap_ids.h} (56%) + copy drivers/staging/{rt2870/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 + create mode 100644 drivers/staging/rt3090/link_list.h + 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/{rt2870/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/{rt2860/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/ieee80211_crypt.h + delete mode 100644 drivers/staging/rtl8187se/r8180_gct.c + delete mode 100644 drivers/staging/rtl8187se/r8180_gct.h + 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_pm.h + 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/rtl8192su/TODO + delete mode 100644 drivers/staging/rtl8192su/dot11d.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211.h + 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/rtl_crypto.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211/scatterwalk.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/scatterwalk.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211_crypt.h + delete mode 100644 drivers/staging/rtl8192su/r8190_rtl8256.c + delete mode 100644 drivers/staging/rtl8192su/r8190_rtl8256.h + delete mode 100644 drivers/staging/rtl8192su/r8192S_FwImgDTM.h + delete mode 100644 drivers/staging/rtl8192su/r8192U_hw.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 + delete mode 100644 drivers/staging/rtl8192su/r819xU_phy.c + delete mode 100644 drivers/staging/rtl8192su/r819xU_phy.h + delete mode 100644 drivers/staging/rtl8192su/r819xU_phyreg.h + delete mode 100644 drivers/staging/uc2322/Kconfig + delete mode 100644 drivers/staging/uc2322/Makefile + delete mode 100644 drivers/staging/uc2322/TODO + delete mode 100644 drivers/staging/uc2322/aten2011.c + delete mode 100644 drivers/staging/vt6655/Makefile.arm + delete mode 100644 drivers/staging/vt6655/Makefile.x86 + 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/aes_ccmp.c + create mode 100644 drivers/staging/vt6656/aes_ccmp.h + 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 + create mode 100644 drivers/staging/vt6656/channel.h + create mode 100644 drivers/staging/vt6656/control.c + create mode 100644 drivers/staging/vt6656/control.h + 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 + create mode 100644 drivers/staging/vt6656/dpc.h + create mode 100644 drivers/staging/vt6656/firmware.c + create mode 100644 drivers/staging/vt6656/firmware.h + create mode 100644 drivers/staging/vt6656/hostap.c + create mode 100644 drivers/staging/vt6656/hostap.h + create mode 100644 drivers/staging/vt6656/int.c + create mode 100644 drivers/staging/vt6656/int.h + create mode 100644 drivers/staging/vt6656/iocmd.h + create mode 100644 drivers/staging/vt6656/ioctl.c + create mode 100644 drivers/staging/vt6656/ioctl.h + 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 + create mode 100644 drivers/staging/vt6656/michael.h + create mode 100644 drivers/staging/vt6656/power.c + create mode 100644 drivers/staging/vt6656/power.h + 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/tbit.h + create mode 100644 drivers/staging/vt6656/tcrc.c + create mode 100644 drivers/staging/vt6656/tcrc.h + create mode 100644 drivers/staging/vt6656/tether.c + create mode 100644 drivers/staging/vt6656/tether.h + create mode 100644 drivers/staging/vt6656/tkip.c + create mode 100644 drivers/staging/vt6656/tkip.h + create mode 100644 drivers/staging/vt6656/tmacro.h + create mode 100644 drivers/staging/vt6656/tpci.h + create mode 100644 drivers/staging/vt6656/ttype.h + create mode 100644 drivers/staging/vt6656/umem.h + create mode 100644 drivers/staging/vt6656/upc.h + create mode 100644 drivers/staging/vt6656/usbpipe.c + create mode 100644 drivers/staging/vt6656/usbpipe.h + 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 + create mode 100644 drivers/staging/vt6656/wpa.h + create mode 100644 drivers/staging/vt6656/wpa2.c + create mode 100644 drivers/staging/vt6656/wpa2.h + create mode 100644 drivers/staging/vt6656/wpactl.c + create mode 100644 drivers/staging/vt6656/wpactl.h +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..44c36496259f --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,532 @@ +Importing driver-core.current based on 2.6.31-rc4-git2 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 4733fd328f14280900435d9dbae1487d110a4d56 +HEAD is now at 4733fd3 mm: Remove duplicate definitions in MIPS and SH +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core.current +sysfs-fix-hardlink-count-on-device_move.patch +driver-core-firmware_class-fix-memory-leak-of-page-pointers-array.patch +dynamic-debug-fix-typo.patch +driver-core-sysdev-do-not-send-kobj_add-uevent-if-kobject_init_and_add-fails.patch +driver-core-documentation-make-it-clear-that-sysfs-is-optional.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/driver-core.current +From ../quilt-tmp + + 59bce14...42065e4 master -> quilt/driver-core.current (forced update) +Importing usb.current based on quilt/driver-core.current +$ cd ../quilt-tmp +$ git reset --hard 42065e425599e48897355397f0fadb2ab2d6ac48 +HEAD is now at 42065e4 driver core: documentation: make it clear that sysfs is optional +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb.current +usb-option-remove-unused-variable.patch +usb-let-the-option-driver-compile-without-config_pm.patch +usb-storage-raise-timeout-in-usb_stor_bulk_max_lun.patch +usb-omap-ohci-hc_driver-s-stop-method-should-call-ohci_stop.patch +usb-ftdi_sio-add-support-for-gn-otometrics-aurical-usb-audiometer.patch +usb-cp210x-add-new-device-ids.patch +usb-ehci-orion-call-ehci_reset-before-ehci_halt.patch +usb-option-add-zte-device-ids-and-remove-onda-ids.patch +usb-option-add-usb-id-for-novatel-mc727-u727-usb727-refresh.patch +usb-aten-uc2324-is-really-a-moschip-7840.patch +usb-serial-option-add-zte-ac8710-usb-modem-device.patch +usb-option.c-to-support-alcatel-x060s-x200-broadband-modems.patch +usb-musb_gadget_ep0-fix-typo-in-service_zero_data_request.patch +usb-musb-refer-to-musb_otg_timer_func-under-correct-ifdef.patch +usb-musb-fix-configdata-register-read-issue.patch +usb-usbtest-no-need-for-usb_devicefs.patch +usb-xhci-fix-less-and-greater-than-confusion.patch +usb-xhci-set-td-size-in-transfer-trb.patch +usb-xhci-deal-with-stalled-endpoints.patch +usb-xhci-use-gfp_atomic-while-holding-spinlocks.patch +usb-xhci-represent-64-bit-addresses-with-one-u64.patch +usb-xhci-handle-short-control-packets-correctly.patch +usb-xhci-correct-event-handler-busy-flag-usage.patch +usb-xhci-make-debugging-more-verbose.patch +usb-xhci-don-t-oops-if-the-host-doesn-t-halt.patch +usb-xhci-check-if-the-host-controller-died-in-irq-handler.patch +usb-xhci-setup-hw-retries-correctly.patch +usb-xhci-handle-babble-errors-on-transfers.patch +usb-xhci-fail-gracefully-if-there-s-no-ss-ep-companion-descriptor.patch +usb-fix-parsing-of-superspeed-endpoint-companion-descriptor.patch +usb-xhci-scratchpad-buffer-allocation.patch +usb-xhci-always-align-output-device-contexts-to-64-bytes.patch +usb-xhci-support-for-64-byte-contexts.patch +usb-xhci-stall-handling-bug-fixes.patch +usb-pl2303-new-vendor-and-product-id.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/usb.current +From ../quilt-tmp + + 7222a2d...d3087a9 master -> quilt/usb.current (forced update) +Importing i2c based on 2.6.31-rc4-git1 +$ cd ../quilt-tmp +$ git reset --hard fc013a58859b7cf85e53a05804a74952fe0a4117 +HEAD is now at fc013a5 Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-tsl2550-fix-lux-value-in-dark-env.patch +i2c-drop-i2c_driver-id.patch +i2c-taos-evm-switch-echo-off.patch +i2c-tsl2550-simpify-IO.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + 9fca6b5...25468dc master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.31-rc4-git1 +$ cd ../quilt-tmp +$ git reset --hard fc013a58859b7cf85e53a05804a74952fe0a4117 +HEAD is now at fc013a5 Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-smsc47m1-reject-LPC47M233.patch +hwmon-asus_atk0110-fix-upper-limit-readings.patch +hwmon-vid-limit-AMD-0Fh-6-bit-VID.patch +hwmon-driver-for-TI-TMP421-TMP422-TMP423-chips.patch +hwmon-tmp421-add-documentation.patch +hwmon-use-resource_size.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + e4a18ce...39db5be master -> quilt/jdelvare-hwmon (forced update) +Importing kernel-doc based on 2.6.31-rc1-git5 +Unchanged quilt series kernel-doc +Importing rr based on v2.6.31-rc3-96-g78af08d +$ cd ../quilt-tmp +$ git reset --hard 78af08d90b8f745044b1274430bc4bc6b2b27aca +HEAD is now at 78af08d Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 +$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr +module:use_symbol_prefix_with_layout.patch +kthread:update_the_comment_in_kthread_stop.patch +lguest:dereferencing_freed_mem_in_add_eventfd.patch +lguest:fix-oversize-config.patch +virtio:fix_memory_leak_on_device_removal.patch +virtio:delete_vq_from_list.patch +virtio:refactor_find_vqs.patch +lguest:comment-style.patch +lguest:comment-update.patch +pci:fix-pci_enable_msix-return-value.patch +lguest:struct-cleanup.patch +lguest:panic_notifier-cleanup.patch +lguest:avoid-native_set_pmd.patch +lguest:PAE-dont-assume-PAGE_OFFSET.patch +cpumask:use_zalloc_cpumask_var_where_possible.patch +cpumask:remove-pcibus_to_cpumask-alpha.patch +cpumask:remove-pcibus_to_cpumask-mips.patch +cpumask:remove-pcibus_to_cpumask-powerpc.patch +cpumask:remove-node_to_cpumask.patch +cpumask:remove-CPU_MASK_ALL_PTR.patch +cpumask:remove-address-of-CPU_MASK_ALL-mips.patch +cpumask:remove-cpu_mask_all.patch +cpumask:remove-last-remaining-irqaction-mask.patch +cpumask:irqaction-remove-mask.patch +cpumask:remove_mask_field_from_comments.patch +cpumask:remove-set_cpus_allowed.patch +cpumask:ia64-smp_call_function_many.patch +cpumask:remove-smp_call_function_mask.patch +cpumask:remove-topology_core_siblings-and-topology_thread_siblings-core.patch +cpumask:remove-topology_core_siblings-and-topology_thread_siblings-sparc.patch +cpumask:remove-topology_core_siblings-and-topology_thread_siblings-s390.patch +cpumask:remove-topology_core_siblings-and-topology_thread_siblings-powerpc.patch +cpumask:remove-topology_core_siblings-and-topology_thread_siblings-ia64.patch +cpumask:arch_send_call_function_ipi_mask-alpha.patch +cpumask:arch_send_call_function_ipi_mask-m32r.patch +cpumask:arch_send_call_function_ipi_mask-mips.patch +cpumask:arch_send_call_function_ipi_mask-powerpc.patch +cpumask:arch_send_call_function_ipi_mask-s390.patch +cpumask:remove-arch_send_call_function_ipi.patch +cpumask:use-cpumap-accessors-m32r.patch +cpumask:use-cpumap-accessors-mips.patch +cpumask:use-cpumap-accessors-powerpc.patch +cpumask:use-cpumap-accessors-um.patch +cpumask:use-mm_cpumask-arm.patch +cpumask:use-mm_cpumask-m32r.patch +cpumask:use-mm_cpumask-mn10300.patch +cpumask:use-mm_cpumask-mips.patch +cpumask:use-mm_cpumask-um.patch +cpumask:use-mm_cpumask-x86.patch +cpumask:mm_quicklist-new-cpumask-ops.patch +cpumask:remove-unused-deprecated-functions.patch +cpumask:move-obsolete-functions-to-end-of-header.patch +virtio:pci-minor-cleanups.patch +arch-x86-kernel-acpi-cstatec-avoid-using-work_on_cpu.patch +misc:work_on_cpu-acpi.patch +misc:work_on_cpu-acpi-fix.patch +misc:work_on_cpu-dcdbas.patch +misc:remove-start_kernel-prototypes.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/rr +From ../quilt-tmp + + 93868fd...e2fea6e master -> quilt/rr (forced update) +Importing device-mapper based on block/for-next + quilt series is empty +$ git update-ref refs/heads/quilt/device-mapper 90e56dba21f7a4481acbcd4cdc12644080398339 +Importing aoe based on v2.6.29-rc2 +Unchanged quilt series aoe +Importing driver-core based on quilt/usb.current +$ cd ../quilt-tmp +$ git reset --hard d3087a914dc0e23f637cbea1fded113768bb0b3d +HEAD is now at d3087a9 USB: pl2303: New vendor and product id +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +driver-core-move-dev_get-set_drvdata-to-drivers-base-dd.c.patch +driver-core-add-accessor-for-device-platform-data.patch +uio-remove-default-n-from-kconfig.patch +driver-model-constify-attribute-groups.patch +mem_class-use-minor-as-index-instead-of-searching-the-array.patch +driver-core-move-dma-coherent.c-from-kernel-to-driver-base.patch +uio-add-generic-driver-for-pci-2.3-devices.patch +driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/driver-core +From ../quilt-tmp + + c36b0ce...bed8558 master -> quilt/driver-core (forced update) +Importing usb based on quilt/driver-core +$ cd ../quilt-tmp +$ git reset --hard bed8558f3b7f8cc0d70b19cbab8599932cf0c5d6 +HEAD is now at bed8558 Driver Core: devtmpfs - kernel-maintained tmpfs-based /dev +$ 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-musb-cleanup-the-nop-registration-for-omap3evm.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-convert-r8a66597-hcd-to-dev_pm_ops.patch +usb-r8a66597-hcd-platform-data-on_chip-support.patch +usb-move-r8a66597-register-defines.patch +usb-m66592-udc-platform-data-on_chip-support.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 +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/usb +From ../quilt-tmp + + 1a2071a...acd0cd0 master -> quilt/usb (forced update) +Importing staging based on quilt/usb +$ cd ../quilt-tmp +$ git reset --hard acd0cd068ebba584fa9ee955c22288b02d36903b +HEAD is now at acd0cd0 USB: at91: modify OHCI driver to allow shared interrupts +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/staging +staging-serqt_usb2-add-missing-calls-to-tty_kref_put.patch +staging-serqt_usb2-fix-memory-leak-in-error-case.patch +staging-android-lowmemorykiller.c-fix-it-for-oom-move-oom_adj-value-from-task_struct-to-mm_struct.patch +staging-remove-aten2011-driver.patch +staging-udlfb-add-vmalloc.h-include.patch +staging-android-binder-move-debugging-mask-into-a-macro.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:645: space before tab in indent. + proc->pid, thread->pid, node->debug_id, +warning: 1 line adds whitespace errors. +staging-android-binder-remove-a-predefine.patch +staging-android-binder-add-enum-usage-in-function-arguments.patch +staging-android-binder-global-variable-cleanup.patch +staging-android-binder-clean-up-for-all-the-stat-statments.patch +staging-android-binder-cleanup-some-long-lines.patch +staging-android-lowmemorykiller-remove-a-predefine.patch +staging-android-lowmemorykiller-delete-the-decription-file.patch +staging-android-binder-partial-checkpatch-cleanup.patch +staging-wlan-ng-scripts-checkpatch.pl-error-fixes.patch +staging-et1310-fix-the-coding-style.patch +staging-rt280-remove-unused-md4.h.patch +staging-rtl8187se-ieee80211-remove-unused-files.patch +staging-rtl8192su-ieee80211-remove-unused-files.patch +staging-rtl8187se-remove-duplicate-dot11d.h-and-ieee80211.h-includes.patch +staging-rtl8192su-remove-duplicate-dot11d.h-and-ieee80211.h-includes.patch +staging-rtl8187se-remove-unused-ieee80211_crypt.h.patch +staging-rtl8192su-remove-unused-ieee80211_crypt.h.patch +staging-rtl8187se-remove-kernel-version-compatibility-wrappers.patch +staging-rtl8187se-remove-support-for-older-wireless-extensions.patch +staging-rtl8187se-ieee80211-remove-dead-_rtl8187_ext_patch_-code.patch +staging-rtl8187se-ieee80211-remove-superfluous-ieee80211_-defines.patch +staging-rtl8187se-ieee80211-remove-unused-dump_chnl_map.patch +staging-rtl8187se-ieee80211-remove-superfluous-john_-ifdefs.patch +staging-rtl8192su-remove-kernel-version-compatibility-wrappers.patch +staging-rtl8192su-remove-support-for-older-wireless-extensions.patch +staging-rtl8192su-ieee80211-remove-unused-_reasoncode-enums.patch +staging-rtl8192su-ieee80211-switch-to-use-linux-ieee80211.h.patch +staging-rtl8192su-add-todo.patch +staging-rtl8187se-add-todo.patch +staging-rtl8187se-remove-enable_dot11d-ifdefs.patch +staging-rtl8187se-remove-config_rtl8180_pm-ifdefs.patch +staging-rtl8187se-remove-thomas_turbo-ifdefs.patch +staging-rtl8187se-remove-config_rtl818x_s-ifdefs.patch +staging-rtl8187se-remove-config_rtl8185b-ifdefs.patch +staging-rtl8187se-remove-config_rtl8180_io_map-ifdefs.patch +staging-rtl8187se-remove-dead-code.patch +staging-rtl8187se-remove-unused-radio-frontends.patch +staging-rtl8187se-remove-debugging-code-from-r8180_core.c.patch +staging-rtl8187se-remove-unused-rtl8225_rf_-functions.patch +staging-rtl8187se-cleanup-r8180_rtl8225.c.patch +staging-rtl8187se-merge-r8180_rtl8225.c-with-r8180_rtl8225z2.c.patch +staging-rtl8187se-cleanup-r8180_pm.c.patch +staging-rtl8187se-merge-r8180_pm.c-with-r8180_core.c.patch +staging-rtl8187se-remove-unused-definitions-from-r8180_hw.h.patch +staging-rtl8187se-remove-unused-definitions-from-r8180.h.patch +staging-rtl8187se-cleanup-r8180_rtl8225z2.c.patch +staging-rtl8187se-cleanup-r8180_core.c.patch +staging-add-rt3090-wireless-driver.patch +staging-add-pristine-upstream-vt6656-driver-sources-to-drivers-staging-vt6656.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:3887: space before tab in indent. + (pDevice->abyEEPROM[EEP_OFS_ZONETYPE]!=0x01)){ //for Japan +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:3893: space before tab in indent. + (pDevice->abyEEPROM[EEP_OFS_ZONETYPE]!=0x02)){ //for Europe +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:5919: space before tab in indent. + ((PWLAN_IE_SSID)pBSSList->abySSID)->abySSID, +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:5920: space before tab in indent. + ((PWLAN_IE_SSID)pBSSList->abySSID)->len) != 0) { +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:6020: space before tab in indent. + while ((skb = skb_dequeue(&pMgmt->sNodeDBTable[*puNodeIndex].sTxPSQueue)) != NULL) +warning: squelched 183 whitespace errors +warning: 188 lines add whitespace errors. +staging-vt6656-add-includes-to-drivers-staging-vt6656.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:732: space before tab in indent. + u8 bssid[6]; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:735: space before tab in indent. + u8 *wpa_ie; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:736: space before tab in indent. + u16 wpa_ie_len; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:737: space before tab in indent. + int pairwise_suite; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:738: space before tab in indent. + int group_suite; +warning: squelched 3 whitespace errors +warning: 8 lines add whitespace errors. +staging-vt6656-build-vt6656.ko-not-vntwusb.ko.patch +staging-vt6656-main_usb.c-drop-obsolete-fsuid-fsgid-accesses.patch +staging-vt6656-replace-net_device-priv-accesses-with-netdev_priv-calls.patch +staging-vt6656-use-net_device_ops-for-management-functions.patch +staging-vt6656-replace-call-to-info-with-printk-call.patch +staging-vt6656-integrate-vt6656-into-build-system.patch +staging-vt6655-fix-build-when-config_wireless_ext.patch +staging-vt6655-remove-dependency-on-wireless_ext-version.patch +staging-otus-fix-warnings-in-staging-otus-ioctl.c.patch +staging-otus-remove-dependency-on-wireless_ext-version.patch +staging-otus-drop-an-unnecessary-null-test.patch +staging-comedi-lindent-changes-to-comdi-driver-in-staging-tree.patch +staging-comedi-no-need-for-checking-vfree-call.patch +staging-comedi-remove-references-to-dead-export_symtab.patch +staging-cpc-usb-remove-unused-include-linux-version.h.patch +staging-wlan-ng-remove-some-superflous-comments.patch +staging-wlan-ng-use-kzfree-to-securely-zero-out-the-wep-key-when-freeing-it.patch +staging-wlan-ng-drop-the-special-case-handling-of-older-wireless-extensions-wireless_ext-is-at-22-for-the-current-kernel.patch +staging-wlan-ng-remove-more-superflous-comments.patch +staging-add-support-for-quatech-esu2-100-usb-2.0-8-port-serial-adaptor.patch +staging-vt6656-remove-dependency-on-kernel-version.patch +staging-vt6656-remove-dependency-on-wireless_ext-version.patch +staging-vt665x-depend-on-wireless_ext.patch +staging-at76_usb-fix-config_wireless_ext-build.patch +staging-at76_usb-replace-mac2str-with-pm.patch +staging-wlan-ng-remove-dependency-on-wireless_ext-version.patch +staging-vt6655-remove-makefile-refs-to-export_symtab.patch +staging-rtl8192su-remove-enable_dot11d-ifdefs.patch +staging-rtl8192su-remove-config_rtl8192_pm-ifdefs.patch +staging-rtl8192su-remove-thomas_turbo-ifdefs.patch +staging-rtl8192su-remove-use_one_pipe-ifdefs.patch +staging-rtl8192su-remove-eeprom_old_format_support-ifdefs.patch +staging-rtl8192su-remove-usb_rx_aggregation_support-ifdefs.patch +staging-rtl8192su-remove-usb_tx_driver_aggregation_enable-ifdefs.patch +staging-rtl8192su-remove-rtl8192su_disable_cck_rate-ifdefs.patch +staging-rtl8192su-remove-rtl8192s_disable_fw_dm-ifdefs.patch +staging-rtl8192su-remove-disable_bb_rf-ifdefs.patch +staging-rtl8192su-remove-rtl8192su_use_param_txpwr-ifdefs.patch +staging-rtl8192su-remove-rtl8192su_fpga_unspecified_network-ifdefs.patch +staging-rtl8192su-remove-rtl8192su_fpga_2mac_verification-ifdefs.patch +staging-rtl8192su-remove-rtl8192su_asic_verification-ifdefs.patch +staging-rtl8192su-remove-rtl8192su_usb_phy_test-ifdefs.patch +staging-rtl8192su-remove-rtl8190_download_firmware_from_header-ifdefs.patch +staging-rtl8192su-remove-rtl8192s_prepare_for_normal_release-ifdefs.patch +staging-rtl8192su-remove-rtl8192su_disable_iqk-ifdefs.patch +staging-rtl8192su-remove-rtl8192se-ifdefs.patch +staging-rtl8192su-remove-rtl8192su-ifdefs.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:2950: space before tab in indent. + (eqMacAddr(priv->ieee80211->current_network.bssid, (fc & IEEE80211_FCTL_TODS)? hdr->addr1 : (fc & IEEE80211_FCTL_FROMDS )? hdr->addr2 : hdr->addr3)) +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:2951: space before tab in indent. + && (!pstats->bHwError) && (!pstats->bCRC)&& (!pstats->bICV)); +warning: 2 lines add whitespace errors. +staging-rtl8192su-remove-unused-files.patch +staging-rtl8192su-remove-dead-code.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:3218: space before tab in indent. + //sMacAddr[5] = (u8)GetRandomNumber(1, 254); +warning: 1 line adds whitespace errors. +staging-rt3070-add-support-for-linksys-wusb54gc-eu-v3.patch +staging-rt-fix-wait_queue_head_t-declaration-on-stack.patch +staging-rt-don-t-confuse-user-of-rt3070-driver-with-rt2870-strings.patch +staging-vt6655-remove-private_obj-ifdefs.patch +staging-vt6655-remove-unused-makefile.-arm-x86-files.patch +staging-b3dfg-drop-null-test-on-list_entry-result.patch +staging-rtl8187se-ieee80211-remove-opensuse_sled-ifdefs.patch +staging-rtl8187se-ieee80211-remove-fedoracore_9-ifdef.patch +staging-rtl8187se-ieee80211-remove-not_yet-ifdefs.patch +staging-rtl8187se-remove-enable_ips-ifdefs.patch +staging-rtl8187se-rename-struct-ieee80211_hdr-to-struct-ieee80211_hdr_4addr.patch +staging-rtl8187se-rename-struct-ieee80211_hdr_3addr_qos-to-struct-ieee80211_hdr_3addrqos.patch +staging-rtl8187se-rename-struct-ieee80211_hdr_qos-to-struct-ieee80211_hdr_4addrqos.patch +staging-rtl8187se-ieee80211-switch-to-use-linux-ieee80211.h.patch +staging-rtl8187se-ieee80211-ieee80211.h-reorderings.patch +staging-rtl8187se-ieee80211-convert-mmie_type_-defines-to-enums.patch +staging-rtl8192su-remove-more-unused-files.patch +staging-rtl8192su-make-private-ieee80211-stack-really-private.patch +staging-rtl8192su-remove-john_dump-ifdefs.patch +staging-rtl8192su-ieee80211-remove-opensuse_sled-ifdefs.patch +staging-rtl8192su-ieee80211-remove-superfluous-container_of-definition.patch +staging-rtl8192su-remove-not_yet-ifdefs.patch +staging-rtl8192su-ieee80211-remove-unused-ieee80211_print_str.patch +staging-rtl8192su-ieee80211-remove-unused-ieee80211_wx_get_encode_ext.patch +staging-rtl8192su-ieee80211-ieee80211.h-cleanups.patch +staging-rtl8192su-ieee80211-move-rtl8192su-specific-code-out-from-ieee80211.h.patch +staging-vt6656-disable-wpa-related-function-due-to-memory-failure-of-this-part-of-codes.patch +staging-htc-dream-add-smd-code.patch +staging-htc-dream-add-rpcrouter-driver.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1352: space before tab in indent. + prog, vers, found_vers); +warning: 1 line adds whitespace errors. +staging-htc-dream-add-qdsp-support.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:3319: space before tab in indent. + void *cmd_data, size_t cmd_size) +warning: 1 line adds whitespace errors. +staging-htc-dream-add-camera-support.patch +staging-htc-dream-makefile-glue.patch +staging-hv-add-the-hyper-v-api-header-files.patch +staging-hv-add-the-hyper-v-driver-header-files.patch +staging-hv-add-the-hyper-v-virtual-bus.patch +staging-hv-add-the-hyper-v-virtual-block-driver.patch +staging-hv-add-the-hyper-v-virtual-network-driver.patch +staging-hv-add-the-hyper-v-virtual-storage-driver.patch +staging-hv-add-a-todo-file.patch +staging-hv-make-the-hyper-v-virtual-bus-code-build.patch +staging-hv-use-the-correct-ifdef-for-x86-64.patch +staging-hv-add-the-hyper-v-virtual-bus-to-the-build.patch +staging-hv-make-the-hyper-v-virtual-storage-driver-build.patch +staging-hv-add-the-hyper-v-virtual-scsi-driver-to-the-build.patch +staging-hv-storvsc-fix-up-driver_data-usage.patch +staging-hv-make-the-hyper-v-virtual-block-driver-build.patch +staging-hv-add-the-hyper-v-virtual-block-driver-to-the-build.patch +staging-hv-blkvsc-fix-up-driver_data-usage.patch +staging-hv-make-the-hyper-v-virtual-network-driver-build.patch +staging-hv-add-the-hyper-v-virtual-network-driver-to-the-build.patch +staging-hv-netvsc-fix-up-driver_data-usage.patch +staging-hv-remove-internal-typedef.patch +staging-hv-remove-pvoid-typedef.patch +staging-hv-remove-void-typedef.patch +staging-hv-remove-uint8-and-int8-typedefs.patch +staging-hv-remove-uint16-and-int16-typedefs.patch +staging-hv-remove-uint32-and-int32-typedefs.patch +staging-hv-remove-uint64-and-int64-and-uchar-typedefs.patch +staging-hv-remove-ushort-typedef.patch +staging-hv-remove-ulonglong-and-longlong-typedefs.patch +staging-hv-remove-ulong_ptr-typedef.patch +staging-hv-remove-ulong-and-long-typedefs.patch +staging-hv-remove-size_t-typedef.patch +staging-hv-remove-dword-and-byte-typedefs.patch +staging-hv-remove-bool-and-boolean-typedefs.patch +staging-hv-remove-defines-from-osd.c.patch +staging-hv-remove-min-and-max-usages.patch +staging-hv-remove-page_size-and-page_shift-and-__builtin-functions.patch +staging-hv-remove-struct_packed-and-struct_aligned-defines.patch +staging-hv-remove-unused_var-usage.patch +staging-hv-remove-field_offset-usage.patch +staging-hv-remove-true-false-and-null-usage.patch +staging-hv-osd-remove-memalloc-wrapper.patch +staging-hv-osd-remove-memalloczeroed-wrapper.patch +staging-hv-osd-remove-memallocatomic-wrapper.patch +staging-hv-osd-remove-memfree-wrapper.patch +staging-hv-make-channel-inboundlock-a-real-spinlock.patch +staging-hv-make-ringinfo-ringlock-a-real-spinlock.patch +staging-hv-make-device-requestlock-a-real-spinlock.patch +staging-hv-make-netdevice-receivepacketlistlock-a-real-spinlock.patch +staging-hv-make-gvmbusconnection.channelmsglock-a-real-spinlock.patch +staging-hv-make-gvmbusconnection.channellock-a-real-spinlock.patch +staging-hv-osd-remove-spinlock-wrapper-functions.patch +staging-hv-osd-remove-sleep-wrapper.patch +staging-hv-osd-remove-memoryfence-wrapper.patch +staging-hv-osd-remove-logmsg-wrapper.patch +staging-hv-osd-remove-printbytes-wrapper.patch +staging-hv-fix-up-printk-warnings.patch +staging-hv-osd-remove-gettickcount-and-gettimestamp-wrappers.patch +staging-hv-remove-compatibility-ifdefry.patch +staging-hv-transform-some-kzalloc-calls-to-kcalloc.patch +staging-hv-force-hyper-v-drivers-to-be-built-as-a-module.patch +staging-hv-use-ld-instead-of-d-for-a-long-ints.patch +staging-hv-remove-c99-comments.patch +staging-hv-storvsc.c-fix-print-formatting.patch +staging-hv-blkvsc_drv.c-fix-print-formatting.patch +staging-hv-fix-blkvsc_open-parameters.patch +staging-hv-fix-blkvsc_release-parameters.patch +staging-hv-fix-blkvsc_ioctl-parameters.patch +staging-hv-remove-x2v_linux-check.patch +staging-hv-netvsc.c-fix-print-formatting.patch +staging-hv-rndisfilter.c-fix-print-formatting.patch +staging-hv-storvsc_drv.c-fix-print-formatting.patch +staging-hv-vmbus_drv.c-fix-print-formatting.patch +staging-hv-check-return-value-of-bus_register.patch +staging-hv-check-return-value-of-device_register.patch +staging-hv-vmbus_drv.c-remove-unused-structs.patch +staging-hv-hv.c-remove-unused-physaddr.patch +staging-hv-remove-vmbus_channel_packet_page_buffer-typedef.patch +staging-hv-remove-vmbus_channel_packet_mulitpage_buffer-typedef.patch +staging-hv-remove-vmbus_connect_state-typedef.patch +staging-hv-remove-vmbus_connection-typedef.patch +staging-hv-remove-vmbus_msginfo-typedef.patch +staging-hv-remove-netvsc_device-typedef.patch +staging-hv-remove-workqueue-typedef.patch +staging-hv-transform-pdevice_object-and-device_object-typedefs-into-their-corresponding-structs.patch +staging-hv-check-return-value-of-driver_for_each_device.patch +staging-hv-comment-out-blkdev-variable-in-blkvsc_ioctl.patch +staging-hv-remove-waitevent-typedef.patch +staging-hv-remove-timer-typedef.patch +staging-hv-remove-handle-typedef.patch +staging-hv-remove-more-printk-warnings.patch +staging-hv-properly-fix-the-printk-warnings.patch +staging-htc-dream-limit-kconfig-for-only-msm-platforms.patch +staging-htc-dream-touchscreen-driver-for-staging.patch +staging-htc-dream-cleanup-dream-touchscreen-driver.patch +staging-htc-dream-touchscreen-more-cleanups.patch +staging-meilhaus-convert-nested-spin_lock_irqsave-to-spin_lock.patch +staging-usb-ip-code-cleanup.patch +staging-cpc-usb-convert-comment-style-in-cpc.h.patch +staging-cpc-usb-convert-comment-style-in-cpc_int.h.patch +staging-cpc-usb-convert-comment-style-in-cpcusb.h.patch +staging-cpc-usb-add-one-todo-entry.patch +staging-vt665x-64bit-compile-fixes-part-1.patch +staging-vt665x-64bit-compile-fixes-part-2.patch +staging-usb-ip-vhci_hdc-fix-the-returned-error-value.patch +staging-fix-typos-mang-ment-management.patch +staging-correct-use-of-and.patch +staging-array_size-changes.patch +staging-dst-correct-error-handling-code.patch +staging-remove-epl-driver.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/staging +From ../quilt-tmp + + ac676b2...49acb97 master -> quilt/staging (forced update) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..b17356fe6d03 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20090729 |