diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-17 15:36:40 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-17 15:36:40 +1000 |
| commit | 5d77a4c053616c3bc970a62e8688d66aabccb9f7 (patch) | |
| tree | 64fd9287efada8920ea0b8dc7855de0f4a213070 | |
| parent | 18a5b68309af9e86f2a74de85eb12ea8a10128f2 (diff) | |
Add linux-next specific files for 20090617next-20090617
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 130 | ||||
| -rw-r--r-- | Next/Trees | 132 | ||||
| -rw-r--r-- | Next/merge.log | 3981 | ||||
| -rw-r--r-- | Next/quilt-import.log | 99 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4343 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..6a05927b2ca2 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,130 @@ +Name SHA1 +---- ---- +origin 300df7dc89cc276377fc020704e34875d5c473b6 +fixes 210af919c949a7d6bd330916ef376cec2907d81e +arm-current 73be1591579084a8103a7005dd3172f3e9dd7362 +m68k-current adfe7c69891128f5e238a5e6823709b4bb85b340 +powerpc-merge 42e27bfc4bfa42bd905e53be93d862b8e3d80a00 +sparc-current 6373fffc5d555caf3acf7c5796cec9820aaf7479 +scsi-rc-fixes d3748ec99c2e4a0824a7b21b176a4ece94784246 +net-current 52ea3a56a3268bc2a5a7c75e98c81463004e38ef +sound-current 3b13b5ce8c1b52379aff80666d31d4354354b2d4 +pci-current 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 +wireless-current aeeab4ff06b8e29cfe2fe730ba626f7e2487ba03 +kbuild-current 300df7dc89cc276377fc020704e34875d5c473b6 +driver-core.current 45e3e1935e2857c54783291107d33323b3ef33c8 +usb.current c601a14139f54ff2d3e5c805afa7e1667b936e0b +cpufreq-current 8e7c25971b1590776a90b249de3d859dd45e7414 +input-current a3ce6ea46cc0d6397d1b92b1a5983bb2935306ed +md-current 0e6e0271a210817e202c8a4bfffbde3e3c0616d1 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 08ced854fc4a979d9e59ba01000bf96e7057cfbc +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm ce53895a5d24e0ee19fb92f56c17323fb4c9ab27 +avr32 4024533e60787a5507818b0c0fdb44ddb522cdf5 +blackfin d6879c585b7f8c2f3eb2f7e7beac806af4e9755c +cris 768c31495abe49227a96261b5aa19f34b30882b1 +ia64 823ba39bb5212cff16490533dc761b0d3f2b629f +m68k 9c6948da2e55f787b942946d830eb3018323b7b7 +m68knommu 9b344bc47839634ad3009d6b97c6261e19eefb84 +microblaze fee3c55d7fb9486f02d3285678d58e433ffe3c2a +mips 82e55f64130a74d2c2c4d83695151de4a58ff376 +parisc b609308e1415efebdf79ebd553f4dd47b0ff2722 +powerpc 313485175da221c388f6a8ecf4c30062ba9bea17 +4xx 336ff735425d2709c4bb3f2a55f7565e8170ce7a +galak 247608234e944e3e8e4d503c54c19ccb63dd27f2 +pxa d78ff0a50aac6a1bfe445969dd963e6486e49f56 +s390 155af2f95f905c830688dd0ca7c7cac4107334fd +sh 39f4490c70eae62cfed62081243110607069d3f9 +sparc aaa7e2f74f11b5f7e30483807b896d7b3369586f +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +cifs 361ea1ae5451040cd254eee0b6df64581080b2cc +configfs 8af7d5ffe1b6468ed0de1c2bb5335ad40b755ba3 +ext4 a41f20716975910d9beb90b7efc61107901492b8 +fatfs 21bea495943f9532f16e819066b340762124f5dd +fuse 151060ac13144208bd7601d17e4c92c59b98072f +gfs2 3ea400581f2b595afd91207bbd79c11cb38598e0 +jfs f7c52fd17a7dda42fc9e88c2b2678403419bfe63 +nfs 4770822f16154559c8168c1b7171c9941a7c4d89 +nfsd 6c18ba9f5e506b8115b89b1aa7bdc25178f40b0a +nilfs2 4c4ec80744f77147f0d40350b18e6da3d1b9398b +ocfs2 9af0b38ff3f4f79c62dd909405b113bf7c1a23aa +squashfs e5d287539dba264a1d9d7607a25b8c8c61c9d658 +v9fs b9b8e1c85b1d98534a562f601acda8132bfff439 +ubifs f2c5dbd7b7396457efc114f825acfdd4db4608f8 +xfs e83f1eb6bfc4004c19a99ee5f5aa65bd3fbecec3 +reiserfs-bkl cfcb7d059be7c2441b2c3ac56e0015631396ead6 +vfs aa7dfb8954ccf49e026ba13d12991a4eb7defb96 +pci 7d9a73f6dcf4390d256bf19330c81e91523a26d5 +hid 45e3e1935e2857c54783291107d33323b3ef33c8 +i2c bb925e999362a4609e94bb829952e5ec1c3b138f +jdelvare-hwmon d1123b3c34b10b854b546eb0fcf5a427a66b9529 +kernel-doc 612392307cb09e49051225092cbbd7049bd8db93 +v4l-dvb 5b12cc6231d47d92df5943ad8f18210b7d1d3b7f +quota a069e9cee1dba2f847839d325f46ce6976ed1b76 +kbuild 300df7dc89cc276377fc020704e34875d5c473b6 +ide 2c7eaa43c3bb7b3b9fe2051d17f308c1f0728c78 +libata 10d4be2bbb6c017bcbda80fb342dbade51468bc6 +infiniband 45e3e1935e2857c54783291107d33323b3ef33c8 +acpi 66c74fa1d49a14c1882fe4d1321352ec452f766b +ieee1394 00635b8ee2b5650fd01f5602ecfa289db336b570 +ubi d9dd0887cc5c6df0dbbe5a307284610607eea7ab +kvm 99b8fdfd69fe12dba3ae4ee9cfc5da54439fe491 +dlm 748285ccf7ea76d3d76d0d5f2945ad6fb91f5329 +scsi ea4431906d86686e541de527915ccbe556761b16 +async_tx b787f2e2a37a373a045f4d9b9bed941ccff01663 +udf 146bca72c7e6ba52de82a63b1fce7934dc103dbc +net 14ebaf81e13ce66bff275380b246796fd16cbfa1 +wireless 1fa6f4af9f55bc1b753af04276984429d6b5a613 +mtd c90173f0907486fe4010c2a8cef534e2473db43f +crypto 08ced854fc4a979d9e59ba01000bf96e7057cfbc +sound 3b13b5ce8c1b52379aff80666d31d4354354b2d4 +cpufreq 8e7c25971b1590776a90b249de3d859dd45e7414 +rr 1edd54f99f316c054a6bf7101c3634aef1226557 +mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c +input 58b5c3e5bec04a82f4dec31d51a4b06b053bc3d4 +bkl-removal 4a6a4499693a419a20559c41e33a7bd70bf20a6f +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block b0fd271d5fba0b2d00888363f3869e3f9b26caa9 +device-mapper ac2152571c038de73be920db171fb438d32bb744 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery a35d01a5d2ac533edab94a8e3b6749ab213c91c5 +leds ac15e95090c2588ada4904c8c4ae8edd347acdf0 +backlight e0724bf6e4a1f2e678d2b2aab01cae22e17862f0 +kgdb 98ddb33cecfe5752836a3359148ec0469617c8b6 +slab 8dd81c7c44a91db60f8ff3af6235068b2b8f4d32 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md fd894e80a4e368e49c393463986a5d9f5ab16bd9 +mfd 42d62293afeb3a01cda2f25c26ab05e59b2acad2 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm f23c20c83d523e5f8cda1f8f7ed52fe6afffbe29 +voltage df64d5a3cbad1694ba47c2cc044e1e2253d93ac4 +security-testing 991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d +lblnet 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b +ttydev f5bc5adb42a758509f3d4f98bbf516cc18dee50e +agp b854b2ab959e8175d75e01cf8ed452ed2624d0c8 +uwb b81c087f6deb049023e41ce00717202a953f3939 +watchdog 953d8e2e40822a068b70c9875600a310d524ac8f +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 008fe148cb0fb51d266baabe2c09997b21cf90c6 +cputime 524f8fdb6a2041afd0f777ce2ee2156bf2298bde +osd 851eba66ae2393f362aa89cce0975c374e1b94ba +jc_docs f89d7eaf6c34828070f407d0e04b73127f176ec5 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 6c7803606c032245825246d9b96c4a23d2aa553c +audit def57543418a5f47debae28a0a9dea2effc11692 +omap 59a3759d0fe8d969888c741bb33f4946e4d3750d +aoe 1de9e8e70f5acc441550ca75433563d91b269bbe +suspend f3ad116588151b3371ae4e092290e4f48e62b8bb +bluetooth 3c4bdc4bd4af791a72147b6ebc29553808f53cea +edac-amd c476c23b45a41eb4e3ea63af786cc4d74762fe11 +fsnotify d42a93a4d5b8aba34e8641d3f9c4d6817f24f3f4 +irda e0057975e09a85ac92be81e975d0d0a911b1c4c6 +tip e23211bd8e15f89475430b567fa9c3112b3bfcbe +asm-generic e7352854da84062856497b76c5dcefbe799ccd50 +driver-core 9a71a362403d34575430e57fc6249378fd4f42b6 +usb 5628d1b2eafc069fe7228a45e8aa0a7bde48c28e +staging 707c2c1cc1aaabc47583cebcf8223fb5a647523c +scsi-post-merge e349792a385ed47390d156155b1a1e19af1bf163 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..6fec6b4d971b --- /dev/null +++ b/Next/Trees @@ -0,0 +1,132 @@ +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 +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/aegl/linux-2.6.git#test +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#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 +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-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 +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/bart/ide-2.6.git#for-next +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 +bkl-removal git git://git.lwn.net/linux-2.6.git#bkl-removal +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 +ttydev quilt http://www.linux.org.uk/~alan/ttydev/ +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 +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest +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..211b7d603e25 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3981 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 03347e2 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 +Merging origin/master +$ git merge origin/master +Updating 03347e2..300df7d +Fast forward + Documentation/filesystems/vfat.txt | 5 + + Documentation/hwmon/f71882fg | 12 +- + Documentation/hwmon/ibmaem | 2 +- + Documentation/hwmon/sysfs-interface | 19 + + Documentation/hwmon/tmp401 | 42 ++ + Documentation/hwmon/w83627ehf | 11 +- + Documentation/i2c/busses/i2c-viapro | 4 + + MAINTAINERS | 3 +- + arch/blackfin/Kconfig | 60 ++- + arch/blackfin/Makefile | 7 +- + arch/blackfin/boot/.gitignore | 3 +- + arch/blackfin/boot/Makefile | 31 +- + arch/blackfin/include/asm/atomic.h | 16 +- + arch/blackfin/include/asm/bfin-global.h | 11 +- + arch/blackfin/include/asm/bitops.h | 3 +- + arch/blackfin/include/asm/bug.h | 57 ++- + arch/blackfin/include/asm/cache.h | 11 +- + arch/blackfin/include/asm/cacheflush.h | 3 +- + arch/blackfin/include/asm/cpu.h | 1 + + arch/blackfin/include/asm/ftrace.h | 14 +- + arch/blackfin/include/asm/ipipe.h | 28 +- + arch/blackfin/include/asm/irq.h | 271 +---------- + arch/blackfin/include/asm/irqflags.h | 63 +++ + arch/blackfin/include/asm/mutex-dec.h | 112 ----- + arch/blackfin/include/asm/sections.h | 11 + + arch/blackfin/include/asm/system.h | 4 +- + arch/blackfin/include/asm/unistd.h | 3 +- + arch/blackfin/kernel/Makefile | 5 + + arch/blackfin/kernel/bfin_dma_5xx.c | 4 +- + arch/blackfin/kernel/bfin_ksyms.c | 5 + + arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 2 +- + arch/blackfin/kernel/cplb-nompu/cplbmgr.c | 54 +-- + arch/blackfin/kernel/early_printk.c | 8 +- + arch/blackfin/kernel/ftrace-entry.S | 140 ++++++ + arch/blackfin/kernel/ftrace.c | 42 ++ + arch/blackfin/kernel/ipipe.c | 42 +- + arch/blackfin/kernel/setup.c | 16 +- + arch/blackfin/kernel/stacktrace.c | 53 ++ + arch/blackfin/kernel/traps.c | 128 +++-- + arch/blackfin/kernel/vmlinux.lds.S | 17 +- + arch/blackfin/lib/checksum.c | 2 + + arch/blackfin/mach-bf518/boards/ezbrd.c | 12 +- + arch/blackfin/mach-bf527/boards/cm_bf527.c | 5 + + arch/blackfin/mach-bf527/boards/ezbrd.c | 5 + + arch/blackfin/mach-bf527/boards/ezkit.c | 5 + + arch/blackfin/mach-bf533/boards/H8606.c | 5 + + arch/blackfin/mach-bf533/boards/blackstamp.c | 5 + + arch/blackfin/mach-bf533/boards/cm_bf533.c | 5 + + arch/blackfin/mach-bf533/boards/ezkit.c | 5 + + arch/blackfin/mach-bf533/boards/stamp.c | 5 + + arch/blackfin/mach-bf537/boards/cm_bf537.c | 7 +- + arch/blackfin/mach-bf537/boards/minotaur.c | 5 + + arch/blackfin/mach-bf537/boards/pnav10.c | 7 +- + arch/blackfin/mach-bf537/boards/stamp.c | 2 +- + arch/blackfin/mach-bf537/boards/tcm_bf537.c | 5 + + arch/blackfin/mach-bf538/boards/ezkit.c | 10 + + arch/blackfin/mach-bf548/boards/cm_bf548.c | 10 + + arch/blackfin/mach-bf548/boards/ezkit.c | 23 + + arch/blackfin/mach-bf561/boards/cm_bf561.c | 7 +- + arch/blackfin/mach-bf561/boards/ezkit.c | 5 + + arch/blackfin/mach-common/cache-c.c | 14 +- + arch/blackfin/mach-common/entry.S | 12 +- + arch/blackfin/mach-common/smp.c | 24 +- + arch/mips/configs/bigsur_defconfig | 2 +- + arch/mips/configs/mtx1_defconfig | 2 +- + arch/powerpc/Kconfig | 5 +- + arch/powerpc/boot/install.sh | 3 + + arch/powerpc/configs/ppc6xx_defconfig | 2 +- + arch/powerpc/include/asm/atomic.h | 3 + + arch/powerpc/include/asm/hw_irq.h | 5 +- + arch/powerpc/include/asm/iommu.h | 10 + + arch/powerpc/include/asm/ps3.h | 18 +- + arch/powerpc/include/asm/ps3gpu.h | 86 ++++ + arch/powerpc/include/asm/reg.h | 4 +- + arch/powerpc/include/asm/systbl.h | 1 + + arch/powerpc/include/asm/unistd.h | 3 +- + arch/powerpc/kernel/Makefile | 2 + + arch/powerpc/kernel/setup_64.c | 4 +- + arch/powerpc/kernel/time.c | 10 + + arch/powerpc/platforms/cell/axon_msi.c | 4 +- + arch/powerpc/platforms/cell/iommu.c | 37 +- + arch/powerpc/platforms/iseries/dt.c | 3 +- + arch/powerpc/platforms/iseries/mf.c | 3 +- + arch/powerpc/platforms/ps3/mm.c | 12 +- + arch/powerpc/platforms/ps3/os-area.c | 142 +++--- + arch/powerpc/platforms/ps3/platform.h | 10 - + arch/powerpc/platforms/ps3/setup.c | 1 + + arch/powerpc/platforms/ps3/system-bus.c | 15 +- + arch/s390/Kconfig | 9 + + arch/s390/Makefile | 4 +- + arch/s390/appldata/appldata_base.c | 119 +++++- + arch/s390/include/asm/ccwdev.h | 19 +- + arch/s390/include/asm/ccwgroup.h | 10 + + arch/s390/include/asm/suspend.h | 10 + + arch/s390/include/asm/system.h | 22 +- + arch/s390/kernel/early.c | 6 +- + arch/s390/kernel/mem_detect.c | 19 +- + arch/s390/kernel/smp.c | 38 ++- + arch/s390/mm/pgtable.c | 19 + + arch/s390/power/Makefile | 8 + + arch/s390/power/suspend.c | 40 ++ + arch/s390/power/swsusp.c | 30 ++ + arch/s390/power/swsusp_64.c | 17 + + arch/s390/power/swsusp_asm64.S | 199 ++++++++ + arch/sparc/Kconfig | 5 + + arch/sparc/configs/sparc64_defconfig | 63 ++- + arch/sparc/include/asm/cpudata_64.h | 197 +-------- + arch/sparc/include/asm/dma-mapping.h | 168 ++++++- + arch/sparc/include/asm/dma-mapping_32.h | 60 --- + arch/sparc/include/asm/dma-mapping_64.h | 154 ------ + arch/sparc/include/asm/ftrace.h | 11 + + arch/sparc/include/asm/mdesc.h | 3 +- + arch/sparc/include/asm/percpu_64.h | 8 +- + arch/sparc/include/asm/prom.h | 2 + + arch/sparc/include/asm/trap_block.h | 207 ++++++++ + arch/sparc/include/asm/unistd.h | 3 +- + arch/sparc/kernel/Makefile | 2 + + arch/sparc/kernel/cpumap.c | 431 ++++++++++++++++ + arch/sparc/kernel/cpumap.h | 16 + + arch/sparc/kernel/dma.c | 127 ++---- + arch/sparc/kernel/ds.c | 3 +- + arch/sparc/kernel/ftrace.c | 47 ++- + arch/sparc/kernel/head_64.S | 22 - + arch/sparc/kernel/iommu.c | 15 +- + arch/sparc/kernel/irq_64.c | 29 +- + arch/sparc/kernel/mdesc.c | 149 ++++--- + arch/sparc/kernel/of_device_32.c | 195 +------- + arch/sparc/kernel/of_device_64.c | 188 +------- + arch/sparc/kernel/of_device_common.c | 174 +++++++ + arch/sparc/kernel/of_device_common.h | 36 ++ + arch/sparc/kernel/pci_sun4v.c | 15 +- + arch/sparc/kernel/prom.h | 1 - + arch/sparc/kernel/prom_64.c | 232 +++++---- + arch/sparc/kernel/prom_common.c | 2 - + arch/sparc/kernel/smp_64.c | 196 +++++++-- + arch/sparc/kernel/systbls_32.S | 4 +- + arch/sparc/kernel/systbls_64.S | 6 +- + arch/sparc/kernel/traps_64.c | 170 ++++--- + arch/sparc/mm/init_32.c | 1 + + arch/sparc/mm/init_64.c | 16 +- + arch/sparc/mm/srmmu.c | 3 +- + block/blk-core.c | 6 +- + block/blk-settings.c | 37 +- + block/cfq-iosched.c | 7 +- + drivers/acpi/acpica/acevents.h | 2 +- + drivers/acpi/acpica/acglobal.h | 3 - + drivers/acpi/acpica/aclocal.h | 12 +- + drivers/acpi/acpica/acnamesp.h | 13 +- + drivers/acpi/acpica/amlcode.h | 2 +- + drivers/acpi/acpica/dsobject.c | 5 +- + drivers/acpi/acpica/dsopcode.c | 17 +- + drivers/acpi/acpica/dswstate.c | 4 +- + drivers/acpi/acpica/evregion.c | 12 +- + drivers/acpi/acpica/evxfevnt.c | 4 +- + drivers/acpi/acpica/exconfig.c | 125 ++++- + drivers/acpi/acpica/excreate.c | 2 +- + drivers/acpi/acpica/exdump.c | 6 +- + drivers/acpi/acpica/exfldio.c | 20 +- + drivers/acpi/acpica/exmutex.c | 45 ++- + drivers/acpi/acpica/exstore.c | 4 +- + drivers/acpi/acpica/hwregs.c | 4 +- + drivers/acpi/acpica/nsalloc.c | 14 +- + drivers/acpi/acpica/nsnames.c | 2 +- + drivers/acpi/acpica/nsobject.c | 9 + + drivers/acpi/acpica/nspredef.c | 7 +- + drivers/acpi/acpica/nssearch.c | 4 + + drivers/acpi/acpica/nswalk.c | 69 ++- + drivers/acpi/acpica/nsxfname.c | 150 ++++++ + drivers/acpi/acpica/nsxfobj.c | 9 +- + drivers/acpi/acpica/rscalc.c | 5 +- + drivers/acpi/acpica/rsxface.c | 8 +- + drivers/acpi/acpica/tbfadt.c | 16 +- + drivers/acpi/acpica/tbinstal.c | 2 +- + drivers/acpi/acpica/utcopy.c | 23 + + drivers/acpi/acpica/utdebug.c | 8 +- + drivers/acpi/acpica/utdelete.c | 21 + + drivers/acpi/acpica/utmisc.c | 20 +- + drivers/acpi/acpica/utmutex.c | 26 +- + drivers/block/cciss.c | 1 - + drivers/block/mg_disk.c | 28 +- + drivers/block/ps3disk.c | 18 +- + drivers/block/ps3vram.c | 168 ++++--- + drivers/char/hvc_iucv.c | 204 ++++++-- + drivers/char/ps3flash.c | 296 ++++++----- + drivers/char/pty.c | 53 ++- + drivers/char/tty_io.c | 2 + + drivers/char/tty_ioctl.c | 5 +- + drivers/char/tty_ldisc.c | 9 +- + drivers/hwmon/Kconfig | 16 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/f71882fg.c | 250 +++++++--- + drivers/hwmon/hwmon.c | 29 ++ + drivers/hwmon/ibmaem.c | 1 + + drivers/hwmon/max6650.c | 86 ++++- + drivers/hwmon/sht15.c | 10 +- + drivers/hwmon/tmp401.c | 690 ++++++++++++++++++++++++++ + drivers/hwmon/w83627ehf.c | 10 +- + drivers/i2c/busses/Kconfig | 6 +- + drivers/i2c/busses/i2c-viapro.c | 4 + + drivers/i2c/busses/i2c-voodoo3.c | 1 - + drivers/i2c/chips/Kconfig | 15 - + drivers/i2c/chips/Makefile | 1 - + drivers/i2c/i2c-core.c | 43 +- + drivers/macintosh/therm_adt746x.c | 84 ++-- + drivers/macintosh/therm_pm72.c | 95 ++-- + drivers/macintosh/therm_windtunnel.c | 126 +++--- + drivers/macintosh/windfarm_lm75_sensor.c | 129 +++-- + drivers/macintosh/windfarm_max6690_sensor.c | 103 +++-- + drivers/macintosh/windfarm_smu_sat.c | 109 +++-- + drivers/md/dm.c | 1 - + drivers/misc/eeprom/Kconfig | 14 + + drivers/misc/eeprom/Makefile | 1 + + drivers/{i2c/chips => misc/eeprom}/max6875.c | 2 +- + drivers/net/ps3_gelic_net.c | 8 +- + drivers/ps3/ps3-sys-manager.c | 2 +- + drivers/ps3/ps3av.c | 8 +- + drivers/ps3/ps3av_cmd.c | 3 +- + drivers/s390/block/dasd.c | 109 ++++- + drivers/s390/block/dasd_devmap.c | 1 + + drivers/s390/block/dasd_eckd.c | 108 ++++- + drivers/s390/block/dasd_fba.c | 6 +- + drivers/s390/block/dasd_int.h | 13 +- + drivers/s390/block/dcssblk.c | 132 +++++- + drivers/s390/block/xpram.c | 129 +++++- + drivers/s390/char/con3215.c | 205 +++++---- + drivers/s390/char/con3270.c | 12 +- + drivers/s390/char/fs3270.c | 16 +- + drivers/s390/char/monreader.c | 140 +++++- + drivers/s390/char/monwriter.c | 98 ++++- + drivers/s390/char/raw3270.c | 84 +++- + drivers/s390/char/raw3270.h | 12 +- + drivers/s390/char/sclp.c | 248 ++++++++-- + drivers/s390/char/sclp.h | 23 +- + drivers/s390/char/sclp_cmd.c | 42 ++- + drivers/s390/char/sclp_con.c | 139 ++++-- + drivers/s390/char/sclp_rw.c | 20 +- + drivers/s390/char/sclp_rw.h | 12 +- + drivers/s390/char/sclp_vt220.c | 118 +++-- + drivers/s390/char/tape.h | 3 +- + drivers/s390/char/tape_34xx.c | 3 +- + drivers/s390/char/tape_3590.c | 3 +- + drivers/s390/char/tape_core.c | 52 ++- + drivers/s390/char/vmlogrdr.c | 27 +- + drivers/s390/char/vmur.c | 26 +- + drivers/s390/char/vmwatchdog.c | 81 +++- + drivers/s390/cio/ccwgroup.c | 78 +++- + drivers/s390/cio/chsc.c | 3 +- + drivers/s390/cio/chsc.h | 1 + + drivers/s390/cio/chsc_sch.c | 32 ++- + drivers/s390/cio/cmf.c | 5 + + drivers/s390/cio/css.c | 157 ++++++- + drivers/s390/cio/css.h | 10 + + drivers/s390/cio/device.c | 260 ++++++++++ + drivers/s390/cio/device.h | 3 + + drivers/s390/cio/device_fsm.c | 96 ++-- + drivers/s390/cio/device_ops.c | 26 +- + drivers/s390/cio/io_sch.h | 1 + + drivers/s390/net/claw.c | 14 +- + drivers/s390/net/ctcm_main.c | 37 ++- + drivers/s390/net/lcs.c | 74 +++- + drivers/s390/net/netiucv.c | 115 ++++- + drivers/s390/net/qeth_core_main.c | 51 ++- + drivers/s390/net/qeth_l2_main.c | 52 ++- + drivers/s390/net/qeth_l3_main.c | 52 ++- + drivers/s390/net/smsgiucv.c | 63 +++- + drivers/s390/scsi/zfcp_ccw.c | 33 ++ + drivers/sbus/char/openprom.c | 2 +- + drivers/serial/atmel_serial.c | 8 +- + drivers/serial/imx.c | 12 +- + drivers/spi/spi_bfin5xx.c | 4 +- + drivers/usb/host/ehci-ps3.c | 7 +- + drivers/usb/host/ohci-ps3.c | 7 +- + drivers/video/bw2.c | 20 +- + drivers/video/cg14.c | 19 +- + drivers/video/cg3.c | 20 +- + drivers/video/cg6.c | 25 +- + drivers/video/leo.c | 14 +- + drivers/video/p9100.c | 20 +- + drivers/video/ps3fb.c | 272 +++++------ + drivers/video/tdfxfb.c | 1 - + fs/bio.c | 1 - + fs/btrfs/disk-io.c | 26 +- + fs/btrfs/transaction.c | 12 +- + fs/fat/cache.c | 6 +- + fs/fat/dir.c | 2 +- + fs/fat/fat.h | 7 +- + fs/fat/fatent.c | 4 +- + fs/fat/file.c | 184 ++++---- + fs/fat/inode.c | 28 +- + fs/fat/misc.c | 22 +- + fs/fat/namei_msdos.c | 2 +- + fs/fat/namei_vfat.c | 2 +- + fs/ocfs2/alloc.c | 80 +++- + fs/ocfs2/blockcheck.c | 184 +++++++- + fs/ocfs2/blockcheck.h | 29 +- + fs/ocfs2/cluster/masklog.h | 35 +- + fs/ocfs2/cluster/tcp.c | 7 +- + fs/ocfs2/dir.c | 21 +- + fs/ocfs2/dlmglue.c | 51 ++ + fs/ocfs2/dlmglue.h | 11 + + fs/ocfs2/file.c | 56 ++- + fs/ocfs2/journal.c | 111 ++++ + fs/ocfs2/journal.h | 4 + + fs/ocfs2/ocfs2.h | 16 + + fs/ocfs2/ocfs2_lockid.h | 5 + + fs/ocfs2/quota_global.c | 4 +- + fs/ocfs2/quota_local.c | 21 +- + fs/ocfs2/super.c | 66 ++- + fs/ocfs2/xattr.c | 5 +- + fs/ubifs/super.c | 3 + + include/acpi/acpixf.h | 9 +- + include/acpi/actypes.h | 20 +- + include/acpi/platform/acgcc.h | 4 + + include/acpi/platform/aclinux.h | 63 ++- + include/asm-generic/atomic64.h | 42 ++ + include/linux/bio.h | 5 + + include/linux/blkdev.h | 1 + + include/linux/kernel.h | 4 +- + include/linux/mg_disk.h | 45 ++ + kernel/module.c | 2 +- + kernel/printk.c | 33 +- + lib/Kconfig | 6 + + lib/Makefile | 2 + + lib/atomic64.c | 175 +++++++ + mm/Kconfig | 4 +- + mm/bounce.c | 1 - + mm/highmem.c | 1 - + net/iucv/af_iucv.c | 147 ++++++- + net/iucv/iucv.c | 268 ++++++++++- + scripts/recordmcount.pl | 20 + + sound/pci/ctxfi/ctatc.c | 22 +- + sound/pci/ctxfi/ctatc.h | 4 +- + sound/pci/ctxfi/cttimer.c | 18 +- + sound/pci/hda/patch_realtek.c | 2 + + sound/pci/intel8x0.c | 24 +- + sound/soc/codecs/ssm2602.c | 4 - + sound/soc/codecs/wm8903.c | 4 - + sound/soc/pxa/magician.c | 2 +- + sound/soc/soc-core.c | 3 + + sound/usb/usbquirks.h | 2 +- + 340 files changed, 10234 insertions(+), 3944 deletions(-) + create mode 100644 Documentation/hwmon/tmp401 + create mode 100644 arch/blackfin/include/asm/irqflags.h + delete mode 100644 arch/blackfin/include/asm/mutex-dec.h + create mode 100644 arch/blackfin/kernel/ftrace-entry.S + create mode 100644 arch/blackfin/kernel/ftrace.c + create mode 100644 arch/blackfin/kernel/stacktrace.c + create mode 100644 arch/powerpc/include/asm/ps3gpu.h + create mode 100644 arch/s390/include/asm/suspend.h + create mode 100644 arch/s390/power/Makefile + create mode 100644 arch/s390/power/suspend.c + create mode 100644 arch/s390/power/swsusp.c + create mode 100644 arch/s390/power/swsusp_64.c + create mode 100644 arch/s390/power/swsusp_asm64.S + delete mode 100644 arch/sparc/include/asm/dma-mapping_32.h + delete mode 100644 arch/sparc/include/asm/dma-mapping_64.h + create mode 100644 arch/sparc/include/asm/trap_block.h + create mode 100644 arch/sparc/kernel/cpumap.c + create mode 100644 arch/sparc/kernel/cpumap.h + create mode 100644 arch/sparc/kernel/of_device_common.c + create mode 100644 arch/sparc/kernel/of_device_common.h + create mode 100644 drivers/hwmon/tmp401.c + rename drivers/{i2c/chips => misc/eeprom}/max6875.c (99%) + create mode 100644 include/asm-generic/atomic64.h + create mode 100644 include/linux/mg_disk.h + create mode 100644 lib/atomic64.c +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging 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/net/cnic.c | 2 -- + 1 files changed, 0 insertions(+), 2 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 +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + drivers/usb/misc/sisusbvga/Kconfig | 2 +- + drivers/usb/serial/ftdi_sio.c | 1 + + drivers/usb/serial/ftdi_sio.h | 3 +++ + drivers/usb/serial/option.c | 5 +++++ + 4 files changed, 10 insertions(+), 1 deletions(-) +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Merge made by recursive. + Documentation/cpu-freq/cpu-drivers.txt | 2 +- + Documentation/cpu-freq/governors.txt | 26 ++-- + Documentation/cpu-freq/user-guide.txt | 1 - + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 191 +++++++++++---------- + arch/x86/kernel/cpu/cpufreq/powernow-k8.h | 11 -- + arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 60 ++----- + arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 93 ++++++----- + arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 1 + + arch/x86/kernel/tsc.c | 8 +- + drivers/cpufreq/cpufreq_conservative.c | 61 +++----- + drivers/cpufreq/cpufreq_ondemand.c | 68 +++----- + 11 files changed, 235 insertions(+), 287 deletions(-) +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 +Already up-to-date. +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Auto-merging arch/cris/arch-v32/kernel/irq.c +Merge made by recursive. + arch/cris/arch-v32/drivers/cryptocop.c | 4 ++-- + arch/cris/arch-v32/kernel/irq.c | 2 +- + arch/cris/arch-v32/lib/Makefile | 2 +- + arch/cris/arch-v32/lib/strcmp.S | 21 +++++++++++++++++++++ + arch/cris/include/arch-v32/arch/spinlock.h | 6 +++--- + arch/cris/include/asm/string.h | 6 ++++++ + 6 files changed, 34 insertions(+), 7 deletions(-) + create mode 100644 arch/cris/arch-v32/lib/strcmp.S +Merging ia64/test +$ git merge ia64/test +Merge made by recursive. + arch/ia64/hp/common/sba_iommu.c | 2 +- + arch/ia64/include/asm/gcc_intrin.h | 18 ++++---- + arch/ia64/include/asm/mca.h | 38 +++++++++--------- + arch/ia64/include/asm/meminit.h | 18 ++++---- + arch/ia64/include/asm/pal.h | 24 +++++------ + arch/ia64/include/asm/processor.h | 56 +++++++++++++------------- + arch/ia64/include/asm/sal.h | 8 ++-- + arch/ia64/include/asm/sn/sn_sal.h | 2 +- + arch/ia64/include/asm/types.h | 13 ++++-- + arch/ia64/kernel/efi.c | 10 ++-- + arch/ia64/kernel/mca.c | 18 ++++---- + arch/ia64/kernel/module.c | 14 ++++-- + arch/ia64/kernel/palinfo.c | 68 +++++++++++++++--------------- + arch/ia64/kernel/pci-dma.c | 2 +- + arch/ia64/kernel/perfmon.c | 6 +- + arch/ia64/kernel/setup.c | 32 +++++++------- + arch/ia64/kernel/smp.c | 2 +- + arch/ia64/kernel/smpboot.c | 2 +- + arch/ia64/kernel/time.c | 2 +- + arch/ia64/kernel/topology.c | 4 +- + arch/ia64/kernel/uncached.c | 3 +- + arch/ia64/mm/contig.c | 9 ++-- + arch/ia64/mm/init.c | 15 +++---- + arch/ia64/mm/tlb.c | 4 +- + arch/ia64/pci/pci.c | 12 +++--- + arch/ia64/sn/kernel/io_acpi_init.c | 4 +- + arch/ia64/sn/kernel/io_common.c | 2 +- + arch/ia64/sn/kernel/sn2/sn_hwperf.c | 4 +- + arch/ia64/sn/kernel/sn2/sn_proc_fs.c | 2 +- + arch/ia64/sn/kernel/tiocx.c | 2 +- + arch/ia64/sn/pci/pcibr/pcibr_provider.c | 2 +- + arch/ia64/sn/pci/tioca_provider.c | 6 +- + arch/ia64/sn/pci/tioce_provider.c | 6 +- + drivers/char/agp/hp-agp.c | 5 +- + drivers/firmware/pcdp.c | 4 +- + include/linux/efi.h | 2 +- + 36 files changed, 212 insertions(+), 209 deletions(-) +Merging m68k/for-next +$ git merge m68k/for-next +Auto-merging drivers/rtc/Kconfig +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/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 +Merge made by recursive. + arch/m68k/include/asm/checksum.h | 160 ++++++++- + 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/hardirq.h | 21 +- + 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 | 22 +- + arch/m68k/include/asm/m520xsim.h | 21 +- + arch/m68k/include/asm/m5249sim.h | 33 +- + arch/m68k/include/asm/m5272sim.h | 5 + + arch/m68k/include/asm/m5307sim.h | 21 +- + arch/m68k/include/asm/m532xsim.h | 44 +-- + arch/m68k/include/asm/m5407sim.h | 18 +- + arch/m68k/include/asm/mcfintc.h | 89 +++++ + arch/m68k/include/asm/mcfsim.h | 93 +----- + 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/kernel/irq.c | 21 -- + arch/m68knommu/lib/checksum.c | 9 - + arch/m68knommu/platform/5206/config.c | 56 ++-- + arch/m68knommu/platform/5206e/config.c | 57 ++-- + arch/m68knommu/platform/520x/config.c | 30 -- + arch/m68knommu/platform/523x/config.c | 63 ---- + arch/m68knommu/platform/5249/Makefile | 2 +- + arch/m68knommu/platform/5249/config.c | 49 +-- + arch/m68knommu/platform/5249/intc2.c | 59 +++ + arch/m68knommu/platform/5272/config.c | 29 +-- + arch/m68knommu/platform/527x/config.c | 49 --- + arch/m68knommu/platform/528x/config.c | 51 +--- + arch/m68knommu/platform/5307/config.c | 65 ++--- + arch/m68knommu/platform/532x/config.c | 49 +--- + arch/m68knommu/platform/5407/config.c | 68 ++--- + arch/m68knommu/platform/68328/ints.c | 72 ++-- + arch/m68knommu/platform/68360/ints.c | 44 ++- + arch/m68knommu/platform/coldfire/Makefile | 22 +- + 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/pit.c | 8 - + arch/m68knommu/platform/coldfire/timers.c | 18 +- + arch/m68knommu/platform/coldfire/vectors.c | 20 +- + 48 files changed, 1704 insertions(+), 2044 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/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/mcfintc.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/5249/intc2.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 +Merging microblaze/next +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Resolved 'drivers/char/hw_random/Kconfig' using previous resolution. +Resolved 'drivers/char/hw_random/Makefile' using previous resolution. +Auto-merging arch/mips/Kconfig +Auto-merging arch/mips/cavium-octeon/octeon-irq.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 +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 17b3ec7] Merge commit 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/mips/Kconfig | 2 + + arch/mips/cavium-octeon/Makefile | 4 + + arch/mips/cavium-octeon/dma-octeon.c | 311 +++- + arch/mips/cavium-octeon/executive/Makefile | 1 + + .../cavium-octeon/executive/cvmx-helper-errata.c | 70 + + .../cavium-octeon/executive/cvmx-helper-jtag.c | 144 ++ + arch/mips/cavium-octeon/msi.c | 288 +++ + arch/mips/cavium-octeon/octeon-irq.c | 2 + + 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 +++++++++++ + arch/mips/include/asm/cpu-features.h | 4 + + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 + + .../include/asm/mach-cavium-octeon/dma-coherence.h | 6 +- + arch/mips/include/asm/mach-generic/dma-coherence.h | 6 +- + arch/mips/include/asm/mach-ip27/dma-coherence.h | 6 +- + arch/mips/include/asm/mach-ip32/dma-coherence.h | 6 +- + arch/mips/include/asm/mach-jazz/dma-coherence.h | 6 +- + arch/mips/include/asm/mach-lemote/dma-coherence.h | 6 +- + .../asm/mach-rc32434/cpu-feature-overrides.h | 5 - + arch/mips/include/asm/octeon/cvmx-helper-errata.h | 33 + + arch/mips/include/asm/octeon/cvmx-helper-jtag.h | 43 + + arch/mips/include/asm/octeon/cvmx-npei-defs.h | 2560 ++++++++++++++++++++ + arch/mips/include/asm/octeon/cvmx-npi-defs.h | 1735 +++++++++++++ + arch/mips/include/asm/octeon/cvmx-pci-defs.h | 1645 +++++++++++++ + arch/mips/include/asm/octeon/cvmx-pcieep-defs.h | 1365 +++++++++++ + arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 1397 +++++++++++ + arch/mips/include/asm/octeon/cvmx-pescx-defs.h | 410 ++++ + arch/mips/include/asm/octeon/cvmx-pexp-defs.h | 229 ++ + arch/mips/include/asm/octeon/cvmx.h | 12 + + arch/mips/include/asm/octeon/octeon.h | 2 + + arch/mips/include/asm/r4kcache.h | 1 + + arch/mips/include/asm/txx9/dmac.h | 51 + + arch/mips/include/asm/txx9/generic.h | 6 + + arch/mips/include/asm/txx9/tx4927.h | 4 + + arch/mips/include/asm/txx9/tx4938.h | 3 + + arch/mips/include/asm/txx9/tx4939.h | 6 + + arch/mips/kernel/cevt-txx9.c | 67 +- + arch/mips/mm/c-r4k.c | 12 + + arch/mips/mm/dma-default.c | 23 +- + arch/mips/mm/tlbex.c | 91 +- + arch/mips/rb532/irq.c | 5 +- + arch/mips/sibyte/Kconfig | 7 - + arch/mips/sibyte/swarm/setup.c | 4 - + arch/mips/txx9/Kconfig | 3 + + arch/mips/txx9/generic/setup.c | 175 ++ + arch/mips/txx9/generic/setup_tx4927.c | 55 + + arch/mips/txx9/generic/setup_tx4938.c | 38 +- + arch/mips/txx9/generic/setup_tx4939.c | 53 +- + arch/mips/txx9/rbtx4927/setup.c | 8 + + arch/mips/txx9/rbtx4938/setup.c | 4 + + arch/mips/txx9/rbtx4939/setup.c | 5 + + drivers/char/hw_random/Kconfig | 13 + + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/tx4939-rng.c | 184 ++ + drivers/dma/Kconfig | 8 + + drivers/dma/Makefile | 1 + + drivers/dma/txx9dmac.c | 1354 +++++++++++ + drivers/dma/txx9dmac.h | 307 +++ + 60 files changed, 14801 insertions(+), 101 deletions(-) + create mode 100644 arch/mips/cavium-octeon/executive/cvmx-helper-errata.c + create mode 100644 arch/mips/cavium-octeon/executive/cvmx-helper-jtag.c + 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 + create mode 100644 arch/mips/include/asm/octeon/cvmx-helper-errata.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-helper-jtag.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-npei-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-npi-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-pci-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-pcieep-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-pciercx-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-pescx-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-pexp-defs.h + create mode 100644 arch/mips/include/asm/txx9/dmac.h + create mode 100644 drivers/char/hw_random/tx4939-rng.c + create mode 100644 drivers/dma/txx9dmac.c + create mode 100644 drivers/dma/txx9dmac.h +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.debug | 17 + + arch/powerpc/boot/cuboot-85xx.c | 2 + + arch/powerpc/boot/dts/asp834x-redboot.dts | 2 +- + arch/powerpc/boot/dts/gef_sbc610.dts | 10 + + arch/powerpc/boot/dts/kmeter1.dts | 520 +++++++ + arch/powerpc/boot/dts/mpc8272ads.dts | 19 +- + arch/powerpc/boot/dts/mpc8315erdb.dts | 15 + + arch/powerpc/boot/dts/mpc8349emitx.dts | 2 +- + arch/powerpc/boot/dts/mpc834x_mds.dts | 2 +- + arch/powerpc/boot/dts/mpc8377_mds.dts | 2 +- + arch/powerpc/boot/dts/mpc8377_rdb.dts | 2 +- + arch/powerpc/boot/dts/mpc8378_mds.dts | 2 +- + arch/powerpc/boot/dts/mpc8378_rdb.dts | 2 +- + arch/powerpc/boot/dts/mpc8379_mds.dts | 2 +- + arch/powerpc/boot/dts/mpc8379_rdb.dts | 2 +- + arch/powerpc/boot/dts/mpc8569mds.dts | 87 ++- + arch/powerpc/boot/dts/sbc8349.dts | 2 +- + arch/powerpc/boot/dts/xcalibur1501.dts | 696 +++++++++ + arch/powerpc/boot/dts/xpedite5200.dts | 466 ++++++ + arch/powerpc/boot/dts/xpedite5200_xmon.dts | 506 +++++++ + arch/powerpc/boot/dts/xpedite5301.dts | 640 ++++++++ + arch/powerpc/boot/dts/xpedite5330.dts | 707 +++++++++ + arch/powerpc/boot/dts/xpedite5370.dts | 638 ++++++++ + arch/powerpc/boot/wrapper | 4 + + arch/powerpc/configs/83xx/kmeter1_defconfig | 908 +++++++++++ + arch/powerpc/configs/85xx/xes_mpc85xx_defconfig | 1821 +++++++++++++++++++++++ + arch/powerpc/include/asm/delay.h | 36 + + arch/powerpc/include/asm/fsl_lbc.h | 4 +- + arch/powerpc/include/asm/reg.h | 3 +- + arch/powerpc/include/asm/reg_booke.h | 2 + + arch/powerpc/kernel/Makefile | 2 + + arch/powerpc/kernel/cpu_setup_6xx.S | 3 + + arch/powerpc/kernel/cpu_setup_fsl_booke.S | 49 +- + arch/powerpc/kvm/Makefile | 2 + + arch/powerpc/lib/Makefile | 2 + + arch/powerpc/mm/Makefile | 2 + + arch/powerpc/oprofile/Makefile | 2 + + arch/powerpc/platforms/44x/warp.c | 8 +- + arch/powerpc/platforms/83xx/Kconfig | 7 + + arch/powerpc/platforms/83xx/Makefile | 1 + + arch/powerpc/platforms/83xx/kmeter1.c | 191 +++ + arch/powerpc/platforms/83xx/mpc83xx.h | 4 +- + arch/powerpc/platforms/83xx/usb.c | 10 +- + arch/powerpc/platforms/85xx/Kconfig | 13 + + arch/powerpc/platforms/85xx/Makefile | 1 + + arch/powerpc/platforms/85xx/mpc8536_ds.c | 17 + + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 19 + + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 20 + + arch/powerpc/platforms/85xx/xes_mpc85xx.c | 282 ++++ + arch/powerpc/platforms/86xx/Kconfig | 1 + + arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 15 + + arch/powerpc/platforms/Kconfig.cputype | 9 +- + arch/powerpc/platforms/Makefile | 2 + + arch/powerpc/sysdev/Makefile | 2 + + arch/powerpc/xmon/Makefile | 2 + + drivers/char/hvc_iseries.c | 2 +- + drivers/char/hvc_vio.c | 2 +- + drivers/char/hvcs.c | 2 +- + drivers/net/ps3_gelic_net.c | 22 +- + drivers/net/ps3_gelic_wireless.c | 6 +- + drivers/rapidio/rio-scan.c | 43 +- + drivers/rapidio/rio-sysfs.c | 6 +- + drivers/scsi/ps3rom.c | 10 +- + drivers/serial/of_serial.c | 2 +- + drivers/serial/ucc_uart.c | 19 +- + drivers/usb/host/ehci-ps3.c | 4 +- + drivers/usb/host/ohci-ps3.c | 4 +- + 67 files changed, 7825 insertions(+), 84 deletions(-) + create mode 100644 arch/powerpc/boot/dts/kmeter1.dts + create mode 100644 arch/powerpc/boot/dts/xcalibur1501.dts + create mode 100644 arch/powerpc/boot/dts/xpedite5200.dts + create mode 100644 arch/powerpc/boot/dts/xpedite5200_xmon.dts + create mode 100644 arch/powerpc/boot/dts/xpedite5301.dts + create mode 100644 arch/powerpc/boot/dts/xpedite5330.dts + create mode 100644 arch/powerpc/boot/dts/xpedite5370.dts + create mode 100644 arch/powerpc/configs/83xx/kmeter1_defconfig + create mode 100644 arch/powerpc/configs/85xx/xes_mpc85xx_defconfig + create mode 100644 arch/powerpc/platforms/83xx/kmeter1.c + create mode 100644 arch/powerpc/platforms/85xx/xes_mpc85xx.c +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging pxa/for-next +$ git merge pxa/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/mm/mmu.c +Merge made by recursive. + MAINTAINERS | 15 + + arch/arm/mach-pxa/Kconfig | 10 + + arch/arm/mach-pxa/Makefile | 1 + + arch/arm/mach-pxa/corgi.c | 6 + + arch/arm/mach-pxa/em-x270.c | 63 +++- + arch/arm/mach-pxa/hx4700.c | 41 ++ + arch/arm/mach-pxa/include/mach/palmz72.h | 5 +- + arch/arm/mach-pxa/include/mach/treo680.h | 49 +++ + arch/arm/mach-pxa/mioa701.c | 42 ++ + arch/arm/mach-pxa/palmz72.c | 65 +++- + arch/arm/mach-pxa/poodle.c | 6 + + arch/arm/mach-pxa/treo680.c | 612 ++++++++++++++++++++++++++++++ + arch/arm/mm/mmu.c | 7 + + sound/soc/pxa/corgi.c | 36 -- + sound/soc/pxa/poodle.c | 36 -- + 15 files changed, 912 insertions(+), 82 deletions(-) + create mode 100644 arch/arm/mach-pxa/include/mach/treo680.h + create mode 100644 arch/arm/mach-pxa/treo680.c +Merging s390/features +$ git merge s390/features +Already up-to-date. +Merging sh/master +$ git merge sh/master +Removing arch/sh/include/asm/checksum_64.h +Removing arch/sh/lib64/c-checksum.c +Merge made by recursive. + arch/sh/Kconfig | 4 + + arch/sh/Kconfig.debug | 1 + + arch/sh/boards/board-urquell.c | 7 + + arch/sh/boards/mach-highlander/setup.c | 52 ++++++- + arch/sh/boards/mach-se/7780/irq.c | 1 - + arch/sh/configs/r7780mp_defconfig | 143 ++++++++++++++--- + arch/sh/drivers/pci/ops-dreamcast.c | 1 - + arch/sh/drivers/pci/pci.c | 14 +-- + arch/sh/include/asm/atomic-irq.h | 24 ++-- + arch/sh/include/asm/checksum.h | 2 +- + arch/sh/include/asm/checksum_64.h | 78 --------- + arch/sh/include/asm/current.h | 21 +--- + arch/sh/include/asm/dma.h | 10 +- + arch/sh/include/asm/ipcbuf.h | 30 +---- + arch/sh/include/asm/irq.h | 2 +- + arch/sh/include/asm/mman.h | 18 +-- + arch/sh/include/asm/mmu_context.h | 22 ++-- + arch/sh/include/asm/module.h | 12 +-- + arch/sh/include/asm/msgbuf.h | 32 +---- + arch/sh/include/asm/param.h | 23 +--- + arch/sh/include/asm/parport.h | 17 +-- + arch/sh/include/asm/posix_types_32.h | 119 ++------------ + arch/sh/include/asm/posix_types_64.h | 127 ++------------- + arch/sh/include/asm/scatterlist.h | 24 +--- + arch/sh/include/asm/sembuf.h | 26 +--- + arch/sh/include/asm/serial.h | 20 +--- + arch/sh/include/asm/setup.h | 2 +- + arch/sh/include/asm/shmbuf.h | 43 +----- + arch/sh/include/asm/signal.h | 147 +----------------- + arch/sh/include/asm/smp.h | 3 +- + arch/sh/include/asm/socket.h | 61 +------- + arch/sh/include/asm/swab.h | 3 +- + arch/sh/include/asm/termbits.h | 199 +----------------------- + arch/sh/include/asm/termios.h | 91 +----------- + arch/sh/include/asm/timex.h | 7 +- + arch/sh/include/asm/topology.h | 3 - + arch/sh/include/asm/types.h | 16 +-- + arch/sh/include/asm/ucontext.h | 13 +-- + arch/sh/include/asm/unaligned.h | 14 +-- + arch/sh/include/asm/unistd_32.h | 3 +- + arch/sh/include/asm/unistd_64.h | 3 +- + arch/sh/include/mach-common/mach/highlander.h | 3 + + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +- + arch/sh/kernel/ftrace.c | 60 ++++---- + arch/sh/kernel/sh_ksyms_64.c | 7 - + arch/sh/kernel/smp.c | 10 +- + arch/sh/kernel/syscalls_32.S | 1 + + arch/sh/kernel/syscalls_64.S | 1 + + arch/sh/kernel/time.c | 27 ++-- + arch/sh/lib64/Makefile | 2 +- + arch/sh/lib64/c-checksum.c | 214 ------------------------- + drivers/clocksource/sh_cmt.c | 1 - + drivers/clocksource/sh_mtu2.c | 1 - + drivers/clocksource/sh_tmu.c | 1 - + drivers/serial/sh-sci.c | 18 ++- + drivers/sh/intc.c | 13 +- + 56 files changed, 339 insertions(+), 1463 deletions(-) + delete mode 100644 arch/sh/include/asm/checksum_64.h + delete mode 100644 arch/sh/lib64/c-checksum.c +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/cifsfs.c | 148 +++++++++++++++++++++++++------------------------ + fs/cifs/cifsproto.h | 2 +- + fs/cifs/connect.c | 21 +------ + fs/cifs/dns_resolve.c | 19 +------ + fs/cifs/netmisc.c | 34 ++++++++++- + 5 files changed, 113 insertions(+), 111 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 1a68c7f] Merge commit 'configfs/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging ext4/next +$ git merge ext4/next +Auto-merging Documentation/filesystems/ext4.txt +Merge made by recursive. + Documentation/ABI/testing/sysfs-fs-ext4 | 10 + + Documentation/filesystems/ext4.txt | 4 + + fs/ext3/acl.c | 13 +- + fs/ext4/Makefile | 2 +- + fs/ext4/acl.c | 15 +- + fs/ext4/ext4.h | 39 +- + fs/ext4/ext4_extents.h | 4 + + fs/ext4/extents.c | 4 +- + fs/ext4/file.c | 36 +- + fs/ext4/fsync.c | 8 +- + fs/ext4/ialloc.c | 48 +- + fs/ext4/inode.c | 281 +++---- + fs/ext4/ioctl.c | 36 + + fs/ext4/mballoc.c | 85 +-- + fs/ext4/mballoc.h | 1 - + fs/ext4/migrate.c | 8 +- + fs/ext4/move_extent.c | 1308 +++++++++++++++++++++++++++++++ + fs/ext4/namei.c | 10 +- + fs/ext4/super.c | 20 +- + fs/jbd2/checkpoint.c | 5 +- + fs/jbd2/commit.c | 13 +- + fs/jbd2/journal.c | 69 ++ + include/linux/jbd2.h | 6 + + include/trace/events/ext4.h | 719 +++++++++++++++++ + include/trace/events/jbd2.h | 167 ++++ + 25 files changed, 2625 insertions(+), 286 deletions(-) + create mode 100644 fs/ext4/move_extent.c + create mode 100644 include/trace/events/ext4.h + create mode 100644 include/trace/events/jbd2.h +$ git reset --hard HEAD^ +HEAD is now at 1a68c7f Merge commit 'configfs/linux-next' +Merging refs/next/20090615/ext4 +$ git merge refs/next/20090615/ext4 +Already up-to-date. +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Already up-to-date. +Merging jfs/next +$ git merge jfs/next +Merge made by recursive. + fs/jfs/jfs_extent.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging nfs/linux-next +$ git merge nfs/linux-next +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/super.c +Merge made by recursive. + fs/nfs/Kconfig | 9 + + fs/nfs/client.c | 124 ++++- + fs/nfs/direct.c | 9 + + fs/nfs/internal.h | 62 +++ + fs/nfs/nfs4_fs.h | 37 ++- + fs/nfs/nfs4proc.c | 1229 ++++++++++++++++++++++++++++++++++++++++-- + fs/nfs/nfs4renewd.c | 6 +- + fs/nfs/nfs4state.c | 130 ++++- + fs/nfs/nfs4xdr.c | 1078 ++++++++++++++++++++++++++++++++----- + fs/nfs/read.c | 33 +- + fs/nfs/super.c | 12 + + fs/nfs/unlink.c | 20 +- + fs/nfs/write.c | 31 +- + include/linux/nfs4.h | 18 + + include/linux/nfs_fs_sb.h | 67 +++- + include/linux/nfs_xdr.h | 174 ++++++ + include/linux/nfsd/state.h | 1 - + include/linux/sunrpc/clnt.h | 1 + + include/linux/sunrpc/sched.h | 1 + + net/sunrpc/clnt.c | 13 + + net/sunrpc/sched.c | 2 +- + 21 files changed, 2838 insertions(+), 219 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merging fs/Kconfig +Auto-merging fs/nfs/Kconfig +Auto-merging fs/nfsd/export.c +Auto-merging fs/nfsd/vfs.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/nfsd/state.h +Merge made by recursive. + Documentation/filesystems/00-INDEX | 4 + + fs/Kconfig | 2 + + fs/lockd/svclock.c | 2 + + fs/locks.c | 3 +- + fs/nfs/Kconfig | 2 +- + fs/nfsd/export.c | 13 +- + fs/nfsd/nfs3proc.c | 237 ++++++++++++++++++++++--- + fs/nfsd/nfs3xdr.c | 1 + + fs/nfsd/nfs4callback.c | 222 ++++++++++++++--------- + fs/nfsd/nfs4proc.c | 129 +++++++++++--- + fs/nfsd/nfs4state.c | 147 +++++++++------- + fs/nfsd/nfs4xdr.c | 296 ++++++++++++++----------------- + fs/nfsd/nfscache.c | 33 +++-- + fs/nfsd/nfsctl.c | 284 ++++++++++++++++++------------ + fs/nfsd/nfsfh.c | 6 - + fs/nfsd/nfsproc.c | 198 +++++++++++++++++---- + fs/nfsd/vfs.c | 93 +++++----- + include/linux/fs.h | 1 + + include/linux/nfsd/cache.h | 3 +- + include/linux/nfsd/nfsfh.h | 7 + + include/linux/nfsd/state.h | 41 +++-- + include/linux/nfsd/xdr4.h | 28 ++-- + include/linux/sunrpc/svc_xprt.h | 7 +- + include/linux/sunrpc/svcsock.h | 7 +- + net/sunrpc/cache.c | 2 +- + net/sunrpc/svc_xprt.c | 57 ++++-- + net/sunrpc/svcsock.c | 87 +++++++--- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 8 +- + 28 files changed, 1263 insertions(+), 657 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Auto-merging fs/nilfs2/cpfile.c +Auto-merging fs/nilfs2/super.c +Auto-merging fs/nilfs2/the_nilfs.c +Merge made by recursive. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Resolved 'net/9p/protocol.c' using previous resolution. +Auto-merging net/9p/protocol.c +CONFLICT (content): Merge conflict in net/9p/protocol.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f1cb9b3] Merge commit 'v9fs/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Auto-merging fs/ubifs/super.c +Auto-merging kernel/hrtimer.c +Merge made by recursive. + fs/ubifs/budget.c | 4 +- + fs/ubifs/dir.c | 19 +++++++++++++ + fs/ubifs/io.c | 34 ++++++++++++++--------- + fs/ubifs/recovery.c | 31 +++------------------- + fs/ubifs/super.c | 73 +++++++++++++++++++++++++++++++++----------------- + fs/ubifs/ubifs.h | 13 +++++--- + kernel/hrtimer.c | 2 + + 7 files changed, 104 insertions(+), 72 deletions(-) +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging reiserfs-bkl/reiserfs/kill-bkl-rc6 +$ git merge reiserfs-bkl/reiserfs/kill-bkl-rc6 +Resolved 'fs/reiserfs/super.c' using previous resolution. +Auto-merging fs/reiserfs/dir.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_sb.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a939f3b] 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 +Auto-merging Documentation/kernel-parameters.txt +Auto-merging drivers/pci/hotplug/ibmphp_core.c +Auto-merging drivers/pci/hotplug/sgi_hotplug.c +Auto-merging drivers/pci/quirks.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-bus-pci | 7 + + Documentation/PCI/pcieaer-howto.txt | 25 + + Documentation/kernel-parameters.txt | 11 +- + arch/powerpc/platforms/pseries/eeh_driver.c | 38 +- + arch/x86/include/asm/pci.h | 1 + + arch/x86/include/asm/pci_x86.h | 2 +- + arch/x86/pci/acpi.c | 35 +- + arch/x86/pci/amd_bus.c | 2 +- + arch/x86/pci/common.c | 4 +- + drivers/pci/access.c | 19 + + drivers/pci/bus.c | 18 +- + drivers/pci/hotplug/Kconfig | 2 +- + drivers/pci/hotplug/acpiphp_core.c | 1 - + drivers/pci/hotplug/cpci_hotplug_core.c | 1 - + drivers/pci/hotplug/cpqphp.h | 167 +++-- + drivers/pci/hotplug/cpqphp_core.c | 1100 +++++++++++++-------------- + drivers/pci/hotplug/cpqphp_ctrl.c | 371 +++++----- + drivers/pci/hotplug/cpqphp_nvram.c | 97 ++-- + drivers/pci/hotplug/cpqphp_pci.c | 599 ++++++++-------- + drivers/pci/hotplug/ibmphp_core.c | 2 +- + drivers/pci/hotplug/pci_hotplug_core.c | 155 ++-- + drivers/pci/hotplug/pciehp.h | 3 - + drivers/pci/hotplug/pciehp_core.c | 112 +--- + drivers/pci/hotplug/pciehp_hpc.c | 31 - + drivers/pci/hotplug/pcihp_skeleton.c | 1 - + drivers/pci/hotplug/rpaphp_core.c | 1 - + drivers/pci/hotplug/sgi_hotplug.c | 1 - + drivers/pci/hotplug/shpchp_core.c | 1 - + drivers/pci/iov.c | 6 +- + drivers/pci/msi.c | 11 +- + drivers/pci/msi.h | 14 +- + drivers/pci/pci.c | 246 ++++--- + drivers/pci/pcie/aer/Kconfig | 15 + + drivers/pci/pcie/aer/Kconfig.debug | 18 + + drivers/pci/pcie/aer/Makefile | 3 + + drivers/pci/pcie/aer/aer_inject.c | 473 ++++++++++++ + drivers/pci/pcie/aer/aerdrv.c | 3 +- + drivers/pci/pcie/aer/aerdrv.h | 6 + + drivers/pci/pcie/aer/aerdrv_core.c | 278 +++++--- + drivers/pci/pcie/aer/ecrc.c | 131 ++++ + drivers/pci/pcie/aspm.c | 4 + + drivers/pci/pcie/portdrv_core.c | 2 +- + drivers/pci/probe.c | 11 +- + drivers/pci/quirks.c | 24 + + drivers/pci/remove.c | 2 - + drivers/pci/search.c | 32 +- + drivers/pci/setup-bus.c | 53 +- + drivers/pci/setup-res.c | 49 +- + drivers/pci/slot.c | 39 + + include/linux/ioport.h | 2 + + include/linux/pci-acpi.h | 4 +- + include/linux/pci.h | 35 +- + include/linux/pci_hotplug.h | 23 +- + include/linux/pci_regs.h | 4 +- + 54 files changed, 2587 insertions(+), 1708 deletions(-) + create mode 100644 drivers/pci/pcie/aer/Kconfig.debug + create mode 100644 drivers/pci/pcie/aer/aer_inject.c + create mode 100644 drivers/pci/pcie/aer/ecrc.c +Merging hid/for-next +$ git merge hid/for-next +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Renaming drivers/i2c/chips/max6875.c->drivers/misc/eeprom/max6875.c +Auto-merging drivers/misc/eeprom/max6875.c +Merge made by recursive. +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Merge made by recursive. + Documentation/dvb/get_dvb_firmware | 8 +- + Documentation/video4linux/CARDLIST.cx23885 | 5 + + Documentation/video4linux/CARDLIST.cx88 | 2 + + Documentation/video4linux/CARDLIST.em28xx | 6 +- + Documentation/video4linux/CARDLIST.saa7134 | 22 +- + Documentation/video4linux/CARDLIST.tuner | 2 + + Documentation/video4linux/gspca.txt | 12 +- + Documentation/video4linux/pxa_camera.txt | 49 + + Documentation/video4linux/v4l2-framework.txt | 5 + + arch/arm/mach-pxa/pcm990-baseboard.c | 23 +- + drivers/media/Kconfig | 10 +- + drivers/media/common/tuners/tuner-simple.c | 44 +- + drivers/media/common/tuners/tuner-types.c | 59 + + drivers/media/common/tuners/tuner-xc2028.c | 56 +- + drivers/media/common/tuners/xc5000.c | 264 +- + drivers/media/dvb/b2c2/flexcop-common.h | 8 +- + drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 790 ++-- + drivers/media/dvb/b2c2/flexcop-i2c.c | 2 +- + drivers/media/dvb/b2c2/flexcop-misc.c | 20 +- + drivers/media/dvb/bt8xx/bt878.c | 8 +- + drivers/media/dvb/dm1105/dm1105.c | 121 +- + drivers/media/dvb/dvb-core/dmxdev.c | 14 +- + drivers/media/dvb/dvb-core/dvb_demux.c | 42 + + drivers/media/dvb/dvb-core/dvb_demux.h | 4 + + drivers/media/dvb/dvb-core/dvb_frontend.c | 2 + + drivers/media/dvb/dvb-usb/Kconfig | 1 + + drivers/media/dvb/dvb-usb/af9015.c | 94 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 31 +- + drivers/media/dvb/dvb-usb/dibusb-common.c | 7 +- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 8 + + drivers/media/dvb/dvb-usb/dvb-usb.h | 2 +- + drivers/media/dvb/dvb-usb/dw2102.c | 325 ++- + drivers/media/dvb/dvb-usb/dw2102.h | 1 + + drivers/media/dvb/dvb-usb/gp8psk.c | 8 +- + drivers/media/dvb/firewire/firedtv-1394.c | 4 +- + drivers/media/dvb/firewire/firedtv-dvb.c | 2 +- + drivers/media/dvb/firewire/firedtv-rc.c | 4 +- + drivers/media/dvb/frontends/Kconfig | 22 + + drivers/media/dvb/frontends/Makefile | 4 +- + drivers/media/dvb/frontends/af9013.c | 2 +- + drivers/media/dvb/frontends/au8522_dig.c | 98 +- + drivers/media/dvb/frontends/cx24116.c | 2 +- + drivers/media/dvb/frontends/drx397xD.c | 4 +- + drivers/media/dvb/frontends/isl6423.c | 308 ++ + drivers/media/dvb/frontends/isl6423.h | 63 + + drivers/media/dvb/frontends/lgdt3305.c | 17 +- + drivers/media/dvb/frontends/lgs8gxx.c | 10 +- + drivers/media/dvb/frontends/lnbp21.c | 2 +- + drivers/media/dvb/frontends/mt312.c | 2 +- + drivers/media/dvb/frontends/nxt200x.c | 6 +- + drivers/media/dvb/frontends/or51132.c | 2 +- + drivers/media/dvb/frontends/stv0900_priv.h | 2 - + drivers/media/dvb/frontends/stv090x.c | 4299 ++++++++++++++++++++ + drivers/media/dvb/frontends/stv090x.h | 106 + + drivers/media/dvb/frontends/stv090x_priv.h | 269 ++ + drivers/media/dvb/frontends/stv090x_reg.h | 2373 +++++++++++ + drivers/media/dvb/frontends/stv6110x.c | 373 ++ + drivers/media/dvb/frontends/stv6110x.h | 71 + + drivers/media/dvb/frontends/stv6110x_priv.h | 75 + + drivers/media/dvb/frontends/stv6110x_reg.h | 82 + + drivers/media/dvb/frontends/tda10048.c | 312 ++- + drivers/media/dvb/frontends/tda10048.h | 21 +- + drivers/media/dvb/siano/Makefile | 2 +- + drivers/media/dvb/siano/sms-cards.c | 188 +- + drivers/media/dvb/siano/sms-cards.h | 64 + + drivers/media/dvb/siano/smscoreapi.c | 468 ++- + drivers/media/dvb/siano/smscoreapi.h | 488 ++- + drivers/media/dvb/siano/smsdvb.c | 372 ++- + drivers/media/dvb/siano/smsendian.c | 102 + + drivers/media/dvb/siano/smsendian.h | 32 + + drivers/media/dvb/siano/smsir.c | 301 ++ + drivers/media/dvb/siano/smsir.h | 93 + + drivers/media/dvb/siano/smssdio.c | 357 ++ + drivers/media/dvb/siano/smsusb.c | 75 +- + drivers/media/dvb/ttpci/av7110_av.c | 124 +- + drivers/media/dvb/ttpci/av7110_hw.c | 2 +- + drivers/media/dvb/ttpci/av7110_v4l.c | 2 +- + drivers/media/dvb/ttpci/budget-av.c | 2 +- + drivers/media/dvb/ttpci/budget.c | 85 + + drivers/media/radio/dsbr100.c | 109 +- + drivers/media/radio/radio-mr800.c | 1 + + drivers/media/radio/radio-sf16fmi.c | 16 +- + drivers/media/radio/radio-sf16fmr2.c | 22 +- + drivers/media/radio/radio-si470x.c | 1 - + drivers/media/video/Kconfig | 20 +- + drivers/media/video/Makefile | 79 +- + drivers/media/video/adv7343.c | 534 +++ + drivers/media/video/adv7343_regs.h | 185 + + drivers/media/video/au0828/au0828-cards.c | 4 +- + drivers/media/video/au0828/au0828-core.c | 17 + + drivers/media/video/au0828/au0828-video.c | 8 +- + drivers/media/video/bt8xx/bttv-driver.c | 3 +- + drivers/media/video/bt8xx/bttv-i2c.c | 21 + + drivers/media/video/cpia2/cpia2_v4l.c | 6 +- + drivers/media/video/cx18/cx18-audio.c | 44 +- + drivers/media/video/cx18/cx18-av-core.c | 374 ++- + drivers/media/video/cx18/cx18-av-firmware.c | 82 +- + drivers/media/video/cx18/cx18-av-vbi.c | 4 +- + drivers/media/video/cx18/cx18-cards.c | 63 +- + drivers/media/video/cx18/cx18-controls.c | 6 +- + drivers/media/video/cx18/cx18-driver.c | 100 +- + drivers/media/video/cx18/cx18-driver.h | 22 +- + drivers/media/video/cx18/cx18-dvb.c | 54 +- + drivers/media/video/cx18/cx18-fileops.c | 7 +- + drivers/media/video/cx18/cx18-mailbox.c | 114 +- + drivers/media/video/cx18/cx18-mailbox.h | 2 +- + drivers/media/video/cx18/cx18-queue.c | 85 +- + drivers/media/video/cx18/cx18-streams.c | 44 +- + drivers/media/video/cx18/cx18-streams.h | 20 +- + drivers/media/video/cx18/cx18-version.h | 2 +- + drivers/media/video/cx231xx/cx231xx-avcore.c | 18 +- + drivers/media/video/cx231xx/cx231xx-cards.c | 8 +- + drivers/media/video/cx231xx/cx231xx-i2c.c | 32 +- + drivers/media/video/cx231xx/cx231xx-input.c | 2 +- + drivers/media/video/cx231xx/cx231xx-vbi.c | 1 - + drivers/media/video/cx231xx/cx231xx-video.c | 26 +- + drivers/media/video/cx231xx/cx231xx.h | 5 +- + drivers/media/video/cx23885/cimax2.c | 2 +- + drivers/media/video/cx23885/cx23885-417.c | 1 - + drivers/media/video/cx23885/cx23885-cards.c | 121 + + drivers/media/video/cx23885/cx23885-core.c | 92 +- + drivers/media/video/cx23885/cx23885-dvb.c | 123 +- + drivers/media/video/cx23885/cx23885-i2c.c | 12 + + drivers/media/video/cx23885/cx23885-video.c | 11 +- + drivers/media/video/cx23885/cx23885.h | 21 + + drivers/media/video/cx88/Makefile | 2 +- + drivers/media/video/cx88/cx88-alsa.c | 7 +- + drivers/media/video/cx88/cx88-cards.c | 108 +- + drivers/media/video/cx88/cx88-core.c | 27 +- + drivers/media/video/cx88/cx88-dsp.c | 312 ++ + drivers/media/video/cx88/cx88-dvb.c | 1 + + drivers/media/video/cx88/cx88-i2c.c | 13 + + drivers/media/video/cx88/cx88-input.c | 6 + + drivers/media/video/cx88/cx88-tvaudio.c | 115 +- + drivers/media/video/cx88/cx88-video.c | 13 +- + drivers/media/video/cx88/cx88.h | 12 + + drivers/media/video/em28xx/em28xx-audio.c | 5 + + drivers/media/video/em28xx/em28xx-cards.c | 222 +- + drivers/media/video/em28xx/em28xx-core.c | 58 +- + drivers/media/video/em28xx/em28xx-dvb.c | 21 +- + drivers/media/video/em28xx/em28xx-i2c.c | 25 +- + drivers/media/video/em28xx/em28xx-input.c | 8 +- + drivers/media/video/em28xx/em28xx-reg.h | 16 + + drivers/media/video/em28xx/em28xx-video.c | 38 +- + drivers/media/video/em28xx/em28xx.h | 9 +- + drivers/media/video/gspca/finepix.c | 1 + + drivers/media/video/gspca/gspca.c | 172 +- + drivers/media/video/gspca/gspca.h | 6 +- + drivers/media/video/gspca/m5602/Makefile | 3 +- + drivers/media/video/gspca/m5602/m5602_bridge.h | 26 +- + drivers/media/video/gspca/m5602/m5602_core.c | 44 +- + drivers/media/video/gspca/m5602/m5602_mt9m111.c | 400 ++- + drivers/media/video/gspca/m5602/m5602_mt9m111.h | 805 +---- + drivers/media/video/gspca/m5602/m5602_ov7660.c | 227 + + drivers/media/video/gspca/m5602/m5602_ov7660.h | 279 ++ + drivers/media/video/gspca/m5602/m5602_ov9650.c | 222 +- + drivers/media/video/gspca/m5602/m5602_ov9650.h | 57 +- + drivers/media/video/gspca/m5602/m5602_po1030.c | 494 ++- + drivers/media/video/gspca/m5602/m5602_po1030.h | 439 +-- + drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 391 ++- + drivers/media/video/gspca/m5602/m5602_s5k4aa.h | 93 +- + drivers/media/video/gspca/m5602/m5602_s5k83a.c | 473 ++- + drivers/media/video/gspca/m5602/m5602_s5k83a.h | 280 +-- + drivers/media/video/gspca/m5602/m5602_sensor.h | 9 +- + drivers/media/video/gspca/mr97310a.c | 8 +- + drivers/media/video/gspca/ov519.c | 520 +++- + drivers/media/video/gspca/ov534.c | 277 +- + drivers/media/video/gspca/sonixb.c | 2 + + drivers/media/video/gspca/sonixj.c | 66 +- + drivers/media/video/gspca/spca500.c | 33 +- + drivers/media/video/gspca/spca505.c | 14 +- + drivers/media/video/gspca/spca508.c | 1934 ++++----- + drivers/media/video/gspca/spca561.c | 105 +- + drivers/media/video/gspca/sq905.c | 1 + + drivers/media/video/gspca/sq905c.c | 1 + + drivers/media/video/gspca/stv06xx/stv06xx.c | 2 - + drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c | 76 +- + drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 10 +- + drivers/media/video/gspca/sunplus.c | 33 +- + drivers/media/video/gspca/t613.c | 2 +- + drivers/media/video/gspca/vc032x.c | 22 +- + drivers/media/video/gspca/zc3xx.c | 22 +- + drivers/media/video/hexium_gemini.c | 2 +- + drivers/media/video/hexium_orion.c | 2 +- + drivers/media/video/ir-kbd-i2c.c | 222 +- + drivers/media/video/ivtv/ivtv-driver.c | 9 +- + drivers/media/video/ivtv/ivtv-i2c.c | 36 +- + drivers/media/video/ivtv/ivtv-ioctl.c | 2 +- + drivers/media/video/mt9m001.c | 120 +- + drivers/media/video/mt9m111.c | 73 +- + drivers/media/video/mt9t031.c | 149 +- + drivers/media/video/mt9v022.c | 150 +- + drivers/media/video/mx1_camera.c | 50 +- + drivers/media/video/mx3_camera.c | 46 +- + drivers/media/video/mxb.c | 4 +- + drivers/media/video/ov511.c | 45 +- + drivers/media/video/ov511.h | 3 + + drivers/media/video/pvrusb2/pvrusb2-devattr.c | 6 + + drivers/media/video/pvrusb2/pvrusb2-devattr.h | 23 +- + drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 3 + + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 74 +- + drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 51 +- + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 22 +- + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 +- + drivers/media/video/pwc/pwc-if.c | 6 +- + drivers/media/video/pwc/pwc-v4l.c | 2 +- + drivers/media/video/pxa_camera.c | 162 +- + drivers/media/video/s2255drv.c | 110 +- + drivers/media/video/saa7134/Kconfig | 1 + + drivers/media/video/saa7134/Makefile | 3 +- + drivers/media/video/saa7134/saa7134-cards.c | 450 ++- + drivers/media/video/saa7134/saa7134-core.c | 18 +- + drivers/media/video/saa7134/saa7134-dvb.c | 26 + + drivers/media/video/saa7134/saa7134-empress.c | 14 +- + drivers/media/video/saa7134/saa7134-i2c.c | 33 +- + drivers/media/video/saa7134/saa7134-input.c | 118 +- + drivers/media/video/saa7134/saa7134-ts.c | 122 +- + drivers/media/video/saa7134/saa7134-video.c | 21 +- + drivers/media/video/saa7134/saa7134.h | 29 +- + drivers/media/video/se401.c | 882 ++-- + drivers/media/video/se401.h | 7 +- + drivers/media/video/sh_mobile_ceu_camera.c | 39 +- + drivers/media/video/soc_camera.c | 106 +- + drivers/media/video/stk-webcam.c | 4 +- + drivers/media/video/tda7432.c | 14 - + drivers/media/video/tea6415c.c | 1 - + drivers/media/video/tea6420.c | 1 - + drivers/media/video/ths7303.c | 151 + + drivers/media/video/tuner-core.c | 33 - + drivers/media/video/tveeprom.c | 6 +- + drivers/media/video/tvp514x.c | 2 +- + drivers/media/video/usbvideo/konicawc.c | 4 +- + drivers/media/video/usbvideo/quickcam_messenger.c | 4 +- + drivers/media/video/usbvision/usbvision-core.c | 14 +- + drivers/media/video/usbvision/usbvision-video.c | 4 +- + drivers/media/video/uvc/uvc_ctrl.c | 35 +- + drivers/media/video/uvc/uvc_driver.c | 68 +- + drivers/media/video/uvc/uvc_queue.c | 14 + + drivers/media/video/uvc/uvc_status.c | 21 +- + drivers/media/video/uvc/uvc_v4l2.c | 39 +- + drivers/media/video/uvc/uvc_video.c | 17 +- + drivers/media/video/uvc/uvcvideo.h | 5 +- + drivers/media/video/v4l2-common.c | 77 +- + drivers/media/video/v4l2-device.c | 31 +- + drivers/media/video/videobuf-core.c | 6 +- + drivers/media/video/videobuf-dma-contig.c | 14 - + drivers/media/video/videobuf-dma-sg.c | 19 +- + drivers/media/video/vino.c | 6 +- + drivers/media/video/vivi.c | 11 +- + drivers/media/video/w9968cf.c | 35 +- + drivers/media/video/zoran/zoran_card.c | 4 +- + drivers/media/video/zoran/zoran_driver.c | 14 +- + drivers/media/video/zr364xx.c | 6 +- + include/linux/mmc/sdio_ids.h | 8 + + include/linux/videodev2.h | 3 +- + include/media/adv7343.h | 23 + + include/media/ir-kbd-i2c.h | 10 +- + include/media/soc_camera.h | 10 +- + include/media/tuner.h | 2 + + include/media/v4l2-chip-ident.h | 6 + + include/media/v4l2-common.h | 10 + + include/media/v4l2-device.h | 23 +- + include/media/v4l2-subdev.h | 5 + + 263 files changed, 21821 insertions(+), 6624 deletions(-) + create mode 100644 drivers/media/dvb/frontends/isl6423.c + create mode 100644 drivers/media/dvb/frontends/isl6423.h + create mode 100644 drivers/media/dvb/frontends/stv090x.c + create mode 100644 drivers/media/dvb/frontends/stv090x.h + create mode 100644 drivers/media/dvb/frontends/stv090x_priv.h + create mode 100644 drivers/media/dvb/frontends/stv090x_reg.h + create mode 100644 drivers/media/dvb/frontends/stv6110x.c + create mode 100644 drivers/media/dvb/frontends/stv6110x.h + create mode 100644 drivers/media/dvb/frontends/stv6110x_priv.h + create mode 100644 drivers/media/dvb/frontends/stv6110x_reg.h + create mode 100644 drivers/media/dvb/siano/smsendian.c + create mode 100644 drivers/media/dvb/siano/smsendian.h + create mode 100644 drivers/media/dvb/siano/smsir.c + create mode 100644 drivers/media/dvb/siano/smsir.h + create mode 100644 drivers/media/dvb/siano/smssdio.c + create mode 100644 drivers/media/video/adv7343.c + create mode 100644 drivers/media/video/adv7343_regs.h + create mode 100644 drivers/media/video/cx88/cx88-dsp.c + create mode 100644 drivers/media/video/gspca/m5602/m5602_ov7660.c + create mode 100644 drivers/media/video/gspca/m5602/m5602_ov7660.h + create mode 100644 drivers/media/video/ths7303.c + create mode 100644 include/media/adv7343.h +Merging quota/for_next +$ git merge quota/for_next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging ide/for-next +$ git merge ide/for-next +Auto-merging drivers/ide/ide-atapi.c +Merge made by recursive. + drivers/ide/at91_ide.c | 3 +- + drivers/ide/buddha.c | 40 +++++---- + drivers/ide/cmd640.c | 13 +++ + drivers/ide/cmd64x.c | 103 +++++++--------------- + drivers/ide/cs5536.c | 23 +++-- + drivers/ide/falconide.c | 1 - + drivers/ide/gayle.c | 33 ++++--- + drivers/ide/ht6560b.c | 33 +++++-- + drivers/ide/icside.c | 10 ++- + drivers/ide/ide-atapi.c | 138 +++++++++++++++++++----------- + drivers/ide/ide-cd.c | 76 +++-------------- + drivers/ide/ide-disk.c | 9 +-- + drivers/ide/ide-floppy.c | 56 +++++------- + drivers/ide/ide-floppy_ioctl.c | 43 +++++----- + drivers/ide/ide-io.c | 8 +- + drivers/ide/ide-ioctls.c | 13 +-- + drivers/ide/ide-probe.c | 17 +++- + drivers/ide/ide-tape.c | 186 ++++++++++++++++++---------------------- + drivers/ide/ide-xfer-mode.c | 12 +++ + drivers/ide/it8172.c | 2 +- + drivers/ide/it8213.c | 2 +- + drivers/ide/macide.c | 30 ++++--- + drivers/ide/opti621.c | 8 +- + drivers/ide/pdc202xx_old.c | 24 +++++- + drivers/ide/piix.c | 2 +- + drivers/ide/q40ide.c | 7 +- + drivers/ide/qd65xx.c | 11 ++- + drivers/ide/qd65xx.h | 11 ++- + drivers/ide/sgiioc4.c | 119 ++++++++++++-------------- + drivers/ide/siimage.c | 42 +++------ + drivers/ide/sl82c105.c | 32 +++++-- + drivers/ide/slc90e66.c | 2 +- + include/linux/ata.h | 14 +++ + include/linux/ide.h | 47 +++++----- + 34 files changed, 597 insertions(+), 573 deletions(-) +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 +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Resolved 'drivers/platform/x86/Kconfig' using previous resolution. +Resolved 'drivers/platform/x86/toshiba_acpi.c' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/x86/kernel/acpi/boot.c +Auto-merging arch/x86/kernel/reboot.c +Auto-merging drivers/acpi/processor_core.c +Auto-merging drivers/platform/x86/Kconfig +CONFLICT (content): Merge conflict in drivers/platform/x86/Kconfig +Auto-merging drivers/platform/x86/eeepc-laptop.c +Auto-merging drivers/platform/x86/toshiba_acpi.c +CONFLICT (content): Merge conflict in drivers/platform/x86/toshiba_acpi.c +Auto-merging drivers/pnp/pnpacpi/rsparser.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 29b1423] Merge commit 'acpi/test' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 8 - + MAINTAINERS | 5 + + arch/x86/kernel/acpi/boot.c | 12 - + arch/x86/kernel/acpi/cstate.c | 16 +- + arch/x86/kernel/reboot.c | 2 +- + drivers/acpi/ac.c | 20 +- + drivers/acpi/battery.c | 22 +- + drivers/acpi/bus.c | 91 +--- + drivers/acpi/power.c | 28 +- + drivers/acpi/processor_core.c | 32 +- + drivers/acpi/processor_idle.c | 7 +- + drivers/platform/x86/Kconfig | 15 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/asus-laptop.c | 23 +- + drivers/platform/x86/asus_acpi.c | 30 +- + drivers/platform/x86/eeepc-laptop.c | 105 ++++- + drivers/platform/x86/oqo-wmi.c | 941 +++++++++++++++++++++++++++++++++++ + drivers/platform/x86/toshiba_acpi.c | 206 ++++++++- + drivers/pnp/pnpacpi/rsparser.c | 46 ++- + include/acpi/acpi_bus.h | 5 +- + include/acpi/acpi_drivers.h | 3 +- + 21 files changed, 1392 insertions(+), 226 deletions(-) + create mode 100644 drivers/platform/x86/oqo-wmi.c +$ git revert -m 1 bc8c4c9333ff8346031db85f395ecc73925230c3 +Finished one revert. +[master 10c72cb] Revert "Merge branch 'oqo-wmi-EXPECT-REFRESH' into test" + 4 files changed, 0 insertions(+), 961 deletions(-) + delete mode 100644 drivers/platform/x86/oqo-wmi.c +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Removing drivers/firewire/fw-device.h +Removing drivers/firewire/fw-topology.h +Merge made by recursive. + drivers/firewire/Kconfig | 12 + + drivers/firewire/Makefile | 12 +- + drivers/firewire/{fw-card.c => core-card.c} | 45 +- + drivers/firewire/{fw-cdev.c => core-cdev.c} | 13 +- + drivers/firewire/{fw-device.c => core-device.c} | 154 ++- + drivers/firewire/{fw-iso.c => core-iso.c} | 17 +- + .../firewire/{fw-topology.c => core-topology.c} | 24 +- + .../{fw-transaction.c => core-transaction.c} | 42 +- + drivers/firewire/core.h | 206 +++ + drivers/firewire/fw-device.h | 202 --- + drivers/firewire/fw-topology.h | 77 - + drivers/firewire/net.c | 1655 ++++++++++++++++++++ + drivers/firewire/{fw-ohci.c => ohci.c} | 19 +- + drivers/firewire/{fw-ohci.h => ohci.h} | 6 +- + drivers/firewire/{fw-sbp2.c => sbp2.c} | 58 +- + drivers/ieee1394/Kconfig | 2 +- + .../fw-transaction.h => include/linux/firewire.h | 503 +++--- + 17 files changed, 2401 insertions(+), 646 deletions(-) + rename drivers/firewire/{fw-card.c => core-card.c} (92%) + rename drivers/firewire/{fw-cdev.c => core-cdev.c} (99%) + rename drivers/firewire/{fw-device.c => core-device.c} (88%) + rename drivers/firewire/{fw-iso.c => core-iso.c} (95%) + rename drivers/firewire/{fw-topology.c => core-topology.c} (97%) + rename drivers/firewire/{fw-transaction.c => core-transaction.c} (97%) + create mode 100644 drivers/firewire/core.h + delete mode 100644 drivers/firewire/fw-device.h + delete mode 100644 drivers/firewire/fw-topology.h + create mode 100644 drivers/firewire/net.c + rename drivers/firewire/{fw-ohci.c => ohci.c} (99%) + rename drivers/firewire/{fw-ohci.h => ohci.h} (98%) + rename drivers/firewire/{fw-sbp2.c => sbp2.c} (97%) + rename drivers/firewire/fw-transaction.h => include/linux/firewire.h (58%) +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/Kconfig | 13 +- + drivers/mtd/ubi/Makefile | 2 +- + drivers/mtd/ubi/build.c | 161 ++++++++++++++++++-- + drivers/mtd/ubi/cdev.c | 32 ++-- + drivers/mtd/ubi/eba.c | 99 ++++++++----- + drivers/mtd/ubi/gluebi.c | 378 +++++++++++++++++++++++++++++++++++----------- + drivers/mtd/ubi/io.c | 82 +++++++++- + drivers/mtd/ubi/kapi.c | 117 ++++++++++++--- + drivers/mtd/ubi/ubi.h | 84 ++++++----- + drivers/mtd/ubi/upd.c | 8 +- + drivers/mtd/ubi/vmt.c | 65 +++----- + drivers/mtd/ubi/wl.c | 179 +++++++++++++--------- + include/linux/mtd/ubi.h | 37 +++++ + 13 files changed, 922 insertions(+), 335 deletions(-) +Merging kvm/master +$ git merge kvm/master +Resolved 'arch/x86/include/asm/mce.h' using previous resolution. +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/x86/include/asm/mce.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/mce.h +Removing arch/x86/kvm/kvm_svm.h +Auto-merging fs/eventfd.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 524e53d] Merge commit 'kvm/master' +$ git diff -M --stat --summary HEAD^.. + arch/ia64/include/asm/kvm_host.h | 1 - + arch/ia64/kvm/Kconfig | 8 +- + arch/ia64/kvm/kvm-ia64.c | 37 ++-- + arch/ia64/kvm/vcpu.c | 4 +- + arch/powerpc/include/asm/kvm_host.h | 1 - + arch/powerpc/kvm/44x.c | 4 +- + arch/powerpc/kvm/Kconfig | 3 +- + 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 | 10 +- + arch/powerpc/kvm/e500_tlb.h | 6 +- + arch/powerpc/kvm/emulate.c | 4 +- + arch/powerpc/kvm/powerpc.c | 16 +- + arch/s390/include/asm/kvm_host.h | 9 +- + arch/s390/kvm/Kconfig | 6 +- + arch/s390/kvm/gaccess.h | 23 ++- + arch/s390/kvm/intercept.c | 18 ++- + arch/s390/kvm/kvm-s390.c | 80 ++++----- + arch/s390/kvm/kvm-s390.h | 32 +++- + arch/s390/kvm/sigp.c | 60 ++++--- + arch/x86/include/asm/kvm.h | 1 + + arch/x86/include/asm/kvm_host.h | 33 ++-- + arch/x86/include/asm/vmx.h | 8 + + arch/x86/kvm/Kconfig | 9 +- + arch/x86/kvm/Makefile | 32 ++-- + arch/x86/kvm/i8254.c | 70 ++++--- + arch/x86/kvm/i8254.h | 2 +- + arch/x86/kvm/i8259.c | 28 ++- + 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 | 71 +++++--- + arch/x86/kvm/lapic.h | 1 + + arch/x86/kvm/mmu.c | 325 ++++++++++++++++++++++---------- + arch/x86/kvm/mmu.h | 4 +- + arch/x86/kvm/paging_tmpl.h | 42 ++-- + arch/x86/kvm/svm.c | 102 +++++++---- + arch/x86/kvm/timer.c | 16 +- + arch/x86/kvm/vmx.c | 331 +++++++++++++++++++++++++------- + arch/x86/kvm/x86.c | 355 ++++++++++++++++++++++++++++------- + arch/x86/kvm/x86_emulate.c | 17 ++- + fs/eventfd.c | 10 +- + include/linux/kvm.h | 62 ++++++- + include/linux/kvm_host.h | 57 +++++- + virt/kvm/Kconfig | 14 ++ + virt/kvm/coalesced_mmio.c | 44 +++-- + virt/kvm/coalesced_mmio.h | 1 + + virt/kvm/eventfd.c | 217 +++++++++++++++++++++ + virt/kvm/ioapic.c | 31 +++- + virt/kvm/iodev.h | 29 ++- + virt/kvm/irq_comm.c | 40 +++- + virt/kvm/kvm_main.c | 148 +++++++++------ + 53 files changed, 1769 insertions(+), 727 deletions(-) + delete mode 100644 arch/x86/kvm/kvm_svm.h + create mode 100644 virt/kvm/Kconfig + create mode 100644 virt/kvm/eventfd.c +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merging drivers/net/Kconfig +Auto-merging drivers/s390/scsi/zfcp_fc.c +Auto-merging drivers/scsi/lpfc/lpfc_scsi.c +Auto-merging fs/compat_ioctl.c +Merge made by recursive. + Documentation/scsi/scsi_fc_transport.txt | 14 +- + Documentation/scsi/scsi_mid_low_api.txt | 5 + + drivers/net/Kconfig | 5 +- + drivers/s390/scsi/zfcp_aux.c | 10 +- + drivers/s390/scsi/zfcp_def.h | 18 +- + drivers/s390/scsi/zfcp_erp.c | 2 +- + drivers/s390/scsi/zfcp_ext.h | 6 +- + drivers/s390/scsi/zfcp_fc.c | 185 ++++++++- + drivers/s390/scsi/zfcp_fsf.c | 3 +- + drivers/s390/scsi/zfcp_scsi.c | 15 + + drivers/scsi/aic7xxx/aic79xx_osm.c | 10 +- + drivers/scsi/bnx2i/Kconfig | 1 + + drivers/scsi/lpfc/lpfc.h | 4 - + drivers/scsi/lpfc/lpfc_attr.c | 6 + + drivers/scsi/lpfc/lpfc_ct.c | 4 +- + drivers/scsi/lpfc/lpfc_els.c | 27 ++- + drivers/scsi/lpfc/lpfc_hbadisc.c | 35 ++- + drivers/scsi/lpfc/lpfc_hw.h | 1 - + drivers/scsi/lpfc/lpfc_hw4.h | 6 +- + drivers/scsi/lpfc/lpfc_init.c | 34 +- + drivers/scsi/lpfc/lpfc_mbox.c | 7 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 2 +- + drivers/scsi/lpfc/lpfc_scsi.c | 661 +++++++++++++++--------------- + drivers/scsi/lpfc/lpfc_sli.c | 264 +++++++++--- + drivers/scsi/lpfc/lpfc_sli.h | 1 + + drivers/scsi/lpfc/lpfc_sli4.h | 2 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 2 - + drivers/scsi/ncr53c8xx.c | 2 +- + drivers/scsi/pcmcia/nsp_cs.c | 6 +- + drivers/scsi/qla2xxx/qla_isr.c | 15 +- + drivers/scsi/qla2xxx/qla_sup.c | 7 +- + drivers/scsi/scsi_devinfo.c | 1 + + drivers/scsi/scsi_transport_fc.c | 614 +++++++++++++++++++++++++++- + drivers/scsi/scsi_transport_spi.c | 18 +- + fs/compat_ioctl.c | 6 - + include/Kbuild | 1 + + include/scsi/Kbuild | 4 + + include/scsi/scsi_bsg_fc.h | 322 +++++++++++++++ + include/scsi/scsi_host.h | 9 + + include/scsi/scsi_transport_fc.h | 52 +++- + include/scsi/scsi_transport_spi.h | 4 + + 42 files changed, 1888 insertions(+), 505 deletions(-) + create mode 100644 include/scsi/Kbuild + create mode 100644 include/scsi/scsi_bsg_fc.h +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging net/master +$ git merge net/master +Merge made by recursive. + Documentation/rfkill.txt | 137 +++++++++++++------------- + drivers/net/sky2.c | 31 +++--- + drivers/net/wireless/ath/ath5k/pcu.c | 5 +- + drivers/net/wireless/ath/ath9k/Kconfig | 1 - + drivers/net/wireless/ath/ath9k/ath9k.h | 10 +-- + drivers/net/wireless/ath/ath9k/hw.c | 29 +++--- + drivers/net/wireless/ath/ath9k/hw.h | 3 - + drivers/net/wireless/ath/ath9k/main.c | 130 ++++++++----------------- + drivers/net/wireless/ath/ath9k/recv.c | 1 + + drivers/net/wireless/iwlwifi/iwl-agn.c | 1 - + drivers/net/wireless/iwlwifi/iwl-core.c | 141 ++++++++++++++++----------- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 +- + drivers/net/wireless/libertas/if_spi.c | 11 +- + drivers/platform/x86/dell-laptop.c | 2 +- + drivers/platform/x86/sony-laptop.c | 5 +- + include/net/x25.h | 2 +- + net/mac80211/debugfs.c | 25 +++++ + net/mac80211/ieee80211_i.h | 2 +- + net/mac80211/mlme.c | 38 +++++--- + net/mac80211/util.c | 25 ----- + net/mac80211/wext.c | 31 +++++- + net/x25/af_x25.c | 23 ++++- + net/x25/x25_timer.c | 2 +- + 23 files changed, 340 insertions(+), 319 deletions(-) +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Removing drivers/mtd/maps/pmcmsp-ramroot.c +Auto-merging drivers/mtd/mtd_blkdevs.c +Auto-merging drivers/mtd/nand/Kconfig +Auto-merging drivers/mtd/nand/davinci_nand.c +Auto-merging drivers/mtd/onenand/omap2.c +Auto-merging fs/compat_ioctl.c +Removing include/mtd/jffs2-user.h +Merge made by recursive. + Documentation/ABI/testing/sysfs-class-mtd | 125 +++++ + Documentation/kernel-parameters.txt | 10 + + MAINTAINERS | 1 - + arch/arm/mach-davinci/include/mach/nand.h | 8 +- + arch/arm/plat-s3c/include/plat/nand.h | 31 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 26 +- + drivers/mtd/chips/jedec_probe.c | 13 + + drivers/mtd/devices/m25p80.c | 4 + + drivers/mtd/maps/Kconfig | 13 +- + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/bfin-async-flash.c | 5 + + drivers/mtd/maps/integrator-flash.c | 226 ++++++-- + drivers/mtd/maps/physmap.c | 40 -- + drivers/mtd/maps/physmap_of.c | 199 +++++-- + drivers/mtd/maps/pmcmsp-ramroot.c | 104 ---- + drivers/mtd/maps/pxa2xx-flash.c | 22 - + drivers/mtd/maps/rbtx4939-flash.c | 23 - + drivers/mtd/maps/sa1100-flash.c | 23 - + drivers/mtd/maps/uclinux.c | 16 +- + drivers/mtd/mtd_blkdevs.c | 2 +- + drivers/mtd/mtdchar.c | 303 +++++++--- + drivers/mtd/mtdcore.c | 47 ++- + drivers/mtd/mtdpart.c | 20 +- + drivers/mtd/nand/Kconfig | 24 +- + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/atmel_nand.c | 11 +- + drivers/mtd/nand/bf5xx_nand.c | 17 +- + drivers/mtd/nand/davinci_nand.c | 342 ++++++++++-- + drivers/mtd/nand/mxc_nand.c | 66 ++- + drivers/mtd/nand/nand_base.c | 3 +- + drivers/mtd/nand/nand_ecc.c | 4 +- + drivers/mtd/nand/omap2.c | 776 ++++++++++++++++++++++++++ + drivers/mtd/nand/orion_nand.c | 23 + + drivers/mtd/nand/plat_nand.c | 19 +- + drivers/mtd/nand/s3c2410.c | 268 ++++++--- + drivers/mtd/nand/txx9ndfmc.c | 16 +- + drivers/mtd/onenand/omap2.c | 4 +- + drivers/mtd/onenand/onenand_base.c | 862 ++++++++++++++++++++++++++--- + drivers/mtd/onenand/onenand_bbt.c | 14 +- + drivers/mtd/onenand/onenand_sim.c | 81 +++- + fs/compat_ioctl.c | 52 -- + fs/jffs2/scan.c | 4 +- + include/linux/mtd/nand.h | 16 + + include/linux/mtd/onenand.h | 24 + + include/linux/mtd/onenand_regs.h | 20 +- + include/linux/mtd/partitions.h | 1 - + include/mtd/Kbuild | 1 - + include/mtd/jffs2-user.h | 34 -- + include/mtd/mtd-abi.h | 15 + + 49 files changed, 3133 insertions(+), 827 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-mtd + delete mode 100644 drivers/mtd/maps/pmcmsp-ramroot.c + create mode 100644 drivers/mtd/nand/omap2.c + delete mode 100644 include/mtd/jffs2-user.h +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Already up-to-date. +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Resolved 'arch/sh/include/asm/smp.h' using previous resolution. +Resolved 'drivers/net/sfc/efx.c' using previous resolution. +Auto-merging arch/ia64/kernel/smp.c +Auto-merging arch/powerpc/platforms/powermac/setup.c +Auto-merging arch/s390/kernel/smp.c +Auto-merging arch/sh/include/asm/mmu_context.h +Auto-merging arch/sh/include/asm/smp.h +CONFLICT (content): Merge conflict in arch/sh/include/asm/smp.h +Auto-merging arch/sh/include/asm/topology.h +Auto-merging arch/x86/kernel/acpi/cstate.c +Auto-merging drivers/net/sfc/efx.c +CONFLICT (content): Merge conflict in drivers/net/sfc/efx.c +Auto-merging drivers/net/virtio_net.c +Auto-merging include/linux/sched.h +Auto-merging virt/kvm/kvm_main.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c5cac13] Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + 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 | 9 +- + arch/mips/kernel/smp-mt.c | 4 +- + arch/mips/kernel/smp-up.c | 3 +- + arch/mips/kernel/smp.c | 4 +- + 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 | 4 +- + arch/powerpc/kernel/smp.c | 4 +- + arch/powerpc/platforms/powermac/setup.c | 2 +- + arch/s390/include/asm/smp.h | 2 +- + arch/s390/include/asm/topology.h | 1 - + arch/s390/kernel/smp.c | 4 +- + arch/sh/include/asm/smp.h | 1 - + arch/sh/include/asm/topology.h | 1 - + arch/sparc/include/asm/smp_64.h | 1 - + arch/sparc/include/asm/topology_64.h | 16 - + arch/um/include/asm/mmu_context.h | 4 +- + arch/um/kernel/smp.c | 2 +- + arch/x86/include/asm/mmu_context.h | 6 +- + arch/x86/include/asm/smp.h | 1 - + arch/x86/kernel/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/mm/tlb.c | 15 +- + arch/x86/xen/mmu.c | 4 +- + drivers/acpi/processor_perflib.c | 3 +- + drivers/acpi/processor_throttling.c | 85 ++-- + drivers/firmware/dcdbas.c | 49 +-- + drivers/net/sfc/efx.c | 3 +- + drivers/oprofile/buffer_sync.c | 3 +- + include/asm-generic/topology.h | 17 - + include/linux/cpu.h | 5 - + include/linux/cpumask.h | 709 ++++++++++------------------ + include/linux/interrupt.h | 2 - + include/linux/sched.h | 3 + + include/linux/smp.h | 11 - + include/linux/topology.h | 6 - + init/main.c | 6 - + kernel/cpu.c | 11 +- + kernel/smp.c | 7 - + kernel/trace/kmemtrace.c | 2 +- + kernel/trace/ring_buffer.c | 4 +- + kernel/trace/trace.c | 7 +- + mm/quicklist.c | 3 +- + virt/kvm/kvm_main.c | 3 +- + 82 files changed, 480 insertions(+), 808 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging input/next +$ git merge input/next +Auto-merging drivers/input/misc/Kconfig +Merge made by recursive. + Documentation/input/input.txt | 2 +- + Documentation/input/rotary-encoder.txt | 9 +- + arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h | 42 + + drivers/char/keyboard.c | 2 - + drivers/input/evdev.c | 17 +- + drivers/input/gameport/fm801-gp.c | 1 + + drivers/input/gameport/gameport.c | 25 +- + drivers/input/joydev.c | 14 +- + drivers/input/keyboard/Kconfig | 21 + + drivers/input/keyboard/Makefile | 2 + + drivers/input/keyboard/ep93xx_keypad.c | 470 +++++++++++ + drivers/input/keyboard/gpio_keys.c | 35 +- + drivers/input/keyboard/lm8323.c | 878 +++++++++++++++++++++ + drivers/input/misc/Kconfig | 19 + + drivers/input/misc/Makefile | 2 + + drivers/input/misc/ati_remote2.c | 16 +- + drivers/input/misc/dm355evm_keys.c | 329 ++++++++ + drivers/input/misc/rotary_encoder.c | 61 +- + drivers/input/misc/twl4030-pwrbutton.c | 145 ++++ + drivers/input/misc/uinput.c | 94 ++- + drivers/input/mouse/Kconfig | 18 + + drivers/input/mouse/Makefile | 1 + + drivers/input/mouse/alps.c | 31 +- + drivers/input/mouse/appletouch.c | 2 +- + drivers/input/mouse/lifebook.c | 25 +- + drivers/input/mouse/psmouse-base.c | 4 +- + drivers/input/mouse/synaptics.c | 28 + + drivers/input/mouse/synaptics.h | 2 + + drivers/input/mouse/synaptics_i2c.c | 676 ++++++++++++++++ + drivers/input/mousedev.c | 9 +- + drivers/input/serio/i8042.c | 17 +- + drivers/input/serio/serio.c | 58 +- + drivers/input/tablet/gtco.c | 1 + + drivers/input/tablet/wacom.h | 5 +- + drivers/input/tablet/wacom_sys.c | 13 + + drivers/input/tablet/wacom_wac.c | 171 +++- + drivers/input/tablet/wacom_wac.h | 3 + + drivers/input/touchscreen/Kconfig | 32 + + drivers/input/touchscreen/Makefile | 3 + + drivers/input/touchscreen/ads7846.c | 23 +- + drivers/input/touchscreen/atmel-wm97xx.c | 446 +++++++++++ + drivers/input/touchscreen/eeti_ts.c | 286 +++++++ + drivers/input/touchscreen/tsc2007.c | 2 +- + drivers/input/touchscreen/w90p910_ts.c | 350 ++++++++ + drivers/input/touchscreen/wm97xx-core.c | 2 +- + drivers/mfd/ucb1400_core.c | 20 + + include/linux/gameport.h | 3 +- + include/linux/i2c/lm8323.h | 46 ++ + include/linux/input.h | 2 + + include/linux/rotary_encoder.h | 2 + + include/linux/serio.h | 9 +- + include/linux/spi/ads7846.h | 1 + + include/linux/ucb1400.h | 23 +- + 53 files changed, 4254 insertions(+), 244 deletions(-) + create mode 100644 arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h + create mode 100644 drivers/input/keyboard/ep93xx_keypad.c + create mode 100644 drivers/input/keyboard/lm8323.c + create mode 100644 drivers/input/misc/dm355evm_keys.c + create mode 100644 drivers/input/misc/twl4030-pwrbutton.c + create mode 100644 drivers/input/mouse/synaptics_i2c.c + create mode 100644 drivers/input/touchscreen/atmel-wm97xx.c + create mode 100644 drivers/input/touchscreen/eeti_ts.c + create mode 100644 drivers/input/touchscreen/w90p910_ts.c + create mode 100644 include/linux/i2c/lm8323.h +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Already up-to-date. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Auto-merging drivers/md/dm.c +Merge made by recursive. + Documentation/device-mapper/dm-queue-length.txt | 39 +++ + Documentation/device-mapper/dm-service-time.txt | 91 ++++++ + drivers/md/Kconfig | 19 ++ + drivers/md/Makefile | 2 + + drivers/md/dm-crypt.c | 19 ++- + drivers/md/dm-delay.c | 26 ++- + drivers/md/dm-exception-store.h | 2 +- + drivers/md/dm-io.c | 14 +- + drivers/md/dm-ioctl.c | 14 +- + drivers/md/dm-linear.c | 15 +- + drivers/md/dm-log.c | 2 +- + drivers/md/dm-mpath.c | 143 ++++++---- + drivers/md/dm-path-selector.h | 8 +- + drivers/md/dm-queue-length.c | 263 ++++++++++++++++++ + drivers/md/dm-raid1.c | 17 +- + drivers/md/dm-region-hash.c | 2 +- + drivers/md/dm-round-robin.c | 2 +- + drivers/md/dm-service-time.c | 339 +++++++++++++++++++++++ + drivers/md/dm-snap-persistent.c | 2 +- + drivers/md/dm-snap.c | 11 + + drivers/md/dm-stripe.c | 33 ++- + drivers/md/dm-sysfs.c | 9 + + drivers/md/dm-table.c | 284 +++++++++++-------- + drivers/md/dm.c | 232 +++++++++------- + drivers/md/dm.h | 3 +- + include/linux/device-mapper.h | 38 ++- + include/linux/dm-ioctl.h | 14 +- + 27 files changed, 1335 insertions(+), 308 deletions(-) + create mode 100644 Documentation/device-mapper/dm-queue-length.txt + create mode 100644 Documentation/device-mapper/dm-service-time.txt + create mode 100644 drivers/md/dm-queue-length.c + create mode 100644 drivers/md/dm-service-time.c +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. + drivers/power/Kconfig | 8 + + drivers/power/Makefile | 3 +- + drivers/power/da9030_battery.c | 19 ++- + drivers/power/ds2760_battery.c | 42 ++++- + drivers/power/max17040_battery.c | 309 ++++++++++++++++++++++++++++++++++++++ + drivers/w1/slaves/w1_ds2760.c | 30 ++++ + drivers/w1/slaves/w1_ds2760.h | 7 + + include/linux/max17040_battery.h | 19 +++ + 8 files changed, 420 insertions(+), 17 deletions(-) + create mode 100644 drivers/power/max17040_battery.c + create mode 100644 include/linux/max17040_battery.h +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 arch/x86/kernel/kgdb.c +Merge made by recursive. + arch/x86/kernel/kgdb.c | 9 +++++++-- + include/linux/kgdb.h | 48 ++++++++++++++++++++++++++++++++++++++++++------ + kernel/kgdb.c | 6 +++--- + 3 files changed, 52 insertions(+), 11 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Merge made by recursive. + Documentation/vm/slqbinfo.c | 1047 ++++++++++++ + include/linux/page-flags.h | 2 - + include/linux/rcu_types.h | 18 + + include/linux/rcupdate.h | 11 +- + include/linux/slab.h | 10 +- + include/linux/slqb_def.h | 298 ++++ + init/Kconfig | 28 +- + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/slab.c | 9 + + mm/slob.c | 6 +- + mm/slqb.c | 3765 +++++++++++++++++++++++++++++++++++++++++++ + mm/slub.c | 104 +- + mm/util.c | 4 + + 14 files changed, 5280 insertions(+), 43 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 +Resolved 'drivers/md/md.c' using previous resolution. +Resolved 'drivers/md/raid5.c' using previous resolution. +Auto-merging drivers/md/md.c +CONFLICT (content): Merge conflict in drivers/md/md.c +Auto-merging drivers/md/raid5.c +CONFLICT (content): Merge conflict in drivers/md/raid5.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7f8a46c] Merge commit 'md/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/md/faulty.c | 15 +- + drivers/md/linear.c | 162 ++++++------------- + drivers/md/linear.h | 10 +- + drivers/md/md.c | 156 +++++++----------- + drivers/md/md.h | 13 +-- + drivers/md/multipath.c | 20 ++-- + drivers/md/multipath.h | 6 - + drivers/md/raid0.c | 395 ++++++++++++++++++++++++--------------------- + drivers/md/raid0.h | 10 +- + drivers/md/raid1.c | 46 +++--- + drivers/md/raid1.h | 6 - + drivers/md/raid10.c | 62 ++++---- + drivers/md/raid10.h | 6 - + drivers/md/raid5.c | 213 +++++++++++++------------ + drivers/md/raid5.h | 8 +- + include/linux/raid/md_p.h | 2 +- + 16 files changed, 507 insertions(+), 623 deletions(-) +Merging mfd/for-next +$ git merge mfd/for-next +Merge made by recursive. + drivers/mfd/Kconfig | 24 +- + drivers/mfd/Makefile | 5 +- + drivers/mfd/ab3100-core.c | 991 ++++++++++++++++++++++++++++++++++++++++++ + drivers/mfd/asic3.c | 312 +++++++++++++- + drivers/mfd/da903x.c | 2 +- + drivers/mfd/ezx-pcap.c | 505 +++++++++++++++++++++ + drivers/mfd/htc-pasic3.c | 4 +- + drivers/mfd/pcf50633-core.c | 4 +- + drivers/mfd/pcf50633-gpio.c | 3 + + drivers/mfd/t7l66xb.c | 2 +- + drivers/mfd/tc6387xb.c | 2 +- + drivers/mfd/tc6393xb.c | 2 +- + drivers/mfd/twl4030-core.c | 2 +- + drivers/mfd/twl4030-irq.c | 2 +- + drivers/mfd/wm8350-regmap.c | 4 +- + drivers/mfd/wm8400-core.c | 4 +- + include/linux/mfd/ab3100.h | 103 +++++ + include/linux/mfd/asic3.h | 236 +---------- + include/linux/mfd/ezx-pcap.h | 256 +++++++++++ + include/linux/mfd/tmio.h | 2 +- + 20 files changed, 2223 insertions(+), 242 deletions(-) + create mode 100644 drivers/mfd/ab3100-core.c + create mode 100644 drivers/mfd/ezx-pcap.c + create mode 100644 include/linux/mfd/ab3100.h + create mode 100644 include/linux/mfd/ezx-pcap.h +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + drivers/regulator/virtual.c | 2 ++ + drivers/regulator/wm8350-regulator.c | 2 ++ + 2 files changed, 4 insertions(+), 0 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Auto-merging MAINTAINERS +Auto-merging drivers/char/tty_ldisc.c +Merge made by recursive. + drivers/char/bfin_jtag_comm.c | 30 +++++++++++++++--------------- + drivers/serial/s3c2400.c | 2 +- + drivers/serial/s3c2410.c | 2 +- + drivers/serial/s3c2412.c | 2 +- + drivers/serial/s3c2440.c | 2 +- + drivers/serial/s3c24a0.c | 2 +- + drivers/serial/s3c6400.c | 2 +- + drivers/serial/samsung.c | 2 +- + drivers/serial/samsung.h | 2 +- + 9 files changed, 23 insertions(+), 23 deletions(-) +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Merge made by recursive. + drivers/uwb/hwa-rc.c | 2 +- + drivers/uwb/wlp/txrx.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging watchdog/master +$ git merge watchdog/master +Resolved 'drivers/watchdog/Makefile' using previous resolution. +Auto-merging drivers/mfd/twl4030-core.c +Auto-merging drivers/watchdog/Kconfig +Auto-merging drivers/watchdog/Makefile +CONFLICT (content): Merge conflict in drivers/watchdog/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f9e2146] Merge commit 'watchdog/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/watchdog/hpwdt.txt | 84 +++++ + drivers/mfd/twl4030-core.c | 12 + + drivers/watchdog/Kconfig | 35 ++ + drivers/watchdog/Makefile | 4 + + drivers/watchdog/alim7101_wdt.c | 15 +- + drivers/watchdog/ar7_wdt.c | 3 +- + drivers/watchdog/at91rm9200_wdt.c | 3 +- + drivers/watchdog/at91sam9_wdt.c | 3 +- + drivers/watchdog/bfin_wdt.c | 14 +- + drivers/watchdog/coh901327_wdt.c | 537 ++++++++++++++++++++++++++++++++ + drivers/watchdog/cpwd.c | 6 +- + drivers/watchdog/davinci_wdt.c | 6 +- + drivers/watchdog/hpwdt.c | 59 +++- + drivers/watchdog/iTCO_vendor_support.c | 88 +++++- + drivers/watchdog/iTCO_wdt.c | 36 ++- + drivers/watchdog/indydog.c | 4 +- + drivers/watchdog/it8712f_wdt.c | 3 +- + drivers/watchdog/ks8695_wdt.c | 4 +- + drivers/watchdog/machzwd.c | 9 +- + drivers/watchdog/mpcore_wdt.c | 7 +- + drivers/watchdog/mtx-1_wdt.c | 6 +- + drivers/watchdog/pnx4008_wdt.c | 6 +- + drivers/watchdog/pnx833x_wdt.c | 282 +++++++++++++++++ + drivers/watchdog/rdc321x_wdt.c | 4 +- + drivers/watchdog/rm9k_wdt.c | 6 +- + drivers/watchdog/s3c2410_wdt.c | 32 +- + drivers/watchdog/sb_wdog.c | 9 +- + drivers/watchdog/sbc60xxwdt.c | 5 +- + drivers/watchdog/sbc8360.c | 4 +- + drivers/watchdog/sbc_epx_c3.c | 12 +- + drivers/watchdog/scx200_wdt.c | 7 +- + drivers/watchdog/shwdt.c | 4 +- + drivers/watchdog/softdog.c | 7 +- + drivers/watchdog/stmp3xxx_wdt.c | 296 ++++++++++++++++++ + drivers/watchdog/twl4030_wdt.c | 272 ++++++++++++++++ + drivers/watchdog/w83697hf_wdt.c | 3 +- + drivers/watchdog/wdrtas.c | 7 +- + 37 files changed, 1773 insertions(+), 121 deletions(-) + create mode 100644 Documentation/watchdog/hpwdt.txt + create mode 100644 drivers/watchdog/coh901327_wdt.c + create mode 100644 drivers/watchdog/pnx833x_wdt.c + create mode 100644 drivers/watchdog/stmp3xxx_wdt.c + create mode 100644 drivers/watchdog/twl4030_wdt.c +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Resolved 'drivers/pci/intel-iommu.c' using previous resolution. +Resolved 'drivers/pci/intr_remapping.c' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/ia64/kernel/pci-dma.c +Auto-merging arch/x86/kernel/pci-swiotlb.c +Auto-merging drivers/pci/intel-iommu.c +CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c +Auto-merging drivers/pci/intr_remapping.c +CONFLICT (content): Merge conflict in drivers/pci/intr_remapping.c +Auto-merging drivers/pci/iov.c +Auto-merging include/linux/dmar.h +Auto-merging include/linux/pci.h +Auto-merging include/linux/pci_regs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b529a08] Merge commit 'dwmw2-iommu/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 1 + + arch/ia64/include/asm/iommu.h | 5 + + arch/ia64/kernel/pci-dma.c | 2 + + arch/ia64/kernel/pci-swiotlb.c | 2 +- + arch/x86/include/asm/iommu.h | 1 + + arch/x86/kernel/pci-dma.c | 6 + + arch/x86/kernel/pci-swiotlb.c | 3 +- + drivers/pci/dmar.c | 235 +++++++++++++++---- + drivers/pci/intel-iommu.c | 449 +++++++++++++++++++++++------------ + drivers/pci/intr_remapping.c | 8 +- + drivers/pci/iov.c | 155 ++++++++++++- + drivers/pci/pci.h | 39 +++ + include/linux/dma_remapping.h | 9 + + include/linux/dmar.h | 9 + + include/linux/intel-iommu.h | 35 ++- + include/linux/pci.h | 2 + + include/linux/pci_regs.h | 10 + + 17 files changed, 754 insertions(+), 217 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Merge made by recursive. + fs/proc/uptime.c | 34 ++++++++++++++++++++++++---------- + 1 files changed, 24 insertions(+), 10 deletions(-) +Merging osd/linux-next +$ git merge osd/linux-next +Merge made by recursive. + drivers/block/Kconfig | 16 ++ + drivers/block/Makefile | 1 + + drivers/block/osdblk.c | 670 ++++++++++++++++++++++++++++++++++++++++++++++++ + fs/exofs/common.h | 4 +- + fs/exofs/dir.c | 4 +- + fs/exofs/exofs.h | 4 +- + fs/exofs/file.c | 22 +- + fs/exofs/inode.c | 7 +- + fs/exofs/namei.c | 4 +- + fs/exofs/osd.c | 4 +- + fs/exofs/super.c | 4 +- + fs/exofs/symlink.c | 4 +- + 12 files changed, 712 insertions(+), 32 deletions(-) + create mode 100644 drivers/block/osdblk.c +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Merge made by recursive. + include/linux/capability.h | 2 +- + include/linux/namei.h | 2 +- + 2 files changed, 2 insertions(+), 2 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 +Already up-to-date. +Merging bluetooth/master +$ git merge bluetooth/master +Already up-to-date. +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Merge made by recursive. + fs/notify/inotify/inotify.h | 3 ++- + fs/notify/inotify/inotify_fsnotify.c | 2 +- + fs/notify/inotify/inotify_user.c | 32 +++++--------------------------- + 3 files changed, 8 insertions(+), 29 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Resolved 'kernel/sched.c' using previous resolution. +Resolved 'mm/Makefile' using previous resolution. +Resolved 'mm/slub.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/kernel/process.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/interrupt.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/slab.h +Auto-merging include/net/inet_sock.h +Auto-merging include/net/sock.h +Auto-merging init/main.c +Auto-merging kernel/sched.c +CONFLICT (content): Merge conflict in kernel/sched.c +Auto-merging kernel/trace/ring_buffer.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/Makefile +CONFLICT (content): Merge conflict in mm/Makefile +Auto-merging mm/slab.c +Auto-merging mm/slub.c +CONFLICT (content): Merge conflict in mm/slub.c +Auto-merging net/core/skbuff.c +Auto-merging net/core/sock.c +Auto-merging net/ipv4/inet_timewait_sock.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c244adb] Merge commit 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/kmemcheck.txt | 773 ++++++++++++++++++++++++++++++++++ + MAINTAINERS | 8 + + arch/x86/Kconfig | 6 + + arch/x86/Kconfig.debug | 1 + + arch/x86/Makefile | 5 + + arch/x86/include/asm/atomic_32.h | 3 +- + arch/x86/include/asm/dma-mapping.h | 8 + + arch/x86/include/asm/kmemcheck.h | 42 ++ + arch/x86/include/asm/page_types.h | 8 + + arch/x86/include/asm/pgtable.h | 5 + + arch/x86/include/asm/pgtable_types.h | 9 +- + arch/x86/include/asm/string_32.h | 8 + + arch/x86/include/asm/string_64.h | 8 + + arch/x86/include/asm/thread_info.h | 4 +- + arch/x86/include/asm/xor.h | 5 + + arch/x86/kernel/cpu/intel.c | 23 + + arch/x86/kernel/cpu/perf_counter.c | 40 +- + arch/x86/kernel/cpu/proc.c | 2 - + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/setup.c | 1 + + arch/x86/kernel/stacktrace.c | 7 + + arch/x86/kernel/traps.c | 5 + + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 18 +- + arch/x86/mm/init.c | 15 +- + arch/x86/mm/init_32.c | 30 +- + arch/x86/mm/init_64.c | 39 +- + arch/x86/mm/kmemcheck/Makefile | 1 + + arch/x86/mm/kmemcheck/error.c | 228 ++++++++++ + arch/x86/mm/kmemcheck/error.h | 15 + + arch/x86/mm/kmemcheck/kmemcheck.c | 637 ++++++++++++++++++++++++++++ + arch/x86/mm/kmemcheck/opcode.c | 106 +++++ + arch/x86/mm/kmemcheck/opcode.h | 9 + + arch/x86/mm/kmemcheck/pte.c | 22 + + arch/x86/mm/kmemcheck/pte.h | 10 + + arch/x86/mm/kmemcheck/selftest.c | 69 +++ + arch/x86/mm/kmemcheck/selftest.h | 6 + + arch/x86/mm/kmemcheck/shadow.c | 162 +++++++ + arch/x86/mm/kmemcheck/shadow.h | 16 + + arch/x86/mm/pageattr.c | 2 +- + arch/x86/mm/pgtable.c | 12 +- + crypto/xor.c | 7 +- + drivers/ieee1394/csr1212.c | 2 + + drivers/ieee1394/nodemgr.c | 5 + + drivers/misc/c2port/core.c | 2 + + include/linux/c2port.h | 3 + + include/linux/fs.h | 5 +- + include/linux/gfp.h | 14 +- + include/linux/interrupt.h | 14 + + include/linux/irq.h | 4 +- + include/linux/kmemcheck.h | 157 +++++++ + include/linux/mm_types.h | 8 + + include/linux/poison.h | 16 +- + include/linux/ring_buffer.h | 4 + + include/linux/skbuff.h | 7 + + include/linux/slab.h | 7 + + include/linux/slab_def.h | 81 ++++ + include/linux/stacktrace.h | 3 + + include/net/inet_sock.h | 14 +- + include/net/inet_timewait_sock.h | 5 +- + include/net/sock.h | 2 + + init/do_mounts.c | 3 +- + init/main.c | 4 + + kernel/fork.c | 14 +- + kernel/futex.c | 51 ++- + kernel/irq/manage.c | 4 +- + kernel/perf_counter.c | 4 +- + kernel/signal.c | 11 +- + kernel/softirq.c | 11 + + kernel/sysctl.c | 11 + + kernel/time/tick-sched.c | 12 +- + kernel/trace/ring_buffer.c | 3 + + lib/Kconfig.debug | 8 +- + lib/Kconfig.kmemcheck | 91 ++++ + mm/Makefile | 1 + + mm/kmemcheck.c | 122 ++++++ + mm/page_alloc.c | 18 + + mm/slab.c | 108 +---- + mm/slub.c | 37 ++- + net/core/skbuff.c | 8 + + net/core/sock.c | 2 + + net/ipv4/inet_timewait_sock.c | 3 + + tools/perf/Makefile | 2 +- + tools/perf/builtin-annotate.c | 200 ++++++++- + tools/perf/builtin-stat.c | 302 ++++++++++---- + tools/perf/util/parse-events.c | 4 +- + tools/perf/util/symbol.h | 1 + + 87 files changed, 3458 insertions(+), 309 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/include/asm/kmemcheck.h + create mode 100644 arch/x86/mm/kmemcheck/Makefile + create mode 100644 arch/x86/mm/kmemcheck/error.c + create mode 100644 arch/x86/mm/kmemcheck/error.h + create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.h + create mode 100644 arch/x86/mm/kmemcheck/pte.c + create mode 100644 arch/x86/mm/kmemcheck/pte.h + create mode 100644 arch/x86/mm/kmemcheck/selftest.c + create mode 100644 arch/x86/mm/kmemcheck/selftest.h + create mode 100644 arch/x86/mm/kmemcheck/shadow.c + create mode 100644 arch/x86/mm/kmemcheck/shadow.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 lib/Kconfig.kmemcheck + create mode 100644 mm/kmemcheck.c +Merging asm-generic/next +$ git merge asm-generic/next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 8 ++++++++ + include/asm-generic/hardirq.h | 13 ------------- + include/asm-generic/uaccess.h | 14 ++++++++------ + 3 files changed, 16 insertions(+), 19 deletions(-) +Merging quilt/driver-core +$ git merge quilt/driver-core +Resolved 'drivers/block/ps3disk.c' using previous resolution. +Resolved 'drivers/block/ps3vram.c' using previous resolution. +Renaming drivers/firewire/fw-sbp2.c => drivers/firewire/sbp2.c +Auto-merging drivers/firewire/sbp2.c +Renaming drivers/net/wireless/ath5k/Kconfig => drivers/net/wireless/ath/ath5k/Kconfig +Auto-merging drivers/net/wireless/ath/ath5k/Kconfig +Auto-merging drivers/block/ps3disk.c +CONFLICT (content): Merge conflict in drivers/block/ps3disk.c +Auto-merging drivers/block/ps3vram.c +CONFLICT (content): Merge conflict in drivers/block/ps3vram.c +Auto-merging drivers/char/hvcs.c +Auto-merging drivers/ide/ide-probe.c +Auto-merging drivers/md/dm-ioctl.c +Auto-merging drivers/media/common/tuners/tuner-xc2028.c +Auto-merging drivers/media/dvb/dvb-usb/dvb-usb.h +Auto-merging drivers/mfd/pcf50633-core.c +Auto-merging drivers/mfd/wm8400-core.c +Auto-merging drivers/net/3c509.c +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/depca.c +Auto-merging drivers/net/ibmveth.c +Auto-merging drivers/net/sb1250-mac.c +Auto-merging drivers/net/tulip/de4x5.c +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/usb/hso.c +Auto-merging drivers/net/wimax/i2400m/i2400m.h +Auto-merging drivers/net/wireless/ipw2x00/ipw2200.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c +Auto-merging drivers/net/wireless/libertas/if_spi.c +Auto-merging drivers/net/wireless/libertas/if_usb.c +Auto-merging drivers/regulator/wm8400-regulator.c +Auto-merging drivers/s390/char/con3215.c +Auto-merging drivers/s390/char/raw3270.c +Auto-merging drivers/s390/char/tape_34xx.c +Auto-merging drivers/s390/char/tape_3590.c +Auto-merging drivers/s390/char/tape_core.c +Auto-merging drivers/s390/char/vmlogrdr.c +Auto-merging drivers/s390/char/vmur.c +Auto-merging drivers/s390/net/claw.c +Auto-merging drivers/s390/net/lcs.c +Auto-merging drivers/s390/net/netiucv.c +Auto-merging drivers/serial/of_serial.c +Auto-merging include/linux/kernel.h +Auto-merging include/linux/sched.h +Auto-merging init/Kconfig +Auto-merging init/do_mounts.c +Auto-merging init/main.c +Auto-merging kernel/trace/trace.c +Removing samples/firmware_class/firmware_sample_driver.c +Removing samples/firmware_class/firmware_sample_firmware_class.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master eee1b88] Merge branch 'quilt/driver-core' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/debugobjects.tmpl | 2 +- + Documentation/cdrom/packet-writing.txt | 2 +- + Documentation/driver-model/device.txt | 32 ++ + Documentation/fault-injection/fault-injection.txt | 70 ++-- + Documentation/firmware_class/README | 3 +- + Documentation/kprobes.txt | 6 +- + Documentation/trace/ftrace.txt | 233 ++++++++----- + Documentation/trace/mmiotrace.txt | 26 +- + arch/mips/sni/eisa.c | 2 +- + arch/um/drivers/net_kern.c | 4 +- + arch/um/drivers/ubd_kern.c | 4 +- + arch/x86/kernel/cpuid.c | 6 + + arch/x86/kernel/microcode_core.c | 1 + + arch/x86/kernel/msr.c | 6 + + block/bsg.c | 6 + + block/genhd.c | 10 + + drivers/base/Kconfig | 25 ++ + drivers/base/Makefile | 1 + + drivers/base/base.h | 6 + + drivers/base/core.c | 60 +++- + drivers/base/dd.c | 6 +- + drivers/base/devtmpfs.c | 367 ++++++++++++++++++++ + drivers/base/firmware_class.c | 27 +- + drivers/base/init.c | 1 + + drivers/base/platform.c | 7 +- + drivers/base/sys.c | 8 +- + drivers/block/aoe/aoechr.c | 7 + + drivers/block/pktcdvd.c | 9 +- + drivers/block/xen-blkfront.c | 14 +- + drivers/char/hvcs.c | 6 +- + drivers/char/hw_random/core.c | 1 + + drivers/char/ipmi/ipmi_si_intf.c | 4 +- + drivers/char/misc.c | 15 +- + drivers/char/raw.c | 6 + + drivers/eisa/pci_eisa.c | 2 +- + drivers/eisa/virtual_root.c | 2 +- + drivers/firewire/sbp2.c | 6 +- + drivers/gpu/drm/drm_debugfs.c | 12 +- + drivers/gpu/drm/drm_drv.c | 2 +- + drivers/gpu/drm/drm_stub.c | 2 +- + drivers/gpu/drm/drm_sysfs.c | 7 + + drivers/hid/usbhid/hiddev.c | 7 +- + drivers/ide/ide-pm.c | 6 +- + drivers/ide/ide-probe.c | 4 +- + drivers/ide/ide_platform.c | 2 +- + drivers/ieee1394/eth1394.c | 16 +- + drivers/ieee1394/sbp2.c | 8 +- + drivers/infiniband/core/sysfs.c | 2 +- + drivers/infiniband/hw/ehca/ehca_main.c | 8 +- + drivers/input/input.c | 6 + + drivers/input/xen-kbdfront.c | 8 +- + drivers/md/dm-ioctl.c | 1 + + drivers/media/common/tuners/tuner-xc2028.c | 2 +- + drivers/media/dvb/dvb-core/dvbdev.c | 10 + + drivers/media/dvb/dvb-usb/dvb-usb.h | 2 +- + drivers/media/video/dabusb.c | 6 + + drivers/net/Kconfig | 4 +- + drivers/net/tun.c | 1 + + drivers/net/wimax/i2400m/i2400m.h | 2 +- + drivers/net/wireless/ath/ath5k/Kconfig | 6 +- + drivers/net/wireless/libertas/README | 12 +- + drivers/net/wireless/libertas/if_spi.c | 8 +- + drivers/net/wireless/libertas/if_spi.h | 3 + + drivers/net/wireless/libertas/if_usb.c | 8 +- + drivers/net/xen-netfront.c | 10 +- + drivers/parisc/eisa.c | 2 +- + drivers/parisc/sba_iommu.c | 6 +- + drivers/parport/parport_gsc.c | 4 +- + drivers/pcmcia/ds.c | 20 +- + drivers/s390/char/con3215.c | 16 +- + drivers/s390/char/raw3270.c | 16 +- + drivers/s390/char/tape_34xx.c | 2 +- + drivers/s390/char/tape_3590.c | 2 +- + drivers/s390/char/tape_core.c | 22 +- + drivers/s390/char/vmlogrdr.c | 12 +- + drivers/s390/char/vmur.c | 16 +- + drivers/s390/net/claw.c | 52 ++-- + drivers/s390/net/lcs.c | 20 +- + drivers/s390/net/lcs.h | 4 +- + drivers/s390/net/netiucv.c | 47 ++-- + drivers/scsi/aha1740.c | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 6 +- + drivers/scsi/ibmvscsi/ibmvstgt.c | 2 +- + drivers/scsi/libsrp.c | 2 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 4 +- + drivers/serial/of_serial.c | 4 +- + drivers/thermal/thermal_sys.c | 4 +- + drivers/usb/atm/ueagle-atm.c | 9 +- + drivers/usb/class/usblp.c | 6 + + drivers/usb/core/file.c | 13 +- + drivers/usb/core/usb.c | 11 + + drivers/usb/gadget/at91_udc.c | 6 +- + drivers/usb/misc/iowarrior.c | 6 + + drivers/usb/misc/legousbtower.c | 6 + + drivers/video/xen-fbfront.c | 8 +- + fs/debugfs/file.c | 65 ++++- + fs/debugfs/inode.c | 11 + + fs/sysfs/symlink.c | 5 +- + include/linux/device.h | 15 + + include/linux/eisa.h | 4 +- + include/linux/firmware.h | 1 - + include/linux/genhd.h | 2 +- + include/linux/kernel.h | 2 +- + include/linux/miscdevice.h | 1 + + include/linux/platform_device.h | 4 +- + include/linux/sched.h | 2 +- + include/linux/shmem_fs.h | 3 + + include/linux/tracepoint.h | 4 +- + include/linux/usb.h | 3 + + init/Kconfig | 6 +- + init/do_mounts.c | 2 +- + init/main.c | 2 + + kernel/trace/Kconfig | 10 +- + kernel/trace/trace.c | 24 +- + kernel/user.c | 67 ++-- + lib/kobject.c | 7 +- + mm/shmem.c | 9 +- + samples/Kconfig | 3 +- + samples/firmware_class/firmware_sample_driver.c | 121 ------- + .../firmware_sample_firmware_class.c | 204 ----------- + scripts/tracing/draw_functrace.py | 8 +- + sound/sound_core.c | 7 + + 122 files changed, 1281 insertions(+), 799 deletions(-) + create mode 100644 drivers/base/devtmpfs.c + delete mode 100644 samples/firmware_class/firmware_sample_driver.c + delete mode 100644 samples/firmware_class/firmware_sample_firmware_class.c +Merging quilt/usb +$ git merge quilt/usb +Auto-merging MAINTAINERS +Auto-merging drivers/pci/pci.c +Auto-merging drivers/usb/host/ehci-ps3.c +Auto-merging fs/fat/dir.c +Auto-merging fs/fat/namei_vfat.c +Auto-merging include/linux/pci.h +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + MAINTAINERS | 6 + + .../arm/plat-s3c/include/plat/regs-usb-hsotg-phy.h | 50 + + arch/arm/plat-s3c/include/plat/regs-usb-hsotg.h | 377 +++ + drivers/pci/pci.c | 5 + + drivers/staging/uc2322/aten2011.c | 4 +- + drivers/usb/Kconfig | 1 + + drivers/usb/Makefile | 1 + + drivers/usb/class/cdc-acm.c | 71 +- + drivers/usb/class/cdc-acm.h | 2 + + drivers/usb/core/Kconfig | 16 +- + drivers/usb/core/Makefile | 4 +- + drivers/usb/core/config.c | 192 ++- + drivers/usb/core/driver.c | 56 +- + drivers/usb/core/endpoint.c | 160 +- + drivers/usb/core/hcd-pci.c | 244 +- + drivers/usb/core/hcd.c | 220 ++- + drivers/usb/core/hcd.h | 55 +- + drivers/usb/core/hub.c | 134 +- + drivers/usb/core/hub.h | 3 + + drivers/usb/core/message.c | 194 +- + drivers/usb/core/sysfs.c | 12 +- + drivers/usb/core/urb.c | 12 + + drivers/usb/core/usb.c | 76 +- + drivers/usb/core/usb.h | 13 +- + drivers/usb/gadget/Kconfig | 53 +- + drivers/usb/gadget/Makefile | 8 + + drivers/usb/gadget/at91_udc.c | 4 +- + drivers/usb/gadget/atmel_usba_udc.c | 20 +- + drivers/usb/gadget/audio.c | 302 ++ + drivers/usb/gadget/ci13xxx_udc.c | 6 +- + drivers/usb/gadget/f_audio.c | 707 ++++ + drivers/usb/gadget/f_rndis.c | 4 +- + drivers/usb/gadget/file_storage.c | 93 +- + drivers/usb/gadget/fsl_mx3_udc.c | 95 + + .../usb/gadget/{fsl_usb2_udc.c => fsl_udc_core.c} | 69 +- + drivers/usb/gadget/fsl_usb2_udc.h | 18 + + drivers/usb/gadget/gadget_chips.h | 8 + + drivers/usb/gadget/goku_udc.c | 6 +- + drivers/usb/gadget/imx_udc.c | 14 +- + drivers/usb/gadget/inode.c | 14 +- + drivers/usb/gadget/langwell_udc.c | 3373 ++++++++++++++++++++ + drivers/usb/gadget/langwell_udc.h | 228 ++ + drivers/usb/gadget/pxa27x_udc.c | 71 +- + drivers/usb/gadget/pxa27x_udc.h | 2 + + drivers/usb/gadget/s3c-hsotg.c | 3269 +++++++++++++++++++ + drivers/usb/gadget/u_audio.c | 319 ++ + drivers/usb/gadget/u_audio.h | 56 + + drivers/usb/gadget/u_serial.c | 1 + + drivers/usb/host/Kconfig | 20 + + drivers/usb/host/Makefile | 2 + + drivers/usb/host/ehci-au1xxx.c | 1 + + drivers/usb/host/ehci-fsl.c | 1 + + drivers/usb/host/ehci-hcd.c | 47 +- + drivers/usb/host/ehci-hub.c | 4 +- + drivers/usb/host/ehci-ixp4xx.c | 1 + + drivers/usb/host/ehci-orion.c | 3 +- + drivers/usb/host/ehci-pci.c | 27 +- + drivers/usb/host/ehci-ppc-of.c | 1 + + drivers/usb/host/ehci-ps3.c | 1 + + drivers/usb/host/ehci-q.c | 19 +- + drivers/usb/host/ehci-sched.c | 8 +- + drivers/usb/host/ehci.h | 1 + + drivers/usb/host/fhci-dbg.c | 2 +- + drivers/usb/host/hwa-hc.c | 21 - + drivers/usb/host/ohci-dbg.c | 31 +- + drivers/usb/host/ohci-hcd.c | 38 +- + drivers/usb/host/ohci-pci.c | 24 +- + drivers/usb/host/pci-quirks.c | 123 + + drivers/usb/host/r8a66597-hcd.c | 62 +- + drivers/usb/host/r8a66597.h | 38 +- + drivers/usb/host/uhci-hcd.c | 23 +- + drivers/usb/host/uhci-q.c | 2 +- + drivers/usb/host/xhci-dbg.c | 485 +++ + drivers/usb/host/xhci-ext-caps.h | 145 + + drivers/usb/host/xhci-hcd.c | 1274 ++++++++ + drivers/usb/host/xhci-hub.c | 308 ++ + drivers/usb/host/xhci-mem.c | 769 +++++ + drivers/usb/host/xhci-pci.c | 166 + + drivers/usb/host/xhci-ring.c | 1648 ++++++++++ + drivers/usb/host/xhci.h | 1157 +++++++ + drivers/usb/misc/usbtest.c | 39 +- + drivers/usb/mon/mon_text.c | 2 +- + drivers/usb/musb/Kconfig | 2 + + drivers/usb/musb/blackfin.c | 11 +- + drivers/usb/musb/cppi_dma.c | 34 +- + drivers/usb/musb/cppi_dma.h | 6 +- + drivers/usb/musb/davinci.c | 54 +- + drivers/usb/musb/musb_core.c | 228 +- + drivers/usb/musb/musb_core.h | 22 +- + drivers/usb/musb/musb_gadget.c | 45 +- + drivers/usb/musb/musb_gadget_ep0.c | 45 +- + drivers/usb/musb/musb_host.c | 273 +- + drivers/usb/musb/musb_host.h | 1 + + drivers/usb/musb/musb_virthub.c | 35 +- + drivers/usb/musb/omap2430.c | 71 +- + drivers/usb/musb/tusb6010.c | 70 +- + drivers/usb/otg/Kconfig | 14 + + drivers/usb/otg/Makefile | 1 + + drivers/usb/otg/langwell_otg.c | 1915 +++++++++++ + drivers/usb/otg/nop-usb-xceiv.c | 25 +- + drivers/usb/otg/twl4030-usb.c | 28 +- + drivers/usb/serial/aircable.c | 5 +- + drivers/usb/serial/belkin_sa.c | 7 +- + drivers/usb/serial/bus.c | 27 +- + drivers/usb/serial/cp210x.c | 6 +- + drivers/usb/serial/cyberjack.c | 20 +- + drivers/usb/serial/cypress_m8.c | 11 +- + drivers/usb/serial/digi_acceleport.c | 20 +- + drivers/usb/serial/empeg.c | 8 - + drivers/usb/serial/ftdi_sio.c | 178 +- + drivers/usb/serial/ftdi_sio.h | 10 +- + drivers/usb/serial/garmin_gps.c | 214 +- + drivers/usb/serial/generic.c | 186 +- + drivers/usb/serial/io_edgeport.c | 29 +- + drivers/usb/serial/io_tables.h | 12 +- + drivers/usb/serial/io_ti.c | 22 +- + drivers/usb/serial/ipaq.c | 7 - + drivers/usb/serial/iuu_phoenix.c | 6 +- + drivers/usb/serial/keyspan.c | 13 +- + drivers/usb/serial/keyspan.h | 12 +- + drivers/usb/serial/keyspan_pda.c | 4 +- + drivers/usb/serial/kl5kusb105.c | 39 +- + drivers/usb/serial/kobil_sct.c | 12 +- + drivers/usb/serial/mct_u232.c | 13 +- + drivers/usb/serial/mos7720.c | 9 +- + drivers/usb/serial/mos7840.c | 358 ++- + drivers/usb/serial/omninet.c | 19 +- + drivers/usb/serial/opticon.c | 14 +- + drivers/usb/serial/option.c | 36 +- + drivers/usb/serial/oti6858.c | 7 +- + drivers/usb/serial/pl2303.c | 10 +- + drivers/usb/serial/sierra.c | 185 +- + drivers/usb/serial/spcp8x5.c | 5 +- + drivers/usb/serial/symbolserial.c | 14 +- + drivers/usb/serial/ti_usb_3410_5052.c | 10 +- + drivers/usb/serial/usb-serial.c | 53 +- + drivers/usb/serial/usb_debug.c | 41 + + drivers/usb/serial/visor.c | 13 +- + drivers/usb/serial/whiteheat.c | 6 +- + drivers/usb/storage/initializers.c | 14 +- + drivers/usb/storage/option_ms.c | 124 +- + drivers/usb/storage/sierra_ms.c | 2 +- + drivers/usb/storage/unusual_devs.h | 2 +- + fs/befs/linuxvfs.c | 20 +- + fs/fat/dir.c | 29 +- + fs/fat/namei_vfat.c | 4 +- + fs/isofs/joliet.c | 36 +- + fs/ncpfs/ncplib_kernel.c | 8 +- + fs/nls/nls_base.c | 166 +- + fs/nls/nls_utf8.c | 13 +- + include/linux/nls.h | 35 +- + include/linux/pci.h | 8 + + include/linux/pci_ids.h | 1 + + include/linux/usb.h | 34 +- + include/linux/usb/audio.h | 265 ++- + include/linux/usb/ch9.h | 17 + + include/linux/usb/composite.h | 3 + + include/linux/usb/langwell_otg.h | 177 + + include/linux/usb/langwell_udc.h | 310 ++ + include/linux/usb/otg.h | 4 +- + include/linux/usb/r8a66597.h | 44 + + include/linux/usb/serial.h | 32 +- + 162 files changed, 20931 insertions(+), 2079 deletions(-) + create mode 100644 arch/arm/plat-s3c/include/plat/regs-usb-hsotg-phy.h + create mode 100644 arch/arm/plat-s3c/include/plat/regs-usb-hsotg.h + create mode 100644 drivers/usb/gadget/audio.c + create mode 100644 drivers/usb/gadget/f_audio.c + create mode 100644 drivers/usb/gadget/fsl_mx3_udc.c + rename drivers/usb/gadget/{fsl_usb2_udc.c => fsl_udc_core.c} (99%) + create mode 100644 drivers/usb/gadget/langwell_udc.c + create mode 100644 drivers/usb/gadget/langwell_udc.h + create mode 100644 drivers/usb/gadget/s3c-hsotg.c + create mode 100644 drivers/usb/gadget/u_audio.c + create mode 100644 drivers/usb/gadget/u_audio.h + create mode 100644 drivers/usb/host/xhci-dbg.c + create mode 100644 drivers/usb/host/xhci-ext-caps.h + create mode 100644 drivers/usb/host/xhci-hcd.c + create mode 100644 drivers/usb/host/xhci-hub.c + create mode 100644 drivers/usb/host/xhci-mem.c + create mode 100644 drivers/usb/host/xhci-pci.c + create mode 100644 drivers/usb/host/xhci-ring.c + create mode 100644 drivers/usb/host/xhci.h + create mode 100644 drivers/usb/otg/langwell_otg.c + create mode 100644 include/linux/usb/langwell_otg.h + create mode 100644 include/linux/usb/langwell_udc.h + create mode 100644 include/linux/usb/r8a66597.h +Merging quilt/staging +$ git merge quilt/staging +Auto-merging MAINTAINERS +Auto-merging drivers/staging/agnx/pci.c +Removing drivers/staging/comedi/comedi_rt.h +Removing drivers/staging/comedi/drivers/comedi_rt_timer.c +Removing drivers/staging/comedi/interrupt.h +Removing drivers/staging/comedi/rt.c +Removing drivers/staging/comedi/rt_pend_tq.c +Removing drivers/staging/comedi/rt_pend_tq.h +Removing drivers/staging/rt2860/common/netif_block.c +Removing drivers/staging/rt2860/common/netif_block.h +Removing drivers/staging/rt2860/leap.h +Removing drivers/staging/rt2860/rt_ate.c +Removing drivers/staging/rt2860/rt_ate.h +Removing drivers/staging/rt2860/sta/dls.c +Removing drivers/staging/rt2870/common/netif_block.c +Removing drivers/staging/rt2870/leap.h +Removing drivers/staging/rt2870/netif_block.h +Removing drivers/staging/rt2870/rt_ate.c +Removing drivers/staging/rt2870/rt_ate.h +Removing drivers/staging/rt2870/sta/dls.c +Removing drivers/staging/rt2870/sta_ioctl.c.patch +Removing drivers/staging/rt2870/tmp60 +Removing drivers/staging/rt2870/tmp61 +Removing drivers/staging/rt3070/common/netif_block.c +Removing drivers/staging/rt3070/leap.h +Removing drivers/staging/rt3070/netif_block.h +Removing drivers/staging/rt3070/rt_ate.c +Removing drivers/staging/rt3070/rt_ate.h +Removing drivers/staging/rt3070/sta/dls.c +Removing drivers/staging/serqt_usb/Makefile +Removing drivers/staging/serqt_usb/serqt_usb.c +Removing drivers/staging/winbond/wbhal.c +Auto-merging drivers/staging/wlan-ng/p80211netdev.c +Merge made by recursive. + MAINTAINERS | 1 + + drivers/staging/Kconfig | 14 +- + drivers/staging/Makefile | 8 +- + drivers/staging/agnx/debug.h | 9 +- + drivers/staging/agnx/pci.c | 57 +- + drivers/staging/agnx/phy.c | 4 +- + drivers/staging/agnx/phy.h | 2 +- + drivers/staging/agnx/sta.c | 2 +- + drivers/staging/agnx/sta.h | 2 +- + drivers/staging/altpciechdma/altpciechdma.c | 34 +- + drivers/staging/android/Kconfig | 10 +- + drivers/staging/android/Makefile | 1 + + drivers/staging/android/binder.c | 436 +- + drivers/staging/android/logger.c | 12 +- + drivers/staging/android/lowmemorykiller.c | 101 +- + drivers/staging/android/ram_console.c | 9 +- + drivers/staging/android/timed_gpio.c | 98 +- + drivers/staging/android/timed_gpio.h | 4 +- + drivers/staging/android/timed_output.c | 121 + + drivers/staging/android/timed_output.h | 37 + + drivers/staging/asus_oled/asus_oled.c | 2 +- + drivers/staging/b3dfg/b3dfg.c | 3 +- + drivers/staging/comedi/Kconfig | 11 +- + drivers/staging/comedi/Makefile | 5 - + drivers/staging/comedi/comedi.h | 1 - + drivers/staging/comedi/comedi_fops.c | 504 +- + drivers/staging/comedi/comedi_ksyms.c | 7 - + drivers/staging/comedi/comedi_rt.h | 149 - + drivers/staging/comedi/comedidev.h | 16 +- + drivers/staging/comedi/drivers.c | 19 +- + drivers/staging/comedi/drivers/8253.h | 50 +- + drivers/staging/comedi/drivers/8255.c | 23 +- + drivers/staging/comedi/drivers/8255.h | 14 +- + drivers/staging/comedi/drivers/Makefile | 5 +- + drivers/staging/comedi/drivers/acl7225b.c | 22 +- + .../comedi/drivers/addi-data/APCI1710_82x54.c | 372 +- + .../comedi/drivers/addi-data/APCI1710_82x54.h | 32 +- + .../comedi/drivers/addi-data/APCI1710_Chrono.c | 402 +- + .../comedi/drivers/addi-data/APCI1710_Chrono.h | 36 +- + .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 309 +- + .../comedi/drivers/addi-data/APCI1710_Dig_io.h | 8 +- + .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 1012 +- + .../comedi/drivers/addi-data/APCI1710_INCCPT.h | 188 +- + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 204 +- + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.h | 8 +- + .../comedi/drivers/addi-data/APCI1710_Pwm.c | 1314 ++-- + .../comedi/drivers/addi-data/APCI1710_Pwm.h | 70 +- + .../comedi/drivers/addi-data/APCI1710_Ssi.c | 230 +- + .../comedi/drivers/addi-data/APCI1710_Ssi.h | 6 +- + .../comedi/drivers/addi-data/APCI1710_Tor.c | 432 +- + .../comedi/drivers/addi-data/APCI1710_Tor.h | 8 +- + .../comedi/drivers/addi-data/APCI1710_Ttl.c | 198 +- + .../comedi/drivers/addi-data/APCI1710_Ttl.h | 8 +- + .../comedi/drivers/addi-data/addi_amcc_S5920.c | 119 +- + .../comedi/drivers/addi-data/addi_amcc_S5920.h | 6 +- + .../comedi/drivers/addi-data/addi_amcc_s5933.h | 12 +- + .../staging/comedi/drivers/addi-data/addi_common.c | 191 +- + .../staging/comedi/drivers/addi-data/addi_common.h | 356 +- + .../staging/comedi/drivers/addi-data/addi_eeprom.c | 438 +- + .../comedi/drivers/addi-data/amcc_s5933_58.h | 43 +- + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 169 +- + .../comedi/drivers/addi-data/hwdrv_APCI1710.h | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci035.c | 214 +- + .../comedi/drivers/addi-data/hwdrv_apci035.h | 34 +- + .../comedi/drivers/addi-data/hwdrv_apci1032.c | 106 +- + .../comedi/drivers/addi-data/hwdrv_apci1032.h | 29 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 532 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.h | 4 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 174 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.h | 29 +- + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 507 +- + .../comedi/drivers/addi-data/hwdrv_apci1564.h | 52 +- + .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 134 +- + .../comedi/drivers/addi-data/hwdrv_apci2016.c | 136 +- + .../comedi/drivers/addi-data/hwdrv_apci2016.h | 26 +- + .../comedi/drivers/addi-data/hwdrv_apci2032.c | 176 +- + .../comedi/drivers/addi-data/hwdrv_apci2032.h | 32 +- + .../comedi/drivers/addi-data/hwdrv_apci2200.c | 174 +- + .../comedi/drivers/addi-data/hwdrv_apci2200.h | 26 +- + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 1055 +- + .../comedi/drivers/addi-data/hwdrv_apci3120.h | 142 +- + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 1701 ++-- + .../comedi/drivers/addi-data/hwdrv_apci3200.h | 176 +- + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 225 +- + .../comedi/drivers/addi-data/hwdrv_apci3501.h | 44 +- + .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 274 +- + drivers/staging/comedi/drivers/addi_apci_035.c | 2 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 177 +- + drivers/staging/comedi/drivers/adl_pci7296.c | 22 +- + drivers/staging/comedi/drivers/adl_pci7432.c | 32 +- + drivers/staging/comedi/drivers/adl_pci8164.c | 325 +- + drivers/staging/comedi/drivers/adl_pci9111.c | 135 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 648 +- + drivers/staging/comedi/drivers/adq12b.c | 82 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 348 +- + drivers/staging/comedi/drivers/adv_pci1723.c | 122 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 112 +- + drivers/staging/comedi/drivers/aio_aio12_8.c | 46 +- + drivers/staging/comedi/drivers/aio_iiro_16.c | 44 +- + drivers/staging/comedi/drivers/am9513.h | 16 +- + drivers/staging/comedi/drivers/amcc_s5933.h | 10 +- + drivers/staging/comedi/drivers/amplc_dio200.c | 226 +- + drivers/staging/comedi/drivers/amplc_pc236.c | 138 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 82 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 131 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 306 +- + drivers/staging/comedi/drivers/c6xdigio.c | 140 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 160 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 842 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 1755 ++-- + drivers/staging/comedi/drivers/cb_pcidda.c | 323 +- + drivers/staging/comedi/drivers/cb_pcidio.c | 75 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 187 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 71 +- + drivers/staging/comedi/drivers/comedi_bond.c | 2 +- + drivers/staging/comedi/drivers/comedi_fc.c | 2 +- + drivers/staging/comedi/drivers/comedi_parport.c | 9 +- + drivers/staging/comedi/drivers/comedi_rt_timer.c | 728 -- + drivers/staging/comedi/drivers/comedi_test.c | 3 +- + drivers/staging/comedi/drivers/contec_pci_dio.c | 46 +- + drivers/staging/comedi/drivers/daqboard2000.c | 230 +- + drivers/staging/comedi/drivers/das08.c | 542 +- + drivers/staging/comedi/drivers/das08.h | 24 +- + drivers/staging/comedi/drivers/das08_cs.c | 65 +- + drivers/staging/comedi/drivers/das16.c | 816 +- + drivers/staging/comedi/drivers/das16m1.c | 152 +- + drivers/staging/comedi/drivers/das1800.c | 689 +- + drivers/staging/comedi/drivers/das6402.c | 47 +- + drivers/staging/comedi/drivers/das800.c | 213 +- + drivers/staging/comedi/drivers/dmm32at.c | 128 +- + drivers/staging/comedi/drivers/dt2801.c | 214 +- + drivers/staging/comedi/drivers/dt2811.c | 92 +- + drivers/staging/comedi/drivers/dt2814.c | 48 +- + drivers/staging/comedi/drivers/dt2815.c | 36 +- + drivers/staging/comedi/drivers/dt2817.c | 27 +- + drivers/staging/comedi/drivers/dt282x.c | 391 +- + drivers/staging/comedi/drivers/dt3000.c | 220 +- + drivers/staging/comedi/drivers/fl512.c | 42 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 234 +- + drivers/staging/comedi/drivers/icp_multi.c | 15 +- + drivers/staging/comedi/drivers/icp_multi.h | 12 +- + drivers/staging/comedi/drivers/ii_pci20kc.c | 83 +- + drivers/staging/comedi/drivers/jr3_pci.c | 211 +- + drivers/staging/comedi/drivers/jr3_pci.h | 8 +- + drivers/staging/comedi/drivers/ke_counter.c | 47 +- + drivers/staging/comedi/drivers/me4000.c | 9 +- + drivers/staging/comedi/drivers/me_daq.c | 1 + + drivers/staging/comedi/drivers/mite.c | 28 +- + drivers/staging/comedi/drivers/mite.h | 2 +- + drivers/staging/comedi/drivers/mpc624.c | 218 +- + drivers/staging/comedi/drivers/mpc8260cpm.c | 32 +- + drivers/staging/comedi/drivers/multiq3.c | 43 +- + drivers/staging/comedi/drivers/ni_6527.c | 73 +- + drivers/staging/comedi/drivers/ni_65xx.c | 251 +- + drivers/staging/comedi/drivers/ni_660x.c | 232 +- + drivers/staging/comedi/drivers/ni_670x.c | 84 +- + drivers/staging/comedi/drivers/ni_at_a2150.c | 275 +- + drivers/staging/comedi/drivers/ni_at_ao.c | 90 +- + drivers/staging/comedi/drivers/ni_atmio.c | 327 +- + drivers/staging/comedi/drivers/ni_atmio16d.c | 117 +- + drivers/staging/comedi/drivers/ni_daq_700.c | 113 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 110 +- + drivers/staging/comedi/drivers/ni_labpc.c | 693 +- + drivers/staging/comedi/drivers/ni_labpc.h | 50 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 105 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 970 +- + drivers/staging/comedi/drivers/ni_mio_cs.c | 256 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 188 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 139 +- + drivers/staging/comedi/drivers/ni_stc.h | 148 +- + drivers/staging/comedi/drivers/ni_tio.c | 18 +- + drivers/staging/comedi/drivers/ni_tio.h | 18 +- + drivers/staging/comedi/drivers/ni_tio_internal.h | 14 +- + drivers/staging/comedi/drivers/ni_tiocmd.c | 40 +- + drivers/staging/comedi/drivers/pcl711.c | 68 +- + drivers/staging/comedi/drivers/pcl724.c | 54 +- + drivers/staging/comedi/drivers/pcl725.c | 24 +- + drivers/staging/comedi/drivers/pcl726.c | 72 +- + drivers/staging/comedi/drivers/pcl730.c | 34 +- + drivers/staging/comedi/drivers/pcl812.c | 320 +- + drivers/staging/comedi/drivers/pcl816.c | 417 +- + drivers/staging/comedi/drivers/pcl818.c | 578 +- + drivers/staging/comedi/drivers/pcm3724.c | 67 +- + drivers/staging/comedi/drivers/pcm3730.c | 28 +- + drivers/staging/comedi/drivers/pcm_common.c | 111 + + drivers/staging/comedi/drivers/pcm_common.h | 8 + + drivers/staging/comedi/drivers/pcmad.c | 42 +- + drivers/staging/comedi/drivers/pcmda12.c | 45 +- + drivers/staging/comedi/drivers/pcmmio.c | 268 +- + drivers/staging/comedi/drivers/pcmuio.c | 241 +- + drivers/staging/comedi/drivers/plx9080.h | 8 +- + drivers/staging/comedi/drivers/poc.c | 104 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 79 +- + drivers/staging/comedi/drivers/rtd520.c | 78 +- + drivers/staging/comedi/drivers/rti800.c | 77 +- + drivers/staging/comedi/drivers/rti802.c | 24 +- + drivers/staging/comedi/drivers/s526.c | 386 +- + drivers/staging/comedi/drivers/s626.c | 282 +- + drivers/staging/comedi/drivers/s626.h | 2 +- + drivers/staging/comedi/drivers/serial2002.c | 100 +- + drivers/staging/comedi/drivers/skel.c | 90 +- + drivers/staging/comedi/drivers/ssv_dnp.c | 49 +- + drivers/staging/comedi/drivers/unioxx5.c | 86 +- + drivers/staging/comedi/drivers/usbdux.c | 181 +- + drivers/staging/comedi/drivers/usbduxfast.c | 213 +- + drivers/staging/comedi/drivers/vmk80xx.c | 1399 +++ + drivers/staging/comedi/interrupt.h | 51 - + drivers/staging/comedi/kcomedilib/data.c | 5 +- + .../staging/comedi/kcomedilib/kcomedilib_main.c | 33 +- + drivers/staging/comedi/kcomedilib/ksyms.c | 49 +- + drivers/staging/comedi/range.c | 9 +- + drivers/staging/comedi/rt.c | 411 - + drivers/staging/comedi/rt_pend_tq.c | 113 - + drivers/staging/comedi/rt_pend_tq.h | 10 - + drivers/staging/cpc-usb/Kconfig | 4 + + drivers/staging/cpc-usb/Makefile | 3 + + drivers/staging/{serqt_usb => cpc-usb}/TODO | 5 +- + drivers/staging/cpc-usb/cpc-usb_drv.c | 1185 ++ + drivers/staging/cpc-usb/cpc.h | 440 + + drivers/staging/cpc-usb/cpc_int.h | 83 + + drivers/staging/cpc-usb/cpcusb.h | 86 + + drivers/staging/cpc-usb/sja2m16c.h | 41 + + drivers/staging/cpc-usb/sja2m16c_2.c | 452 + + drivers/staging/echo/echo.c | 2 +- + drivers/staging/epl/EplSdoUdpu.c | 3 +- + drivers/staging/epl/ShbIpc-LinuxKernel.c | 8 +- + drivers/staging/frontier/alphatrack.c | 1 - + drivers/staging/frontier/tranzport.c | 1 - + drivers/staging/go7007/wis-sony-tuner.c | 2 +- + drivers/staging/heci/heci.h | 1 - + drivers/staging/heci/heci_data_structures.h | 1 - + drivers/staging/heci/heci_init.c | 14 +- + drivers/staging/heci/heci_interface.c | 17 +- + drivers/staging/heci/heci_interface.h | 2 +- + drivers/staging/heci/heci_main.c | 50 +- + drivers/staging/heci/interrupt.c | 28 +- + drivers/staging/heci/io_heci.c | 47 +- + drivers/staging/meilhaus/me0600_ext_irq.c | 5 - + drivers/staging/meilhaus/me0900_di.c | 1 - + drivers/staging/meilhaus/me1400_device.c | 1 - + drivers/staging/meilhaus/me1400_ext_irq.c | 5 - + drivers/staging/meilhaus/me4600_ai.c | 4 - + drivers/staging/meilhaus/me4600_ai.h | 1 - + drivers/staging/meilhaus/me4600_ao.c | 6 +- + drivers/staging/meilhaus/me4600_ext_irq.c | 5 - + drivers/staging/meilhaus/me6000_ao.c | 4 - + drivers/staging/meilhaus/me6000_ao.h | 1 - + drivers/staging/meilhaus/me8100_di.c | 5 - + drivers/staging/meilhaus/me8200_di.c | 9 - + drivers/staging/meilhaus/me8200_do.c | 5 - + drivers/staging/meilhaus/memain.c | 184 +- + drivers/staging/meilhaus/memain.h | 194 - + drivers/staging/octeon/Kconfig | 12 + + drivers/staging/octeon/Makefile | 30 + + drivers/staging/octeon/cvmx-address.h | 274 + + drivers/staging/octeon/cvmx-asxx-defs.h | 475 + + drivers/staging/octeon/cvmx-cmd-queue.c | 306 + + drivers/staging/octeon/cvmx-cmd-queue.h | 617 + + drivers/staging/octeon/cvmx-config.h | 169 + + drivers/staging/octeon/cvmx-dbg-defs.h | 72 + + drivers/staging/octeon/cvmx-fau.h | 597 + + drivers/staging/octeon/cvmx-fpa-defs.h | 403 + + drivers/staging/octeon/cvmx-fpa.c | 183 + + drivers/staging/octeon/cvmx-fpa.h | 299 + + drivers/staging/octeon/cvmx-gmxx-defs.h | 2529 ++++ + drivers/staging/octeon/cvmx-helper-board.c | 706 ++ + drivers/staging/octeon/cvmx-helper-board.h | 180 + + drivers/staging/octeon/cvmx-helper-fpa.c | 243 + + drivers/staging/octeon/cvmx-helper-fpa.h | 64 + + drivers/staging/octeon/cvmx-helper-loop.c | 85 + + drivers/staging/octeon/cvmx-helper-loop.h | 59 + + drivers/staging/octeon/cvmx-helper-npi.c | 113 + + drivers/staging/octeon/cvmx-helper-npi.h | 60 + + drivers/staging/octeon/cvmx-helper-rgmii.c | 525 + + drivers/staging/octeon/cvmx-helper-rgmii.h | 110 + + drivers/staging/octeon/cvmx-helper-sgmii.c | 550 + + drivers/staging/octeon/cvmx-helper-sgmii.h | 104 + + drivers/staging/octeon/cvmx-helper-spi.c | 195 + + drivers/staging/octeon/cvmx-helper-spi.h | 84 + + drivers/staging/octeon/cvmx-helper-util.c | 433 + + drivers/staging/octeon/cvmx-helper-util.h | 215 + + drivers/staging/octeon/cvmx-helper-xaui.c | 348 + + drivers/staging/octeon/cvmx-helper-xaui.h | 103 + + drivers/staging/octeon/cvmx-helper.c | 1058 ++ + drivers/staging/octeon/cvmx-helper.h | 227 + + drivers/staging/octeon/cvmx-interrupt-decodes.c | 371 + + drivers/staging/octeon/cvmx-interrupt-rsl.c | 140 + + drivers/staging/octeon/cvmx-ipd.h | 338 + + drivers/staging/octeon/cvmx-mdio.h | 506 + + drivers/staging/octeon/cvmx-packet.h | 65 + + drivers/staging/octeon/cvmx-pcsx-defs.h | 370 + + drivers/staging/octeon/cvmx-pcsxx-defs.h | 316 + + drivers/staging/octeon/cvmx-pip-defs.h | 1267 ++ + drivers/staging/octeon/cvmx-pip.h | 524 + + drivers/staging/octeon/cvmx-pko-defs.h | 1133 ++ + drivers/staging/octeon/cvmx-pko.c | 506 + + drivers/staging/octeon/cvmx-pko.h | 610 + + drivers/staging/octeon/cvmx-pow.h | 1982 ++++ + drivers/staging/octeon/cvmx-scratch.h | 139 + + drivers/staging/octeon/cvmx-smix-defs.h | 178 + + drivers/staging/octeon/cvmx-spi.c | 667 ++ + drivers/staging/octeon/cvmx-spi.h | 269 + + drivers/staging/octeon/cvmx-spxx-defs.h | 347 + + drivers/staging/octeon/cvmx-srxx-defs.h | 126 + + drivers/staging/octeon/cvmx-stxx-defs.h | 292 + + drivers/staging/octeon/cvmx-wqe.h | 397 + + drivers/staging/octeon/ethernet-common.c | 328 + + drivers/staging/octeon/ethernet-common.h | 29 + + drivers/staging/octeon/ethernet-defines.h | 134 + + drivers/staging/octeon/ethernet-mdio.c | 231 + + drivers/staging/octeon/ethernet-mdio.h | 46 + + drivers/staging/octeon/ethernet-mem.c | 198 + + drivers/staging/octeon/ethernet-mem.h | 29 + + drivers/staging/octeon/ethernet-proc.c | 256 + + drivers/staging/octeon/ethernet-proc.h | 29 + + drivers/staging/octeon/ethernet-rgmii.c | 397 + + drivers/staging/octeon/ethernet-rx.c | 505 + + drivers/staging/octeon/ethernet-rx.h | 33 + + drivers/staging/octeon/ethernet-sgmii.c | 129 + + drivers/staging/octeon/ethernet-spi.c | 323 + + drivers/staging/octeon/ethernet-tx.c | 634 + + drivers/staging/octeon/ethernet-tx.h | 32 + + drivers/staging/octeon/ethernet-util.h | 81 + + drivers/staging/octeon/ethernet-xaui.c | 127 + + drivers/staging/octeon/ethernet.c | 507 + + drivers/staging/octeon/octeon-ethernet.h | 127 + + drivers/staging/otus/80211core/ccmd.c | 2982 +++--- + drivers/staging/otus/80211core/coid.c | 2 +- + drivers/staging/p9auth/p9auth.c | 24 +- + drivers/staging/pata_rdc/Kconfig | 6 + + drivers/staging/pata_rdc/Makefile | 2 + + drivers/staging/pata_rdc/pata_rdc.c | 955 ++ + drivers/staging/pata_rdc/pata_rdc.h | 144 + + drivers/staging/pohmelfs/crypto.c | 3 +- + drivers/staging/pohmelfs/dir.c | 9 +- + drivers/staging/pohmelfs/inode.c | 15 +- + drivers/staging/pohmelfs/net.c | 7 +- + drivers/staging/pohmelfs/netfs.h | 65 +- + drivers/staging/pohmelfs/trans.c | 7 +- + drivers/staging/rspiusb/rspiusb.c | 559 +- + drivers/staging/rspiusb/rspiusb.h | 28 +- + drivers/staging/rt2860/2860_main_dev.c | 41 +- + drivers/staging/rt2860/Makefile | 5 +- + drivers/staging/rt2860/ap.h | 40 +- + drivers/staging/rt2860/chlist.h | 56 +- + drivers/staging/rt2860/common/2860_rtmp_init.c | 25 - + drivers/staging/rt2860/common/action.c | 444 +- + drivers/staging/rt2860/common/action.h | 7 - + drivers/staging/rt2860/common/ba_action.c | 179 +- + drivers/staging/rt2860/common/cmm_data.c | 647 +- + drivers/staging/rt2860/common/cmm_data_2860.c | 105 +- + drivers/staging/rt2860/common/cmm_info.c | 273 +- + drivers/staging/rt2860/common/cmm_sanity.c | 401 +- + drivers/staging/rt2860/common/cmm_sync.c | 113 +- + drivers/staging/rt2860/common/cmm_wpa.c | 28 +- + drivers/staging/rt2860/common/dfs.c | 21 - + drivers/staging/rt2860/common/eeprom.c | 1268 ++- + drivers/staging/rt2860/common/md5.c | 12 - + drivers/staging/rt2860/common/mlme.c | 1890 ++-- + drivers/staging/rt2860/common/netif_block.c | 144 - + drivers/staging/rt2860/common/netif_block.h | 58 - + drivers/staging/rt2860/common/rtmp_init.c | 1253 ++- + drivers/staging/rt2860/common/rtmp_tkip.c | 21 - + drivers/staging/rt2860/common/rtmp_wep.c | 2 - + drivers/staging/rt2860/common/spectrum.c | 57 +- + drivers/staging/rt2860/leap.h | 215 - + drivers/staging/rt2860/mlme.h | 309 - + drivers/staging/rt2860/oid.h | 173 +- + drivers/staging/rt2860/rt28xx.h | 1218 +-- + drivers/staging/rt2860/rt_ate.c | 6009 ---------- + drivers/staging/rt2860/rt_ate.h | 347 - + drivers/staging/rt2860/rt_config.h | 33 +- + drivers/staging/rt2860/rt_linux.c | 45 +- + drivers/staging/rt2860/rt_linux.h | 188 +- + drivers/staging/rt2860/rt_main_dev.c | 717 +- + drivers/staging/rt2860/rt_profile.c | 161 +- + drivers/staging/rt2860/rtmp.h | 1831 ++-- + drivers/staging/rt2860/rtmp_def.h | 210 +- + drivers/staging/rt2860/spectrum.h | 30 - + drivers/staging/rt2860/sta/assoc.c | 586 +- + drivers/staging/rt2860/sta/auth.c | 14 - + drivers/staging/rt2860/sta/auth_rsp.c | 19 - + drivers/staging/rt2860/sta/connect.c | 602 +- + drivers/staging/rt2860/sta/dls.c | 2197 ---- + drivers/staging/rt2860/sta/rtmp_data.c | 336 +- + drivers/staging/rt2860/sta/sanity.c | 2 - + drivers/staging/rt2860/sta/sync.c | 290 +- + drivers/staging/rt2860/sta/wpa.c | 12 +- + drivers/staging/rt2860/sta_ioctl.c | 1236 +-- + drivers/staging/rt2860/wpa.h | 31 +- + drivers/staging/rt2870/2870_main_dev.c | 264 +- + drivers/staging/rt2870/Makefile | 4 - + drivers/staging/rt2870/aironet.h | 211 +- + drivers/staging/rt2870/ap.h | 563 +- + drivers/staging/rt2870/chlist.h | 1297 +-- + drivers/staging/rt2870/common/2870_rtmp_init.c | 123 +- + drivers/staging/rt2870/common/action.c | 1047 +-- + drivers/staging/rt2870/common/action.h | 69 +- + drivers/staging/rt2870/common/ba_action.c | 1799 +--- + drivers/staging/rt2870/common/cmm_data.c | 2732 +----- + drivers/staging/rt2870/common/cmm_data_2870.c | 73 +- + drivers/staging/rt2870/common/cmm_info.c | 3713 +------ + drivers/staging/rt2870/common/cmm_sanity.c | 1664 +--- + drivers/staging/rt2870/common/cmm_sync.c | 712 +-- + drivers/staging/rt2870/common/cmm_wpa.c | 1655 +--- + drivers/staging/rt2870/common/dfs.c | 454 +- + drivers/staging/rt2870/common/eeprom.c | 255 +- + drivers/staging/rt2870/common/md5.c | 1428 +--- + drivers/staging/rt2870/common/mlme.c | 8610 +-------------- + drivers/staging/rt2870/common/netif_block.c | 144 - + drivers/staging/rt2870/common/rtmp_init.c | 4133 +------- + drivers/staging/rt2870/common/rtmp_tkip.c | 1614 +--- + drivers/staging/rt2870/common/rtmp_wep.c | 509 +- + drivers/staging/rt2870/common/rtusb_bulk.c | 775 +-- + drivers/staging/rt2870/common/rtusb_data.c | 13 - + drivers/staging/rt2870/common/rtusb_io.c | 211 +- + drivers/staging/rt2870/common/spectrum.c | 1877 +--- + drivers/staging/rt2870/dfs.h | 101 +- + drivers/staging/rt2870/leap.h | 215 - + drivers/staging/rt2870/link_list.h | 135 +- + drivers/staging/rt2870/md5.h | 108 +- + drivers/staging/rt2870/mlme.h | 1472 +--- + drivers/staging/rt2870/netif_block.h | 58 - + drivers/staging/rt2870/oid.h | 1092 +-- + drivers/staging/rt2870/rt2870.h | 252 +- + drivers/staging/rt2870/rt28xx.h | 2690 +----- + drivers/staging/rt2870/rt_ate.c | 6452 ---------- + drivers/staging/rt2870/rt_ate.h | 315 - + drivers/staging/rt2870/rt_config.h | 105 +- + drivers/staging/rt2870/rt_linux.c | 1096 +-- + drivers/staging/rt2870/rt_linux.h | 907 +-- + drivers/staging/rt2870/rt_main_dev.c | 1866 +--- + drivers/staging/rt2870/rt_profile.c | 2021 +---- + drivers/staging/rt2870/rtmp.h | 7587 +------------ + drivers/staging/rt2870/rtmp_ckipmic.h | 114 +- + drivers/staging/rt2870/rtmp_def.h | 1623 +--- + drivers/staging/rt2870/rtmp_type.h | 95 +- + drivers/staging/rt2870/spectrum.h | 323 +- + drivers/staging/rt2870/spectrum_def.h | 96 +- + drivers/staging/rt2870/sta/aironet.c | 1313 +-- + drivers/staging/rt2870/sta/assoc.c | 2040 +---- + drivers/staging/rt2870/sta/auth.c | 475 +- + drivers/staging/rt2870/sta/auth_rsp.c | 167 +- + drivers/staging/rt2870/sta/connect.c | 2823 +----- + drivers/staging/rt2870/sta/dls.c | 2210 ---- + drivers/staging/rt2870/sta/rtmp_data.c | 2620 +---- + drivers/staging/rt2870/sta/sanity.c | 421 +- + drivers/staging/rt2870/sta/sync.c | 1754 +--- + drivers/staging/rt2870/sta/wpa.c | 2108 +---- + drivers/staging/rt2870/sta_ioctl.c | 7069 +----------- + drivers/staging/rt2870/sta_ioctl.c.patch | 18 - + drivers/staging/rt2870/tmp60 | 7037 ----------- + drivers/staging/rt2870/tmp61 | 7037 ----------- + drivers/staging/rt2870/wpa.h | 358 +- + drivers/staging/rt3070/2870_main_dev.c | 1628 +--- + drivers/staging/rt3070/Makefile | 4 - + drivers/staging/rt3070/action.h | 69 +- + drivers/staging/rt3070/aironet.h | 211 +- + drivers/staging/rt3070/ap.h | 558 +- + drivers/staging/rt3070/chlist.h | 1254 +-- + drivers/staging/rt3070/common/2870_rtmp_init.c | 1763 +--- + drivers/staging/rt3070/common/action.c | 1039 +-- + drivers/staging/rt3070/common/ba_action.c | 1811 +--- + drivers/staging/rt3070/common/cmm_data.c | 2828 +----- + drivers/staging/rt3070/common/cmm_data_2870.c | 981 +-- + drivers/staging/rt3070/common/cmm_info.c | 3396 +------ + drivers/staging/rt3070/common/cmm_sanity.c | 1670 +--- + drivers/staging/rt3070/common/cmm_sync.c | 712 +-- + drivers/staging/rt3070/common/cmm_wpa.c | 1607 +--- + drivers/staging/rt3070/common/dfs.c | 442 +- + drivers/staging/rt3070/common/eeprom.c | 1499 +--- + drivers/staging/rt3070/common/md5.c | 1428 +--- + drivers/staging/rt3070/common/mlme.c | 9137 +-------------- + drivers/staging/rt3070/common/netif_block.c | 136 - + drivers/staging/rt3070/common/rtmp_init.c | 4198 +------- + drivers/staging/rt3070/common/rtmp_tkip.c | 1614 +--- + drivers/staging/rt3070/common/rtmp_wep.c | 509 +- + drivers/staging/rt3070/common/rtusb_bulk.c | 1383 +--- + drivers/staging/rt3070/common/rtusb_data.c | 219 +- + drivers/staging/rt3070/common/rtusb_io.c | 1909 +--- + drivers/staging/rt3070/common/spectrum.c | 1877 +--- + drivers/staging/rt3070/dfs.h | 101 +- + drivers/staging/rt3070/leap.h | 215 - + drivers/staging/rt3070/link_list.h | 135 +- + drivers/staging/rt3070/md5.h | 108 +- + drivers/staging/rt3070/mlme.h | 1469 +--- + drivers/staging/rt3070/netif_block.h | 58 - + drivers/staging/rt3070/oid.h | 1143 +-- + drivers/staging/rt3070/rt2870.h | 757 +-- + drivers/staging/rt3070/rt28xx.h | 2726 +----- + drivers/staging/rt3070/rt_ate.c | 6506 ---------- + drivers/staging/rt3070/rt_ate.h | 294 - + drivers/staging/rt3070/rt_config.h | 122 +- + drivers/staging/rt3070/rt_linux.c | 1064 +-- + drivers/staging/rt3070/rt_linux.h | 888 +-- + drivers/staging/rt3070/rt_main_dev.c | 1802 +--- + drivers/staging/rt3070/rt_profile.c | 2042 +---- + drivers/staging/rt3070/rtmp.h | 7729 +------------ + drivers/staging/rt3070/rtmp_ckipmic.h | 114 +- + drivers/staging/rt3070/rtmp_def.h | 1560 +--- + drivers/staging/rt3070/rtmp_type.h | 96 +- + drivers/staging/rt3070/spectrum.h | 323 +- + drivers/staging/rt3070/spectrum_def.h | 96 +- + drivers/staging/rt3070/sta/aironet.c | 1313 +-- + drivers/staging/rt3070/sta/assoc.c | 2061 +---- + drivers/staging/rt3070/sta/auth.c | 476 +- + drivers/staging/rt3070/sta/auth_rsp.c | 168 +- + drivers/staging/rt3070/sta/connect.c | 2857 +----- + drivers/staging/rt3070/sta/dls.c | 2170 ---- + drivers/staging/rt3070/sta/rtmp_data.c | 2638 +----- + drivers/staging/rt3070/sta/sanity.c | 421 +- + drivers/staging/rt3070/sta/sync.c | 1756 +--- + drivers/staging/rt3070/sta/wpa.c | 2100 +---- + drivers/staging/rt3070/sta_ioctl.c | 7204 +----------- + drivers/staging/rt3070/wpa.h | 357 +- + drivers/staging/rtl8187se/Kconfig | 2 +- + .../staging/rtl8187se/ieee80211/ieee80211_module.c | 1 - + drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 2 +- + drivers/staging/rtl8187se/r8180_core.c | 25 +- + drivers/staging/rtl8187se/r8180_dm.c | 6 +- + drivers/staging/rtl8187se/r8180_pm.c | 6 +- + drivers/staging/rtl8192su/Kconfig | 6 + + drivers/staging/rtl8192su/Makefile | 66 + + drivers/staging/rtl8192su/authors | 1 + + drivers/staging/rtl8192su/dot11d.h | 102 + + drivers/staging/rtl8192su/ieee80211.h | 2901 +++++ + drivers/staging/rtl8192su/ieee80211/EndianFree.h | 199 + + drivers/staging/rtl8192su/ieee80211/Makefile | 31 + + 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 | 239 + + drivers/staging/rtl8192su/ieee80211/dot11d.h | 102 + + drivers/staging/rtl8192su/ieee80211/ieee80211.h | 2901 +++++ + .../staging/rtl8192su/ieee80211/ieee80211_crypt.c | 273 + + .../staging/rtl8192su/ieee80211/ieee80211_crypt.h | 93 + + .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 534 + + .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 1034 ++ + .../rtl8192su/ieee80211/ieee80211_crypt_wep.c | 397 + + .../staging/rtl8192su/ieee80211/ieee80211_module.c | 394 + + drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 2832 +++++ + .../rtl8192su/ieee80211/ieee80211_softmac.c | 3580 ++++++ + .../rtl8192su/ieee80211/ieee80211_softmac_wx.c | 711 ++ + drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 947 ++ + drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 1032 ++ + 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 + + drivers/staging/rtl8192su/ieee80211/readme | 162 + + drivers/staging/rtl8192su/ieee80211/rtl819x_BA.h | 69 + + .../staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 781 ++ + drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h | 517 + + .../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 2037 ++++ + drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h | 749 ++ + drivers/staging/rtl8192su/ieee80211/rtl819x_TS.h | 56 + + .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 667 ++ + 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.c | 146 + + drivers/staging/rtl8192su/r8180_93cx6.h | 45 + + drivers/staging/rtl8192su/r8190_rtl8256.c | 312 + + drivers/staging/rtl8192su/r8190_rtl8256.h | 27 + + drivers/staging/rtl8192su/r8192SU_HWImg.c | 4902 ++++++++ + drivers/staging/rtl8192su/r8192SU_HWImg.h | 44 + + drivers/staging/rtl8192su/r8192S_Efuse.c | 2442 ++++ + drivers/staging/rtl8192su/r8192S_Efuse.h | 101 + + drivers/staging/rtl8192su/r8192S_FwImgDTM.h | 3797 ++++++ + drivers/staging/rtl8192su/r8192S_firmware.c | 1023 ++ + drivers/staging/rtl8192su/r8192S_firmware.h | 212 + + drivers/staging/rtl8192su/r8192S_hw.h | 1677 +++ + drivers/staging/rtl8192su/r8192S_phy.c | 5028 ++++++++ + drivers/staging/rtl8192su/r8192S_phy.h | 138 + + drivers/staging/rtl8192su/r8192S_phyreg.h | 1033 ++ + drivers/staging/rtl8192su/r8192S_rtl6052.c | 946 ++ + drivers/staging/rtl8192su/r8192S_rtl6052.h | 134 + + drivers/staging/rtl8192su/r8192S_rtl8225.c | 292 + + drivers/staging/rtl8192su/r8192S_rtl8225.h | 30 + + drivers/staging/rtl8192su/r8192U.h | 2112 ++++ + drivers/staging/rtl8192su/r8192U_core.c |12460 ++++++++++++++++++++ + drivers/staging/rtl8192su/r8192U_dm.c | 4521 +++++++ + drivers/staging/rtl8192su/r8192U_dm.h | 309 + + drivers/staging/rtl8192su/r8192U_hw.h | 746 ++ + drivers/staging/rtl8192su/r8192U_pm.c | 77 + + drivers/staging/rtl8192su/r8192U_pm.h | 27 + + drivers/staging/rtl8192su/r8192U_wx.c | 1350 +++ + drivers/staging/rtl8192su/r8192U_wx.h | 23 + + drivers/staging/rtl8192su/r819xU_HTGen.h | 22 + + drivers/staging/rtl8192su/r819xU_HTType.h | 392 + + drivers/staging/rtl8192su/r819xU_cmdpkt.c | 826 ++ + drivers/staging/rtl8192su/r819xU_cmdpkt.h | 219 + + 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_usb/Makefile | 1 - + drivers/staging/serqt_usb/serqt_usb.c | 2656 ----- + drivers/staging/{serqt_usb => serqt_usb2}/Kconfig | 4 +- + drivers/staging/serqt_usb2/Makefile | 1 + + drivers/staging/serqt_usb2/serqt_usb2.c | 1664 +++ + drivers/staging/slicoss/slicoss.c | 3 +- + drivers/staging/stlc45xx/stlc45xx.c | 11 +- + drivers/staging/sxg/sxg.c | 40 +- + drivers/staging/sxg/sxg_ethtool.c | 2 +- + drivers/staging/udlfb/Kconfig | 8 + + drivers/staging/udlfb/Makefile | 1 + + drivers/staging/udlfb/udlfb.c | 937 ++ + drivers/staging/udlfb/udlfb.h | 225 + + drivers/staging/vt6655/80211hdr.h | 357 + + drivers/staging/vt6655/80211mgr.c | 1050 ++ + drivers/staging/vt6655/80211mgr.h | 832 ++ + drivers/staging/vt6655/IEEE11h.c | 324 + + drivers/staging/vt6655/IEEE11h.h | 68 + + drivers/staging/vt6655/Kconfig | 6 + + drivers/staging/vt6655/Makefile | 38 + + drivers/staging/vt6655/Makefile.arm | 181 + + drivers/staging/vt6655/Makefile.x86 | 209 + + drivers/staging/vt6655/aes_ccmp.c | 410 + + drivers/staging/vt6655/aes_ccmp.h | 48 + + drivers/staging/vt6655/baseband.c | 2990 +++++ + drivers/staging/vt6655/baseband.h | 198 + + drivers/staging/vt6655/bssdb.c | 1786 +++ + drivers/staging/vt6655/bssdb.h | 380 + + drivers/staging/vt6655/card.c | 3126 +++++ + drivers/staging/vt6655/card.h | 273 + + drivers/staging/vt6655/country.h | 192 + + drivers/staging/vt6655/datarate.c | 455 + + drivers/staging/vt6655/datarate.h | 95 + + drivers/staging/vt6655/desc.h | 697 ++ + drivers/staging/vt6655/device.h | 1063 ++ + drivers/staging/vt6655/device_cfg.h | 142 + + drivers/staging/vt6655/device_main.c | 4074 +++++++ + drivers/staging/vt6655/dpc.c | 1668 +++ + drivers/staging/vt6655/dpc.h | 75 + + drivers/staging/vt6655/hostap.c | 914 ++ + drivers/staging/vt6655/hostap.h | 94 + + drivers/staging/vt6655/iocmd.h | 481 + + drivers/staging/vt6655/ioctl.c | 775 ++ + drivers/staging/vt6655/ioctl.h | 74 + + drivers/staging/vt6655/iowpa.h | 159 + + drivers/staging/vt6655/iwctl.c | 2397 ++++ + drivers/staging/vt6655/iwctl.h | 332 + + drivers/staging/vt6655/kcompat.h | 84 + + drivers/staging/vt6655/key.c | 836 ++ + drivers/staging/vt6655/key.h | 202 + + drivers/staging/vt6655/mac.c | 1752 +++ + drivers/staging/vt6655/mac.h | 1166 ++ + drivers/staging/vt6655/mib.c | 616 + + drivers/staging/vt6655/mib.h | 399 + + drivers/staging/vt6655/michael.c | 188 + + drivers/staging/vt6655/michael.h | 62 + + drivers/staging/vt6655/power.c | 441 + + drivers/staging/vt6655/power.h | 85 + + drivers/staging/vt6655/rc4.c | 86 + + drivers/staging/vt6655/rc4.h | 51 + + drivers/staging/vt6655/rf.c | 1283 ++ + drivers/staging/vt6655/rf.h | 118 + + drivers/staging/vt6655/rxtx.c | 3269 +++++ + drivers/staging/vt6655/rxtx.h | 132 + + drivers/staging/vt6655/srom.c | 437 + + drivers/staging/vt6655/srom.h | 179 + + drivers/staging/vt6655/tbit.h | 78 + + drivers/staging/vt6655/tcrc.c | 207 + + drivers/staging/vt6655/tcrc.h | 71 + + drivers/staging/vt6655/test | 9 + + drivers/staging/vt6655/tether.c | 123 + + drivers/staging/vt6655/tether.h | 256 + + drivers/staging/vt6655/tkip.c | 284 + + drivers/staging/vt6655/tkip.h | 76 + + drivers/staging/vt6655/tmacro.h | 152 + + drivers/staging/vt6655/tpci.h | 117 + + drivers/staging/vt6655/ttype.h | 386 + + drivers/staging/vt6655/umem.h | 75 + + drivers/staging/vt6655/upc.h | 171 + + drivers/staging/vt6655/vntconfiguration.dat | 1 + + drivers/staging/vt6655/vntwifi.c | 832 ++ + drivers/staging/vt6655/vntwifi.h | 330 + + drivers/staging/vt6655/wcmd.c | 1178 ++ + drivers/staging/vt6655/wcmd.h | 151 + + drivers/staging/vt6655/wctl.c | 261 + + drivers/staging/vt6655/wctl.h | 127 + + drivers/staging/vt6655/wmgr.c | 5088 ++++++++ + drivers/staging/vt6655/wmgr.h | 521 + + drivers/staging/vt6655/wpa.c | 339 + + drivers/staging/vt6655/wpa.h | 98 + + drivers/staging/vt6655/wpa2.c | 373 + + drivers/staging/vt6655/wpa2.h | 100 + + drivers/staging/vt6655/wpactl.c | 1017 ++ + drivers/staging/vt6655/wpactl.h | 89 + + drivers/staging/vt6655/wroute.c | 211 + + drivers/staging/vt6655/wroute.h | 65 + + drivers/staging/winbond/Makefile | 1 - + drivers/staging/winbond/mds.c | 2 +- + drivers/staging/winbond/mto.c | 2 +- + drivers/staging/winbond/phy_calibration.c | 19 + + drivers/staging/winbond/wbhal.c | 568 - + drivers/staging/winbond/wbhal_f.h | 21 - + drivers/staging/winbond/wbhal_s.h | 1 - + drivers/staging/winbond/wbusb.c | 785 +- + drivers/staging/wlan-ng/README | 1 - + drivers/staging/wlan-ng/hfa384x.h | 286 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 323 +- + drivers/staging/wlan-ng/p80211conv.c | 21 +- + drivers/staging/wlan-ng/p80211conv.h | 4 +- + drivers/staging/wlan-ng/p80211hdr.h | 3 - + drivers/staging/wlan-ng/p80211meta.h | 1 - + drivers/staging/wlan-ng/p80211metadef.h | 48 + + drivers/staging/wlan-ng/p80211mgmt.h | 42 +- + drivers/staging/wlan-ng/p80211msg.h | 1 - + drivers/staging/wlan-ng/p80211netdev.c | 99 +- + drivers/staging/wlan-ng/p80211netdev.h | 47 +- + drivers/staging/wlan-ng/p80211req.c | 20 +- + drivers/staging/wlan-ng/p80211req.h | 2 +- + drivers/staging/wlan-ng/p80211types.h | 7 +- + drivers/staging/wlan-ng/p80211wep.c | 198 +- + drivers/staging/wlan-ng/p80211wext.c | 147 +- + drivers/staging/wlan-ng/prism2fw.c | 1406 +++ + drivers/staging/wlan-ng/prism2mgmt.c | 117 +- + drivers/staging/wlan-ng/prism2mgmt.h | 48 +- + drivers/staging/wlan-ng/prism2mib.c | 159 +- + drivers/staging/wlan-ng/prism2sta.c | 268 +- + drivers/staging/wlan-ng/prism2usb.c | 14 +- + 732 files changed, 191732 insertions(+), 240492 deletions(-) + create mode 100644 drivers/staging/android/timed_output.c + create mode 100644 drivers/staging/android/timed_output.h + delete mode 100644 drivers/staging/comedi/comedi_rt.h + delete mode 100644 drivers/staging/comedi/drivers/comedi_rt_timer.c + create mode 100644 drivers/staging/comedi/drivers/pcm_common.c + create mode 100644 drivers/staging/comedi/drivers/pcm_common.h + create mode 100644 drivers/staging/comedi/drivers/vmk80xx.c + delete mode 100644 drivers/staging/comedi/interrupt.h + delete mode 100644 drivers/staging/comedi/rt.c + delete mode 100644 drivers/staging/comedi/rt_pend_tq.c + delete mode 100644 drivers/staging/comedi/rt_pend_tq.h + create mode 100644 drivers/staging/cpc-usb/Kconfig + create mode 100644 drivers/staging/cpc-usb/Makefile + rename drivers/staging/{serqt_usb => cpc-usb}/TODO (63%) + create mode 100644 drivers/staging/cpc-usb/cpc-usb_drv.c + create mode 100644 drivers/staging/cpc-usb/cpc.h + create mode 100644 drivers/staging/cpc-usb/cpc_int.h + create mode 100644 drivers/staging/cpc-usb/cpcusb.h + create mode 100644 drivers/staging/cpc-usb/sja2m16c.h + create mode 100644 drivers/staging/cpc-usb/sja2m16c_2.c + create mode 100644 drivers/staging/octeon/Kconfig + create mode 100644 drivers/staging/octeon/Makefile + create mode 100644 drivers/staging/octeon/cvmx-address.h + create mode 100644 drivers/staging/octeon/cvmx-asxx-defs.h + create mode 100644 drivers/staging/octeon/cvmx-cmd-queue.c + create mode 100644 drivers/staging/octeon/cvmx-cmd-queue.h + create mode 100644 drivers/staging/octeon/cvmx-config.h + create mode 100644 drivers/staging/octeon/cvmx-dbg-defs.h + create mode 100644 drivers/staging/octeon/cvmx-fau.h + create mode 100644 drivers/staging/octeon/cvmx-fpa-defs.h + create mode 100644 drivers/staging/octeon/cvmx-fpa.c + create mode 100644 drivers/staging/octeon/cvmx-fpa.h + create mode 100644 drivers/staging/octeon/cvmx-gmxx-defs.h + create mode 100644 drivers/staging/octeon/cvmx-helper-board.c + create mode 100644 drivers/staging/octeon/cvmx-helper-board.h + create mode 100644 drivers/staging/octeon/cvmx-helper-fpa.c + create mode 100644 drivers/staging/octeon/cvmx-helper-fpa.h + create mode 100644 drivers/staging/octeon/cvmx-helper-loop.c + create mode 100644 drivers/staging/octeon/cvmx-helper-loop.h + create mode 100644 drivers/staging/octeon/cvmx-helper-npi.c + create mode 100644 drivers/staging/octeon/cvmx-helper-npi.h + create mode 100644 drivers/staging/octeon/cvmx-helper-rgmii.c + create mode 100644 drivers/staging/octeon/cvmx-helper-rgmii.h + create mode 100644 drivers/staging/octeon/cvmx-helper-sgmii.c + create mode 100644 drivers/staging/octeon/cvmx-helper-sgmii.h + create mode 100644 drivers/staging/octeon/cvmx-helper-spi.c + create mode 100644 drivers/staging/octeon/cvmx-helper-spi.h + create mode 100644 drivers/staging/octeon/cvmx-helper-util.c + create mode 100644 drivers/staging/octeon/cvmx-helper-util.h + create mode 100644 drivers/staging/octeon/cvmx-helper-xaui.c + create mode 100644 drivers/staging/octeon/cvmx-helper-xaui.h + create mode 100644 drivers/staging/octeon/cvmx-helper.c + create mode 100644 drivers/staging/octeon/cvmx-helper.h + create mode 100644 drivers/staging/octeon/cvmx-interrupt-decodes.c + create mode 100644 drivers/staging/octeon/cvmx-interrupt-rsl.c + create mode 100644 drivers/staging/octeon/cvmx-ipd.h + create mode 100644 drivers/staging/octeon/cvmx-mdio.h + create mode 100644 drivers/staging/octeon/cvmx-packet.h + create mode 100644 drivers/staging/octeon/cvmx-pcsx-defs.h + create mode 100644 drivers/staging/octeon/cvmx-pcsxx-defs.h + create mode 100644 drivers/staging/octeon/cvmx-pip-defs.h + create mode 100644 drivers/staging/octeon/cvmx-pip.h + create mode 100644 drivers/staging/octeon/cvmx-pko-defs.h + create mode 100644 drivers/staging/octeon/cvmx-pko.c + create mode 100644 drivers/staging/octeon/cvmx-pko.h + create mode 100644 drivers/staging/octeon/cvmx-pow.h + create mode 100644 drivers/staging/octeon/cvmx-scratch.h + create mode 100644 drivers/staging/octeon/cvmx-smix-defs.h + create mode 100644 drivers/staging/octeon/cvmx-spi.c + create mode 100644 drivers/staging/octeon/cvmx-spi.h + create mode 100644 drivers/staging/octeon/cvmx-spxx-defs.h + create mode 100644 drivers/staging/octeon/cvmx-srxx-defs.h + create mode 100644 drivers/staging/octeon/cvmx-stxx-defs.h + create mode 100644 drivers/staging/octeon/cvmx-wqe.h + create mode 100644 drivers/staging/octeon/ethernet-common.c + create mode 100644 drivers/staging/octeon/ethernet-common.h + create mode 100644 drivers/staging/octeon/ethernet-defines.h + create mode 100644 drivers/staging/octeon/ethernet-mdio.c + create mode 100644 drivers/staging/octeon/ethernet-mdio.h + create mode 100644 drivers/staging/octeon/ethernet-mem.c + create mode 100644 drivers/staging/octeon/ethernet-mem.h + create mode 100644 drivers/staging/octeon/ethernet-proc.c + create mode 100644 drivers/staging/octeon/ethernet-proc.h + create mode 100644 drivers/staging/octeon/ethernet-rgmii.c + create mode 100644 drivers/staging/octeon/ethernet-rx.c + create mode 100644 drivers/staging/octeon/ethernet-rx.h + create mode 100644 drivers/staging/octeon/ethernet-sgmii.c + create mode 100644 drivers/staging/octeon/ethernet-spi.c + create mode 100644 drivers/staging/octeon/ethernet-tx.c + create mode 100644 drivers/staging/octeon/ethernet-tx.h + create mode 100644 drivers/staging/octeon/ethernet-util.h + create mode 100644 drivers/staging/octeon/ethernet-xaui.c + create mode 100644 drivers/staging/octeon/ethernet.c + create mode 100644 drivers/staging/octeon/octeon-ethernet.h + create mode 100644 drivers/staging/pata_rdc/Kconfig + create mode 100644 drivers/staging/pata_rdc/Makefile + create mode 100644 drivers/staging/pata_rdc/pata_rdc.c + create mode 100644 drivers/staging/pata_rdc/pata_rdc.h + delete mode 100644 drivers/staging/rt2860/common/netif_block.c + delete mode 100644 drivers/staging/rt2860/common/netif_block.h + delete mode 100644 drivers/staging/rt2860/leap.h + delete mode 100644 drivers/staging/rt2860/rt_ate.c + delete mode 100644 drivers/staging/rt2860/rt_ate.h + delete mode 100644 drivers/staging/rt2860/sta/dls.c + delete mode 100644 drivers/staging/rt2870/common/netif_block.c + delete mode 100644 drivers/staging/rt2870/leap.h + delete mode 100644 drivers/staging/rt2870/netif_block.h + delete mode 100644 drivers/staging/rt2870/rt_ate.c + delete mode 100644 drivers/staging/rt2870/rt_ate.h + delete mode 100644 drivers/staging/rt2870/sta/dls.c + delete mode 100644 drivers/staging/rt2870/sta_ioctl.c.patch + delete mode 100644 drivers/staging/rt2870/tmp60 + delete mode 100644 drivers/staging/rt2870/tmp61 + delete mode 100644 drivers/staging/rt3070/common/netif_block.c + delete mode 100644 drivers/staging/rt3070/leap.h + delete mode 100644 drivers/staging/rt3070/netif_block.h + delete mode 100644 drivers/staging/rt3070/rt_ate.c + delete mode 100644 drivers/staging/rt3070/rt_ate.h + delete mode 100644 drivers/staging/rt3070/sta/dls.c + create mode 100644 drivers/staging/rtl8192su/Kconfig + create mode 100644 drivers/staging/rtl8192su/Makefile + create mode 100644 drivers/staging/rtl8192su/authors + create mode 100644 drivers/staging/rtl8192su/dot11d.h + create mode 100644 drivers/staging/rtl8192su/ieee80211.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/EndianFree.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/Makefile + create mode 100644 drivers/staging/rtl8192su/ieee80211/aes.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/api.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/arc4.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/autoload.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/cipher.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/compress.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/crypto_compat.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/digest.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/dot11d.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/dot11d.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_ccmp.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_wep.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_module.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/internal.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/kmap_types.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/michael_mic.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/proc.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/readme + create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_BA.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_TS.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl_crypto.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/scatterwalk.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/scatterwalk.h + create mode 100644 drivers/staging/rtl8192su/ieee80211_crypt.h + create mode 100644 drivers/staging/rtl8192su/r8180_93cx6.c + create mode 100644 drivers/staging/rtl8192su/r8180_93cx6.h + create mode 100644 drivers/staging/rtl8192su/r8190_rtl8256.c + create mode 100644 drivers/staging/rtl8192su/r8190_rtl8256.h + create mode 100644 drivers/staging/rtl8192su/r8192SU_HWImg.c + create mode 100644 drivers/staging/rtl8192su/r8192SU_HWImg.h + create mode 100644 drivers/staging/rtl8192su/r8192S_Efuse.c + create mode 100644 drivers/staging/rtl8192su/r8192S_Efuse.h + create mode 100644 drivers/staging/rtl8192su/r8192S_FwImgDTM.h + create mode 100644 drivers/staging/rtl8192su/r8192S_firmware.c + create mode 100644 drivers/staging/rtl8192su/r8192S_firmware.h + create mode 100644 drivers/staging/rtl8192su/r8192S_hw.h + create mode 100644 drivers/staging/rtl8192su/r8192S_phy.c + create mode 100644 drivers/staging/rtl8192su/r8192S_phy.h + create mode 100644 drivers/staging/rtl8192su/r8192S_phyreg.h + create mode 100644 drivers/staging/rtl8192su/r8192S_rtl6052.c + create mode 100644 drivers/staging/rtl8192su/r8192S_rtl6052.h + create mode 100644 drivers/staging/rtl8192su/r8192S_rtl8225.c + create mode 100644 drivers/staging/rtl8192su/r8192S_rtl8225.h + create mode 100644 drivers/staging/rtl8192su/r8192U.h + create mode 100644 drivers/staging/rtl8192su/r8192U_core.c + create mode 100644 drivers/staging/rtl8192su/r8192U_dm.c + create mode 100644 drivers/staging/rtl8192su/r8192U_dm.h + create mode 100644 drivers/staging/rtl8192su/r8192U_hw.h + create mode 100644 drivers/staging/rtl8192su/r8192U_pm.c + create mode 100644 drivers/staging/rtl8192su/r8192U_pm.h + create mode 100644 drivers/staging/rtl8192su/r8192U_wx.c + create mode 100644 drivers/staging/rtl8192su/r8192U_wx.h + create mode 100644 drivers/staging/rtl8192su/r819xU_HTGen.h + create mode 100644 drivers/staging/rtl8192su/r819xU_HTType.h + create mode 100644 drivers/staging/rtl8192su/r819xU_cmdpkt.c + create mode 100644 drivers/staging/rtl8192su/r819xU_cmdpkt.h + create mode 100644 drivers/staging/rtl8192su/r819xU_firmware.c + create mode 100644 drivers/staging/rtl8192su/r819xU_firmware.h + create mode 100644 drivers/staging/rtl8192su/r819xU_firmware_img.c + create mode 100644 drivers/staging/rtl8192su/r819xU_firmware_img.h + create mode 100644 drivers/staging/rtl8192su/r819xU_phy.c + create mode 100644 drivers/staging/rtl8192su/r819xU_phy.h + create mode 100644 drivers/staging/rtl8192su/r819xU_phyreg.h + delete mode 100644 drivers/staging/serqt_usb/Makefile + delete mode 100644 drivers/staging/serqt_usb/serqt_usb.c + rename drivers/staging/{serqt_usb => serqt_usb2}/Kconfig (76%) + create mode 100644 drivers/staging/serqt_usb2/Makefile + create mode 100644 drivers/staging/serqt_usb2/serqt_usb2.c + create mode 100644 drivers/staging/udlfb/Kconfig + create mode 100644 drivers/staging/udlfb/Makefile + create mode 100644 drivers/staging/udlfb/udlfb.c + create mode 100644 drivers/staging/udlfb/udlfb.h + create mode 100644 drivers/staging/vt6655/80211hdr.h + create mode 100644 drivers/staging/vt6655/80211mgr.c + create mode 100644 drivers/staging/vt6655/80211mgr.h + create mode 100644 drivers/staging/vt6655/IEEE11h.c + create mode 100644 drivers/staging/vt6655/IEEE11h.h + create mode 100644 drivers/staging/vt6655/Kconfig + create mode 100644 drivers/staging/vt6655/Makefile + create mode 100644 drivers/staging/vt6655/Makefile.arm + create mode 100644 drivers/staging/vt6655/Makefile.x86 + create mode 100644 drivers/staging/vt6655/aes_ccmp.c + create mode 100644 drivers/staging/vt6655/aes_ccmp.h + create mode 100644 drivers/staging/vt6655/baseband.c + create mode 100644 drivers/staging/vt6655/baseband.h + create mode 100644 drivers/staging/vt6655/bssdb.c + create mode 100644 drivers/staging/vt6655/bssdb.h + create mode 100644 drivers/staging/vt6655/card.c + create mode 100644 drivers/staging/vt6655/card.h + create mode 100644 drivers/staging/vt6655/country.h + create mode 100644 drivers/staging/vt6655/datarate.c + create mode 100644 drivers/staging/vt6655/datarate.h + create mode 100644 drivers/staging/vt6655/desc.h + create mode 100644 drivers/staging/vt6655/device.h + create mode 100644 drivers/staging/vt6655/device_cfg.h + create mode 100644 drivers/staging/vt6655/device_main.c + create mode 100644 drivers/staging/vt6655/dpc.c + create mode 100644 drivers/staging/vt6655/dpc.h + create mode 100644 drivers/staging/vt6655/hostap.c + create mode 100644 drivers/staging/vt6655/hostap.h + create mode 100644 drivers/staging/vt6655/iocmd.h + create mode 100644 drivers/staging/vt6655/ioctl.c + create mode 100644 drivers/staging/vt6655/ioctl.h + create mode 100644 drivers/staging/vt6655/iowpa.h + create mode 100644 drivers/staging/vt6655/iwctl.c + create mode 100644 drivers/staging/vt6655/iwctl.h + create mode 100644 drivers/staging/vt6655/kcompat.h + create mode 100644 drivers/staging/vt6655/key.c + create mode 100644 drivers/staging/vt6655/key.h + create mode 100644 drivers/staging/vt6655/mac.c + create mode 100644 drivers/staging/vt6655/mac.h + create mode 100644 drivers/staging/vt6655/mib.c + create mode 100644 drivers/staging/vt6655/mib.h + create mode 100644 drivers/staging/vt6655/michael.c + create mode 100644 drivers/staging/vt6655/michael.h + create mode 100644 drivers/staging/vt6655/power.c + create mode 100644 drivers/staging/vt6655/power.h + create mode 100644 drivers/staging/vt6655/rc4.c + create mode 100644 drivers/staging/vt6655/rc4.h + create mode 100644 drivers/staging/vt6655/rf.c + create mode 100644 drivers/staging/vt6655/rf.h + create mode 100644 drivers/staging/vt6655/rxtx.c + create mode 100644 drivers/staging/vt6655/rxtx.h + create mode 100644 drivers/staging/vt6655/srom.c + create mode 100644 drivers/staging/vt6655/srom.h + create mode 100644 drivers/staging/vt6655/tbit.h + create mode 100644 drivers/staging/vt6655/tcrc.c + create mode 100644 drivers/staging/vt6655/tcrc.h + create mode 100644 drivers/staging/vt6655/test + create mode 100644 drivers/staging/vt6655/tether.c + create mode 100644 drivers/staging/vt6655/tether.h + create mode 100644 drivers/staging/vt6655/tkip.c + create mode 100644 drivers/staging/vt6655/tkip.h + create mode 100644 drivers/staging/vt6655/tmacro.h + create mode 100644 drivers/staging/vt6655/tpci.h + create mode 100644 drivers/staging/vt6655/ttype.h + create mode 100644 drivers/staging/vt6655/umem.h + create mode 100644 drivers/staging/vt6655/upc.h + create mode 100644 drivers/staging/vt6655/vntconfiguration.dat + create mode 100644 drivers/staging/vt6655/vntwifi.c + create mode 100644 drivers/staging/vt6655/vntwifi.h + create mode 100644 drivers/staging/vt6655/wcmd.c + create mode 100644 drivers/staging/vt6655/wcmd.h + create mode 100644 drivers/staging/vt6655/wctl.c + create mode 100644 drivers/staging/vt6655/wctl.h + create mode 100644 drivers/staging/vt6655/wmgr.c + create mode 100644 drivers/staging/vt6655/wmgr.h + create mode 100644 drivers/staging/vt6655/wpa.c + create mode 100644 drivers/staging/vt6655/wpa.h + create mode 100644 drivers/staging/vt6655/wpa2.c + create mode 100644 drivers/staging/vt6655/wpa2.h + create mode 100644 drivers/staging/vt6655/wpactl.c + create mode 100644 drivers/staging/vt6655/wpactl.h + create mode 100644 drivers/staging/vt6655/wroute.c + create mode 100644 drivers/staging/vt6655/wroute.h + delete mode 100644 drivers/staging/winbond/wbhal.c + create mode 100644 drivers/staging/wlan-ng/prism2fw.c +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. +$ git am -3 ../patches/0001-kvm-powerpc-make-32-bit-constant-unsigned-long.patch +Applying: kvm/powerpc: make 32 bit constant unsigned long diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..b0d1a7b7ecd4 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,99 @@ +Unchanged quilt series driver-core.current +Unchanged quilt series usb.current +Importing i2c based on 2.6.30-git9 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 03347e2592078a90df818670fddf97a33eec70fb +HEAD is now at 03347e2 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-remove-void-casts.patch +i2c-retry-on-arbitration-loss.patch +i2c-tdfx-no-class.patch +i2c-adapter-no-default-parent.patch +i2c-chips-move-max6875-to-drivers-misc-eeprom.patch +i2c-viapro-add-new-pci-device-id-for-vx855.patch +macintosh-therm_pm72-convert-to-new-style-i2c.patch +macintosh-windfarm-convert-to-new-style-i2c.patch +macintosh-therm_adt746x-convert-to-new-style-i2c.patch +macintosh-therm_windtunnel-convert-to-new-style-i2c.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + bb153ae...bb925e9 master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.30-git9 +$ cd ../quilt-tmp +$ git reset --hard 03347e2592078a90df818670fddf97a33eec70fb +HEAD is now at 03347e2 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-more-__devexit-fixes.patch +hwmon-ibmaem-automatically-load-on-hc10-blade.patch +hwmon-tmp401-01-new-driver.patch +hwmon-tmp401-02-add-support-for-TI-TMP411.patch +hwmon-tmp401-03-add-documentation.patch +hwmon-w83627ehf-add-W83627DHG-P-support.patch +hwmon-pci-quirk-for-MSI-7031.patch +hwmon-f71882fg-01-f8000-cleanup-pwm.patch +hwmon-f71882fg-02-f8000-sanity-check-pwm.patch +hwmon-f71882fg-03-f8000-temp_fault.patch +hwmon-f71882fg-04-add-f71858fg-support-v2.patch +hwmon-max6650-add-support-for-alarms.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + 3edc6a4...d1123b3 master -> quilt/jdelvare-hwmon (forced update) +Unchanged quilt series kernel-doc +Unchanged quilt series rr +Importing device-mapper based on block/for-next +$ cd ../quilt-tmp +$ git reset --hard b0fd271d5fba0b2d00888363f3869e3f9b26caa9 +HEAD is now at b0fd271 block: add request clone interface (v2) +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-mpath-validate-table-argument-count.patch +dm-mpath-validate-hw_handler-argument-count.patch +dm-sysfs-skip-output-when-device-is-being-destroyed.patch +dm-mpath-change-attached-scsi_dh.patch +dm-mpath-call-activate-fn-for-each-path-in-pg_init.patch +dm-raid1-keep-retrying-alloc-if-mempool_alloc-failed.patch +dm-mpath-flush-keventd-queue-in-destructor.patch +dm-avoid-unsupported-spanning-of-md-stripe-boundaries.patch +dm-avoid-unsupported-spanning-of-md-stripe-boundaries-fixup-for-linux-next.patch +dm-use-i_size_read.patch +dm-rename-suspended_bdev-to-bdev.patch +dm-always-hold-bdev-reference.patch +dm-make-dm_flush-return-void.patch +dm-process-requeue-in-dm_wq_work.patch +dm-store-only-first-barrier-error.patch +dm-remove-EOPNOTSUPP-for-barriers.patch +dm-remove-check-that-prevents-mapping-empty-bios.patch +dm-introduce-num_flush_requests.patch +dm-initialise-tio-in-alloc_tio.patch +dm-send-empty-barriers-to-targets-in-dm_flush.patch +dm-linear-support-flush.patch +dm-stripe-support-flush.patch +dm-crypt-support-flush.patch +dm-delay-support-barriers.patch +dm-mpath-support-barriers.patch +dm-snapshot-support-barriers.patch +dm-io-record-eopnotsupp.patch +dm-io-retry-after-barrier-error.patch +dm-snapshot-use-barrier-when-writing-exception-store.patch +dm-mpath-add-start_io-and-nr_bytes-to-path-selectors.patch +dm-mpath-add-queue-length-load-balancer.patch +dm-mpath-add-service-time-load-balancer.patch +dm-table-improve-warning-message-when-devices-not-freed-before-destruction.patch +dm-sysfs-add-suspended-attribute.patch +dm-ioctl-support-cookies-for-udev.patch +dm-table-ensure-targets-are-aligned-to-logical_block_size.patch +dm-table-validate-device-logical_block_size.patch +dm-table-replace-struct-io_restrictions-with-struct-queue_limits.patch +dm-table-establish-queue-limits-by-copying-table-limits.patch +dm-targets-introduce-iterate-devices-fn.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/device-mapper +From ../quilt-tmp + + c4b0687...ac21525 master -> quilt/device-mapper (forced update) +Unchanged quilt series ttydev +Unchanged quilt series aoe +Unchanged quilt series driver-core +Unchanged quilt series usb +Unchanged quilt series staging diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..978e3c07528b --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20090617 |